From ec636c95a1335aebd125116f0234dbaacc4c2562 Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Sun, 13 Aug 2017 12:30:28 +0200
Subject: [PATCH 001/668]  Improve update and verify routines.

---
 app/Console/Commands/UpgradeDatabase.php | 440 +++++++++++------------
 app/Console/Commands/VerifyDatabase.php  |  35 ++
 2 files changed, 238 insertions(+), 237 deletions(-)

diff --git a/app/Console/Commands/UpgradeDatabase.php b/app/Console/Commands/UpgradeDatabase.php
index 066e4496d3..90d2434d76 100644
--- a/app/Console/Commands/UpgradeDatabase.php
+++ b/app/Console/Commands/UpgradeDatabase.php
@@ -20,7 +20,6 @@ use FireflyIII\Models\AccountMeta;
 use FireflyIII\Models\AccountType;
 use FireflyIII\Models\BudgetLimit;
 use FireflyIII\Models\LimitRepetition;
-use FireflyIII\Models\PiggyBankEvent;
 use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionCurrency;
 use FireflyIII\Models\TransactionJournal;
@@ -71,76 +70,25 @@ class UpgradeDatabase extends Command
     {
         $this->setTransactionIdentifier();
         $this->migrateRepetitions();
-        $this->repairPiggyBanks();
         $this->updateAccountCurrencies();
-        $this->updateJournalCurrencies();
-        $this->currencyInfoToTransactions();
-        $this->verifyCurrencyInfo();
+        $this->updateTransferCurrencies();
+        $this->updateOtherCurrencies();
         $this->info('Firefly III database is up to date.');
+        return;
+
+
+
     }
 
     /**
-     * Moves the currency id info to the transaction instead of the journal.
-     *
-     * @SuppressWarnings(PHPMD.CyclomaticComplexity) // cannot be helped.
+     * Migrate budget repetitions to new format where the end date is in the budget limit as well,
+     * making the limit_repetition table obsolete.
      */
-    private function currencyInfoToTransactions()
+    public function migrateRepetitions(): void
     {
-        $count = 0;
-        $set   = TransactionJournal::with('transactions')->get();
-        /** @var TransactionJournal $journal */
-        foreach ($set as $journal) {
-            /** @var Transaction $transaction */
-            foreach ($journal->transactions as $transaction) {
-                if (is_null($transaction->transaction_currency_id)) {
-                    $transaction->transaction_currency_id = $journal->transaction_currency_id;
-                    $transaction->save();
-                    $count++;
-                }
-            }
-
-            // read and use the foreign amounts when present.
-            if ($journal->hasMeta('foreign_amount')) {
-                $amount = Steam::positive($journal->getMeta('foreign_amount'));
-
-                // update both transactions:
-                foreach ($journal->transactions as $transaction) {
-                    $transaction->foreign_amount = $amount;
-                    if (bccomp($transaction->amount, '0') === -1) {
-                        // update with negative amount:
-                        $transaction->foreign_amount = bcmul($amount, '-1');
-                    }
-                    // set foreign currency id:
-                    $transaction->foreign_currency_id = intval($journal->getMeta('foreign_currency_id'));
-                    $transaction->save();
-                }
-                $journal->deleteMeta('foreign_amount');
-                $journal->deleteMeta('foreign_currency_id');
-            }
-
-        }
-
-        $this->line(sprintf('Updated currency information for %d transactions', $count));
-    }
-
-    /**
-     *  Migrate budget repetitions to new format.
-     *
-     * @SuppressWarnings(PHPMD.CyclomaticComplexity) // it's 5.
-     */
-    private function migrateRepetitions()
-    {
-        if (!Schema::hasTable('budget_limits')) {
-            return;
-        }
-        // get all budget limits with end_date NULL
         $set = BudgetLimit::whereNull('end_date')->get();
-        if ($set->count() > 0) {
-            $this->line(sprintf('Found %d budget limit(s) to update', $set->count()));
-        }
         /** @var BudgetLimit $budgetLimit */
         foreach ($set as $budgetLimit) {
-            // get limit repetition (should be just one):
             /** @var LimitRepetition $repetition */
             $repetition = $budgetLimit->limitrepetitions()->first();
             if (!is_null($repetition)) {
@@ -150,59 +98,30 @@ class UpgradeDatabase extends Command
                 $repetition->delete();
             }
         }
+
+        return;
     }
 
     /**
-     * Make sure there are only transfers linked to piggy bank events.
+     * This method gives all transactions which are part of a split journal (so more than 2) a sort of "order" so they are easier
+     * to easier to match to their counterpart. When a journal is split, it has two or three transactions: -3, -4 and -5 for example.
      *
-     * @SuppressWarnings(PHPMD.CyclomaticComplexity) // cannot be helped.
+     * In the database this is reflected as 6 transactions: -3/+3, -4/+4, -5/+5.
+     *
+     * When either of these are the same amount, FF3 can't keep them apart: +3/-3, +3/-3, +3/-3. This happens more often than you would
+     * think. So each set gets a number (1,2,3) to keep them apart.
      */
-    private function repairPiggyBanks()
-    {
-        // if table does not exist, return false
-        if (!Schema::hasTable('piggy_bank_events')) {
-            return;
-        }
-
-        $set = PiggyBankEvent::with(['PiggyBank', 'TransactionJournal', 'TransactionJournal.TransactionType'])->get();
-        /** @var PiggyBankEvent $event */
-        foreach ($set as $event) {
-
-            if (is_null($event->transaction_journal_id)) {
-                continue;
-            }
-            /** @var TransactionJournal $journal */
-            $journal = $event->transactionJournal()->first();
-            if (is_null($journal)) {
-                continue;
-            }
-
-            $type = $journal->transactionType->type;
-            if ($type !== TransactionType::TRANSFER) {
-                $event->transaction_journal_id = null;
-                $event->save();
-                $this->line(sprintf('Piggy bank #%d was referenced by an invalid event. This has been fixed.', $event->piggy_bank_id));
-            }
-        }
-    }
-
-    /**
-     * This is strangely complex, because the HAVING modifier is a no-no. And subqueries in Laravel are weird.
-     */
-    private function setTransactionIdentifier()
+    public function setTransactionIdentifier(): void
     {
         // if table does not exist, return false
         if (!Schema::hasTable('transaction_journals')) {
             return;
         }
-
-
-        $subQuery = TransactionJournal::leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
-                                      ->whereNull('transaction_journals.deleted_at')
-                                      ->whereNull('transactions.deleted_at')
-                                      ->groupBy(['transaction_journals.id'])
-                                      ->select(['transaction_journals.id', DB::raw('COUNT(transactions.id) AS t_count')]);
-
+        $subQuery   = TransactionJournal::leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
+                                        ->whereNull('transaction_journals.deleted_at')
+                                        ->whereNull('transactions.deleted_at')
+                                        ->groupBy(['transaction_journals.id'])
+                                        ->select(['transaction_journals.id', DB::raw('COUNT(transactions.id) AS t_count')]);
         $result     = DB::table(DB::raw('(' . $subQuery->toSql() . ') AS derived'))
                         ->mergeBindings($subQuery->getQuery())
                         ->where('t_count', '>', 2)
@@ -210,55 +129,178 @@ class UpgradeDatabase extends Command
         $journalIds = array_unique($result->pluck('id')->toArray());
 
         foreach ($journalIds as $journalId) {
-            $this->updateJournal(intval($journalId));
+            $this->updateJournalidentifiers(intval($journalId));
         }
+
+        return;
     }
 
     /**
-     * Make sure all accounts have proper currency info.
+     * Each (asset) account must have a reference to a preferred currency. If the account does not have one, it's forced upon
+     * the account.
      */
-    private function updateAccountCurrencies()
+    public function updateAccountCurrencies(): void
     {
         $accounts = Account::leftJoin('account_types', 'account_types.id', '=', 'accounts.account_type_id')
                            ->whereIn('account_types.type', [AccountType::DEFAULT, AccountType::ASSET])->get(['accounts.*']);
 
-        /** @var Account $account */
-        foreach ($accounts as $account) {
-            // get users preference, fall back to system pref.
-            $defaultCurrencyCode = Preferences::getForUser($account->user, 'currencyPreference', config('firefly.default_currency', 'EUR'))->data;
-            $defaultCurrency     = TransactionCurrency::where('code', $defaultCurrencyCode)->first();
-            $accountCurrency     = intval($account->getMeta('currency_id'));
-            $openingBalance      = $account->getOpeningBalance();
-            $obCurrency          = intval($openingBalance->transaction_currency_id);
+        $accounts->each(
+            function (Account $account) {
+                // get users preference, fall back to system pref.
+                $defaultCurrencyCode = Preferences::getForUser($account->user, 'currencyPreference', config('firefly.default_currency', 'EUR'))->data;
+                $defaultCurrency     = TransactionCurrency::where('code', $defaultCurrencyCode)->first();
+                $accountCurrency     = intval($account->getMeta('currency_id'));
+                $openingBalance      = $account->getOpeningBalance();
+                $obCurrency          = intval($openingBalance->transaction_currency_id);
 
-            // both 0? set to default currency:
-            if ($accountCurrency === 0 && $obCurrency === 0) {
-                AccountMeta::create(['account_id' => $account->id, 'name' => 'currency_id', 'data' => $defaultCurrency->id]);
-                $this->line(sprintf('Account #%d ("%s") now has a currency setting (%s).', $account->id, $account->name, $defaultCurrencyCode));
-                continue;
+                // both 0? set to default currency:
+                if ($accountCurrency === 0 && $obCurrency === 0) {
+                    AccountMeta::create(['account_id' => $account->id, 'name' => 'currency_id', 'data' => $defaultCurrency->id]);
+                    $this->line(sprintf('Account #%d ("%s") now has a currency setting (%s).', $account->id, $account->name, $defaultCurrencyCode));
+
+                    return true;
+                }
+
+                // account is set to 0, opening balance is not?
+                if ($accountCurrency === 0 && $obCurrency > 0) {
+                    AccountMeta::create(['account_id' => $account->id, 'name' => 'currency_id', 'data' => $obCurrency]);
+                    $this->line(sprintf('Account #%d ("%s") now has a currency setting (%s).', $account->id, $account->name, $defaultCurrencyCode));
+
+                    return true;
+                }
+
+                // do not match and opening balance id is not null.
+                if ($accountCurrency !== $obCurrency && $openingBalance->id > 0) {
+                    // update opening balance:
+                    $openingBalance->transaction_currency_id = $accountCurrency;
+                    $openingBalance->save();
+                    $this->line(sprintf('Account #%d ("%s") now has a correct currency for opening balance.', $account->id, $account->name));
+
+                    return true;
+                }
+
+                return true;
             }
+        );
 
-            // account is set to 0, opening balance is not?
-            if ($accountCurrency === 0 && $obCurrency > 0) {
-                AccountMeta::create(['account_id' => $account->id, 'name' => 'currency_id', 'data' => $obCurrency]);
-                $this->line(sprintf('Account #%d ("%s") now has a currency setting (%s).', $account->id, $account->name, $defaultCurrencyCode));
-                continue;
+        return;
+    }
+
+    /**
+     * This routine verifies that withdrawals, deposits and opening balances have the correct currency settings for
+     * the accounts they are linked to.
+     *
+     * Both source and destination must match the respective currency preference of the related asset account.
+     * So FF3 must verify all transactions.
+     */
+    public function updateOtherCurrencies()
+    {
+        /** @var CurrencyRepositoryInterface $repository */
+        $repository = app(CurrencyRepositoryInterface::class);
+        $set        = TransactionJournal
+            ::leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id')
+            ->whereIn('transaction_types.type', [TransactionType::WITHDRAWAL, TransactionType::DEPOSIT, TransactionType::OPENING_BALANCE])
+            ->get(['transaction_journals.*']);
+
+        $set->each(
+            function (TransactionJournal $journal) use ($repository) {
+                // get the transaction with the asset account in it:
+                /** @var Transaction $transaction */
+                $transaction = $journal->transactions()
+                                       ->leftJoin('accounts', 'accounts.id', '=', 'transactions.account_id')
+                                       ->leftJoin('account_types', 'account_types.id', '=', 'accounts.account_type_id')
+                                       ->whereIn('account_types.type', [AccountType::DEFAULT, AccountType::ASSET])->first(['transactions.*']);
+                /** @var Account $account */
+                $account      = $transaction->account;
+                $currency     = $repository->find(intval($account->getMeta('currency_id')));
+                $transactions = $journal->transactions()->get();
+                $transactions->each(
+                    function (Transaction $transaction) use ($currency) {
+                        if (is_null($transaction->transaction_currency_id)) {
+                            $transaction->transaction_currency_id = $currency->id;
+                            $transaction->save();
+                            $this->line(sprintf('Transaction #%d is set to %s', $transaction->id, $currency->code));
+                        }
+
+                        // when mismatch in transaction:
+                        if ($transaction->transaction_currency_id !== $currency->id) {
+                            $this->line(
+                                sprintf(
+                                    'Transaction #%d is set to %s and foreign %s', $transaction->id, $currency->code, $transaction->transactionCurrency->code
+                                )
+                            );
+                            $transaction->foreign_currency_id     = $transaction->transaction_currency_id;
+                            $transaction->foreign_amount          = $transaction->amount;
+                            $transaction->transaction_currency_id = $currency->id;
+                            $transaction->save();
+                        }
+                    }
+                );
+                // also update the journal, of course:
+                $journal->transaction_currency_id = $currency->id;
+                $journal->save();
             }
+        );
+        return;
+    }
 
-            // do not match:
-            if ($accountCurrency !== $obCurrency) {
-                // update opening balance:
-                $openingBalance->transaction_currency_id = $accountCurrency;
-                $openingBalance->save();
-                $this->line(sprintf('Account #%d ("%s") now has a correct currency for opening balance.', $account->id, $account->name));
-                continue;
+    /**
+     * This routine verifies that transfers have the correct currency settings for the accounts they are linked to.
+     * For transfers, this is can be a destructive routine since we FORCE them into a currency setting whether they
+     * like it or not. Previous routines MUST have set the currency setting for both accounts for this to work.
+     *
+     * Both source and destination must match the respective currency preference. So FF3 must verify ALL
+     * transactions.
+     */
+    public function updateTransferCurrencies()
+    {
+        /** @var CurrencyRepositoryInterface $repository */
+        $repository = app(CurrencyRepositoryInterface::class);
+        $set        = TransactionJournal
+            ::leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id')
+            ->where('transaction_types.type', TransactionType::TRANSFER)
+            ->get(['transaction_journals.*']);
+
+        $set->each(
+            function (TransactionJournal $transfer) use ($repository) {
+                /** @var Transaction $transaction */
+                $transaction = $transfer->transactions()->where('amount', '<', 0)->first();
+                $this->updateTransactionCurrency($transaction);
+                $this->updateJournalCurrency($transaction);
+
+
+                /** @var Transaction $transaction */
+                $transaction = $transfer->transactions()->where('amount', '>', 0)->first();
+                $this->updateTransactionCurrency($transaction);
             }
+        );
+    }
 
-            // opening balance 0, account not zero? just continue:
-            // both are equal, just continue:
 
+    /**
+     * This method makes sure that the transaction journal uses the currency given in the transaction.
+     *
+     * @param Transaction $transaction
+     */
+    private function updateJournalCurrency(Transaction $transaction): void
+    {
+        /** @var CurrencyRepositoryInterface $repository */
+        $repository = app(CurrencyRepositoryInterface::class);
+        $currency   = $repository->find(intval($transaction->account->getMeta('currency_id')));
+        $journal    = $transaction->transactionJournal;
+
+        if ($currency->id !== $journal->transaction_currency_id) {
+            $this->line(
+                sprintf(
+                    'Transfer #%d ("%s") has been updated to use %s instead of %s.', $journal->id, $journal->description, $currency->code,
+                    $journal->transactionCurrency->code
+                )
+            );
+            $journal->transaction_currency_id = $currency->id;
+            $journal->save();
         }
 
+        return;
     }
 
     /**
@@ -267,7 +309,7 @@ class UpgradeDatabase extends Command
      *
      * @param int $journalId
      */
-    private function updateJournal(int $journalId)
+    private function updateJournalidentifiers(int $journalId): void
     {
         $identifier   = 0;
         $processed    = [];
@@ -295,121 +337,45 @@ class UpgradeDatabase extends Command
             if (!is_null($opposing)) {
                 // give both a new identifier:
                 $transaction->identifier = $identifier;
+                $opposing->identifier    = $identifier;
                 $transaction->save();
-                $opposing->identifier = $identifier;
                 $opposing->save();
                 $processed[] = $transaction->id;
                 $processed[] = $opposing->id;
             }
             $identifier++;
         }
+
+        return;
     }
 
     /**
-     * Makes sure that withdrawals, deposits and transfers have
-     * a currency setting matching their respective accounts
-     */
-    private function updateJournalCurrencies()
-    {
-        $types        = [
-            TransactionType::WITHDRAWAL => '<',
-            TransactionType::DEPOSIT    => '>',
-        ];
-        $repository   = app(CurrencyRepositoryInterface::class);
-        $notification = '%s #%d uses %s but should use %s. It has been updated. Please verify this in Firefly III.';
-        $transfer     = 'Transfer #%d has been updated to use the correct currencies. Please verify this in Firefly III.';
-        $driver       = DB::connection()->getDriverName();
-        $pgsql        = ['pgsql', 'postgresql'];
-
-        foreach ($types as $type => $operator) {
-            $query = TransactionJournal
-                ::leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id')->leftJoin(
-                    'transactions', function (JoinClause $join) use ($operator) {
-                    $join->on('transaction_journals.id', '=', 'transactions.transaction_journal_id')->where('transactions.amount', $operator, '0');
-                }
-                )
-                ->leftJoin('accounts', 'accounts.id', '=', 'transactions.account_id')
-                ->leftJoin('account_meta', 'account_meta.account_id', '=', 'accounts.id')
-                ->where('transaction_types.type', $type)
-                ->where('account_meta.name', 'currency_id');
-            if (in_array($driver, $pgsql)) {
-                $query->where('transaction_journals.transaction_currency_id', '!=', DB::raw('cast(account_meta.data as int)'));
-            }
-            if (!in_array($driver, $pgsql)) {
-                $query->where('transaction_journals.transaction_currency_id', '!=', DB::raw('account_meta.data'));
-            }
-
-            $set = $query->get(['transaction_journals.*', 'account_meta.data as expected_currency_id', 'transactions.amount as transaction_amount']);
-            /** @var TransactionJournal $journal */
-            foreach ($set as $journal) {
-                $expectedCurrency = $repository->find(intval($journal->expected_currency_id));
-                $line             = sprintf($notification, $type, $journal->id, $journal->transactionCurrency->code, $expectedCurrency->code);
-
-                $journal->setMeta('foreign_amount', $journal->transaction_amount);
-                $journal->setMeta('foreign_currency_id', $journal->transaction_currency_id);
-                $journal->transaction_currency_id = $expectedCurrency->id;
-                $journal->save();
-                $this->line($line);
-            }
-        }
-        /*
-         * For transfers it's slightly different. Both source and destination
-         * must match the respective currency preference. So we must verify ALL
-         * transactions.
-         */
-        $set = TransactionJournal
-            ::leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id')
-            ->where('transaction_types.type', TransactionType::TRANSFER)
-            ->get(['transaction_journals.*']);
-        /** @var TransactionJournal $journal */
-        foreach ($set as $journal) {
-            $updated = false;
-            /** @var Transaction $sourceTransaction */
-            $sourceTransaction = $journal->transactions()->where('amount', '<', 0)->first();
-            $sourceCurrency    = $repository->find(intval($sourceTransaction->account->getMeta('currency_id')));
-
-            if ($sourceCurrency->id !== $journal->transaction_currency_id) {
-                $updated                          = true;
-                $journal->transaction_currency_id = $sourceCurrency->id;
-                $journal->save();
-            }
-
-            // destination
-            $destinationTransaction = $journal->transactions()->where('amount', '>', 0)->first();
-            $destinationCurrency    = $repository->find(intval($destinationTransaction->account->getMeta('currency_id')));
-
-            if ($destinationCurrency->id !== $journal->transaction_currency_id) {
-                $updated = true;
-                $journal->deleteMeta('foreign_amount');
-                $journal->deleteMeta('foreign_currency_id');
-                $journal->setMeta('foreign_amount', $destinationTransaction->amount);
-                $journal->setMeta('foreign_currency_id', $destinationCurrency->id);
-            }
-            if ($updated) {
-                $line = sprintf($transfer, $journal->id);
-                $this->line($line);
-            }
-        }
-    }
-
-    /**
+     * This method makes sure that the tranaction uses the same currency as the main account does.
+     * If not, the currency is updated to include a reference to its original currency as the "foreign" currency.
      *
+     * @param Transaction $transaction
      */
-    private function verifyCurrencyInfo()
+    private function updateTransactionCurrency(Transaction $transaction): void
     {
-        $count        = 0;
-        $transactions = Transaction::get();
-        /** @var Transaction $transaction */
-        foreach ($transactions as $transaction) {
-            $currencyId = intval($transaction->transaction_currency_id);
-            $foreignId  = intval($transaction->foreign_currency_id);
-            if ($currencyId === $foreignId) {
-                $transaction->foreign_currency_id = null;
-                $transaction->foreign_amount      = null;
-                $transaction->save();
-                $count++;
-            }
+        /** @var CurrencyRepositoryInterface $repository */
+        $repository = app(CurrencyRepositoryInterface::class);
+        $currency   = $repository->find(intval($transaction->account->getMeta('currency_id')));
+
+        if (is_null($transaction->transaction_currency_id)) {
+            $transaction->transaction_currency_id = $currency->id;
+            $transaction->save();
+            $this->line(sprintf('Transaction #%d is set to %s', $transaction->id, $currency->code));
         }
-        $this->line(sprintf('Updated currency information for %d transactions', $count));
+
+        // when mismatch in transaction:
+        if ($transaction->transaction_currency_id !== $currency->id) {
+            $this->line(sprintf('Transaction #%d is set to %s and foreign %s', $transaction->id, $currency->code, $transaction->transactionCurrency->code));
+            $transaction->foreign_currency_id     = $transaction->transaction_currency_id;
+            $transaction->foreign_amount          = $transaction->amount;
+            $transaction->transaction_currency_id = $currency->id;
+            $transaction->save();
+        }
+
+        return;
     }
 }
diff --git a/app/Console/Commands/VerifyDatabase.php b/app/Console/Commands/VerifyDatabase.php
index 6e128e7f53..ffc8f1b667 100644
--- a/app/Console/Commands/VerifyDatabase.php
+++ b/app/Console/Commands/VerifyDatabase.php
@@ -17,6 +17,7 @@ use Crypt;
 use FireflyIII\Models\Account;
 use FireflyIII\Models\AccountType;
 use FireflyIII\Models\Budget;
+use FireflyIII\Models\PiggyBankEvent;
 use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Models\TransactionType;
@@ -94,6 +95,40 @@ class VerifyDatabase extends Command
         // report on journals with the wrong types of accounts.
         $this->reportIncorrectJournals();
 
+        // report (and fix) piggy banks
+        $this->repairPiggyBanks();
+
+    }
+
+    /**
+     * Make sure there are only transfers linked to piggy bank events.
+     */
+    private function repairPiggyBanks(): void
+    {
+        $set = PiggyBankEvent::with(['PiggyBank', 'TransactionJournal', 'TransactionJournal.TransactionType'])->get();
+        $set->each(
+            function (PiggyBankEvent $event) {
+                if (is_null($event->transaction_journal_id)) {
+                    return true;
+                }
+                /** @var TransactionJournal $journal */
+                $journal = $event->transactionJournal()->first();
+                if (is_null($journal)) {
+                    return true;
+                }
+
+                $type = $journal->transactionType->type;
+                if ($type !== TransactionType::TRANSFER) {
+                    $event->transaction_journal_id = null;
+                    $event->save();
+                    $this->line(sprintf('Piggy bank #%d was referenced by an invalid event. This has been fixed.', $event->piggy_bank_id));
+                }
+
+                return true;
+            }
+        );
+
+        return;
     }
 
     /**

From f9c85d4d81863ebdc879a01fe42e36a587904345 Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Sun, 13 Aug 2017 12:37:09 +0200
Subject: [PATCH 002/668] Catch the error in #760

---
 app/Import/Object/ImportJournal.php  | 4 ++++
 app/Import/Storage/ImportStorage.php | 4 +++-
 app/Import/Storage/ImportSupport.php | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/Import/Object/ImportJournal.php b/app/Import/Object/ImportJournal.php
index a72f574f28..48b7d7df60 100644
--- a/app/Import/Object/ImportJournal.php
+++ b/app/Import/Object/ImportJournal.php
@@ -85,6 +85,7 @@ class ImportJournal
 
     /**
      * @return string
+     * @throws FireflyException
      */
     public function getAmount(): string
     {
@@ -102,6 +103,9 @@ class ImportJournal
                 }
             }
         }
+        if(bccomp($this->amount,'0') === 0) {
+            throw new FireflyException('Amount is zero.');
+        }
 
         return $this->amount;
     }
diff --git a/app/Import/Storage/ImportStorage.php b/app/Import/Storage/ImportStorage.php
index 50980ad2a9..598380a06b 100644
--- a/app/Import/Storage/ImportStorage.php
+++ b/app/Import/Storage/ImportStorage.php
@@ -11,6 +11,8 @@ declare(strict_types=1);
 
 namespace FireflyIII\Import\Storage;
 
+use ErrorException;
+use Exception;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Import\Object\ImportJournal;
 use FireflyIII\Models\ImportJob;
@@ -95,7 +97,7 @@ class ImportStorage
             function (ImportJournal $importJournal, int $index) {
                 try {
                     $this->storeImportJournal($index, $importJournal);
-                } catch (FireflyException $e) {
+                } catch (FireflyException | ErrorException | Exception $e) {
                     $this->errors->push($e->getMessage());
                     Log::error(sprintf('Cannot import row #%d because: %s', $index, $e->getMessage()));
                 }
diff --git a/app/Import/Storage/ImportSupport.php b/app/Import/Storage/ImportSupport.php
index 38b444b98e..aa7b1dbf99 100644
--- a/app/Import/Storage/ImportSupport.php
+++ b/app/Import/Storage/ImportSupport.php
@@ -214,7 +214,7 @@ trait ImportSupport
      */
     private function getTransactionType(string $amount, Account $account): string
     {
-        $transactionType = '';
+        $transactionType = TransactionType::WITHDRAWAL;
         // amount is negative, it's a withdrawal, opposing is an expense:
         if (bccomp($amount, '0') === -1) {
             $transactionType = TransactionType::WITHDRAWAL;

From 1633994fbdf8c4e2609ba1d9e50f616e44d2b63d Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Sun, 13 Aug 2017 15:30:39 +0200
Subject: [PATCH 003/668] Slight change in amount handler. #760

---
 app/Import/Object/ImportJournal.php | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/app/Import/Object/ImportJournal.php b/app/Import/Object/ImportJournal.php
index 48b7d7df60..21bd535b8f 100644
--- a/app/Import/Object/ImportJournal.php
+++ b/app/Import/Object/ImportJournal.php
@@ -37,6 +37,8 @@ class ImportJournal
     public $budget;
     /** @var ImportCategory */
     public $category;
+    /** @var  ImportCurrency */
+    public $currency;
     /** @var  string */
     public $description = '';
     /** @var  string */
@@ -51,8 +53,8 @@ class ImportJournal
     public $tags = [];
     /** @var string */
     private $amount;
-    /** @var  ImportCurrency */
-    public $currency;
+    /** @var  string */
+    private $convertedAmount = null;
     /** @var string */
     private $date = '';
     /** @var string */
@@ -89,25 +91,25 @@ class ImportJournal
      */
     public function getAmount(): string
     {
-        if (is_null($this->amount)) {
+        if (is_null($this->convertedAmount)) {
             /** @var ConverterInterface $amountConverter */
-            $amountConverter = app(Amount::class);
-            $this->amount    = $amountConverter->convert($this->amount);
+            $amountConverter       = app(Amount::class);
+            $this->convertedAmount = $amountConverter->convert($this->amount);
             // modify
             foreach ($this->modifiers as $modifier) {
                 $class = sprintf('FireflyIII\Import\Converter\%s', config(sprintf('csv.import_roles.%s.converter', $modifier['role'])));
                 /** @var ConverterInterface $converter */
                 $converter = app($class);
                 if ($converter->convert($modifier['value']) === -1) {
-                    $this->amount = Steam::negative($this->amount);
+                    $this->convertedAmount = Steam::negative($this->convertedAmount);
                 }
             }
         }
-        if(bccomp($this->amount,'0') === 0) {
+        if (bccomp($this->convertedAmount, '0') === 0) {
             throw new FireflyException('Amount is zero.');
         }
 
-        return $this->amount;
+        return $this->convertedAmount;
     }
 
     /**

From 5a9a6a4680d0e14741df55c9b35e6ffe1debd75f Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Mon, 14 Aug 2017 16:10:14 +0200
Subject: [PATCH 004/668] New translations csv.php (French)

---
 resources/lang/fr_FR/csv.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/resources/lang/fr_FR/csv.php b/resources/lang/fr_FR/csv.php
index ac03875f19..68fced7524 100644
--- a/resources/lang/fr_FR/csv.php
+++ b/resources/lang/fr_FR/csv.php
@@ -14,10 +14,10 @@ declare(strict_types=1);
 return [
 
     // initial config
-    'initial_title'                 => 'Import setup (1/3) - Basic CSV import setup',
-    'initial_text'                  => 'To be able to import your file correctly, please validate the options below.',
-    'initial_box'                   => 'Basic CSV import setup',
-    'initial_box_title'             => 'Basic CSV import setup options',
+    'initial_title'                 => 'Importer la configuration (1/3) - Configuration de l\'importation CSV de base',
+    'initial_text'                  => 'Pour pouvoir importer votre fichier correctement, veuillez validez les options ci-dessous.',
+    'initial_box'                   => 'Options d’importation CSV basique',
+    'initial_box_title'             => 'Options d’importation CSV basique',
     'initial_header_help'           => 'Check this box if the first row of your CSV file are the column titles.',
     'initial_date_help'             => 'Date time format in your CSV. Follow the format like <a href="https://secure.php.net/manual/en/datetime.createfromformat.php#refsect1-datetime.createfromformat-parameters">this page</a> indicates. The default value will parse dates that look like this: :dateExample.',
     'initial_delimiter_help'        => 'Choose the field delimiter that is used in your input file. If not sure, comma is the safest option.',

From c04eb6dc2a1034fe2761c5d04a1fd3b89855d65b Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Mon, 14 Aug 2017 16:20:06 +0200
Subject: [PATCH 005/668] New translations csv.php (French)

---
 resources/lang/fr_FR/csv.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/lang/fr_FR/csv.php b/resources/lang/fr_FR/csv.php
index 68fced7524..f1d3890f4c 100644
--- a/resources/lang/fr_FR/csv.php
+++ b/resources/lang/fr_FR/csv.php
@@ -14,11 +14,11 @@ declare(strict_types=1);
 return [
 
     // initial config
-    'initial_title'                 => 'Importer la configuration (1/3) - Configuration de l\'importation CSV de base',
+    'initial_title'                 => 'Importer la configuration (1/3) - Configuration de l\'importation CSV basique',
     'initial_text'                  => 'Pour pouvoir importer votre fichier correctement, veuillez validez les options ci-dessous.',
     'initial_box'                   => 'Options d’importation CSV basique',
     'initial_box_title'             => 'Options d’importation CSV basique',
-    'initial_header_help'           => 'Check this box if the first row of your CSV file are the column titles.',
+    'initial_header_help'           => 'Cochez cette case si la première ligne de votre fichier CSV contient les entêtes des colonnes.',
     'initial_date_help'             => 'Date time format in your CSV. Follow the format like <a href="https://secure.php.net/manual/en/datetime.createfromformat.php#refsect1-datetime.createfromformat-parameters">this page</a> indicates. The default value will parse dates that look like this: :dateExample.',
     'initial_delimiter_help'        => 'Choose the field delimiter that is used in your input file. If not sure, comma is the safest option.',
     'initial_import_account_help'   => 'If your CSV file does NOT contain information about your asset account(s), use this dropdown to select to which account the transactions in the CSV belong to.',

From 9a29747bbfb4d974f992f7ee34f6199efcdd4e85 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Mon, 14 Aug 2017 16:50:08 +0200
Subject: [PATCH 006/668] New translations csv.php (French)

---
 resources/lang/fr_FR/csv.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/resources/lang/fr_FR/csv.php b/resources/lang/fr_FR/csv.php
index f1d3890f4c..2d79cfbbab 100644
--- a/resources/lang/fr_FR/csv.php
+++ b/resources/lang/fr_FR/csv.php
@@ -22,13 +22,13 @@ return [
     'initial_date_help'             => 'Date time format in your CSV. Follow the format like <a href="https://secure.php.net/manual/en/datetime.createfromformat.php#refsect1-datetime.createfromformat-parameters">this page</a> indicates. The default value will parse dates that look like this: :dateExample.',
     'initial_delimiter_help'        => 'Choose the field delimiter that is used in your input file. If not sure, comma is the safest option.',
     'initial_import_account_help'   => 'If your CSV file does NOT contain information about your asset account(s), use this dropdown to select to which account the transactions in the CSV belong to.',
-    'initial_submit'                => 'Continue with step 2/3',
+    'initial_submit'                => 'Passez à l’étape 2/3',
 
     // roles config
-    'roles_title'                   => 'Import setup (2/3) - Define each column\'s role',
+    'roles_title'                   => 'Importer la configuration (1/3) - Définir le rôle de chaque colonne',
     'roles_text'                    => 'Each column in your CSV file contains certain data. Please indicate what kind of data the importer should expect. The option to "map" data means that you will link each entry found in the column to a value in your database. An often mapped column is the column that contains the IBAN of the opposing account. That can be easily matched to IBAN\'s present in your database already.',
-    'roles_table'                   => 'Table',
-    'roles_column_name'             => 'Name of column',
+    'roles_table'                   => 'Tableau',
+    'roles_column_name'             => 'Nom de colonne',
     'roles_column_example'          => 'Column example data',
     'roles_column_role'             => 'Column data meaning',
     'roles_do_map_value'            => 'Map these values',

From fe457d149c2a65a2fbf3fe86a8fa3a0a2d67962e Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Mon, 14 Aug 2017 17:00:07 +0200
Subject: [PATCH 007/668] New translations csv.php (French)

---
 resources/lang/fr_FR/csv.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/resources/lang/fr_FR/csv.php b/resources/lang/fr_FR/csv.php
index 2d79cfbbab..4828e6ae1b 100644
--- a/resources/lang/fr_FR/csv.php
+++ b/resources/lang/fr_FR/csv.php
@@ -26,24 +26,24 @@ return [
 
     // roles config
     'roles_title'                   => 'Importer la configuration (1/3) - Définir le rôle de chaque colonne',
-    'roles_text'                    => 'Each column in your CSV file contains certain data. Please indicate what kind of data the importer should expect. The option to "map" data means that you will link each entry found in the column to a value in your database. An often mapped column is the column that contains the IBAN of the opposing account. That can be easily matched to IBAN\'s present in your database already.',
+    'roles_text'                    => 'Chaque colonne de votre fichier CSV contient certaines données. Veuillez indiquer quel type de données, l’importateur doit attendre. L’option de « mapper » les données signifie que vous allez lier chaque entrée trouvée dans la colonne à une valeur dans votre base de données. Souvent une colonne est la colonne contenant l’IBAN du compte opposé. Qui peut être facilement adapté aux IBAN déjà présents dans votre base de données.',
     'roles_table'                   => 'Tableau',
     'roles_column_name'             => 'Nom de colonne',
     'roles_column_example'          => 'Column example data',
     'roles_column_role'             => 'Column data meaning',
-    'roles_do_map_value'            => 'Map these values',
-    'roles_column'                  => 'Column',
-    'roles_no_example_data'         => 'No example data available',
-    'roles_submit'                  => 'Continue with step 3/3',
+    'roles_do_map_value'            => 'Mapper ces valeurs',
+    'roles_column'                  => 'Colonne',
+    'roles_no_example_data'         => 'Pas de données disponibles',
+    'roles_submit'                  => 'Passez à l’étape 3/3',
     'roles_warning'                 => 'At the very least, mark one column as the amount-column. It is advisable to also select a column for the description, date and the opposing account.',
 
     // map data
     'map_title'                     => 'Import setup (3/3) - Connect import data to Firefly III data',
     'map_text'                      => 'Dans les tableaux suivants, la valeur gauche vous montre des informations trouvées dans votre fichier CSV téléchargé. C’est votre rôle de mapper cette valeur, si possible, une valeur déjà présente dans votre base de données. Firefly s’en tiendra à ce mappage. Si il n’y a pas de valeur correspondante, ou vous ne souhaitez pas la valeur spécifique de la carte, ne sélectionnez rien.',
-    'map_field_value'               => 'Field value',
-    'map_field_mapped_to'           => 'Mapped to',
-    'map_do_not_map'                => '(do not map)',
-    'map_submit'                    => 'Start the import',
+    'map_field_value'               => 'Valeur du champ',
+    'map_field_mapped_to'           => 'Mappé à',
+    'map_do_not_map'                => '(ne pas mapper)',
+    'map_submit'                    => 'Démarrer l\'importation',
 
     // map things.
     'column__ignore'                => '(ignorer cette colonne)',

From 4a1a70fa46b1e4b893efdd98b8a48c082cc58f68 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Mon, 14 Aug 2017 17:41:49 +0200
Subject: [PATCH 008/668] New translations csv.php (French)

---
 resources/lang/fr_FR/csv.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/fr_FR/csv.php b/resources/lang/fr_FR/csv.php
index 4828e6ae1b..a7191b341c 100644
--- a/resources/lang/fr_FR/csv.php
+++ b/resources/lang/fr_FR/csv.php
@@ -29,7 +29,7 @@ return [
     'roles_text'                    => 'Chaque colonne de votre fichier CSV contient certaines données. Veuillez indiquer quel type de données, l’importateur doit attendre. L’option de « mapper » les données signifie que vous allez lier chaque entrée trouvée dans la colonne à une valeur dans votre base de données. Souvent une colonne est la colonne contenant l’IBAN du compte opposé. Qui peut être facilement adapté aux IBAN déjà présents dans votre base de données.',
     'roles_table'                   => 'Tableau',
     'roles_column_name'             => 'Nom de colonne',
-    'roles_column_example'          => 'Column example data',
+    'roles_column_example'          => 'Données d’exemple de colonne',
     'roles_column_role'             => 'Column data meaning',
     'roles_do_map_value'            => 'Mapper ces valeurs',
     'roles_column'                  => 'Colonne',

From 84b5c3c789cb208489959048b7510a08e3a7e19e Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Mon, 14 Aug 2017 17:50:12 +0200
Subject: [PATCH 009/668] New translations csv.php (French)

---
 resources/lang/fr_FR/csv.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/lang/fr_FR/csv.php b/resources/lang/fr_FR/csv.php
index a7191b341c..701f1c83fc 100644
--- a/resources/lang/fr_FR/csv.php
+++ b/resources/lang/fr_FR/csv.php
@@ -30,12 +30,12 @@ return [
     'roles_table'                   => 'Tableau',
     'roles_column_name'             => 'Nom de colonne',
     'roles_column_example'          => 'Données d’exemple de colonne',
-    'roles_column_role'             => 'Column data meaning',
+    'roles_column_role'             => 'Signification des données de colonne',
     'roles_do_map_value'            => 'Mapper ces valeurs',
     'roles_column'                  => 'Colonne',
     'roles_no_example_data'         => 'Pas de données disponibles',
     'roles_submit'                  => 'Passez à l’étape 3/3',
-    'roles_warning'                 => 'At the very least, mark one column as the amount-column. It is advisable to also select a column for the description, date and the opposing account.',
+    'roles_warning'                 => 'La moindre des choses, c\'est de marquer une colonne comme colonne-montant. Il est conseillé de sélectionner également une colonne pour la description, la date et le compte opposé.',
 
     // map data
     'map_title'                     => 'Import setup (3/3) - Connect import data to Firefly III data',

From 3182256580bd03de24a7e87adee45348fd70e162 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Mon, 14 Aug 2017 18:00:11 +0200
Subject: [PATCH 010/668] New translations csv.php (French)

---
 resources/lang/fr_FR/csv.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/resources/lang/fr_FR/csv.php b/resources/lang/fr_FR/csv.php
index 701f1c83fc..afd0dbf930 100644
--- a/resources/lang/fr_FR/csv.php
+++ b/resources/lang/fr_FR/csv.php
@@ -19,9 +19,9 @@ return [
     'initial_box'                   => 'Options d’importation CSV basique',
     'initial_box_title'             => 'Options d’importation CSV basique',
     'initial_header_help'           => 'Cochez cette case si la première ligne de votre fichier CSV contient les entêtes des colonnes.',
-    'initial_date_help'             => 'Date time format in your CSV. Follow the format like <a href="https://secure.php.net/manual/en/datetime.createfromformat.php#refsect1-datetime.createfromformat-parameters">this page</a> indicates. The default value will parse dates that look like this: :dateExample.',
-    'initial_delimiter_help'        => 'Choose the field delimiter that is used in your input file. If not sure, comma is the safest option.',
-    'initial_import_account_help'   => 'If your CSV file does NOT contain information about your asset account(s), use this dropdown to select to which account the transactions in the CSV belong to.',
+    'initial_date_help'             => 'Le format de la date et de l’heure dans votre fichier CSV. Utiliser le format comme indiqué sur <a href="https://secure.php.net/manual/en/datetime.createfromformat.php#refsect1-datetime.createfromformat-parameters">cette page</a>. La valeur par défaut va analyser les dates ressemblant à ceci : :dateExample.',
+    'initial_delimiter_help'        => 'Choisissez le délimiteur de champ qui est utilisé dans votre fichier d’entrée. Si vous n’êtes pas certain, la virgule est l’option la plus sûre.',
+    'initial_import_account_help'   => 'Si votre fichier CSV ne contient AUCUNE information concernant vos compte(s) actif, utilisez cette liste déroulante pour choisir à quel compte les opérations contenues dans le CSV font référence.',
     'initial_submit'                => 'Passez à l’étape 2/3',
 
     // roles config
@@ -38,7 +38,7 @@ return [
     'roles_warning'                 => 'La moindre des choses, c\'est de marquer une colonne comme colonne-montant. Il est conseillé de sélectionner également une colonne pour la description, la date et le compte opposé.',
 
     // map data
-    'map_title'                     => 'Import setup (3/3) - Connect import data to Firefly III data',
+    'map_title'                     => 'Importer la configuration (3/3) - Connecter l\'importation des données aux données de Firefly III',
     'map_text'                      => 'Dans les tableaux suivants, la valeur gauche vous montre des informations trouvées dans votre fichier CSV téléchargé. C’est votre rôle de mapper cette valeur, si possible, une valeur déjà présente dans votre base de données. Firefly s’en tiendra à ce mappage. Si il n’y a pas de valeur correspondante, ou vous ne souhaitez pas la valeur spécifique de la carte, ne sélectionnez rien.',
     'map_field_value'               => 'Valeur du champ',
     'map_field_mapped_to'           => 'Mappé à',
@@ -73,8 +73,8 @@ return [
     'column_opposing-name'          => 'Compte destination (nom)',
     'column_rabo-debet-credit'      => 'Indicateur spécifique débit/crédit à Rabobank',
     'column_ing-debet-credit'       => 'Indicateur spécifique débit/crédit à ING',
-    'column_sepa-ct-id'             => 'SEPA Credit Transfer end-to-end ID',
-    'column_sepa-ct-op'             => 'SEPA Credit Transfer opposing account',
+    'column_sepa-ct-id'             => 'SEPA Transfert Crédit ID de bout en bout',
+    'column_sepa-ct-op'             => 'SEPA Transfert Crédit compte opposé',
     'column_sepa-db'                => 'SEPA débit immédiat',
     'column_tags-comma'             => 'Tags (séparé par des virgules)',
     'column_tags-space'             => 'Tags(séparé par des espaces)',

From 5d3df4579e2cd0f74504103714a0e6ef91c4ac7a Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Mon, 14 Aug 2017 18:00:13 +0200
Subject: [PATCH 011/668] New translations list.php (French)

---
 resources/lang/fr_FR/list.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/resources/lang/fr_FR/list.php b/resources/lang/fr_FR/list.php
index 003c518d2b..ce34a53af3 100644
--- a/resources/lang/fr_FR/list.php
+++ b/resources/lang/fr_FR/list.php
@@ -36,7 +36,7 @@ return [
     'split_number'          => 'Segmenter en',
     'destination'           => 'Destination',
     'source'                => 'Source',
-    'next_expected_match'   => 'Next expected match',
+    'next_expected_match'   => 'Prochaine association attendue',
     'automatch'             => 'Correspondance automatique ?',
     'repeat_freq'           => 'Répétitions',
     'description'           => 'Description',
@@ -70,22 +70,22 @@ return [
     'is_blocked'            => 'Est bloqué',
     'is_admin'              => 'Est admin',
     'has_two_factor'        => 'A 2FA',
-    'confirmed_from'        => 'Confirmed from',
+    'confirmed_from'        => 'Confirmé à partir de',
     'registered_from'       => 'Inscrit depuis le',
     'blocked_code'          => 'Code de blocage',
     'domain'                => 'Domaine',
-    'registration_attempts' => 'Registration attempts',
+    'registration_attempts' => 'Tentatives d\'inscription',
     'source_account'        => 'Compte d\'origine',
     'destination_account'   => 'Compte destinataire',
 
     'accounts_count'        => 'Nombre de comptes',
     'journals_count'        => 'Nombre d\'opérations',
     'attachments_count'     => 'Nombre de pièces jointes',
-    'bills_count'           => 'Number of bills',
-    'categories_count'      => 'Number of categories',
-    'export_jobs_count'     => 'Number of export jobs',
-    'import_jobs_count'     => 'Number of import jobs',
-    'budget_count'          => 'Number of budgets',
+    'bills_count'           => 'Nombre de factures',
+    'categories_count'      => 'Nombre de catégories',
+    'export_jobs_count'     => 'Nombre de travaux exportés',
+    'import_jobs_count'     => 'Nombre de travaux importés',
+    'budget_count'          => 'Nombre de budgets',
     'rule_and_groups_count' => 'Nombre de règles et de groupes de règles',
     'tags_count'            => 'Number of tags',
 ];
\ No newline at end of file

From a785fd27ecfa749ae6dceb9bc99dda3d5873d144 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Mon, 14 Aug 2017 18:10:07 +0200
Subject: [PATCH 012/668] New translations validation.php (French)

---
 resources/lang/fr_FR/validation.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/fr_FR/validation.php b/resources/lang/fr_FR/validation.php
index 7328b1530a..6eacebc9f8 100644
--- a/resources/lang/fr_FR/validation.php
+++ b/resources/lang/fr_FR/validation.php
@@ -90,5 +90,5 @@ return [
     'in_array'                       => 'Le champ :attribute n\'existe pas dans :other.',
     'present'                        => 'Le champs :attribute doit être rempli.',
     'amount_zero'                    => 'Le montant total ne peut pas être zéro',
-    'secure_password'                => 'This is not a secure password. Please try again. For more information, visit https://goo.gl/NCh2tN',
+    'secure_password'                => 'Ce n’est pas un mot de passe sécurisé. S’il vous plaît essayer de nouveau. Pour plus d’informations, visitez https://goo.gl/NCh2tN',
 ];
\ No newline at end of file

From 2410c767f8dbabb77cc78884213bf8c795c0c697 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Mon, 14 Aug 2017 18:10:09 +0200
Subject: [PATCH 013/668] New translations form.php (French)

---
 resources/lang/fr_FR/form.php | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/resources/lang/fr_FR/form.php b/resources/lang/fr_FR/form.php
index 8451d35d30..f583f16d16 100644
--- a/resources/lang/fr_FR/form.php
+++ b/resources/lang/fr_FR/form.php
@@ -34,7 +34,7 @@ return [
     'journal_source_account_name'    => 'Compte de recettes (source)',
     'journal_source_account_id'      => 'Compte d’actif (source)',
     'BIC'                            => 'Code BIC',
-    'verify_password'                => 'Verify password security',
+    'verify_password'                => 'Vérifiez la sécurité du mot de passe',
     'account_from_id'                => 'Compte d\'origine',
     'account_to_id'                  => 'Compte de destination',
     'source_account'                 => 'Compte d\'origine',
@@ -57,36 +57,36 @@ return [
     'targetamount'                   => 'Montant cible',
     'accountRole'                    => 'Rôle du compte',
     'openingBalanceDate'             => 'Date du solde initial',
-    'ccType'                         => 'Credit card payment plan',
-    'ccMonthlyPaymentDate'           => 'Credit card monthly payment date',
+    'ccType'                         => 'Plan de paiement de carte de crédit',
+    'ccMonthlyPaymentDate'           => 'Date de paiement mensuelle de carte de crédit',
     'piggy_bank_id'                  => 'Tirelire',
-    'returnHere'                     => 'Return here',
+    'returnHere'                     => 'Retourner ici',
     'returnHereExplanation'          => 'Après enregistrement, revenir ici pour en créer un nouveau.',
     'returnHereUpdateExplanation'    => 'Après mise à jour, revenir ici.',
     'description'                    => 'Description',
     'expense_account'                => 'Compte de dépenses',
     'revenue_account'                => 'Compte de recettes',
-    'decimal_places'                 => 'Decimal places',
+    'decimal_places'                 => 'Chiffres après la virgule',
     'exchange_rate_instruction'      => 'Devises étrangères',
-    'exchanged_amount'               => 'Exchanged amount',
+    'exchanged_amount'               => 'Montant échangé',
     'source_amount'                  => 'Montant (source)',
     'destination_amount'             => 'Montant (destination)',
-    'native_amount'                  => 'Native amount',
+    'native_amount'                  => 'Montant natif',
 
-    'revenue_account_source'      => 'Revenue account (source)',
-    'source_account_asset'        => 'Source account (asset account)',
-    'destination_account_expense' => 'Destination account (expense account)',
-    'destination_account_asset'   => 'Destination account (asset account)',
-    'source_account_revenue'      => 'Source account (revenue account)',
+    'revenue_account_source'      => 'Compte de recettes (source)',
+    'source_account_asset'        => 'Compte source (compte d\'actif)',
+    'destination_account_expense' => 'Compte de destination (compte de dépenses)',
+    'destination_account_asset'   => 'Compte de destination (compte d’actif)',
+    'source_account_revenue'      => 'Compte source (compte recettes)',
     'type'                        => 'Type',
-    'convert_Withdrawal'          => 'Convert withdrawal',
-    'convert_Deposit'             => 'Convert deposit',
-    'convert_Transfer'            => 'Convert transfer',
+    'convert_Withdrawal'          => 'Convertir le retrait',
+    'convert_Deposit'             => 'Convertir le dépôt',
+    'convert_Transfer'            => 'Convertir le transfert',
 
 
     'amount'                     => 'Montant',
     'date'                       => 'Date',
-    'interest_date'              => 'Interest date',
+    'interest_date'              => 'Date de l’intérêt',
     'book_date'                  => 'Date de réservation',
     'process_date'               => 'Date de traitement',
     'category'                   => 'Catégorie',
@@ -102,7 +102,7 @@ return [
     'accountNumber'              => 'N° de compte',
     'has_headers'                => 'Entêtes ',
     'date_format'                => 'Format de la date',
-    'specifix'                   => 'Bank- or file specific fixes',
+    'specifix'                   => 'Banque - ou déposer des corrections spécifiques',
     'attachments[]'              => 'Pièces jointes',
     'store_new_withdrawal'       => 'Enregistrer un nouveau retrait',
     'store_new_deposit'          => 'Enregistrer un nouveau dépôt',

From fe24c8971f54a2ad5a63f705b1437e43e0f11349 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Mon, 14 Aug 2017 18:10:10 +0200
Subject: [PATCH 014/668] New translations breadcrumbs.php (French)

---
 resources/lang/fr_FR/breadcrumbs.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/fr_FR/breadcrumbs.php b/resources/lang/fr_FR/breadcrumbs.php
index ef1952431c..48763edce1 100644
--- a/resources/lang/fr_FR/breadcrumbs.php
+++ b/resources/lang/fr_FR/breadcrumbs.php
@@ -26,7 +26,7 @@ return [
     'edit_bill'         => 'Editer la facture : ":name"',
     'delete_bill'       => 'Supprimer la facture ":name"',
     'reports'           => 'Rapport',
-    'search_result'     => 'Search results for ":query"',
+    'search_result'     => 'Résultats de recherche pour ":query"',
     'withdrawal_list'   => 'Dépenses',
     'deposit_list'      => 'Revenu, salaire et versements',
     'transfer_list'     => 'Virements',

From 5e423a8edef043f36327beac6c2012cb3f31be78 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Mon, 14 Aug 2017 18:10:11 +0200
Subject: [PATCH 015/668] New translations list.php (French)

---
 resources/lang/fr_FR/list.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/fr_FR/list.php b/resources/lang/fr_FR/list.php
index ce34a53af3..2acf2c75d3 100644
--- a/resources/lang/fr_FR/list.php
+++ b/resources/lang/fr_FR/list.php
@@ -87,5 +87,5 @@ return [
     'import_jobs_count'     => 'Nombre de travaux importés',
     'budget_count'          => 'Nombre de budgets',
     'rule_and_groups_count' => 'Nombre de règles et de groupes de règles',
-    'tags_count'            => 'Number of tags',
+    'tags_count'            => 'Nombre d’étiquettes',
 ];
\ No newline at end of file

From 244dcc04653caa727cc2ef50b3e290ae47aa50d4 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Mon, 14 Aug 2017 19:10:07 +0200
Subject: [PATCH 016/668] New translations demo.php (French)

---
 resources/lang/fr_FR/demo.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/fr_FR/demo.php b/resources/lang/fr_FR/demo.php
index 5ef3b853d3..8b376c17a2 100644
--- a/resources/lang/fr_FR/demo.php
+++ b/resources/lang/fr_FR/demo.php
@@ -13,7 +13,7 @@ return [
     'no_demo_text'                   => 'Désolé, il n’y a aucun texte supplémentaire de démonstration ou d\'explication pour <abbr title=":route"> cette page</abbr>.',
     'see_help_icon'                  => 'Cependant, l\'icône <i class="fa fa-question-circle"></i> située dans le coin supérieur droit peut vous en dire plus.',
     'index'                          => 'Bienvenue chez <strong>Firefly III</strong> ! Sur cette page, vous obtenez un aperçu rapide de vos finances. Pour plus d’informations, consultez comptes &rarr; <a href=":asset"> Comptes d’actif</a> et, bien sûr, les pages des <a href=":budgets"> Budgets</a> et des <a href=":reports"> rapports</a>. Ou juste jetez un coup d’œil et voyez où vous vous retrouvez.',
-    'accounts-index'                 => 'Asset accounts are your personal bank accounts. Expense accounts are the accounts you spend money at, such as stores and friends. Revenue accounts are accounts you receive money from, such as your job, the government or other sources of income. On this page you can edit or remove them.',
+    'accounts-index'                 => 'Les comptes d’actifs sont vos comptes bancaires personnels. Les comptes de dépenses sont des comptes où vous dépensez de l’argent, comme les magasins et les amis. Les comptes de recettes sont des comptes où vous recevez de l’argent, comme votre travail, le gouvernement ou d’autres sources de revenu. Sur cette page, vous pouvez les modifier ou les supprimer.',
     'budgets-index'                  => 'Cette page vous présente un aperçu de vos budgets. La barre du haut affiche le montant disponible à budgétiser. Cela peut être personnalisé pour toute période en cliquant sur le montant sur la droite. Le montant que vous avez réellement dépensé s’affiche dans la barre ci-dessous. Visualisez ainsi les dépenses budgétisées et votre prévisionnel.',
     'reports-index-start'            => 'Firefly III prend en charge quatre types de rapports. Apprenez-en plus à leur sujet en cliquant sur l\'icône <i class="fa fa-question-circle"></i> située dans le coin supérieur droit.',
     'reports-index-examples'         => 'N’oubliez pas de consultez ces exemples : <a href=":one"> un aperçu financier mensuel</a>, <a href=":two"> une vue d’ensemble financière annuelle</a> ainsi <a href=":three"> qu’une présentation du budget</a>.',

From 4219edc089818dfee83d76c0a07b712c6fb32da3 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Mon, 14 Aug 2017 23:40:07 +0200
Subject: [PATCH 017/668] New translations firefly.php (French)

---
 resources/lang/fr_FR/firefly.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/resources/lang/fr_FR/firefly.php b/resources/lang/fr_FR/firefly.php
index 923d9f639d..a4c53bdb81 100644
--- a/resources/lang/fr_FR/firefly.php
+++ b/resources/lang/fr_FR/firefly.php
@@ -70,7 +70,7 @@ return [
     'two_factor_lost_fix_owner'                  => 'Dans le cas contraire, contactez le propriétaire du site par courriel <a href="mailto::site_owner"> : site_owner</a> et demandez leur de réinitialiser votre authentification à deux facteurs.',
     'warning_much_data'                          => ':days de données peuvent prendre un certain temps à charger.',
     'registered'                                 => 'Vous avez été enregistré avec succès !',
-    'tagbalancingAct'                            => 'Balancing act',
+    'tagbalancingAct'                            => 'Acte d\'équilibre',
     'tagadvancePayment'                          => 'Acompte',
     'tagnothing'                                 => '',
     'Default asset account'                      => 'Compte d’actif par défaut',
@@ -82,29 +82,29 @@ return [
     'user_id_is'                                 => 'Votre identifiant d’utilisateur est <strong>:user</strong>',
     'field_supports_markdown'                    => 'Ce champ prend en charge la <a href="https://en.support.wordpress.com/markdown-quick-reference/">syntaxe Markdown</a>.',
     'need_more_help'                             => 'Si vous désirez plus de renseignements sur l\'utilisation de Firefly III, merci <a href="https://github.com/firefly-iii/firefly-iii/issues">d\'ouvrir un ticket sur Github</a>.',
-    'reenable_intro_text'                        => 'You can also reenable <a href="#" id="reenableGuidance">the introduction guidance</a>.',
-    'intro_boxes_after_refresh'                  => 'The introduction boxes will reappear when you refresh the page.',
+    'reenable_intro_text'                        => 'Vous pouvez également réactiver <a href="#" id="reenableGuidance">le guide d\'introduction</a>.',
+    'intro_boxes_after_refresh'                  => 'Les boîtes d\'introduction réapparaîtront lorsque vous actualiserez la page.',
     'nothing_to_display'                         => 'Il n’y a aucune transaction à afficher',
     'show_all_no_filter'                         => 'Montrer toutes les transactions sans les classer par date.',
     'expenses_by_category'                       => 'Dépenses par catégorie',
     'expenses_by_budget'                         => 'Dépenses par budget',
     'income_by_category'                         => 'Revenu par catégorie',
-    'expenses_by_asset_account'                  => 'Expenses by asset account',
-    'expenses_by_expense_account'                => 'Expenses by expense account',
+    'expenses_by_asset_account'                  => 'Dépenses par compte d’actif',
+    'expenses_by_expense_account'                => 'Dépenses par compte de dépenses',
     'cannot_redirect_to_account'                 => 'Firefly III n\'est pas en mesure de vous rediriger vers la bonne page. Veuillez nous en excuser.',
     'sum_of_expenses'                            => 'Montant des dépenses',
     'sum_of_income'                              => 'Montant des revenus',
     'total_sum'                                  => 'Montant total ',
-    'spent_in_specific_budget'                   => 'Spent in budget ":budget"',
-    'sum_of_expenses_in_budget'                  => 'Spent total in budget ":budget"',
-    'left_in_budget_limit'                       => 'Left to spend according to budgeting',
+    'spent_in_specific_budget'                   => 'Dépensé dans le budget ":budget"',
+    'sum_of_expenses_in_budget'                  => 'Total dépensé dans le budget ":budget"',
+    'left_in_budget_limit'                       => 'Reste à dépenser selon budget',
     'cannot_change_demo'                         => 'Vous ne pouvez pas modifier le mot de passe du compte de démonstration.',
     'cannot_delete_demo'                         => 'Vous ne pouvez pas supprimer le compte de démonstration.',
     'cannot_reset_demo_user'                     => 'Vous ne pouvez pas réinitialiser le mot de passe du compte démonstration',
     'per_period'                                 => 'Par période',
     'all_periods'                                => 'Toutes les périodes',
     'current_period'                             => 'Période en cours',
-    'show_the_current_period_and_overview'       => 'Show the current period and overview',
+    'show_the_current_period_and_overview'       => 'Afficher l’exercice en cours et sa vue d’ensemble',
     'pref_languages_locale'                      => 'For a language other than English to work properly, your operating system must be equipped with the correct locale-information. If these are not present, currency data, dates and amounts may be formatted wrong.',
     'budget_in_period'                           => 'All transactions for budget ":name" between :start and :end',
     'chart_budget_in_period'                     => 'Chart for all transactions for budget ":name" between :start and :end',

From e84b37fc66f11a7a1c765cf1d20521b933c46943 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Mon, 14 Aug 2017 23:50:14 +0200
Subject: [PATCH 018/668] New translations firefly.php (French)

---
 resources/lang/fr_FR/firefly.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/resources/lang/fr_FR/firefly.php b/resources/lang/fr_FR/firefly.php
index a4c53bdb81..e6caa63b6f 100644
--- a/resources/lang/fr_FR/firefly.php
+++ b/resources/lang/fr_FR/firefly.php
@@ -105,12 +105,12 @@ return [
     'all_periods'                                => 'Toutes les périodes',
     'current_period'                             => 'Période en cours',
     'show_the_current_period_and_overview'       => 'Afficher l’exercice en cours et sa vue d’ensemble',
-    'pref_languages_locale'                      => 'For a language other than English to work properly, your operating system must be equipped with the correct locale-information. If these are not present, currency data, dates and amounts may be formatted wrong.',
-    'budget_in_period'                           => 'All transactions for budget ":name" between :start and :end',
-    'chart_budget_in_period'                     => 'Chart for all transactions for budget ":name" between :start and :end',
-    'chart_account_in_period'                    => 'Chart for all transactions for account ":name" between :start and :end',
-    'chart_category_in_period'                   => 'Chart for all transactions for category ":name" between :start and :end',
-    'chart_category_all'                         => 'Chart for all transactions for category ":name"',
+    'pref_languages_locale'                      => 'Pour une langue autre que l’anglais pour fonctionner correctement, votre système d’exploitation doit être équipé avec les paramètres régionaux correctes. Si ils ne sont pas présents, les données de devises, les dates et les montants peuvent être mal formatés.',
+    'budget_in_period'                           => 'Toutes les transactions pour le budget ":name" entre :start et :end',
+    'chart_budget_in_period'                     => 'Graphique pour toutes les transactions pour le budget ":name" entre :start et :end',
+    'chart_account_in_period'                    => 'Graphique pour toutes les transactions pour le compte ":name" entre :start et :end',
+    'chart_category_in_period'                   => 'Graphique pour toutes les transactions pour la catégorie ":name" entre :start et :end',
+    'chart_category_all'                         => 'Graphique pour toutes les transactions pour la catégorie ":name"',
     'budget_in_period_breadcrumb'                => 'Entre :start et :end',
     'clone_withdrawal'                           => 'Cloner ce retrait',
     'clone_deposit'                              => 'Cloner ce dépôt',

From 7974319c7380b491a272e793884144cf40f97b49 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Tue, 15 Aug 2017 00:10:08 +0200
Subject: [PATCH 019/668] New translations firefly.php (French)

---
 resources/lang/fr_FR/firefly.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/lang/fr_FR/firefly.php b/resources/lang/fr_FR/firefly.php
index e6caa63b6f..61009dbb38 100644
--- a/resources/lang/fr_FR/firefly.php
+++ b/resources/lang/fr_FR/firefly.php
@@ -139,8 +139,8 @@ return [
     'all_journals_for_tag'                       => 'Toutes les transactions pour le tag ":tag"',
     'title_transfer_between'                     => 'Tous les transferts entre :start et :end',
     'all_journals_for_category'                  => 'Toutes les transactions pour la catégorie :name',
-    'all_journals_for_budget'                    => 'All transactions for budget :name',
-    'chart_all_journals_for_budget'              => 'Chart of all transactions for budget :name',
+    'all_journals_for_budget'                    => 'Toutes les transactions pour le budget :name',
+    'chart_all_journals_for_budget'              => 'Graphique pour toutes les transactions pour le budget :name',
     'journals_in_period_for_category'            => 'All transactions for category :name between :start and :end',
     'journals_in_period_for_tag'                 => 'All transactions for tag :tag between :start and :end',
     'not_available_demo_user'                    => 'The feature you try to access is not available to demo users.',

From f1081e058c44ec69d1112bdffc71904b9446754a Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Tue, 15 Aug 2017 00:20:07 +0200
Subject: [PATCH 020/668] New translations firefly.php (French)

---
 resources/lang/fr_FR/firefly.php | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/resources/lang/fr_FR/firefly.php b/resources/lang/fr_FR/firefly.php
index 61009dbb38..cca0521221 100644
--- a/resources/lang/fr_FR/firefly.php
+++ b/resources/lang/fr_FR/firefly.php
@@ -141,24 +141,24 @@ return [
     'all_journals_for_category'                  => 'Toutes les transactions pour la catégorie :name',
     'all_journals_for_budget'                    => 'Toutes les transactions pour le budget :name',
     'chart_all_journals_for_budget'              => 'Graphique pour toutes les transactions pour le budget :name',
-    'journals_in_period_for_category'            => 'All transactions for category :name between :start and :end',
-    'journals_in_period_for_tag'                 => 'All transactions for tag :tag between :start and :end',
-    'not_available_demo_user'                    => 'The feature you try to access is not available to demo users.',
-    'exchange_rate_instructions'                 => 'Asset account "@name" only accepts transactions in @native_currency. If you wish to use @foreign_currency instead, make sure that the amount in @native_currency is known as well:',
-    'transfer_exchange_rate_instructions'        => 'Source asset account "@source_name" only accepts transactions in @source_currency. Destination asset account "@dest_name" only accepts transactions in @dest_currency. You must provide the transferred amount correctly in both currencies.',
-    'transaction_data'                           => 'Transaction data',
+    'journals_in_period_for_category'            => 'Toutes les transactions pour la catégorie :name entre :start et :end',
+    'journals_in_period_for_tag'                 => 'Toutes les transactions de balise :tag entre :start et :end',
+    'not_available_demo_user'                    => 'La fonctionnalité que vous essayez d’accéder n’est pas disponible pour les utilisateurs de la démo.',
+    'exchange_rate_instructions'                 => 'Compte d’actif "@name" n’accepte que les transactions en @native_currency. Si vous souhaitez utiliser @foreign_currency à la place, assurez-vous que le montant en @native_currency est aussi bien connu :',
+    'transfer_exchange_rate_instructions'        => 'Compte d’actif source "@source_name" n’accepte que les transactions en @source_currency. Compte d’actif "@dest_name" de destination n’accepte que les transactions en @dest_currency. Vous devez fournir le montant transféré correctement dans les deux monnaies.',
+    'transaction_data'                           => 'Données de transaction',
 
     // search
     'search'                                     => 'Rechercher',
-    'search_found_transactions'                  => 'Number of transactions found:',
-    'general_search_error'                       => 'An error occured while searching. Please check the log files for more information.',
-    'search_box'                                 => 'Search',
-    'search_box_intro'                           => 'Welcome to the search function of Firefly III. Enter your search query in the box. Make sure you check out the help file because the search is pretty advanced.',
-    'search_error'                               => 'Error while searching',
-    'search_searching'                           => 'Searching ...',
+    'search_found_transactions'                  => 'Nombre de transactions trouvées :',
+    'general_search_error'                       => 'Une erreur s’est produite lors de la recherche. S’il vous plaît vérifiez les fichiers de log pour plus d’informations.',
+    'search_box'                                 => 'Chercher',
+    'search_box_intro'                           => 'Bienvenue à la fonction de recherche de Firefly III. Entrez votre requête de recherche dans la zone. Assurez-vous de consulter le fichier d’aide parce que la recherche est assez avancée.',
+    'search_error'                               => 'Erreur lors de la recherche',
+    'search_searching'                           => 'Recherche ...',
 
     // repeat frequencies:
-    'repeat_freq_yearly'                         => 'yearly',
+    'repeat_freq_yearly'                         => 'annuellement',
     'repeat_freq_monthly'                        => 'mensuel',
     'weekly'                                     => 'hebdomadaire',
     'quarterly'                                  => 'trimestriel',
@@ -258,7 +258,7 @@ return [
     'warning_transaction_subset'                 => 'Pour des raisons de performances cette liste est limitée à :max_num_transactions et peut n\'afficher qu\'une partie des opérations correspondantes',
     'warning_no_matching_transactions'           => 'Aucunes opérations correspondantes trouvées. Veuillez noter que pour des raisons de performances, seule les dernières :num_transactions opérations ont été vérifiées.',
     'warning_no_valid_triggers'                  => 'Aucun déclencheurs valide fourni.',
-    'apply_rule_selection'                       => 'Apply rule ":title" to a selection of your transactions',
+    'apply_rule_selection'                       => 'Appliquer la règle ":title" à une sélection de vos transactions',
     'apply_rule_selection_intro'                 => 'Rules like ":title" are normally only applied to new or updated transactions, but you can tell Firefly III to run it on a selection of your existing transactions. This can be useful when you have updated a rule and you need the changes to be applied to all of your other transactions.',
     'include_transactions_from_accounts'         => 'Iclure les opérations depuis ces comptes',
     'applied_rule_selection'                     => 'Rule ":title" has been applied to your selection.',

From 207b0194c24666dcb74c0406427d000d9763820b Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Tue, 15 Aug 2017 00:30:07 +0200
Subject: [PATCH 021/668] New translations firefly.php (French)

---
 resources/lang/fr_FR/firefly.php | 48 ++++++++++++++++----------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/resources/lang/fr_FR/firefly.php b/resources/lang/fr_FR/firefly.php
index cca0521221..033683119e 100644
--- a/resources/lang/fr_FR/firefly.php
+++ b/resources/lang/fr_FR/firefly.php
@@ -259,11 +259,11 @@ return [
     'warning_no_matching_transactions'           => 'Aucunes opérations correspondantes trouvées. Veuillez noter que pour des raisons de performances, seule les dernières :num_transactions opérations ont été vérifiées.',
     'warning_no_valid_triggers'                  => 'Aucun déclencheurs valide fourni.',
     'apply_rule_selection'                       => 'Appliquer la règle ":title" à une sélection de vos transactions',
-    'apply_rule_selection_intro'                 => 'Rules like ":title" are normally only applied to new or updated transactions, but you can tell Firefly III to run it on a selection of your existing transactions. This can be useful when you have updated a rule and you need the changes to be applied to all of your other transactions.',
+    'apply_rule_selection_intro'                 => 'Les règles comme ":title" ne s\'appliquent normalement qu\'aux transactions nouvelles ou mises à jour, mais vous pouvez dire à Firefly III de l’exécuter sur une sélection de vos transactions existantes. Cela peut être utile lorsque vous avez mis à jour une règle et vous avez besoin que les modifications soit appliqué à l’ensemble de vos autres transactions.',
     'include_transactions_from_accounts'         => 'Iclure les opérations depuis ces comptes',
-    'applied_rule_selection'                     => 'Rule ":title" has been applied to your selection.',
+    'applied_rule_selection'                     => 'La règle ":title" a été appliqué à votre sélection.',
     'execute'                                    => 'Executer',
-    'apply_rule_group_selection'                 => 'Apply rule group ":title" to a selection of your transactions',
+    'apply_rule_group_selection'                 => 'Appliquer le groupe de règles ":title" à une sélection de vos transactions',
     'apply_rule_group_selection_intro'           => 'Rule groups like ":title" are normally only applied to new or updated transactions, but you can tell Firefly III to run all the rules in this group on a selection of your existing transactions. This can be useful when you have updated a group of rules and you need the changes to be applied to all of your other transactions.',
     'applied_rule_group_selection'               => 'Rule group ":title" has been applied to your selection.',
 
@@ -278,7 +278,7 @@ return [
     'rule_trigger_to_account_is'                 => 'Le compte de destination est ":trigger_value"',
     'rule_trigger_to_account_contains'           => 'Le compte de destination contient ":trigger_value"',
     'rule_trigger_transaction_type'              => 'L\'opération est du type ":trigger_value"',
-    'rule_trigger_category_is'                   => 'Category is ":trigger_value"',
+    'rule_trigger_category_is'                   => 'La catégorie est ":trigger_value"',
     'rule_trigger_amount_less'                   => 'Le montant est inférieur à :trigger_value',
     'rule_trigger_amount_exactly'                => 'Le montant est :trigger_value',
     'rule_trigger_amount_more'                   => 'Le montant est supérieur à :trigger_value',
@@ -302,11 +302,11 @@ return [
     'rule_trigger_description_ends_choice'       => 'La description se termine par..',
     'rule_trigger_description_contains_choice'   => 'La description contient..',
     'rule_trigger_description_is_choice'         => 'La description est..',
-    'rule_trigger_category_is_choice'            => 'Category is..',
-    'rule_trigger_budget_is_choice'              => 'Budget is..',
-    'rule_trigger_tag_is_choice'                 => '(A) tag is..',
-    'rule_trigger_has_attachments_choice'        => 'Has at least this many attachments',
-    'rule_trigger_has_attachments'               => 'Has at least :trigger_value attachment(s)',
+    'rule_trigger_category_is_choice'            => 'La catégorie est..',
+    'rule_trigger_budget_is_choice'              => 'Le budget est..',
+    'rule_trigger_tag_is_choice'                 => '(A) le tag est..',
+    'rule_trigger_has_attachments_choice'        => 'À au moins autant de pièces jointes',
+    'rule_trigger_has_attachments'               => 'À au moins :trigger_value pièce(s) jointe(s)',
     'rule_trigger_store_journal'                 => 'Lorsqu’une transaction est créée',
     'rule_trigger_update_journal'                => 'Lorsqu’une transaction est mise à jour',
     'rule_action_set_category'                   => 'Définir la catégorie à ":action_value"',
@@ -329,10 +329,10 @@ return [
     'rule_action_set_description_choice'         => 'Définir la description à..',
     'rule_action_append_description_choice'      => 'Suffixer la description avec..',
     'rule_action_prepend_description_choice'     => 'Préfixer la description avec..',
-    'rule_action_set_source_account_choice'      => 'Set source account to...',
-    'rule_action_set_source_account'             => 'Set source account to :action_value',
-    'rule_action_set_destination_account_choice' => 'Set destination account to...',
-    'rule_action_set_destination_account'        => 'Set destination account to :action_value',
+    'rule_action_set_source_account_choice'      => 'Définissez le compte source à...',
+    'rule_action_set_source_account'             => 'Définir le compte source à :action_value',
+    'rule_action_set_destination_account_choice' => 'Définissez le compte de destination pour...',
+    'rule_action_set_destination_account'        => 'Définissez le compte de destination pour :action_value',
 
     // tags
     'store_new_tag'                              => 'Créer un nouveau tag',
@@ -370,9 +370,9 @@ return [
     'pref_two_factor_auth_remove_will_disable'   => '(cela désactivera également l\'authentification à deux facteurs)',
     'pref_save_settings'                         => 'Enregistrer les paramètres',
     'saved_preferences'                          => 'Préférences enregistrées!',
-    'preferences_general'                        => 'General',
-    'preferences_frontpage'                      => 'Home screen',
-    'preferences_security'                       => 'Security',
+    'preferences_general'                        => 'Général',
+    'preferences_frontpage'                      => 'Écran d\'accueil',
+    'preferences_security'                       => 'Sécurité',
     'preferences_layout'                         => 'Layout',
     'pref_home_show_deposits'                    => 'Show deposits on the home screen',
     'pref_home_show_deposits_info'               => 'The home screen already shows your expense accounts. Should it also show your revenue accounts?',
@@ -839,21 +839,21 @@ return [
     'period'                                     => 'Période',
     'balance'                                    => 'Balance',
     'summary'                                    => 'Summary',
-    'sum'                                        => 'Sum',
-    'average'                                    => 'Average',
-    'balanceFor'                                 => 'Balance for :name',
+    'sum'                                        => 'Somme',
+    'average'                                    => 'Moyenne',
+    'balanceFor'                                 => 'Balance pour :name',
 
     // piggy banks:
-    'add_money_to_piggy'                         => 'Add money to piggy bank ":name"',
+    'add_money_to_piggy'                         => 'Ajouter de l’argent à la tirelire ":name"',
     'piggy_bank'                                 => 'Tirelire',
-    'new_piggy_bank'                             => 'New piggy bank',
+    'new_piggy_bank'                             => 'Nouvelle tirelire',
     'store_piggy_bank'                           => 'Créer une nouvelle tirelire',
     'stored_piggy_bank'                          => 'Créer une nouvelle tirelire ":name"',
     'account_status'                             => 'Statut du compte',
-    'left_for_piggy_banks'                       => 'Left for piggy banks',
+    'left_for_piggy_banks'                       => 'Reste pour les tirelires',
     'sum_of_piggy_banks'                         => 'Somme des tirelires',
-    'saved_so_far'                               => 'Saved so far',
-    'left_to_save'                               => 'Left to save',
+    'saved_so_far'                               => 'Enregistré jusqu\'à présent',
+    'left_to_save'                               => 'Reste à sauver',
     'suggested_amount'                           => 'Suggested monthly amount to save',
     'add_money_to_piggy_title'                   => 'Add money to piggy bank ":name"',
     'remove_money_from_piggy_title'              => 'Remove money from piggy bank ":name"',

From 7bb5d243a0db302c7058040739bd5c75b9d2a406 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Tue, 15 Aug 2017 00:40:07 +0200
Subject: [PATCH 022/668] New translations firefly.php (French)

---
 resources/lang/fr_FR/firefly.php | 54 ++++++++++++++++----------------
 1 file changed, 27 insertions(+), 27 deletions(-)

diff --git a/resources/lang/fr_FR/firefly.php b/resources/lang/fr_FR/firefly.php
index 033683119e..4dfc3802d2 100644
--- a/resources/lang/fr_FR/firefly.php
+++ b/resources/lang/fr_FR/firefly.php
@@ -373,20 +373,20 @@ return [
     'preferences_general'                        => 'Général',
     'preferences_frontpage'                      => 'Écran d\'accueil',
     'preferences_security'                       => 'Sécurité',
-    'preferences_layout'                         => 'Layout',
-    'pref_home_show_deposits'                    => 'Show deposits on the home screen',
-    'pref_home_show_deposits_info'               => 'The home screen already shows your expense accounts. Should it also show your revenue accounts?',
-    'pref_home_do_show_deposits'                 => 'Yes, show them',
-    'successful_count'                           => 'of which :count successful',
+    'preferences_layout'                         => 'Mise en Page',
+    'pref_home_show_deposits'                    => 'Afficher les dépôts sur l\'écran d\'accueil',
+    'pref_home_show_deposits_info'               => 'L\'écran d\'accueil affiche déjà vos comptes de dépenses. Devrait-il aussi afficher vos comptes de revenus?',
+    'pref_home_do_show_deposits'                 => 'Oui, montrez-les',
+    'successful_count'                           => 'dont :count avec succès',
     'transaction_page_size_title'                => 'Taille de la page',
     'transaction_page_size_help'                 => 'N’importe quelle liste de transactions montre au plus ce nombre de transactions',
     'transaction_page_size_label'                => 'Taille de la page',
     'between_dates'                              => '(:start et :end)',
     'pref_optional_fields_transaction'           => 'Champs optionnels pour les transactions',
-    'pref_optional_fields_transaction_help'      => 'By default not all fields are enabled when creating a new transaction (because of the clutter). Below, you can enable these fields if you think they could be useful for you. Of course, any field that is disabled, but already filled in, will be visible regardless of the setting.',
+    'pref_optional_fields_transaction_help'      => 'Par défaut, tous les champs ne sont pas activés lors de la création d\'une nouvelle transaction (en raison du désordre). Ci-dessous, vous pouvez activer ces champs si vous pensez qu\'ils pourraient vous être utiles. Bien sûr, tout domaine désactivé, mais déjà rempli, sera visible quel que soit le paramètre.',
     'optional_tj_date_fields'                    => 'Champ date',
     'optional_tj_business_fields'                => 'Champs professionnels',
-    'optional_tj_attachment_fields'              => 'Attachment fields',
+    'optional_tj_attachment_fields'              => 'Champs de pièces jointes',
     'pref_optional_tj_interest_date'             => 'Date des intérêts',
     'pref_optional_tj_book_date'                 => 'Date de réservation',
     'pref_optional_tj_process_date'              => 'Date de traitement',
@@ -854,38 +854,38 @@ return [
     'sum_of_piggy_banks'                         => 'Somme des tirelires',
     'saved_so_far'                               => 'Enregistré jusqu\'à présent',
     'left_to_save'                               => 'Reste à sauver',
-    'suggested_amount'                           => 'Suggested monthly amount to save',
-    'add_money_to_piggy_title'                   => 'Add money to piggy bank ":name"',
-    'remove_money_from_piggy_title'              => 'Remove money from piggy bank ":name"',
-    'add'                                        => 'Add',
+    'suggested_amount'                           => 'Montant mensuel suggéré à enregistrer',
+    'add_money_to_piggy_title'                   => 'Ajouter de l’argent à la tirelire ":name"',
+    'remove_money_from_piggy_title'              => 'Retirer l’argent de la tirelire ":name"',
+    'add'                                        => 'Ajouter',
 
-    'remove'                     => 'Remove',
+    'remove'                     => 'Enlever',
     'max_amount_add'             => 'Le montant maximum que vous pouvez ajouter est',
     'max_amount_remove'          => 'Le montant maximum que vous pouvez supprimer est',
-    'update_piggy_button'        => 'Update piggy bank',
-    'update_piggy_title'         => 'Update piggy bank ":name"',
-    'updated_piggy_bank'         => 'Updated piggy bank ":name"',
+    'update_piggy_button'        => 'Mise à jour tirelire',
+    'update_piggy_title'         => 'Mise à jour de tirelire ":name"',
+    'updated_piggy_bank'         => 'Mise à jour de la tirelire ":name"',
     'details'                    => 'Détails',
     'events'                     => 'Evènements',
     'target_amount'              => 'Montant cible',
     'start_date'                 => 'Date de début',
     'target_date'                => 'Date cible',
     'no_target_date'             => 'Aucune date butoir',
-    'todo'                       => 'to do',
-    'table'                      => 'Table',
-    'piggy_bank_not_exists'      => 'Piggy bank no longer exists.',
-    'add_any_amount_to_piggy'    => 'Add money to this piggy bank to reach your target of :amount.',
-    'add_set_amount_to_piggy'    => 'Add :amount to fill this piggy bank on :date',
-    'delete_piggy_bank'          => 'Delete piggy bank ":name"',
-    'cannot_add_amount_piggy'    => 'Could not add :amount to ":name".',
-    'cannot_remove_from_piggy'   => 'Could not remove :amount from ":name".',
+    'todo'                       => 'à faire',
+    'table'                      => 'Tableau',
+    'piggy_bank_not_exists'      => 'La tirelire n’existe plus.',
+    'add_any_amount_to_piggy'    => 'Ajouter de l’argent pour cette tirelire pour atteindre votre objectif de :amount.',
+    'add_set_amount_to_piggy'    => 'Ajouter :amount pour remplir cette tirelire au :date',
+    'delete_piggy_bank'          => 'Supprimer la tirelire ":name"',
+    'cannot_add_amount_piggy'    => 'Impossible d\'ajouter :amount à ":name".',
+    'cannot_remove_from_piggy'   => 'Impossible de supprimer :amount à ":name".',
     'deleted_piggy_bank'         => 'Tirelire ":name" supprimée',
-    'added_amount_to_piggy'      => 'Added :amount to ":name"',
-    'removed_amount_from_piggy'  => 'Removed :amount from ":name"',
-    'cannot_remove_amount_piggy' => 'Could not remove :amount from ":name".',
+    'added_amount_to_piggy'      => 'Ajouté :amount à ":name"',
+    'removed_amount_from_piggy'  => 'Supprimé :amount du ":name"',
+    'cannot_remove_amount_piggy' => 'Impossible de supprimer :amount de ":name".',
 
     // tags
-    'regular_tag'                => 'Just a regular tag.',
+    'regular_tag'                => 'Juste une balise ordinaire.',
     'balancing_act'              => 'Un tag prend au maximum deux opérations : une dépense et un transfert. Ils s\'équilibreront mutuellement.',
     'advance_payment'            => 'Un tag accepte une dépense et un nombre quelconque de dépôts visant à rembourser la dépense originale.',
     'delete_tag'                 => 'Supprimer le tag ":tag"',

From 298e6d38a02097bea1de634f4e44f06586e645b1 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Tue, 15 Aug 2017 00:50:07 +0200
Subject: [PATCH 023/668] New translations firefly.php (French)

---
 resources/lang/fr_FR/firefly.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/resources/lang/fr_FR/firefly.php b/resources/lang/fr_FR/firefly.php
index 4dfc3802d2..d21d621daa 100644
--- a/resources/lang/fr_FR/firefly.php
+++ b/resources/lang/fr_FR/firefly.php
@@ -397,7 +397,7 @@ return [
     'pref_optional_tj_notes'                     => 'Notes',
     'pref_optional_tj_attachments'               => 'Pièces jointes',
     'optional_field_meta_dates'                  => 'Dates',
-    'optional_field_meta_business'               => 'Business',
+    'optional_field_meta_business'               => 'Commerce',
     'optional_field_attachments'                 => 'Pièces jointes',
     'optional_field_meta_data'                   => 'Métadonnées facultatives',
 
@@ -418,9 +418,9 @@ return [
     'password_changed'                           => 'Mot de passe modifié!',
     'should_change'                              => 'L’idée est de changer votre mot de passe.',
     'invalid_password'                           => 'Mot de passe incorrect!',
-    'what_is_pw_security'                        => 'What is "verify password security"?',
-    'secure_pw_title'                            => 'How to choose a secure password',
-    'secure_pw_history'                          => 'In August 2017 well known security researcher Troy Hunt released a list of 306 million stolen passwords. These passwords were stolen during breakins at companies like LinkedIn, Adobe and NeoPets (and many more).',
+    'what_is_pw_security'                        => 'Qu\'est-ce que "vérifier la sécurité du mot de passe" ?',
+    'secure_pw_title'                            => 'Comment choisir un mot de passe sécurisé',
+    'secure_pw_history'                          => 'En août 2017, le réputé chercheur en sécurité Troy Hunt a publié une liste de 306 millions de mots de passe volés. Ces mots de passe ont été volés lors de cambriolages à des entreprises comme LinkedIn, Adobe et NeoPets (et bien d’autres).',
     'secure_pw_check_box'                        => 'By checking the box, Firefly III will send the SHA1 hash of your password to <a href="https://www.troyhunt.com/introducing-306-million-freely-downloadable-pwned-passwords/">the website of Troy Hunt</a> to see if it is on the list. This will stop you from using unsafe passwords as is recommended in the latest <a href="https://pages.nist.gov/800-63-3/sp800-63b.html">NIST Special Publication</a> on this subject.',
     'secure_pw_sha1'                             => 'But I thought SHA1 was broken?',
     'secure_pw_hash_speed'                       => 'Yes, but not in this context. As you can read on <a href="https://shattered.io/">the website detailing how they broke SHA1</a>, it is now slightly easier to find a "collision": another string that results in the same SHA1-hash. It now only takes 10,000 years using a single-GPU machine.',

From ddf0ee997208d9b959eec0f1a7c3c9394f5f1bfe Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Tue, 15 Aug 2017 01:00:07 +0200
Subject: [PATCH 024/668] New translations firefly.php (French)

---
 resources/lang/fr_FR/firefly.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/resources/lang/fr_FR/firefly.php b/resources/lang/fr_FR/firefly.php
index d21d621daa..6a7cd02efc 100644
--- a/resources/lang/fr_FR/firefly.php
+++ b/resources/lang/fr_FR/firefly.php
@@ -421,11 +421,11 @@ return [
     'what_is_pw_security'                        => 'Qu\'est-ce que "vérifier la sécurité du mot de passe" ?',
     'secure_pw_title'                            => 'Comment choisir un mot de passe sécurisé',
     'secure_pw_history'                          => 'En août 2017, le réputé chercheur en sécurité Troy Hunt a publié une liste de 306 millions de mots de passe volés. Ces mots de passe ont été volés lors de cambriolages à des entreprises comme LinkedIn, Adobe et NeoPets (et bien d’autres).',
-    'secure_pw_check_box'                        => 'By checking the box, Firefly III will send the SHA1 hash of your password to <a href="https://www.troyhunt.com/introducing-306-million-freely-downloadable-pwned-passwords/">the website of Troy Hunt</a> to see if it is on the list. This will stop you from using unsafe passwords as is recommended in the latest <a href="https://pages.nist.gov/800-63-3/sp800-63b.html">NIST Special Publication</a> on this subject.',
-    'secure_pw_sha1'                             => 'But I thought SHA1 was broken?',
-    'secure_pw_hash_speed'                       => 'Yes, but not in this context. As you can read on <a href="https://shattered.io/">the website detailing how they broke SHA1</a>, it is now slightly easier to find a "collision": another string that results in the same SHA1-hash. It now only takes 10,000 years using a single-GPU machine.',
-    'secure_pw_hash_security'                    => 'This collision would not be equal to your password, nor would it be useful on (a site like) Firefly III. This application does not use SHA1 for password verification. So it is safe to check this box. Your password is hashed and sent over HTTPS.',
-    'secure_pw_should'                           => 'Should I check the box?',
+    'secure_pw_check_box'                        => 'En cochant la case, Firefly III enverra l\'empreinte SHA1 de votre mot de passe au <a href="https://www.troyhunt.com/introducing-306-million-freely-downloadable-pwned-passwords/">site Web de Troy Hunt</a> pour voir si c’est sur la liste. Cela vous empêchera d\'utiliser des mots de passe dangereux comme cela est recommandé dans les dernières <a href="https://pages.nist.gov/800-63-3/sp800-63b.html">NIST Special Publication</a> à ce sujet.',
+    'secure_pw_sha1'                             => 'Mais je pensais que SHA1 était cassé ?',
+    'secure_pw_hash_speed'                       => 'Oui, mais pas dans ce contexte. Comme vous pouvez le lire sur <a href="https://shattered.io/"> le site Web détaillant comment ils ont cassé SHA1</a>, c’est maintenant légèrement plus facile de trouver une « collision » : une autre chaîne qui aboutit à la même empreinte SHA1. Maintenant, cela prend seulement 10 000 ans, à l’aide d’une machine mono-GPU.',
+    'secure_pw_hash_security'                    => 'Cette collision ne serait pas égale à votre mot de passe, et ne serait pas utile sur (un site comme) Firefly III. Cette application n\'utilise pas SHA1 pour la vérification du mot de passe. Il est donc sûr de cocher cette case. Votre mot de passe est haché et envoyé par HTTPS.',
+    'secure_pw_should'                           => 'Dois-je cocher la case ?',
     'secure_pw_long_password'                    => 'If you just generated a long, single-use password for Firefly III using some kind of password generator: <strong>no</strong>.',
     'secure_pw_short'                            => 'If you just entered the password you always use: <em>Please yes</em>.',
 

From 56f7ca388d34e55467fab71852356ca41883d177 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Tue, 15 Aug 2017 01:10:06 +0200
Subject: [PATCH 025/668] New translations firefly.php (French)

---
 resources/lang/fr_FR/firefly.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/lang/fr_FR/firefly.php b/resources/lang/fr_FR/firefly.php
index 6a7cd02efc..c0f1154017 100644
--- a/resources/lang/fr_FR/firefly.php
+++ b/resources/lang/fr_FR/firefly.php
@@ -426,8 +426,8 @@ return [
     'secure_pw_hash_speed'                       => 'Oui, mais pas dans ce contexte. Comme vous pouvez le lire sur <a href="https://shattered.io/"> le site Web détaillant comment ils ont cassé SHA1</a>, c’est maintenant légèrement plus facile de trouver une « collision » : une autre chaîne qui aboutit à la même empreinte SHA1. Maintenant, cela prend seulement 10 000 ans, à l’aide d’une machine mono-GPU.',
     'secure_pw_hash_security'                    => 'Cette collision ne serait pas égale à votre mot de passe, et ne serait pas utile sur (un site comme) Firefly III. Cette application n\'utilise pas SHA1 pour la vérification du mot de passe. Il est donc sûr de cocher cette case. Votre mot de passe est haché et envoyé par HTTPS.',
     'secure_pw_should'                           => 'Dois-je cocher la case ?',
-    'secure_pw_long_password'                    => 'If you just generated a long, single-use password for Firefly III using some kind of password generator: <strong>no</strong>.',
-    'secure_pw_short'                            => 'If you just entered the password you always use: <em>Please yes</em>.',
+    'secure_pw_long_password'                    => 'Si vous venez de générer un long mot de passe unique pour Firefly III à l\'aide d\'un type de générateur de mot de passe : <strong>no</strong>.',
+    'secure_pw_short'                            => 'Si vous venez d\'entrer le mot de passe que vous utilisez toujours : <em>S\'il vous plaît, oui</em>.',
 
 
     // attachments

From 3d58a0c0f39fc63e3c2bd05daf6edd5cb80d681c Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Tue, 15 Aug 2017 01:20:07 +0200
Subject: [PATCH 026/668] New translations firefly.php (French)

---
 resources/lang/fr_FR/firefly.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/lang/fr_FR/firefly.php b/resources/lang/fr_FR/firefly.php
index c0f1154017..43d9fdfdc2 100644
--- a/resources/lang/fr_FR/firefly.php
+++ b/resources/lang/fr_FR/firefly.php
@@ -597,8 +597,8 @@ return [
     'select_more_than_one_category'              => 'Please select more than one category',
     'select_more_than_one_budget'                => 'Please select more than one budget',
     'select_more_than_one_tag'                   => 'Please select more than one tag',
-    'from_to'                                    => 'From :start to :end',
-    'from_to_breadcrumb'                         => 'from :start to :end',
+    'from_to'                                    => 'De :start à :end',
+    'from_to_breadcrumb'                         => 'de :start à :end',
     'account_default_currency'                   => 'If you select another currency, new transactions from this account will have this currency pre-selected.',
 
     // categories:

From 08e5b018b83748b4cfbf85b6160f7b4c9847ca4f Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Tue, 15 Aug 2017 01:20:08 +0200
Subject: [PATCH 027/668] New translations csv.php (French)

---
 resources/lang/fr_FR/csv.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/fr_FR/csv.php b/resources/lang/fr_FR/csv.php
index afd0dbf930..7a3eb6206f 100644
--- a/resources/lang/fr_FR/csv.php
+++ b/resources/lang/fr_FR/csv.php
@@ -77,7 +77,7 @@ return [
     'column_sepa-ct-op'             => 'SEPA Transfert Crédit compte opposé',
     'column_sepa-db'                => 'SEPA débit immédiat',
     'column_tags-comma'             => 'Tags (séparé par des virgules)',
-    'column_tags-space'             => 'Tags(séparé par des espaces)',
+    'column_tags-space'             => 'Tags (séparé par des espaces)',
     'column_account-number'         => 'Compte d’actif (numéro de compte)',
     'column_opposing-number'        => 'Compte destination (numéro de compte)',
 ];
\ No newline at end of file

From bd8afc67ddc367c8cc7e6bee7882e4729fdcbe2f Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Tue, 15 Aug 2017 10:00:14 +0200
Subject: [PATCH 028/668] New translations firefly.php (French)

---
 resources/lang/fr_FR/firefly.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/resources/lang/fr_FR/firefly.php b/resources/lang/fr_FR/firefly.php
index 43d9fdfdc2..d4a2409fca 100644
--- a/resources/lang/fr_FR/firefly.php
+++ b/resources/lang/fr_FR/firefly.php
@@ -449,9 +449,9 @@ return [
     'title_transfers'                            => 'Transferts',
 
     // convert stuff:
-    'convert_is_already_type_Withdrawal'         => 'This transaction is already a withdrawal',
-    'convert_is_already_type_Deposit'            => 'This transaction is already a deposit',
-    'convert_is_already_type_Transfer'           => 'This transaction is already a transfer',
+    'convert_is_already_type_Withdrawal'         => 'Cette transaction est déjà un retrait',
+    'convert_is_already_type_Deposit'            => 'Cette transaction est déjà un dépôt',
+    'convert_is_already_type_Transfer'           => 'Cette transaction est déjà un transfert',
     'convert_to_Withdrawal'                      => 'Convert ":description" to a withdrawal',
     'convert_to_Deposit'                         => 'Convert ":description" to a deposit',
     'convert_to_Transfer'                        => 'Convert ":description" to a transfer',
@@ -461,7 +461,7 @@ return [
     'convert_options_DepositWithdrawal'          => 'Convert a deposit into a withdrawal',
     'convert_options_TransferWithdrawal'         => 'Convert a transfer into a withdrawal',
     'convert_options_TransferDeposit'            => 'Convert a transfer into a deposit',
-    'transaction_journal_convert_options'        => 'Convert this transaction',
+    'transaction_journal_convert_options'        => 'Convertir cette transaction',
     'convert_Withdrawal_to_deposit'              => 'Convert this withdrawal to a deposit',
     'convert_Withdrawal_to_transfer'             => 'Convert this withdrawal to a transfer',
     'convert_Deposit_to_withdrawal'              => 'Convert this deposit to a withdrawal',

From 0b2c3d7ca82b62f89003ad89ffff30579849b7b9 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Tue, 15 Aug 2017 10:10:22 +0200
Subject: [PATCH 029/668] New translations firefly.php (French)

---
 resources/lang/fr_FR/firefly.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/resources/lang/fr_FR/firefly.php b/resources/lang/fr_FR/firefly.php
index d4a2409fca..8d02ce65dd 100644
--- a/resources/lang/fr_FR/firefly.php
+++ b/resources/lang/fr_FR/firefly.php
@@ -452,9 +452,9 @@ return [
     'convert_is_already_type_Withdrawal'         => 'Cette transaction est déjà un retrait',
     'convert_is_already_type_Deposit'            => 'Cette transaction est déjà un dépôt',
     'convert_is_already_type_Transfer'           => 'Cette transaction est déjà un transfert',
-    'convert_to_Withdrawal'                      => 'Convert ":description" to a withdrawal',
-    'convert_to_Deposit'                         => 'Convert ":description" to a deposit',
-    'convert_to_Transfer'                        => 'Convert ":description" to a transfer',
+    'convert_to_Withdrawal'                      => 'Convertir ":description" vers un retrait',
+    'convert_to_Deposit'                         => 'Convertir ":description" vers un dépôt',
+    'convert_to_Transfer'                        => 'Convertir ":description" vers un transfert',
     'convert_options_WithdrawalDeposit'          => 'Convert a withdrawal into a deposit',
     'convert_options_WithdrawalTransfer'         => 'Convert a withdrawal into a transfer',
     'convert_options_DepositTransfer'            => 'Convert a deposit into a transfer',
@@ -462,9 +462,9 @@ return [
     'convert_options_TransferWithdrawal'         => 'Convert a transfer into a withdrawal',
     'convert_options_TransferDeposit'            => 'Convert a transfer into a deposit',
     'transaction_journal_convert_options'        => 'Convertir cette transaction',
-    'convert_Withdrawal_to_deposit'              => 'Convert this withdrawal to a deposit',
-    'convert_Withdrawal_to_transfer'             => 'Convert this withdrawal to a transfer',
-    'convert_Deposit_to_withdrawal'              => 'Convert this deposit to a withdrawal',
+    'convert_Withdrawal_to_deposit'              => 'Convertir ce retrait en dépôt',
+    'convert_Withdrawal_to_transfer'             => 'Convertir ce retrait en transfert',
+    'convert_Deposit_to_withdrawal'              => 'Convertir ce dépôt en retrait',
     'convert_Deposit_to_transfer'                => 'Convert this deposit to a transfer',
     'convert_Transfer_to_deposit'                => 'Convert this transfer to a deposit',
     'convert_Transfer_to_withdrawal'             => 'Convert this transfer to a withdrawal',

From 59a7feafef825799a636667d8e3d5c7de8b3ee0f Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Tue, 15 Aug 2017 16:30:08 +0200
Subject: [PATCH 030/668] New translations firefly.php (French)

---
 resources/lang/fr_FR/firefly.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/fr_FR/firefly.php b/resources/lang/fr_FR/firefly.php
index 8d02ce65dd..abf989d52b 100644
--- a/resources/lang/fr_FR/firefly.php
+++ b/resources/lang/fr_FR/firefly.php
@@ -264,7 +264,7 @@ return [
     'applied_rule_selection'                     => 'La règle ":title" a été appliqué à votre sélection.',
     'execute'                                    => 'Executer',
     'apply_rule_group_selection'                 => 'Appliquer le groupe de règles ":title" à une sélection de vos transactions',
-    'apply_rule_group_selection_intro'           => 'Rule groups like ":title" are normally only applied to new or updated transactions, but you can tell Firefly III to run all the rules in this group on a selection of your existing transactions. This can be useful when you have updated a group of rules and you need the changes to be applied to all of your other transactions.',
+    'apply_rule_group_selection_intro'           => 'Les groupes de règles comme ":titre" ne s\'appliquent normalement qu\'aux transactions nouvelles ou mises à jour, mais vous pouvez dire à Firefly III d\'exécuter toutes les règles de ce groupe sur une sélection de vos transactions existantes. Cela peut être utile lorsque vous avez mis à jour un groupe de règles et que vous avez besoin des modifications à appliquer à toutes vos autres transactions.',
     'applied_rule_group_selection'               => 'Rule group ":title" has been applied to your selection.',
 
     // actions and triggers

From 253a98143c2fc400eee235948fb9d1787fac81d8 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Tue, 15 Aug 2017 16:40:08 +0200
Subject: [PATCH 031/668] New translations firefly.php (French)

---
 resources/lang/fr_FR/firefly.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/fr_FR/firefly.php b/resources/lang/fr_FR/firefly.php
index abf989d52b..c4728c927e 100644
--- a/resources/lang/fr_FR/firefly.php
+++ b/resources/lang/fr_FR/firefly.php
@@ -265,7 +265,7 @@ return [
     'execute'                                    => 'Executer',
     'apply_rule_group_selection'                 => 'Appliquer le groupe de règles ":title" à une sélection de vos transactions',
     'apply_rule_group_selection_intro'           => 'Les groupes de règles comme ":titre" ne s\'appliquent normalement qu\'aux transactions nouvelles ou mises à jour, mais vous pouvez dire à Firefly III d\'exécuter toutes les règles de ce groupe sur une sélection de vos transactions existantes. Cela peut être utile lorsque vous avez mis à jour un groupe de règles et que vous avez besoin des modifications à appliquer à toutes vos autres transactions.',
-    'applied_rule_group_selection'               => 'Rule group ":title" has been applied to your selection.',
+    'applied_rule_group_selection'               => 'Le groupe de règles ":title" a été appliqué à votre sélection.',
 
     // actions and triggers
     'rule_trigger_user_action'                   => 'L\'action de l’utilisateur est ": trigger_value"',

From e5afcbd013b84c97795f601c6ae3aa70b1a76928 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Tue, 15 Aug 2017 16:50:07 +0200
Subject: [PATCH 032/668] New translations firefly.php (French)

---
 resources/lang/fr_FR/firefly.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/fr_FR/firefly.php b/resources/lang/fr_FR/firefly.php
index c4728c927e..2f342384a0 100644
--- a/resources/lang/fr_FR/firefly.php
+++ b/resources/lang/fr_FR/firefly.php
@@ -455,7 +455,7 @@ return [
     'convert_to_Withdrawal'                      => 'Convertir ":description" vers un retrait',
     'convert_to_Deposit'                         => 'Convertir ":description" vers un dépôt',
     'convert_to_Transfer'                        => 'Convertir ":description" vers un transfert',
-    'convert_options_WithdrawalDeposit'          => 'Convert a withdrawal into a deposit',
+    'convert_options_WithdrawalDeposit'          => 'Convertir un retrait en dépôt',
     'convert_options_WithdrawalTransfer'         => 'Convert a withdrawal into a transfer',
     'convert_options_DepositTransfer'            => 'Convert a deposit into a transfer',
     'convert_options_DepositWithdrawal'          => 'Convert a deposit into a withdrawal',

From 34894fb76b86e2dc29dc791308691ea2ffaa0c81 Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Tue, 15 Aug 2017 17:26:43 +0200
Subject: [PATCH 033/668] Add some comments [skip ci]

---
 app/Console/Commands/CreateImport.php               |  4 ++++
 app/Console/Commands/Import.php                     |  4 +++-
 app/Console/Commands/UpgradeDatabase.php            | 11 +++++------
 app/Console/Commands/UpgradeFireflyInstructions.php |  8 +++++++-
 app/Console/Commands/UseEncryption.php              |  5 ++++-
 app/Console/Commands/VerifyDatabase.php             |  8 ++++++--
 6 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/app/Console/Commands/CreateImport.php b/app/Console/Commands/CreateImport.php
index f155d9add0..191f361582 100644
--- a/app/Console/Commands/CreateImport.php
+++ b/app/Console/Commands/CreateImport.php
@@ -54,6 +54,8 @@ class CreateImport extends Command
     }
 
     /**
+     * Run the command.
+     *
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength) // cannot be helped
      * @SuppressWarnings(PHPMD.CyclomaticComplexity) // it's five exactly.
      */
@@ -133,6 +135,8 @@ class CreateImport extends Command
     }
 
     /**
+     * Verify user inserts correct arguments.
+     *
      * @return bool
      * @SuppressWarnings(PHPMD.CyclomaticComplexity) // it's five exactly.
      */
diff --git a/app/Console/Commands/Import.php b/app/Console/Commands/Import.php
index f37203cc41..b77dddf0fc 100644
--- a/app/Console/Commands/Import.php
+++ b/app/Console/Commands/Import.php
@@ -51,7 +51,7 @@ class Import extends Command
     }
 
     /**
-     *
+     * Run the import routine.
      */
     public function handle()
     {
@@ -91,6 +91,8 @@ class Import extends Command
     }
 
     /**
+     * Check if job is valid to be imported.
+     *
      * @param ImportJob $job
      *
      * @return bool
diff --git a/app/Console/Commands/UpgradeDatabase.php b/app/Console/Commands/UpgradeDatabase.php
index 90d2434d76..59065e4d6c 100644
--- a/app/Console/Commands/UpgradeDatabase.php
+++ b/app/Console/Commands/UpgradeDatabase.php
@@ -26,15 +26,14 @@ use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Models\TransactionType;
 use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
 use Illuminate\Console\Command;
-use Illuminate\Database\Query\JoinClause;
 use Illuminate\Database\QueryException;
 use Log;
 use Preferences;
 use Schema;
-use Steam;
 
 /**
  * Class UpgradeDatabase
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects) // it just touches a lot of things.
  *
  * @package FireflyIII\Console\Commands
@@ -74,8 +73,8 @@ class UpgradeDatabase extends Command
         $this->updateTransferCurrencies();
         $this->updateOtherCurrencies();
         $this->info('Firefly III database is up to date.');
-        return;
 
+        return;
 
 
     }
@@ -136,8 +135,7 @@ class UpgradeDatabase extends Command
     }
 
     /**
-     * Each (asset) account must have a reference to a preferred currency. If the account does not have one, it's forced upon
-     * the account.
+     * Each (asset) account must have a reference to a preferred currency. If the account does not have one, it's forced upon the account.
      */
     public function updateAccountCurrencies(): void
     {
@@ -193,7 +191,7 @@ class UpgradeDatabase extends Command
      * Both source and destination must match the respective currency preference of the related asset account.
      * So FF3 must verify all transactions.
      */
-    public function updateOtherCurrencies()
+    public function updateOtherCurrencies(): void
     {
         /** @var CurrencyRepositoryInterface $repository */
         $repository = app(CurrencyRepositoryInterface::class);
@@ -241,6 +239,7 @@ class UpgradeDatabase extends Command
                 $journal->save();
             }
         );
+
         return;
     }
 
diff --git a/app/Console/Commands/UpgradeFireflyInstructions.php b/app/Console/Commands/UpgradeFireflyInstructions.php
index 363e5089f7..bed25e3e0e 100644
--- a/app/Console/Commands/UpgradeFireflyInstructions.php
+++ b/app/Console/Commands/UpgradeFireflyInstructions.php
@@ -84,6 +84,9 @@ class UpgradeFireflyInstructions extends Command
         }
     }
 
+    /**
+     * Render instructions.
+     */
     private function installInstructions()
     {
         /** @var string $version */
@@ -102,7 +105,7 @@ class UpgradeFireflyInstructions extends Command
         $this->boxed('');
         if (is_null($text)) {
 
-            $this->boxed(sprintf('Thank you for installin Firefly III, v%s!', $version));
+            $this->boxed(sprintf('Thank you for installing Firefly III, v%s!', $version));
             $this->boxedInfo('There are no extra installation instructions.');
             $this->boxed('Firefly III should be ready for use.');
             $this->boxed('');
@@ -131,6 +134,9 @@ class UpgradeFireflyInstructions extends Command
 
     }
 
+    /**
+     * Render upgrade instructions.
+     */
     private function updateInstructions()
     {
         /** @var string $version */
diff --git a/app/Console/Commands/UseEncryption.php b/app/Console/Commands/UseEncryption.php
index 89e6bf012d..5cf80aff32 100644
--- a/app/Console/Commands/UseEncryption.php
+++ b/app/Console/Commands/UseEncryption.php
@@ -16,6 +16,8 @@ use Illuminate\Support\Str;
 
 /**
  * Class UseEncryption
+ *
+ * @package FireflyIII\Console\Commands
  */
 class UseEncryption extends Command
 {
@@ -46,7 +48,6 @@ class UseEncryption extends Command
      */
     public function handle()
     {
-        //
         $this->handleObjects('Account', 'name', 'encrypted');
         $this->handleObjects('Bill', 'name', 'name_encrypted');
         $this->handleObjects('Bill', 'match', 'match_encrypted');
@@ -57,6 +58,8 @@ class UseEncryption extends Command
     }
 
     /**
+     * Run each object and encrypt them (or not).
+     *
      * @param string $class
      * @param string $field
      * @param string $indicator
diff --git a/app/Console/Commands/VerifyDatabase.php b/app/Console/Commands/VerifyDatabase.php
index ffc8f1b667..4dd0848501 100644
--- a/app/Console/Commands/VerifyDatabase.php
+++ b/app/Console/Commands/VerifyDatabase.php
@@ -204,6 +204,9 @@ class VerifyDatabase extends Command
         }
     }
 
+    /**
+     * Report on journals with bad account types linked to them.
+     */
     private function reportIncorrectJournals()
     {
         $configuration = [
@@ -270,7 +273,7 @@ class VerifyDatabase extends Command
     }
 
     /**
-     *
+     * Report on journals without transactions.
      */
     private function reportNoTransactions()
     {
@@ -288,6 +291,7 @@ class VerifyDatabase extends Command
     }
 
     /**
+     * Report on things with no linked journals.
      * @param string $name
      */
     private function reportObject(string $name)
@@ -359,7 +363,7 @@ class VerifyDatabase extends Command
     }
 
     /**
-     *
+     * Report on transfers that have budgets.
      */
     private function reportTransfersBudgets()
     {

From 7b3ef0e3abfc84063779b10ade759c7edb1046bc Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Tue, 15 Aug 2017 17:34:34 +0200
Subject: [PATCH 034/668] Fix #764

---
 .../Json/AutoCompleteController.php           | 101 ++++++++++++++++++
 app/Http/Controllers/JsonController.php       |  51 ---------
 .../Account/FindAccountsTrait.php             |   8 +-
 .../Journal/SupportJournalsTrait.php          |  20 +++-
 routes/web.php                                |   6 +-
 5 files changed, 125 insertions(+), 61 deletions(-)
 create mode 100644 app/Http/Controllers/Json/AutoCompleteController.php

diff --git a/app/Http/Controllers/Json/AutoCompleteController.php b/app/Http/Controllers/Json/AutoCompleteController.php
new file mode 100644
index 0000000000..28dc7495d8
--- /dev/null
+++ b/app/Http/Controllers/Json/AutoCompleteController.php
@@ -0,0 +1,101 @@
+<?php
+/**
+ * AutoCompleteController.php
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Http\Controllers\Json;
+
+use FireflyIII\Http\Controllers\Controller;
+use FireflyIII\Models\Account;
+use FireflyIII\Models\AccountType;
+use FireflyIII\Repositories\Account\AccountRepositoryInterface;
+use Response;
+
+/**
+ * Class AutoCompleteController
+ *
+ * @package FireflyIII\Http\Controllers\Json
+ */
+class AutoCompleteController extends Controller
+{
+
+    /**
+     * Returns a JSON list of all accounts.
+     *
+     * @param AccountRepositoryInterface $repository
+     *
+     * @return \Illuminate\Http\JsonResponse
+     *
+     */
+    public function allAccounts(AccountRepositoryInterface $repository)
+    {
+        $return = array_unique(
+            $repository->getAccountsByType(
+                [AccountType::REVENUE, AccountType::EXPENSE, AccountType::BENEFICIARY, AccountType::DEFAULT, AccountType::ASSET]
+            )->pluck('name')->toArray()
+        );
+        sort($return);
+
+        return Response::json($return);
+
+    }
+
+    /**
+     * Returns a JSON list of all beneficiaries.
+     *
+     * @param AccountRepositoryInterface $repository
+     *
+     * @return \Illuminate\Http\JsonResponse
+     *
+     */
+    public function expenseAccounts(AccountRepositoryInterface $repository)
+    {
+        $set      = $repository->getAccountsByType([AccountType::EXPENSE, AccountType::BENEFICIARY]);
+        $filtered = $set->filter(
+            function (Account $account) {
+                if ($account->active) {
+                    return $account;
+                }
+
+                return false;
+            }
+        );
+        $return   = array_unique($filtered->pluck('name')->toArray());
+
+        sort($return);
+
+        return Response::json($return);
+    }
+
+    /**
+     * @param AccountRepositoryInterface $repository
+     *
+     * @return \Illuminate\Http\JsonResponse
+     *
+     */
+    public function revenueAccounts(AccountRepositoryInterface $repository)
+    {
+        $set      = $repository->getAccountsByType([AccountType::REVENUE]);
+        $filtered = $set->filter(
+            function (Account $account) {
+                if ($account->active) {
+                    return $account;
+                }
+
+                return false;
+            }
+        );
+        $return   = array_unique($filtered->pluck('name')->toArray());
+        sort($return);
+
+        return Response::json($return);
+    }
+
+}
\ No newline at end of file
diff --git a/app/Http/Controllers/JsonController.php b/app/Http/Controllers/JsonController.php
index 849b0631f9..06a4aa4d1d 100644
--- a/app/Http/Controllers/JsonController.php
+++ b/app/Http/Controllers/JsonController.php
@@ -62,27 +62,6 @@ class JsonController extends Controller
         return Response::json(['html' => $view]);
     }
 
-    /**
-     * Returns a JSON list of all accounts.
-     *
-     * @param AccountRepositoryInterface $repository
-     *
-     * @return \Illuminate\Http\JsonResponse
-     *
-     */
-    public function allAccounts(AccountRepositoryInterface $repository)
-    {
-        $return = array_unique(
-            $repository->getAccountsByType(
-                [AccountType::REVENUE, AccountType::EXPENSE, AccountType::BENEFICIARY, AccountType::DEFAULT, AccountType::ASSET]
-            )->pluck('name')->toArray()
-        );
-        sort($return);
-
-        return Response::json($return);
-
-    }
-
     /**
      * @param JournalCollectorInterface $collector
      *
@@ -235,36 +214,6 @@ class JsonController extends Controller
         return Response::json($return);
     }
 
-    /**
-     * Returns a JSON list of all beneficiaries.
-     *
-     * @param AccountRepositoryInterface $repository
-     *
-     * @return \Illuminate\Http\JsonResponse
-     *
-     */
-    public function expenseAccounts(AccountRepositoryInterface $repository)
-    {
-        $return = array_unique($repository->getAccountsByType([AccountType::EXPENSE, AccountType::BENEFICIARY])->pluck('name')->toArray());
-        sort($return);
-
-        return Response::json($return);
-    }
-
-    /**
-     * @param AccountRepositoryInterface $repository
-     *
-     * @return \Illuminate\Http\JsonResponse
-     *
-     */
-    public function revenueAccounts(AccountRepositoryInterface $repository)
-    {
-        $return = array_unique($repository->getAccountsByType([AccountType::REVENUE])->pluck('name')->toArray());
-        sort($return);
-
-        return Response::json($return);
-    }
-
     /**
      * Returns a JSON list of all beneficiaries.
      *
diff --git a/app/Repositories/Account/FindAccountsTrait.php b/app/Repositories/Account/FindAccountsTrait.php
index e06a598a47..6bd9a42d45 100644
--- a/app/Repositories/Account/FindAccountsTrait.php
+++ b/app/Repositories/Account/FindAccountsTrait.php
@@ -205,10 +205,12 @@ trait FindAccountsTrait
      */
     public function getCashAccount(): Account
     {
-        $type    = AccountType::where('type', AccountType::CASH)->first();
-        $account = Account::firstOrCreateEncrypted(
-            ['user_id' => $this->user->id, 'account_type_id' => $type->id, 'name' => 'Cash account', 'active' => 1]
+        $type            = AccountType::where('type', AccountType::CASH)->first();
+        $account         = Account::firstOrCreateEncrypted(
+            ['user_id' => $this->user->id, 'account_type_id' => $type->id, 'name' => 'Cash account']
         );
+        $account->active = true;
+        $account->save();
 
         return $account;
     }
diff --git a/app/Repositories/Journal/SupportJournalsTrait.php b/app/Repositories/Journal/SupportJournalsTrait.php
index df57879971..ee36766599 100644
--- a/app/Repositories/Journal/SupportJournalsTrait.php
+++ b/app/Repositories/Journal/SupportJournalsTrait.php
@@ -117,8 +117,11 @@ trait SupportJournalsTrait
         if (strlen($data['source_account_name']) > 0) {
             $sourceType    = AccountType::where('type', 'Revenue account')->first();
             $sourceAccount = Account::firstOrCreateEncrypted(
-                ['user_id' => $user->id, 'account_type_id' => $sourceType->id, 'name' => $data['source_account_name'], 'active' => 1]
+                ['user_id' => $user->id, 'account_type_id' => $sourceType->id, 'name' => $data['source_account_name']]
             );
+            // always make account active
+            $sourceAccount->active = true;
+            $sourceAccount->save();
 
             Log::debug(sprintf('source account name is "%s", account is %d', $data['source_account_name'], $sourceAccount->id));
 
@@ -132,8 +135,11 @@ trait SupportJournalsTrait
 
         $sourceType    = AccountType::where('type', AccountType::CASH)->first();
         $sourceAccount = Account::firstOrCreateEncrypted(
-            ['user_id' => $user->id, 'account_type_id' => $sourceType->id, 'name' => 'Cash account', 'active' => 1]
+            ['user_id' => $user->id, 'account_type_id' => $sourceType->id, 'name' => 'Cash account']
         );
+        // always make account active
+        $sourceAccount->active = true;
+        $sourceAccount->save();
 
         return [
             'source'      => $sourceAccount,
@@ -161,10 +167,13 @@ trait SupportJournalsTrait
                     'user_id'         => $user->id,
                     'account_type_id' => $destinationType->id,
                     'name'            => $data['destination_account_name'],
-                    'active'          => 1,
                 ]
             );
 
+            // always make account active
+            $destinationAccount->active = true;
+            $destinationAccount->save();
+
             Log::debug(sprintf('destination account name is "%s", account is %d', $data['destination_account_name'], $destinationAccount->id));
 
             return [
@@ -175,8 +184,11 @@ trait SupportJournalsTrait
         Log::debug('destination_account_name is empty, so default to cash account!');
         $destinationType    = AccountType::where('type', AccountType::CASH)->first();
         $destinationAccount = Account::firstOrCreateEncrypted(
-            ['user_id' => $user->id, 'account_type_id' => $destinationType->id, 'name' => 'Cash account', 'active' => 1]
+            ['user_id' => $user->id, 'account_type_id' => $destinationType->id, 'name' => 'Cash account']
         );
+        // always make account active
+        $destinationAccount->active = true;
+        $destinationAccount->save();
 
         return [
             'source'      => $sourceAccount,
diff --git a/routes/web.php b/routes/web.php
index 5557e08cf1..403958be0a 100755
--- a/routes/web.php
+++ b/routes/web.php
@@ -430,9 +430,9 @@ Route::group(
  */
 Route::group(
     ['middleware' => 'user-full-auth', 'prefix' => 'json', 'as' => 'json.'], function () {
-    Route::get('expense-accounts', ['uses' => 'JsonController@expenseAccounts', 'as' => 'expense-accounts']);
-    Route::get('all-accounts', ['uses' => 'JsonController@allAccounts', 'as' => 'all-accounts']);
-    Route::get('revenue-accounts', ['uses' => 'JsonController@revenueAccounts', 'as' => 'revenue-accounts']);
+    Route::get('expense-accounts', ['uses' => 'Json\AutoCompleteController@expenseAccounts', 'as' => 'expense-accounts']);
+    Route::get('all-accounts', ['uses' => 'Json\AutoCompleteController@allAccounts', 'as' => 'all-accounts']);
+    Route::get('revenue-accounts', ['uses' => 'Json\AutoCompleteController@revenueAccounts', 'as' => 'revenue-accounts']);
     Route::get('categories', ['uses' => 'JsonController@categories', 'as' => 'categories']);
     Route::get('budgets', ['uses' => 'JsonController@budgets', 'as' => 'budgets']);
     Route::get('tags', ['uses' => 'JsonController@tags', 'as' => 'tags']);

From 431bcf20eae0e605eb2c72326010fc7a18f02335 Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Tue, 15 Aug 2017 17:37:48 +0200
Subject: [PATCH 035/668] Add list button [skip ci] #763

---
 resources/views/tags/show.twig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/resources/views/tags/show.twig b/resources/views/tags/show.twig
index a5d7d40287..3237078e90 100644
--- a/resources/views/tags/show.twig
+++ b/resources/views/tags/show.twig
@@ -182,4 +182,5 @@
     </script>
     <script src="https://maps.googleapis.com/maps/api/js?v=3&amp;key={{ apiKey }}"></script>
     <script src="js/ff/tags/show.js"></script>
+    <script type="text/javascript" src="js/ff/transactions/list.js"></script>
 {% endblock %}

From 6666d1a2f40a21feec0eb3ea15d21cbbccf23378 Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Tue, 15 Aug 2017 21:12:49 +0200
Subject: [PATCH 036/668] Add debug information to getAmount routine.

---
 app/Import/Object/ImportJournal.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/app/Import/Object/ImportJournal.php b/app/Import/Object/ImportJournal.php
index 21bd535b8f..33b7db299b 100644
--- a/app/Import/Object/ImportJournal.php
+++ b/app/Import/Object/ImportJournal.php
@@ -91,20 +91,28 @@ class ImportJournal
      */
     public function getAmount(): string
     {
+        Log::debug('Now in getAmount()');
         if (is_null($this->convertedAmount)) {
+            Log::debug('convertedAmount is NULL');
             /** @var ConverterInterface $amountConverter */
             $amountConverter       = app(Amount::class);
             $this->convertedAmount = $amountConverter->convert($this->amount);
+            Log::debug(sprintf('First attempt to convert gives "%s"', $this->convertedAmount));
             // modify
             foreach ($this->modifiers as $modifier) {
                 $class = sprintf('FireflyIII\Import\Converter\%s', config(sprintf('csv.import_roles.%s.converter', $modifier['role'])));
                 /** @var ConverterInterface $converter */
                 $converter = app($class);
+                Log::debug(sprintf('Now launching converter %s', $class));
                 if ($converter->convert($modifier['value']) === -1) {
                     $this->convertedAmount = Steam::negative($this->convertedAmount);
                 }
+                Log::debug(sprintf('convertedAmount after conversion is  %s', $this->convertedAmount));
             }
+
+            Log::debug(sprintf('After modifiers the result is: "%s"', $this->convertedAmount));
         }
+        Log::debug(sprintf('convertedAmount is: "%s"', $this->convertedAmount));
         if (bccomp($this->convertedAmount, '0') === 0) {
             throw new FireflyException('Amount is zero.');
         }

From ebb37c09e5d49bcc304ea1a359418f1645942940 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Thu, 17 Aug 2017 19:32:05 +0200
Subject: [PATCH 037/668] New translations form.php (Spanish)

---
 resources/lang/es_ES/form.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/lang/es_ES/form.php b/resources/lang/es_ES/form.php
index 6692bba2ad..3eae0844a8 100644
--- a/resources/lang/es_ES/form.php
+++ b/resources/lang/es_ES/form.php
@@ -14,8 +14,8 @@ declare(strict_types=1);
 return [
 
     // new user:
-    'bank_name'                      => 'Bank name',
-    'bank_balance'                   => 'Balance',
+    'bank_name'                      => 'Banco',
+    'bank_balance'                   => 'Saldo',
     'savings_balance'                => 'Savings balance',
     'credit_card_limit'              => 'Credit card limit',
     'automatch'                      => 'Match automatically',

From a29292e0182e12ab4a7303c8145ebfbc8fb766d8 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Thu, 17 Aug 2017 19:40:06 +0200
Subject: [PATCH 038/668] New translations form.php (Spanish)

---
 resources/lang/es_ES/form.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/resources/lang/es_ES/form.php b/resources/lang/es_ES/form.php
index 3eae0844a8..21435d2f63 100644
--- a/resources/lang/es_ES/form.php
+++ b/resources/lang/es_ES/form.php
@@ -16,16 +16,16 @@ return [
     // new user:
     'bank_name'                      => 'Banco',
     'bank_balance'                   => 'Saldo',
-    'savings_balance'                => 'Savings balance',
-    'credit_card_limit'              => 'Credit card limit',
+    'savings_balance'                => 'Salgo de ahorro',
+    'credit_card_limit'              => 'Límite de la tarjeta de crédito',
     'automatch'                      => 'Match automatically',
-    'skip'                           => 'Skip',
-    'name'                           => 'Name',
-    'active'                         => 'Active',
-    'amount_min'                     => 'Minimum amount',
-    'amount_max'                     => 'Maximum amount',
+    'skip'                           => 'Saltar',
+    'name'                           => 'Nombre',
+    'active'                         => 'Activo',
+    'amount_min'                     => 'Importe mínimo',
+    'amount_max'                     => 'Importe máximo',
     'match'                          => 'Matches on',
-    'repeat_freq'                    => 'Repeats',
+    'repeat_freq'                    => 'Repetición',
     'journal_currency_id'            => 'Currency',
     'currency_id'                    => 'Currency',
     'attachments'                    => 'Attachments',

From 08af0aab751b2ad95628852245542c6c03f46896 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Thu, 17 Aug 2017 19:50:06 +0200
Subject: [PATCH 039/668] New translations form.php (Spanish)

---
 resources/lang/es_ES/form.php | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/resources/lang/es_ES/form.php b/resources/lang/es_ES/form.php
index 21435d2f63..743ff7f1fc 100644
--- a/resources/lang/es_ES/form.php
+++ b/resources/lang/es_ES/form.php
@@ -26,24 +26,24 @@ return [
     'amount_max'                     => 'Importe máximo',
     'match'                          => 'Matches on',
     'repeat_freq'                    => 'Repetición',
-    'journal_currency_id'            => 'Currency',
-    'currency_id'                    => 'Currency',
-    'attachments'                    => 'Attachments',
-    'journal_amount'                 => 'Amount',
+    'journal_currency_id'            => 'Divisa',
+    'currency_id'                    => 'Divisa',
+    'attachments'                    => 'Adjuntos',
+    'journal_amount'                 => 'Importe',
     'journal_asset_source_account'   => 'Asset account (source)',
     'journal_source_account_name'    => 'Revenue account (source)',
     'journal_source_account_id'      => 'Asset account (source)',
     'BIC'                            => 'BIC',
-    'verify_password'                => 'Verify password security',
-    'account_from_id'                => 'From account',
-    'account_to_id'                  => 'To account',
-    'source_account'                 => 'Source account',
-    'destination_account'            => 'Destination account',
+    'verify_password'                => 'Verificar la seguridad de contraseña',
+    'account_from_id'                => 'Cuenta origen',
+    'account_to_id'                  => 'Cuenta destino',
+    'source_account'                 => 'Cuenta origen',
+    'destination_account'            => 'Cuenta destino',
     'journal_destination_account_id' => 'Asset account (destination)',
     'asset_destination_account'      => 'Asset account (destination)',
     'asset_source_account'           => 'Asset account (source)',
-    'journal_description'            => 'Description',
-    'note'                           => 'Notes',
+    'journal_description'            => 'Descripción',
+    'note'                           => 'Notas',
     'split_journal'                  => 'Split this transaction',
     'split_journal_explanation'      => 'Split this transaction in multiple parts',
     'currency'                       => 'Currency',

From ef21ac3d5ad3e2f90dc7194dae53cf00a386efdd Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Thu, 17 Aug 2017 19:50:08 +0200
Subject: [PATCH 040/668] New translations firefly.php (Spanish)

---
 resources/lang/es_ES/firefly.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/lang/es_ES/firefly.php b/resources/lang/es_ES/firefly.php
index f746be2614..87c4704ae1 100644
--- a/resources/lang/es_ES/firefly.php
+++ b/resources/lang/es_ES/firefly.php
@@ -22,14 +22,14 @@ return [
     'everything'                                 => 'Todo',
     'customRange'                                => 'Rango personalizado',
     'apply'                                      => 'Aplicar',
-    'select_date'                                => 'Select date..',
+    'select_date'                                => 'Seleccionar fecha...',
     'cancel'                                     => 'Cancelar',
     'from'                                       => 'Desde',
     'to'                                         => 'Hasta',
     'showEverything'                             => 'Mostrar todo',
     'never'                                      => 'Nunca',
     'search_results_for'                         => 'Resultados de la búsqueda para %{query}',
-    'no_results_for_empty_search'                => 'Your search was empty, so nothing was found.',
+    'no_results_for_empty_search'                => 'Su búsqueda estaba vacía, por lo que no se encontró nada.',
     'bounced_error'                              => 'El mensaje enviado al: correo electrónico no ha sido recibido, así que no hay acceso para usted.',
     'deleted_error'                              => 'Las credenciales no coinciden con los registros.',
     'general_blocked_error'                      => 'Tu cuenta ha sido creada. Ahora puedes iniciar sesión.',

From 18bc91734fbca659349a1bf3fb0359ac87e02962 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Thu, 17 Aug 2017 20:00:16 +0200
Subject: [PATCH 041/668] New translations firefly.php (Spanish)

---
 resources/lang/es_ES/firefly.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/lang/es_ES/firefly.php b/resources/lang/es_ES/firefly.php
index 87c4704ae1..2a876f7000 100644
--- a/resources/lang/es_ES/firefly.php
+++ b/resources/lang/es_ES/firefly.php
@@ -65,11 +65,11 @@ return [
     'two_factor_forgot_title'                    => 'Autenticación en dos pasos perdida',
     'two_factor_forgot'                          => 'I forgot my two-factor thing.',
     'two_factor_lost_header'                     => 'Lost your two factor authentication?',
-    'two_factor_lost_intro'                      => 'Unfortunately, this is not something you can reset from the web interface. You have two choices.',
+    'two_factor_lost_intro'                      => 'Por desgracia, esto no es algo que se pueda restablecer desde la interfaz web. Tienes dos opciones.',
     'two_factor_lost_fix_self'                   => 'If you run your own instance of Firefly III, check the logs in <code>storage/logs</code> for instructions.',
     'two_factor_lost_fix_owner'                  => 'Otherwise, email the site owner, <a href="mailto::site_owner">:site_owner</a> and ask them to reset your two factor authentication.',
     'warning_much_data'                          => ':days days of data may take a while to load.',
-    'registered'                                 => 'You have registered successfully!',
+    'registered'                                 => '¡Te has registrado con éxito!',
     'tagbalancingAct'                            => 'Balancing act',
     'tagadvancePayment'                          => 'Advance payment',
     'tagnothing'                                 => '',

From b7522288b504eb8a86fa9abce5a458ab8e01414b Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Thu, 17 Aug 2017 20:00:18 +0200
Subject: [PATCH 042/668] New translations breadcrumbs.php (Spanish)

---
 resources/lang/es_ES/breadcrumbs.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/es_ES/breadcrumbs.php b/resources/lang/es_ES/breadcrumbs.php
index 5909aac402..fd58a4772c 100644
--- a/resources/lang/es_ES/breadcrumbs.php
+++ b/resources/lang/es_ES/breadcrumbs.php
@@ -26,7 +26,7 @@ return [
     'edit_bill'         => 'Editar factura ":name"',
     'delete_bill'       => 'Eliminar factura ":name"',
     'reports'           => 'Reportes',
-    'search_result'     => 'Search results for ":query"',
+    'search_result'     => 'Resultados de la búsqueda para ":query"',
     'withdrawal_list'   => 'Gastos',
     'deposit_list'      => 'Ganancia, ingresos y depósitos',
     'transfer_list'     => 'Transferencias',

From 9cda8c8bcff731b318cd3fe74a77b7ecc3a93544 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Thu, 17 Aug 2017 20:10:13 +0200
Subject: [PATCH 043/668] New translations csv.php (Spanish)

---
 resources/lang/es_ES/csv.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/lang/es_ES/csv.php b/resources/lang/es_ES/csv.php
index b518776e5f..ffdf32c5eb 100644
--- a/resources/lang/es_ES/csv.php
+++ b/resources/lang/es_ES/csv.php
@@ -15,10 +15,10 @@ return [
 
     // initial config
     'initial_title'                 => 'Import setup (1/3) - Basic CSV import setup',
-    'initial_text'                  => 'To be able to import your file correctly, please validate the options below.',
+    'initial_text'                  => 'Para poder importar correctamente el archivo, por favor comprueba las opciones a continuación.',
     'initial_box'                   => 'Basic CSV import setup',
     'initial_box_title'             => 'Basic CSV import setup options',
-    'initial_header_help'           => 'Check this box if the first row of your CSV file are the column titles.',
+    'initial_header_help'           => 'Marque aquí si el CSV contiene títulos de columna en la primera fila.',
     'initial_date_help'             => 'Date time format in your CSV. Follow the format like <a href="https://secure.php.net/manual/en/datetime.createfromformat.php#refsect1-datetime.createfromformat-parameters">this page</a> indicates. The default value will parse dates that look like this: :dateExample.',
     'initial_delimiter_help'        => 'Choose the field delimiter that is used in your input file. If not sure, comma is the safest option.',
     'initial_import_account_help'   => 'If your CSV file does NOT contain information about your asset account(s), use this dropdown to select to which account the transactions in the CSV belong to.',

From 6068cfbd704d44ad0aafcf6d14c8712f7d658c7d Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Fri, 18 Aug 2017 08:00:06 +0200
Subject: [PATCH 044/668] New translations intro.php (Dutch)

---
 resources/lang/nl_NL/intro.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/resources/lang/nl_NL/intro.php b/resources/lang/nl_NL/intro.php
index e945adcec8..fc788e515e 100644
--- a/resources/lang/nl_NL/intro.php
+++ b/resources/lang/nl_NL/intro.php
@@ -11,16 +11,16 @@ declare(strict_types=1);
 
 return [
     // index
-    'index_intro'                           => 'Welcome to the index page of Firefly III. Please take the time to walk through this intro to get a feeling of how Firefly III works.',
-    'index_accounts-chart'                  => 'This chart shows the current balance of your asset accounts. You can select the accounts visible here in your preferences.',
-    'index_box_out_holder'                  => 'This little box and the boxes next to this one will give you a quick overview of your financial situation.',
-    'index_help'                            => 'If you ever need help with a page or a form, press this button.',
-    'index_outro'                           => 'Most pages of Firefly III will start with a little tour like this one. Please contact me when you have questions or comments. Enjoy!',
-    'index_sidebar-toggle'                  => 'To create new transactions, accounts or other things, use the menu under this icon.',
+    'index_intro'                           => 'Welkom op de homepage van Firefly III. Neem even de tijd voor deze introductie zodat je Firefly III leert kennen.',
+    'index_accounts-chart'                  => 'Deze grafiek toont het saldo van je betaalrekening(en). Welke rekeningen zichtbaar zijn kan je aangeven bij de instellingen.',
+    'index_box_out_holder'                  => 'Dit vakje en de vakjes er naast geven een snel overzicht van je financiële situatie.',
+    'index_help'                            => 'Als je ooit hulp nodig hebt, klik dan hier.',
+    'index_outro'                           => 'De meeste pagina\'s in Firefly III beginnen met een kleine rondleiding zoals deze. Zoek me op als je vragen of commentaar hebt. Veel plezier!',
+    'index_sidebar-toggle'                  => 'Nieuwe transacties, rekeningen en andere dingen maak je met het menu onder deze knop.',
 
     // create account:
-    'accounts_create_iban'                  => 'Give your accounts a valid IBAN. This could make a data import very easy in the future.',
-    'accounts_create_asset_opening_balance' => 'Assets accounts may have an "opening balance", indicating the start of this account\'s history in Firefly.',
+    'accounts_create_iban'                  => 'Geef je rekeningen een geldige IBAN. Dat scheelt met importeren van data.',
+    'accounts_create_asset_opening_balance' => 'Betaalrekeningen kunnen een startsaldo hebben, waarmee het begin van deze rekening in Firefly wordt aangegeven.',
     'accounts_create_asset_currency'        => 'Firefly III supports multiple currencies. Asset accounts have one main currency, which you must set here.',
     'accounts_create_asset_virtual'         => 'It can sometimes help to give your account a virtual balance: an extra amount always added to or removed from the actual balance.',
 

From b955486f14be247ac19a49980a5133f0103e4725 Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Fri, 18 Aug 2017 14:45:42 +0200
Subject: [PATCH 045/668] Updated export routine.

---
 app/Export/Collector/UploadCollector.php   | 110 +-------
 app/Export/Entry/Entry.php                 |  87 ++++++
 app/Export/ExpandedProcessor.php           | 308 +++++++++++++++++++++
 app/Export/Exporter/CsvExporter.php        |   8 +-
 app/Helpers/Collector/JournalCollector.php |  21 +-
 app/Http/Controllers/ExportController.php  |  16 +-
 app/Http/Requests/ExportFormRequest.php    |  23 +-
 app/Http/Requests/Request.php              |   2 +-
 app/Models/Transaction.php                 |  36 +++
 resources/views/export/index.twig          |   8 +-
 routes/web.php                             |   2 +-
 11 files changed, 482 insertions(+), 139 deletions(-)
 create mode 100644 app/Export/ExpandedProcessor.php

diff --git a/app/Export/Collector/UploadCollector.php b/app/Export/Collector/UploadCollector.php
index 17f863e721..a27de79610 100644
--- a/app/Export/Collector/UploadCollector.php
+++ b/app/Export/Collector/UploadCollector.php
@@ -15,6 +15,7 @@ namespace FireflyIII\Export\Collector;
 
 use Crypt;
 use Illuminate\Contracts\Encryption\DecryptException;
+use Illuminate\Contracts\Filesystem\FileNotFoundException;
 use Log;
 use Storage;
 
@@ -50,14 +51,6 @@ class UploadCollector extends BasicCollector implements CollectorInterface
     public function run(): bool
     {
         Log::debug('Going to collect attachments', ['key' => $this->job->key]);
-
-        // file names associated with the old import routine.
-        $this->vintageFormat = sprintf('csv-upload-%d-', $this->job->user->id);
-
-        // collect old upload files (names beginning with "csv-upload".
-        $this->collectVintageUploads();
-
-        // then collect current upload files:
         $this->collectModernUploads();
 
         return true;
@@ -70,7 +63,8 @@ class UploadCollector extends BasicCollector implements CollectorInterface
      */
     private function collectModernUploads(): bool
     {
-        $set  = $this->job->user->importJobs()->where('status', 'import_complete')->get(['import_jobs.*']);
+        $set = $this->job->user->importJobs()->whereIn('status', ['import_complete', 'finished'])->get(['import_jobs.*']);
+        Log::debug(sprintf('Found %d import jobs', $set->count()));
         $keys = [];
         if ($set->count() > 0) {
             $keys = $set->pluck('key')->toArray();
@@ -83,59 +77,6 @@ class UploadCollector extends BasicCollector implements CollectorInterface
         return true;
     }
 
-    /**
-     * This method collects all the uploads that are uploaded using the "old" importer. So from before the summer of 2016.
-     *
-     * @return bool
-     */
-    private function collectVintageUploads(): bool
-    {
-        // grab upload directory.
-        $files = $this->uploadDisk->files();
-
-        foreach ($files as $entry) {
-            $this->processVintageUpload($entry);
-        }
-
-        return true;
-    }
-
-    /**
-     * This method tells you when the vintage upload file was actually uploaded.
-     *
-     * @param string $entry
-     *
-     * @return string
-     */
-    private function getVintageUploadDate(string $entry): string
-    {
-        // this is an original upload.
-        $parts          = explode('-', str_replace(['.csv.encrypted', $this->vintageFormat], '', $entry));
-        $originalUpload = intval($parts[1]);
-        $date           = date('Y-m-d \a\t H-i-s', $originalUpload);
-
-        return $date;
-    }
-
-    /**
-     * Tells you if a file name is a vintage upload.
-     *
-     * @param string $entry
-     *
-     * @return bool
-     */
-    private function isVintageImport(string $entry): bool
-    {
-        $len = strlen($this->vintageFormat);
-        // file is part of the old import routine:
-        if (substr($entry, 0, $len) === $this->vintageFormat) {
-
-            return true;
-        }
-
-        return false;
-    }
-
     /**
      * @param string $key
      *
@@ -153,7 +94,7 @@ class UploadCollector extends BasicCollector implements CollectorInterface
         $content = '';
         try {
             $content = Crypt::decrypt($this->uploadDisk->get(sprintf('%s.upload', $key)));
-        } catch (DecryptException $e) {
+        } catch (FileNotFoundException | DecryptException $e) {
             Log::error(sprintf('Could not decrypt old import file "%s". Skipped because: %s', $key, $e->getMessage()));
         }
 
@@ -168,47 +109,4 @@ class UploadCollector extends BasicCollector implements CollectorInterface
         return true;
     }
 
-    /**
-     * If the file is a vintage upload, process it.
-     *
-     * @param string $entry
-     *
-     * @return bool
-     */
-    private function processVintageUpload(string $entry): bool
-    {
-        if ($this->isVintageImport($entry)) {
-            $this->saveVintageImportFile($entry);
-
-            return true;
-        }
-
-        return false;
-    }
-
-
-    /**
-     * This will store the content of the old vintage upload somewhere.
-     *
-     * @param string $entry
-     */
-    private function saveVintageImportFile(string $entry)
-    {
-        $content = '';
-        try {
-            $content = Crypt::decrypt($this->uploadDisk->get($entry));
-        } catch (DecryptException $e) {
-            Log::error('Could not decrypt old CSV import file ' . $entry . '. Skipped because ' . $e->getMessage());
-        }
-
-        if (strlen($content) > 0) {
-            // add to export disk.
-            $date = $this->getVintageUploadDate($entry);
-            $file = $this->job->key . '-Old import dated ' . $date . '.csv';
-            $this->exportDisk->put($file, $content);
-            $this->getEntries()->push($file);
-        }
-    }
-
-
 }
diff --git a/app/Export/Entry/Entry.php b/app/Export/Entry/Entry.php
index 81ef189d36..817b71ce43 100644
--- a/app/Export/Entry/Entry.php
+++ b/app/Export/Entry/Entry.php
@@ -13,6 +13,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Export\Entry;
 
+use FireflyIII\Models\Transaction;
 use Steam;
 
 /**
@@ -37,24 +38,43 @@ final class Entry
 {
     // @formatter:off
     public $journal_id;
+    public $transaction_id = 0;
+
     public $date;
     public $description;
 
     public $currency_code;
     public $amount;
+    public $foreign_currency_code = '';
+    public $foreign_amount        = '0';
 
     public $transaction_type;
 
     public $asset_account_id;
     public $asset_account_name;
+    public $asset_account_iban;
+    public $asset_account_bic;
+    public $asset_account_number;
+    public $asset_currency_code;
 
     public $opposing_account_id;
     public $opposing_account_name;
+    public $opposing_account_iban;
+    public $opposing_account_bic;
+    public $opposing_account_number;
+    public $opposing_currency_code;
 
     public $budget_id;
     public $budget_name;
+
     public $category_id;
     public $category_name;
+
+    public $bill_id;
+    public $bill_name;
+
+    public $notes;
+    public $tags;
     // @formatter:on
 
     /**
@@ -95,5 +115,72 @@ final class Entry
         return $entry;
     }
 
+    /**
+     * Converts a given transaction (as collected by the collector) into an export entry.
+     *
+     * @param Transaction $transaction
+     *
+     * @return Entry
+     */
+    public static function fromTransaction(Transaction $transaction): Entry
+    {
+        $entry                 = new self;
+        $entry->journal_id     = $transaction->journal_id;
+        $entry->transaction_id = $transaction->id;
+        $entry->date           = $transaction->date->format('Ymd');
+        $entry->description    = $transaction->description;
+        if (strlen(strval($transaction->transaction_description)) > 0) {
+            $entry->description = $transaction->transaction_description . '(' . $transaction->description . ')';
+        }
+        $entry->currency_code = $transaction->transactionCurrency->code;
+        $entry->amount        = round($transaction->transaction_amount, $transaction->transactionCurrency->decimal_places);
+
+        $entry->foreign_currency_code = is_null($transaction->foreign_currency_id) ? null : $transaction->foreignCurrency->code;
+        $entry->foreign_amount        = is_null($transaction->foreign_currency_id)
+            ? null
+            : round(
+                $transaction->transaction_foreign_amount, $transaction->foreignCurrency->decimal_places
+            );
+
+        $entry->transaction_type     = $transaction->transaction_type_type;
+        $entry->asset_account_id     = $transaction->account_id;
+        $entry->asset_account_name   = app('steam')->tryDecrypt($transaction->account_name);
+        $entry->asset_account_iban   = $transaction->account_iban;
+        $entry->asset_account_number = $transaction->account_number;
+        $entry->asset_account_bic    = $transaction->account_bic;
+        // asset_currency_code
+        $entry->opposing_account_id     = $transaction->opposing_account_id;
+        $entry->opposing_account_name   = app('steam')->tryDecrypt($transaction->opposing_account_name);
+        $entry->opposing_account_iban   = $transaction->opposing_account_iban;
+        $entry->opposing_account_number = $transaction->opposing_account_number;
+        $entry->opposing_account_bic    = $transaction->opposing_account_bic;
+        // opposing currency code
+
+        /** budget */
+        $entry->budget_id   = $transaction->transaction_budget_id;
+        $entry->budget_name = app('steam')->tryDecrypt($transaction->transaction_budget_name);
+        if (is_null($transaction->transaction_budget_id)) {
+            $entry->budget_id   = $transaction->transaction_journal_budget_id;
+            $entry->budget_name = app('steam')->tryDecrypt($transaction->transaction_journal_budget_name);
+        }
+
+        /** category */
+        $entry->category_id   = $transaction->transaction_category_id;
+        $entry->category_name = app('steam')->tryDecrypt($transaction->transaction_category_name);
+        if (is_null($transaction->transaction_category_id)) {
+            $entry->category_id   = $transaction->transaction_journal_category_id;
+            $entry->category_name = app('steam')->tryDecrypt($transaction->transaction_journal_category_name);
+        }
+
+        /** budget */
+        $entry->bill_id   = $transaction->bill_id;
+        $entry->bill_name = app('steam')->tryDecrypt($transaction->bill_name);
+
+        $entry->tags  = $transaction->tags;
+        $entry->notes = $transaction->notes;
+
+        return $entry;
+    }
+
 
 }
diff --git a/app/Export/ExpandedProcessor.php b/app/Export/ExpandedProcessor.php
new file mode 100644
index 0000000000..703963f27d
--- /dev/null
+++ b/app/Export/ExpandedProcessor.php
@@ -0,0 +1,308 @@
+<?php
+/**
+ * ExpandedProcessor.php
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Export;
+
+
+use Crypt;
+use DB;
+use FireflyIII\Exceptions\FireflyException;
+use FireflyIII\Export\Collector\AttachmentCollector;
+use FireflyIII\Export\Collector\UploadCollector;
+use FireflyIII\Export\Entry\Entry;
+use FireflyIII\Helpers\Collector\JournalCollectorInterface;
+use FireflyIII\Helpers\Filter\InternalTransferFilter;
+use FireflyIII\Models\AccountMeta;
+use FireflyIII\Models\ExportJob;
+use FireflyIII\Models\Transaction;
+use FireflyIII\Models\TransactionJournalMeta;
+use Illuminate\Support\Collection;
+use Log;
+use Storage;
+use ZipArchive;
+
+/**
+ * Class ExpandedProcessor
+ *
+ * @package FireflyIII\Export
+ */
+class ExpandedProcessor implements ProcessorInterface
+{
+
+    /** @var Collection */
+    public $accounts;
+    /** @var  string */
+    public $exportFormat;
+    /** @var  bool */
+    public $includeAttachments;
+    /** @var  bool */
+    public $includeOldUploads;
+    /** @var  ExportJob */
+    public $job;
+    /** @var array */
+    public $settings;
+    /** @var  Collection */
+    private $exportEntries;
+    /** @var  Collection */
+    private $files;
+    /** @var  Collection */
+    private $journals;
+
+    /**
+     * Processor constructor.
+     */
+    public function __construct()
+    {
+        $this->journals      = new Collection;
+        $this->exportEntries = new Collection;
+        $this->files         = new Collection;
+    }
+
+    /**
+     * @return bool
+     */
+    public function collectAttachments(): bool
+    {
+        /** @var AttachmentCollector $attachmentCollector */
+        $attachmentCollector = app(AttachmentCollector::class);
+        $attachmentCollector->setJob($this->job);
+        $attachmentCollector->setDates($this->settings['startDate'], $this->settings['endDate']);
+        $attachmentCollector->run();
+        $this->files = $this->files->merge($attachmentCollector->getEntries());
+
+        return true;
+    }
+
+    /**
+     * @return bool
+     */
+    public function collectJournals(): bool
+    {
+        // use journal collector thing.
+        /** @var JournalCollectorInterface $collector */
+        $collector = app(JournalCollectorInterface::class);
+        $collector->setAccounts($this->accounts)->setRange($this->settings['startDate'], $this->settings['endDate'])
+                  ->withOpposingAccount()->withBudgetInformation()->withCategoryInformation()
+                  ->removeFilter(InternalTransferFilter::class);
+        $transactions = $collector->getJournals();
+        // get some more meta data for each entry:
+        $ids         = $transactions->pluck('journal_id')->toArray();
+        $assetIds    = $transactions->pluck('account_id')->toArray();
+        $opposingIds = $transactions->pluck('opposing_account_id')->toArray();
+        $notes       = $this->getNotes($ids);
+        $tags        = $this->getTags($ids);
+        $ibans       = $this->getIbans($assetIds) + $this->getIbans($opposingIds);
+        $transactions->each(
+            function (Transaction $transaction) use ($notes, $tags, $ibans) {
+                $journalId                            = intval($transaction->journal_id);
+                $accountId                            = intval($transaction->account_id);
+                $opposingId                           = intval($transaction->opposing_account_id);
+                $transaction->notes                   = $notes[$journalId] ?? '';
+                $transaction->tags                    = join(',', $tags[$journalId] ?? []);
+                $transaction->account_number          = $ibans[$accountId]['accountNumber'] ?? '';
+                $transaction->account_bic             = $ibans[$accountId]['BIC'] ?? '';
+                $transaction->opposing_account_number = $ibans[$opposingId]['accountNumber'] ?? '';
+                $transaction->opposing_account_bic    = $ibans[$opposingId]['BIC'] ?? '';
+
+            }
+        );
+
+        $this->journals = $transactions;
+
+        return true;
+    }
+
+    /**
+     * @return bool
+     */
+    public function collectOldUploads(): bool
+    {
+        /** @var UploadCollector $uploadCollector */
+        $uploadCollector = app(UploadCollector::class);
+        $uploadCollector->setJob($this->job);
+        $uploadCollector->run();
+
+        $this->files = $this->files->merge($uploadCollector->getEntries());
+
+        return true;
+    }
+
+    /**
+     * @return bool
+     */
+    public function convertJournals(): bool
+    {
+        $this->journals->each(
+            function (Transaction $transaction) {
+                $this->exportEntries->push(Entry::fromTransaction($transaction));
+            }
+        );
+        Log::debug(sprintf('Count %d entries in exportEntries (convertJournals)', $this->exportEntries->count()));
+
+        return true;
+    }
+
+    /**
+     * @return bool
+     * @throws FireflyException
+     */
+    public function createZipFile(): bool
+    {
+        $zip      = new ZipArchive;
+        $file     = $this->job->key . '.zip';
+        $fullPath = storage_path('export') . '/' . $file;
+
+        if ($zip->open($fullPath, ZipArchive::CREATE) !== true) {
+            throw new FireflyException('Cannot store zip file.');
+        }
+        // for each file in the collection, add it to the zip file.
+        $disk = Storage::disk('export');
+        foreach ($this->getFiles() as $entry) {
+            // is part of this job?
+            $zipFileName = str_replace($this->job->key . '-', '', $entry);
+            $zip->addFromString($zipFileName, $disk->get($entry));
+        }
+
+        $zip->close();
+
+        // delete the files:
+        $this->deleteFiles();
+
+        return true;
+    }
+
+    /**
+     * @return bool
+     */
+    public function exportJournals(): bool
+    {
+        $exporterClass = config('firefly.export_formats.' . $this->exportFormat);
+        $exporter      = app($exporterClass);
+        $exporter->setJob($this->job);
+        $exporter->setEntries($this->exportEntries);
+        $exporter->run();
+        $this->files->push($exporter->getFileName());
+
+        return true;
+    }
+
+    /**
+     * @return Collection
+     */
+    public function getFiles(): Collection
+    {
+        return $this->files;
+    }
+
+    /**
+     * Save export job settings to class.
+     *
+     * @param array $settings
+     */
+    public function setSettings(array $settings)
+    {
+        // save settings
+        $this->settings           = $settings;
+        $this->accounts           = $settings['accounts'];
+        $this->exportFormat       = $settings['exportFormat'];
+        $this->includeAttachments = $settings['includeAttachments'];
+        $this->includeOldUploads  = $settings['includeOldUploads'];
+        $this->job                = $settings['job'];
+    }
+
+    /**
+     *
+     */
+    private function deleteFiles()
+    {
+        $disk = Storage::disk('export');
+        foreach ($this->getFiles() as $file) {
+            $disk->delete($file);
+        }
+    }
+
+    /**
+     * Get all IBAN / SWIFT / account numbers
+     *
+     * @param array $array
+     *
+     * @return array
+     */
+    private function getIbans(array $array): array
+    {
+        $array  = array_unique($array);
+        $return = [];
+        $set    = AccountMeta::whereIn('account_id', $array)
+                             ->leftJoin('accounts', 'accounts.id', 'account_meta.account_id')
+                             ->where('accounts.user_id', $this->job->user_id)
+                             ->whereIn('account_meta.name', ['accountNumber', 'BIC', 'currency_id'])
+                             ->get(['account_meta.id', 'account_meta.account_id', 'account_meta.name', 'account_meta.data']);
+        /** @var AccountMeta $meta */
+        foreach ($set as $meta) {
+            $id                       = intval($meta->account_id);
+            $return[$id][$meta->name] = $meta->data;
+        }
+
+        return $return;
+    }
+
+    /**
+     * Returns, if present, for the given journal ID's the notes.
+     *
+     * @param array $array
+     *
+     * @return array
+     */
+    private function getNotes(array $array): array
+    {
+        $array  = array_unique($array);
+        $set    = TransactionJournalMeta::whereIn('journal_meta.transaction_journal_id', $array)
+                                        ->leftJoin('transaction_journals', 'transaction_journals.id', '=', 'journal_meta.transaction_journal_id')
+                                        ->where('transaction_journals.user_id', $this->job->user_id)
+                                        ->where('journal_meta.name', 'notes')->get(
+                ['journal_meta.transaction_journal_id', 'journal_meta.data', 'journal_meta.id']
+            );
+        $return = [];
+        /** @var TransactionJournalMeta $meta */
+        foreach ($set as $meta) {
+            $id          = intval($meta->transaction_journal_id);
+            $return[$id] = $meta->data;
+        }
+
+        return $return;
+    }
+
+    /**
+     * Returns a comma joined list of all the users tags linked to these journals.
+     *
+     * @param array $array
+     *
+     * @return array
+     */
+    private function getTags(array $array): array
+    {
+        $set    = DB::table('tag_transaction_journal')
+                    ->whereIn('tag_transaction_journal.transaction_journal_id', $array)
+                    ->leftJoin('tags', 'tag_transaction_journal.tag_id', '=', 'tags.id')
+                    ->leftJoin('transaction_journals', 'transaction_journals.id', '=', 'tag_transaction_journal.transaction_journal_id')
+                    ->where('transaction_journals.user_id', $this->job->user_id)
+                    ->get(['tag_transaction_journal.transaction_journal_id', 'tags.tag']);
+        $result = [];
+        foreach ($set as $entry) {
+            $id            = intval($entry->transaction_journal_id);
+            $result[$id]   = isset($result[$id]) ? $result[$id] : [];
+            $result[$id][] = Crypt::decrypt($entry->tag);
+        }
+
+        return $result;
+    }
+}
\ No newline at end of file
diff --git a/app/Export/Exporter/CsvExporter.php b/app/Export/Exporter/CsvExporter.php
index 34a56182e0..dea7519fa7 100644
--- a/app/Export/Exporter/CsvExporter.php
+++ b/app/Export/Exporter/CsvExporter.php
@@ -58,8 +58,12 @@ class CsvExporter extends BasicExporter implements ExporterInterface
 
         // get field names for header row:
         $first   = $this->getEntries()->first();
-        $headers = array_keys(get_object_vars($first));
-        $rows[]  = $headers;
+        $headers = [];
+        if (!is_null($first)) {
+            $headers = array_keys(get_object_vars($first));
+        }
+
+        $rows[] = $headers;
 
         /** @var Entry $entry */
         foreach ($this->getEntries() as $entry) {
diff --git a/app/Helpers/Collector/JournalCollector.php b/app/Helpers/Collector/JournalCollector.php
index c31295c235..d892cefdf8 100644
--- a/app/Helpers/Collector/JournalCollector.php
+++ b/app/Helpers/Collector/JournalCollector.php
@@ -31,7 +31,6 @@ use FireflyIII\Models\Tag;
 use FireflyIII\Models\Transaction;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\User;
-use Illuminate\Contracts\Encryption\DecryptException;
 use Illuminate\Database\Eloquent\Builder as EloquentBuilder;
 use Illuminate\Database\Query\JoinClause;
 use Illuminate\Pagination\LengthAwarePaginator;
@@ -86,7 +85,9 @@ class JournalCollector implements JournalCollectorInterface
 
             'accounts.name as account_name',
             'accounts.encrypted as account_encrypted',
+            'accounts.iban as account_iban',
             'account_types.type as account_type',
+
         ];
     /** @var  bool */
     private $filterTransfers = false;
@@ -175,12 +176,10 @@ class JournalCollector implements JournalCollectorInterface
                 if (!is_null($transaction->bill_name)) {
                     $transaction->bill_name = Steam::decrypt(intval($transaction->bill_name_encrypted), $transaction->bill_name);
                 }
+                $transaction->opposing_account_name = app('steam')->tryDecrypt($transaction->opposing_account_name);
+                $transaction->account_iban          = app('steam')->tryDecrypt($transaction->account_iban);
+                $transaction->opposing_account_iban = app('steam')->tryDecrypt($transaction->opposing_account_iban);
 
-                try {
-                    $transaction->opposing_account_name = Crypt::decrypt($transaction->opposing_account_name);
-                } catch (DecryptException $e) {
-                    // if this fails its already decrypted.
-                }
 
             }
         );
@@ -677,10 +676,12 @@ class JournalCollector implements JournalCollectorInterface
             $this->query->leftJoin('account_types as opposing_account_types', 'opposing_accounts.account_type_id', '=', 'opposing_account_types.id');
             $this->query->whereNull('opposing.deleted_at');
 
-            $this->fields[]       = 'opposing.id as opposing_id';
-            $this->fields[]       = 'opposing.account_id as opposing_account_id';
-            $this->fields[]       = 'opposing_accounts.name as opposing_account_name';
-            $this->fields[]       = 'opposing_accounts.encrypted as opposing_account_encrypted';
+            $this->fields[] = 'opposing.id as opposing_id';
+            $this->fields[] = 'opposing.account_id as opposing_account_id';
+            $this->fields[] = 'opposing_accounts.name as opposing_account_name';
+            $this->fields[] = 'opposing_accounts.encrypted as opposing_account_encrypted';
+            $this->fields[] = 'opposing_accounts.iban as opposing_account_iban';
+
             $this->fields[]       = 'opposing_account_types.type as opposing_account_type';
             $this->joinedOpposing = true;
             Log::debug('joinedOpposing is now true!');
diff --git a/app/Http/Controllers/ExportController.php b/app/Http/Controllers/ExportController.php
index 6bb4cd3f44..326ad87c77 100644
--- a/app/Http/Controllers/ExportController.php
+++ b/app/Http/Controllers/ExportController.php
@@ -17,6 +17,7 @@ namespace FireflyIII\Http\Controllers;
 use Carbon\Carbon;
 use ExpandedForm;
 use FireflyIII\Exceptions\FireflyException;
+use FireflyIII\Export\ExpandedProcessor;
 use FireflyIII\Export\ProcessorInterface;
 use FireflyIII\Http\Requests\ExportFormRequest;
 use FireflyIII\Models\AccountType;
@@ -137,34 +138,40 @@ class ExportController extends Controller
     public function postIndex(ExportFormRequest $request, AccountRepositoryInterface $repository, ExportJobRepositoryInterface $jobs)
     {
         $job      = $jobs->findByKey($request->get('job'));
+        $accounts = $request->get('accounts') ?? [];
         $settings = [
-            'accounts'           => $repository->getAccountsById($request->get('accounts')),
+            'accounts'           => $repository->getAccountsById($accounts),
             'startDate'          => new Carbon($request->get('export_start_range')),
             'endDate'            => new Carbon($request->get('export_end_range')),
             'exportFormat'       => $request->get('exportFormat'),
-            'includeAttachments' => intval($request->get('include_attachments')) === 1,
-            'includeOldUploads'  => intval($request->get('include_old_uploads')) === 1,
+            'includeAttachments' => $request->boolean('include_attachments'),
+            'includeOldUploads'  => $request->boolean('include_old_uploads'),
             'job'                => $job,
         ];
 
         $jobs->changeStatus($job, 'export_status_make_exporter');
 
         /** @var ProcessorInterface $processor */
-        $processor = app(ProcessorInterface::class);
+        $processor = app(ExpandedProcessor::class);
         $processor->setSettings($settings);
 
+
+
+
         /*
          * Collect journals:
          */
         $jobs->changeStatus($job, 'export_status_collecting_journals');
         $processor->collectJournals();
         $jobs->changeStatus($job, 'export_status_collected_journals');
+
         /*
          * Transform to exportable entries:
          */
         $jobs->changeStatus($job, 'export_status_converting_to_export_format');
         $processor->convertJournals();
         $jobs->changeStatus($job, 'export_status_converted_to_export_format');
+
         /*
          * Transform to (temporary) file:
          */
@@ -180,6 +187,7 @@ class ExportController extends Controller
             $jobs->changeStatus($job, 'export_status_collected_attachments');
         }
 
+
         /*
          * Collect old uploads
          */
diff --git a/app/Http/Requests/ExportFormRequest.php b/app/Http/Requests/ExportFormRequest.php
index 16a5638302..fac7f1ee2c 100644
--- a/app/Http/Requests/ExportFormRequest.php
+++ b/app/Http/Requests/ExportFormRequest.php
@@ -38,20 +38,19 @@ class ExportFormRequest extends Request
     public function rules()
     {
         $sessionFirst = clone session('first');
-
-        $first   = $sessionFirst->subDay()->format('Y-m-d');
-        $today   = Carbon::create()->addDay()->format('Y-m-d');
-        $formats = join(',', array_keys(config('firefly.export_formats')));
+        $first        = $sessionFirst->subDay()->format('Y-m-d');
+        $today        = Carbon::create()->addDay()->format('Y-m-d');
+        $formats      = join(',', array_keys(config('firefly.export_formats')));
 
         return [
-            'export_start_range'  => 'required|date|after:' . $first,
-            'export_end_range'    => 'required|date|before:' . $today,
-            'accounts'            => 'required',
-            'job'                 => 'required|belongsToUser:export_jobs,key',
-            'accounts.*'          => 'required|exists:accounts,id|belongsToUser:accounts',
-            'include_attachments' => 'in:0,1',
-            'include_config'      => 'in:0,1',
-            'exportFormat'        => 'in:' . $formats,
+//            'export_start_range'  => 'required|date|after:' . $first,
+//            'export_end_range'    => 'required|date|before:' . $today,
+//            'accounts'            => 'required',
+//            'job'                 => 'required|belongsToUser:export_jobs,key',
+//            'accounts.*'          => 'required|exists:accounts,id|belongsToUser:accounts',
+//            'include_attachments' => 'in:0,1',
+//            'include_config'      => 'in:0,1',
+//            'exportFormat'        => 'in:' . $formats,
         ];
     }
 }
diff --git a/app/Http/Requests/Request.php b/app/Http/Requests/Request.php
index 16e77bad4a..87e1bf2934 100644
--- a/app/Http/Requests/Request.php
+++ b/app/Http/Requests/Request.php
@@ -28,7 +28,7 @@ class Request extends FormRequest
      *
      * @return bool
      */
-    protected function boolean(string $field): bool
+    public function boolean(string $field): bool
     {
         return intval($this->input($field)) === 1;
     }
diff --git a/app/Models/Transaction.php b/app/Models/Transaction.php
index c9b139d485..2b9deae872 100644
--- a/app/Models/Transaction.php
+++ b/app/Models/Transaction.php
@@ -22,6 +22,42 @@ use Watson\Validating\ValidatingTrait;
 /**
  * Class Transaction
  *
+ * @property-read int $journal_id
+ * @property-read Carbon $date
+ * @property-read string $transaction_description
+ * @property-read string $transaction_amount
+ * @property-read string $transaction_foreign_amount
+ * @property-read string $transaction_type_type
+ *
+ * @property-read int $account_id
+ * @property-read string $account_name
+ * @property string $account_iban
+ * @property string $account_number
+ * @property string $account_bic
+ *
+ * @property-read int $opposing_account_id
+ * @property string $opposing_account_name
+ * @property string $opposing_account_iban
+ * @property string $opposing_account_number
+ * @property string $opposing_account_bic
+ *
+ *
+ * @property-read int $transaction_budget_id
+ * @property-read string $transaction_budget_name
+ * @property-read int $transaction_journal_budget_id
+ * @property-read string $transaction_journal_budget_name
+ *
+ * @property-read int $transaction_category_id
+ * @property-read string $transaction_category_name
+ * @property-read int $transaction_journal_category_id
+ * @property-read string $transaction_journal_category_name
+ *
+ * @property-read int $bill_id
+ * @property string $bill_name
+ *
+ * @property string $notes
+ * @property string $tags
+ *
  * @package FireflyIII\Models
  */
 class Transaction extends Model
diff --git a/resources/views/export/index.twig b/resources/views/export/index.twig
index 3ebcc538ea..2f7aaba776 100644
--- a/resources/views/export/index.twig
+++ b/resources/views/export/index.twig
@@ -8,7 +8,7 @@
 
 
 
-    <form method="POST" action="{{ route('export.export') }}" accept-charset="UTF-8" class="form-horizontal" id="export">
+    <form method="post" action="{{ route('export.submit') }}" accept-charset="UTF-8" class="form-horizontal" id="export">
         <input name="_token" type="hidden" value="{{ csrf_token() }}">
         <input name="job" type="hidden" value="{{ job.key }}">
 
@@ -87,7 +87,9 @@
                         </div>
                     </div>
                     <div class="box-footer">
-                        <input type="submit" name="submit" value="{{ 'do_export'|_ }}" id="do-export-button" class="btn btn-success pull-right"/>
+                        <button type="submit" class="btn pull-right btn-success" id="do-export-button">
+                            {{ 'do_export'|_ }}
+                        </button>
                     </div>
                 </div>
             </div>
@@ -102,7 +104,7 @@
     </script>
     <script type="text/javascript" src="js/lib/modernizr-custom.js"></script>
     <script type="text/javascript" src="js/lib/jquery-ui.min.js"></script>
-    <script type="text/javascript" src="js/ff/export/index.js"></script>
+    <!--<script type="text/javascript" src="js/ff/export/index.js"></script>-->
 {% endblock %}
 {% block styles %}
     <link href="css/jquery-ui/jquery-ui.structure.min.css" type="text/css" rel="stylesheet" media="all">
diff --git a/routes/web.php b/routes/web.php
index 403958be0a..0b0cba2265 100755
--- a/routes/web.php
+++ b/routes/web.php
@@ -200,7 +200,7 @@ Route::group(
     Route::get('status/{jobKey}', ['uses' => 'ExportController@getStatus', 'as' => 'status']);
     Route::get('download/{jobKey}', ['uses' => 'ExportController@download', 'as' => 'download']);
 
-    Route::post('submit', ['uses' => 'ExportController@postIndex', 'as' => 'export']);
+    Route::post('submit', ['uses' => 'ExportController@postIndex', 'as' => 'submit']);
 
 }
 );

From 7d8876f03ccd3d59d8aa4759cd0fa0951381a8f0 Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Fri, 18 Aug 2017 15:14:44 +0200
Subject: [PATCH 046/668] new export routine

---
 app/Console/Commands/UpgradeDatabase.php      | 23 +++++++++----
 app/Export/Entry/Entry.php                    |  5 +--
 app/Export/ExpandedProcessor.php              | 33 ++++++++++++++++++-
 app/Models/Transaction.php                    |  2 ++
 .../Currency/CurrencyRepository.php           | 10 ++++++
 .../Currency/CurrencyRepositoryInterface.php  |  7 ++++
 6 files changed, 70 insertions(+), 10 deletions(-)

diff --git a/app/Console/Commands/UpgradeDatabase.php b/app/Console/Commands/UpgradeDatabase.php
index 59065e4d6c..b70011a8d9 100644
--- a/app/Console/Commands/UpgradeDatabase.php
+++ b/app/Console/Commands/UpgradeDatabase.php
@@ -27,6 +27,7 @@ use FireflyIII\Models\TransactionType;
 use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
 use Illuminate\Console\Command;
 use Illuminate\Database\QueryException;
+use Illuminate\Support\Collection;
 use Log;
 use Preferences;
 use Schema;
@@ -262,15 +263,23 @@ class UpgradeDatabase extends Command
 
         $set->each(
             function (TransactionJournal $transfer) use ($repository) {
-                /** @var Transaction $transaction */
-                $transaction = $transfer->transactions()->where('amount', '<', 0)->first();
-                $this->updateTransactionCurrency($transaction);
-                $this->updateJournalCurrency($transaction);
+                /** @var Collection $transactions */
+                $transactions = $transfer->transactions()->where('amount', '<', 0)->get();
+                $transactions->each(
+                    function (Transaction $transaction) {
+                        $this->updateTransactionCurrency($transaction);
+                        $this->updateJournalCurrency($transaction);
+                    }
+                );
 
 
-                /** @var Transaction $transaction */
-                $transaction = $transfer->transactions()->where('amount', '>', 0)->first();
-                $this->updateTransactionCurrency($transaction);
+                /** @var Collection $transactions */
+                $transactions = $transfer->transactions()->where('amount', '>', 0)->get();
+                $transactions->each(
+                    function (Transaction $transaction) {
+                        $this->updateTransactionCurrency($transaction);
+                    }
+                );
             }
         );
     }
diff --git a/app/Export/Entry/Entry.php b/app/Export/Entry/Entry.php
index 817b71ce43..b652d9ad66 100644
--- a/app/Export/Entry/Entry.php
+++ b/app/Export/Entry/Entry.php
@@ -148,13 +148,14 @@ final class Entry
         $entry->asset_account_iban   = $transaction->account_iban;
         $entry->asset_account_number = $transaction->account_number;
         $entry->asset_account_bic    = $transaction->account_bic;
-        // asset_currency_code
+        $entry->asset_currency_code  = $transaction->account_currency_code;
+
         $entry->opposing_account_id     = $transaction->opposing_account_id;
         $entry->opposing_account_name   = app('steam')->tryDecrypt($transaction->opposing_account_name);
         $entry->opposing_account_iban   = $transaction->opposing_account_iban;
         $entry->opposing_account_number = $transaction->opposing_account_number;
         $entry->opposing_account_bic    = $transaction->opposing_account_bic;
-        // opposing currency code
+        $entry->opposing_currency_code  = $transaction->opposing_currency_code;
 
         /** budget */
         $entry->budget_id   = $transaction->transaction_budget_id;
diff --git a/app/Export/ExpandedProcessor.php b/app/Export/ExpandedProcessor.php
index 703963f27d..569ff55d9d 100644
--- a/app/Export/ExpandedProcessor.php
+++ b/app/Export/ExpandedProcessor.php
@@ -25,6 +25,7 @@ use FireflyIII\Models\AccountMeta;
 use FireflyIII\Models\ExportJob;
 use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionJournalMeta;
+use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
 use Illuminate\Support\Collection;
 use Log;
 use Storage;
@@ -101,17 +102,22 @@ class ExpandedProcessor implements ProcessorInterface
         $notes       = $this->getNotes($ids);
         $tags        = $this->getTags($ids);
         $ibans       = $this->getIbans($assetIds) + $this->getIbans($opposingIds);
+        $currencies  = $this->getAccountCurrencies($ibans);
         $transactions->each(
-            function (Transaction $transaction) use ($notes, $tags, $ibans) {
+            function (Transaction $transaction) use ($notes, $tags, $ibans, $currencies) {
                 $journalId                            = intval($transaction->journal_id);
                 $accountId                            = intval($transaction->account_id);
                 $opposingId                           = intval($transaction->opposing_account_id);
+                $currencyId                           = $ibans[$accountId]['currency_id'] ?? 0;
+                $opposingCurrencyId                   = $ibans[$opposingId]['currency_id'] ?? 0;
                 $transaction->notes                   = $notes[$journalId] ?? '';
                 $transaction->tags                    = join(',', $tags[$journalId] ?? []);
                 $transaction->account_number          = $ibans[$accountId]['accountNumber'] ?? '';
                 $transaction->account_bic             = $ibans[$accountId]['BIC'] ?? '';
+                $transaction->account_currency_code   = $currencies[$currencyId] ?? '';
                 $transaction->opposing_account_number = $ibans[$opposingId]['accountNumber'] ?? '';
                 $transaction->opposing_account_bic    = $ibans[$opposingId]['BIC'] ?? '';
+                $transaction->opposing_currency_code  = $currencies[$opposingCurrencyId] ?? '';
 
             }
         );
@@ -230,6 +236,31 @@ class ExpandedProcessor implements ProcessorInterface
         }
     }
 
+    /**
+     * @param array $array
+     *
+     * @return array
+     */
+    private function getAccountCurrencies(array $array): array
+    {
+        /** @var CurrencyRepositoryInterface $repository */
+        $repository = app(CurrencyRepositoryInterface::class);
+        $return     = [];
+        $ids        = [];
+        $repository->setUser($this->job->user);
+        foreach ($array as $value) {
+            $ids[] = $value['currency_id'] ?? 0;
+        }
+        $ids    = array_unique($ids);
+        $result = $repository->getByIds($ids);
+
+        foreach ($result as $currency) {
+            $return[$currency->id] = $currency->code;
+        }
+
+        return $return;
+    }
+
     /**
      * Get all IBAN / SWIFT / account numbers
      *
diff --git a/app/Models/Transaction.php b/app/Models/Transaction.php
index 2b9deae872..1437532083 100644
--- a/app/Models/Transaction.php
+++ b/app/Models/Transaction.php
@@ -34,12 +34,14 @@ use Watson\Validating\ValidatingTrait;
  * @property string $account_iban
  * @property string $account_number
  * @property string $account_bic
+ * @property string $account_currency_code
  *
  * @property-read int $opposing_account_id
  * @property string $opposing_account_name
  * @property string $opposing_account_iban
  * @property string $opposing_account_number
  * @property string $opposing_account_bic
+ * @property string $opposing_currency_code
  *
  *
  * @property-read int $transaction_budget_id
diff --git a/app/Repositories/Currency/CurrencyRepository.php b/app/Repositories/Currency/CurrencyRepository.php
index 6e0ae64ae7..d86adea16c 100644
--- a/app/Repositories/Currency/CurrencyRepository.php
+++ b/app/Repositories/Currency/CurrencyRepository.php
@@ -166,6 +166,16 @@ class CurrencyRepository implements CurrencyRepositoryInterface
         return TransactionCurrency::get();
     }
 
+    /**
+     * @param array $ids
+     *
+     * @return Collection
+     */
+    public function getByIds(array $ids): Collection
+    {
+        return TransactionCurrency::whereIn('id', $ids)->get();
+    }
+
     /**
      * @param Preference $preference
      *
diff --git a/app/Repositories/Currency/CurrencyRepositoryInterface.php b/app/Repositories/Currency/CurrencyRepositoryInterface.php
index 6c2ccdd61b..07b953aeca 100644
--- a/app/Repositories/Currency/CurrencyRepositoryInterface.php
+++ b/app/Repositories/Currency/CurrencyRepositoryInterface.php
@@ -90,6 +90,13 @@ interface CurrencyRepositoryInterface
      */
     public function get(): Collection;
 
+    /**
+     * @param array $ids
+     *
+     * @return Collection
+     */
+    public function getByIds(array $ids): Collection;
+
     /**
      * @param Preference $preference
      *

From 9b177151757f15f85a9e0d19922a37e8819bcab7 Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Fri, 18 Aug 2017 15:32:11 +0200
Subject: [PATCH 047/668] Fix the unit tests.

---
 app/Console/Commands/UpgradeDatabase.php      |  9 +-
 app/Http/Controllers/ExportController.php     |  5 +-
 app/Models/ExportJob.php                      |  3 +
 app/Providers/FireflyServiceProvider.php      |  5 +-
 database/factories/ModelFactory.php           |  1 +
 .../Controllers/ExportControllerTest.php      |  7 +-
 .../Json/AutoCompleteControllerTest.php       | 87 +++++++++++++++++++
 .../Controllers/JsonControllerTest.php        | 54 ------------
 8 files changed, 101 insertions(+), 70 deletions(-)
 create mode 100644 tests/Feature/Controllers/Json/AutoCompleteControllerTest.php

diff --git a/app/Console/Commands/UpgradeDatabase.php b/app/Console/Commands/UpgradeDatabase.php
index b70011a8d9..bf11fad82d 100644
--- a/app/Console/Commands/UpgradeDatabase.php
+++ b/app/Console/Commands/UpgradeDatabase.php
@@ -71,6 +71,7 @@ class UpgradeDatabase extends Command
         $this->setTransactionIdentifier();
         $this->migrateRepetitions();
         $this->updateAccountCurrencies();
+        $this->line('Updating currency information..');
         $this->updateTransferCurrencies();
         $this->updateOtherCurrencies();
         $this->info('Firefly III database is up to date.');
@@ -218,16 +219,10 @@ class UpgradeDatabase extends Command
                         if (is_null($transaction->transaction_currency_id)) {
                             $transaction->transaction_currency_id = $currency->id;
                             $transaction->save();
-                            $this->line(sprintf('Transaction #%d is set to %s', $transaction->id, $currency->code));
                         }
 
                         // when mismatch in transaction:
                         if ($transaction->transaction_currency_id !== $currency->id) {
-                            $this->line(
-                                sprintf(
-                                    'Transaction #%d is set to %s and foreign %s', $transaction->id, $currency->code, $transaction->transactionCurrency->code
-                                )
-                            );
                             $transaction->foreign_currency_id     = $transaction->transaction_currency_id;
                             $transaction->foreign_amount          = $transaction->amount;
                             $transaction->transaction_currency_id = $currency->id;
@@ -372,12 +367,10 @@ class UpgradeDatabase extends Command
         if (is_null($transaction->transaction_currency_id)) {
             $transaction->transaction_currency_id = $currency->id;
             $transaction->save();
-            $this->line(sprintf('Transaction #%d is set to %s', $transaction->id, $currency->code));
         }
 
         // when mismatch in transaction:
         if ($transaction->transaction_currency_id !== $currency->id) {
-            $this->line(sprintf('Transaction #%d is set to %s and foreign %s', $transaction->id, $currency->code, $transaction->transactionCurrency->code));
             $transaction->foreign_currency_id     = $transaction->transaction_currency_id;
             $transaction->foreign_amount          = $transaction->amount;
             $transaction->transaction_currency_id = $currency->id;
diff --git a/app/Http/Controllers/ExportController.php b/app/Http/Controllers/ExportController.php
index 326ad87c77..0afaba639f 100644
--- a/app/Http/Controllers/ExportController.php
+++ b/app/Http/Controllers/ExportController.php
@@ -152,12 +152,9 @@ class ExportController extends Controller
         $jobs->changeStatus($job, 'export_status_make_exporter');
 
         /** @var ProcessorInterface $processor */
-        $processor = app(ExpandedProcessor::class);
+        $processor = app(ProcessorInterface::class);
         $processor->setSettings($settings);
 
-
-
-
         /*
          * Collect journals:
          */
diff --git a/app/Models/ExportJob.php b/app/Models/ExportJob.php
index 89f2e4554b..6cf10bbb39 100644
--- a/app/Models/ExportJob.php
+++ b/app/Models/ExportJob.php
@@ -13,12 +13,15 @@ declare(strict_types=1);
 
 namespace FireflyIII\Models;
 
+use FireflyIII\User;
 use Illuminate\Database\Eloquent\Model;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 /**
  * Class ExportJob
  *
+ * @property User $user
+ *
  * @package FireflyIII\Models
  */
 class ExportJob extends Model
diff --git a/app/Providers/FireflyServiceProvider.php b/app/Providers/FireflyServiceProvider.php
index a2b6429f20..2323ba9340 100644
--- a/app/Providers/FireflyServiceProvider.php
+++ b/app/Providers/FireflyServiceProvider.php
@@ -13,7 +13,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Providers;
 
-use FireflyIII\Export\Processor;
+use FireflyIII\Export\ExpandedProcessor;
 use FireflyIII\Export\ProcessorInterface;
 use FireflyIII\Generator\Chart\Basic\ChartJsGenerator;
 use FireflyIII\Generator\Chart\Basic\GeneratorInterface;
@@ -138,7 +138,8 @@ class FireflyServiceProvider extends ServiceProvider
         );
 
         // other generators
-        $this->app->bind(ProcessorInterface::class, Processor::class);
+        // export:
+        $this->app->bind(ProcessorInterface::class, ExpandedProcessor::class);
         $this->app->bind(UserRepositoryInterface::class, UserRepository::class);
         $this->app->bind(AttachmentHelperInterface::class, AttachmentHelper::class);
 
diff --git a/database/factories/ModelFactory.php b/database/factories/ModelFactory.php
index c014cb7078..8669ccf1b3 100644
--- a/database/factories/ModelFactory.php
+++ b/database/factories/ModelFactory.php
@@ -210,6 +210,7 @@ $factory->define(
         'id'              => $faker->unique()->numberBetween(1000, 10000),
         'name'            => $faker->words(3, true),
         'account_type_id' => 1,
+        'active'          => true,
     ];
 }
 );
diff --git a/tests/Feature/Controllers/ExportControllerTest.php b/tests/Feature/Controllers/ExportControllerTest.php
index 9f66e44c9c..6de839c908 100644
--- a/tests/Feature/Controllers/ExportControllerTest.php
+++ b/tests/Feature/Controllers/ExportControllerTest.php
@@ -143,12 +143,15 @@ class ExportControllerTest extends TestCase
         $processor->shouldReceive('collectOldUploads')->once();
         $processor->shouldReceive('collectAttachments')->once();
 
+        $job = new ExportJob;
+        $job->user = $this->user();
+
         $repository->shouldReceive('changeStatus')->andReturn(true);
-        $repository->shouldReceive('findByKey')->andReturn(new ExportJob);
+        $repository->shouldReceive('findByKey')->andReturn($job);
 
         $this->be($this->user());
 
-        $response = $this->post(route('export.export'), $data);
+        $response = $this->post(route('export.submit'), $data);
         $response->assertStatus(200);
         $response->assertSee('ok');
     }
diff --git a/tests/Feature/Controllers/Json/AutoCompleteControllerTest.php b/tests/Feature/Controllers/Json/AutoCompleteControllerTest.php
new file mode 100644
index 0000000000..e00cfb2c13
--- /dev/null
+++ b/tests/Feature/Controllers/Json/AutoCompleteControllerTest.php
@@ -0,0 +1,87 @@
+<?php
+/**
+ * AutoCompleteControllerTest.php
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types=1);
+
+namespace Tests\Feature\Controllers\Json;
+
+
+use FireflyIII\Models\Account;
+use FireflyIII\Models\AccountType;
+use FireflyIII\Models\TransactionJournal;
+use FireflyIII\Repositories\Account\AccountRepositoryInterface;
+use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
+use Illuminate\Support\Collection;
+use Tests\TestCase;
+
+/**
+ * Class AutoCompleteControllerTest
+ *
+ * @package Tests\Feature\Controllers\Json
+ */
+class AutoCompleteControllerTest extends TestCase
+{
+
+    /**
+     * @covers \FireflyIII\Http\Controllers\Json\AutoCompleteController::allAccounts
+     */
+    public function testAllAccounts()
+    {
+        $accountRepos = $this->mock(AccountRepositoryInterface::class);
+        $accountRepos->shouldReceive('getAccountsByType')
+                     ->withArgs([[AccountType::REVENUE, AccountType::EXPENSE, AccountType::BENEFICIARY, AccountType::DEFAULT, AccountType::ASSET]])
+                     ->andReturn(new Collection);
+
+        $this->be($this->user());
+        $response = $this->get(route('json.all-accounts'));
+        $response->assertStatus(200);
+    }
+
+    /**
+     * @covers \FireflyIII\Http\Controllers\Json\AutoCompleteController::expenseAccounts
+     */
+    public function testExpenseAccounts()
+    {
+        // mock stuff
+        $account      = factory(Account::class)->make();
+        $accountRepos = $this->mock(AccountRepositoryInterface::class);
+        $journalRepos = $this->mock(JournalRepositoryInterface::class);
+        $journalRepos->shouldReceive('first')->once()->andReturn(new TransactionJournal);
+        $accountRepos->shouldReceive('getAccountsByType')->withArgs([[AccountType::EXPENSE, AccountType::BENEFICIARY]])->once()->andReturn(
+            new Collection([$account])
+        );
+
+        $this->be($this->user());
+        $response = $this->get(route('json.expense-accounts'));
+        $response->assertStatus(200);
+        $response->assertExactJson([$account->name]);
+    }
+
+    /**
+     * @covers \FireflyIII\Http\Controllers\Json\AutoCompleteController::revenueAccounts
+     */
+    public function testRevenueAccounts()
+    {
+        // mock stuff
+        $account      = factory(Account::class)->make();
+        $accountRepos = $this->mock(AccountRepositoryInterface::class);
+        $journalRepos = $this->mock(JournalRepositoryInterface::class);
+        $journalRepos->shouldReceive('first')->once()->andReturn(new TransactionJournal);
+        $accountRepos->shouldReceive('getAccountsByType')->withArgs([[AccountType::REVENUE]])->once()->andReturn(
+            new Collection([$account])
+        );
+
+        $this->be($this->user());
+        $response = $this->get(route('json.revenue-accounts'));
+        $response->assertStatus(200);
+        $response->assertExactJson([$account->name]);
+    }
+
+}
\ No newline at end of file
diff --git a/tests/Feature/Controllers/JsonControllerTest.php b/tests/Feature/Controllers/JsonControllerTest.php
index 2afd48ca56..bef5b28839 100644
--- a/tests/Feature/Controllers/JsonControllerTest.php
+++ b/tests/Feature/Controllers/JsonControllerTest.php
@@ -54,21 +54,6 @@ class JsonControllerTest extends TestCase
         $response->assertStatus(200);
     }
 
-    /**
-     * @covers \FireflyIII\Http\Controllers\JsonController::allAccounts
-     */
-    public function testAllAccounts()
-    {
-        $accountRepos = $this->mock(AccountRepositoryInterface::class);
-        $accountRepos->shouldReceive('getAccountsByType')
-                     ->withArgs([[AccountType::REVENUE, AccountType::EXPENSE, AccountType::BENEFICIARY, AccountType::DEFAULT, AccountType::ASSET]])
-                     ->andReturn(new Collection);
-
-        $this->be($this->user());
-        $response = $this->get(route('json.all-accounts'));
-        $response->assertStatus(200);
-    }
-
     /**
      * @covers \FireflyIII\Http\Controllers\JsonController::allTransactionJournals()
      */
@@ -210,45 +195,6 @@ class JsonControllerTest extends TestCase
         $response->assertExactJson([$category->name]);
     }
 
-    /**
-     * @covers \FireflyIII\Http\Controllers\JsonController::expenseAccounts
-     */
-    public function testExpenseAccounts()
-    {
-        // mock stuff
-        $account      = factory(Category::class)->make();
-        $accountRepos = $this->mock(AccountRepositoryInterface::class);
-        $journalRepos = $this->mock(JournalRepositoryInterface::class);
-        $journalRepos->shouldReceive('first')->once()->andReturn(new TransactionJournal);
-        $accountRepos->shouldReceive('getAccountsByType')->withArgs([[AccountType::EXPENSE, AccountType::BENEFICIARY]])->once()->andReturn(
-            new Collection([$account])
-        );
-
-        $this->be($this->user());
-        $response = $this->get(route('json.expense-accounts'));
-        $response->assertStatus(200);
-        $response->assertExactJson([$account->name]);
-    }
-
-    /**
-     * @covers \FireflyIII\Http\Controllers\JsonController::revenueAccounts
-     */
-    public function testRevenueAccounts()
-    {
-        // mock stuff
-        $account      = factory(Category::class)->make();
-        $accountRepos = $this->mock(AccountRepositoryInterface::class);
-        $journalRepos = $this->mock(JournalRepositoryInterface::class);
-        $journalRepos->shouldReceive('first')->once()->andReturn(new TransactionJournal);
-        $accountRepos->shouldReceive('getAccountsByType')->withArgs([[AccountType::REVENUE]])->once()->andReturn(
-            new Collection([$account])
-        );
-
-        $this->be($this->user());
-        $response = $this->get(route('json.revenue-accounts'));
-        $response->assertStatus(200);
-        $response->assertExactJson([$account->name]);
-    }
 
     /**
      * @covers \FireflyIII\Http\Controllers\JsonController::tags

From 3e64028e295391cc712d9bfe21a4b2c3edc3946e Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Fri, 18 Aug 2017 15:38:23 +0200
Subject: [PATCH 048/668] Reinstate export javascript

---
 resources/views/export/index.twig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/export/index.twig b/resources/views/export/index.twig
index 2f7aaba776..6279fef14b 100644
--- a/resources/views/export/index.twig
+++ b/resources/views/export/index.twig
@@ -104,7 +104,7 @@
     </script>
     <script type="text/javascript" src="js/lib/modernizr-custom.js"></script>
     <script type="text/javascript" src="js/lib/jquery-ui.min.js"></script>
-    <!--<script type="text/javascript" src="js/ff/export/index.js"></script>-->
+    <script type="text/javascript" src="js/ff/export/index.js"></script>
 {% endblock %}
 {% block styles %}
     <link href="css/jquery-ui/jquery-ui.structure.min.css" type="text/css" rel="stylesheet" media="all">

From 4b46a3d29840a248e64ad4418eefd2f7e5d1cca3 Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Fri, 18 Aug 2017 15:38:33 +0200
Subject: [PATCH 049/668] Update composer.lock file.

---
 composer.lock | 52 ++++++++++++++++++++++++++-------------------------
 1 file changed, 27 insertions(+), 25 deletions(-)

diff --git a/composer.lock b/composer.lock
index a405cfb5a7..55445326ed 100644
--- a/composer.lock
+++ b/composer.lock
@@ -507,33 +507,33 @@
         },
         {
             "name": "doctrine/inflector",
-            "version": "v1.1.0",
+            "version": "v1.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/inflector.git",
-                "reference": "90b2128806bfde671b6952ab8bea493942c1fdae"
+                "reference": "e11d84c6e018beedd929cff5220969a3c6d1d462"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/inflector/zipball/90b2128806bfde671b6952ab8bea493942c1fdae",
-                "reference": "90b2128806bfde671b6952ab8bea493942c1fdae",
+                "url": "https://api.github.com/repos/doctrine/inflector/zipball/e11d84c6e018beedd929cff5220969a3c6d1d462",
+                "reference": "e11d84c6e018beedd929cff5220969a3c6d1d462",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.2"
+                "php": "^7.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "4.*"
+                "phpunit/phpunit": "^6.2"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.1.x-dev"
+                    "dev-master": "1.2.x-dev"
                 }
             },
             "autoload": {
-                "psr-0": {
-                    "Doctrine\\Common\\Inflector\\": "lib/"
+                "psr-4": {
+                    "Doctrine\\Common\\Inflector\\": "lib/Doctrine/Common/Inflector"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -570,7 +570,7 @@
                 "singularize",
                 "string"
             ],
-            "time": "2015-11-06T14:35:42+00:00"
+            "time": "2017-07-22T12:18:28+00:00"
         },
         {
             "name": "doctrine/lexer",
@@ -670,20 +670,20 @@
         },
         {
             "name": "laravel/framework",
-            "version": "v5.4.32",
+            "version": "v5.4.33",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/framework.git",
-                "reference": "b8300578d159199b1195413b67318c79068cd24d"
+                "reference": "e53a81a2bf406f501cdf818ad949f8d6c8dabfc0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/framework/zipball/b8300578d159199b1195413b67318c79068cd24d",
-                "reference": "b8300578d159199b1195413b67318c79068cd24d",
+                "url": "https://api.github.com/repos/laravel/framework/zipball/e53a81a2bf406f501cdf818ad949f8d6c8dabfc0",
+                "reference": "e53a81a2bf406f501cdf818ad949f8d6c8dabfc0",
                 "shasum": ""
             },
             "require": {
-                "doctrine/inflector": "~1.1.0",
+                "doctrine/inflector": "~1.1",
                 "erusev/parsedown": "~1.6",
                 "ext-mbstring": "*",
                 "ext-openssl": "*",
@@ -795,7 +795,7 @@
                 "framework",
                 "laravel"
             ],
-            "time": "2017-08-03T12:59:42+00:00"
+            "time": "2017-08-14T20:17:41+00:00"
         },
         {
             "name": "laravelcollective/html",
@@ -2929,29 +2929,31 @@
         },
         {
             "name": "fzaninotto/faker",
-            "version": "v1.6.0",
+            "version": "v1.7.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/fzaninotto/Faker.git",
-                "reference": "44f9a286a04b80c76a4e5fb7aad8bb539b920123"
+                "reference": "d3ed4cc37051c1ca52d22d76b437d14809fc7e0d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/fzaninotto/Faker/zipball/44f9a286a04b80c76a4e5fb7aad8bb539b920123",
-                "reference": "44f9a286a04b80c76a4e5fb7aad8bb539b920123",
+                "url": "https://api.github.com/repos/fzaninotto/Faker/zipball/d3ed4cc37051c1ca52d22d76b437d14809fc7e0d",
+                "reference": "d3ed4cc37051c1ca52d22d76b437d14809fc7e0d",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.3.3|^7.0"
+                "php": "^5.3.3 || ^7.0"
             },
             "require-dev": {
                 "ext-intl": "*",
-                "phpunit/phpunit": "~4.0",
-                "squizlabs/php_codesniffer": "~1.5"
+                "phpunit/phpunit": "^4.0 || ^5.0",
+                "squizlabs/php_codesniffer": "^1.5"
             },
             "type": "library",
             "extra": {
-                "branch-alias": []
+                "branch-alias": {
+                    "dev-master": "1.8-dev"
+                }
             },
             "autoload": {
                 "psr-4": {
@@ -2973,7 +2975,7 @@
                 "faker",
                 "fixtures"
             ],
-            "time": "2016-04-29T12:21:54+00:00"
+            "time": "2017-08-15T16:48:10+00:00"
         },
         {
             "name": "guzzle/guzzle",

From 93068659e5ae624c3263344aaa5429d371aa74a4 Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Fri, 18 Aug 2017 17:08:30 +0200
Subject: [PATCH 050/668] Bunq code.

---
 app/Services/Bunq/Id/BunqId.php               |  43 ++
 app/Services/Bunq/Id/DeviceServerId.php       |  25 ++
 app/Services/Bunq/Id/DeviceSessionId.php      |  24 ++
 app/Services/Bunq/Id/InstallationId.php       |  24 ++
 app/Services/Bunq/Object/BunqObject.php       |  23 ++
 app/Services/Bunq/Object/ServerPublicKey.php  |  51 +++
 app/Services/Bunq/Object/UserPerson.php       | 134 +++++++
 app/Services/Bunq/Request/BunqRequest.php     | 374 ++++++++++++++++++
 .../Bunq/Request/InstallationTokenRequest.php | 149 +++++++
 app/Services/Bunq/Token/BunqToken.php         |  89 +++++
 app/Services/Bunq/Token/InstallationToken.php |  24 ++
 app/Services/Bunq/Token/SessionToken.php      |  25 ++
 12 files changed, 985 insertions(+)
 create mode 100644 app/Services/Bunq/Id/BunqId.php
 create mode 100644 app/Services/Bunq/Id/DeviceServerId.php
 create mode 100644 app/Services/Bunq/Id/DeviceSessionId.php
 create mode 100644 app/Services/Bunq/Id/InstallationId.php
 create mode 100644 app/Services/Bunq/Object/BunqObject.php
 create mode 100644 app/Services/Bunq/Object/ServerPublicKey.php
 create mode 100644 app/Services/Bunq/Object/UserPerson.php
 create mode 100644 app/Services/Bunq/Request/BunqRequest.php
 create mode 100644 app/Services/Bunq/Request/InstallationTokenRequest.php
 create mode 100644 app/Services/Bunq/Token/BunqToken.php
 create mode 100644 app/Services/Bunq/Token/InstallationToken.php
 create mode 100644 app/Services/Bunq/Token/SessionToken.php

diff --git a/app/Services/Bunq/Id/BunqId.php b/app/Services/Bunq/Id/BunqId.php
new file mode 100644
index 0000000000..9752d71ba3
--- /dev/null
+++ b/app/Services/Bunq/Id/BunqId.php
@@ -0,0 +1,43 @@
+<?php
+
+/**
+ * BunqId.php
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Services\Bunq\Id;
+
+/**
+ * Class BunqId
+ *
+ * @package FireflyIII\Services\Bunq\Id
+ */
+class BunqId
+{
+    /** @var int */
+    private $id = 0;
+
+    /**
+     * @return int
+     */
+    public function getId(): int
+    {
+        return $this->id;
+    }
+
+    /**
+     * @param int $id
+     */
+    public function setId(int $id)
+    {
+        $this->id = $id;
+    }
+
+
+}
\ No newline at end of file
diff --git a/app/Services/Bunq/Id/DeviceServerId.php b/app/Services/Bunq/Id/DeviceServerId.php
new file mode 100644
index 0000000000..b8b845fd7e
--- /dev/null
+++ b/app/Services/Bunq/Id/DeviceServerId.php
@@ -0,0 +1,25 @@
+<?php
+
+/**
+ * DeviceServerId.php
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Services\Bunq\Id;
+
+
+/**
+ * Class DeviceServerId
+ *
+ * @package Bunq\Id
+ */
+class DeviceServerId extends BunqId
+{
+
+}
\ No newline at end of file
diff --git a/app/Services/Bunq/Id/DeviceSessionId.php b/app/Services/Bunq/Id/DeviceSessionId.php
new file mode 100644
index 0000000000..2010ec1e9f
--- /dev/null
+++ b/app/Services/Bunq/Id/DeviceSessionId.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * DeviceSessionId.php
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Services\Bunq\Id;
+
+
+/**
+ * Class DeviceSessionId
+ *
+ * @package Bunq\Id
+ */
+class DeviceSessionId extends BunqId
+{
+
+}
\ No newline at end of file
diff --git a/app/Services/Bunq/Id/InstallationId.php b/app/Services/Bunq/Id/InstallationId.php
new file mode 100644
index 0000000000..3716b1dab9
--- /dev/null
+++ b/app/Services/Bunq/Id/InstallationId.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * InstallationId.php
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Services\Bunq\Id;
+
+
+/**
+ * Class InstallationId
+ *
+ * @package Bunq\Id
+ */
+class InstallationId extends BunqId
+{
+
+}
\ No newline at end of file
diff --git a/app/Services/Bunq/Object/BunqObject.php b/app/Services/Bunq/Object/BunqObject.php
new file mode 100644
index 0000000000..069348169b
--- /dev/null
+++ b/app/Services/Bunq/Object/BunqObject.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * BunqObject.php
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Services\Bunq\Object;
+
+/**
+ * Class BunqObject
+ *
+ * @package FireflyIII\Services\Bunq\Object
+ */
+class BunqObject
+{
+
+}
\ No newline at end of file
diff --git a/app/Services/Bunq/Object/ServerPublicKey.php b/app/Services/Bunq/Object/ServerPublicKey.php
new file mode 100644
index 0000000000..78426d34d1
--- /dev/null
+++ b/app/Services/Bunq/Object/ServerPublicKey.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * ServerPublicKey.php
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Services\Bunq\Object;
+
+/**
+ * Class ServerPublicKey
+ *
+ * @package Bunq\Object
+ */
+class ServerPublicKey extends BunqObject
+{
+    /** @var string */
+    private $publicKey = '';
+
+    /**
+     * ServerPublicKey constructor.
+     *
+     * @param array $response
+     */
+    public function __construct(array $response) {
+        $this->publicKey = $response['server_public_key'];
+    }
+
+    /**
+     * @param string $publicKey
+     */
+    public function setPublicKey(string $publicKey)
+    {
+        $this->publicKey = $publicKey;
+    }
+
+    /**
+     * @return string
+     */
+    public function getPublicKey(): string
+    {
+        return $this->publicKey;
+    }
+
+
+}
\ No newline at end of file
diff --git a/app/Services/Bunq/Object/UserPerson.php b/app/Services/Bunq/Object/UserPerson.php
new file mode 100644
index 0000000000..963357ab51
--- /dev/null
+++ b/app/Services/Bunq/Object/UserPerson.php
@@ -0,0 +1,134 @@
+<?php
+/**
+ * UserPerson.php
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Services\Bunq\Object;
+
+use Carbon\Carbon;
+
+/**
+ * Class UserPerson
+ *
+ * @package Bunq\Object
+ */
+class UserPerson extends BunqObject
+{
+    private $addressMain;
+    private $addressPostal;
+    /** @var array */
+    private $aliases = [];
+    private $avatar;
+    /** @var array */
+    private $billingContracts = [];
+    /** @var string */
+    private $countryOfBirth = '';
+    /** @var Carbon */
+    private $created;
+    private $customer;
+    private $customerLimit;
+    private $dailyLimit;
+    /** @var Carbon */
+    private $dateOfBirth;
+    /** @var string */
+    private $displayName = '';
+    /** @var string */
+    private $documentCountry = '';
+    /** @var string */
+    private $documentNumber = '';
+    /** @var string */
+    private $documentType = '';
+    /** @var string */
+    private $firstName = '';
+    /** @var string */
+    private $gender = '';
+    /** @var int */
+    private $id = 0;
+    /** @var string */
+    private $language = '';
+    /** @var string */
+    private $lastName = '';
+    /** @var string */
+    private $legalName = '';
+    /** @var string */
+    private $middleName = '';
+    /** @var string */
+    private $nationality = '';
+    /** @var array */
+    private $notificationFilters = [];
+    /** @var string */
+    private $placeOfBirth = '';
+    /** @var string */
+    private $publicNickName = '';
+    /** @var string */
+    private $publicUuid = '';
+    private $region;
+    /** @var int */
+    private $sessionTimeout = 0;
+    /** @var string */
+    private $status = '';
+    /** @var string */
+    private $subStatus = '';
+    /** @var string */
+    private $taxResident = '';
+    /** @var Carbon */
+    private $updated;
+    /** @var int */
+    private $versionTos = 0;
+
+    /**
+     * UserPerson constructor.
+     *
+     * @param array $data
+     */
+    public function __construct(array $data)
+    {
+        $this->id              = intval($data['id']);
+        $this->created         = Carbon::createFromFormat('Y-m-d H:i:s.u', $data['created']);
+        $this->updated         = Carbon::createFromFormat('Y-m-d H:i:s.u', $data['updated']);
+        $this->status          = $data['status'];
+        $this->subStatus       = $data['sub_status'];
+        $this->publicUuid      = $data['public_uuid'];
+        $this->displayName     = $data['display_name'];
+        $this->publicNickName  = $data['public_nick_name'];
+        $this->language        = $data['language'];
+        $this->region          = $data['region'];
+        $this->sessionTimeout  = intval($data['session_timeout']);
+        $this->firstName       = $data['first_name'];
+        $this->middleName      = $data['middle_name'];
+        $this->lastName        = $data['last_name'];
+        $this->legalName       = $data['legal_name'];
+        $this->taxResident     = $data['tax_resident'];
+        $this->dateOfBirth     = Carbon::createFromFormat('Y-m-d', $data['date_of_birth']);
+        $this->placeOfBirth    = $data['place_of_birth'];
+        $this->countryOfBirth  = $data['country_of_birth'];
+        $this->nationality     = $data['nationality'];
+        $this->gender          = $data['gender'];
+        $this->versionTos      = intval($data['version_terms_of_service']);
+        $this->documentNumber  = $data['document_number'];
+        $this->documentType    = $data['document_type'];
+        $this->documentCountry = $data['document_country_of_issuance'];
+
+        // create aliases
+        // create avatar
+        // create daily limit
+        // create notification filters
+        // create address main, postal
+        // document front, back attachment
+        // customer, customer_limit
+        // billing contracts
+
+        //        echo '<pre>';
+        //        print_r($data);
+        //        var_dump($this);
+        //        echo '</pre>';
+    }
+
+}
\ No newline at end of file
diff --git a/app/Services/Bunq/Request/BunqRequest.php b/app/Services/Bunq/Request/BunqRequest.php
new file mode 100644
index 0000000000..4226204f0e
--- /dev/null
+++ b/app/Services/Bunq/Request/BunqRequest.php
@@ -0,0 +1,374 @@
+<?php
+/**
+ * BunqRequest.php
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Services\Bunq\Request;
+
+use Bunq\Object\ServerPublicKey;
+use Exception;
+use Monolog\Handler\StreamHandler;
+use Monolog\Logger;
+use Requests;
+use Requests_Exception;
+
+/**
+ * Class BunqRequest
+ *
+ * @package Bunq\Request
+ */
+abstract class BunqRequest
+{
+    /** @var bool */
+    protected $fake = false;
+    /** @var string */
+    protected $secret = '';
+    /** @var  Logger */
+    private $logger;
+    /** @var string */
+    private $privateKey = '';
+    /** @var string */
+    private $server = '';
+    /** @var  ServerPublicKey */
+    private $serverPublicKey;
+    private $upperCaseHeaders
+        = [
+            'x-bunq-client-response-id' => 'X-Bunq-Client-Response-Id',
+            'x-bunq-client-request-id'  => 'X-Bunq-Client-Request-Id',
+        ];
+
+    public function __construct()
+    {
+
+
+        // create a log channel
+        $this->logger = new Logger('bunq-request');
+        $this->logger->pushHandler(new StreamHandler('logs/bunq.log', Logger::DEBUG));
+        $this->logger->debug('Hallo dan');
+    }
+
+    /**
+     *
+     */
+    abstract public function call(): void;
+
+    /**
+     * @return string
+     */
+    public function getServer(): string
+    {
+        return $this->server;
+    }
+
+    /**
+     * @param string $server
+     */
+    public function setServer(string $server)
+    {
+        $this->server = $server;
+    }
+
+    /**
+     * @param bool $fake
+     */
+    public function setFake(bool $fake)
+    {
+        $this->fake = $fake;
+    }
+
+    /**
+     * @param string $privateKey
+     */
+    public function setPrivateKey(string $privateKey)
+    {
+        $this->privateKey = $privateKey;
+    }
+
+    /**
+     * @param string $secret
+     */
+    public function setSecret(string $secret)
+    {
+        $this->secret = $secret;
+    }
+
+    /**
+     * @param ServerPublicKey $serverPublicKey
+     */
+    public function setServerPublicKey(ServerPublicKey $serverPublicKey)
+    {
+        $this->serverPublicKey = $serverPublicKey;
+    }
+
+    /**
+     * @param string $method
+     * @param string $uri
+     * @param array  $headers
+     * @param string $data
+     *
+     * @return string
+     */
+    protected function generateSignature(string $method, string $uri, array $headers, string $data): string
+    {
+        if (strlen($this->privateKey) === 0) {
+            throw new Exception('No private key present.');
+        }
+        if (strtolower($method) === 'get') {
+            $data = '';
+        }
+
+        $uri           = str_replace(['https://api.bunq.com', 'https://sandbox.public.api.bunq.com'], '', $uri);
+        $toSign        = strtoupper($method) . ' ' . $uri . "\n";
+        $headersToSign = ['Cache-Control', 'User-Agent'];
+        ksort($headers);
+        foreach ($headers as $name => $value) {
+            if (in_array($name, $headersToSign) || substr($name, 0, 7) === 'X-Bunq-') {
+                $toSign .= $name . ': ' . $value . "\n";
+            }
+        }
+        $toSign    .= "\n" . $data;
+        $signature = '';
+
+        openssl_sign($toSign, $signature, $this->privateKey, OPENSSL_ALGO_SHA256);
+        $signature = base64_encode($signature);
+
+        return $signature;
+    }
+
+    protected function getDefaultHeaders(): array
+    {
+        return [
+            'X-Bunq-Client-Request-Id' => uniqid('sander'),
+            'Cache-Control'            => 'no-cache',
+            'User-Agent'               => 'pre-Firefly III test thing',
+            'X-Bunq-Language'          => 'en_US',
+            'X-Bunq-Region'            => 'nl_NL',
+            'X-Bunq-Geolocation'       => '0 0 0 0 NL',
+        ];
+    }
+
+    /**
+     * @param string $key
+     * @param array  $response
+     *
+     * @return array
+     */
+    protected function getKeyFromResponse(string $key, array $response): array
+    {
+        if (isset($response['Response'])) {
+            foreach ($response['Response'] as $entry) {
+                $currentKey = key($entry);
+                $data       = current($entry);
+                if ($currentKey === $key) {
+                    return $data;
+                }
+            }
+        }
+
+        return [];
+    }
+
+    /**
+     * @param string $uri
+     * @param array  $data
+     * @param array  $headers
+     *
+     * @return array
+     * @throws Exception
+     */
+    protected function sendSignedBunqGet(string $uri, array $data, array $headers): array
+    {
+        if (strlen($this->server) === 0) {
+            throw new Exception('No bunq server defined');
+        }
+
+        $body                               = json_encode($data);
+        $fullUri                            = $this->server . $uri;
+        $signature                          = $this->generateSignature('get', $uri, $headers, $body);
+        $headers['X-Bunq-Client-Signature'] = $signature;
+        try {
+            $response = Requests::get($fullUri, $headers);
+        } catch (Requests_Exception $e) {
+            return ['Error' => [0 => ['error_description' => $e->getMessage(), 'error_description_translated' => $e->getMessage()],]];
+        }
+
+        $body  = $response->body;
+        $array = json_decode($body, true);
+        if ($this->isErrorResponse($array)) {
+            $this->throwResponseError($array);
+        }
+        $responseHeaders = $response->headers->getAll();
+        $statusCode      = $response->status_code;
+        if (!$this->verifyServerSignature($body, $responseHeaders, $statusCode)) {
+            throw new Exception(sprintf('Could not verify signature for request to "%s"', $uri));
+        }
+        $array['ResponseHeaders'] = $responseHeaders;
+
+        return $array;
+    }
+
+    /**
+     * @param string $uri
+     * @param array  $data
+     * @param array  $headers
+     *
+     * @return array
+     * @throws Exception
+     */
+    protected function sendSignedBunqPost(string $uri, array $data, array $headers): array
+    {
+        $body                               = json_encode($data);
+        $fullUri                            = $this->server . $uri;
+        $signature                          = $this->generateSignature('post', $uri, $headers, $body);
+        $headers['X-Bunq-Client-Signature'] = $signature;
+        try {
+            $response = Requests::post($fullUri, $headers, $body);
+        } catch (Requests_Exception $e) {
+            return ['Error' => [0 => ['error_description' => $e->getMessage(), 'error_description_translated' => $e->getMessage()],]];
+        }
+
+        $body  = $response->body;
+        $array = json_decode($body, true);
+        if ($this->isErrorResponse($array)) {
+            $this->throwResponseError($array);
+        }
+        $responseHeaders = $response->headers->getAll();
+        $statusCode      = $response->status_code;
+        if (!$this->verifyServerSignature($body, $responseHeaders, $statusCode)) {
+            throw new Exception(sprintf('Could not verify signature for request to "%s"', $uri));
+        }
+        $array['ResponseHeaders'] = $responseHeaders;
+
+        return $array;
+    }
+
+    /**
+     * @param string $uri
+     * @param array  $data
+     * @param array  $headers
+     *
+     * @return array
+     */
+    protected function sendUnsignedBunqPost(string $uri, array $data, array $headers): array
+    {
+        $body    = json_encode($data);
+        $fullUri = $this->server . $uri;
+        try {
+            $response = Requests::post($fullUri, $headers, $body);
+        } catch (Requests_Exception $e) {
+            return ['Error' => [0 => ['error_description' => $e->getMessage(), 'error_description_translated' => $e->getMessage()],]];
+        }
+        $body            = $response->body;
+        $responseHeaders = $response->headers->getAll();
+        $array           = json_decode($body, true);
+        if ($this->isErrorResponse($array)) {
+            $this->throwResponseError($array);
+        }
+        $array['ResponseHeaders'] = $responseHeaders;
+
+        return $array;
+    }
+
+    /**
+     * @param array $response
+     *
+     * @return bool
+     */
+    private function isErrorResponse(array $response): bool
+    {
+        $key = key($response);
+        if ($key === 'Error') {
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * @param array $response
+     *
+     * @throws Exception
+     */
+    private function throwResponseError(array $response)
+    {
+        echo '<hr><pre>' . print_r($response, true) . '</pre><hr>';
+        $message = [];
+        if (isset($response['Error'])) {
+            foreach ($response['Error'] as $error) {
+                $message[] = $error['error_description'];
+            }
+        }
+        throw new Exception(join(', ', $message));
+    }
+
+    /**
+     * @param string $body
+     * @param array  $headers
+     * @param int    $statusCode
+     *
+     * @return bool
+     * @throws Exception
+     */
+    private function verifyServerSignature(string $body, array $headers, int $statusCode): bool
+    {
+        $this->logger->debug('Going to verify signature for body+headers+status');
+        $dataToVerify  = $statusCode . "\n";
+        $verifyHeaders = [];
+
+        // false when no public key is present
+        if (is_null($this->serverPublicKey)) {
+            $this->logger->error('No public key present in class, so return FALSE.');
+
+            return false;
+        }
+        //$this->logger->debug('Given headers', $headers);
+        foreach ($headers as $header => $value) {
+
+            // skip non-bunq headers or signature
+            if (substr($header, 0, 7) !== 'x-bunq-' || $header === 'x-bunq-server-signature') {
+                continue;
+            }
+            // need to have upper case variant of header:
+            if (!isset($this->upperCaseHeaders[$header])) {
+                throw new Exception(sprintf('No upper case variant for header "%s"', $header));
+            }
+            $header                 = $this->upperCaseHeaders[$header];
+            $verifyHeaders[$header] = $value[0];
+        }
+        // sort verification headers:
+        ksort($verifyHeaders);
+
+        //$this->logger->debug('Final headers for verification', $verifyHeaders);
+
+        // add them to data to sign:
+        foreach ($verifyHeaders as $header => $value) {
+            $dataToVerify .= $header . ': ' . trim($value) . "\n";
+        }
+
+        $signature    = $headers['x-bunq-server-signature'][0];
+        $dataToVerify .= "\n" . $body;
+
+        //$this->logger->debug(sprintf('Signature to verify: "%s"', $signature));
+
+        $result = openssl_verify($dataToVerify, base64_decode($signature), $this->serverPublicKey->getPublicKey(), OPENSSL_ALGO_SHA256);
+
+        if (is_int($result) && $result < 1) {
+            $this->logger->error(sprintf('Result of verification is %d, return false.', $result));
+
+            return false;
+        }
+        if (!is_int($result)) {
+            $this->logger->error(sprintf('Result of verification is a boolean (%d), return false.', $result));
+        }
+        $this->logger->info('Signature is a match, return true.');
+
+        return true;
+    }
+}
\ No newline at end of file
diff --git a/app/Services/Bunq/Request/InstallationTokenRequest.php b/app/Services/Bunq/Request/InstallationTokenRequest.php
new file mode 100644
index 0000000000..d23e573a18
--- /dev/null
+++ b/app/Services/Bunq/Request/InstallationTokenRequest.php
@@ -0,0 +1,149 @@
+<?php
+/**
+ * InstallationTokenRequest.php
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Services\Bunq\Request;
+
+use FireflyIII\Services\Bunq\Id\InstallationId;
+
+/**
+ * Class InstallationTokenRequest
+ *
+ * @package FireflyIII\Services\Bunq\Request
+ */
+class InstallationTokenRequest extends BunqRequest
+{
+    /** @var InstallationId */
+    private $installationId;
+    /** @var  InstallationToken */
+    private $installationToken;
+    /** @var string */
+    private $publicKey = '';
+    /** @var  ServerPublicKey */
+    private $serverPublicKey;
+
+    /**
+     *
+     */
+    public function call(): void
+    {
+        $uri      = '/v1/installation';
+        $data     = ['client_public_key' => $this->publicKey,];
+        $headers  = $this->getDefaultHeaders();
+        $response = [];
+        if ($this->fake) {
+            $response = json_decode(
+                '{"Response":[{"Id":{"id":875936}},{"Token":{"id":13172597,"created":"2017-08-05 11:46:07.061740","updated":"2017-08-05 11:46:07.061740","token":"35278fcc8b0615261fe23285e6d2e6ccd05ac4c93454981bd5e985ec453e5b5d"}},{"ServerPublicKey":{"server_public_key":"-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAon5y6OZGvTN8kIqPBdro\ndG8TWVw6sl34hAWI47NK6Pi7gmnTtd\/k9gfwq56iI4Er8uMM5e4QmjD++XrBIqcw\nHohDVK03li3xsyJPZ4EBSUOkv4VKXKL\/quqlSgDmPnxtT39BowUZl1um5QbTm0hW\npGI\/0bK7jQk7mbEan9yDOpXnczKgfNlo4o+zbFquPdUfA5LE8R8X057dB6ab7eqA\n9Aybo+I6xyrsOOztufg3Yfe5RA6a0Sikqe\/L8HCP+9TJByUI2pwydPou3KONfYhK\n1NQJZ+RCZ6V+jmcuzKe2vq0jhBZd26wNscl48Sm7etJeuBOpHE+MgO24JiTEYlLS\nVQIDAQAB\n-----END PUBLIC KEY-----\n"}}]}',
+                true
+            );
+        }
+        if (!$this->fake) {
+            $response = $this->sendUnsignedBunqPost($uri, $data, $headers);
+        }
+        //echo '<hr><pre>' . json_encode($response) . '</pre><hr>';
+
+        $this->installationId    = $this->extractInstallationId($response);
+        $this->serverPublicKey   = $this->extractServerPublicKey($response);
+        $this->installationToken = $this->extractInstallationToken($response);
+
+        return;
+    }
+
+    /**
+     * @return InstallationId
+     */
+    public function getInstallationId(): InstallationId
+    {
+        return $this->installationId;
+    }
+
+    /**
+     * @return InstallationToken
+     */
+    public function getInstallationToken(): InstallationToken
+    {
+        return $this->installationToken;
+    }
+
+    /**
+     * @return string
+     */
+    public function getPublicKey(): string
+    {
+        return $this->publicKey;
+    }
+
+    /**
+     * @param string $publicKey
+     */
+    public function setPublicKey(string $publicKey)
+    {
+        $this->publicKey = $publicKey;
+    }
+
+    /**
+     * @return ServerPublicKey
+     */
+    public function getServerPublicKey(): ServerPublicKey
+    {
+        return $this->serverPublicKey;
+    }
+
+    /**
+     * @param bool $fake
+     */
+    public function setFake(bool $fake)
+    {
+        $this->fake = $fake;
+    }
+
+    /**
+     * @param array $response
+     *
+     * @return InstallationId
+     */
+    private function extractInstallationId(array $response): InstallationId
+    {
+        $installationId = new InstallationId;
+        $data           = $this->getKeyFromResponse('Id', $response);
+        $installationId->setId(intval($data['id']));
+
+        return $installationId;
+
+    }
+
+    /**
+     * @param array $response
+     *
+     * @return InstallationToken
+     */
+    private function extractInstallationToken(array $response): InstallationToken
+    {
+
+        $data              = $this->getKeyFromResponse('Token', $response);
+        $installationToken = new InstallationToken($data);
+
+        return $installationToken;
+    }
+
+    /**
+     * @param array $response
+     *
+     * @return ServerPublicKey
+     */
+    private function extractServerPublicKey(array $response): ServerPublicKey
+    {
+        $data            = $this->getKeyFromResponse('ServerPublicKey', $response);
+        $serverPublicKey = new ServerPublicKey($data);
+
+        return $serverPublicKey;
+    }
+}
\ No newline at end of file
diff --git a/app/Services/Bunq/Token/BunqToken.php b/app/Services/Bunq/Token/BunqToken.php
new file mode 100644
index 0000000000..7cb9ba486d
--- /dev/null
+++ b/app/Services/Bunq/Token/BunqToken.php
@@ -0,0 +1,89 @@
+<?php
+/**
+ * BunqToken.php
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Services\Bunq\Token;
+
+
+use Carbon\Carbon;
+
+/**
+ * Class BunqToken
+ *
+ * @package Bunq\Token
+ */
+class BunqToken
+{
+    /** @var  Carbon */
+    private $created;
+    /** @var int */
+    private $id = 0;
+    /** @var string */
+    private $token = '';
+    /** @var  Carbon */
+    private $updated;
+
+    /**
+     * BunqToken constructor.
+     *
+     * @param array $response
+     */
+    public function __construct(array $response)
+    {
+        $this->makeTokenFromResponse($response);
+    }
+
+    /**
+     * @return Carbon
+     */
+    public function getCreated(): Carbon
+    {
+        return $this->created;
+    }
+
+    /**
+     * @return int
+     */
+    public function getId(): int
+    {
+        return $this->id;
+    }
+
+    /**
+     * @return string
+     */
+    public function getToken(): string
+    {
+        return $this->token;
+    }
+
+    /**
+     * @return Carbon
+     */
+    public function getUpdated(): Carbon
+    {
+        return $this->updated;
+    }
+
+    /**
+     * @param array $response
+     */
+    protected function makeTokenFromResponse(array $response): void
+    {
+        $this->id      = $response['id'];
+        $this->created = Carbon::createFromFormat('Y-m-d H:i:s.u', $response['created']);
+        $this->updated = Carbon::createFromFormat('Y-m-d H:i:s.u', $response['updated']);
+        $this->token   = $response['token'];
+
+        return;
+    }
+
+}
\ No newline at end of file
diff --git a/app/Services/Bunq/Token/InstallationToken.php b/app/Services/Bunq/Token/InstallationToken.php
new file mode 100644
index 0000000000..59777b0f3a
--- /dev/null
+++ b/app/Services/Bunq/Token/InstallationToken.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * InstallationToken.php
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Services\Bunq\Token;
+
+/**
+ * Class InstallationToken
+ *
+ * @package FireflyIII\Services\Bunq\Token
+ */
+class InstallationToken extends BunqToken
+{
+
+
+}
\ No newline at end of file
diff --git a/app/Services/Bunq/Token/SessionToken.php b/app/Services/Bunq/Token/SessionToken.php
new file mode 100644
index 0000000000..f6b1218f56
--- /dev/null
+++ b/app/Services/Bunq/Token/SessionToken.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * SessionToken.php
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types=1);
+
+namespace Bunq\Token;
+
+namespace FireflyIII\Services\Bunq\Token;
+
+/**
+ * Class SessionToken
+ *
+ * @package FireflyIII\Services\Bunq\Token
+ */
+class SessionToken extends BunqToken
+{
+
+}
\ No newline at end of file

From 519ad64e1d01ed5dd5cdb66ebe0063701a9d2034 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Fri, 18 Aug 2017 17:30:06 +0200
Subject: [PATCH 051/668] New translations validation.php (Spanish)

---
 resources/lang/es_ES/validation.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/resources/lang/es_ES/validation.php b/resources/lang/es_ES/validation.php
index cf55f8a024..150c44d8d7 100644
--- a/resources/lang/es_ES/validation.php
+++ b/resources/lang/es_ES/validation.php
@@ -57,9 +57,9 @@ return [
     'json'                           => 'El campo :attribute debe ser una cadena JSON válida.',
     'max.numeric'                    => 'El campo :attribute no puede ser mayor que :max.',
     'max.file'                       => 'El campo :attribute no puede ser mayor :max de kilobytes.',
-    'max.string'                     => 'The :attribute may not be greater than :max characters.',
-    'max.array'                      => 'The :attribute may not have more than :max items.',
-    'mimes'                          => 'The :attribute must be a file of type: :values.',
+    'max.string'                     => 'El campo :attribute debe contener menos de :max caracteres.',
+    'max.array'                      => 'El campo :attribute debe contener al menos :max elementos.',
+    'mimes'                          => 'El campo :attribute debe ser un archivo de tipo :values.',
     'min.numeric'                    => 'The :attribute must be at least :min.',
     'min.file'                       => 'The :attribute must be at least :min kilobytes.',
     'min.string'                     => 'The :attribute must be at least :min characters.',

From 4c3dbc6debae674ff033d4f92b826479139119bc Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Fri, 18 Aug 2017 17:40:06 +0200
Subject: [PATCH 052/668] New translations validation.php (Spanish)

---
 resources/lang/es_ES/validation.php | 62 ++++++++++++++---------------
 1 file changed, 31 insertions(+), 31 deletions(-)

diff --git a/resources/lang/es_ES/validation.php b/resources/lang/es_ES/validation.php
index 150c44d8d7..062c56feaf 100644
--- a/resources/lang/es_ES/validation.php
+++ b/resources/lang/es_ES/validation.php
@@ -60,35 +60,35 @@ return [
     'max.string'                     => 'El campo :attribute debe contener menos de :max caracteres.',
     'max.array'                      => 'El campo :attribute debe contener al menos :max elementos.',
     'mimes'                          => 'El campo :attribute debe ser un archivo de tipo :values.',
-    'min.numeric'                    => 'The :attribute must be at least :min.',
-    'min.file'                       => 'The :attribute must be at least :min kilobytes.',
-    'min.string'                     => 'The :attribute must be at least :min characters.',
-    'min.array'                      => 'The :attribute must have at least :min items.',
-    'not_in'                         => 'The selected :attribute is invalid.',
-    'numeric'                        => 'The :attribute must be a number.',
-    'regex'                          => 'The :attribute format is invalid.',
-    'required'                       => 'The :attribute field is required.',
-    'required_if'                    => 'The :attribute field is required when :other is :value.',
-    'required_unless'                => 'The :attribute field is required unless :other is in :values.',
-    'required_with'                  => 'The :attribute field is required when :values is present.',
-    'required_with_all'              => 'The :attribute field is required when :values is present.',
-    'required_without'               => 'The :attribute field is required when :values is not present.',
-    'required_without_all'           => 'The :attribute field is required when none of :values are present.',
-    'same'                           => 'The :attribute and :other must match.',
-    'size.numeric'                   => 'The :attribute must be :size.',
-    'size.file'                      => 'The :attribute must be :size kilobytes.',
-    'size.string'                    => 'The :attribute must be :size characters.',
-    'size.array'                     => 'The :attribute must contain :size items.',
-    'unique'                         => 'The :attribute has already been taken.',
-    'string'                         => 'The :attribute must be a string.',
-    'url'                            => 'The :attribute format is invalid.',
-    'timezone'                       => 'The :attribute must be a valid zone.',
-    '2fa_code'                       => 'The :attribute field is invalid.',
-    'dimensions'                     => 'The :attribute has invalid image dimensions.',
-    'distinct'                       => 'The :attribute field has a duplicate value.',
-    'file'                           => 'The :attribute must be a file.',
-    'in_array'                       => 'The :attribute field does not exist in :other.',
-    'present'                        => 'The :attribute field must be present.',
-    'amount_zero'                    => 'The total amount cannot be zero',
-    'secure_password'                => 'This is not a secure password. Please try again. For more information, visit https://goo.gl/NCh2tN',
+    'min.numeric'                    => 'El campo :attribute debe ser al menos :min.',
+    'min.file'                       => 'El campo :attribute debe ser al menos :min kilobytes.',
+    'min.string'                     => 'El campo :attribute debe contener al menos :min caracteres.',
+    'min.array'                      => 'El campo :attribute debe tener al menos :min elementos.',
+    'not_in'                         => 'El campo :attribute seleccionado es inválido.',
+    'numeric'                        => 'El campo :attribute debe ser un número.',
+    'regex'                          => 'El formato del campo :attribute no es válido.',
+    'required'                       => 'El campo :attribute es obligatorio.',
+    'required_if'                    => 'El campo :attribute es obligatorio cuando el campo :other es :value.',
+    'required_unless'                => 'El campo :attribute es obligatorio a menos que :other se encuentre en :values.',
+    'required_with'                  => 'El campo :attribute es obligatorio cuando :values está presente.',
+    'required_with_all'              => 'El campo :attribute es obligatorio cuando :values está presente.',
+    'required_without'               => 'El campo :attribute es obligatorio cuando :values no está presente.',
+    'required_without_all'           => 'El campo :attribute es obligatorio cuando ningún campo :values está presente.',
+    'same'                           => 'El campo atributo :attribute y :other deben coincidir.',
+    'size.numeric'                   => 'El tamaño de :attribute debe ser :size.',
+    'size.file'                      => 'El tamaño de :attribute debe ser :size kilobytes.',
+    'size.string'                    => 'El campo :attribute debe tener :size caracteres.',
+    'size.array'                     => 'El campo :attribute debe contener :size elementos.',
+    'unique'                         => 'El elemento :attribute ya está en uso.',
+    'string'                         => 'El campo :atribute debe ser un texto.',
+    'url'                            => 'El formato del campo :attribute no es válido.',
+    'timezone'                       => 'El campo :attribute debe contener una zona válida.',
+    '2fa_code'                       => 'El campo :attribute no es válido.',
+    'dimensions'                     => 'Las dimensiones de la imagen :attribute son incorrectas.',
+    'distinct'                       => 'El campo :attribute tiene un valor duplicado.',
+    'file'                           => 'El campo :attribute debe ser un fichero.',
+    'in_array'                       => 'El campo :attribute no existe en :other.',
+    'present'                        => 'El campo :attribute debe estar presente.',
+    'amount_zero'                    => 'La cantidad total no puede ser cero',
+    'secure_password'                => 'Esta contraseña no es segura. Por favor inténtalo de nuevo. Para más información, visita https://goo.gl/NCh2tN',
 ];
\ No newline at end of file

From 4b5d363f5521708eb25dfe2bb26704683fc0a9e1 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Fri, 18 Aug 2017 17:50:06 +0200
Subject: [PATCH 053/668] New translations validation.php (Spanish)

---
 resources/lang/es_ES/validation.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/resources/lang/es_ES/validation.php b/resources/lang/es_ES/validation.php
index 062c56feaf..cb5c33ed45 100644
--- a/resources/lang/es_ES/validation.php
+++ b/resources/lang/es_ES/validation.php
@@ -12,16 +12,16 @@ declare(strict_types=1);
  */
 
 return [
-    'iban'                           => 'This is not a valid CBU.',
+    'iban'                           => 'Este no es un IBAN válido.',
     'unique_account_number_for_user' => 'Parece que este número de cuenta ya está en uso.',
     'deleted_user'                   => 'Debido a restricciones de seguridad, no se puede registrar utilizando esta dirección de correo electrónico.',
-    'rule_trigger_value'             => 'Este valor es válido para el disparador seleccionado.',
-    'rule_action_value'              => 'Este valor es inválido para la acción seleccionado.',
+    'rule_trigger_value'             => 'Este valor es incorrecto para el disparador seleccionado.',
+    'rule_action_value'              => 'Este valor es incorrecto para la acción seleccionada.',
     'invalid_domain'                 => 'Debido a restricciones de seguridad, no se puede registrar utilizando este dominio.',
-    'file_already_attached'          => 'Archivo ":name" ya ha sido añadido para este objeto.',
+    'file_already_attached'          => 'El archivo ":name" ya ha sido añadido a este objeto.',
     'file_attached'                  => 'Archivo subido correctamente ": nombre".',
-    'file_invalid_mime'              => 'Archivo ":name" es de tipo": mime" que no es aceptado como una nueva carga.',
-    'file_too_large'                 => 'Archivo ":name" es demasiado grande.',
+    'file_invalid_mime'              => 'El archivo ":name" es de tipo ": mime", el cual no se acepta.',
+    'file_too_large'                 => 'El archivo ":name" es demasiado grande.',
     'belongs_to_user'                => 'El valor de :attribute es desconocido',
     'accepted'                       => 'El :attribute debe ser aceptado.',
     'bic'                            => 'Esto no es un BIC válido.',
@@ -64,7 +64,7 @@ return [
     'min.file'                       => 'El campo :attribute debe ser al menos :min kilobytes.',
     'min.string'                     => 'El campo :attribute debe contener al menos :min caracteres.',
     'min.array'                      => 'El campo :attribute debe tener al menos :min elementos.',
-    'not_in'                         => 'El campo :attribute seleccionado es inválido.',
+    'not_in'                         => 'El campo :attribute seleccionado es incorrecto.',
     'numeric'                        => 'El campo :attribute debe ser un número.',
     'regex'                          => 'El formato del campo :attribute no es válido.',
     'required'                       => 'El campo :attribute es obligatorio.',

From 33e381b5da3c00c7abef8c697413e10d761a2bec Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Fri, 18 Aug 2017 17:50:07 +0200
Subject: [PATCH 054/668] New translations form.php (Spanish)

---
 resources/lang/es_ES/form.php | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/resources/lang/es_ES/form.php b/resources/lang/es_ES/form.php
index 743ff7f1fc..47b109fdc0 100644
--- a/resources/lang/es_ES/form.php
+++ b/resources/lang/es_ES/form.php
@@ -18,7 +18,7 @@ return [
     'bank_balance'                   => 'Saldo',
     'savings_balance'                => 'Salgo de ahorro',
     'credit_card_limit'              => 'Límite de la tarjeta de crédito',
-    'automatch'                      => 'Match automatically',
+    'automatch'                      => 'Coinciden automáticamente',
     'skip'                           => 'Saltar',
     'name'                           => 'Nombre',
     'active'                         => 'Activo',
@@ -78,14 +78,14 @@ return [
     'destination_account_expense' => 'Destination account (expense account)',
     'destination_account_asset'   => 'Destination account (asset account)',
     'source_account_revenue'      => 'Source account (revenue account)',
-    'type'                        => 'Type',
+    'type'                        => 'Tipo',
     'convert_Withdrawal'          => 'Convert withdrawal',
     'convert_Deposit'             => 'Convert deposit',
     'convert_Transfer'            => 'Convert transfer',
 
 
-    'amount'                     => 'Amount',
-    'date'                       => 'Date',
+    'amount'                     => 'Importe',
+    'date'                       => 'Fecha',
     'interest_date'              => 'Interest date',
     'book_date'                  => 'Book date',
     'process_date'               => 'Processing date',
@@ -94,16 +94,16 @@ return [
     'deletePermanently'          => 'Delete permanently',
     'cancel'                     => 'Cancel',
     'targetdate'                 => 'Target date',
-    'tag'                        => 'Tag',
+    'tag'                        => 'Etiqueta',
     'under'                      => 'Under',
-    'symbol'                     => 'Symbol',
-    'code'                       => 'Code',
+    'symbol'                     => 'Símbolo',
+    'code'                       => 'Código',
     'iban'                       => 'IBAN',
-    'accountNumber'              => 'Account number',
-    'has_headers'                => 'Headers',
-    'date_format'                => 'Date format',
+    'accountNumber'              => 'Número de cuenta',
+    'has_headers'                => 'Encabezados',
+    'date_format'                => 'Formato de fecha',
     'specifix'                   => 'Bank- or file specific fixes',
-    'attachments[]'              => 'Attachments',
+    'attachments[]'              => 'Adjuntos',
     'store_new_withdrawal'       => 'Store new withdrawal',
     'store_new_deposit'          => 'Store new deposit',
     'store_new_transfer'         => 'Store new transfer',
@@ -111,12 +111,12 @@ return [
     'add_new_deposit'            => 'Add a new deposit',
     'add_new_transfer'           => 'Add a new transfer',
     'noPiggybank'                => '(no piggy bank)',
-    'title'                      => 'Title',
-    'notes'                      => 'Notes',
-    'filename'                   => 'File name',
-    'mime'                       => 'Mime type',
-    'size'                       => 'Size',
-    'trigger'                    => 'Trigger',
+    'title'                      => 'Título',
+    'notes'                      => 'Notas',
+    'filename'                   => 'Nombre de fichero',
+    'mime'                       => 'Tipo Mime',
+    'size'                       => 'Tamaño',
+    'trigger'                    => 'Disparador',
     'stop_processing'            => 'Stop processing',
     'start_date'                 => 'Start of range',
     'end_date'                   => 'End of range',

From df443aa34c72be141f1f245d193ce3546e68a22e Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Fri, 18 Aug 2017 21:08:51 +0200
Subject: [PATCH 055/668] Add copyright things.

---
 app/Console/Commands/UseEncryption.php            | 10 ++++++++++
 app/Mail/RegisteredUser.php                       | 10 ++++++++++
 app/Mail/RequestedNewPassword.php                 | 10 ++++++++++
 config/auth.php                                   |  6 +++---
 config/broadcasting.php                           |  7 ++++---
 config/cache.php                                  |  8 +++++---
 config/compile.php                                |  6 +++---
 config/database.php                               |  7 ++++---
 config/filesystems.php                            |  7 ++++---
 config/firefly.php                                |  3 +++
 config/mail.php                                   |  7 ++++---
 config/queue.php                                  |  7 ++++---
 config/services.php                               |  7 ++++---
 config/twigbridge.php                             | 15 ++++++++-------
 ...016_10_09_150037_expand_transactions_table.php |  6 +++---
 .../2016_10_22_075804_changes_for_v410.php        |  6 +++---
 .../2016_11_24_210552_changes_for_v420.php        |  6 +++---
 .../2016_12_22_150431_changes_for_v430.php        | 10 ++++++++++
 .../2016_12_28_203205_changes_for_v431.php        |  8 +++++---
 .../2017_04_13_163623_changes_for_v440.php        | 10 ++++++++++
 .../2017_06_02_105232_changes_for_v450.php        | 10 ++++++++++
 gulpfile.js                                       |  9 +++++++++
 phpunit.coverage.xml                              |  9 +++++++++
 phpunit.xml                                       |  9 +++++++++
 tests/CreatesApplication.php                      |  5 ++---
 tests/Feature/ExampleTest.php                     |  6 ++++--
 tests/TestCase.php                                |  3 ++-
 tests/Unit/ExampleTest.php                        | 10 ++++++++++
 28 files changed, 165 insertions(+), 52 deletions(-)

diff --git a/app/Console/Commands/UseEncryption.php b/app/Console/Commands/UseEncryption.php
index 5cf80aff32..ef0e68ac4a 100644
--- a/app/Console/Commands/UseEncryption.php
+++ b/app/Console/Commands/UseEncryption.php
@@ -1,4 +1,14 @@
 <?php
+
+/**
+ * UseEncryption.php
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
 declare(strict_types=1);
 
 /**
diff --git a/app/Mail/RegisteredUser.php b/app/Mail/RegisteredUser.php
index 01d7f675cd..3f820ed719 100644
--- a/app/Mail/RegisteredUser.php
+++ b/app/Mail/RegisteredUser.php
@@ -1,4 +1,14 @@
 <?php
+
+/**
+ * RegisteredUser.php
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
 declare(strict_types=1);
 
 
diff --git a/app/Mail/RequestedNewPassword.php b/app/Mail/RequestedNewPassword.php
index b5399ecd40..58b0a42f05 100644
--- a/app/Mail/RequestedNewPassword.php
+++ b/app/Mail/RequestedNewPassword.php
@@ -1,4 +1,14 @@
 <?php
+
+/**
+ * RequestedNewPassword.php
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
 declare(strict_types=1);
 
 
diff --git a/config/auth.php b/config/auth.php
index ddf966efc8..52d3280350 100644
--- a/config/auth.php
+++ b/config/auth.php
@@ -1,16 +1,16 @@
 <?php
-declare(strict_types=1);
 
 /**
  * auth.php
- * Copyright (C) 2016 thegrumpydictator@gmail.com
- *
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
  * This software may be modified and distributed under the terms of the
  * Creative Commons Attribution-ShareAlike 4.0 International License.
  *
  * See the LICENSE file for details.
  */
 
+declare(strict_types=1);
+
 return [
     'defaults'  => [
         'guard'     => 'web',
diff --git a/config/broadcasting.php b/config/broadcasting.php
index e4012544ff..3257e542d3 100644
--- a/config/broadcasting.php
+++ b/config/broadcasting.php
@@ -1,16 +1,17 @@
 <?php
-declare(strict_types=1);
 
 /**
  * broadcasting.php
- * Copyright (C) 2016 thegrumpydictator@gmail.com
- *
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
  * This software may be modified and distributed under the terms of the
  * Creative Commons Attribution-ShareAlike 4.0 International License.
  *
  * See the LICENSE file for details.
  */
 
+declare(strict_types=1);
+
+
 return [
 
     /*
diff --git a/config/cache.php b/config/cache.php
index 464b334317..dd2dbe7a70 100644
--- a/config/cache.php
+++ b/config/cache.php
@@ -1,16 +1,18 @@
 <?php
-declare(strict_types=1);
 
 /**
  * cache.php
- * Copyright (C) 2016 thegrumpydictator@gmail.com
- *
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
  * This software may be modified and distributed under the terms of the
  * Creative Commons Attribution-ShareAlike 4.0 International License.
  *
  * See the LICENSE file for details.
  */
 
+declare(strict_types=1);
+
+
+
 return [
 
     /*
diff --git a/config/compile.php b/config/compile.php
index d5812f37c3..f627a86b7a 100644
--- a/config/compile.php
+++ b/config/compile.php
@@ -1,16 +1,16 @@
 <?php
-declare(strict_types=1);
 
 /**
  * compile.php
- * Copyright (C) 2016 thegrumpydictator@gmail.com
- *
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
  * This software may be modified and distributed under the terms of the
  * Creative Commons Attribution-ShareAlike 4.0 International License.
  *
  * See the LICENSE file for details.
  */
 
+declare(strict_types=1);
+
 return [
 
     /*
diff --git a/config/database.php b/config/database.php
index b17719c1b1..272de2acdc 100644
--- a/config/database.php
+++ b/config/database.php
@@ -1,16 +1,17 @@
 <?php
-declare(strict_types=1);
 
 /**
  * database.php
- * Copyright (C) 2016 thegrumpydictator@gmail.com
- *
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
  * This software may be modified and distributed under the terms of the
  * Creative Commons Attribution-ShareAlike 4.0 International License.
  *
  * See the LICENSE file for details.
  */
 
+declare(strict_types=1);
+
+
 // for heroku:
 $databaseUrl = getenv('DATABASE_URL');
 $host        = '';
diff --git a/config/filesystems.php b/config/filesystems.php
index 06cfd1b5d3..0a64af6c68 100644
--- a/config/filesystems.php
+++ b/config/filesystems.php
@@ -1,16 +1,17 @@
 <?php
-declare(strict_types=1);
 
 /**
  * filesystems.php
- * Copyright (C) 2016 thegrumpydictator@gmail.com
- *
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
  * This software may be modified and distributed under the terms of the
  * Creative Commons Attribution-ShareAlike 4.0 International License.
  *
  * See the LICENSE file for details.
  */
 
+declare(strict_types=1);
+
+
 return [
 
     /*
diff --git a/config/firefly.php b/config/firefly.php
index 0f342a6b93..6903836d2b 100644
--- a/config/firefly.php
+++ b/config/firefly.php
@@ -42,6 +42,9 @@ return [
     'import_pre' => [
         'bunq' => 'FireflyIII\Support\Import\Prerequisites\BunqPrerequisites',
     ],
+    'bunq' => [
+        'server' => 'https://sandbox.public.api.bunq.com',
+    ],
     'default_export_format'      => 'csv',
     'default_import_format'      => 'csv',
     'bill_periods'               => ['weekly', 'monthly', 'quarterly', 'half-year', 'yearly'],
diff --git a/config/mail.php b/config/mail.php
index 61d69cdc5b..f5d33fd68e 100644
--- a/config/mail.php
+++ b/config/mail.php
@@ -1,16 +1,17 @@
 <?php
-declare(strict_types=1);
 
 /**
  * mail.php
- * Copyright (C) 2016 thegrumpydictator@gmail.com
- *
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
  * This software may be modified and distributed under the terms of the
  * Creative Commons Attribution-ShareAlike 4.0 International License.
  *
  * See the LICENSE file for details.
  */
 
+declare(strict_types=1);
+
+
 return [
 
     /*
diff --git a/config/queue.php b/config/queue.php
index 4d891e2d1c..592710d91d 100644
--- a/config/queue.php
+++ b/config/queue.php
@@ -1,16 +1,17 @@
 <?php
-declare(strict_types=1);
 
 /**
  * queue.php
- * Copyright (C) 2016 thegrumpydictator@gmail.com
- *
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
  * This software may be modified and distributed under the terms of the
  * Creative Commons Attribution-ShareAlike 4.0 International License.
  *
  * See the LICENSE file for details.
  */
 
+declare(strict_types=1);
+
+
 return [
 
     /*
diff --git a/config/services.php b/config/services.php
index f5d419a687..bad5a03d81 100644
--- a/config/services.php
+++ b/config/services.php
@@ -1,16 +1,17 @@
 <?php
-declare(strict_types=1);
 
 /**
  * services.php
- * Copyright (C) 2016 thegrumpydictator@gmail.com
- *
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
  * This software may be modified and distributed under the terms of the
  * Creative Commons Attribution-ShareAlike 4.0 International License.
  *
  * See the LICENSE file for details.
  */
 
+declare(strict_types=1);
+
+
 return [
 
     /*
diff --git a/config/twigbridge.php b/config/twigbridge.php
index d66b768afe..d438e9146a 100644
--- a/config/twigbridge.php
+++ b/config/twigbridge.php
@@ -1,16 +1,17 @@
 <?php
-declare(strict_types=1);
-
 
 /**
- * This file is part of the TwigBridge package.
+ * twigbridge.php
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
  *
- * @copyright Robert Crowe <hello@vivalacrowe.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * See the LICENSE file for details.
  */
 
+declare(strict_types=1);
+
+
 /**
  * Configuration options for Twig.
  */
diff --git a/database/migrations/2016_10_09_150037_expand_transactions_table.php b/database/migrations/2016_10_09_150037_expand_transactions_table.php
index 6b4e345582..6909aaa2a5 100644
--- a/database/migrations/2016_10_09_150037_expand_transactions_table.php
+++ b/database/migrations/2016_10_09_150037_expand_transactions_table.php
@@ -1,16 +1,16 @@
 <?php
-declare(strict_types=1);
 
 /**
  * 2016_10_09_150037_expand_transactions_table.php
- * Copyright (C) 2016 thegrumpydictator@gmail.com
- *
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
  * This software may be modified and distributed under the terms of the
  * Creative Commons Attribution-ShareAlike 4.0 International License.
  *
  * See the LICENSE file for details.
  */
 
+declare(strict_types=1);
+
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
diff --git a/database/migrations/2016_10_22_075804_changes_for_v410.php b/database/migrations/2016_10_22_075804_changes_for_v410.php
index 217bfeb953..0714fb32e5 100644
--- a/database/migrations/2016_10_22_075804_changes_for_v410.php
+++ b/database/migrations/2016_10_22_075804_changes_for_v410.php
@@ -1,16 +1,16 @@
 <?php
-declare(strict_types=1);
 
 /**
  * 2016_10_22_075804_changes_for_v410.php
- * Copyright (C) 2016 thegrumpydictator@gmail.com
- *
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
  * This software may be modified and distributed under the terms of the
  * Creative Commons Attribution-ShareAlike 4.0 International License.
  *
  * See the LICENSE file for details.
  */
 
+declare(strict_types=1);
+
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
diff --git a/database/migrations/2016_11_24_210552_changes_for_v420.php b/database/migrations/2016_11_24_210552_changes_for_v420.php
index ac701001b9..1d0a57e940 100644
--- a/database/migrations/2016_11_24_210552_changes_for_v420.php
+++ b/database/migrations/2016_11_24_210552_changes_for_v420.php
@@ -1,16 +1,16 @@
 <?php
-declare(strict_types=1);
 
 /**
  * 2016_11_24_210552_changes_for_v420.php
- * Copyright (C) 2016 thegrumpydictator@gmail.com
- *
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
  * This software may be modified and distributed under the terms of the
  * Creative Commons Attribution-ShareAlike 4.0 International License.
  *
  * See the LICENSE file for details.
  */
 
+declare(strict_types=1);
+
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
diff --git a/database/migrations/2016_12_22_150431_changes_for_v430.php b/database/migrations/2016_12_22_150431_changes_for_v430.php
index d2c046b132..ef0747e4f4 100644
--- a/database/migrations/2016_12_22_150431_changes_for_v430.php
+++ b/database/migrations/2016_12_22_150431_changes_for_v430.php
@@ -1,4 +1,14 @@
 <?php
+
+/**
+ * 2016_12_22_150431_changes_for_v430.php
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
 declare(strict_types=1);
 
 
diff --git a/database/migrations/2016_12_28_203205_changes_for_v431.php b/database/migrations/2016_12_28_203205_changes_for_v431.php
index c7d3075ba6..1bac0f7924 100644
--- a/database/migrations/2016_12_28_203205_changes_for_v431.php
+++ b/database/migrations/2016_12_28_203205_changes_for_v431.php
@@ -1,14 +1,16 @@
 <?php
-declare(strict_types=1);
 
 /**
  * 2016_12_28_203205_changes_for_v431.php
- * Copyright (c) 2016 thegrumpydictator@gmail.com
- * This software may be modified and distributed under the terms of the Creative Commons Attribution-ShareAlike 4.0 International License.
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
  *
  * See the LICENSE file for details.
  */
 
+declare(strict_types=1);
+
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
diff --git a/database/migrations/2017_04_13_163623_changes_for_v440.php b/database/migrations/2017_04_13_163623_changes_for_v440.php
index c2cd3f969e..8293836751 100644
--- a/database/migrations/2017_04_13_163623_changes_for_v440.php
+++ b/database/migrations/2017_04_13_163623_changes_for_v440.php
@@ -1,4 +1,14 @@
 <?php
+
+/**
+ * 2017_04_13_163623_changes_for_v440.php
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
 declare(strict_types=1);
 
 
diff --git a/database/migrations/2017_06_02_105232_changes_for_v450.php b/database/migrations/2017_06_02_105232_changes_for_v450.php
index 011a66e188..44c2a04dc4 100644
--- a/database/migrations/2017_06_02_105232_changes_for_v450.php
+++ b/database/migrations/2017_06_02_105232_changes_for_v450.php
@@ -1,4 +1,14 @@
 <?php
+
+/**
+ * 2017_06_02_105232_changes_for_v450.php
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
 declare(strict_types=1);
 
 
diff --git a/gulpfile.js b/gulpfile.js
index 04d503d8d5..5f7804554a 100755
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -1,3 +1,12 @@
+/*
+ * gulpfile.js
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
 const elixir = require('laravel-elixir');
 
 require('laravel-elixir-vue');
diff --git a/phpunit.coverage.xml b/phpunit.coverage.xml
index 0997eb6bb2..b0b352d90a 100755
--- a/phpunit.coverage.xml
+++ b/phpunit.coverage.xml
@@ -1,4 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ phpunit.coverage.xml
+  ~ Copyright (c) 2017 thegrumpydictator@gmail.com
+  ~ This software may be modified and distributed under the terms of the
+  ~ Creative Commons Attribution-ShareAlike 4.0 International License.
+  ~
+  ~ See the LICENSE file for details.
+  -->
+
 <phpunit backupGlobals="false"
          backupStaticAttributes="false"
          bootstrap="bootstrap/autoload.php"
diff --git a/phpunit.xml b/phpunit.xml
index b0e315533c..73d2797478 100755
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -1,4 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ phpunit.xml
+  ~ Copyright (c) 2017 thegrumpydictator@gmail.com
+  ~ This software may be modified and distributed under the terms of the
+  ~ Creative Commons Attribution-ShareAlike 4.0 International License.
+  ~
+  ~ See the LICENSE file for details.
+  -->
+
 <phpunit backupGlobals="false"
          backupStaticAttributes="false"
          bootstrap="bootstrap/autoload.php"
diff --git a/tests/CreatesApplication.php b/tests/CreatesApplication.php
index b4cc8b15b2..acb598dcc1 100644
--- a/tests/CreatesApplication.php
+++ b/tests/CreatesApplication.php
@@ -1,7 +1,4 @@
 <?php
-declare(strict_types=1);
-
-
 
 /**
  * CreatesApplication.php
@@ -12,6 +9,8 @@ declare(strict_types=1);
  * See the LICENSE file for details.
  */
 
+declare(strict_types=1);
+
 namespace Tests;
 
 use Illuminate\Contracts\Console\Kernel;
diff --git a/tests/Feature/ExampleTest.php b/tests/Feature/ExampleTest.php
index 2cdc406421..df6e4a591d 100644
--- a/tests/Feature/ExampleTest.php
+++ b/tests/Feature/ExampleTest.php
@@ -1,14 +1,16 @@
 <?php
-declare(strict_types=1);
 
 /**
  * ExampleTest.php
  * Copyright (c) 2017 thegrumpydictator@gmail.com
- * This software may be modified and distributed under the terms of the Creative Commons Attribution-ShareAlike 4.0 International License.
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
  *
  * See the LICENSE file for details.
  */
 
+declare(strict_types=1);
+
 namespace Tests\Feature;
 
 use Tests\TestCase;
diff --git a/tests/TestCase.php b/tests/TestCase.php
index 9bec6db836..5d0faaae6b 100644
--- a/tests/TestCase.php
+++ b/tests/TestCase.php
@@ -1,5 +1,4 @@
 <?php
-declare(strict_types=1);
 
 /**
  * TestCase.php
@@ -10,6 +9,8 @@ declare(strict_types=1);
  * See the LICENSE file for details.
  */
 
+declare(strict_types=1);
+
 namespace Tests;
 
 use Carbon\Carbon;
diff --git a/tests/Unit/ExampleTest.php b/tests/Unit/ExampleTest.php
index 25b906c212..b55d6c83f1 100644
--- a/tests/Unit/ExampleTest.php
+++ b/tests/Unit/ExampleTest.php
@@ -1,5 +1,15 @@
 <?php
 
+
+/**
+ * ExampleTest.php
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
 declare(strict_types=1);
 
 /**

From 684c9773c90313c04e3f8964500c8ccbeb4b8b88 Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Fri, 18 Aug 2017 21:09:22 +0200
Subject: [PATCH 056/668] Can now register with Bunq and get device server ID.

---
 .../Controllers/Import/BankController.php     |  46 +++-
 app/Models/Preference.php                     |  13 +-
 app/Services/Bunq/Object/DeviceServer.php     |  63 +++++
 app/Services/Bunq/Request/BunqRequest.php     |  84 +++---
 .../Bunq/Request/DeviceServerRequest.php      |  82 ++++++
 .../Bunq/Request/InstallationTokenRequest.php |  20 +-
 .../Bunq/Request/ListDeviceServerRequest.php  |  74 ++++++
 .../Prerequisites/BunqPrerequisites.php       | 241 ++++++++++++++++++
 .../Prerequisites/PrerequisitesInterface.php  |   9 +
 .../views/import/bunq/prerequisites.twig      |   4 +-
 routes/web.php                                |   2 +
 11 files changed, 577 insertions(+), 61 deletions(-)
 create mode 100644 app/Services/Bunq/Object/DeviceServer.php
 create mode 100644 app/Services/Bunq/Request/DeviceServerRequest.php
 create mode 100644 app/Services/Bunq/Request/ListDeviceServerRequest.php

diff --git a/app/Http/Controllers/Import/BankController.php b/app/Http/Controllers/Import/BankController.php
index d78620c9e3..17af47128c 100644
--- a/app/Http/Controllers/Import/BankController.php
+++ b/app/Http/Controllers/Import/BankController.php
@@ -14,17 +14,54 @@ namespace FireflyIII\Http\Controllers\Import;
 
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Support\Import\Prerequisites\PrerequisitesInterface;
+use Illuminate\Http\Request;
+use Log;
+use Session;
 
 class BankController extends Controller
 {
 
-    public function postPrerequisites()
+    public function form()
     {
 
     }
 
+    /**
+     * @param Request $request
+     * @param string  $bank
+     *
+     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
+     */
+    public function postPrerequisites(Request $request, string $bank)
+    {
+        Log::debug(sprintf('Now in postPrerequisites for %s', $bank));
+        $class = config(sprintf('firefly.import_pre.%s', $bank));
+        /** @var PrerequisitesInterface $object */
+        $object = app($class);
+        $object->setUser(auth()->user());
+        if (!$object->hasPrerequisites()) {
+            //Log::debug(sprintf('No more prerequisites for %s, move to form.', $bank));
+            //return redirect(route('import.bank.form', [$bank]));
+        }
+        Log::debug('Going to store entered preprerequisites.');
+        // store post data
+        $result = $object->storePrerequisites($request);
+        echo 'done with prereq';
+        exit;
+
+        if ($result->count() > 0) {
+            Session::flash('error', $result->first());
+
+            return redirect(route('import.bank.prerequisites', [$bank]));
+        }
+
+        return redirect(route('import.bank.form', [$bank]));
+    }
+
     /**
      * @param string $bank
+     *
+     * @return \Illuminate\Contracts\View\Factory|\Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector|\Illuminate\View\View
      */
     public function prerequisites(string $bank)
     {
@@ -33,17 +70,16 @@ class BankController extends Controller
         $object = app($class);
         $object->setUser(auth()->user());
 
-        if ($object->hasPrerequisites()) {
+        //if ($object->hasPrerequisites()) {
             $view       = $object->getView();
             $parameters = $object->getViewParameters();
 
             return view($view, $parameters);
-        }
+        //}
 
         if (!$object->hasPrerequisites()) {
-            echo 'redirect to import form.';
+            return redirect(route('import.bank.form', [$bank]));
         }
-
     }
 
 }
diff --git a/app/Models/Preference.php b/app/Models/Preference.php
index 7b7922b4e0..4bacffea77 100644
--- a/app/Models/Preference.php
+++ b/app/Models/Preference.php
@@ -14,6 +14,7 @@ declare(strict_types=1);
 namespace FireflyIII\Models;
 
 use Crypt;
+use Exception;
 use FireflyIII\Exceptions\FireflyException;
 use Illuminate\Contracts\Encryption\DecryptException;
 use Illuminate\Database\Eloquent\Model;
@@ -56,7 +57,15 @@ class Preference extends Model
                 sprintf('Could not decrypt preference #%d. If this error persists, please run "php artisan cache:clear" on the command line.', $this->id)
             );
         }
-
+        $unserialized = false;
+        try {
+            $unserialized = unserialize($data);
+        } catch (Exception $e) {
+            // don't care, assume is false.
+        }
+        if (!($unserialized === false)) {
+            return $unserialized;
+        }
 
         return json_decode($data, true);
     }
@@ -66,7 +75,7 @@ class Preference extends Model
      */
     public function setDataAttribute($value)
     {
-        $this->attributes['data'] = Crypt::encrypt(json_encode($value));
+        $this->attributes['data'] = Crypt::encrypt(serialize($value));
     }
 
     /**
diff --git a/app/Services/Bunq/Object/DeviceServer.php b/app/Services/Bunq/Object/DeviceServer.php
new file mode 100644
index 0000000000..35d1dd712b
--- /dev/null
+++ b/app/Services/Bunq/Object/DeviceServer.php
@@ -0,0 +1,63 @@
+<?php
+/**
+ * DeviceServer.php
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Services\Bunq\Object;
+
+
+use Carbon\Carbon;
+use FireflyIII\Services\Bunq\Id\DeviceServerId;
+
+class DeviceServer extends BunqObject
+{
+    /** @var  Carbon */
+    private $created;
+    /** @var  string */
+    private $description;
+    /** @var  DeviceServerId */
+    private $id;
+    /** @var  string */
+    private $ip;
+    /** @var  string */
+    private $status;
+    /** @var  Carbon */
+    private $updated;
+
+    public function __construct(array $data)
+    {
+        $id = new DeviceServerId();
+        $id->setId($data['id']);
+        $this->id          = $id;
+        $this->created     = Carbon::createFromFormat('Y-m-d H:i:s.u', $data['created']);
+        $this->updated     = Carbon::createFromFormat('Y-m-d H:i:s.u', $data['updated']);
+        $this->ip          = $data['ip'];
+        $this->description = $data['description'];
+        $this->status      = $data['status'];
+    }
+
+    /**
+     * @return DeviceServerId
+     */
+    public function getId(): DeviceServerId
+    {
+        return $this->id;
+    }
+
+    /**
+     * @return string
+     */
+    public function getIp(): string
+    {
+        return $this->ip;
+    }
+
+
+}
\ No newline at end of file
diff --git a/app/Services/Bunq/Request/BunqRequest.php b/app/Services/Bunq/Request/BunqRequest.php
index 4226204f0e..6712f178d6 100644
--- a/app/Services/Bunq/Request/BunqRequest.php
+++ b/app/Services/Bunq/Request/BunqRequest.php
@@ -12,10 +12,10 @@ declare(strict_types=1);
 
 namespace FireflyIII\Services\Bunq\Request;
 
-use Bunq\Object\ServerPublicKey;
 use Exception;
-use Monolog\Handler\StreamHandler;
-use Monolog\Logger;
+use FireflyIII\Exceptions\FireflyException;
+use FireflyIII\Services\Bunq\Object\ServerPublicKey;
+use Log;
 use Requests;
 use Requests_Exception;
 
@@ -26,12 +26,8 @@ use Requests_Exception;
  */
 abstract class BunqRequest
 {
-    /** @var bool */
-    protected $fake = false;
     /** @var string */
     protected $secret = '';
-    /** @var  Logger */
-    private $logger;
     /** @var string */
     private $privateKey = '';
     /** @var string */
@@ -44,14 +40,11 @@ abstract class BunqRequest
             'x-bunq-client-request-id'  => 'X-Bunq-Client-Request-Id',
         ];
 
+    /**
+     * BunqRequest constructor.
+     */
     public function __construct()
     {
-
-
-        // create a log channel
-        $this->logger = new Logger('bunq-request');
-        $this->logger->pushHandler(new StreamHandler('logs/bunq.log', Logger::DEBUG));
-        $this->logger->debug('Hallo dan');
     }
 
     /**
@@ -75,14 +68,6 @@ abstract class BunqRequest
         $this->server = $server;
     }
 
-    /**
-     * @param bool $fake
-     */
-    public function setFake(bool $fake)
-    {
-        $this->fake = $fake;
-    }
-
     /**
      * @param string $privateKey
      */
@@ -142,12 +127,36 @@ abstract class BunqRequest
         return $signature;
     }
 
+    /**
+     * @param string $key
+     * @param array  $response
+     *
+     * @return array
+     */
+    protected function getArrayFromResponse(string $key, array $response): array
+    {
+        $result = [];
+        if (isset($response['Response'])) {
+            foreach ($response['Response'] as $entry) {
+                $currentKey = key($entry);
+                $data       = current($entry);
+                if ($currentKey === $key) {
+                    $result[] = $data;
+                }
+            }
+        }
+
+        return $result;
+    }
+
     protected function getDefaultHeaders(): array
     {
+        $userAgent = sprintf('FireflyIII v%s', config('firefly.version'));
+
         return [
-            'X-Bunq-Client-Request-Id' => uniqid('sander'),
+            'X-Bunq-Client-Request-Id' => uniqid('FFIII'),
             'Cache-Control'            => 'no-cache',
-            'User-Agent'               => 'pre-Firefly III test thing',
+            'User-Agent'               => $userAgent,
             'X-Bunq-Language'          => 'en_US',
             'X-Bunq-Region'            => 'nl_NL',
             'X-Bunq-Geolocation'       => '0 0 0 0 NL',
@@ -186,7 +195,7 @@ abstract class BunqRequest
     protected function sendSignedBunqGet(string $uri, array $data, array $headers): array
     {
         if (strlen($this->server) === 0) {
-            throw new Exception('No bunq server defined');
+            throw new FireflyException('No bunq server defined');
         }
 
         $body                               = json_encode($data);
@@ -207,7 +216,7 @@ abstract class BunqRequest
         $responseHeaders = $response->headers->getAll();
         $statusCode      = $response->status_code;
         if (!$this->verifyServerSignature($body, $responseHeaders, $statusCode)) {
-            throw new Exception(sprintf('Could not verify signature for request to "%s"', $uri));
+            throw new FireflyException(sprintf('Could not verify signature for request to "%s"', $uri));
         }
         $array['ResponseHeaders'] = $responseHeaders;
 
@@ -242,7 +251,7 @@ abstract class BunqRequest
         $responseHeaders = $response->headers->getAll();
         $statusCode      = $response->status_code;
         if (!$this->verifyServerSignature($body, $responseHeaders, $statusCode)) {
-            throw new Exception(sprintf('Could not verify signature for request to "%s"', $uri));
+            throw new FireflyException(sprintf('Could not verify signature for request to "%s"', $uri));
         }
         $array['ResponseHeaders'] = $responseHeaders;
 
@@ -298,14 +307,13 @@ abstract class BunqRequest
      */
     private function throwResponseError(array $response)
     {
-        echo '<hr><pre>' . print_r($response, true) . '</pre><hr>';
         $message = [];
         if (isset($response['Error'])) {
             foreach ($response['Error'] as $error) {
                 $message[] = $error['error_description'];
             }
         }
-        throw new Exception(join(', ', $message));
+        throw new FireflyException(join(', ', $message));
     }
 
     /**
@@ -318,17 +326,16 @@ abstract class BunqRequest
      */
     private function verifyServerSignature(string $body, array $headers, int $statusCode): bool
     {
-        $this->logger->debug('Going to verify signature for body+headers+status');
+        Log::debug('Going to verify signature for body+headers+status');
         $dataToVerify  = $statusCode . "\n";
         $verifyHeaders = [];
 
         // false when no public key is present
         if (is_null($this->serverPublicKey)) {
-            $this->logger->error('No public key present in class, so return FALSE.');
+            Log::error('No public key present in class, so return FALSE.');
 
             return false;
         }
-        //$this->logger->debug('Given headers', $headers);
         foreach ($headers as $header => $value) {
 
             // skip non-bunq headers or signature
@@ -337,7 +344,7 @@ abstract class BunqRequest
             }
             // need to have upper case variant of header:
             if (!isset($this->upperCaseHeaders[$header])) {
-                throw new Exception(sprintf('No upper case variant for header "%s"', $header));
+                throw new FireflyException(sprintf('No upper case variant for header "%s"', $header));
             }
             $header                 = $this->upperCaseHeaders[$header];
             $verifyHeaders[$header] = $value[0];
@@ -345,8 +352,6 @@ abstract class BunqRequest
         // sort verification headers:
         ksort($verifyHeaders);
 
-        //$this->logger->debug('Final headers for verification', $verifyHeaders);
-
         // add them to data to sign:
         foreach ($verifyHeaders as $header => $value) {
             $dataToVerify .= $header . ': ' . trim($value) . "\n";
@@ -354,20 +359,17 @@ abstract class BunqRequest
 
         $signature    = $headers['x-bunq-server-signature'][0];
         $dataToVerify .= "\n" . $body;
-
-        //$this->logger->debug(sprintf('Signature to verify: "%s"', $signature));
-
-        $result = openssl_verify($dataToVerify, base64_decode($signature), $this->serverPublicKey->getPublicKey(), OPENSSL_ALGO_SHA256);
+        $result       = openssl_verify($dataToVerify, base64_decode($signature), $this->serverPublicKey->getPublicKey(), OPENSSL_ALGO_SHA256);
 
         if (is_int($result) && $result < 1) {
-            $this->logger->error(sprintf('Result of verification is %d, return false.', $result));
+            Log::error(sprintf('Result of verification is %d, return false.', $result));
 
             return false;
         }
         if (!is_int($result)) {
-            $this->logger->error(sprintf('Result of verification is a boolean (%d), return false.', $result));
+            Log::error(sprintf('Result of verification is a boolean (%d), return false.', $result));
         }
-        $this->logger->info('Signature is a match, return true.');
+        Log::info('Signature is a match, return true.');
 
         return true;
     }
diff --git a/app/Services/Bunq/Request/DeviceServerRequest.php b/app/Services/Bunq/Request/DeviceServerRequest.php
new file mode 100644
index 0000000000..d997064656
--- /dev/null
+++ b/app/Services/Bunq/Request/DeviceServerRequest.php
@@ -0,0 +1,82 @@
+<?php
+/**
+ * DeviceServerRequest.php
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Services\Bunq\Request;
+
+use FireflyIII\Services\Bunq\Id\DeviceServerId;
+use FireflyIII\Services\Bunq\Token\InstallationToken;
+
+/**
+ * Class DeviceServerRequest
+ *
+ * @package Bunq\Request
+ */
+class DeviceServerRequest extends BunqRequest
+{
+    /** @var string */
+    private $description = '';
+    /** @var  DeviceServerId */
+    private $deviceServerId;
+    /** @var  InstallationToken */
+    private $installationToken;
+    /** @var array */
+    private $permittedIps = [];
+
+    /**
+     *
+     */
+    public function call(): void
+    {
+        $uri                                     = '/v1/device-server';
+        $data                                    = ['description' => $this->description, 'secret' => $this->secret, 'permitted_ips' => $this->permittedIps];
+        $headers                                 = $this->getDefaultHeaders();
+        $headers['X-Bunq-Client-Authentication'] = $this->installationToken->getToken();
+        $response                                = $this->sendSignedBunqPost($uri, $data, $headers);
+        $deviceServerId                          = new DeviceServerId;
+        $deviceServerId->setId(intval($response['Response'][0]['Id']['id']));
+        $this->deviceServerId = $deviceServerId;
+
+        return;
+    }
+
+    /**
+     * @return DeviceServerId
+     */
+    public function getDeviceServerId(): DeviceServerId
+    {
+        return $this->deviceServerId;
+    }
+
+    /**
+     * @param string $description
+     */
+    public function setDescription(string $description)
+    {
+        $this->description = $description;
+    }
+
+    /**
+     * @param InstallationToken $installationToken
+     */
+    public function setInstallationToken(InstallationToken $installationToken)
+    {
+        $this->installationToken = $installationToken;
+    }
+
+    /**
+     * @param array $permittedIps
+     */
+    public function setPermittedIps(array $permittedIps)
+    {
+        $this->permittedIps = $permittedIps;
+    }
+}
\ No newline at end of file
diff --git a/app/Services/Bunq/Request/InstallationTokenRequest.php b/app/Services/Bunq/Request/InstallationTokenRequest.php
index d23e573a18..d941e09a6c 100644
--- a/app/Services/Bunq/Request/InstallationTokenRequest.php
+++ b/app/Services/Bunq/Request/InstallationTokenRequest.php
@@ -13,6 +13,9 @@ declare(strict_types=1);
 namespace FireflyIII\Services\Bunq\Request;
 
 use FireflyIII\Services\Bunq\Id\InstallationId;
+use FireflyIII\Services\Bunq\Object\ServerPublicKey;
+use FireflyIII\Services\Bunq\Token\InstallationToken;
+use Log;
 
 /**
  * Class InstallationTokenRequest
@@ -38,22 +41,17 @@ class InstallationTokenRequest extends BunqRequest
         $uri      = '/v1/installation';
         $data     = ['client_public_key' => $this->publicKey,];
         $headers  = $this->getDefaultHeaders();
-        $response = [];
-        if ($this->fake) {
-            $response = json_decode(
-                '{"Response":[{"Id":{"id":875936}},{"Token":{"id":13172597,"created":"2017-08-05 11:46:07.061740","updated":"2017-08-05 11:46:07.061740","token":"35278fcc8b0615261fe23285e6d2e6ccd05ac4c93454981bd5e985ec453e5b5d"}},{"ServerPublicKey":{"server_public_key":"-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAon5y6OZGvTN8kIqPBdro\ndG8TWVw6sl34hAWI47NK6Pi7gmnTtd\/k9gfwq56iI4Er8uMM5e4QmjD++XrBIqcw\nHohDVK03li3xsyJPZ4EBSUOkv4VKXKL\/quqlSgDmPnxtT39BowUZl1um5QbTm0hW\npGI\/0bK7jQk7mbEan9yDOpXnczKgfNlo4o+zbFquPdUfA5LE8R8X057dB6ab7eqA\n9Aybo+I6xyrsOOztufg3Yfe5RA6a0Sikqe\/L8HCP+9TJByUI2pwydPou3KONfYhK\n1NQJZ+RCZ6V+jmcuzKe2vq0jhBZd26wNscl48Sm7etJeuBOpHE+MgO24JiTEYlLS\nVQIDAQAB\n-----END PUBLIC KEY-----\n"}}]}',
-                true
-            );
-        }
-        if (!$this->fake) {
-            $response = $this->sendUnsignedBunqPost($uri, $data, $headers);
-        }
-        //echo '<hr><pre>' . json_encode($response) . '</pre><hr>';
+        $response = $this->sendUnsignedBunqPost($uri, $data, $headers);
+        Log::debug('Installation request response', $response);
 
         $this->installationId    = $this->extractInstallationId($response);
         $this->serverPublicKey   = $this->extractServerPublicKey($response);
         $this->installationToken = $this->extractInstallationToken($response);
 
+        Log::debug(sprintf('Installation ID: %s', serialize($this->installationId)));
+        Log::debug(sprintf('Installation token: %s', serialize($this->installationToken)));
+        Log::debug(sprintf('server public key: %s', serialize($this->serverPublicKey)));
+
         return;
     }
 
diff --git a/app/Services/Bunq/Request/ListDeviceServerRequest.php b/app/Services/Bunq/Request/ListDeviceServerRequest.php
new file mode 100644
index 0000000000..ee9548b74a
--- /dev/null
+++ b/app/Services/Bunq/Request/ListDeviceServerRequest.php
@@ -0,0 +1,74 @@
+<?php
+/**
+ * ListDeviceServerRequest.php
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Services\Bunq\Request;
+
+use FireflyIII\Services\Bunq\Object\DeviceServer;
+use FireflyIII\Services\Bunq\Token\InstallationToken;
+use Illuminate\Support\Collection;
+
+/**
+ * Class ListDeviceServerRequest
+ *
+ * @package FireflyIII\Services\Bunq\Request
+ */
+class ListDeviceServerRequest extends BunqRequest
+{
+    /** @var Collection */
+    private $devices;
+    /** @var  InstallationToken */
+    private $installationToken;
+
+    public function __construct()
+    {
+        parent::__construct();
+        $this->devices = new Collection;
+    }
+
+    /**
+     * @return Collection
+     */
+    public function getDevices(): Collection
+    {
+        return $this->devices;
+    }
+
+
+    /**
+     *
+     */
+    public function call(): void
+    {
+        $uri                                     = '/v1/device-server';
+        $data                                    = [];
+        $headers                                 = $this->getDefaultHeaders();
+        $headers['X-Bunq-Client-Authentication'] = $this->installationToken->getToken();
+        $response                                = $this->sendSignedBunqGet($uri, $data, $headers);
+
+        // create device server objects:
+        $raw = $this->getArrayFromResponse('DeviceServer', $response);
+        /** @var array $entry */
+        foreach ($raw as $entry) {
+            $this->devices->push(new DeviceServer($entry));
+        }
+
+        return;
+    }
+
+    /**
+     * @param InstallationToken $installationToken
+     */
+    public function setInstallationToken(InstallationToken $installationToken)
+    {
+        $this->installationToken = $installationToken;
+    }
+}
\ No newline at end of file
diff --git a/app/Support/Import/Prerequisites/BunqPrerequisites.php b/app/Support/Import/Prerequisites/BunqPrerequisites.php
index f0cd1ed377..48e46c7717 100644
--- a/app/Support/Import/Prerequisites/BunqPrerequisites.php
+++ b/app/Support/Import/Prerequisites/BunqPrerequisites.php
@@ -11,8 +11,21 @@ declare(strict_types=1);
 
 namespace FireflyIII\Support\Import\Prerequisites;
 
+use FireflyIII\Exceptions\FireflyException;
+use FireflyIII\Services\Bunq\Id\DeviceServerId;
+use FireflyIII\Services\Bunq\Object\DeviceServer;
+use FireflyIII\Services\Bunq\Object\ServerPublicKey;
+use FireflyIII\Services\Bunq\Request\DeviceServerRequest;
+use FireflyIII\Services\Bunq\Request\InstallationTokenRequest;
+use FireflyIII\Services\Bunq\Request\ListDeviceServerRequest;
+use FireflyIII\Services\Bunq\Token\InstallationToken;
 use FireflyIII\User;
+use Illuminate\Http\Request;
+use Illuminate\Support\MessageBag;
+use Log;
 use Preferences;
+use Requests;
+use Requests_Exception;
 
 /**
  * Class BunqPrerequisites
@@ -68,4 +81,232 @@ class BunqPrerequisites implements PrerequisitesInterface
 
         return;
     }
+
+    /**
+     * @param Request $request
+     *
+     * @return MessageBag
+     */
+    public function storePrerequisites(Request $request): MessageBag
+    {
+        $apiKey = $request->get('api_key');
+        Log::debug('Storing bunq API key');
+        Preferences::setForUser($this->user, 'bunq_api_key', $apiKey);
+        // register Firefly III as a new device.
+        $serverId = $this->registerDevice();
+
+
+        return new MessageBag;
+    }
+
+    /**
+     *
+     */
+    private function createKeyPair(): void
+    {
+        Log::debug('Generate new key pair for user.');
+        $keyConfig = [
+            "digest_alg"       => "sha512",
+            "private_key_bits" => 2048,
+            "private_key_type" => OPENSSL_KEYTYPE_RSA,
+        ];
+        // Create the private and public key
+        $res = openssl_pkey_new($keyConfig);
+
+        // Extract the private key from $res to $privKey
+        $privKey = '';
+        openssl_pkey_export($res, $privKey);
+
+        // Extract the public key from $res to $pubKey
+        $pubKey = openssl_pkey_get_details($res);
+
+        Preferences::setForUser($this->user, 'bunq_private_key', $privKey);
+        Preferences::setForUser($this->user, 'bunq_public_key', $pubKey['key']);
+        Log::debug('Created key pair');
+
+        return;
+
+    }
+
+    /**
+     * Get a list of servers and return the one that is this FF instance, if one can be found.
+     *
+     * @return DeviceServerId
+     * @throws FireflyException
+     */
+    private function getExistingDevice(): DeviceServerId
+    {
+        $installationToken = $this->getInstallationToken();
+        $serverPublicKey   = $this->getServerPublicKey();
+        $request           = new ListDeviceServerRequest;
+        $remoteIp          = $this->getRemoteIp();
+        $request->setInstallationToken($installationToken);
+        $request->setServerPublicKey($serverPublicKey);
+        $request->setPrivateKey($this->getPrivateKey());
+        $request->setServer(config('firefly.bunq.server'));
+        $request->call();
+        $devices = $request->getDevices();
+        /** @var DeviceServer $device */
+        foreach ($devices as $device) {
+            if ($device->getIp() === $remoteIp) {
+                return $device->getId();
+            }
+        }
+        throw new FireflyException('Cannot find existing Server Device that can be used by this instance of Firefly III.');
+    }
+
+    /**
+     * Get the installation token, either from the users preferences or from Bunq.
+     *
+     * @return InstallationToken
+     */
+    private function getInstallationToken(): InstallationToken
+    {
+        Log::debug('Get installation token.');
+        $token = Preferences::getForUser($this->user, 'bunq_installation_token', null);
+        if (!is_null($token)) {
+            return $token->data;
+        }
+        Log::debug('Have no token, request one.');
+
+        // verify bunq api code:
+        $publicKey = $this->getPublicKey();
+        $request   = new InstallationTokenRequest;
+        $request->setServer(strval(config('firefly.bunq.server')));
+        $request->setPublicKey($publicKey);
+        $request->call();
+        Log::debug('Sent request');
+
+        $installationToken = $request->getInstallationToken();
+        $installationId    = $request->getInstallationId();
+        $serverPublicKey   = $request->getServerPublicKey();
+
+        Preferences::setForUser($this->user, 'bunq_installation_token', $installationToken);
+        Preferences::setForUser($this->user, 'bunq_installation_id', $installationId);
+        Preferences::setForUser($this->user, 'bunq_server_public_key', $serverPublicKey);
+
+        exit;
+    }
+
+    /**
+     * Get the private key from the users preferences.
+     *
+     * @return string
+     */
+    private function getPrivateKey(): string
+    {
+        Log::debug('get private key');
+        $preference = Preferences::getForUser($this->user, 'bunq_private_key', null);
+        if (is_null($preference)) {
+            Log::debug('private key is null');
+            // create key pair
+            $this->createKeyPair();
+        }
+        $preference = Preferences::getForUser($this->user, 'bunq_private_key', null);
+        Log::debug('Return private key for user');
+
+        return $preference->data;
+    }
+
+    /**
+     * Get a public key from the users preferences.
+     *
+     * @return string
+     */
+    private function getPublicKey(): string
+    {
+        Log::debug('get public key');
+        $preference = Preferences::getForUser($this->user, 'bunq_public_key', null);
+        if (is_null($preference)) {
+            Log::debug('public key is null');
+            // create key pair
+            $this->createKeyPair();
+        }
+        $preference = Preferences::getForUser($this->user, 'bunq_public_key', null);
+        Log::debug('Return public key for user');
+
+        return $preference->data;
+    }
+
+    /**
+     * Let's assume this value will not change any time soon.
+     */
+    private function getRemoteIp(): string
+    {
+        $preference = Preferences::getForUser($this->user, 'external_ip', null);
+        if (is_null($preference)) {
+            try {
+                $response = Requests::get('https://api.ipify.org');
+            } catch (Requests_Exception $e) {
+                throw new FireflyException(sprintf('Could not retrieve external IP: %s', $e->getMessage()));
+            }
+            if ($response->status_code !== 200) {
+                throw new FireflyException(sprintf('Could not retrieve external IP: %d %s', $response->status_code, $response->body));
+            }
+            $ip = $response->body;
+            Preferences::setForUser($this->user, 'external_ip', $ip);
+
+            return $ip;
+        }
+
+        return $preference->data;
+    }
+
+    /**
+     * @return ServerPublicKey
+     */
+    private function getServerPublicKey(): ServerPublicKey
+    {
+        return Preferences::getForUser($this->user, 'bunq_server_public_key', null)->data;
+    }
+
+    /**
+     * To install Firefly III as a new device:
+     * - Send an installation token request.
+     * - Use this token to send a device server request
+     * - Store the installation token
+     * - Use the installation token each time we need a session.
+     */
+    private function registerDevice(): DeviceServerId
+    {
+        Log::debug('Now in registerDevice');
+        $deviceServerId = Preferences::getForUser($this->user, 'bunq_device_server_id', null);
+        $serverIp       = $this->getRemoteIp();
+        if (!is_null($deviceServerId)) {
+            Log::debug('Have device server ID.');
+
+            return $deviceServerId->data;
+        }
+        Log::debug('Device server id is null, do register.');
+        $installationToken = $this->getInstallationToken();
+        $serverPublicKey   = $this->getServerPublicKey();
+        $apiKey            = Preferences::getForUser($this->user, 'bunq_api_key', '');
+        $request           = new DeviceServerRequest;
+        $request->setServer(strval(config('firefly.bunq.server')));
+        $request->setPrivateKey($this->getPrivateKey());
+        $request->setDescription('Firefly III v' . config('firefly.version') . ' for ' . $this->user->email);
+        $request->setSecret($apiKey->data);
+        $request->setPermittedIps([$serverIp]);
+        $request->setInstallationToken($installationToken);
+        $request->setServerPublicKey($serverPublicKey);
+        $deviceServerId = null;
+        // try to register device:
+        try {
+            $request->call();
+            $deviceServerId = $request->getDeviceServerId();
+        } catch (FireflyException $e) {
+            Log::error($e->getMessage());
+        }
+        if (is_null($deviceServerId)) {
+            // try get the current from a list:
+            $deviceServerId = $this->getExistingDevice();
+        }
+
+        Preferences::setForUser($this->user, 'bunq_device_server_id', $deviceServerId);
+        Log::debug(sprintf('Server ID: %s', serialize($deviceServerId)));
+        var_dump($deviceServerId);
+        var_dump($installationToken);
+        exit;
+    }
+
 }
diff --git a/app/Support/Import/Prerequisites/PrerequisitesInterface.php b/app/Support/Import/Prerequisites/PrerequisitesInterface.php
index 803ee90e7e..393a3d82a5 100644
--- a/app/Support/Import/Prerequisites/PrerequisitesInterface.php
+++ b/app/Support/Import/Prerequisites/PrerequisitesInterface.php
@@ -13,6 +13,8 @@ namespace FireflyIII\Support\Import\Prerequisites;
 
 
 use FireflyIII\User;
+use Illuminate\Http\Request;
+use Illuminate\Support\MessageBag;
 
 interface PrerequisitesInterface
 {
@@ -30,6 +32,13 @@ interface PrerequisitesInterface
      */
     public function getViewParameters(): array;
 
+    /**
+     * @param Request $request
+     *
+     * @return MessageBag
+     */
+    public function storePrerequisites(Request $request): MessageBag;
+
     /**
      * Returns if this import method has any special prerequisites such as config
      * variables or other things.
diff --git a/resources/views/import/bunq/prerequisites.twig b/resources/views/import/bunq/prerequisites.twig
index 88872997a9..aafe01c93d 100644
--- a/resources/views/import/bunq/prerequisites.twig
+++ b/resources/views/import/bunq/prerequisites.twig
@@ -10,13 +10,13 @@
             <div class="col-lg-12 col-md-12 col-sm-12">
                 <div class="box box-default">
                     <div class="box-header with-border">
-                        <h3 class="box-title">{{ trans('bank.prerequisites_for_import_title') }}</h3>
+                        <h3 class="box-title">{{ trans('bank.bunq_prerequisites_title') }}</h3>
                     </div>
                     <div class="box-body">
                         <div class="row">
                             <div class="col-lg-8">
                                 <p>
-                                    {{ trans('bank.prerequisites_for_import_text') }}
+                                    {{ trans('bank.bunq_prerequisites_text') }}
                                 </p>
                             </div>
                         </div>
diff --git a/routes/web.php b/routes/web.php
index 0b0cba2265..13aa3714cf 100755
--- a/routes/web.php
+++ b/routes/web.php
@@ -401,6 +401,8 @@ Route::group(
     // banks:
     Route::get('bank/{bank}/prerequisites', ['uses' => 'Import\BankController@prerequisites', 'as' => 'bank.prerequisites']);
     Route::post('bank/{bank}/prerequisites', ['uses' => 'Import\BankController@postPrerequisites', 'as' => 'bank.prerequisites.post']);
+
+    Route::get('bank/{bank}/form', ['uses' => 'Import\BankController@form', 'as' => 'bank.form']);
 }
 );
 

From ca0f09c8f77a20bb76484446f0075010142da518 Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Fri, 18 Aug 2017 23:02:29 +0200
Subject: [PATCH 057/668] Various cleanup.

---
 .../Controllers/Import/BankController.php     | 15 ++++---
 .../Prerequisites/BunqPrerequisites.php       | 43 +++++++++++++------
 2 files changed, 38 insertions(+), 20 deletions(-)

diff --git a/app/Http/Controllers/Import/BankController.php b/app/Http/Controllers/Import/BankController.php
index 17af47128c..2e16476e8e 100644
--- a/app/Http/Controllers/Import/BankController.php
+++ b/app/Http/Controllers/Import/BankController.php
@@ -20,10 +20,13 @@ use Session;
 
 class BankController extends Controller
 {
-
+    /**
+     *
+     */
     public function form()
     {
 
+
     }
 
     /**
@@ -40,14 +43,12 @@ class BankController extends Controller
         $object = app($class);
         $object->setUser(auth()->user());
         if (!$object->hasPrerequisites()) {
-            //Log::debug(sprintf('No more prerequisites for %s, move to form.', $bank));
-            //return redirect(route('import.bank.form', [$bank]));
+            Log::debug(sprintf('No more prerequisites for %s, move to form.', $bank));
+            return redirect(route('import.bank.form', [$bank]));
         }
         Log::debug('Going to store entered preprerequisites.');
         // store post data
         $result = $object->storePrerequisites($request);
-        echo 'done with prereq';
-        exit;
 
         if ($result->count() > 0) {
             Session::flash('error', $result->first());
@@ -70,12 +71,12 @@ class BankController extends Controller
         $object = app($class);
         $object->setUser(auth()->user());
 
-        //if ($object->hasPrerequisites()) {
+        if ($object->hasPrerequisites()) {
             $view       = $object->getView();
             $parameters = $object->getViewParameters();
 
             return view($view, $parameters);
-        //}
+        }
 
         if (!$object->hasPrerequisites()) {
             return redirect(route('import.bank.form', [$bank]));
diff --git a/app/Support/Import/Prerequisites/BunqPrerequisites.php b/app/Support/Import/Prerequisites/BunqPrerequisites.php
index 48e46c7717..44abdf488b 100644
--- a/app/Support/Import/Prerequisites/BunqPrerequisites.php
+++ b/app/Support/Import/Prerequisites/BunqPrerequisites.php
@@ -28,7 +28,7 @@ use Requests;
 use Requests_Exception;
 
 /**
- * Class BunqPrerequisites
+ * This class contains all the routines necessary to connect to Bunq.
  *
  * @package FireflyIII\Support\Import\Prerequisites
  */
@@ -38,7 +38,7 @@ class BunqPrerequisites implements PrerequisitesInterface
     private $user;
 
     /**
-     * Returns view name that allows user to fill in prerequisites.
+     * Returns view name that allows user to fill in prerequisites. Currently asks for the API key.
      *
      * @return string
      */
@@ -59,7 +59,8 @@ class BunqPrerequisites implements PrerequisitesInterface
 
     /**
      * Returns if this import method has any special prerequisites such as config
-     * variables or other things.
+     * variables or other things. The only thing we verify is the presence of the API key. Everything else
+     * tumbles into place: no installation token? Will be requested. No device server? Will be created. Etc.
      *
      * @return bool
      */
@@ -83,6 +84,9 @@ class BunqPrerequisites implements PrerequisitesInterface
     }
 
     /**
+     * This method responds to the user's submission of an API key. It tries to register this instance as a new Firefly III device.
+     * If this fails, the error is returned in a message bag and the user is notified (this is fairly friendly).
+     *
      * @param Request $request
      *
      * @return MessageBag
@@ -93,14 +97,22 @@ class BunqPrerequisites implements PrerequisitesInterface
         Log::debug('Storing bunq API key');
         Preferences::setForUser($this->user, 'bunq_api_key', $apiKey);
         // register Firefly III as a new device.
-        $serverId = $this->registerDevice();
+        $serverId = null;
+        $messages = new MessageBag;
+        try {
+            $serverId = $this->registerDevice();
+            Log::debug(sprintf('Found device server with id %d', $serverId->getId()));
+        } catch (FireflyException $e) {
+            $messages->add('error', $e->getMessage());
+        }
 
-
-        return new MessageBag;
+        return $messages;
     }
 
     /**
-     *
+     * This method creates a new public/private keypair for the user. This isn't really secure, since the key is generated on the fly with
+     * no regards for HSM's, smart cards or other things. It would require some low level programming to get this right. But the private key
+     * is stored encrypted in the database so it's something.
      */
     private function createKeyPair(): void
     {
@@ -129,7 +141,8 @@ class BunqPrerequisites implements PrerequisitesInterface
     }
 
     /**
-     * Get a list of servers and return the one that is this FF instance, if one can be found.
+     * When the device server cannot be registered for some reason (when previous attempts failed to be stored) this method can be used
+     * to try and detect the server ID for this firefly instance.
      *
      * @return DeviceServerId
      * @throws FireflyException
@@ -185,7 +198,7 @@ class BunqPrerequisites implements PrerequisitesInterface
         Preferences::setForUser($this->user, 'bunq_installation_id', $installationId);
         Preferences::setForUser($this->user, 'bunq_server_public_key', $serverPublicKey);
 
-        exit;
+        return $installationToken;
     }
 
     /**
@@ -229,7 +242,10 @@ class BunqPrerequisites implements PrerequisitesInterface
     }
 
     /**
-     * Let's assume this value will not change any time soon.
+     * Request users server remote IP. Let's assume this value will not change any time soon.
+     *
+     * @return string
+     * @throws FireflyException
      */
     private function getRemoteIp(): string
     {
@@ -253,6 +269,8 @@ class BunqPrerequisites implements PrerequisitesInterface
     }
 
     /**
+     * Get the public key of the server, necessary to verify server signature.
+     *
      * @return ServerPublicKey
      */
     private function getServerPublicKey(): ServerPublicKey
@@ -304,9 +322,8 @@ class BunqPrerequisites implements PrerequisitesInterface
 
         Preferences::setForUser($this->user, 'bunq_device_server_id', $deviceServerId);
         Log::debug(sprintf('Server ID: %s', serialize($deviceServerId)));
-        var_dump($deviceServerId);
-        var_dump($installationToken);
-        exit;
+
+        return $deviceServerId;
     }
 
 }

From 4694e31e35410ab4beea914e6894ead117b34bc1 Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Sat, 19 Aug 2017 09:22:44 +0200
Subject: [PATCH 058/668] Expand bunq related code.

---
 .../Controllers/Import/BankController.php     |  32 +++-
 .../Bunq/Object/MonetaryAccountBank.php       |  23 +++
 app/Services/Bunq/Object/UserCompany.php      |  34 ++++
 app/Services/Bunq/Object/UserPerson.php       |   3 +
 app/Services/Bunq/Request/BunqRequest.php     | 120 +++++++++++---
 .../Request/DeleteDeviceSessionRequest.php    |  49 ++++++
 .../Bunq/Request/DeviceSessionRequest.php     | 149 ++++++++++++++++++
 .../Import/Information/BunqInformation.php    | 105 ++++++++++++
 .../Information/InformationInterface.php      |  39 +++++
 config/firefly.php                            |   3 +
 10 files changed, 533 insertions(+), 24 deletions(-)
 create mode 100644 app/Services/Bunq/Object/MonetaryAccountBank.php
 create mode 100644 app/Services/Bunq/Object/UserCompany.php
 create mode 100644 app/Services/Bunq/Request/DeleteDeviceSessionRequest.php
 create mode 100644 app/Services/Bunq/Request/DeviceSessionRequest.php
 create mode 100644 app/Support/Import/Information/BunqInformation.php
 create mode 100644 app/Support/Import/Information/InformationInterface.php

diff --git a/app/Http/Controllers/Import/BankController.php b/app/Http/Controllers/Import/BankController.php
index 2e16476e8e..d54fa5726d 100644
--- a/app/Http/Controllers/Import/BankController.php
+++ b/app/Http/Controllers/Import/BankController.php
@@ -13,6 +13,7 @@ namespace FireflyIII\Http\Controllers\Import;
 
 
 use FireflyIII\Http\Controllers\Controller;
+use FireflyIII\Support\Import\Information\InformationInterface;
 use FireflyIII\Support\Import\Prerequisites\PrerequisitesInterface;
 use Illuminate\Http\Request;
 use Log;
@@ -21,15 +22,36 @@ use Session;
 class BankController extends Controller
 {
     /**
-     *
+     * This method must ask the user all parameters necessary to start importing data. This may not be enough
+     * to finish the import itself (ie. mapping) but it should be enough to begin: accounts to import from,
+     * accounts to import into, data ranges, etc.
      */
-    public function form()
+    public function form(string $bank)
     {
+        $class = config(sprintf('firefly.import_pre.%s', $bank));
+        /** @var PrerequisitesInterface $object */
+        $object = app($class);
+        $object->setUser(auth()->user());
 
+        if ($object->hasPrerequisites()) {
+            return redirect(route('import.banq.prerequisites', [$bank]));
+        }
+        $class = config(sprintf('firefly.import_info.%s', $bank));
+        /** @var InformationInterface $object */
+        $object = app($class);
+        $object->setUser(auth()->user());
+        $remoteAccounts = $object->getAccounts();
 
     }
 
     /**
+     * This method processes the prerequisites the user has entered in the previous step.
+     *
+     * Whatever storePrerequisites does, it should make sure that the system is ready to continue immediately. So
+     * no extra calls or stuff, except maybe to open a session
+     *
+     * @see PrerequisitesInterface::storePrerequisites
+     *
      * @param Request $request
      * @param string  $bank
      *
@@ -60,6 +82,9 @@ class BankController extends Controller
     }
 
     /**
+     * This method shows you, if necessary, a form that allows you to enter any required values, such as API keys,
+     * login passwords or other values.
+     *
      * @param string $bank
      *
      * @return \Illuminate\Contracts\View\Factory|\Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector|\Illuminate\View\View
@@ -77,10 +102,7 @@ class BankController extends Controller
 
             return view($view, $parameters);
         }
-
-        if (!$object->hasPrerequisites()) {
             return redirect(route('import.bank.form', [$bank]));
-        }
     }
 
 }
diff --git a/app/Services/Bunq/Object/MonetaryAccountBank.php b/app/Services/Bunq/Object/MonetaryAccountBank.php
new file mode 100644
index 0000000000..31f7224be2
--- /dev/null
+++ b/app/Services/Bunq/Object/MonetaryAccountBank.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * MonetaryAccountBank.php
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Services\Bunq\Object;
+
+/**
+ * Class MonetaryAccountBank
+ *
+ * @package FireflyIII\Services\Bunq\Object
+ */
+class MonetaryAccountBank extends BunqObject
+{
+
+}
\ No newline at end of file
diff --git a/app/Services/Bunq/Object/UserCompany.php b/app/Services/Bunq/Object/UserCompany.php
new file mode 100644
index 0000000000..9ae3f18931
--- /dev/null
+++ b/app/Services/Bunq/Object/UserCompany.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * UserCompany.php
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Services\Bunq\Object;
+
+use Carbon\Carbon;
+
+/**
+ * Class UserCompany
+ *
+ * @package FireflyIII\Services\Bunq\Object
+ */
+class UserCompany extends BunqObject
+{
+    /**
+     * UserCompany constructor.
+     *
+     * @param array $data
+     */
+    public function __construct(array $data)
+    {
+
+    }
+
+}
\ No newline at end of file
diff --git a/app/Services/Bunq/Object/UserPerson.php b/app/Services/Bunq/Object/UserPerson.php
index 963357ab51..336d7c9a4f 100644
--- a/app/Services/Bunq/Object/UserPerson.php
+++ b/app/Services/Bunq/Object/UserPerson.php
@@ -90,6 +90,9 @@ class UserPerson extends BunqObject
      */
     public function __construct(array $data)
     {
+        if (count($data) === 0) {
+            return;
+        }
         $this->id              = intval($data['id']);
         $this->created         = Carbon::createFromFormat('Y-m-d H:i:s.u', $data['created']);
         $this->updated         = Carbon::createFromFormat('Y-m-d H:i:s.u', $data['updated']);
diff --git a/app/Services/Bunq/Request/BunqRequest.php b/app/Services/Bunq/Request/BunqRequest.php
index 6712f178d6..629378377f 100644
--- a/app/Services/Bunq/Request/BunqRequest.php
+++ b/app/Services/Bunq/Request/BunqRequest.php
@@ -99,23 +99,24 @@ abstract class BunqRequest
      * @param string $data
      *
      * @return string
+     * @throws FireflyException
      */
     protected function generateSignature(string $method, string $uri, array $headers, string $data): string
     {
         if (strlen($this->privateKey) === 0) {
-            throw new Exception('No private key present.');
+            throw new FireflyException('No private key present.');
         }
-        if (strtolower($method) === 'get') {
+        if (strtolower($method) === 'get' || strtolower($method) === 'delete') {
             $data = '';
         }
 
         $uri           = str_replace(['https://api.bunq.com', 'https://sandbox.public.api.bunq.com'], '', $uri);
-        $toSign        = strtoupper($method) . ' ' . $uri . "\n";
+        $toSign        = sprintf("%s %s\n", strtoupper($method), $uri);
         $headersToSign = ['Cache-Control', 'User-Agent'];
         ksort($headers);
         foreach ($headers as $name => $value) {
             if (in_array($name, $headersToSign) || substr($name, 0, 7) === 'X-Bunq-') {
-                $toSign .= $name . ': ' . $value . "\n";
+                $toSign .= sprintf("%s: %s\n", $name, $value);
             }
         }
         $toSign    .= "\n" . $data;
@@ -184,6 +185,48 @@ abstract class BunqRequest
         return [];
     }
 
+    /**
+     * @param string $uri
+     * @param array  $headers
+     *
+     * @return array
+     * @throws Exception
+     */
+    protected function sendSignedBunqDelete(string $uri, array $headers): array
+    {
+        if (strlen($this->server) === 0) {
+            throw new FireflyException('No bunq server defined');
+        }
+
+        $fullUri                            = $this->server . $uri;
+        $signature                          = $this->generateSignature('delete', $uri, $headers, '');
+        $headers['X-Bunq-Client-Signature'] = $signature;
+        try {
+            $response = Requests::delete($fullUri, $headers);
+        } catch (Requests_Exception $e) {
+            return ['Error' => [0 => ['error_description' => $e->getMessage(), 'error_description_translated' => $e->getMessage()],]];
+        }
+
+        $body                        = $response->body;
+        $array                       = json_decode($body, true);
+        $responseHeaders             = $response->headers->getAll();
+        $statusCode                  = $response->status_code;
+        $array['ResponseHeaders']    = $responseHeaders;
+        $array['ResponseStatusCode'] = $statusCode;
+
+        Log::debug(sprintf('Response to DELETE %s is %s', $fullUri, $body));
+        if ($this->isErrorResponse($array)) {
+            $this->throwResponseError($array);
+        }
+
+        if (!$this->verifyServerSignature($body, $responseHeaders, $statusCode)) {
+            throw new FireflyException(sprintf('Could not verify signature for request to "%s"', $uri));
+        }
+
+
+        return $array;
+    }
+
     /**
      * @param string $uri
      * @param array  $data
@@ -208,17 +251,20 @@ abstract class BunqRequest
             return ['Error' => [0 => ['error_description' => $e->getMessage(), 'error_description_translated' => $e->getMessage()],]];
         }
 
-        $body  = $response->body;
-        $array = json_decode($body, true);
+        $body                        = $response->body;
+        $array                       = json_decode($body, true);
+        $responseHeaders             = $response->headers->getAll();
+        $statusCode                  = $response->status_code;
+        $array['ResponseHeaders']    = $responseHeaders;
+        $array['ResponseStatusCode'] = $statusCode;
+
         if ($this->isErrorResponse($array)) {
             $this->throwResponseError($array);
         }
-        $responseHeaders = $response->headers->getAll();
-        $statusCode      = $response->status_code;
+
         if (!$this->verifyServerSignature($body, $responseHeaders, $statusCode)) {
             throw new FireflyException(sprintf('Could not verify signature for request to "%s"', $uri));
         }
-        $array['ResponseHeaders'] = $responseHeaders;
 
         return $array;
     }
@@ -243,17 +289,49 @@ abstract class BunqRequest
             return ['Error' => [0 => ['error_description' => $e->getMessage(), 'error_description_translated' => $e->getMessage()],]];
         }
 
-        $body  = $response->body;
-        $array = json_decode($body, true);
+        $body                        = $response->body;
+        $array                       = json_decode($body, true);
+        $responseHeaders             = $response->headers->getAll();
+        $statusCode                  = $response->status_code;
+        $array['ResponseHeaders']    = $responseHeaders;
+        $array['ResponseStatusCode'] = $statusCode;
+
         if ($this->isErrorResponse($array)) {
             $this->throwResponseError($array);
         }
-        $responseHeaders = $response->headers->getAll();
-        $statusCode      = $response->status_code;
+
         if (!$this->verifyServerSignature($body, $responseHeaders, $statusCode)) {
             throw new FireflyException(sprintf('Could not verify signature for request to "%s"', $uri));
         }
-        $array['ResponseHeaders'] = $responseHeaders;
+
+
+        return $array;
+    }
+
+    /**
+     * @param string $uri
+     * @param array  $headers
+     *
+     * @return array
+     */
+    protected function sendUnsignedBunqDelete(string $uri, array $headers): array
+    {
+        $fullUri = $this->server . $uri;
+        try {
+            $response = Requests::delete($fullUri, $headers);
+        } catch (Requests_Exception $e) {
+            return ['Error' => [0 => ['error_description' => $e->getMessage(), 'error_description_translated' => $e->getMessage()],]];
+        }
+        $body                        = $response->body;
+        $array                       = json_decode($body, true);
+        $responseHeaders             = $response->headers->getAll();
+        $statusCode                  = $response->status_code;
+        $array['ResponseHeaders']    = $responseHeaders;
+        $array['ResponseStatusCode'] = $statusCode;
+
+        if ($this->isErrorResponse($array)) {
+            $this->throwResponseError($array);
+        }
 
         return $array;
     }
@@ -274,13 +352,17 @@ abstract class BunqRequest
         } catch (Requests_Exception $e) {
             return ['Error' => [0 => ['error_description' => $e->getMessage(), 'error_description_translated' => $e->getMessage()],]];
         }
-        $body            = $response->body;
-        $responseHeaders = $response->headers->getAll();
-        $array           = json_decode($body, true);
+        $body                        = $response->body;
+        $array                       = json_decode($body, true);
+        $responseHeaders             = $response->headers->getAll();
+        $statusCode                  = $response->status_code;
+        $array['ResponseHeaders']    = $responseHeaders;
+        $array['ResponseStatusCode'] = $statusCode;
+
         if ($this->isErrorResponse($array)) {
             $this->throwResponseError($array);
         }
-        $array['ResponseHeaders'] = $responseHeaders;
+
 
         return $array;
     }
@@ -313,7 +395,7 @@ abstract class BunqRequest
                 $message[] = $error['error_description'];
             }
         }
-        throw new FireflyException(join(', ', $message));
+        throw new FireflyException('Bunq ERROR ' . $response['ResponseStatusCode'] . ': ' . join(', ', $message));
     }
 
     /**
diff --git a/app/Services/Bunq/Request/DeleteDeviceSessionRequest.php b/app/Services/Bunq/Request/DeleteDeviceSessionRequest.php
new file mode 100644
index 0000000000..66c5d1eecc
--- /dev/null
+++ b/app/Services/Bunq/Request/DeleteDeviceSessionRequest.php
@@ -0,0 +1,49 @@
+<?php
+/**
+ * DeleteDeviceSessionRequest.php
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Services\Bunq\Request;
+
+use FireflyIII\Services\Bunq\Token\InstallationToken;
+use FireflyIII\Services\Bunq\Token\SessionToken;
+use Log;
+
+/**
+ * Class DeleteDeviceSessionRequest
+ *
+ * @package FireflyIII\Services\Bunq\Request
+ */
+class DeleteDeviceSessionRequest extends BunqRequest
+{
+    /** @var  SessionToken */
+    private $sessionToken;
+
+    /**
+     *
+     */
+    public function call(): void
+    {
+        Log::debug('Going to send bunq delete session request.');
+        $uri                                     = sprintf('/v1/session/%d', $this->sessionToken->getId());
+        $headers                                 = $this->getDefaultHeaders();
+        $headers['X-Bunq-Client-Authentication'] = $this->sessionToken->getToken();
+        $this->sendSignedBunqDelete($uri, $headers);
+        return;
+    }
+
+    /**
+     * @param SessionToken $sessionToken
+     */
+    public function setSessionToken(SessionToken $sessionToken)
+    {
+        $this->sessionToken = $sessionToken;
+    }
+}
\ No newline at end of file
diff --git a/app/Services/Bunq/Request/DeviceSessionRequest.php b/app/Services/Bunq/Request/DeviceSessionRequest.php
new file mode 100644
index 0000000000..66bc0dc768
--- /dev/null
+++ b/app/Services/Bunq/Request/DeviceSessionRequest.php
@@ -0,0 +1,149 @@
+<?php
+/**
+ * DeviceSessionRequest.php
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Services\Bunq\Request;
+
+
+use FireflyIII\Services\Bunq\Id\DeviceSessionId;
+use FireflyIII\Services\Bunq\Object\UserCompany;
+use FireflyIII\Services\Bunq\Object\UserPerson;
+use FireflyIII\Services\Bunq\Token\InstallationToken;
+use FireflyIII\Services\Bunq\Token\SessionToken;
+use Log;
+
+/**
+ * Class DeviceSessionRequest
+ *
+ * @package FireflyIII\Services\Bunq\Request
+ */
+class DeviceSessionRequest extends BunqRequest
+{
+    /** @var  DeviceSessionId */
+    private $deviceSessionId;
+    /** @var  InstallationToken */
+    private $installationToken;
+    /** @var  SessionToken */
+    private $sessionToken;
+    /** @var  UserCompany */
+    private $userCompany;
+    /** @var  UserPerson */
+    private $userPerson;
+
+    /**
+     *
+     */
+    public function call(): void
+    {
+        $uri                                     = '/v1/session-server';
+        $data                                    = ['secret' => $this->secret];
+        $headers                                 = $this->getDefaultHeaders();
+        $headers['X-Bunq-Client-Authentication'] = $this->installationToken->getToken();
+        $response                                = $this->sendSignedBunqPost($uri, $data, $headers);
+
+
+        $this->deviceSessionId = $this->extractDeviceSessionId($response);
+        $this->sessionToken    = $this->extractSessionToken($response);
+        $this->userPerson      = $this->extractUserPerson($response);
+        $this->userCompany     = $this->extractUserCompany($response);
+
+        Log::debug(sprintf('Session ID: %s', serialize($this->deviceSessionId)));
+        Log::debug(sprintf('Session token: %s', serialize($this->sessionToken)));
+        Log::debug(sprintf('Session user person: %s', serialize($this->userPerson)));
+        Log::debug(sprintf('Session user company: %s', serialize($this->userCompany)));
+
+        return;
+    }
+
+    /**
+     * @return DeviceSessionId
+     */
+    public function getDeviceSessionId(): DeviceSessionId
+    {
+        return $this->deviceSessionId;
+    }
+
+    /**
+     * @return SessionToken
+     */
+    public function getSessionToken(): SessionToken
+    {
+        return $this->sessionToken;
+    }
+
+    /**
+     * @return UserPerson
+     */
+    public function getUserPerson(): UserPerson
+    {
+        return $this->userPerson;
+    }
+
+    /**
+     * @param InstallationToken $installationToken
+     */
+    public function setInstallationToken(InstallationToken $installationToken)
+    {
+        $this->installationToken = $installationToken;
+    }
+
+    /**
+     * @param array $response
+     *
+     * @return DeviceSessionId
+     */
+    private function extractDeviceSessionId(array $response): DeviceSessionId
+    {
+        $data            = $this->getKeyFromResponse('Id', $response);
+        $deviceSessionId = new DeviceSessionId;
+        $deviceSessionId->setId(intval($data['id']));
+
+        return $deviceSessionId;
+    }
+
+    private function extractSessionToken(array $response): SessionToken
+    {
+        $data         = $this->getKeyFromResponse('Token', $response);
+        $sessionToken = new SessionToken($data);
+
+        return $sessionToken;
+    }
+
+    /**
+     * @param $response
+     *
+     * @return UserCompany
+     */
+    private function extractUserCompany($response): UserCompany
+    {
+        $data        = $this->getKeyFromResponse('UserCompany', $response);
+        $userCompany = new UserCompany($data);
+
+
+        return $userCompany;
+    }
+
+    /**
+     * @param $response
+     *
+     * @return UserPerson
+     */
+    private function extractUserPerson($response): UserPerson
+    {
+        $data       = $this->getKeyFromResponse('UserPerson', $response);
+        $userPerson = new UserPerson($data);
+
+
+        return $userPerson;
+    }
+
+
+}
\ No newline at end of file
diff --git a/app/Support/Import/Information/BunqInformation.php b/app/Support/Import/Information/BunqInformation.php
new file mode 100644
index 0000000000..971336df75
--- /dev/null
+++ b/app/Support/Import/Information/BunqInformation.php
@@ -0,0 +1,105 @@
+<?php
+/**
+ * BunqInformation.php
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Support\Import\Information;
+
+use FireflyIII\Services\Bunq\Request\DeleteDeviceSessionRequest;
+use FireflyIII\Services\Bunq\Request\DeviceSessionRequest;
+use FireflyIII\Services\Bunq\Token\SessionToken;
+use FireflyIII\User;
+use Illuminate\Support\Collection;
+use Log;
+use Preferences;
+
+/**
+ * Class BunqInformation
+ *
+ * @package FireflyIII\Support\Import\Information
+ */
+class BunqInformation implements InformationInterface
+{
+
+    /** @var  User */
+    private $user;
+
+    /**
+     * Returns a collection of accounts. Preferrably, these follow a uniform Firefly III format so they can be managed over banks.
+     *
+     * @return Collection
+     */
+    public function getAccounts(): Collection
+    {
+        Log::debug('Now in getAccounts()');
+        $sessionToken = $this->startSession();
+
+        // get list of Bunq accounts:
+
+
+        $this->closeSession($sessionToken);
+
+        return new Collection;
+    }
+
+    /**
+     * Set the user for this Prerequisites-routine. Class is expected to implement and save this.
+     *
+     * @param User $user
+     */
+    public function setUser(User $user): void
+    {
+        $this->user = $user;
+    }
+
+    /**
+     * @param SessionToken $sessionToken
+     */
+    private function closeSession(SessionToken $sessionToken): void
+    {
+        Log::debug('Going to close session');
+        $apiKey          = Preferences::getForUser($this->user, 'bunq_api_key')->data;
+        $serverPublicKey = Preferences::getForUser($this->user, 'bunq_server_public_key')->data;
+        $server          = config('firefly.bunq.server');
+        $privateKey      = Preferences::getForUser($this->user, 'bunq_private_key')->data;
+        $request         = new DeleteDeviceSessionRequest();
+        $request->setSecret($apiKey);
+        $request->setServer($server);
+        $request->setPrivateKey($privateKey);
+        $request->setServerPublicKey($serverPublicKey);
+        $request->setSessionToken($sessionToken);
+        $request->call();
+        return;
+    }
+
+    /**
+     * @return SessionToken
+     */
+    private function startSession(): SessionToken
+    {
+        Log::debug('Now in startSession.');
+        $apiKey            = Preferences::getForUser($this->user, 'bunq_api_key')->data;
+        $serverPublicKey   = Preferences::getForUser($this->user, 'bunq_server_public_key')->data;
+        $server            = config('firefly.bunq.server');
+        $privateKey        = Preferences::getForUser($this->user, 'bunq_private_key')->data;
+        $installationToken = Preferences::getForUser($this->user, 'bunq_installation_token')->data;
+        $request           = new DeviceSessionRequest();
+        $request->setSecret($apiKey);
+        $request->setServerPublicKey($serverPublicKey);
+        $request->setServer($server);
+        $request->setPrivateKey($privateKey);
+        $request->setInstallationToken($installationToken);
+        $request->call();
+        $sessionToken = $request->getSessionToken();
+        Log::debug(sprintf('Now have got session token: %s', serialize($sessionToken)));
+
+        return $sessionToken;
+    }
+}
\ No newline at end of file
diff --git a/app/Support/Import/Information/InformationInterface.php b/app/Support/Import/Information/InformationInterface.php
new file mode 100644
index 0000000000..a3a8fb6dca
--- /dev/null
+++ b/app/Support/Import/Information/InformationInterface.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * InformationInterface.php
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Support\Import\Information;
+
+use FireflyIII\User;
+use Illuminate\Support\Collection;
+
+/**
+ * Interface InformationInterface
+ *
+ * @package FireflyIII\Support\Import\Information
+ */
+interface InformationInterface
+{
+
+    /**
+     * Set the user for this Prerequisites-routine. Class is expected to implement and save this.
+     *
+     * @param User $user
+     */
+    public function setUser(User $user): void;
+
+    /**
+     * Returns a collection of accounts. Preferrably, these follow a uniform Firefly III format so they can be managed over banks.
+     *
+     * @return Collection
+     */
+    public function getAccounts(): Collection;
+}
\ No newline at end of file
diff --git a/config/firefly.php b/config/firefly.php
index 6903836d2b..b1e1660187 100644
--- a/config/firefly.php
+++ b/config/firefly.php
@@ -42,6 +42,9 @@ return [
     'import_pre' => [
         'bunq' => 'FireflyIII\Support\Import\Prerequisites\BunqPrerequisites',
     ],
+    'import_info' => [
+        'bunq' => 'FireflyIII\Support\Import\Information\BunqInformation',
+    ],
     'bunq' => [
         'server' => 'https://sandbox.public.api.bunq.com',
     ],

From c4fe9a6a51e09a0c4ff5e13cd2ec6e9dc41599b9 Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Sat, 19 Aug 2017 16:46:06 +0200
Subject: [PATCH 059/668] More code for bunq import, must now wait for reply
 from bunq itself

---
 .../Bunq/Object/MonetaryAccountBank.php       |  8 ++
 app/Services/Bunq/Object/UserCompany.php      | 63 +++++++++++++
 app/Services/Bunq/Object/UserLight.php        | 70 +++++++++++++++
 app/Services/Bunq/Object/UserPerson.php       |  9 ++
 app/Services/Bunq/Request/ListUserRequest.php | 90 +++++++++++++++++++
 .../Import/Information/BunqInformation.php    | 27 ++++++
 6 files changed, 267 insertions(+)
 create mode 100644 app/Services/Bunq/Object/UserLight.php
 create mode 100644 app/Services/Bunq/Request/ListUserRequest.php

diff --git a/app/Services/Bunq/Object/MonetaryAccountBank.php b/app/Services/Bunq/Object/MonetaryAccountBank.php
index 31f7224be2..2642d0ac5f 100644
--- a/app/Services/Bunq/Object/MonetaryAccountBank.php
+++ b/app/Services/Bunq/Object/MonetaryAccountBank.php
@@ -19,5 +19,13 @@ namespace FireflyIII\Services\Bunq\Object;
  */
 class MonetaryAccountBank extends BunqObject
 {
+    /**
+     * MonetaryAccountBank constructor.
+     *
+     * @param array $data
+     */
+    public function __construct(array $data) {
+
+    }
 
 }
\ No newline at end of file
diff --git a/app/Services/Bunq/Object/UserCompany.php b/app/Services/Bunq/Object/UserCompany.php
index 9ae3f18931..c0c861f947 100644
--- a/app/Services/Bunq/Object/UserCompany.php
+++ b/app/Services/Bunq/Object/UserCompany.php
@@ -21,6 +21,52 @@ use Carbon\Carbon;
  */
 class UserCompany extends BunqObject
 {
+    private $addressMain;
+    private $addressPostal;
+    /** @var array */
+    private $aliases = [];
+    private $avatar;
+    /** @var string */
+    private $cocNumber = '';
+    /** @var string */
+    private $counterBankIban = '';
+    /** @var Carbon */
+    private $created;
+    private $dailyLimit;
+    private $directorAlias;
+    /** @var string */
+    private $displayName = '';
+    /** @var int */
+    private $id = 0;
+    /** @var string */
+    private $language = '';
+    /** @var string */
+    private $name = '';
+    /** @var array */
+    private $notificationFilters = [];
+    /** @var string */
+    private $publicNickName = '';
+    /** @var string */
+    private $publicUuid = '';
+    /** @var string */
+    private $region = '';
+    /** @var string */
+    private $sectorOfIndustry = '';
+    /** @var int */
+    private $sessionTimeout = 0;
+    /** @var string */
+    private $status = '';
+    /** @var string */
+    private $subStatus = '';
+    /** @var  string */
+    private $typeOfBusinessEntity = '';
+    /** @var array */
+    private $ubos = [];
+    /** @var Carbon */
+    private $updated;
+    /** @var int */
+    private $versionTos = 0;
+
     /**
      * UserCompany constructor.
      *
@@ -28,6 +74,23 @@ class UserCompany extends BunqObject
      */
     public function __construct(array $data)
     {
+        $this->id                   = intval($data['id']);
+        $this->created              = Carbon::createFromFormat('Y-m-d H:i:s.u', $data['created']);
+        $this->updated              = Carbon::createFromFormat('Y-m-d H:i:s.u', $data['updated']);
+        $this->status               = $data['status'];
+        $this->subStatus            = $data['sub_status'];
+        $this->publicUuid           = $data['public_uuid'];
+        $this->displayName          = $data['display_name'];
+        $this->publicNickName       = $data['public_nick_name'];
+        $this->language             = $data['language'];
+        $this->region               = $data['region'];
+        $this->sessionTimeout       = intval($data['session_timeout']);
+        $this->versionTos           = intval($data['version_terms_of_service']);
+        $this->cocNumber            = $data['chamber_of_commerce_number'];
+        $this->typeOfBusinessEntity = $data['type_of_business_entity'] ?? '';
+        $this->sectorOfIndustry     = $data['sector_of_industry'] ?? '';
+        $this->counterBankIban      = $data['counter_bank_iban'];
+        $this->name                 = $data['name'];
 
     }
 
diff --git a/app/Services/Bunq/Object/UserLight.php b/app/Services/Bunq/Object/UserLight.php
new file mode 100644
index 0000000000..fe47df54a7
--- /dev/null
+++ b/app/Services/Bunq/Object/UserLight.php
@@ -0,0 +1,70 @@
+<?php
+/**
+ * UserLight.php
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Services\Bunq\Object;
+
+use Carbon\Carbon;
+
+/**
+ * Class UserLight
+ *
+ * @package FireflyIII\Services\Bunq\Object
+ */
+class UserLight extends BunqObject
+{
+    /** @var array */
+    private $aliases = [];
+    /** @var Carbon */
+    private $created;
+    /** @var string */
+    private $displayName = '';
+    /** @var string */
+    private $firstName = '';
+    /** @var int */
+    private $id = 0;
+    /** @var string */
+    private $lastName = '';
+    /** @var string */
+    private $legalName = '';
+    /** @var string */
+    private $middleName = '';
+    /** @var string */
+    private $publicNickName = '';
+    /** @var string */
+    private $publicUuid = '';
+    /** @var Carbon */
+    private $updated;
+
+    /**
+     * UserLight constructor.
+     *
+     * @param array $data
+     */
+    public function __construct(array $data)
+    {
+        if(count($data) === 0) {
+            return;
+        }
+        $this->id             = intval($data['id']);
+        $this->created        = Carbon::createFromFormat('Y-m-d H:i:s.u', $data['created']);
+        $this->updated        = Carbon::createFromFormat('Y-m-d H:i:s.u', $data['updated']);
+        $this->publicUuid     = $data['public_uuid'];
+        $this->displayName    = $data['display_name'];
+        $this->publicNickName = $data['public_nick_name'];
+        $this->firstName      = $data['first_name'];
+        $this->middleName     = $data['middle_name'];
+        $this->lastName       = $data['last_name'];
+        $this->legalName      = $data['legal_name'];
+        // aliases
+    }
+
+}
\ No newline at end of file
diff --git a/app/Services/Bunq/Object/UserPerson.php b/app/Services/Bunq/Object/UserPerson.php
index 336d7c9a4f..c9a29ebb4d 100644
--- a/app/Services/Bunq/Object/UserPerson.php
+++ b/app/Services/Bunq/Object/UserPerson.php
@@ -134,4 +134,13 @@ class UserPerson extends BunqObject
         //        echo '</pre>';
     }
 
+    /**
+     * @return int
+     */
+    public function getId(): int
+    {
+        return $this->id;
+    }
+
+
 }
\ No newline at end of file
diff --git a/app/Services/Bunq/Request/ListUserRequest.php b/app/Services/Bunq/Request/ListUserRequest.php
new file mode 100644
index 0000000000..06dbeb96de
--- /dev/null
+++ b/app/Services/Bunq/Request/ListUserRequest.php
@@ -0,0 +1,90 @@
+<?php
+/**
+ * ListUserRequest.php
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Services\Bunq\Request;
+
+use FireflyIII\Services\Bunq\Object\UserCompany;
+use FireflyIII\Services\Bunq\Object\UserLight;
+use FireflyIII\Services\Bunq\Object\UserPerson;
+use FireflyIII\Services\Bunq\Token\SessionToken;
+
+/**
+ * Class ListUserRequest
+ *
+ * @package FireflyIII\Services\Bunq\Request
+ */
+class ListUserRequest extends BunqRequest
+{
+    /** @var  SessionToken */
+    private $sessionToken;
+    /** @var  UserCompany */
+    private $userCompany;
+    /** @var  UserLight */
+    private $userLight;
+    /** @var  UserPerson */
+    private $userPerson;
+
+    /**
+     *
+     */
+    public function call(): void
+    {
+        $uri                                     = '/v1/user';
+        $data                                    = [];
+        $headers                                 = $this->getDefaultHeaders();
+        $headers['X-Bunq-Client-Authentication'] = $this->sessionToken->getToken();
+        $response                                = $this->sendSignedBunqGet($uri, $data, $headers);
+
+        // create user objects:
+        $light             = $this->getKeyFromResponse('UserLight', $response);
+        $company           = $this->getKeyFromResponse('UserCompany', $response);
+        $person            = $this->getKeyFromResponse('UserPerson', $response);
+        $this->userLight   = new UserLight($light);
+        $this->userCompany = new UserCompany($company);
+        $this->userPerson  = new UserPerson($person);
+
+        return;
+    }
+
+    /**
+     * @return UserCompany
+     */
+    public function getUserCompany(): UserCompany
+    {
+        return $this->userCompany;
+    }
+
+    /**
+     * @return UserLight
+     */
+    public function getUserLight(): UserLight
+    {
+        return $this->userLight;
+    }
+
+    /**
+     * @return UserPerson
+     */
+    public function getUserPerson(): UserPerson
+    {
+        return $this->userPerson;
+    }
+
+
+    /**
+     * @param SessionToken $sessionToken
+     */
+    public function setSessionToken(SessionToken $sessionToken)
+    {
+        $this->sessionToken = $sessionToken;
+    }
+}
\ No newline at end of file
diff --git a/app/Support/Import/Information/BunqInformation.php b/app/Support/Import/Information/BunqInformation.php
index 971336df75..3c41800fa1 100644
--- a/app/Support/Import/Information/BunqInformation.php
+++ b/app/Support/Import/Information/BunqInformation.php
@@ -14,6 +14,7 @@ namespace FireflyIII\Support\Import\Information;
 
 use FireflyIII\Services\Bunq\Request\DeleteDeviceSessionRequest;
 use FireflyIII\Services\Bunq\Request\DeviceSessionRequest;
+use FireflyIII\Services\Bunq\Request\ListUserRequest;
 use FireflyIII\Services\Bunq\Token\SessionToken;
 use FireflyIII\User;
 use Illuminate\Support\Collection;
@@ -40,6 +41,7 @@ class BunqInformation implements InformationInterface
     {
         Log::debug('Now in getAccounts()');
         $sessionToken = $this->startSession();
+        $this->getUserInformation($sessionToken);
 
         // get list of Bunq accounts:
 
@@ -79,6 +81,31 @@ class BunqInformation implements InformationInterface
         return;
     }
 
+    /**
+     * @param SessionToken $sessionToken
+     */
+    private function getUserInformation(SessionToken $sessionToken): void
+    {
+        $apiKey            = Preferences::getForUser($this->user, 'bunq_api_key')->data;
+        $serverPublicKey   = Preferences::getForUser($this->user, 'bunq_server_public_key')->data;
+        $server            = config('firefly.bunq.server');
+        $privateKey        = Preferences::getForUser($this->user, 'bunq_private_key')->data;
+        $request = new ListUserRequest;
+        $request->setSessionToken($sessionToken);
+        $request->setSecret($apiKey);
+        $request->setServerPublicKey($serverPublicKey);
+        $request->setServer($server);
+        $request->setPrivateKey($privateKey);
+        $request->call();
+        // return the first that isn't null?
+        // get all objects, try to find ID.
+        var_dump($request->getUserCompany());
+        var_dump($request->getUserLight());
+        var_dump($request->getUserPerson());
+
+        return;
+    }
+
     /**
      * @return SessionToken
      */

From bd924b993b31a979b41ee3b5fce95a5abb914336 Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Sat, 19 Aug 2017 18:24:04 +0200
Subject: [PATCH 060/668] This fixes part of #738 (not everything).

---
 .../Controllers/Transaction/SplitController.php    | 14 ++++++++++++--
 resources/views/transactions/split/edit.twig       | 13 ++++++++++---
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/app/Http/Controllers/Transaction/SplitController.php b/app/Http/Controllers/Transaction/SplitController.php
index 23225eae8f..d8c8a872f9 100644
--- a/app/Http/Controllers/Transaction/SplitController.php
+++ b/app/Http/Controllers/Transaction/SplitController.php
@@ -18,6 +18,7 @@ use ExpandedForm;
 use FireflyIII\Events\UpdatedTransactionJournal;
 use FireflyIII\Helpers\Attachments\AttachmentHelperInterface;
 use FireflyIII\Http\Controllers\Controller;
+use FireflyIII\Models\Account;
 use FireflyIII\Models\AccountType;
 use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
@@ -94,13 +95,22 @@ class SplitController extends Controller
 
         $uploadSize     = min(Steam::phpBytes(ini_get('upload_max_filesize')), Steam::phpBytes(ini_get('post_max_size')));
         $currencies     = $this->currencies->get();
-        $assetAccounts  = ExpandedForm::makeSelectList($this->accounts->getAccountsByType([AccountType::DEFAULT, AccountType::ASSET]));
+        $accountList    = $this->accounts->getAccountsByType([AccountType::DEFAULT, AccountType::ASSET]);
+        $assetAccounts  = ExpandedForm::makeSelectList($accountList);
         $optionalFields = Preferences::get('transaction_journal_optional_fields', [])->data;
         $budgets        = ExpandedForm::makeSelectListWithEmpty($this->budgets->getActiveBudgets());
         $preFilled      = $this->arrayFromJournal($request, $journal);
         $subTitle       = trans('breadcrumbs.edit_journal', ['description' => $journal->description]);
         $subTitleIcon   = 'fa-pencil';
 
+        $accountArray = [];
+        // account array to display currency info:
+        /** @var Account $account */
+        foreach ($accountList as $account) {
+            $accountArray[$account->id] = $account;
+        }
+
+
         Session::flash('gaEventCategory', 'transactions');
         Session::flash('gaEventAction', 'edit-split-' . $preFilled['what']);
 
@@ -115,7 +125,7 @@ class SplitController extends Controller
             compact(
                 'subTitleIcon', 'currencies', 'optionalFields',
                 'preFilled', 'subTitle', 'uploadSize', 'assetAccounts',
-                'budgets', 'journal'
+                'budgets', 'journal','accountArray'
             )
         );
     }
diff --git a/resources/views/transactions/split/edit.twig b/resources/views/transactions/split/edit.twig
index dfb69c7fcd..5266ee0be0 100644
--- a/resources/views/transactions/split/edit.twig
+++ b/resources/views/transactions/split/edit.twig
@@ -56,9 +56,16 @@
                         {% endif %}
 
                         {# TOTAL AMOUNT IS STATIC TEXT #}
-                        {# TODO this does not reflect the actual currency (currencies) #}
-                        {{ ExpandedForm.staticText('journal_amount', preFilled.journal_amount|formatAmount ) }}
-                        <input type="hidden" name="journal_amount" value="{{ preFilled.journal_amount }}"/>
+                        {% if preFilled.what == 'withdrawal' or preFilled.what == 'transfer' %}
+                            {{ ExpandedForm.staticText('journal_amount', formatAmountByAccount(accountArray[preFilled.journal_source_account_id], preFilled.journal_amount, true) ) }}
+                            <input type="hidden" name="journal_amount" value="{{ preFilled.journal_amount }}"/>
+                        {% endif %}
+
+                        {% if preFilled.what == 'deposit' %}
+                            {{ ExpandedForm.staticText('journal_amount', formatAmountByAccount(accountArray[preFilled.journal_destination_account_id], preFilled.journal_amount, true) ) }}
+                            <input type="hidden" name="journal_amount" value="{{ preFilled.journal_amount }}"/>
+                        {% endif %}
+
 
                         {# DATE #}
                         {{ ExpandedForm.date('date', journal.date) }}

From 2609f3425b7e01e0ea944b6fd6eb8cd911e06c01 Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Sat, 19 Aug 2017 21:59:13 +0200
Subject: [PATCH 061/668] Fix #738

---
 .../Transaction/SplitController.php           |  5 +--
 public/js/ff/transactions/split/edit.js       |  7 ++--
 resources/views/transactions/split/edit.twig  | 35 ++++++++++++-------
 3 files changed, 30 insertions(+), 17 deletions(-)

diff --git a/app/Http/Controllers/Transaction/SplitController.php b/app/Http/Controllers/Transaction/SplitController.php
index d8c8a872f9..2f0b407cc9 100644
--- a/app/Http/Controllers/Transaction/SplitController.php
+++ b/app/Http/Controllers/Transaction/SplitController.php
@@ -107,7 +107,8 @@ class SplitController extends Controller
         // account array to display currency info:
         /** @var Account $account */
         foreach ($accountList as $account) {
-            $accountArray[$account->id] = $account;
+            $accountArray[$account->id]                = $account;
+            $accountArray[$account->id]['currency_id'] = intval($account->getMeta('currency_id'));
         }
 
 
@@ -125,7 +126,7 @@ class SplitController extends Controller
             compact(
                 'subTitleIcon', 'currencies', 'optionalFields',
                 'preFilled', 'subTitle', 'uploadSize', 'assetAccounts',
-                'budgets', 'journal','accountArray'
+                'budgets', 'journal', 'accountArray'
             )
         );
     }
diff --git a/public/js/ff/transactions/split/edit.js b/public/js/ff/transactions/split/edit.js
index dbe9cfba98..197e9f6fb6 100644
--- a/public/js/ff/transactions/split/edit.js
+++ b/public/js/ff/transactions/split/edit.js
@@ -7,7 +7,7 @@
  */
 
 
-/** global: originalSum, accounting, what, Modernizr */
+/** global: originalSum, accounting, what, Modernizr, currencySymbol */
 
 var destAccounts = {};
 var srcAccounts = {};
@@ -231,13 +231,14 @@ function calculateSum() {
     sum = Math.round(sum * 100) / 100;
     left = Math.round(left * 100) / 100;
 
+
     $('.amount-warning').remove();
     if (sum !== originalSum) {
         var holder = $('#journal_amount_holder');
         var par = holder.find('p.form-control-static');
-        $('<span>').text(' (' + accounting.formatMoney(sum) + ')').addClass('text-danger amount-warning').appendTo(par);
+        $('<span>').text(' (' + accounting.formatMoney(sum, currencySymbol) + ')').addClass('text-danger amount-warning').appendTo(par);
         // also add what's left to divide (or vice versa)
-        $('<span>').text(' (' + accounting.formatMoney(left) + ')').addClass('text-danger amount-warning').appendTo(par);
+        $('<span>').text(' (' + accounting.formatMoney(left, currencySymbol) + ')').addClass('text-danger amount-warning').appendTo(par);
     }
 
 }
\ No newline at end of file
diff --git a/resources/views/transactions/split/edit.twig b/resources/views/transactions/split/edit.twig
index 5266ee0be0..fcce6ddc94 100644
--- a/resources/views/transactions/split/edit.twig
+++ b/resources/views/transactions/split/edit.twig
@@ -250,7 +250,11 @@
                                     {% endif %}
 
                                     {# amount#}
+                                    {% if transaction.foreign_amount != null %}
                                     <div class="col-lg-1 col-md-5 col-sm-12 col-xs-12">
+                                    {% else %}
+                                    <div class="col-lg-2 col-md-5 col-sm-12 col-xs-12">
+                                    {% endif %}
                                         <div class="input-group">
                                             <div class="input-group-addon">{{ transaction.transaction_currency_symbol }}</div>
                                             <input type="number" name="transactions[{{ loop.index0 }}][amount]" value="{{ transaction.amount }}"
@@ -261,21 +265,20 @@
                                     </div>
 
                                     {# foreign amount #}
+                                    {% if transaction.foreign_amount != null %}
                                     <div class="col-lg-1 col-md-7 col-sm-12 col-xs-12">
-                                        {% if transaction.foreign_amount != null %}
+                                        <div class="input-group">
+                                            <div class="input-group-addon">{{ transaction.foreign_currency_symbol }}</div>
+                                            <input type="number" name="transactions[{{ loop.index0 }}][foreign_amount]"
+                                                   value="{{ transaction.foreign_amount }}"
+                                                   class="form-control" autocomplete="off" step="any">
+                                        </div>
+                                        <input type="hidden"
+                                               name="transactions[{{ loop.index0 }}][foreign_currency_id]"
+                                               value="{{ transaction.foreign_currency_id }}">
 
-                                            <div class="input-group">
-                                                <div class="input-group-addon">{{ transaction.foreign_currency_symbol }}</div>
-                                                <input type="number" name="transactions[{{ loop.index0 }}][foreign_amount]"
-                                                       value="{{ transaction.foreign_amount }}"
-                                                       class="form-control" autocomplete="off" step="any">
-                                            </div>
-                                            <input type="hidden"
-                                                   name="transactions[{{ loop.index0 }}][foreign_currency_id]"
-                                                   value="{{ transaction.foreign_currency_id }}">
-
-                                        {% endif %}
                                     </div>
+                                    {% endif %}
 
                                     {# budget #}
                                     {% if preFilled.what == 'withdrawal' %}
@@ -330,7 +333,15 @@
     <link href="css/jquery-ui/jquery-ui.theme.min.css" type="text/css" rel="stylesheet" media="all">
 {% endblock %}
 {% block scripts %}
+    <script type="text/javascript" src="{{ route('javascript.currencies') }}?ext=.js"></script>
     <script type="text/javascript">
+        var currencySymbol = 'x';
+        {% if preFilled.what == 'withdrawal' or preFilled.what == 'transfer' %}
+            currencySymbol = currencyInfo[{{ accountArray[preFilled.journal_source_account_id].currency_id }}].symbol;
+        {% endif %}
+        {% if preFilled.what == 'deposit' %}
+            currencySymbol = currencyInfo[{{ accountArray[preFilled.journal_destination_account_id].currency_id }}].symbol;
+        {% endif %}
         var originalSum = {{ preFilled.journal_amount }};
         var what = "{{ preFilled.what }}";
     </script>

From 1d6f3fc57f3401e7e31f309c17f287fe141c04aa Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Sun, 20 Aug 2017 12:39:31 +0200
Subject: [PATCH 062/668] Update composer file.

---
 composer.lock | 46 +++++++++++++++++++++++-----------------------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/composer.lock b/composer.lock
index 55445326ed..b3fdfc23cd 100644
--- a/composer.lock
+++ b/composer.lock
@@ -2067,16 +2067,16 @@
         },
         {
             "name": "symfony/polyfill-mbstring",
-            "version": "v1.4.0",
+            "version": "v1.5.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-mbstring.git",
-                "reference": "f29dca382a6485c3cbe6379f0c61230167681937"
+                "reference": "7c8fae0ac1d216eb54349e6a8baa57d515fe8803"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/f29dca382a6485c3cbe6379f0c61230167681937",
-                "reference": "f29dca382a6485c3cbe6379f0c61230167681937",
+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/7c8fae0ac1d216eb54349e6a8baa57d515fe8803",
+                "reference": "7c8fae0ac1d216eb54349e6a8baa57d515fe8803",
                 "shasum": ""
             },
             "require": {
@@ -2088,7 +2088,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.4-dev"
+                    "dev-master": "1.5-dev"
                 }
             },
             "autoload": {
@@ -2122,20 +2122,20 @@
                 "portable",
                 "shim"
             ],
-            "time": "2017-06-09T14:24:12+00:00"
+            "time": "2017-06-14T15:44:48+00:00"
         },
         {
             "name": "symfony/polyfill-php56",
-            "version": "v1.4.0",
+            "version": "v1.5.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php56.git",
-                "reference": "bc0b7d6cb36b10cfabb170a3e359944a95174929"
+                "reference": "e85ebdef569b84e8709864e1a290c40f156b30ca"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php56/zipball/bc0b7d6cb36b10cfabb170a3e359944a95174929",
-                "reference": "bc0b7d6cb36b10cfabb170a3e359944a95174929",
+                "url": "https://api.github.com/repos/symfony/polyfill-php56/zipball/e85ebdef569b84e8709864e1a290c40f156b30ca",
+                "reference": "e85ebdef569b84e8709864e1a290c40f156b30ca",
                 "shasum": ""
             },
             "require": {
@@ -2145,7 +2145,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.4-dev"
+                    "dev-master": "1.5-dev"
                 }
             },
             "autoload": {
@@ -2178,20 +2178,20 @@
                 "portable",
                 "shim"
             ],
-            "time": "2017-06-09T08:25:21+00:00"
+            "time": "2017-06-14T15:44:48+00:00"
         },
         {
             "name": "symfony/polyfill-util",
-            "version": "v1.4.0",
+            "version": "v1.5.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-util.git",
-                "reference": "ebccbde4aad410f6438d86d7d261c6b4d2b9a51d"
+                "reference": "67925d1cf0b84bd234a83bebf26d4eb281744c6d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-util/zipball/ebccbde4aad410f6438d86d7d261c6b4d2b9a51d",
-                "reference": "ebccbde4aad410f6438d86d7d261c6b4d2b9a51d",
+                "url": "https://api.github.com/repos/symfony/polyfill-util/zipball/67925d1cf0b84bd234a83bebf26d4eb281744c6d",
+                "reference": "67925d1cf0b84bd234a83bebf26d4eb281744c6d",
                 "shasum": ""
             },
             "require": {
@@ -2200,7 +2200,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.4-dev"
+                    "dev-master": "1.5-dev"
                 }
             },
             "autoload": {
@@ -2230,7 +2230,7 @@
                 "polyfill",
                 "shim"
             ],
-            "time": "2017-06-09T08:25:21+00:00"
+            "time": "2017-07-05T15:09:33+00:00"
         },
         {
             "name": "symfony/process",
@@ -3697,16 +3697,16 @@
         },
         {
             "name": "phpunit/php-token-stream",
-            "version": "2.0.0",
+            "version": "2.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-token-stream.git",
-                "reference": "ecb0b2cdaa0add708fe6f329ef65ae0c5225130b"
+                "reference": "9a02332089ac48e704c70f6cefed30c224e3c0b0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/ecb0b2cdaa0add708fe6f329ef65ae0c5225130b",
-                "reference": "ecb0b2cdaa0add708fe6f329ef65ae0c5225130b",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/9a02332089ac48e704c70f6cefed30c224e3c0b0",
+                "reference": "9a02332089ac48e704c70f6cefed30c224e3c0b0",
                 "shasum": ""
             },
             "require": {
@@ -3742,7 +3742,7 @@
             "keywords": [
                 "tokenizer"
             ],
-            "time": "2017-08-03T14:17:41+00:00"
+            "time": "2017-08-20T05:47:52+00:00"
         },
         {
             "name": "phpunit/phpunit",

From 5769d0121e90565c0de760840b1611c6d5de09e9 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 20 Aug 2017 12:40:06 +0200
Subject: [PATCH 063/668] New translations intro.php (Dutch)

---
 resources/lang/nl_NL/intro.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/lang/nl_NL/intro.php b/resources/lang/nl_NL/intro.php
index fc788e515e..dfac61180c 100644
--- a/resources/lang/nl_NL/intro.php
+++ b/resources/lang/nl_NL/intro.php
@@ -21,8 +21,8 @@ return [
     // create account:
     'accounts_create_iban'                  => 'Geef je rekeningen een geldige IBAN. Dat scheelt met importeren van data.',
     'accounts_create_asset_opening_balance' => 'Betaalrekeningen kunnen een startsaldo hebben, waarmee het begin van deze rekening in Firefly wordt aangegeven.',
-    'accounts_create_asset_currency'        => 'Firefly III supports multiple currencies. Asset accounts have one main currency, which you must set here.',
-    'accounts_create_asset_virtual'         => 'It can sometimes help to give your account a virtual balance: an extra amount always added to or removed from the actual balance.',
+    'accounts_create_asset_currency'        => 'Firefly III ondersteunt meerdere valuta. Hier stel je de valuta in van je betaalrekening.',
+    'accounts_create_asset_virtual'         => 'Soms is het handig om je betaalrekening een virtueel saldo te geven: een extra bedrag dat altijd bij het daadwerkelijke saldo wordt opgeteld.',
 
     // budgets index
     'budgets_index_intro'                   => 'Budgets are used to manage your finances and form one of the core functions of Firefly III.',

From 40639dfa37660cf7eb69b293cf615b59c2bab131 Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Sun, 20 Aug 2017 12:40:14 +0200
Subject: [PATCH 064/668] New view for tags

---
 app/Http/Controllers/TagController.php        |  47 +++-----
 app/Repositories/Tag/TagRepository.php        |  69 ++++++++++-
 .../Tag/TagRepositoryInterface.php            |   9 ++
 public/css/firefly.css                        |   4 +
 resources/views/tags/index.twig               | 113 +++++++++++-------
 resources/views/tags/show.twig                |   4 +-
 6 files changed, 168 insertions(+), 78 deletions(-)

diff --git a/app/Http/Controllers/TagController.php b/app/Http/Controllers/TagController.php
index 5dcbe252cb..64d1d22701 100644
--- a/app/Http/Controllers/TagController.php
+++ b/app/Http/Controllers/TagController.php
@@ -168,41 +168,23 @@ class TagController extends Controller
      */
     public function index(TagRepositoryInterface $repository)
     {
-        $title         = 'Tags';
-        $mainTitleIcon = 'fa-tags';
-        $types         = ['nothing', 'balancingAct', 'advancePayment'];
-        $hasTypes      = 0; // which types of tag the user actually has.
-        $counts        = []; // how many of each type?
-        $count         = $repository->count();
 
-        // loop each types and get the tags, group them by year.
-        $collection = [];
-        foreach ($types as $type) {
+        // collect tags by year:
+        /** @var Carbon $start */
+        $start             = clone(session('first'));
+        $now               = new Carbon;
+        $clouds            = [];
+        $clouds['no-date'] = $repository->tagCloud(null);
+        while ($now > $start) {
+            $year          = $now->year;
+            $clouds[$year] = $repository->tagCloud($year);
 
-            /** @var Collection $tags */
-            $tags = $repository->getByType($type);
-            $tags = $tags->sortBy(
-                function (Tag $tag) {
-                    $date = !is_null($tag->date) ? $tag->date->format('Ymd') : '000000';
-
-                    return strtolower($date . $tag->tag);
-                }
-            );
-            if ($tags->count() > 0) {
-                $hasTypes++;
-            }
-            $counts[$type] = $tags->count();
-
-            /** @var Tag $tag */
-            foreach ($tags as $tag) {
-                $year           = is_null($tag->date) ? trans('firefly.no_year') : $tag->date->year;
-                $monthFormatted = is_null($tag->date) ? trans('firefly.no_month') : $tag->date->formatLocalized($this->monthFormat);
-
-                $collection[$type][$year][$monthFormatted][] = $tag;
-            }
+            $now->subYear();
         }
+        $count = $repository->count();
 
-        return view('tags.index', compact('title', 'mainTitleIcon', 'counts', 'hasTypes', 'types', 'collection', 'count'));
+
+        return view('tags.index', compact('clouds', 'count'));
     }
 
     /**
@@ -274,7 +256,6 @@ class TagController extends Controller
         return view('tags.show', compact('apiKey', 'tag', 'periods', 'subTitle', 'subTitleIcon', 'journals', 'sum', 'start', 'end', 'moment'));
     }
 
-
     /**
      * @param TagFormRequest $request
      *
@@ -371,4 +352,6 @@ class TagController extends Controller
         return $collection;
 
     }
+
+
 }
diff --git a/app/Repositories/Tag/TagRepository.php b/app/Repositories/Tag/TagRepository.php
index e81201ef0b..01910c3a0f 100644
--- a/app/Repositories/Tag/TagRepository.php
+++ b/app/Repositories/Tag/TagRepository.php
@@ -253,11 +253,61 @@ class TagRepository implements TagRepositoryInterface
         }
 
         $collector->setAllAssetAccounts()->setTag($tag);
-        $sum = $collector->getJournals()->sum('transaction_amount');
+        $journals = $collector->getJournals();
+        $sum      = '0';
+        foreach ($journals as $journal) {
+            $sum = bcadd($sum, app('steam')->positive(strval($journal->transaction_amount)));
+        }
 
         return strval($sum);
     }
 
+    /**
+     * Generates a tag cloud.
+     *
+     * @param int|null $year
+     *
+     * @return array
+     */
+    public function tagCloud(?int $year): array
+    {
+        $min    = null;
+        $max    = 0;
+        $query  = $this->user->tags();
+        $return = [];
+        if (!is_null($year)) {
+            $start = $year . '-01-01';
+            $end   = $year . '-12-31';
+            $query->where('date', '>=', $start)->where('date', '<=', $end);
+        }
+        if (is_null($year)) {
+            $query->whereNull('date');
+        }
+        $tags      = $query->orderBy('id','desc')->get();
+        $temporary = [];
+        foreach ($tags as $tag) {
+            $amount      = floatval($this->sumOfTag($tag, null, null));
+            $min         = $amount < $min || is_null($min) ? $amount : $min;
+            $max         = $amount > $max ? $amount : $max;
+            $temporary[] = [
+                'amount' => $amount,
+                'tag'    => $tag,
+            ];
+        }
+        /** @var array $entry */
+        foreach ($temporary as $entry) {
+            $scale          = $this->cloudScale([12, 20], $entry['amount'], $min, $max);
+            $tagId          = $entry['tag']->id;
+            $return[$tagId] = [
+                'scale' => $scale,
+                'tag'   => $entry['tag'],
+            ];
+        }
+
+        return $return;
+    }
+
+
     /**
      * @param Tag   $tag
      * @param array $data
@@ -277,4 +327,21 @@ class TagRepository implements TagRepositoryInterface
         return $tag;
     }
 
+    /**
+     * @param array $range
+     * @param float $amount
+     * @param float $min
+     * @param float $max
+     *
+     * @return int
+     */
+    private function cloudScale(array $range, float $amount, float $min, float $max): int
+    {
+        $amountDiff = $max - $min;
+        $diff       = $range[1] - $range[0];
+        $step       = $amountDiff / $diff;
+        $extra      = round($amount / $step);
+
+        return intval($range[0] + $extra);
+    }
 }
diff --git a/app/Repositories/Tag/TagRepositoryInterface.php b/app/Repositories/Tag/TagRepositoryInterface.php
index 8cc71547ba..6ed8ec4edd 100644
--- a/app/Repositories/Tag/TagRepositoryInterface.php
+++ b/app/Repositories/Tag/TagRepositoryInterface.php
@@ -135,6 +135,15 @@ interface TagRepositoryInterface
      */
     public function sumOfTag(Tag $tag, ?Carbon $start, ?Carbon $end): string;
 
+    /**
+     * Generates a tag cloud.
+     *
+     * @param int|null $year
+     *
+     * @return array
+     */
+    public function tagCloud(?int $year): array;
+
     /**
      * Update a tag.
      *
diff --git a/public/css/firefly.css b/public/css/firefly.css
index 4957efdbfa..b5fd1b056c 100644
--- a/public/css/firefly.css
+++ b/public/css/firefly.css
@@ -17,6 +17,10 @@
     background: url('/images/error.png') no-repeat center center;
 }
 
+p.tagcloud .label {
+    line-height:2;
+}
+
 .handle {
     cursor: move;
 }
diff --git a/resources/views/tags/index.twig b/resources/views/tags/index.twig
index 6d1531cd7a..7365efda52 100644
--- a/resources/views/tags/index.twig
+++ b/resources/views/tags/index.twig
@@ -8,54 +8,81 @@
     {% if count == 0 %}
         {% include 'partials.empty' with {what: 'default', type: 'tags',route: route('tags.create')} %}
     {% else %}
-        <div class="row">
-            {% for type in types %}
-                {% if counts[type] > 0 %}
-                    <div class="
-                        {% if hasTypes == 1 %}col-lg-12 col-md-12 col-sm-12 col-xs-12{% endif %}
-                        {% if hasTypes == 2 %}col-lg-6 col-md-6 col-sm-12 col-xs-12{% endif %}
-                        {% if hasTypes == 3 %}col-lg-4 col-md-4 col-sm-12 col-xs-12{% endif %}
-                        ">
-                        <div class="box">
-                            <div class="box-header with-border">
-                                <h3 class="box-title">{{ ('tag_title_'~type)|_ }}</h3>
-                            </div>
-                            <div class="box-body">
-                                {% for year,months in collection[type] %}
-                                    <h4>{{ year }}</h4>
-
-                                    {% for month,tags in months %}
-                                        <h5>{{ month }}</h5>
-                                        <p style="line-height: 200%;">
-                                            {% for tag in tags %}
-                                                <span style="display: inline;"><a style="font-size:100%;font-weight:normal;" class="label label-success"
-                                                                                  href="{{ route('tags.show',tag.id) }}">
-                                                {% if tag.tagMode == 'nothing' %}
-                                                    <i class="fa fa-fw fa-tag"></i>
-                                                {% endif %}
-                                                        {% if tag.tagMode == 'balancingAct' %}
-                                                            <i class="fa fa-fw fa-refresh"></i>
-                                                        {% endif %}
-                                                        {% if tag.tagMode == 'advancePayment' %}
-                                                            <i class="fa fa-fw fa-sort-numeric-desc"></i>
-                                                        {% endif %}
-                                                        {{ tag.tag }}</a>
-                                </span>
-                                            {% endfor %}
-                                        </p>
-                                    {% endfor %}
+        {% for period,entries in clouds %}
+            {% if entries|length > 0 %}
+            <div class="row">
+                <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
+                    <div class="box">
+                        <div class="box-header with-border">
+                            <h3 class="box-title">
+                                {% if period == 'no-date' %}{{ 'without_date'|_ }}{% else %}{{ period }}{% endif %}
+                            </h3>
+                        </div>
+                        <div class="box-body">
+                            <p class="tagcloud">
+                                {% for tagInfo in entries %}
+                                    <a style="font-size:{{ tagInfo.scale }}px;" class="label label-success" href="{{ route('tags.show',tagInfo.tag.id) }}"><i class="fa fa-fw fa-tag"></i> {{ tagInfo.tag.tag }}</a>
                                 {% endfor %}
-
-
-                            </div>
-                            <div class="box-footer">
-                                <a href="{{ route('tags.create') }}" title="New tag" class="btn btn-info pull-right">{{ 'new_tag'|_ }}</a>
-                            </div>
+                            </p>
                         </div>
                     </div>
+                </div>
+            </div>
                 {% endif %}
-            {% endfor %}
+        {% endfor %}
+        {#
+
+                <div class="row">
+
+                    {% for type in types %}
+                        {% if counts[type] > 0 %}
+                            <div class="
+                                {% if hasTypes == 1 %}col-lg-12 col-md-12 col-sm-12 col-xs-12{% endif %}
+                                {% if hasTypes == 2 %}col-lg-6 col-md-6 col-sm-12 col-xs-12{% endif %}
+                                {% if hasTypes == 3 %}col-lg-4 col-md-4 col-sm-12 col-xs-12{% endif %}
+                                ">
+                                <div class="box">
+                                    <div class="box-header with-border">
+                                        <h3 class="box-title">{{ ('tag_title_'~type)|_ }}</h3>
+                                    </div>
+                                    <div class="box-body">
+                                        {% for year,months in collection[type] %}
+                                            <h4>{{ year }}</h4>
+
+                                            {% for month,tags in months %}
+                                                <h5>{{ month }}</h5>
+                                                <p style="line-height: 200%;">
+                                                    {% for tag in tags %}
+                                                        <span style="display: inline;"><a style="font-size:100%;font-weight:normal;" class="label label-success"
+                                                                                          href="{{ route('tags.show',tag.id) }}">
+                                                        {% if tag.tagMode == 'nothing' %}
+                                                            <i class="fa fa-fw fa-tag"></i>
+                                                        {% endif %}
+                                                                {% if tag.tagMode == 'balancingAct' %}
+                                                                    <i class="fa fa-fw fa-refresh"></i>
+                                                                {% endif %}
+                                                                {% if tag.tagMode == 'advancePayment' %}
+                                                                    <i class="fa fa-fw fa-sort-numeric-desc"></i>
+                                                                {% endif %}
+                                                                {{ tag.tag }}</a>
+                                        </span>
+                                                    {% endfor %}
+                                                </p>
+                                            {% endfor %}
+                                        {% endfor %}
+
+
+                                    </div>
+                                    <div class="box-footer">
+                                        <a href="{{ route('tags.create') }}" title="New tag" class="btn btn-info pull-right">{{ 'new_tag'|_ }}</a>
+                                    </div>
+                                </div>
+                            </div>
+                        {% endif %}
+                    {% endfor %}
+
         </div>
+         #}
     {% endif %}
 
 {% endblock %}
diff --git a/resources/views/tags/show.twig b/resources/views/tags/show.twig
index 3237078e90..acd4a376ad 100644
--- a/resources/views/tags/show.twig
+++ b/resources/views/tags/show.twig
@@ -109,14 +109,14 @@
 
                     {% if periods.count > 0 %}
                         <p>
-                            <i class="fa fa-calendar" aria-hidden="true"></i>
+                            <i class="fa fa-calendar"></i>
                             <a href="{{ route('tags.show', [tag.id,'all']) }}">
                                 {{ 'show_all_no_filter'|_ }}
                             </a>
                         </p>
                     {% else %}
                         <p>
-                            <i class="fa fa-calendar" aria-hidden="true"></i>
+                            <i class="fa fa-calendar"></i>
                             <a href="{{ route('tags.show', [tag.id]) }}">
                                 {{ 'show_the_current_period_and_overview'|_ }}
                             </a>

From 7684e966fc8f721d22bb7b015c96d16fc5a74a4f Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Sun, 20 Aug 2017 12:41:31 +0200
Subject: [PATCH 065/668] First code for #616

---
 app/Http/Controllers/Admin/LinkController.php | 54 +++++++++++++++++
 app/Http/breadcrumbs.php                      |  8 +++
 app/Models/LinkType.php                       | 38 ++++++++++++
 .../2017_08_20_062014_changes_for_v470.php    | 58 +++++++++++++++++++
 database/seeds/DatabaseSeeder.php             |  1 +
 database/seeds/LinkTypeSeeder.php             | 57 ++++++++++++++++++
 resources/lang/en_US/firefly.php              |  2 +
 resources/views/admin/index.twig              |  3 +
 resources/views/admin/link/index.twig         | 21 +++++++
 routes/web.php                                |  3 +
 10 files changed, 245 insertions(+)
 create mode 100644 app/Http/Controllers/Admin/LinkController.php
 create mode 100644 app/Models/LinkType.php
 create mode 100644 database/migrations/2017_08_20_062014_changes_for_v470.php
 create mode 100644 database/seeds/LinkTypeSeeder.php
 create mode 100644 resources/views/admin/link/index.twig

diff --git a/app/Http/Controllers/Admin/LinkController.php b/app/Http/Controllers/Admin/LinkController.php
new file mode 100644
index 0000000000..ca2ce39184
--- /dev/null
+++ b/app/Http/Controllers/Admin/LinkController.php
@@ -0,0 +1,54 @@
+<?php
+/**
+ * LinkController.php
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Http\Controllers\Admin;
+
+
+use FireflyIII\Http\Controllers\Controller;
+use View;
+
+/**
+ * Class LinkController
+ *
+ * @package FireflyIII\Http\Controllers\Admin
+ */
+class LinkController extends Controller
+{
+    /**
+     *
+     */
+    public function __construct()
+    {
+        parent::__construct();
+
+        $this->middleware(
+            function ($request, $next) {
+                View::share('title', strval(trans('firefly.administration')));
+                View::share('mainTitleIcon', 'fa-hand-spock-o');
+
+                return $next($request);
+            }
+        );
+    }
+
+    /**
+     *
+     */
+    public function index()
+    {
+        $subTitle     = trans('firefly.journal_link_configuration');
+        $subTitleIcon = 'fa-link';
+
+        return view('admin.link.index', compact('subTitle', 'subTitleIcon'));
+    }
+
+}
\ No newline at end of file
diff --git a/app/Http/breadcrumbs.php b/app/Http/breadcrumbs.php
index 5c79e234b5..fd3bd27685 100644
--- a/app/Http/breadcrumbs.php
+++ b/app/Http/breadcrumbs.php
@@ -152,6 +152,14 @@ Breadcrumbs::register(
 );
 
 
+Breadcrumbs::register(
+    'admin.links.index', function (BreadCrumbGenerator $breadcrumbs) {
+    $breadcrumbs->parent('admin.index');
+    $breadcrumbs->push(trans('firefly.journal_link_configuration'), route('admin.links.index'));
+}
+);
+
+
 /**
  * ATTACHMENTS
  */
diff --git a/app/Models/LinkType.php b/app/Models/LinkType.php
new file mode 100644
index 0000000000..8a86779466
--- /dev/null
+++ b/app/Models/LinkType.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * LinkType.php
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Models;
+
+
+use Illuminate\Database\Eloquent\Model;
+
+/**
+ * Class LinkType
+ *
+ * @package FireflyIII\Models
+ */
+class LinkType extends Model
+{
+    /**
+     * The attributes that should be casted to native types.
+     *
+     * @var array
+     */
+    protected $casts
+        = [
+            'created_at' => 'date',
+            'updated_at' => 'date',
+            'deleted_at' => 'date',
+            'editable'   => 'boolean',
+        ];
+
+}
\ No newline at end of file
diff --git a/database/migrations/2017_08_20_062014_changes_for_v470.php b/database/migrations/2017_08_20_062014_changes_for_v470.php
new file mode 100644
index 0000000000..1fe202c8c1
--- /dev/null
+++ b/database/migrations/2017_08_20_062014_changes_for_v470.php
@@ -0,0 +1,58 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+/**
+ * Class ChangesForV470
+ */
+class ChangesForV470 extends Migration
+{
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('link_types');
+        Schema::dropIfExists('journal_types');
+    }
+
+    /**
+     * Run the migrations.
+     *
+     * @SuppressWarnings(PHPMD.ShortMethodName)
+     * @return void
+     */
+    public function up()
+    {
+        if (!Schema::hasTable('link_types')) {
+            Schema::create(
+                'link_types', function (Blueprint $table) {
+                $table->increments('id');
+                $table->timestamps();
+                $table->softDeletes();
+                $table->string('name');
+                $table->string('outward');
+                $table->string('inward');
+                $table->boolean('editable');
+            }
+            );
+        }
+
+        if (!Schema::hasTable('journal_links')) {
+            Schema::create(
+                'journal_links', function (Blueprint $table) {
+                $table->increments('id');
+                $table->integer('link_type_id', false, true);
+                $table->integer('source_id', false, true);
+                $table->integer('destination_id', false, true);
+                $table->text('comment');
+                $table->integer('sequence', false, true);
+            }
+            );
+        }
+    }
+}
diff --git a/database/seeds/DatabaseSeeder.php b/database/seeds/DatabaseSeeder.php
index 504c129e47..03adb0669e 100644
--- a/database/seeds/DatabaseSeeder.php
+++ b/database/seeds/DatabaseSeeder.php
@@ -28,6 +28,7 @@ class DatabaseSeeder extends Seeder
         $this->call(TransactionCurrencySeeder::class);
         $this->call(TransactionTypeSeeder::class);
         $this->call(PermissionSeeder::class);
+        $this->call(LinkTypeSeeder::class);
 
     }
 }
diff --git a/database/seeds/LinkTypeSeeder.php b/database/seeds/LinkTypeSeeder.php
new file mode 100644
index 0000000000..2101b3f86f
--- /dev/null
+++ b/database/seeds/LinkTypeSeeder.php
@@ -0,0 +1,57 @@
+<?php
+/**
+ * LinkTypeSeeder.php
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types=1);
+
+
+use FireflyIII\Models\LinkType;
+use Illuminate\Database\Seeder;
+
+/**
+ * Class LinkTypeSeeder
+ */
+class LinkTypeSeeder extends Seeder
+{
+    /**
+     *
+     */
+    public function run()
+    {
+        $link           = new LinkType;
+        $link->name     = 'Related';
+        $link->inward   = 'relates to';
+        $link->outward  = 'is related to';
+        $link->editable = false;
+        $link->save();
+
+        $link           = new LinkType;
+        $link->name     = 'Refund';
+        $link->inward   = 'refunds';
+        $link->outward  = 'is refunded by';
+        $link->editable = false;
+        $link->save();
+
+        $link           = new LinkType;
+        $link->name     = 'PartialRefund';
+        $link->inward   = 'partially refunds';
+        $link->outward  = 'is partially refunded by';
+        $link->editable = false;
+        $link->save();
+
+        $link           = new LinkType;
+        $link->name     = 'Paid';
+        $link->inward   = 'pays for';
+        $link->outward  = 'is paid for by';
+        $link->editable = false;
+        $link->save();
+
+    }
+
+}
diff --git a/resources/lang/en_US/firefly.php b/resources/lang/en_US/firefly.php
index fd23d22f83..a72ba1ccc3 100644
--- a/resources/lang/en_US/firefly.php
+++ b/resources/lang/en_US/firefly.php
@@ -935,6 +935,8 @@ return [
     'block_code_bounced'                    => 'Email message(s) bounced',
     'block_code_expired'                    => 'Demo account expired',
     'no_block_code'                         => 'No reason for block or user not blocked',
+    // links
+    'journal_link_configuration'            => 'Transaction links configuration',
 
 
     // split a transaction:
diff --git a/resources/views/admin/index.twig b/resources/views/admin/index.twig
index 2edd7c681e..1de89abcc3 100644
--- a/resources/views/admin/index.twig
+++ b/resources/views/admin/index.twig
@@ -13,6 +13,7 @@
                 <div class="box-body">
                     <ul>
                         <li><a href="{{ route('admin.configuration.index') }}">{{ 'firefly_instance_configuration'|_ }}</a></li>
+                        <li><a href="{{ route('admin.links.index') }}">{{ 'journal_link_configuration'|_ }}</a></li>
                     </ul>
                 </div>
             </div>
@@ -34,4 +35,6 @@
         </div>
     </div>
 
+
+
 {% endblock %}
diff --git a/resources/views/admin/link/index.twig b/resources/views/admin/link/index.twig
new file mode 100644
index 0000000000..f5ac34ba4a
--- /dev/null
+++ b/resources/views/admin/link/index.twig
@@ -0,0 +1,21 @@
+{% extends "./layout/default" %}
+
+{% block breadcrumbs %}
+    {{ Breadcrumbs.renderIfExists }}
+{% endblock %}
+{% block content %}
+    <div class="row">
+        <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
+            <div class="box box-default">
+                <div class="box-header with-border">
+                    <h3 class="box-title">{{ 'journal_link_configuration'|_ }}</h3>
+                </div>
+                <div class="box-body">
+                    
+                </div>
+            </div>
+        </div>
+    </div>
+
+
+{% endblock %}
diff --git a/routes/web.php b/routes/web.php
index 13aa3714cf..9e380fb15b 100755
--- a/routes/web.php
+++ b/routes/web.php
@@ -758,6 +758,9 @@ Route::group(
     Route::get('users/show/{user}', ['uses' => 'UserController@show', 'as' => 'users.show']);
     Route::post('users/update/{user}', ['uses' => 'UserController@update', 'as' => 'users.update']);
 
+    // journal links manager
+    Route::get('links', ['uses' => 'LinkController@index', 'as' => 'links.index']);
+
     // FF configuration:
     Route::get('configuration', ['uses' => 'ConfigurationController@index', 'as' => 'configuration.index']);
     Route::post('configuration', ['uses' => 'ConfigurationController@postIndex', 'as' => 'configuration.index.post']);

From 4d595c13803c2a5d8bfa5ac991c31b35d4ad6ba8 Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Sun, 20 Aug 2017 12:42:51 +0200
Subject: [PATCH 066/668] More link types for #616

---
 database/seeds/LinkTypeSeeder.php | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/database/seeds/LinkTypeSeeder.php b/database/seeds/LinkTypeSeeder.php
index 2101b3f86f..33dd2ff23d 100644
--- a/database/seeds/LinkTypeSeeder.php
+++ b/database/seeds/LinkTypeSeeder.php
@@ -52,6 +52,20 @@ class LinkTypeSeeder extends Seeder
         $link->editable = false;
         $link->save();
 
+        $link           = new LinkType;
+        $link->name     = 'Reimbursement';
+        $link->inward   = 'reimburses';
+        $link->outward  = 'is reimbursed by';
+        $link->editable = false;
+        $link->save();
+
+        $link           = new LinkType;
+        $link->name     = 'PartialReimbursement';
+        $link->inward   = 'partially reimburses';
+        $link->outward  = 'is partially reimbursed by';
+        $link->editable = false;
+        $link->save();
+
     }
 
 }

From 6fcbe5a37fd2e091b7e8eeaa64c56d29c3fde0e0 Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Sun, 20 Aug 2017 12:43:31 +0200
Subject: [PATCH 067/668] Various HTML fixes.

---
 resources/views/accounts/show.twig            |   4 +-
 resources/views/auth/login.twig               |   4 +-
 resources/views/auth/two-factor.twig          |   2 +-
 resources/views/budgets/income.twig           |   4 +-
 resources/views/budgets/no-budget.twig        |   4 +-
 resources/views/budgets/show.twig             |   2 +-
 resources/views/categories/no-category.twig   |   4 +-
 resources/views/categories/show.twig          |   4 +-
 resources/views/list/journals.twig            |   2 +-
 resources/views/partials/flashes.twig         |   8 +-
 resources/views/partials/password-modal.twig  |   2 +-
 resources/views/piggy-banks/add.twig          |   4 +-
 resources/views/piggy-banks/remove.twig       |   4 +-
 .../views/popup/report/balance-amount.twig    |   2 +-
 .../popup/report/budget-spent-amount.twig     |   2 +-
 .../views/popup/report/category-entry.twig    |   2 +-
 .../views/popup/report/expense-entry.twig     |   2 +-
 .../views/popup/report/income-entry.twig      |   2 +-
 .../views/reports/partials/budget-period.twig |   4 +-
 .../reports/partials/category-period.twig     |   4 +-
 .../rules/partials/test-trigger-modal.twig    |   2 +-
 resources/views/transactions/index.twig       |   4 +-
 resources/views/transactions/show.twig        | 188 +++++++++++++-----
 .../views/transactions/single/create.twig     |   2 +-
 resources/views/transactions/single/edit.twig |   2 +-
 resources/views/transactions/split/edit.twig  |   2 +-
 26 files changed, 178 insertions(+), 88 deletions(-)

diff --git a/resources/views/accounts/show.twig b/resources/views/accounts/show.twig
index 7249618ff8..a176f0fcd6 100644
--- a/resources/views/accounts/show.twig
+++ b/resources/views/accounts/show.twig
@@ -88,14 +88,14 @@
                     {% include 'list.journals' with {sorting:true, hideBills:true, hideBudgets: true, hideCategories: true} %}
                     {% if periods.count > 0 %}
                         <p>
-                            <i class="fa fa-calendar" aria-hidden="true"></i>
+                            <i class="fa fa-calendar"></i>
                             <a href="{{ route('accounts.show', [account.id, 'all']) }}">
                                 {{ 'show_all_no_filter'|_ }}
                             </a>
                         </p>
                     {% else %}
                         <p>
-                            <i class="fa fa-calendar" aria-hidden="true"></i>
+                            <i class="fa fa-calendar"></i>
                             <a href="{{ route('accounts.show', [account.id]) }}">
                                 {{ 'show_the_current_period_and_overview'|_ }}
                             </a>
diff --git a/resources/views/auth/login.twig b/resources/views/auth/login.twig
index 88353375a6..8e925d16ba 100644
--- a/resources/views/auth/login.twig
+++ b/resources/views/auth/login.twig
@@ -17,7 +17,7 @@
         <div class="row">
             <div class="col-lg-12">
                 <div class="alert alert-danger alert-dismissible" role="alert">
-                    <button type="button" class="close" data-dismiss="alert"><span aria-hidden="true">&times;</span><span class="sr-only">{{ 'close'|_ }}</span>
+                    <button type="button" class="close" data-dismiss="alert"><span>&times;</span><span class="sr-only">{{ 'close'|_ }}</span>
                     </button>
                     <strong>Error!</strong> {{ errors.get('email')[0] }}
                 </div>
@@ -29,7 +29,7 @@
         <div class="row">
             <div class="col-lg-12">
                 <div class="alert alert-info alert-dismissible" role="alert">
-                    <button type="button" class="close" data-dismiss="alert"><span aria-hidden="true">&times;</span><span class="sr-only">{{ 'close'|_ }}</span>
+                    <button type="button" class="close" data-dismiss="alert"><span>&times;</span><span class="sr-only">{{ 'close'|_ }}</span>
                     </button>
                     {{ session('logoutMessage') }}
                 </div>
diff --git a/resources/views/auth/two-factor.twig b/resources/views/auth/two-factor.twig
index ea4275aae2..a02c30bf56 100644
--- a/resources/views/auth/two-factor.twig
+++ b/resources/views/auth/two-factor.twig
@@ -6,7 +6,7 @@
         <div class="row">
             <div class="col-lg-12">
                 <div class="alert alert-danger alert-dismissible" role="alert">
-                    <button type="button" class="close" data-dismiss="alert"><span aria-hidden="true">&times;</span><span class="sr-only">{{ 'close'|_ }}</span>
+                    <button type="button" class="close" data-dismiss="alert"><span>&times;</span><span class="sr-only">{{ 'close'|_ }}</span>
                     </button>
                     <strong>{{ 'flash_error'|_ }}</strong> {{ errors.get('code')[0] }}
                 </div>
diff --git a/resources/views/budgets/income.twig b/resources/views/budgets/income.twig
index 28904dc66d..89e28bd710 100644
--- a/resources/views/budgets/income.twig
+++ b/resources/views/budgets/income.twig
@@ -1,9 +1,9 @@
 <div class="modal-dialog">
     <div class="modal-content">
         <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">{{ 'close'|_ }}</span>
+            <button type="button" class="close" data-dismiss="modal"><span>&times;</span><span class="sr-only">{{ 'close'|_ }}</span>
             </button>
-            <h4 class="modal-title" id="myModalLabel">
+            <h4 class="modal-title">
                 {{ trans('firefly.update_budget_amount_range',
                 {start: start.formatLocalized(monthAndDayFormat), end: end.formatLocalized(monthAndDayFormat)}) }}
             </h4>
diff --git a/resources/views/budgets/no-budget.twig b/resources/views/budgets/no-budget.twig
index e400c32a98..8e10cda80d 100644
--- a/resources/views/budgets/no-budget.twig
+++ b/resources/views/budgets/no-budget.twig
@@ -25,12 +25,12 @@
                     {% include 'list.journals' with {'journals': journals,'hideBudgets': true} %}
                     {% if periods.count > 0 %}
                         <p>
-                            <i class="fa fa-calendar" aria-hidden="true"></i>
+                            <i class="fa fa-calendar"></i>
                             <a href="{{ route('budgets.no-budget', ['all']) }}">{{ 'show_all_no_filter'|_ }}</a>
                         </p>
                     {% else %}
                         <p>
-                            <i class="fa fa-calendar" aria-hidden="true"></i>
+                            <i class="fa fa-calendar"></i>
                             <a href="{{ route('budgets.no-budget') }}">{{ 'show_the_current_period_and_overview'|_ }}</a>
                         </p>
                     {% endif %}
diff --git a/resources/views/budgets/show.twig b/resources/views/budgets/show.twig
index 39dfd3b936..5e8e953794 100644
--- a/resources/views/budgets/show.twig
+++ b/resources/views/budgets/show.twig
@@ -91,7 +91,7 @@
                     {% include 'list.journals' with {hideBudgets:true, hideBills:true} %}
                     {% if budgetLimit %}
                         <p>
-                            <i class="fa fa-calendar" aria-hidden="true"></i>
+                            <i class="fa fa-calendar"></i>
                             <a href="{{ route('budgets.show', [budget.id]) }}">
                                 {{ 'show_all_no_filter'|_ }}
                             </a>
diff --git a/resources/views/categories/no-category.twig b/resources/views/categories/no-category.twig
index 64a8dfc793..60f3cc79eb 100644
--- a/resources/views/categories/no-category.twig
+++ b/resources/views/categories/no-category.twig
@@ -25,12 +25,12 @@
                     {% include 'list.journals' with {'journals': journals, 'hideCategories':true} %}
                     {% if periods.count > 0 %}
                         <p>
-                            <i class="fa fa-calendar" aria-hidden="true"></i>
+                            <i class="fa fa-calendar"></i>
                             <a href="{{ route('categories.no-category', ['all']) }}">{{ 'show_all_no_filter'|_ }}</a>
                         </p>
                     {% else %}
                         <p>
-                            <i class="fa fa-calendar" aria-hidden="true"></i>
+                            <i class="fa fa-calendar"></i>
                             <a href="{{ route('categories.no-category') }}">{{ 'show_the_current_period_and_overview'|_ }}</a>
                         </p>
                     {% endif %}
diff --git a/resources/views/categories/show.twig b/resources/views/categories/show.twig
index 2bb556734e..72be5d3faf 100644
--- a/resources/views/categories/show.twig
+++ b/resources/views/categories/show.twig
@@ -68,14 +68,14 @@
                     {% include 'list.journals' with {hideCategories: true, hideBills: true} %}
                     {% if periods.count > 0 %}
                         <p>
-                            <i class="fa fa-calendar" aria-hidden="true"></i>
+                            <i class="fa fa-calendar"></i>
                             <a href="{{ route('categories.show', [category.id,'all']) }}">
                                 {{ 'show_all_no_filter'|_ }}
                             </a>
                         </p>
                     {% else %}
                         <p>
-                            <i class="fa fa-calendar" aria-hidden="true"></i>
+                            <i class="fa fa-calendar"></i>
                             <a href="{{ route('categories.show', [category.id]) }}">
                                 {{ 'show_the_current_period_and_overview'|_ }}
                             </a>
diff --git a/resources/views/list/journals.twig b/resources/views/list/journals.twig
index 62f16a4962..c8921545a9 100644
--- a/resources/views/list/journals.twig
+++ b/resources/views/list/journals.twig
@@ -114,7 +114,7 @@
         <div class="mass_buttons btn-group btn-group pull-right">
             <a href="#" class="btn btn-default mass_select"><i class="fa fa-fw fa-check-square-o"></i> {{ 'select_transactions'|_ }}</a>
             <a href="#" class="btn btn-default mass_stop_select" style="display:none;"><i class="fa faw-fw fa-square-o"
-                                                                                          aria-hidden="true"></i> {{ 'stop_selection'|_ }}</a>
+                                                                                         ></i> {{ 'stop_selection'|_ }}</a>
         </div>
     </div>
 </div>
diff --git a/resources/views/partials/flashes.twig b/resources/views/partials/flashes.twig
index c4808c0ee5..15198f87b6 100644
--- a/resources/views/partials/flashes.twig
+++ b/resources/views/partials/flashes.twig
@@ -2,7 +2,7 @@
 {% if Session.has('success') %}
     <div class="alert alert-success alert-dismissible" role="alert">
         <button type="button" class="close" data-dismiss="alert">
-            <span aria-hidden="true">&times;</span><span class="sr-only">{{ 'close'|_ }}</span>
+            <span>&times;</span><span class="sr-only">{{ 'close'|_ }}</span>
         </button>
         <strong>{{ 'flash_success'|_ }}</strong> {{ session('success') }}
     </div>
@@ -12,7 +12,7 @@
 {% if Session.has('info') %}
     <div class="alert alert-info alert-dismissible" role="alert">
         <button type="button" class="close" data-dismiss="alert">
-            <span aria-hidden="true">&times;</span><span class="sr-only">{{ 'close'|_ }}</span>
+            <span>&times;</span><span class="sr-only">{{ 'close'|_ }}</span>
         </button>
 
         {# MULTIPLE INFO MESSAGE #}
@@ -42,7 +42,7 @@
 {% if Session.has('warning') %}
     <div class="alert alert-warning alert-dismissible" role="alert">
         <button type="button" class="close" data-dismiss="alert">
-            <span aria-hidden="true">&times;</span><span class="sr-only">{{ 'close'|_ }}</span>
+            <span>&times;</span><span class="sr-only">{{ 'close'|_ }}</span>
         </button>
         <strong>{{ 'flash_warning'|_ }}</strong> {{ session('warning') }}
     </div>
@@ -52,7 +52,7 @@
 {% if Session.has('error') %}
     <div class="alert alert-danger alert-dismissible" role="alert">
         <button type="button" class="close" data-dismiss="alert">
-            <span aria-hidden="true">&times;</span><span class="sr-only">{{ 'close'|_ }}</span>
+            <span>&times;</span><span class="sr-only">{{ 'close'|_ }}</span>
         </button>
 
         {# MULTIPLE ERRORS (BAD) #}
diff --git a/resources/views/partials/password-modal.twig b/resources/views/partials/password-modal.twig
index 3fbfac9e56..9aa7be78d8 100644
--- a/resources/views/partials/password-modal.twig
+++ b/resources/views/partials/password-modal.twig
@@ -3,7 +3,7 @@
     <div class="modal-dialog" role="document">
         <div class="modal-content">
             <div class="modal-header">
-                <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+                <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span>&times;</span></button>
                 <h4 class="modal-title">
                     {{ 'secure_pw_title'|_ }}
                 </h4>
diff --git a/resources/views/piggy-banks/add.twig b/resources/views/piggy-banks/add.twig
index e8e4c32ab6..ccc37f9d00 100644
--- a/resources/views/piggy-banks/add.twig
+++ b/resources/views/piggy-banks/add.twig
@@ -1,9 +1,9 @@
 <div class="modal-dialog">
     <div class="modal-content">
         <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">{{ 'close'|_ }}</span>
+            <button type="button" class="close" data-dismiss="modal"><span>&times;</span><span class="sr-only">{{ 'close'|_ }}</span>
             </button>
-            <h4 class="modal-title" id="myModalLabel">{{ trans('firefly.add_money_to_piggy_title', {name: piggyBank.name}) }}</h4>
+            <h4 class="modal-title">{{ trans('firefly.add_money_to_piggy_title', {name: piggyBank.name}) }}</h4>
         </div>
         <form style="display: inline;" id="add" action="{{ route('piggy-banks.add', piggyBank.id) }}" method="POST">
             <div class="modal-body">
diff --git a/resources/views/piggy-banks/remove.twig b/resources/views/piggy-banks/remove.twig
index 34f1055181..190616cc24 100644
--- a/resources/views/piggy-banks/remove.twig
+++ b/resources/views/piggy-banks/remove.twig
@@ -4,9 +4,9 @@
             <input type="hidden" name="_token" value="{{ csrf_token() }}"/>
 
             <div class="modal-header">
-                <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">{{ 'close'|_ }}</span>
+                <button type="button" class="close" data-dismiss="modal"><span>&times;</span><span class="sr-only">{{ 'close'|_ }}</span>
                 </button>
-                <h4 class="modal-title" id="myModalLabel">{{ trans('firefly.remove_money_from_piggy_title', {name: piggyBank.name}) }}</h4>
+                <h4 class="modal-title">{{ trans('firefly.remove_money_from_piggy_title', {name: piggyBank.name}) }}</h4>
             </div>
 
             <div class="modal-body">
diff --git a/resources/views/popup/report/balance-amount.twig b/resources/views/popup/report/balance-amount.twig
index 426aab6d07..d6fce9f97b 100644
--- a/resources/views/popup/report/balance-amount.twig
+++ b/resources/views/popup/report/balance-amount.twig
@@ -2,7 +2,7 @@
 <div class="modal-dialog modal-lg" role="document">
     <div class="modal-content">
         <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal" aria-label="{{ 'close'|_ }}"><span aria-hidden="true">&times;</span></button>
+            <button type="button" class="close" data-dismiss="modal" aria-label="{{ 'close'|_ }}"><span>&times;</span></button>
             <h4 class="modal-title" id="balanceAmountTitle">{{ trans('firefly.balance_amount',
                 {budget: budget.name, account: account.name,  start: start.formatLocalized(monthAndDayFormat), end: end.formatLocalized(monthAndDayFormat)}
                 ) }}</h4>
diff --git a/resources/views/popup/report/budget-spent-amount.twig b/resources/views/popup/report/budget-spent-amount.twig
index 8f4f106b7e..0817e533d7 100644
--- a/resources/views/popup/report/budget-spent-amount.twig
+++ b/resources/views/popup/report/budget-spent-amount.twig
@@ -2,7 +2,7 @@
 <div class="modal-dialog modal-lg" role="document">
     <div class="modal-content">
         <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal" aria-label="{{ 'close'|_ }}"><span aria-hidden="true">&times;</span></button>
+            <button type="button" class="close" data-dismiss="modal" aria-label="{{ 'close'|_ }}"><span>&times;</span></button>
             <h4 class="modal-title" id="budgetSpentAmountLabel">
                 {{ trans('firefly.budget_spent_amount', {start: start.formatLocalized(monthAndDayFormat), end: end.formatLocalized(monthAndDayFormat), budget: budget.name}) }}
             </h4>
diff --git a/resources/views/popup/report/category-entry.twig b/resources/views/popup/report/category-entry.twig
index f5cd63d1c6..e3371f439f 100644
--- a/resources/views/popup/report/category-entry.twig
+++ b/resources/views/popup/report/category-entry.twig
@@ -2,7 +2,7 @@
 <div class="modal-dialog modal-lg" role="document">
     <div class="modal-content">
         <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal" aria-label="{{ 'close'|_ }}"><span aria-hidden="true">&times;</span></button>
+            <button type="button" class="close" data-dismiss="modal" aria-label="{{ 'close'|_ }}"><span>&times;</span></button>
             <h4 class="modal-title"
                 id="expenseEntryTitle">{{ trans('firefly.category_entry', {name: category.name, start: start.formatLocalized(monthAndDayFormat), end: end.formatLocalized(monthAndDayFormat)}) }}</h4>
         </div>
diff --git a/resources/views/popup/report/expense-entry.twig b/resources/views/popup/report/expense-entry.twig
index 46193a0eb2..0cbc7cfe90 100644
--- a/resources/views/popup/report/expense-entry.twig
+++ b/resources/views/popup/report/expense-entry.twig
@@ -2,7 +2,7 @@
 <div class="modal-dialog modal-lg" role="document">
     <div class="modal-content">
         <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal" aria-label="{{ 'close'|_ }}"><span aria-hidden="true">&times;</span></button>
+            <button type="button" class="close" data-dismiss="modal" aria-label="{{ 'close'|_ }}"><span>&times;</span></button>
             <h4 class="modal-title"
                 id="expenseEntryTitle">{{ trans('firefly.expense_entry', {name: account.name, start: start.formatLocalized(monthAndDayFormat), end: end.formatLocalized(monthAndDayFormat)}) }}</h4>
         </div>
diff --git a/resources/views/popup/report/income-entry.twig b/resources/views/popup/report/income-entry.twig
index 31a22e8f95..c5c2b12475 100644
--- a/resources/views/popup/report/income-entry.twig
+++ b/resources/views/popup/report/income-entry.twig
@@ -2,7 +2,7 @@
 <div class="modal-dialog modal-lg" role="document">
     <div class="modal-content">
         <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal" aria-label="{{ 'close'|_ }}"><span aria-hidden="true">&times;</span></button>
+            <button type="button" class="close" data-dismiss="modal" aria-label="{{ 'close'|_ }}"><span>&times;</span></button>
             <h4 class="modal-title"
                 id="incomeEntryTitle">{{ trans('firefly.income_entry', {name: account.name, start: start.formatLocalized(monthAndDayFormat), end: end.formatLocalized(monthAndDayFormat)}) }}</h4>
         </div>
diff --git a/resources/views/reports/partials/budget-period.twig b/resources/views/reports/partials/budget-period.twig
index f70e5c9c71..33fb487ff8 100644
--- a/resources/views/reports/partials/budget-period.twig
+++ b/resources/views/reports/partials/budget-period.twig
@@ -13,9 +13,9 @@
         <tr>
             <td>
                 {% if id != 0 %}
-                    <a class="btn btn-default btn-xs" href="{{ route('budgets.show', [id]) }}"><i class="fa fa-external-link" aria-hidden="true"></i></a>
+                    <a class="btn btn-default btn-xs" href="{{ route('budgets.show', [id]) }}"><i class="fa fa-external-link"></i></a>
                 {% else %}
-                    <a class="btn btn-default btn-xs" href="{{ route('budgets.no-budget') }}"><i class="fa fa-external-link" aria-hidden="true"></i></a>
+                    <a class="btn btn-default btn-xs" href="{{ route('budgets.no-budget') }}"><i class="fa fa-external-link"></i></a>
                 {% endif %}
             </td>
             <td data-value="{{ info.name }}">
diff --git a/resources/views/reports/partials/category-period.twig b/resources/views/reports/partials/category-period.twig
index db35d7ea4d..05d49b3a2f 100644
--- a/resources/views/reports/partials/category-period.twig
+++ b/resources/views/reports/partials/category-period.twig
@@ -13,9 +13,9 @@
         <tr>
             <td>
                 {% if id != 0 %}
-                    <a class="btn btn-default btn-xs" href="{{ route('categories.show', [id]) }}"><i class="fa fa-external-link" aria-hidden="true"></i></a>
+                    <a class="btn btn-default btn-xs" href="{{ route('categories.show', [id]) }}"><i class="fa fa-external-link"></i></a>
                 {% else %}
-                    <a class="btn btn-default btn-xs" href="{{ route('categories.no-category') }}"><i class="fa fa-external-link" aria-hidden="true"></i></a>
+                    <a class="btn btn-default btn-xs" href="{{ route('categories.no-category') }}"><i class="fa fa-external-link"></i></a>
                 {% endif %}
             </td>
             <td data-value="{{ info.name }}">
diff --git a/resources/views/rules/partials/test-trigger-modal.twig b/resources/views/rules/partials/test-trigger-modal.twig
index fc6bcd7f7a..ef2e5e15c9 100644
--- a/resources/views/rules/partials/test-trigger-modal.twig
+++ b/resources/views/rules/partials/test-trigger-modal.twig
@@ -3,7 +3,7 @@
     <div class="modal-dialog" role="document">
         <div class="modal-content">
             <div class="modal-header">
-                <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+                <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span>&times;</span></button>
                 <h4 class="modal-title" id="testTriggerLabel">{{ 'test_rule_triggers'|_ }}</h4>
             </div>
             <div class="modal-body">
diff --git a/resources/views/transactions/index.twig b/resources/views/transactions/index.twig
index 65bfbf64e7..e7de57948f 100644
--- a/resources/views/transactions/index.twig
+++ b/resources/views/transactions/index.twig
@@ -25,12 +25,12 @@
                     {% include 'list.journals' with {'journals': journals} %}
                     {% if periods.count > 0 %}
                         <p>
-                            <i class="fa fa-calendar" aria-hidden="true"></i>
+                            <i class="fa fa-calendar"></i>
                             <a href="{{ route('transactions.index', [what, 'all']) }}">{{ 'show_all_no_filter'|_ }}</a>
                         </p>
                     {% else %}
                         <p>
-                            <i class="fa fa-calendar" aria-hidden="true"></i>
+                            <i class="fa fa-calendar"></i>
                             <a href="{{ route('transactions.index', [what]) }}">{{ 'show_the_current_period_and_overview'|_ }}</a>
                         </p>
                     {% endif %}
diff --git a/resources/views/transactions/show.twig b/resources/views/transactions/show.twig
index b390b7002d..92c9108472 100644
--- a/resources/views/transactions/show.twig
+++ b/resources/views/transactions/show.twig
@@ -10,6 +10,56 @@
             <div class="box">
                 <div class="box-header with-border">
                     <h3 class="box-title">{{ 'transaction_journal_information'|_ }}</h3>
+
+                    <div class="box-tools pull-right">
+                        <div class="btn-group">
+                            <button id="transaction_menu" class="btn btn-box-tool dropdown-toggle" data-toggle="dropdown"><i class="fa fa-ellipsis-v"></i>
+                            </button>
+                            <ul class="dropdown-menu" role="menu">
+                                <li><a href="{{ route('transactions.edit',journal.id) }}"><i class="fa fa-pencil fa-fw"></i> {{ 'edit'|_ }}</a></li>
+                                <li><a href="{{ route('transactions.delete',journal.id) }}"><i class="fa fa-trash fa-fw"></i> {{ 'delete'|_ }}</a></li>
+                                {# convert to withdrawal #}
+                                {% if journal.transactionType.type != "Withdrawal" %}
+                                    <li>
+                                        <a href="{{ route('transactions.convert.index', ['withdrawal', journal.id]) }}">
+                                            <i class="fa fa-exchange fa-fw"></i> {{ ('convert_'~journal.transactionType.type~'_to_withdrawal')|_ }}
+                                        </a>
+                                    </li>
+                                {% endif %}
+                                {# convert to deposit #}
+                                {% if journal.transactionType.type != "Deposit" %}
+                                    <li>
+                                        <a href="{{ route('transactions.convert.index', ['deposit', journal.id]) }}">
+                                            <i class="fa fa-exchange fa-fw"></i> {{ ('convert_'~journal.transactionType.type~'_to_deposit')|_ }}
+                                        </a>
+                                    </li>
+                                {% endif %}
+                                {# convert to transfer#}
+                                {% if journal.transactionType.type != "Transfer" %}
+                                    <li>
+                                        <a href="{{ route('transactions.convert.index', ['transfer', journal.id]) }}">
+                                            <i class="fa fa-exchange fa-fw"></i> {{ ('convert_'~journal.transactionType.type~'_to_transfer')|_ }}
+                                        </a>
+                                    </li>
+                                {% endif %}
+                                {# other options #}
+                                <li>
+                                    <a href="{{ route('transactions.clone', [journal.id]) }}">
+                                        <i class="fa fa-copy fa-fw"></i> {{ ('clone_'~journal.transactionType.type|lower)|_ }}
+                                    </a>
+                                </li>
+                                <li>
+                                    <a href="{{ route('transactions.split.edit', journal.id) }}">
+                                        <i class="fa fa-unsorted fa-fw"></i> {{ ('split_this_'~what)|_ }}
+                                    </a>
+                                </li>
+                                <li>
+                                    <a href="#" data-toggle="modal" data-target="#linkJournalModal"><i class="fa fa-fw fa-link"></i> {{ 'link_transaction'|_ }}</a>
+                                </li>
+                            </ul>
+                        </div>
+                    </div>
+
                 </div>
                 <div class="box-body table-responsive no-padding">
                     <table class="table table-hover">
@@ -49,8 +99,54 @@
                 </div>
                 <div class="box-footer">
                     <div class="pull-right">
-                        <a class="btn btn-default" href="{{ route('transactions.edit',journal.id) }}"><i class="fa fa-pencil fa-fw"></i> {{ 'edit'|_ }}</a>
-                        <a href="{{ route('transactions.delete',journal.id) }}" class="btn btn-danger"><i class="fa fa-trash fa-fw"></i> {{ 'delete'|_ }}</a>
+                        <div class="btn-group">
+                            <a class="btn btn-default" href="{{ route('transactions.edit',journal.id) }}"><i class="fa fa-pencil fa-fw"></i> {{ 'edit'|_ }}</a>
+                            <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                                <i class="fa fa-cog fa-fw"></i> {{ 'options'|_ }} <span class="caret"></span>
+                            </button>
+                            <ul class="dropdown-menu">
+                                {# convert to withdrawal #}
+                                {% if journal.transactionType.type != "Withdrawal" %}
+                                    <li>
+                                        <a href="{{ route('transactions.convert.index', ['withdrawal', journal.id]) }}">
+                                            <i class="fa fa-exchange fa-fw"></i> {{ ('convert_'~journal.transactionType.type~'_to_withdrawal')|_ }}
+                                        </a>
+                                    </li>
+                                {% endif %}
+                                {# convert to deposit #}
+                                {% if journal.transactionType.type != "Deposit" %}
+                                    <li>
+                                        <a href="{{ route('transactions.convert.index', ['deposit', journal.id]) }}">
+                                            <i class="fa fa-exchange fa-fw"></i> {{ ('convert_'~journal.transactionType.type~'_to_deposit')|_ }}
+                                        </a>
+                                    </li>
+                                {% endif %}
+                                {# convert to transfer#}
+                                {% if journal.transactionType.type != "Transfer" %}
+                                    <li>
+                                        <a href="{{ route('transactions.convert.index', ['transfer', journal.id]) }}">
+                                            <i class="fa fa-exchange fa-fw"></i> {{ ('convert_'~journal.transactionType.type~'_to_transfer')|_ }}
+                                        </a>
+                                    </li>
+                                {% endif %}
+                                {# other options #}
+                                <li>
+                                    <a href="{{ route('transactions.clone', [journal.id]) }}">
+                                        <i class="fa fa-copy fa-fw"></i> {{ ('clone_'~journal.transactionType.type|lower)|_ }}
+                                    </a>
+                                </li>
+                                <li>
+                                    <a href="{{ route('transactions.split.edit', journal.id) }}">
+                                        <i class="fa fa-unsorted fa-fw"></i> {{ ('split_this_'~what)|_ }}
+                                    </a>
+                                </li>
+                                <li>
+                                    <a href="#" data-toggle="modal" data-target="#linkJournalModal"><i class="fa fa-fw fa-link"></i> {{ 'link_transaction'|_ }}</a>
+                                </li>
+                            </ul>
+                            <a href="{{ route('transactions.delete',journal.id) }}" class="btn btn-danger"><i class="fa fa-trash fa-fw"></i> {{ 'delete'|_ }}
+                            </a>
+                        </div>
                     </div>
                 </div>
             </div>
@@ -213,52 +309,6 @@
                     </div>
                 </div>
             {% endif %}
-            {% if transactions|length == 1 %}
-                <div class="box">
-                    <div class="box-header with-border">
-                        <h3 class="box-title">{{ 'transaction_journal_other_options'|_ }}</h3>
-                    </div>
-                    <div class="box-body">
-                        {% if journal.transactionType.type != "Withdrawal" %}
-                            <p>
-                                <i class="fa fa-exchange fa-fw" aria-hidden="true"></i>
-                                <a href="{{ route('transactions.convert.index', ['withdrawal', journal.id]) }}">
-                                    {{ ('convert_'~journal.transactionType.type~'_to_withdrawal')|_ }}
-                                </a>
-                            </p>
-                        {% endif %}
-                        {% if journal.transactionType.type != "Deposit" %}
-                            <p>
-                                <i class="fa fa-exchange fa-fw" aria-hidden="true"></i>
-                                <a href="{{ route('transactions.convert.index', ['deposit', journal.id]) }}">
-                                    {{ ('convert_'~journal.transactionType.type~'_to_deposit')|_ }}
-                                </a>
-                            </p>
-                        {% endif %}
-
-                        {% if journal.transactionType.type != "Transfer" %}
-                            <p>
-                                <i class="fa fa-exchange fa-fw" aria-hidden="true"></i>
-                                <a href="{{ route('transactions.convert.index', ['transfer', journal.id]) }}">
-                                    {{ ('convert_'~journal.transactionType.type~'_to_transfer')|_ }}
-                                </a>
-                            </p>
-                        {% endif %}
-                        <p>
-                            <i class="fa fa-copy fa-fw" aria-hidden="true"></i>
-                            <a href="{{ route('transactions.clone', [journal.id]) }}">
-                                {{ ('clone_'~journal.transactionType.type|lower)|_ }}
-                            </a>
-                        </p>
-                        <p>
-                            <i class="fa fa-unsorted fa-fw" aria-hidden="true"></i>
-                            <a href="{{ route('transactions.split.edit', journal.id) }}">
-                                {{ ('split_this_'~what)|_ }}
-                            </a>
-                        </p>
-                    </div>
-                </div>
-            {% endif %}
         </div>
     </div>
 
@@ -330,5 +380,45 @@
             </div>
         </div>
     </div>
-    <!-- end -->
+
+    {# link journal modal:#}
+    <div class="modal fade" tabindex="-1" role="dialog" id="linkJournalModal">
+        <form action="#" method="post" class="form-horizontal">
+            <div class="modal-dialog modal-lg">
+                <div class="modal-content">
+                    <div class="modal-header">
+                        <h4 class="modal-title">Link another transaction</h4>
+                    </div>
+                    <div class="modal-body" id="helpBody">
+                        <p>Select a transaction to link this transaction to</p>
+                        <div class="form-group">
+                            <label for="link_type" class="col-sm-2 control-label">This transaction</label>
+                            <div class="col-sm-10">
+                                <select class="form-control" name="link_type"><option>a</option><option>a</option><option>a</option></select>
+                            </div>
+                        </div>
+                        <div class="form-group">
+                            <label for="link_type" class="col-sm-2 control-label">Transaction</label>
+                            <div class="col-sm-10">
+                                <input type="text" value="" class="form-control">
+                            </div>
+                        </div>
+                        <div class="form-group">
+                            <label for="comments" class="col-sm-2 control-label">Comments</label>
+                            <div class="col-sm-10">
+                                <textarea class="form-control"></textarea>
+                            </div>
+                        </div>
+
+
+                    </div>
+                    <div class="modal-footer">
+                        <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
+                        <button type="submit" class="btn btn-primary">{{ 'do something'|_ }}</button>
+                    </div>
+                </div>
+            </div>
+        </form>
+    </div>
+
 {% endblock %}
diff --git a/resources/views/transactions/single/create.twig b/resources/views/transactions/single/create.twig
index a55254bf04..2129bd70d1 100644
--- a/resources/views/transactions/single/create.twig
+++ b/resources/views/transactions/single/create.twig
@@ -102,7 +102,7 @@
                 not optionalFields.internal_reference or
                 not optionalFields.notes or
                 not optionalFields.attachments %}
-                    <p class="text-center text-success"><i class="fa fa-info-circle" aria-hidden="true"></i>
+                    <p class="text-center text-success"><i class="fa fa-info-circle"></i>
                         <em>{{ trans('firefly.hidden_fields_preferences', {link: route('preferences.index')})|raw }}</em></p>
                 {% endif %}
 
diff --git a/resources/views/transactions/single/edit.twig b/resources/views/transactions/single/edit.twig
index 6e1aafe723..76ea6216c3 100644
--- a/resources/views/transactions/single/edit.twig
+++ b/resources/views/transactions/single/edit.twig
@@ -107,7 +107,7 @@
                 not optionalFields.internal_reference or
                 not optionalFields.notes or
                 not optionalFields.attachments %}
-                    <p class="text-center text-success"><i class="fa fa-info-circle" aria-hidden="true"></i>
+                    <p class="text-center text-success"><i class="fa fa-info-circle"></i>
                         <em>{{ trans('firefly.hidden_fields_preferences', {link: route('preferences.index')})|raw }}</em></p>
                 {% endif %}
 
diff --git a/resources/views/transactions/split/edit.twig b/resources/views/transactions/split/edit.twig
index fcce6ddc94..095202f46c 100644
--- a/resources/views/transactions/split/edit.twig
+++ b/resources/views/transactions/split/edit.twig
@@ -99,7 +99,7 @@
                 not optionalFields.internal_reference or
                 not optionalFields.notes or
                 not optionalFields.attachments %}
-                    <p class="text-center text-success"><i class="fa fa-info-circle" aria-hidden="true"></i>
+                    <p class="text-center text-success"><i class="fa fa-info-circle"></i>
                         <em>{{ trans('firefly.hidden_fields_preferences', {link: route('preferences.index')})|raw }}</em></p>
                 {% endif %}
 

From c5cdd748fc194056e654d64f1401f62c43ba5832 Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Sun, 20 Aug 2017 14:36:14 +0200
Subject: [PATCH 068/668] Make sure tests work again.

---
 tests/Feature/Controllers/TagControllerTest.php      |  4 +---
 .../Controllers/Transaction/SplitControllerTest.php  | 12 ++++++++----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/tests/Feature/Controllers/TagControllerTest.php b/tests/Feature/Controllers/TagControllerTest.php
index dcfbe0bc13..7e1c5c8e76 100644
--- a/tests/Feature/Controllers/TagControllerTest.php
+++ b/tests/Feature/Controllers/TagControllerTest.php
@@ -102,13 +102,11 @@ class TagControllerTest extends TestCase
     public function testIndex()
     {
         // mock stuff
-        $tag          = factory(Tag::class)->make();
         $repository   = $this->mock(TagRepositoryInterface::class);
         $journalRepos = $this->mock(JournalRepositoryInterface::class);
         $journalRepos->shouldReceive('first')->once()->andReturn(new TransactionJournal);
         $repository->shouldReceive('count')->andReturn(0);
-        $repository->shouldReceive('getByType')->andReturn(new Collection([$tag]));
-
+        $repository->shouldReceive('tagCloud')->andReturn([]);
 
         $this->be($this->user());
         $response = $this->get(route('tags.index'));
diff --git a/tests/Feature/Controllers/Transaction/SplitControllerTest.php b/tests/Feature/Controllers/Transaction/SplitControllerTest.php
index c430a30dde..f9ce7bbc1e 100644
--- a/tests/Feature/Controllers/Transaction/SplitControllerTest.php
+++ b/tests/Feature/Controllers/Transaction/SplitControllerTest.php
@@ -47,17 +47,19 @@ class SplitControllerTest extends TestCase
         $currencyRepository = $this->mock(CurrencyRepositoryInterface::class);
         $accountRepository  = $this->mock(AccountRepositoryInterface::class);
         $budgetRepository   = $this->mock(BudgetRepositoryInterface::class);
+        $deposit            = TransactionJournal::where('transaction_type_id', 2)->where('user_id', $this->user()->id)->first();
+        $destination        = $deposit->transactions()->where('amount', '>', 0)->first();
+        $account            = $destination->account;
         $transactions       = factory(Transaction::class, 3)->make();
         $tasker             = $this->mock(JournalTaskerInterface::class);
 
         $currencyRepository->shouldReceive('get')->once()->andReturn(new Collection);
         $accountRepository->shouldReceive('getAccountsByType')->withArgs([[AccountType::DEFAULT, AccountType::ASSET]])
-                          ->andReturn(new Collection)->once();
+                          ->andReturn(new Collection([$account]))->once();
         $budgetRepository->shouldReceive('getActiveBudgets')->andReturn(new Collection);
         $tasker->shouldReceive('getTransactionsOverview')->andReturn($transactions->toArray());
 
 
-        $deposit = TransactionJournal::where('transaction_type_id', 2)->where('user_id', $this->user()->id)->first();
         $this->be($this->user());
         $response = $this->get(route('transactions.split.edit', [$deposit->id]));
         $response->assertStatus(200);
@@ -90,15 +92,17 @@ class SplitControllerTest extends TestCase
         $budgetRepository   = $this->mock(BudgetRepositoryInterface::class);
         $transactions       = factory(Transaction::class, 1)->make();
         $tasker             = $this->mock(JournalTaskerInterface::class);
+        $deposit            = TransactionJournal::where('transaction_type_id', 2)->where('user_id', $this->user()->id)->first();
+        $destination        = $deposit->transactions()->where('amount', '>', 0)->first();
+        $account            = $destination->account;
 
         $currencyRepository->shouldReceive('get')->once()->andReturn(new Collection);
         $accountRepository->shouldReceive('getAccountsByType')->withArgs([[AccountType::DEFAULT, AccountType::ASSET]])
-                          ->andReturn(new Collection)->once();
+                          ->andReturn(new Collection([$account]))->once();
         $budgetRepository->shouldReceive('getActiveBudgets')->andReturn(new Collection);
         $tasker->shouldReceive('getTransactionsOverview')->andReturn($transactions->toArray());
 
 
-        $deposit = TransactionJournal::where('transaction_type_id', 2)->where('user_id', $this->user()->id)->first();
         $this->be($this->user());
         $response = $this->get(route('transactions.split.edit', [$deposit->id]));
         $response->assertStatus(200);

From 59f46b82659ff19fb1e9319bc2e0af2eb093519a Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 20 Aug 2017 14:50:24 +0200
Subject: [PATCH 069/668] New translations firefly.php (Russian)

---
 resources/lang/ru_RU/firefly.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/resources/lang/ru_RU/firefly.php b/resources/lang/ru_RU/firefly.php
index 1782df7c43..c403ea6e33 100644
--- a/resources/lang/ru_RU/firefly.php
+++ b/resources/lang/ru_RU/firefly.php
@@ -935,6 +935,8 @@ return [
     'block_code_bounced'                    => 'Email message(s) bounced',
     'block_code_expired'                    => 'Demo account expired',
     'no_block_code'                         => 'No reason for block or user not blocked',
+    // links
+    'journal_link_configuration'            => 'Transaction links configuration',
 
 
     // split a transaction:

From 05be2fe25a091e35a81fc091c899090fdee8fe8c Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 20 Aug 2017 14:50:38 +0200
Subject: [PATCH 070/668] New translations firefly.php (French)

---
 resources/lang/fr_FR/firefly.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/resources/lang/fr_FR/firefly.php b/resources/lang/fr_FR/firefly.php
index 2f342384a0..79ffb73369 100644
--- a/resources/lang/fr_FR/firefly.php
+++ b/resources/lang/fr_FR/firefly.php
@@ -935,6 +935,8 @@ return [
     'block_code_bounced'                    => 'Email message(s) bounced',
     'block_code_expired'                    => 'Demo account expired',
     'no_block_code'                         => 'No reason for block or user not blocked',
+    // links
+    'journal_link_configuration'            => 'Transaction links configuration',
 
 
     // split a transaction:

From 7cbe0768f25577a1495c4701c90378341a668f64 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 20 Aug 2017 14:50:41 +0200
Subject: [PATCH 071/668] New translations firefly.php (German)

---
 resources/lang/de_DE/firefly.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/resources/lang/de_DE/firefly.php b/resources/lang/de_DE/firefly.php
index e1abf3a408..0a1eff694e 100644
--- a/resources/lang/de_DE/firefly.php
+++ b/resources/lang/de_DE/firefly.php
@@ -936,6 +936,8 @@ Sollen zusätzlich Ihre Girokonten angezeigt werden?',
     'block_code_bounced'                    => 'Email message(s) bounced',
     'block_code_expired'                    => 'Demo-Konto abgelaufen',
     'no_block_code'                         => 'Kein Grund für Block oder Benutzer nicht blockiert',
+    // links
+    'journal_link_configuration'            => 'Transaction links configuration',
 
 
     // split a transaction:

From aa78948c9015871ae4b42302c62ae8f1e598aed6 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 20 Aug 2017 14:50:43 +0200
Subject: [PATCH 072/668] New translations firefly.php (Dutch)

---
 resources/lang/nl_NL/firefly.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/resources/lang/nl_NL/firefly.php b/resources/lang/nl_NL/firefly.php
index a6313d9440..89f3da2471 100644
--- a/resources/lang/nl_NL/firefly.php
+++ b/resources/lang/nl_NL/firefly.php
@@ -935,6 +935,8 @@ return [
     'block_code_bounced'                    => 'Email kwam niet aan',
     'block_code_expired'                    => 'Demo-account verlopen',
     'no_block_code'                         => 'Geen reden of gebruiker niet geblokkeerd',
+    // links
+    'journal_link_configuration'            => 'Transaction links configuration',
 
 
     // split a transaction:

From 91558049d9636d15498fb16195a2a2aeca74cf5d Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 20 Aug 2017 14:50:45 +0200
Subject: [PATCH 073/668] New translations firefly.php (Chinese Traditional)

---
 resources/lang/zh_TW/firefly.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/resources/lang/zh_TW/firefly.php b/resources/lang/zh_TW/firefly.php
index 09cad74ff6..afd7643bf2 100644
--- a/resources/lang/zh_TW/firefly.php
+++ b/resources/lang/zh_TW/firefly.php
@@ -935,6 +935,8 @@ return [
     'block_code_bounced'                    => 'Email message(s) bounced',
     'block_code_expired'                    => 'Demo account expired',
     'no_block_code'                         => 'No reason for block or user not blocked',
+    // links
+    'journal_link_configuration'            => 'Transaction links configuration',
 
 
     // split a transaction:

From 81ae86013424878fb37fb55b2be23c50296a0b53 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 20 Aug 2017 14:50:48 +0200
Subject: [PATCH 074/668] New translations firefly.php (Polish)

---
 resources/lang/pl_PL/firefly.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/resources/lang/pl_PL/firefly.php b/resources/lang/pl_PL/firefly.php
index ea8ad49c15..db37dc7f0b 100644
--- a/resources/lang/pl_PL/firefly.php
+++ b/resources/lang/pl_PL/firefly.php
@@ -935,6 +935,8 @@ return [
     'block_code_bounced'                    => 'Email message(s) bounced',
     'block_code_expired'                    => 'Demonstracyjne konto wygasło',
     'no_block_code'                         => 'No reason for block or user not blocked',
+    // links
+    'journal_link_configuration'            => 'Transaction links configuration',
 
 
     // split a transaction:

From 5dad1fe2af685e89ddf21b02b958b259d8c9960e Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 20 Aug 2017 14:50:51 +0200
Subject: [PATCH 075/668] New translations firefly.php (Portuguese, Brazilian)

---
 resources/lang/pt_BR/firefly.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/resources/lang/pt_BR/firefly.php b/resources/lang/pt_BR/firefly.php
index e8903e2baf..d7aeecb4d6 100644
--- a/resources/lang/pt_BR/firefly.php
+++ b/resources/lang/pt_BR/firefly.php
@@ -935,6 +935,8 @@ return [
     'block_code_bounced'                    => 'Email message(s) bounced',
     'block_code_expired'                    => 'Demo account expired',
     'no_block_code'                         => 'No reason for block or user not blocked',
+    // links
+    'journal_link_configuration'            => 'Transaction links configuration',
 
 
     // split a transaction:

From 06fcf8f0792425fc40442a92495f8d606b392a21 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 20 Aug 2017 14:50:55 +0200
Subject: [PATCH 076/668] New translations firefly.php (Spanish)

---
 resources/lang/es_ES/firefly.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/resources/lang/es_ES/firefly.php b/resources/lang/es_ES/firefly.php
index 2a876f7000..53dad8f60b 100644
--- a/resources/lang/es_ES/firefly.php
+++ b/resources/lang/es_ES/firefly.php
@@ -935,6 +935,8 @@ return [
     'block_code_bounced'                    => 'Email message(s) bounced',
     'block_code_expired'                    => 'Demo account expired',
     'no_block_code'                         => 'No reason for block or user not blocked',
+    // links
+    'journal_link_configuration'            => 'Transaction links configuration',
 
 
     // split a transaction:

From cac498fd9ecf6cbff264f5d12aa7e95034af1b5c Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 20 Aug 2017 14:50:58 +0200
Subject: [PATCH 077/668] New translations firefly.php (Slovenian)

---
 resources/lang/sl_SI/firefly.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/resources/lang/sl_SI/firefly.php b/resources/lang/sl_SI/firefly.php
index 7147f5c160..1ba7b86648 100644
--- a/resources/lang/sl_SI/firefly.php
+++ b/resources/lang/sl_SI/firefly.php
@@ -935,6 +935,8 @@ return [
     'block_code_bounced'                    => 'Email message(s) bounced',
     'block_code_expired'                    => 'Demo account expired',
     'no_block_code'                         => 'No reason for block or user not blocked',
+    // links
+    'journal_link_configuration'            => 'Transaction links configuration',
 
 
     // split a transaction:

From 35ab4a5ff496aeb3434b463d3b6a8e467ce358a3 Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Mon, 21 Aug 2017 07:13:03 +0200
Subject: [PATCH 078/668] Management of links and first form for link storing
 #616

---
 app/Http/Controllers/Admin/LinkController.php | 163 +++++++++++++++++-
 .../Json/AutoCompleteController.php           |  36 ++++
 .../Transaction/LinkController.php            |  25 +++
 .../Controllers/TransactionController.php     |   7 +-
 app/Http/Requests/LinkTypeFormRequest.php     |  57 ++++++
 app/Http/Requests/Request.php                 |   2 +-
 app/Http/breadcrumbs.php                      |  21 +++
 app/Models/LinkType.php                       |   5 +
 app/Models/TransactionJournal.php             |  15 ++
 app/Models/TransactionJournalLink.php         |  53 ++++++
 app/Providers/AdminServiceProvider.php        |  63 +++++++
 .../LinkType/LinkTypeRepository.php           | 119 +++++++++++++
 .../LinkType/LinkTypeRepositoryInterface.php  |  67 +++++++
 config/app.php                                |   1 +
 .../2017_08_20_062014_changes_for_v470.php    |  15 +-
 public/js/ff/transactions/show.js             |  39 +++++
 resources/lang/en_US/firefly.php              |  20 +++
 resources/lang/en_US/form.php                 |   6 +
 resources/lang/en_US/list.php                 |  23 +--
 resources/views/admin/link/create.twig        |  44 +++++
 resources/views/admin/link/delete.twig        |  53 ++++++
 resources/views/admin/link/edit.twig          |  48 ++++++
 resources/views/admin/link/index.twig         |  43 ++++-
 resources/views/transactions/show.twig        |  34 ++--
 routes/web.php                                |  20 ++-
 25 files changed, 948 insertions(+), 31 deletions(-)
 create mode 100644 app/Http/Controllers/Transaction/LinkController.php
 create mode 100644 app/Http/Requests/LinkTypeFormRequest.php
 create mode 100644 app/Models/TransactionJournalLink.php
 create mode 100644 app/Providers/AdminServiceProvider.php
 create mode 100644 app/Repositories/LinkType/LinkTypeRepository.php
 create mode 100644 app/Repositories/LinkType/LinkTypeRepositoryInterface.php
 create mode 100644 public/js/ff/transactions/show.js
 create mode 100644 resources/views/admin/link/create.twig
 create mode 100644 resources/views/admin/link/delete.twig
 create mode 100644 resources/views/admin/link/edit.twig

diff --git a/app/Http/Controllers/Admin/LinkController.php b/app/Http/Controllers/Admin/LinkController.php
index ca2ce39184..06bf9daf69 100644
--- a/app/Http/Controllers/Admin/LinkController.php
+++ b/app/Http/Controllers/Admin/LinkController.php
@@ -14,6 +14,11 @@ namespace FireflyIII\Http\Controllers\Admin;
 
 
 use FireflyIII\Http\Controllers\Controller;
+use FireflyIII\Http\Requests\LinkTypeFormRequest;
+use FireflyIII\Models\LinkType;
+use FireflyIII\Repositories\LinkType\LinkTypeRepositoryInterface;
+use Illuminate\Http\Request;
+use Preferences;
 use View;
 
 /**
@@ -41,14 +46,166 @@ class LinkController extends Controller
     }
 
     /**
-     *
+     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
      */
-    public function index()
+    public function create()
+    {
+        $subTitle     = trans('firefly.create_new_link_type');
+        $subTitleIcon = 'fa-link';
+
+        // put previous url in session if not redirect from store (not "create another").
+        if (session('link_types.create.fromStore') !== true) {
+            $this->rememberPreviousUri('link_types.create.uri');
+        }
+
+        return view('admin.link.create', compact('subTitle', 'subTitleIcon'));
+    }
+
+    /**
+     * @param LinkType $linkType
+     *
+     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector|View
+     */
+    public function delete(Request $request, LinkTypeRepositoryInterface $repository, LinkType $linkType)
+    {
+        if (!$linkType->editable) {
+            $request->session()->flash('error', strval(trans('firefly.cannot_edit_link_type', ['name' => $linkType->name])));
+
+            return redirect(route('admin.links.index'));
+        }
+
+        $subTitle   = trans('firefly.delete_link_type', ['name' => $linkType->name]);
+        $otherTypes = $repository->get();
+        $count      = $repository->countJournals($linkType);
+        $moveTo     = [];
+        $moveTo[0]  = trans('firefly.do_not_save_connection');
+        /** @var LinkType $otherType */
+        foreach ($otherTypes as $otherType) {
+            if ($otherType->id !== $linkType->id) {
+                $moveTo[$otherType->id] = sprintf('%s (%s / %s)', $otherType->name, $otherType->inward, $otherType->outward);
+            }
+        }
+        // put previous url in session
+        $this->rememberPreviousUri('link_types.delete.uri');
+
+        return view('admin.link.delete', compact('linkType', 'subTitle', 'moveTo', 'count'));
+    }
+
+    /**
+     * @param Request                     $request
+     * @param LinkTypeRepositoryInterface $repository
+     * @param LinkType                    $linkType
+     *
+     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
+     */
+    public function destroy(Request $request, LinkTypeRepositoryInterface $repository, LinkType $linkType)
+    {
+        $name   = $linkType->name;
+        $moveTo = $repository->find(intval($request->get('move_link_type_before_delete')));
+        $repository->destroy($linkType, $moveTo);
+
+        $request->session()->flash('success', strval(trans('firefly.deleted_link_type', ['name' => $name])));
+        Preferences::mark();
+
+        return redirect($this->getPreviousUri('link_types.delete.uri'));
+    }
+
+    /**
+     * @param Request  $request
+     * @param LinkType $linkType
+     *
+     * @return \Illuminate\Contracts\View\Factory|\Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector|\Illuminate\View\View
+     */
+    public function edit(Request $request, LinkType $linkType)
+    {
+        if (!$linkType->editable) {
+            $request->session()->flash('error', strval(trans('firefly.cannot_edit_link_type', ['name' => $linkType->name])));
+
+            return redirect(route('admin.links.index'));
+        }
+        $subTitle     = trans('firefly.edit_link_type', ['name' => $linkType->name]);
+        $subTitleIcon = 'fa-link';
+
+        // put previous url in session if not redirect from store (not "return_to_edit").
+        if (session('link_types.edit.fromUpdate') !== true) {
+            $this->rememberPreviousUri('link_types.edit.uri');
+        }
+        $request->session()->forget('link_types.edit.fromUpdate');
+
+        return view('admin.link.edit', compact('subTitle', 'subTitleIcon', 'linkType'));
+    }
+
+    /**
+     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
+     */
+    public function index(LinkTypeRepositoryInterface $repository)
     {
         $subTitle     = trans('firefly.journal_link_configuration');
         $subTitleIcon = 'fa-link';
+        $linkTypes    = $repository->get();
+        $linkTypes->each(
+            function (LinkType $linkType) use ($repository) {
+                $linkType->journalCount = $repository->countJournals($linkType);
+            }
+        );
 
-        return view('admin.link.index', compact('subTitle', 'subTitleIcon'));
+        return view('admin.link.index', compact('subTitle', 'subTitleIcon', 'linkTypes'));
+    }
+
+    /**
+     * @param LinkTypeFormRequest         $request
+     * @param LinkTypeRepositoryInterface $repository
+     *
+     * @return $this|\Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
+     */
+    public function store(LinkTypeFormRequest $request, LinkTypeRepositoryInterface $repository)
+    {
+        $data     = [
+            'name'    => $request->string('name'),
+            'inward'  => $request->string('inward'),
+            'outward' => $request->string('outward'),
+        ];
+        $linkType = $repository->store($data);
+        $request->session()->flash('success', strval(trans('firefly.stored_new_link_type', ['name' => $linkType->name])));
+
+        if (intval($request->get('create_another')) === 1) {
+            // set value so create routine will not overwrite URL:
+            $request->session()->put('link_types.create.fromStore', true);
+
+            return redirect(route('link_types.create', [$request->input('what')]))->withInput();
+        }
+
+        // redirect to previous URL.
+        return redirect($this->getPreviousUri('link_types.create.uri'));
+    }
+
+    public function update(LinkTypeFormRequest $request, LinkTypeRepositoryInterface $repository, LinkType $linkType)
+    {
+        if (!$linkType->editable) {
+            $request->session()->flash('error', strval(trans('firefly.cannot_edit_link_type', ['name' => $linkType->name])));
+
+            return redirect(route('admin.links.index'));
+        }
+
+        $data = [
+            'name'    => $request->string('name'),
+            'inward'  => $request->string('inward'),
+            'outward' => $request->string('outward'),
+        ];
+        $repository->update($linkType, $data);
+
+        $request->session()->flash('success', strval(trans('firefly.updated_link_type', ['name' => $linkType->name])));
+        Preferences::mark();
+
+        if (intval($request->get('return_to_edit')) === 1) {
+            // set value so edit routine will not overwrite URL:
+            $request->session()->put('link_types.edit.fromUpdate', true);
+
+            return redirect(route('admin.links.edit', [$linkType->id]))->withInput(['return_to_edit' => 1]);
+        }
+
+        // redirect to previous URL.
+        return redirect($this->getPreviousUri('link_types.edit.uri'));
     }
 
 }
\ No newline at end of file
diff --git a/app/Http/Controllers/Json/AutoCompleteController.php b/app/Http/Controllers/Json/AutoCompleteController.php
index 28dc7495d8..dbcbf45ab0 100644
--- a/app/Http/Controllers/Json/AutoCompleteController.php
+++ b/app/Http/Controllers/Json/AutoCompleteController.php
@@ -12,10 +12,13 @@ declare(strict_types=1);
 
 namespace FireflyIII\Http\Controllers\Json;
 
+use FireflyIII\Helpers\Collector\JournalCollectorInterface;
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Models\Account;
 use FireflyIII\Models\AccountType;
+use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
+use FireflyIII\Support\CacheProperties;
 use Response;
 
 /**
@@ -74,6 +77,39 @@ class AutoCompleteController extends Controller
         return Response::json($return);
     }
 
+    /**
+     * @param JournalCollectorInterface $collector
+     *
+     * @return \Illuminate\Http\JsonResponse|mixed
+     */
+    public function journalsWithId(JournalCollectorInterface $collector, TransactionJournal $except)
+    {
+
+        $cache = new CacheProperties;
+        $cache->addProperty('recent-journals-id');
+
+        if ($cache->has()) {
+            return $cache->get(); // @codeCoverageIgnore
+        }
+
+        $collector->setLimit(400)->setPage(1);
+        $set    = $collector->getJournals()->pluck('description', 'journal_id')->toArray();
+        $return = [];
+        foreach ($set as $id => $description) {
+            $id = intval($id);
+            if ($id !== $except->id) {
+                $return[] = [
+                    'id'   => $id,
+                    'name' => $id . ': ' . $description,
+                ];
+            }
+        }
+
+        $cache->store($return);
+
+        return Response::json($return);
+    }
+
     /**
      * @param AccountRepositoryInterface $repository
      *
diff --git a/app/Http/Controllers/Transaction/LinkController.php b/app/Http/Controllers/Transaction/LinkController.php
new file mode 100644
index 0000000000..835661022e
--- /dev/null
+++ b/app/Http/Controllers/Transaction/LinkController.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * LinkController.php
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Http\Controllers\Transaction;
+
+
+use Illuminate\Http\Request;
+
+class LinkController
+{
+
+    public function store(Request $request) {
+        var_dump($request->all());
+    }
+
+}
\ No newline at end of file
diff --git a/app/Http/Controllers/TransactionController.php b/app/Http/Controllers/TransactionController.php
index 059a1e3fb7..eb21c44356 100644
--- a/app/Http/Controllers/TransactionController.php
+++ b/app/Http/Controllers/TransactionController.php
@@ -20,6 +20,7 @@ use FireflyIII\Helpers\Filter\InternalTransferFilter;
 use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
 use FireflyIII\Repositories\Journal\JournalTaskerInterface;
+use FireflyIII\Repositories\LinkType\LinkTypeRepositoryInterface;
 use FireflyIII\Support\CacheProperties;
 use Illuminate\Http\Request;
 use Illuminate\Support\Collection;
@@ -155,18 +156,18 @@ class TransactionController extends Controller
      *
      * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector|View
      */
-    public function show(TransactionJournal $journal, JournalTaskerInterface $tasker)
+    public function show(TransactionJournal $journal, JournalTaskerInterface $tasker, LinkTypeRepositoryInterface $linkTypeRepository)
     {
         if ($this->isOpeningBalance($journal)) {
             return $this->redirectToAccount($journal);
         }
-
+        $linkTypes       = $linkTypeRepository->get();
         $events       = $tasker->getPiggyBankEvents($journal);
         $transactions = $tasker->getTransactionsOverview($journal);
         $what         = strtolower($journal->transaction_type_type ?? $journal->transactionType->type);
         $subTitle     = trans('firefly.' . $what) . ' "' . e($journal->description) . '"';
 
-        return view('transactions.show', compact('journal', 'events', 'subTitle', 'what', 'transactions'));
+        return view('transactions.show', compact('journal', 'events', 'subTitle', 'what', 'transactions', 'linkTypes'));
 
 
     }
diff --git a/app/Http/Requests/LinkTypeFormRequest.php b/app/Http/Requests/LinkTypeFormRequest.php
new file mode 100644
index 0000000000..625e40d0d5
--- /dev/null
+++ b/app/Http/Requests/LinkTypeFormRequest.php
@@ -0,0 +1,57 @@
+<?php
+/**
+ * LinkTypeFormRequest.php
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Http\Requests;
+
+use FireflyIII\Repositories\LinkType\LinkTypeRepositoryInterface;
+
+/**
+ * Class BillFormRequest
+ *
+ *
+ * @package FireflyIII\Http\Requests
+ */
+class LinkTypeFormRequest extends Request
+{
+    /**
+     * @return bool
+     */
+    public function authorize()
+    {
+        // Only allow logged and admins
+        return auth()->check() && auth()->user()->hasRole('owner');
+    }
+
+    /**
+     * @return array
+     */
+    public function rules()
+    {
+        /** @var LinkTypeRepositoryInterface $repository */
+        $repository = app(LinkTypeRepositoryInterface::class);
+        $nameRule   = 'required|min:1|unique:link_types,name';
+        $idRule     = '';
+        if (!is_null($repository->find($this->integer('id'))->id)) {
+            $idRule   = 'exists:link_types,id';
+            $nameRule = 'required|min:1';
+        }
+
+        $rules = [
+            'id'      => $idRule,
+            'name'    => $nameRule,
+            'inward'  => 'required|min:1|different:outward',
+            'outward' => 'required|min:1|different:inward',
+        ];
+
+        return $rules;
+    }
+}
diff --git a/app/Http/Requests/Request.php b/app/Http/Requests/Request.php
index 87e1bf2934..30906089c5 100644
--- a/app/Http/Requests/Request.php
+++ b/app/Http/Requests/Request.php
@@ -85,7 +85,7 @@ class Request extends FormRequest
      *
      * @return string
      */
-    protected function string(string $field): string
+    public function string(string $field): string
     {
         $string  = $this->get($field) ?? '';
         $search  = [
diff --git a/app/Http/breadcrumbs.php b/app/Http/breadcrumbs.php
index fd3bd27685..98ba0c7234 100644
--- a/app/Http/breadcrumbs.php
+++ b/app/Http/breadcrumbs.php
@@ -21,6 +21,7 @@ use FireflyIII\Models\Budget;
 use FireflyIII\Models\BudgetLimit;
 use FireflyIII\Models\Category;
 use FireflyIII\Models\ImportJob;
+use FireflyIII\Models\LinkType;
 use FireflyIII\Models\PiggyBank;
 use FireflyIII\Models\Rule;
 use FireflyIII\Models\RuleGroup;
@@ -159,6 +160,26 @@ Breadcrumbs::register(
 }
 );
 
+Breadcrumbs::register(
+    'admin.links.create', function (BreadCrumbGenerator $breadcrumbs) {
+    $breadcrumbs->parent('admin.links.index');
+    $breadcrumbs->push(trans('firefly.create_new_link_type'), route('admin.links.create'));
+}
+);
+
+Breadcrumbs::register(
+    'admin.links.edit', function (BreadCrumbGenerator $breadcrumbs, LinkType $linkType) {
+    $breadcrumbs->parent('admin.links.index');
+    $breadcrumbs->push(trans('firefly.edit_link_type', ['name' => $linkType->name]), route('admin.links.edit', [$linkType->id]));
+}
+);
+
+Breadcrumbs::register(
+    'admin.links.delete', function (BreadCrumbGenerator $breadcrumbs, LinkType $linkType) {
+    $breadcrumbs->parent('admin.links.index');
+    $breadcrumbs->push(trans('firefly.delete_link_type', ['name' => $linkType->name]), route('admin.links.delete', [$linkType->id]));
+}
+);
 
 /**
  * ATTACHMENTS
diff --git a/app/Models/LinkType.php b/app/Models/LinkType.php
index 8a86779466..da8d60de5b 100644
--- a/app/Models/LinkType.php
+++ b/app/Models/LinkType.php
@@ -16,6 +16,7 @@ namespace FireflyIII\Models;
 use Illuminate\Database\Eloquent\Model;
 
 /**
+ * @property int $journalCount
  * Class LinkType
  *
  * @package FireflyIII\Models
@@ -35,4 +36,8 @@ class LinkType extends Model
             'editable'   => 'boolean',
         ];
 
+    public function transactionJournalLinks() {
+        return $this->hasMany(TransactionJournalLink::class);
+    }
+
 }
\ No newline at end of file
diff --git a/app/Models/TransactionJournal.php b/app/Models/TransactionJournal.php
index 977ef1ea90..d0f1e4ab8e 100644
--- a/app/Models/TransactionJournal.php
+++ b/app/Models/TransactionJournal.php
@@ -372,6 +372,21 @@ class TransactionJournal extends Model
         return $entry;
     }
 
+    /**
+     * @return HasMany
+     */
+    public function sourceJournalLinks(): HasMany
+    {
+        return $this->hasMany(TransactionJournalLink::class, 'source_id');
+    }
+    /**
+     * @return HasMany
+     */
+    public function destinationJournalLinks(): HasMany
+    {
+        return $this->hasMany(TransactionJournalLink::class, 'destination_id');
+    }
+
     /**
      * @return \Illuminate\Database\Eloquent\Relations\BelongsToMany
      */
diff --git a/app/Models/TransactionJournalLink.php b/app/Models/TransactionJournalLink.php
new file mode 100644
index 0000000000..a864c66bb2
--- /dev/null
+++ b/app/Models/TransactionJournalLink.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * TransactionJournalLink.php
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Models;
+
+
+use Illuminate\Database\Eloquent\Model;
+
+/**
+ * Class TransactionJournalLink
+ *
+ * @package FireflyIII\Models
+ */
+class TransactionJournalLink extends Model
+{
+protected $table = 'journal_links';
+
+
+    /**
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
+     */
+    public function linkType()
+    {
+        return $this->belongsTo(LinkType::class);
+    }
+
+    /**
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
+     */
+    public function source()
+    {
+        return $this->belongsTo(TransactionJournal::class,'source_id');
+    }
+
+    /**
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
+     */
+    public function destination()
+    {
+        return $this->belongsTo(TransactionJournal::class,'destination_id');
+    }
+
+
+}
\ No newline at end of file
diff --git a/app/Providers/AdminServiceProvider.php b/app/Providers/AdminServiceProvider.php
new file mode 100644
index 0000000000..a325823f06
--- /dev/null
+++ b/app/Providers/AdminServiceProvider.php
@@ -0,0 +1,63 @@
+<?php
+/**
+ * AdminServiceProvider.php
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Providers;
+
+use FireflyIII\Repositories\LinkType\LinkTypeRepository;
+use FireflyIII\Repositories\LinkType\LinkTypeRepositoryInterface;
+use Illuminate\Foundation\Application;
+use Illuminate\Support\ServiceProvider;
+
+
+class AdminServiceProvider extends ServiceProvider
+{
+    /**
+     * Bootstrap the application services.
+     *
+     * @return void
+     */
+    public function boot()
+    {
+
+
+    }
+
+    /**
+     * Register the application services.
+     *
+     * @return void
+     */
+    public function register()
+    {
+        $this->linkType();
+    }
+
+    /**
+     *
+     */
+    private function linkType()
+    {
+        $this->app->bind(
+            LinkTypeRepositoryInterface::class,
+            function (Application $app) {
+                /** @var LinkTypeRepository $repository */
+                $repository = app(LinkTypeRepository::class);
+                if ($app->auth->check()) {
+                    $repository->setUser(auth()->user());
+                }
+
+                return $repository;
+            }
+        );
+    }
+
+}
\ No newline at end of file
diff --git a/app/Repositories/LinkType/LinkTypeRepository.php b/app/Repositories/LinkType/LinkTypeRepository.php
new file mode 100644
index 0000000000..2376dde92d
--- /dev/null
+++ b/app/Repositories/LinkType/LinkTypeRepository.php
@@ -0,0 +1,119 @@
+<?php
+/**
+ * LinkTypeRepository.php
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Repositories\LinkType;
+
+use FireflyIII\Models\LinkType;
+use FireflyIII\Models\TransactionJournalLink;
+use FireflyIII\User;
+use Illuminate\Support\Collection;
+
+/**
+ * Class LinkTypeRepository
+ *
+ * @package FireflyIII\Repositories\LinkType
+ */
+class LinkTypeRepository implements LinkTypeRepositoryInterface
+{
+    /** @var User */
+    private $user;
+
+    /**
+     * @param LinkType $linkType
+     *
+     * @return int
+     */
+    public function countJournals(LinkType $linkType): int
+    {
+        return $linkType->transactionJournalLinks()->count() * 2;
+    }
+
+    /**
+     * @param LinkType $linkType
+     * @param LinkType $moveTo
+     *
+     * @return bool
+     */
+    public function destroy(LinkType $linkType, LinkType $moveTo): bool
+    {
+        if (!is_null($moveTo->id)) {
+            TransactionJournalLink::where('link_type_id', $linkType->id)->update(['link_type_id' => $moveTo->id]);
+        }
+        $linkType->delete();
+        return true;
+    }
+
+    /**
+     * @param int $id
+     *
+     * @return LinkType
+     */
+    public function find(int $id): LinkType
+    {
+        $linkType = LinkType::find($id);
+        if (is_null($linkType)) {
+            return new LinkType;
+        }
+
+        return $linkType;
+    }
+
+    /**
+     * @return Collection
+     */
+    public function get(): Collection
+    {
+        return LinkType::orderBy('name', 'ASC')->get();
+    }
+
+    /**
+     * @param User $user
+     */
+    public function setUser(User $user)
+    {
+        $this->user = $user;
+    }
+
+    /**
+     * @param array $data
+     *
+     * @return LinkType
+     */
+    public function store(array $data): LinkType
+    {
+        $linkType           = new LinkType;
+        $linkType->name     = $data['name'];
+        $linkType->inward   = $data['inward'];
+        $linkType->outward  = $data['outward'];
+        $linkType->editable = true;
+        $linkType->save();
+
+        return $linkType;
+    }
+
+    /**
+     * @param LinkType $linkType
+     * @param array    $data
+     *
+     * @return LinkType
+     */
+    public function update(LinkType $linkType, array $data): LinkType
+    {
+        $linkType->name    = $data['name'];
+        $linkType->inward  = $data['inward'];
+        $linkType->outward = $data['outward'];
+        $linkType->save();
+
+        return $linkType;
+
+    }
+}
\ No newline at end of file
diff --git a/app/Repositories/LinkType/LinkTypeRepositoryInterface.php b/app/Repositories/LinkType/LinkTypeRepositoryInterface.php
new file mode 100644
index 0000000000..9a35b431e6
--- /dev/null
+++ b/app/Repositories/LinkType/LinkTypeRepositoryInterface.php
@@ -0,0 +1,67 @@
+<?php
+/**
+ * LinkTypeRepositoryInterface.php
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Repositories\LinkType;
+
+use FireflyIII\Models\LinkType;
+use Illuminate\Support\Collection;
+
+/**
+ * Interface LinkTypeRepositoryInterface
+ *
+ * @package FireflyIII\Repositories\LinkType
+ */
+interface LinkTypeRepositoryInterface
+{
+    /**
+     * @param int $id
+     *
+     * @return LinkType
+     */
+    public function find(int $id): LinkType;
+
+    /**
+     * @return Collection
+     */
+    public function get(): Collection;
+
+    /**
+     * @param LinkType $linkType
+     *
+     * @return int
+     */
+    public function countJournals(LinkType $linkType): int;
+
+    /**
+     * @param LinkType $linkType
+     * @param LinkType $moveTo
+     *
+     * @return bool
+     */
+    public function destroy(LinkType $linkType, LinkType $moveTo): bool;
+
+    /**
+     * @param array $data
+     *
+     * @return LinkType
+     */
+    public function store(array $data): LinkType;
+
+    /**
+     * @param LinkType $linkType
+     * @param array    $data
+     *
+     * @return LinkType
+     */
+    public function update(LinkType $linkType, array $data): LinkType;
+
+}
\ No newline at end of file
diff --git a/config/app.php b/config/app.php
index 1f0172e6b5..56b26276bb 100644
--- a/config/app.php
+++ b/config/app.php
@@ -88,6 +88,7 @@ return [
         FireflyIII\Providers\RuleGroupServiceProvider::class,
         FireflyIII\Providers\SearchServiceProvider::class,
         FireflyIII\Providers\TagServiceProvider::class,
+        FireflyIII\Providers\AdminServiceProvider::class,
 
 
     ],
diff --git a/database/migrations/2017_08_20_062014_changes_for_v470.php b/database/migrations/2017_08_20_062014_changes_for_v470.php
index 1fe202c8c1..f3735202ad 100644
--- a/database/migrations/2017_08_20_062014_changes_for_v470.php
+++ b/database/migrations/2017_08_20_062014_changes_for_v470.php
@@ -16,8 +16,9 @@ class ChangesForV470 extends Migration
      */
     public function down()
     {
+        Schema::dropIfExists('journal_links');
         Schema::dropIfExists('link_types');
-        Schema::dropIfExists('journal_types');
+
     }
 
     /**
@@ -38,6 +39,9 @@ class ChangesForV470 extends Migration
                 $table->string('outward');
                 $table->string('inward');
                 $table->boolean('editable');
+
+                $table->unique(['name']);
+                $table->unique(['outward','inward']);
             }
             );
         }
@@ -46,11 +50,20 @@ class ChangesForV470 extends Migration
             Schema::create(
                 'journal_links', function (Blueprint $table) {
                 $table->increments('id');
+                $table->timestamps();
                 $table->integer('link_type_id', false, true);
                 $table->integer('source_id', false, true);
                 $table->integer('destination_id', false, true);
                 $table->text('comment');
                 $table->integer('sequence', false, true);
+
+                $table->foreign('link_type_id')->references('id')->on('link_types')->onDelete('cascade');
+                $table->foreign('source_id')->references('id')->on('transaction_journals')->onDelete('cascade');
+                $table->foreign('destination_id')->references('id')->on('transaction_journals')->onDelete('cascade');
+
+                $table->unique(['link_type_id','source_id','destination_id']);
+
+
             }
             );
         }
diff --git a/public/js/ff/transactions/show.js b/public/js/ff/transactions/show.js
new file mode 100644
index 0000000000..9e797ce3b2
--- /dev/null
+++ b/public/js/ff/transactions/show.js
@@ -0,0 +1,39 @@
+/*
+ * show.js
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+/** global: autoCompleteUri */
+
+$(function () {
+    "use strict";
+
+
+    $.getJSON(autoCompleteUri).done(function (data) {
+        var $input = $("#link_other");
+        $input.typeahead({
+                             source: data,
+                             autoSelect: true
+                         });
+        $input.change(function() {
+            var current = $input.typeahead("getActive");
+            if (current) {
+                // Some item from your model is active!
+                if (current.name.toLowerCase() === $input.val().toLowerCase()) {
+                    // This means the exact match is found. Use toLowerCase() if you want case insensitive match.
+                    $('input[name="link_journal_id"]').val(current.id);
+                } else {
+                    $('input[name="link_journal_id"]').val(0);
+                }
+            } else {
+                $('input[name="link_journal_id"]').val(0);
+            }
+        });
+    });
+
+
+});
\ No newline at end of file
diff --git a/resources/lang/en_US/firefly.php b/resources/lang/en_US/firefly.php
index a72ba1ccc3..69c482ab9e 100644
--- a/resources/lang/en_US/firefly.php
+++ b/resources/lang/en_US/firefly.php
@@ -937,6 +937,26 @@ return [
     'no_block_code'                         => 'No reason for block or user not blocked',
     // links
     'journal_link_configuration'            => 'Transaction links configuration',
+    'create_new_link_type'                  => 'Create new link type',
+    'store_new_link_type'                   => 'Store new link type',
+    'update_link_type'                      => 'Update link type',
+    'edit_link_type'                        => 'Edit link type ":name"',
+    'updated_link_type'                     => 'Updated link type ":name"',
+    'delete_link_type'                      => 'Delete link type ":name"',
+    'deleted_link_type'                     => 'Deleted link type ":name"',
+    'stored_new_link_type'                  => 'Store new link type ":name"',
+    'cannot_edit_link_type'                 => 'Cannot edit link type ":name"',
+    'link_type_help_name'                   => 'Ie. "Duplicates"',
+    'link_type_help_inward'                 => 'Ie. "duplicates"',
+    'link_type_help_outward'                => 'Ie. "is duplicated by"',
+    'save_connections_by_moving'            => 'Save the link between these transaction(s) by moving them to another link type:',
+    'do_not_save_connection'                => '(do not save connection)',
+    'link_transaction'                      => 'Link transaction',
+    'link_to_other_transaction'             => 'Link this transaction to another transaction',
+    'select_transaction_to_link'            => 'Select a transaction to link this transaction to',
+    'this_transaction'                      => 'This transaction',
+    'transaction'                           => 'Transaction',
+    'comments'                              => 'Comments',
 
 
     // split a transaction:
diff --git a/resources/lang/en_US/form.php b/resources/lang/en_US/form.php
index 1f0d3e0ef0..f47f680876 100644
--- a/resources/lang/en_US/form.php
+++ b/resources/lang/en_US/form.php
@@ -135,6 +135,7 @@ return [
     'delete_attachment'          => 'Delete attachment ":name"',
     'delete_rule'                => 'Delete rule ":title"',
     'delete_rule_group'          => 'Delete rule group ":title"',
+    'delete_link_type'           => 'Delete link type ":name"',
     'attachment_areYouSure'      => 'Are you sure you want to delete the attachment named ":name"?',
     'account_areYouSure'         => 'Are you sure you want to delete the account named ":name"?',
     'bill_areYouSure'            => 'Are you sure you want to delete the bill named ":name"?',
@@ -147,11 +148,13 @@ return [
     'journal_areYouSure'         => 'Are you sure you want to delete the transaction described ":description"?',
     'mass_journal_are_you_sure'  => 'Are you sure you want to delete these transactions?',
     'tag_areYouSure'             => 'Are you sure you want to delete the tag ":tag"?',
+    'linkType_areYouSure'        => 'Are you sure you want to delete the link type ":name" (":inward" / ":outward")?',
     'permDeleteWarning'          => 'Deleting stuff from Firely is permanent and cannot be undone.',
     'mass_make_selection'        => 'You can still prevent items from being deleted by removing the checkbox.',
     'delete_all_permanently'     => 'Delete selected permanently',
     'update_all_journals'        => 'Update these transactions',
     'also_delete_transactions'   => 'The only transaction connected to this account will be deleted as well.|All :count transactions connected to this account will be deleted as well.',
+    'also_delete_connections'   => 'The only transaction linked with this link type will lose this connection.|All :count transactions linked with this link type will lose their connection.',
     'also_delete_rules'          => 'The only rule connected to this rule group will be deleted as well.|All :count rules connected to this rule group will be deleted as well.',
     'also_delete_piggyBanks'     => 'The only piggy bank connected to this account will be deleted as well.|All :count piggy bank connected to this account will be deleted as well.',
     'bill_keep_transactions'     => 'The only transaction connected to this bill will not be deleted.|All :count transactions connected to this bill will spared deletion.',
@@ -189,4 +192,7 @@ return [
     'payment_date'       => 'Payment date',
     'invoice_date'       => 'Invoice date',
     'internal_reference' => 'Internal reference',
+
+    'inward'  => 'Inward description',
+    'outward' => 'Outward description',
 ];
diff --git a/resources/lang/en_US/list.php b/resources/lang/en_US/list.php
index c44721b8d5..a5a19d981e 100644
--- a/resources/lang/en_US/list.php
+++ b/resources/lang/en_US/list.php
@@ -78,14 +78,17 @@ return [
     'source_account'        => 'Source account',
     'destination_account'   => 'Destination account',
 
-    'accounts_count'        => 'Number of accounts',
-    'journals_count'        => 'Number of transactions',
-    'attachments_count'     => 'Number of attachments',
-    'bills_count'           => 'Number of bills',
-    'categories_count'      => 'Number of categories',
-    'export_jobs_count'     => 'Number of export jobs',
-    'import_jobs_count'     => 'Number of import jobs',
-    'budget_count'          => 'Number of budgets',
-    'rule_and_groups_count' => 'Number of rules and rule groups',
-    'tags_count'            => 'Number of tags',
+    'accounts_count'         => 'Number of accounts',
+    'journals_count'         => 'Number of transactions',
+    'attachments_count'      => 'Number of attachments',
+    'bills_count'            => 'Number of bills',
+    'categories_count'       => 'Number of categories',
+    'export_jobs_count'      => 'Number of export jobs',
+    'import_jobs_count'      => 'Number of import jobs',
+    'budget_count'           => 'Number of budgets',
+    'rule_and_groups_count'  => 'Number of rules and rule groups',
+    'tags_count'             => 'Number of tags',
+    'inward'                 => 'Inward description',
+    'outward'                => 'Outward description',
+    'number_of_transactions' => 'Number of transactions',
 ];
diff --git a/resources/views/admin/link/create.twig b/resources/views/admin/link/create.twig
new file mode 100644
index 0000000000..cb69f859df
--- /dev/null
+++ b/resources/views/admin/link/create.twig
@@ -0,0 +1,44 @@
+{% extends "./layout/default" %}
+
+{% block breadcrumbs %}
+    {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName) }}
+{% endblock %}
+
+{% block content %}
+
+    <form method="POST" action="{{ route('admin.links.store') }}" accept-charset="UTF-8" class="form-horizontal">
+        <input name="_token" type="hidden" value="{{ csrf_token() }}">
+        <div class="row">
+            <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
+                <div class="box box-primary">
+                    <div class="box-header with-border">
+                        <h3 class="box-title">{{ 'mandatoryFields'|_ }}</h3>
+                    </div>
+                    <div class="box-body">
+                        {{ ExpandedForm.text('name', null, {helpText: trans('firefly.link_type_help_name')}) }}
+                        {{ ExpandedForm.text('inward', null, {helpText: trans('firefly.link_type_help_inward')}) }}
+                        {{ ExpandedForm.text('outward', null, {helpText: trans('firefly.link_type_help_outward')}) }}
+                    </div>
+                </div>
+            </div>
+            <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
+                <!-- panel for options -->
+                <div class="box">
+                    <div class="box-header with-border">
+                        <h3 class="box-title">{{ 'options'|_ }}</h3>
+                    </div>
+                    <div class="box-body">
+                        {{ ExpandedForm.optionsList('create','link_type') }}
+                    </div>
+                    <div class="box-footer">
+                        <button type="submit" class="btn pull-right btn-success">{{ 'store_new_link_type'|_ }}</button>
+                    </div>
+                </div>
+
+            </div>
+
+        </div>
+    </form>
+
+
+{% endblock %}
diff --git a/resources/views/admin/link/delete.twig b/resources/views/admin/link/delete.twig
new file mode 100644
index 0000000000..7b94903ed9
--- /dev/null
+++ b/resources/views/admin/link/delete.twig
@@ -0,0 +1,53 @@
+{% extends "./layout/default" %}
+
+{% block breadcrumbs %}
+    {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, linkType) }}
+{% endblock %}
+
+{% block content %}
+
+    <form method="POST" action="{{ route('admin.links.destroy',linkType.id) }}" accept-charset="UTF-8" class="form-horizontal" id="destroy">
+        <input name="_token" type="hidden" value="{{ csrf_token() }}">
+        <div class="row">
+            <div class="col-lg-6 col-lg-offset-3 col-md-12 col-sm-12">
+                <div class="box box-danger">
+                    <div class="box-header with-border">
+                        <h3 class="box-title">{{ trans('form.delete_link_type', {'name': linkType.name}) }}</h3>
+                    </div>
+                    <div class="box-body">
+                        <p class="text-danger">
+                            {{ trans('form.permDeleteWarning') }}
+                        </p>
+
+                        <p>
+                            {{ trans('form.linkType_areYouSure', {'name': linkType.name,'inward': linkType.inward,'outward': linkType.outward}) }}
+                        </p>
+
+                        {% if count > 0 %}
+                            <p>
+                                {{ Lang.choice('form.also_delete_connections', count, {count: count}) }}
+                            </p>
+                        {% endif %}
+                        {% if count > 0 %}
+                            <p class="text-success">
+                                {{ 'save_connections_by_moving'|_ }}
+                            </p>
+
+                            <p>
+                                {{ Form.select('move_link_type_before_delete', moveTo, null, {class: 'form-control'}) }}
+                            </p>
+                        {% else %}
+                            <input type="hidden" name="move_link_type_before_delete" value="0"/>
+                        {% endif %}
+
+                    </div>
+                    <div class="box-footer">
+                        <input type="submit" name="submit" value="{{ trans('form.deletePermanently') }}" class="btn pull-right btn-danger"/>
+                        <a href="{{ URL.previous() }}" class="btn-default btn">{{ trans('form.cancel') }}</a>
+                    </div>
+                </div>
+            </div>
+        </div>
+
+    </form>
+{% endblock %}
diff --git a/resources/views/admin/link/edit.twig b/resources/views/admin/link/edit.twig
new file mode 100644
index 0000000000..1bd8599f70
--- /dev/null
+++ b/resources/views/admin/link/edit.twig
@@ -0,0 +1,48 @@
+{% extends "./layout/default" %}
+
+{% block breadcrumbs %}
+    {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, linkType) }}
+{% endblock %}
+
+{% block content %}
+
+    {{ Form.model(linkType, {'class' : 'form-horizontal','id' : 'update','url' : route('admin.links.update', linkType.id) } ) }}
+        <input type="hidden" name="id" value="{{ linkType.id }}"/>
+        <input name="_token" type="hidden" value="{{ csrf_token() }}">
+        <div class="row">
+            <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
+                <div class="box box-primary">
+                    <div class="box-header with-border">
+                        <h3 class="box-title">{{ 'mandatoryFields'|_ }}</h3>
+                    </div>
+                    <div class="box-body">
+                        {{ ExpandedForm.text('name', null, {helpText: trans('firefly.link_type_help_name')}) }}
+                        {{ ExpandedForm.text('inward', null, {helpText: trans('firefly.link_type_help_inward')}) }}
+                        {{ ExpandedForm.text('outward', null, {helpText: trans('firefly.link_type_help_outward')}) }}
+                    </div>
+                </div>
+            </div>
+            <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
+
+                <!-- panel for options  -->
+                <div class="box">
+                    <div class="box-header with-border">
+                        <h3 class="box-title">{{ 'options'|_ }}</h3>
+                    </div>
+                    <div class="box-body">
+                        {{ ExpandedForm.optionsList('update','link_type') }}
+                    </div>
+                    <div class="box-footer">
+                        <button type="submit" class="btn pull-right btn-success">
+                            {{ ('update_link_type')|_ }}
+                        </button>
+                    </div>
+                </div>
+
+            </div>
+
+        </div>
+    </form>
+
+
+{% endblock %}
diff --git a/resources/views/admin/link/index.twig b/resources/views/admin/link/index.twig
index f5ac34ba4a..4aafa5470c 100644
--- a/resources/views/admin/link/index.twig
+++ b/resources/views/admin/link/index.twig
@@ -10,8 +10,47 @@
                 <div class="box-header with-border">
                     <h3 class="box-title">{{ 'journal_link_configuration'|_ }}</h3>
                 </div>
-                <div class="box-body">
-                    
+                <div class="box-body no-padding">
+                    <table class="table table-hover sortable">
+                        <thead>
+                        <tr>
+                            <th class="hidden-sm hidden-xs" data-defaultsort="disabled">&nbsp;</th>
+                            <th data-defaultsign="az">{{ trans('list.name') }}</th>
+                            <th class="hidden-sm hidden-xs" data-defaultsign="az">{{ trans('list.inward') }}</th>
+                            <th class="hidden-sm hidden-xs" data-defaultsign="az">{{ trans('list.outward') }}</th>
+                            <th data-defaultsign="_19">{{ trans('list.number_of_transactions') }}</th>
+                        </tr>
+                        </thead>
+                        <tbody>
+                        {% for linkType in linkTypes %}
+                            <tr>
+                                <td>
+                                    {% if linkType.editable %}
+                                        <div class="btn-group btn-group-xs">
+                                            <a class="btn btn-default btn-xs" href="{{ route('admin.links.edit',linkType.id) }}"><i class="fa fa-fw fa-pencil"></i></a>
+                                            <a class="btn btn-danger btn-xs" href="{{ route('admin.links.delete',linkType.id) }}"><i class="fa fa-fw fa-trash-o"></i></a>
+                                        </div>
+                                    {% endif %}
+                                </td>
+                                <td>
+                                    <strong>{{ linkType.name }}</strong>
+                                </td>
+                                <td>
+                                    {{ linkType.inward }}
+                                </td>
+                                <td>
+                                    {{ linkType.outward }}
+                                </td>
+                                <td data-value="{{ linkType.journalCount }}">
+                                    {{ linkType.journalCount }}
+                                </td>
+                            </tr>
+                        {% endfor %}
+                        </tbody>
+                    </table>
+                </div>
+                <div class="box-footer">
+                    <a href="{{ route('admin.links.create') }}" class="btn btn-success">{{ 'create_new_link_type'|_ }}</a>
                 </div>
             </div>
         </div>
diff --git a/resources/views/transactions/show.twig b/resources/views/transactions/show.twig
index 92c9108472..59ba96b99b 100644
--- a/resources/views/transactions/show.twig
+++ b/resources/views/transactions/show.twig
@@ -383,30 +383,37 @@
 
     {# link journal modal:#}
     <div class="modal fade" tabindex="-1" role="dialog" id="linkJournalModal">
-        <form action="#" method="post" class="form-horizontal">
+        <form action="{{ route('transactions.link.store', [journal.id]) }}" method="post" class="form-horizontal">
+            <input type="hidden" name="_token" value="{{ csrf_token() }}">
             <div class="modal-dialog modal-lg">
                 <div class="modal-content">
                     <div class="modal-header">
-                        <h4 class="modal-title">Link another transaction</h4>
+                        <h4 class="modal-title">{{ 'link_to_other_transaction'|_ }}</h4>
                     </div>
                     <div class="modal-body" id="helpBody">
-                        <p>Select a transaction to link this transaction to</p>
+                        <p>{{ 'select_transaction_to_link'|_ }}</p>
                         <div class="form-group">
-                            <label for="link_type" class="col-sm-2 control-label">This transaction</label>
+                            <label for="link_type" class="col-sm-2 control-label">{{ 'this_transaction'|_ }}</label>
                             <div class="col-sm-10">
-                                <select class="form-control" name="link_type"><option>a</option><option>a</option><option>a</option></select>
+                                <select id="link_type" class="form-control" name="link_type">
+                                    {% for linkType in linkTypes %}
+                                        <option label="{{ linkType.inward }}" value="{{ linkType.id }}_inward">{{ linkType.inward }}</option>
+                                        <option label="{{ linkType.outward }}" value="{{ linkType.id }}_inward">{{ linkType.outward }}</option>
+                                    {% endfor %}
+                                </select>
                             </div>
                         </div>
                         <div class="form-group">
-                            <label for="link_type" class="col-sm-2 control-label">Transaction</label>
+                            <label for="link_other" class="col-sm-2 control-label">{{ 'transaction'|_ }}</label>
                             <div class="col-sm-10">
-                                <input type="text" value="" class="form-control">
+                                <input type="text" name="link_other" autocomplete="off" id="link_other" value="" class="form-control">
+                                <input type="hidden" name="link_journal_id" value="0">
                             </div>
                         </div>
                         <div class="form-group">
-                            <label for="comments" class="col-sm-2 control-label">Comments</label>
+                            <label for="comments" class="col-sm-2 control-label">{{ 'comments'|_ }}</label>
                             <div class="col-sm-10">
-                                <textarea class="form-control"></textarea>
+                                <textarea id="comments" name="comments" class="form-control"></textarea>
                             </div>
                         </div>
 
@@ -414,7 +421,7 @@
                     </div>
                     <div class="modal-footer">
                         <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
-                        <button type="submit" class="btn btn-primary">{{ 'do something'|_ }}</button>
+                        <button type="submit" class="btn btn-primary">{{ 'submit'|_ }}</button>
                     </div>
                 </div>
             </div>
@@ -422,3 +429,10 @@
     </div>
 
 {% endblock %}
+{% block scripts %}
+    <script type="text/javascript">
+        var autoCompleteUri = "{{ route('json.journals-with-id',[journal.id]) }}";
+    </script>
+    <script type="text/javascript" src="js/lib/bootstrap3-typeahead.min.js"></script>
+    <script type="text/javascript" src="js/ff/transactions/show.js"></script>
+{% endblock %}
\ No newline at end of file
diff --git a/routes/web.php b/routes/web.php
index 9e380fb15b..6e25737e6b 100755
--- a/routes/web.php
+++ b/routes/web.php
@@ -443,6 +443,7 @@ Route::group(
     Route::get('box/bills-unpaid', ['uses' => 'JsonController@boxBillsUnpaid', 'as' => 'box.unpaid']);
     Route::get('box/bills-paid', ['uses' => 'JsonController@boxBillsPaid', 'as' => 'box.paid']);
     Route::get('transaction-journals/all', ['uses' => 'JsonController@allTransactionJournals', 'as' => 'all-transaction-journals']);
+    Route::get('transaction-journals/with-id/{tj}', ['uses' => 'Json\AutoCompleteController@journalsWithId', 'as' => 'journals-with-id']);
     Route::get('transaction-journals/{what}', ['uses' => 'JsonController@transactionJournals', 'as' => 'transaction-journals']);
     Route::get('transaction-types', ['uses' => 'JsonController@transactionTypes', 'as' => 'transaction-types']);
     Route::get('trigger', ['uses' => 'JsonController@trigger', 'as' => 'trigger']);
@@ -724,7 +725,7 @@ Route::group(
 );
 
 /**
- * Convert Controller
+ * Transaction Convert Controller
  */
 Route::group(
     ['middleware' => 'user-full-auth', 'namespace' => 'Transaction', 'prefix' => 'transactions/convert', 'as' => 'transactions.convert.'], function () {
@@ -733,6 +734,15 @@ Route::group(
 }
 );
 
+/**
+ * Transaction Link Controller
+ */
+Route::group(
+    ['middleware' => 'user-full-auth', 'namespace' => 'Transaction', 'prefix' => 'transactions/link', 'as' => 'transactions.link.'], function () {
+    Route::post('store/{tj}', ['uses' => 'LinkController@store', 'as' => 'store']);
+}
+);
+
 /**
  * Report Popup Controller
  */
@@ -760,6 +770,14 @@ Route::group(
 
     // journal links manager
     Route::get('links', ['uses' => 'LinkController@index', 'as' => 'links.index']);
+    Route::get('links/create', ['uses' => 'LinkController@create', 'as' => 'links.create']);
+    Route::get('links/edit/{linkType}', ['uses' => 'LinkController@edit', 'as' => 'links.edit']);
+    Route::get('links/delete/{linkType}', ['uses' => 'LinkController@delete', 'as' => 'links.delete']);
+
+
+    Route::post('links/store', ['uses' => 'LinkController@store', 'as' => 'links.store']);
+    Route::post('links/update/{linkType}', ['uses' => 'LinkController@update', 'as' => 'links.update']);
+    Route::post('links/destroy/{linkType}', ['uses' => 'LinkController@destroy', 'as' => 'links.destroy']);
 
     // FF configuration:
     Route::get('configuration', ['uses' => 'ConfigurationController@index', 'as' => 'configuration.index']);

From ff390fcb7c93df50ab897901b7f20d04803de5a6 Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Mon, 21 Aug 2017 07:14:41 +0200
Subject: [PATCH 079/668] Less complex links

---
 database/seeds/LinkTypeSeeder.php | 26 ++++++--------------------
 1 file changed, 6 insertions(+), 20 deletions(-)

diff --git a/database/seeds/LinkTypeSeeder.php b/database/seeds/LinkTypeSeeder.php
index 33dd2ff23d..179142ad87 100644
--- a/database/seeds/LinkTypeSeeder.php
+++ b/database/seeds/LinkTypeSeeder.php
@@ -33,36 +33,22 @@ class LinkTypeSeeder extends Seeder
 
         $link           = new LinkType;
         $link->name     = 'Refund';
-        $link->inward   = 'refunds';
-        $link->outward  = 'is refunded by';
-        $link->editable = false;
-        $link->save();
-
-        $link           = new LinkType;
-        $link->name     = 'PartialRefund';
-        $link->inward   = 'partially refunds';
-        $link->outward  = 'is partially refunded by';
+        $link->inward   = '(partially) refunds';
+        $link->outward  = 'is (partially) refunded by';
         $link->editable = false;
         $link->save();
 
         $link           = new LinkType;
         $link->name     = 'Paid';
-        $link->inward   = 'pays for';
-        $link->outward  = 'is paid for by';
+        $link->inward   = '(partially) pays for';
+        $link->outward  = 'is (partially) paid for by';
         $link->editable = false;
         $link->save();
 
         $link           = new LinkType;
         $link->name     = 'Reimbursement';
-        $link->inward   = 'reimburses';
-        $link->outward  = 'is reimbursed by';
-        $link->editable = false;
-        $link->save();
-
-        $link           = new LinkType;
-        $link->name     = 'PartialReimbursement';
-        $link->inward   = 'partially reimburses';
-        $link->outward  = 'is partially reimbursed by';
+        $link->inward   = '(partially) reimburses';
+        $link->outward  = 'is (partially) reimbursed by';
         $link->editable = false;
         $link->save();
 

From c962ec34c84f350cdbf2f0fedeeb646e65c1be34 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Mon, 21 Aug 2017 07:20:16 +0200
Subject: [PATCH 080/668] New translations list.php (Spanish)

---
 resources/lang/es_ES/list.php | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/resources/lang/es_ES/list.php b/resources/lang/es_ES/list.php
index a4c8c55d78..b26fb4f2ad 100644
--- a/resources/lang/es_ES/list.php
+++ b/resources/lang/es_ES/list.php
@@ -78,14 +78,17 @@ return [
     'source_account'        => 'Cuenta origen',
     'destination_account'   => 'Cuenta destino',
 
-    'accounts_count'        => 'Número de cuentas',
-    'journals_count'        => 'Número de transacciones',
-    'attachments_count'     => 'Núm. de datos adjuntos',
-    'bills_count'           => 'Número de facturas',
-    'categories_count'      => 'Número de categorías',
-    'export_jobs_count'     => 'Número de operaciones de exportación',
-    'import_jobs_count'     => 'Número de operaciones de importación',
-    'budget_count'          => 'Número de presupuestos',
-    'rule_and_groups_count' => 'Número de reglas y grupos de reglas',
-    'tags_count'            => 'Número de etiquetas',
+    'accounts_count'         => 'Número de cuentas',
+    'journals_count'         => 'Número de transacciones',
+    'attachments_count'      => 'Núm. de datos adjuntos',
+    'bills_count'            => 'Número de facturas',
+    'categories_count'       => 'Número de categorías',
+    'export_jobs_count'      => 'Número de operaciones de exportación',
+    'import_jobs_count'      => 'Número de operaciones de importación',
+    'budget_count'           => 'Número de presupuestos',
+    'rule_and_groups_count'  => 'Número de reglas y grupos de reglas',
+    'tags_count'             => 'Número de etiquetas',
+    'inward'                 => 'Inward description',
+    'outward'                => 'Outward description',
+    'number_of_transactions' => 'Number of transactions',
 ];
\ No newline at end of file

From fe2beaf96aaddcb62cb13951383b344c48029180 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Mon, 21 Aug 2017 07:20:17 +0200
Subject: [PATCH 081/668] New translations list.php (Slovenian)

---
 resources/lang/sl_SI/list.php | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/resources/lang/sl_SI/list.php b/resources/lang/sl_SI/list.php
index 3a7f3959b3..e2cb94be16 100644
--- a/resources/lang/sl_SI/list.php
+++ b/resources/lang/sl_SI/list.php
@@ -78,14 +78,17 @@ return [
     'source_account'        => 'Izvorni račun',
     'destination_account'   => 'Ciljni račun',
 
-    'accounts_count'        => 'Število računov',
-    'journals_count'        => 'Število transakcij',
-    'attachments_count'     => 'Število prilog',
-    'bills_count'           => 'Število trajnikov',
-    'categories_count'      => 'Število kategorij',
-    'export_jobs_count'     => 'Število izvozov',
-    'import_jobs_count'     => 'Število uvozov',
-    'budget_count'          => 'Število budžetov',
-    'rule_and_groups_count' => 'Število pravil in skupin pravil',
-    'tags_count'            => 'Število značk',
+    'accounts_count'         => 'Število računov',
+    'journals_count'         => 'Število transakcij',
+    'attachments_count'      => 'Število prilog',
+    'bills_count'            => 'Število trajnikov',
+    'categories_count'       => 'Število kategorij',
+    'export_jobs_count'      => 'Število izvozov',
+    'import_jobs_count'      => 'Število uvozov',
+    'budget_count'           => 'Število budžetov',
+    'rule_and_groups_count'  => 'Število pravil in skupin pravil',
+    'tags_count'             => 'Število značk',
+    'inward'                 => 'Inward description',
+    'outward'                => 'Outward description',
+    'number_of_transactions' => 'Number of transactions',
 ];
\ No newline at end of file

From 381ca70517492392692bec5d79e1f6edb9457a01 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Mon, 21 Aug 2017 07:20:18 +0200
Subject: [PATCH 082/668] New translations list.php (Polish)

---
 resources/lang/pl_PL/list.php | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/resources/lang/pl_PL/list.php b/resources/lang/pl_PL/list.php
index c8b2e9d464..6a2de20588 100644
--- a/resources/lang/pl_PL/list.php
+++ b/resources/lang/pl_PL/list.php
@@ -78,14 +78,17 @@ return [
     'source_account'        => 'Konto źródłowe',
     'destination_account'   => 'Konto docelowe',
 
-    'accounts_count'        => 'Liczba kont',
-    'journals_count'        => 'Liczba transakcji',
-    'attachments_count'     => 'Liczba załączników',
-    'bills_count'           => 'Liczba rachunków',
-    'categories_count'      => 'Liczba kategorii',
-    'export_jobs_count'     => 'Liczba zadań eksportu',
-    'import_jobs_count'     => 'Liczba zadań importu',
-    'budget_count'          => 'Liczba budżetów',
-    'rule_and_groups_count' => 'Liczba reguł i grup reguł',
-    'tags_count'            => 'Liczba tagów',
+    'accounts_count'         => 'Liczba kont',
+    'journals_count'         => 'Liczba transakcji',
+    'attachments_count'      => 'Liczba załączników',
+    'bills_count'            => 'Liczba rachunków',
+    'categories_count'       => 'Liczba kategorii',
+    'export_jobs_count'      => 'Liczba zadań eksportu',
+    'import_jobs_count'      => 'Liczba zadań importu',
+    'budget_count'           => 'Liczba budżetów',
+    'rule_and_groups_count'  => 'Liczba reguł i grup reguł',
+    'tags_count'             => 'Liczba tagów',
+    'inward'                 => 'Inward description',
+    'outward'                => 'Outward description',
+    'number_of_transactions' => 'Number of transactions',
 ];
\ No newline at end of file

From 27988374507d1b3500206db4d551bb0bb1b5ee7c Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Mon, 21 Aug 2017 07:20:19 +0200
Subject: [PATCH 083/668] New translations list.php (Portuguese, Brazilian)

---
 resources/lang/pt_BR/list.php | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/resources/lang/pt_BR/list.php b/resources/lang/pt_BR/list.php
index 6e92a81437..cf8d04a2f8 100644
--- a/resources/lang/pt_BR/list.php
+++ b/resources/lang/pt_BR/list.php
@@ -78,14 +78,17 @@ return [
     'source_account'        => 'Conta de origem',
     'destination_account'   => 'Conta de destino',
 
-    'accounts_count'        => 'Número de Contas',
-    'journals_count'        => 'Number of transactions',
-    'attachments_count'     => 'Número de anexos',
-    'bills_count'           => 'Número de contas',
-    'categories_count'      => 'Número de categorias',
-    'export_jobs_count'     => 'Número de jobs de exportação',
-    'import_jobs_count'     => 'Número de jobs de importação',
-    'budget_count'          => 'Número de orçamentos',
-    'rule_and_groups_count' => 'Número de regras e grupos de regras',
-    'tags_count'            => 'Número de tags',
+    'accounts_count'         => 'Número de Contas',
+    'journals_count'         => 'Number of transactions',
+    'attachments_count'      => 'Número de anexos',
+    'bills_count'            => 'Número de contas',
+    'categories_count'       => 'Número de categorias',
+    'export_jobs_count'      => 'Número de jobs de exportação',
+    'import_jobs_count'      => 'Número de jobs de importação',
+    'budget_count'           => 'Número de orçamentos',
+    'rule_and_groups_count'  => 'Número de regras e grupos de regras',
+    'tags_count'             => 'Número de tags',
+    'inward'                 => 'Inward description',
+    'outward'                => 'Outward description',
+    'number_of_transactions' => 'Number of transactions',
 ];
\ No newline at end of file

From 7f4a80f17ff653b010b6a5994490356d04e3daaa Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Mon, 21 Aug 2017 07:20:25 +0200
Subject: [PATCH 084/668] New translations list.php (Russian)

---
 resources/lang/ru_RU/list.php | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/resources/lang/ru_RU/list.php b/resources/lang/ru_RU/list.php
index 268929684b..95fe61c6bb 100644
--- a/resources/lang/ru_RU/list.php
+++ b/resources/lang/ru_RU/list.php
@@ -78,14 +78,17 @@ return [
     'source_account'        => 'Source account',
     'destination_account'   => 'Destination account',
 
-    'accounts_count'        => 'Всего счетов',
-    'journals_count'        => 'Всего транзакций',
-    'attachments_count'     => 'Всего вложений',
-    'bills_count'           => 'Всего счетов к оплате',
-    'categories_count'      => 'Всего категорий',
-    'export_jobs_count'     => 'Задачи по экспорту',
-    'import_jobs_count'     => 'Задачи по импорту',
-    'budget_count'          => 'Всего категорий бюджета',
-    'rule_and_groups_count' => 'Всего правил и групп правил',
-    'tags_count'            => 'Всего меток',
+    'accounts_count'         => 'Всего счетов',
+    'journals_count'         => 'Всего транзакций',
+    'attachments_count'      => 'Всего вложений',
+    'bills_count'            => 'Всего счетов к оплате',
+    'categories_count'       => 'Всего категорий',
+    'export_jobs_count'      => 'Задачи по экспорту',
+    'import_jobs_count'      => 'Задачи по импорту',
+    'budget_count'           => 'Всего категорий бюджета',
+    'rule_and_groups_count'  => 'Всего правил и групп правил',
+    'tags_count'             => 'Всего меток',
+    'inward'                 => 'Inward description',
+    'outward'                => 'Outward description',
+    'number_of_transactions' => 'Number of transactions',
 ];
\ No newline at end of file

From 5b9178b18d5d569d91238f06d5cef88e32fb72ff Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Mon, 21 Aug 2017 07:20:29 +0200
Subject: [PATCH 085/668] New translations firefly.php (Russian)

---
 resources/lang/ru_RU/firefly.php | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/resources/lang/ru_RU/firefly.php b/resources/lang/ru_RU/firefly.php
index c403ea6e33..90e139af7d 100644
--- a/resources/lang/ru_RU/firefly.php
+++ b/resources/lang/ru_RU/firefly.php
@@ -937,6 +937,26 @@ return [
     'no_block_code'                         => 'No reason for block or user not blocked',
     // links
     'journal_link_configuration'            => 'Transaction links configuration',
+    'create_new_link_type'                  => 'Create new link type',
+    'store_new_link_type'                   => 'Store new link type',
+    'update_link_type'                      => 'Update link type',
+    'edit_link_type'                        => 'Edit link type ":name"',
+    'updated_link_type'                     => 'Updated link type ":name"',
+    'delete_link_type'                      => 'Delete link type ":name"',
+    'deleted_link_type'                     => 'Deleted link type ":name"',
+    'stored_new_link_type'                  => 'Store new link type ":name"',
+    'cannot_edit_link_type'                 => 'Cannot edit link type ":name"',
+    'link_type_help_name'                   => 'Ie. "Duplicates"',
+    'link_type_help_inward'                 => 'Ie. "duplicates"',
+    'link_type_help_outward'                => 'Ie. "is duplicated by"',
+    'save_connections_by_moving'            => 'Save the link between these transaction(s) by moving them to another link type:',
+    'do_not_save_connection'                => '(do not save connection)',
+    'link_transaction'                      => 'Link transaction',
+    'link_to_other_transaction'             => 'Link this transaction to another transaction',
+    'select_transaction_to_link'            => 'Select a transaction to link this transaction to',
+    'this_transaction'                      => 'This transaction',
+    'transaction'                           => 'Transaction',
+    'comments'                              => 'Comments',
 
 
     // split a transaction:

From 9c392461e822c4570114223494a85d1be75b8687 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Mon, 21 Aug 2017 07:20:30 +0200
Subject: [PATCH 086/668] New translations form.php (Russian)

---
 resources/lang/ru_RU/form.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/resources/lang/ru_RU/form.php b/resources/lang/ru_RU/form.php
index ef3414b805..1f3892e7c8 100644
--- a/resources/lang/ru_RU/form.php
+++ b/resources/lang/ru_RU/form.php
@@ -135,6 +135,7 @@ return [
     'delete_attachment'          => 'Delete attachment ":name"',
     'delete_rule'                => 'Delete rule ":title"',
     'delete_rule_group'          => 'Delete rule group ":title"',
+    'delete_link_type'           => 'Delete link type ":name"',
     'attachment_areYouSure'      => 'Are you sure you want to delete the attachment named ":name"?',
     'account_areYouSure'         => 'Are you sure you want to delete the account named ":name"?',
     'bill_areYouSure'            => 'Are you sure you want to delete the bill named ":name"?',
@@ -147,11 +148,13 @@ return [
     'journal_areYouSure'         => 'Are you sure you want to delete the transaction described ":description"?',
     'mass_journal_are_you_sure'  => 'Are you sure you want to delete these transactions?',
     'tag_areYouSure'             => 'Are you sure you want to delete the tag ":tag"?',
+    'linkType_areYouSure'        => 'Are you sure you want to delete the link type ":name" (":inward" / ":outward")?',
     'permDeleteWarning'          => 'Deleting stuff from Firely is permanent and cannot be undone.',
     'mass_make_selection'        => 'You can still prevent items from being deleted by removing the checkbox.',
     'delete_all_permanently'     => 'Delete selected permanently',
     'update_all_journals'        => 'Update these transactions',
     'also_delete_transactions'   => 'The only transaction connected to this account will be deleted as well.|All :count transactions connected to this account will be deleted as well.',
+    'also_delete_connections'   => 'The only transaction linked with this link type will lose this connection.|All :count transactions linked with this link type will lose their connection.',
     'also_delete_rules'          => 'The only rule connected to this rule group will be deleted as well.|All :count rules connected to this rule group will be deleted as well.',
     'also_delete_piggyBanks'     => 'The only piggy bank connected to this account will be deleted as well.|All :count piggy bank connected to this account will be deleted as well.',
     'bill_keep_transactions'     => 'The only transaction connected to this bill will not be deleted.|All :count transactions connected to this bill will spared deletion.',
@@ -189,4 +192,7 @@ return [
     'payment_date'       => 'Payment date',
     'invoice_date'       => 'Invoice date',
     'internal_reference' => 'Internal reference',
+
+    'inward'  => 'Inward description',
+    'outward' => 'Outward description',
 ];
\ No newline at end of file

From 21dbf0f14b4ff8fda990fff559e499e2436c6bf6 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Mon, 21 Aug 2017 07:20:32 +0200
Subject: [PATCH 087/668] New translations list.php (German)

---
 resources/lang/de_DE/list.php | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/resources/lang/de_DE/list.php b/resources/lang/de_DE/list.php
index b6181c5b8a..d18f01a6d5 100644
--- a/resources/lang/de_DE/list.php
+++ b/resources/lang/de_DE/list.php
@@ -78,14 +78,17 @@ return [
     'source_account'        => 'Quellkonto',
     'destination_account'   => 'Zielkonto',
 
-    'accounts_count'        => 'Anzahl Konten',
-    'journals_count'        => 'Anzahl der Zahlungsvorgänge',
-    'attachments_count'     => 'Anzahl Anhänge',
-    'bills_count'           => 'Anzahl Rechnungen',
-    'categories_count'      => 'Anzahl Kategorien',
-    'export_jobs_count'     => 'Anzahl exportierter Jobs',
-    'import_jobs_count'     => 'Anzahl importierter Jobs',
-    'budget_count'          => 'Anzahl Budgets',
-    'rule_and_groups_count' => 'Anzahl Regeln und Regelgruppen',
-    'tags_count'            => 'Anzahl Tags',
+    'accounts_count'         => 'Anzahl Konten',
+    'journals_count'         => 'Anzahl der Zahlungsvorgänge',
+    'attachments_count'      => 'Anzahl Anhänge',
+    'bills_count'            => 'Anzahl Rechnungen',
+    'categories_count'       => 'Anzahl Kategorien',
+    'export_jobs_count'      => 'Anzahl exportierter Jobs',
+    'import_jobs_count'      => 'Anzahl importierter Jobs',
+    'budget_count'           => 'Anzahl Budgets',
+    'rule_and_groups_count'  => 'Anzahl Regeln und Regelgruppen',
+    'tags_count'             => 'Anzahl Tags',
+    'inward'                 => 'Inward description',
+    'outward'                => 'Outward description',
+    'number_of_transactions' => 'Number of transactions',
 ];
\ No newline at end of file

From 863f812dbbf923d477ae4ec573fa92f1ae6f2559 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Mon, 21 Aug 2017 07:20:33 +0200
Subject: [PATCH 088/668] New translations list.php (French)

---
 resources/lang/fr_FR/list.php | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/resources/lang/fr_FR/list.php b/resources/lang/fr_FR/list.php
index 2acf2c75d3..99c046801a 100644
--- a/resources/lang/fr_FR/list.php
+++ b/resources/lang/fr_FR/list.php
@@ -78,14 +78,17 @@ return [
     'source_account'        => 'Compte d\'origine',
     'destination_account'   => 'Compte destinataire',
 
-    'accounts_count'        => 'Nombre de comptes',
-    'journals_count'        => 'Nombre d\'opérations',
-    'attachments_count'     => 'Nombre de pièces jointes',
-    'bills_count'           => 'Nombre de factures',
-    'categories_count'      => 'Nombre de catégories',
-    'export_jobs_count'     => 'Nombre de travaux exportés',
-    'import_jobs_count'     => 'Nombre de travaux importés',
-    'budget_count'          => 'Nombre de budgets',
-    'rule_and_groups_count' => 'Nombre de règles et de groupes de règles',
-    'tags_count'            => 'Nombre d’étiquettes',
+    'accounts_count'         => 'Nombre de comptes',
+    'journals_count'         => 'Nombre d\'opérations',
+    'attachments_count'      => 'Nombre de pièces jointes',
+    'bills_count'            => 'Nombre de factures',
+    'categories_count'       => 'Nombre de catégories',
+    'export_jobs_count'      => 'Nombre de travaux exportés',
+    'import_jobs_count'      => 'Nombre de travaux importés',
+    'budget_count'           => 'Nombre de budgets',
+    'rule_and_groups_count'  => 'Nombre de règles et de groupes de règles',
+    'tags_count'             => 'Nombre d’étiquettes',
+    'inward'                 => 'Inward description',
+    'outward'                => 'Outward description',
+    'number_of_transactions' => 'Number of transactions',
 ];
\ No newline at end of file

From e628ec6ff04db2608e09fb51d05a82dae3434b24 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Mon, 21 Aug 2017 07:20:41 +0200
Subject: [PATCH 089/668] New translations form.php (Spanish)

---
 resources/lang/es_ES/form.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/resources/lang/es_ES/form.php b/resources/lang/es_ES/form.php
index 47b109fdc0..46417389c3 100644
--- a/resources/lang/es_ES/form.php
+++ b/resources/lang/es_ES/form.php
@@ -135,6 +135,7 @@ return [
     'delete_attachment'          => 'Delete attachment ":name"',
     'delete_rule'                => 'Delete rule ":title"',
     'delete_rule_group'          => 'Delete rule group ":title"',
+    'delete_link_type'           => 'Delete link type ":name"',
     'attachment_areYouSure'      => 'Are you sure you want to delete the attachment named ":name"?',
     'account_areYouSure'         => 'Are you sure you want to delete the account named ":name"?',
     'bill_areYouSure'            => 'Are you sure you want to delete the bill named ":name"?',
@@ -147,11 +148,13 @@ return [
     'journal_areYouSure'         => 'Are you sure you want to delete the transaction described ":description"?',
     'mass_journal_are_you_sure'  => 'Are you sure you want to delete these transactions?',
     'tag_areYouSure'             => 'Are you sure you want to delete the tag ":tag"?',
+    'linkType_areYouSure'        => 'Are you sure you want to delete the link type ":name" (":inward" / ":outward")?',
     'permDeleteWarning'          => 'Deleting stuff from Firely is permanent and cannot be undone.',
     'mass_make_selection'        => 'You can still prevent items from being deleted by removing the checkbox.',
     'delete_all_permanently'     => 'Delete selected permanently',
     'update_all_journals'        => 'Update these transactions',
     'also_delete_transactions'   => 'The only transaction connected to this account will be deleted as well.|All :count transactions connected to this account will be deleted as well.',
+    'also_delete_connections'   => 'The only transaction linked with this link type will lose this connection.|All :count transactions linked with this link type will lose their connection.',
     'also_delete_rules'          => 'The only rule connected to this rule group will be deleted as well.|All :count rules connected to this rule group will be deleted as well.',
     'also_delete_piggyBanks'     => 'The only piggy bank connected to this account will be deleted as well.|All :count piggy bank connected to this account will be deleted as well.',
     'bill_keep_transactions'     => 'The only transaction connected to this bill will not be deleted.|All :count transactions connected to this bill will spared deletion.',
@@ -189,4 +192,7 @@ return [
     'payment_date'       => 'Payment date',
     'invoice_date'       => 'Invoice date',
     'internal_reference' => 'Internal reference',
+
+    'inward'  => 'Inward description',
+    'outward' => 'Outward description',
 ];
\ No newline at end of file

From 22b6916ac2b0334ccfd8e2313c22f4c1e48d013a Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Mon, 21 Aug 2017 07:20:42 +0200
Subject: [PATCH 090/668] New translations form.php (Portuguese, Brazilian)

---
 resources/lang/pt_BR/form.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/resources/lang/pt_BR/form.php b/resources/lang/pt_BR/form.php
index 3e08364ffd..2aa4b9f77a 100644
--- a/resources/lang/pt_BR/form.php
+++ b/resources/lang/pt_BR/form.php
@@ -135,6 +135,7 @@ return [
     'delete_attachment'          => 'Apagar anexo ":name"',
     'delete_rule'                => 'Excluir regra ":title"',
     'delete_rule_group'          => 'Exclua o grupo de regras ":title"',
+    'delete_link_type'           => 'Delete link type ":name"',
     'attachment_areYouSure'      => 'Tem certeza que deseja excluir o anexo denominado ":name"?',
     'account_areYouSure'         => 'Tem certeza que deseja excluir a conta denominada ":name"?',
     'bill_areYouSure'            => 'Você tem certeza que quer apagar a fatura ":name"?',
@@ -147,11 +148,13 @@ return [
     'journal_areYouSure'         => 'Tem certeza que deseja excluir a transação descrita ":description"?',
     'mass_journal_are_you_sure'  => 'Tem a certeza que pretende apagar estas transações?',
     'tag_areYouSure'             => 'Você tem certeza que quer apagar a tag ":tag"?',
+    'linkType_areYouSure'        => 'Are you sure you want to delete the link type ":name" (":inward" / ":outward")?',
     'permDeleteWarning'          => 'Exclusão de dados do Firely são permanentes e não podem ser desfeitos.',
     'mass_make_selection'        => 'Você ainda pode evitar que itens sejam excluídos, removendo a caixa de seleção.',
     'delete_all_permanently'     => 'Exclua os selecionados permanentemente',
     'update_all_journals'        => 'Atualizar essas transações',
     'also_delete_transactions'   => 'A única transação ligada a essa conta será excluída também.|Todas as :count transações ligadas a esta conta serão excluídas também.',
+    'also_delete_connections'   => 'The only transaction linked with this link type will lose this connection.|All :count transactions linked with this link type will lose their connection.',
     'also_delete_rules'          => 'A única regra que ligado a este grupo de regras será excluída também.|Todos as :count regras ligadas a este grupo de regras serão excluídas também.',
     'also_delete_piggyBanks'     => 'O único cofrinho conectado a essa conta será excluído também.|Todos os :count cofrinhos conectados a esta conta serão excluídos também.',
     'bill_keep_transactions'     => 'A única transação a esta conta não será excluída.|Todos as :count transações conectadas a esta fatura não serão excluídos.',
@@ -189,4 +192,7 @@ return [
     'payment_date'       => 'Data de pagamento',
     'invoice_date'       => 'Data da Fatura',
     'internal_reference' => 'Referência interna',
+
+    'inward'  => 'Inward description',
+    'outward' => 'Outward description',
 ];
\ No newline at end of file

From 5e692e10bcc8cad63ea1b92901439a62926759fb Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Mon, 21 Aug 2017 07:20:43 +0200
Subject: [PATCH 091/668] New translations form.php (Slovenian)

---
 resources/lang/sl_SI/form.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/resources/lang/sl_SI/form.php b/resources/lang/sl_SI/form.php
index f85aa1cde4..3df2e86e35 100644
--- a/resources/lang/sl_SI/form.php
+++ b/resources/lang/sl_SI/form.php
@@ -135,6 +135,7 @@ return [
     'delete_attachment'          => 'Delete attachment ":name"',
     'delete_rule'                => 'Delete rule ":title"',
     'delete_rule_group'          => 'Delete rule group ":title"',
+    'delete_link_type'           => 'Delete link type ":name"',
     'attachment_areYouSure'      => 'Are you sure you want to delete the attachment named ":name"?',
     'account_areYouSure'         => 'Are you sure you want to delete the account named ":name"?',
     'bill_areYouSure'            => 'Are you sure you want to delete the bill named ":name"?',
@@ -147,11 +148,13 @@ return [
     'journal_areYouSure'         => 'Are you sure you want to delete the transaction described ":description"?',
     'mass_journal_are_you_sure'  => 'Are you sure you want to delete these transactions?',
     'tag_areYouSure'             => 'Are you sure you want to delete the tag ":tag"?',
+    'linkType_areYouSure'        => 'Are you sure you want to delete the link type ":name" (":inward" / ":outward")?',
     'permDeleteWarning'          => 'Deleting stuff from Firely is permanent and cannot be undone.',
     'mass_make_selection'        => 'You can still prevent items from being deleted by removing the checkbox.',
     'delete_all_permanently'     => 'Delete selected permanently',
     'update_all_journals'        => 'Update these transactions',
     'also_delete_transactions'   => 'The only transaction connected to this account will be deleted as well.|All :count transactions connected to this account will be deleted as well.',
+    'also_delete_connections'   => 'The only transaction linked with this link type will lose this connection.|All :count transactions linked with this link type will lose their connection.',
     'also_delete_rules'          => 'The only rule connected to this rule group will be deleted as well.|All :count rules connected to this rule group will be deleted as well.',
     'also_delete_piggyBanks'     => 'The only piggy bank connected to this account will be deleted as well.|All :count piggy bank connected to this account will be deleted as well.',
     'bill_keep_transactions'     => 'The only transaction connected to this bill will not be deleted.|All :count transactions connected to this bill will spared deletion.',
@@ -189,4 +192,7 @@ return [
     'payment_date'       => 'Payment date',
     'invoice_date'       => 'Invoice date',
     'internal_reference' => 'Internal reference',
+
+    'inward'  => 'Inward description',
+    'outward' => 'Outward description',
 ];
\ No newline at end of file

From 9a1219c70cea656b7b351eb88f064c6e5ee9b3e1 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Mon, 21 Aug 2017 07:20:45 +0200
Subject: [PATCH 092/668] New translations list.php (Chinese Traditional)

---
 resources/lang/zh_TW/list.php | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/resources/lang/zh_TW/list.php b/resources/lang/zh_TW/list.php
index e9e40f95be..60c67ed53a 100644
--- a/resources/lang/zh_TW/list.php
+++ b/resources/lang/zh_TW/list.php
@@ -78,14 +78,17 @@ return [
     'source_account'        => '來源帳戶',
     'destination_account'   => 'Destination account',
 
-    'accounts_count'        => 'Number of accounts',
-    'journals_count'        => 'Number of transactions',
-    'attachments_count'     => 'Number of attachments',
-    'bills_count'           => 'Number of bills',
-    'categories_count'      => 'Number of categories',
-    'export_jobs_count'     => 'Number of export jobs',
-    'import_jobs_count'     => 'Number of import jobs',
-    'budget_count'          => 'Number of budgets',
-    'rule_and_groups_count' => 'Number of rules and rule groups',
-    'tags_count'            => 'Number of tags',
+    'accounts_count'         => 'Number of accounts',
+    'journals_count'         => 'Number of transactions',
+    'attachments_count'      => 'Number of attachments',
+    'bills_count'            => 'Number of bills',
+    'categories_count'       => 'Number of categories',
+    'export_jobs_count'      => 'Number of export jobs',
+    'import_jobs_count'      => 'Number of import jobs',
+    'budget_count'           => 'Number of budgets',
+    'rule_and_groups_count'  => 'Number of rules and rule groups',
+    'tags_count'             => 'Number of tags',
+    'inward'                 => 'Inward description',
+    'outward'                => 'Outward description',
+    'number_of_transactions' => 'Number of transactions',
 ];
\ No newline at end of file

From 235c7a3bb8c797794446e4d39b335a919144c603 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Mon, 21 Aug 2017 07:20:46 +0200
Subject: [PATCH 093/668] New translations list.php (Dutch)

---
 resources/lang/nl_NL/list.php | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/resources/lang/nl_NL/list.php b/resources/lang/nl_NL/list.php
index 3efab736fa..0f6fef3101 100644
--- a/resources/lang/nl_NL/list.php
+++ b/resources/lang/nl_NL/list.php
@@ -78,14 +78,17 @@ return [
     'source_account'        => 'Bronrekening',
     'destination_account'   => 'Doelrekening',
 
-    'accounts_count'        => 'Aantal rekeningen',
-    'journals_count'        => 'Aantal transacties',
-    'attachments_count'     => 'Aantal bijlagen',
-    'bills_count'           => 'Aantal contracten',
-    'categories_count'      => 'Aantal categorieën',
-    'export_jobs_count'     => 'Aantal export-jobs',
-    'import_jobs_count'     => 'Aantal import-jobs',
-    'budget_count'          => 'Aantal budgetten',
-    'rule_and_groups_count' => 'Aantal regels en regelgroepen',
-    'tags_count'            => 'Aantal tags',
+    'accounts_count'         => 'Aantal rekeningen',
+    'journals_count'         => 'Aantal transacties',
+    'attachments_count'      => 'Aantal bijlagen',
+    'bills_count'            => 'Aantal contracten',
+    'categories_count'       => 'Aantal categorieën',
+    'export_jobs_count'      => 'Aantal export-jobs',
+    'import_jobs_count'      => 'Aantal import-jobs',
+    'budget_count'           => 'Aantal budgetten',
+    'rule_and_groups_count'  => 'Aantal regels en regelgroepen',
+    'tags_count'             => 'Aantal tags',
+    'inward'                 => 'Inward description',
+    'outward'                => 'Outward description',
+    'number_of_transactions' => 'Number of transactions',
 ];
\ No newline at end of file

From 62a3bbbcf525017ea62b78eb71d9e9bb30bf1b39 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Mon, 21 Aug 2017 07:20:48 +0200
Subject: [PATCH 094/668] New translations form.php (Polish)

---
 resources/lang/pl_PL/form.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/resources/lang/pl_PL/form.php b/resources/lang/pl_PL/form.php
index fe143cc460..62c422bc78 100644
--- a/resources/lang/pl_PL/form.php
+++ b/resources/lang/pl_PL/form.php
@@ -135,6 +135,7 @@ return [
     'delete_attachment'          => 'Usuń załącznik ":name"',
     'delete_rule'                => 'Usuń regułę ":title"',
     'delete_rule_group'          => 'Usuń grupę reguł ":title"',
+    'delete_link_type'           => 'Delete link type ":name"',
     'attachment_areYouSure'      => 'Czy na pewno chcesz usunąć załącznik o nazwie ":name"?',
     'account_areYouSure'         => 'Czy na pewno chcesz usunąć konto o nazwie ":name"?',
     'bill_areYouSure'            => 'Czy na pewno chcesz usunąć rachunek o nazwie ":name"?',
@@ -147,11 +148,13 @@ return [
     'journal_areYouSure'         => 'Czy na pewno chcesz usunąć transakcję opisaną ":description"?',
     'mass_journal_are_you_sure'  => 'Czy na pewno chcesz usunąć te transakcje?',
     'tag_areYouSure'             => 'Czy na pewno chcesz usunąć tag ":tag"?',
+    'linkType_areYouSure'        => 'Are you sure you want to delete the link type ":name" (":inward" / ":outward")?',
     'permDeleteWarning'          => 'Usuwanie rzeczy z Firefly jest trwałe i nie można tego cofnąć.',
     'mass_make_selection'        => 'You can still prevent items from being deleted by removing the checkbox.',
     'delete_all_permanently'     => 'Trwale usuń zaznaczone',
     'update_all_journals'        => 'Zmodyfikuj te transakcje',
     'also_delete_transactions'   => 'The only transaction connected to this account will be deleted as well.|All :count transactions connected to this account will be deleted as well.',
+    'also_delete_connections'   => 'The only transaction linked with this link type will lose this connection.|All :count transactions linked with this link type will lose their connection.',
     'also_delete_rules'          => 'The only rule connected to this rule group will be deleted as well.|All :count rules connected to this rule group will be deleted as well.',
     'also_delete_piggyBanks'     => 'The only piggy bank connected to this account will be deleted as well.|All :count piggy bank connected to this account will be deleted as well.',
     'bill_keep_transactions'     => 'The only transaction connected to this bill will not be deleted.|All :count transactions connected to this bill will spared deletion.',
@@ -189,4 +192,7 @@ return [
     'payment_date'       => 'Data płatności',
     'invoice_date'       => 'Data faktury',
     'internal_reference' => 'Internal reference',
+
+    'inward'  => 'Inward description',
+    'outward' => 'Outward description',
 ];
\ No newline at end of file

From ba4616371b633d13fb735a57d99c98f65b06518a Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Mon, 21 Aug 2017 07:20:50 +0200
Subject: [PATCH 095/668] New translations form.php (German)

---
 resources/lang/de_DE/form.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/resources/lang/de_DE/form.php b/resources/lang/de_DE/form.php
index dcab7b67ef..921cadc2d0 100644
--- a/resources/lang/de_DE/form.php
+++ b/resources/lang/de_DE/form.php
@@ -135,6 +135,7 @@ return [
     'delete_attachment'          => 'Lösche Anhang ":name"',
     'delete_rule'                => 'Lösche Regel ":title"',
     'delete_rule_group'          => 'Lösche Regelgruppe ":title"',
+    'delete_link_type'           => 'Delete link type ":name"',
     'attachment_areYouSure'      => 'Sind Sie sicher, dass Sie den Anhang ":name" löschen möchten?',
     'account_areYouSure'         => 'Sind Sie sicher, dass Sie das Konto ":name" löschen möchten?',
     'bill_areYouSure'            => 'Sind Sie sicher, dass Sie die Rechnung ":name" löschen möchten?',
@@ -147,11 +148,13 @@ return [
     'journal_areYouSure'         => 'Sind Sie sicher, dass Sie die Überweisung mit dem Namen ":description" löschen möchten?',
     'mass_journal_are_you_sure'  => 'Sind Sie sicher, dass Sie diese Überweisung löschen möchten?',
     'tag_areYouSure'             => 'Sind Sie sicher, dass Sie den Tag ":name" löschen möchten?',
+    'linkType_areYouSure'        => 'Are you sure you want to delete the link type ":name" (":inward" / ":outward")?',
     'permDeleteWarning'          => 'Das Löschen von Dingen in Firefly ist dauerhaft und kann nicht rückgängig gemacht werden.',
     'mass_make_selection'        => 'Sie können das Löschen von Elementen verhinden, indem Sie die Checkbox entfernen.',
     'delete_all_permanently'     => 'Ausgewähltes dauerhaft löschen',
     'update_all_journals'        => 'Diese Transaktionen aktualisieren',
     'also_delete_transactions'   => 'Die einzige Überweisung, die mit diesem Konto verknüpft ist, wird ebenfalls gelöscht. | Alle :count Überweisungen, die mit diesem Konto verknüpft sind, werden ebenfalls gelöscht.',
+    'also_delete_connections'   => 'The only transaction linked with this link type will lose this connection.|All :count transactions linked with this link type will lose their connection.',
     'also_delete_rules'          => 'Die einzige Regel, die mit diesem Konto verknüpft ist, wird ebenfalls gelöscht. | Alle :count Regeln, die mit diesem Konto verknüpft sind, werden ebenfalls gelöscht.',
     'also_delete_piggyBanks'     => 'Das einzige Sparschwein, das mit diesem Konto verknüpft ist, wird ebenfalls gelöscht. | Alle :count Sparschweine, die mit diesem Konto verknüpft sind, werden ebenfalls gelöscht.',
     'bill_keep_transactions'     => 'Die einzige Überweisung, die mit dieser Rechnung verknüpft ist, wird nicht gelöscht. | Keine der :count Überweisungen, die mit dieser Rechnung verknüpft sind, werden gelöscht.',
@@ -189,4 +192,7 @@ return [
     'payment_date'       => 'Zahlungsdatum',
     'invoice_date'       => 'Rechnungsdatum',
     'internal_reference' => 'Interner Verweis',
+
+    'inward'  => 'Inward description',
+    'outward' => 'Outward description',
 ];
\ No newline at end of file

From 245db56771d3567d6bea75dbd8a5a46f7e9b3d66 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Mon, 21 Aug 2017 07:20:52 +0200
Subject: [PATCH 096/668] New translations firefly.php (French)

---
 resources/lang/fr_FR/firefly.php | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/resources/lang/fr_FR/firefly.php b/resources/lang/fr_FR/firefly.php
index 79ffb73369..b4e42e1e32 100644
--- a/resources/lang/fr_FR/firefly.php
+++ b/resources/lang/fr_FR/firefly.php
@@ -937,6 +937,26 @@ return [
     'no_block_code'                         => 'No reason for block or user not blocked',
     // links
     'journal_link_configuration'            => 'Transaction links configuration',
+    'create_new_link_type'                  => 'Create new link type',
+    'store_new_link_type'                   => 'Store new link type',
+    'update_link_type'                      => 'Update link type',
+    'edit_link_type'                        => 'Edit link type ":name"',
+    'updated_link_type'                     => 'Updated link type ":name"',
+    'delete_link_type'                      => 'Delete link type ":name"',
+    'deleted_link_type'                     => 'Deleted link type ":name"',
+    'stored_new_link_type'                  => 'Store new link type ":name"',
+    'cannot_edit_link_type'                 => 'Cannot edit link type ":name"',
+    'link_type_help_name'                   => 'Ie. "Duplicates"',
+    'link_type_help_inward'                 => 'Ie. "duplicates"',
+    'link_type_help_outward'                => 'Ie. "is duplicated by"',
+    'save_connections_by_moving'            => 'Save the link between these transaction(s) by moving them to another link type:',
+    'do_not_save_connection'                => '(do not save connection)',
+    'link_transaction'                      => 'Link transaction',
+    'link_to_other_transaction'             => 'Link this transaction to another transaction',
+    'select_transaction_to_link'            => 'Select a transaction to link this transaction to',
+    'this_transaction'                      => 'This transaction',
+    'transaction'                           => 'Transaction',
+    'comments'                              => 'Comments',
 
 
     // split a transaction:

From be48a2ed91996894a2845478d290b4f139e120bc Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Mon, 21 Aug 2017 07:20:54 +0200
Subject: [PATCH 097/668] New translations firefly.php (German)

---
 resources/lang/de_DE/firefly.php | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/resources/lang/de_DE/firefly.php b/resources/lang/de_DE/firefly.php
index 0a1eff694e..5b78485524 100644
--- a/resources/lang/de_DE/firefly.php
+++ b/resources/lang/de_DE/firefly.php
@@ -938,6 +938,26 @@ Sollen zusätzlich Ihre Girokonten angezeigt werden?',
     'no_block_code'                         => 'Kein Grund für Block oder Benutzer nicht blockiert',
     // links
     'journal_link_configuration'            => 'Transaction links configuration',
+    'create_new_link_type'                  => 'Create new link type',
+    'store_new_link_type'                   => 'Store new link type',
+    'update_link_type'                      => 'Update link type',
+    'edit_link_type'                        => 'Edit link type ":name"',
+    'updated_link_type'                     => 'Updated link type ":name"',
+    'delete_link_type'                      => 'Delete link type ":name"',
+    'deleted_link_type'                     => 'Deleted link type ":name"',
+    'stored_new_link_type'                  => 'Store new link type ":name"',
+    'cannot_edit_link_type'                 => 'Cannot edit link type ":name"',
+    'link_type_help_name'                   => 'Ie. "Duplicates"',
+    'link_type_help_inward'                 => 'Ie. "duplicates"',
+    'link_type_help_outward'                => 'Ie. "is duplicated by"',
+    'save_connections_by_moving'            => 'Save the link between these transaction(s) by moving them to another link type:',
+    'do_not_save_connection'                => '(do not save connection)',
+    'link_transaction'                      => 'Link transaction',
+    'link_to_other_transaction'             => 'Link this transaction to another transaction',
+    'select_transaction_to_link'            => 'Select a transaction to link this transaction to',
+    'this_transaction'                      => 'This transaction',
+    'transaction'                           => 'Transaction',
+    'comments'                              => 'Comments',
 
 
     // split a transaction:

From a2b2e01e39f4d67c1fb494fce19fd26beffe50a5 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Mon, 21 Aug 2017 07:20:57 +0200
Subject: [PATCH 098/668] New translations firefly.php (Dutch)

---
 resources/lang/nl_NL/firefly.php | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/resources/lang/nl_NL/firefly.php b/resources/lang/nl_NL/firefly.php
index 89f3da2471..1cceb076cf 100644
--- a/resources/lang/nl_NL/firefly.php
+++ b/resources/lang/nl_NL/firefly.php
@@ -937,6 +937,26 @@ return [
     'no_block_code'                         => 'Geen reden of gebruiker niet geblokkeerd',
     // links
     'journal_link_configuration'            => 'Transaction links configuration',
+    'create_new_link_type'                  => 'Create new link type',
+    'store_new_link_type'                   => 'Store new link type',
+    'update_link_type'                      => 'Update link type',
+    'edit_link_type'                        => 'Edit link type ":name"',
+    'updated_link_type'                     => 'Updated link type ":name"',
+    'delete_link_type'                      => 'Delete link type ":name"',
+    'deleted_link_type'                     => 'Deleted link type ":name"',
+    'stored_new_link_type'                  => 'Store new link type ":name"',
+    'cannot_edit_link_type'                 => 'Cannot edit link type ":name"',
+    'link_type_help_name'                   => 'Ie. "Duplicates"',
+    'link_type_help_inward'                 => 'Ie. "duplicates"',
+    'link_type_help_outward'                => 'Ie. "is duplicated by"',
+    'save_connections_by_moving'            => 'Save the link between these transaction(s) by moving them to another link type:',
+    'do_not_save_connection'                => '(do not save connection)',
+    'link_transaction'                      => 'Link transaction',
+    'link_to_other_transaction'             => 'Link this transaction to another transaction',
+    'select_transaction_to_link'            => 'Select a transaction to link this transaction to',
+    'this_transaction'                      => 'This transaction',
+    'transaction'                           => 'Transaction',
+    'comments'                              => 'Comments',
 
 
     // split a transaction:

From 9a52fcf66db1452b9156c42de2e201e9411781a9 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Mon, 21 Aug 2017 07:20:59 +0200
Subject: [PATCH 099/668] New translations firefly.php (Chinese Traditional)

---
 resources/lang/zh_TW/firefly.php | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/resources/lang/zh_TW/firefly.php b/resources/lang/zh_TW/firefly.php
index afd7643bf2..b17b3c75a5 100644
--- a/resources/lang/zh_TW/firefly.php
+++ b/resources/lang/zh_TW/firefly.php
@@ -937,6 +937,26 @@ return [
     'no_block_code'                         => 'No reason for block or user not blocked',
     // links
     'journal_link_configuration'            => 'Transaction links configuration',
+    'create_new_link_type'                  => 'Create new link type',
+    'store_new_link_type'                   => 'Store new link type',
+    'update_link_type'                      => 'Update link type',
+    'edit_link_type'                        => 'Edit link type ":name"',
+    'updated_link_type'                     => 'Updated link type ":name"',
+    'delete_link_type'                      => 'Delete link type ":name"',
+    'deleted_link_type'                     => 'Deleted link type ":name"',
+    'stored_new_link_type'                  => 'Store new link type ":name"',
+    'cannot_edit_link_type'                 => 'Cannot edit link type ":name"',
+    'link_type_help_name'                   => 'Ie. "Duplicates"',
+    'link_type_help_inward'                 => 'Ie. "duplicates"',
+    'link_type_help_outward'                => 'Ie. "is duplicated by"',
+    'save_connections_by_moving'            => 'Save the link between these transaction(s) by moving them to another link type:',
+    'do_not_save_connection'                => '(do not save connection)',
+    'link_transaction'                      => 'Link transaction',
+    'link_to_other_transaction'             => 'Link this transaction to another transaction',
+    'select_transaction_to_link'            => 'Select a transaction to link this transaction to',
+    'this_transaction'                      => 'This transaction',
+    'transaction'                           => 'Transaction',
+    'comments'                              => 'Comments',
 
 
     // split a transaction:

From 27470499863a9d9f666f681b9eb0494d94c41048 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Mon, 21 Aug 2017 07:21:02 +0200
Subject: [PATCH 100/668] New translations firefly.php (Polish)

---
 resources/lang/pl_PL/firefly.php | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/resources/lang/pl_PL/firefly.php b/resources/lang/pl_PL/firefly.php
index db37dc7f0b..98a2a063dc 100644
--- a/resources/lang/pl_PL/firefly.php
+++ b/resources/lang/pl_PL/firefly.php
@@ -937,6 +937,26 @@ return [
     'no_block_code'                         => 'No reason for block or user not blocked',
     // links
     'journal_link_configuration'            => 'Transaction links configuration',
+    'create_new_link_type'                  => 'Create new link type',
+    'store_new_link_type'                   => 'Store new link type',
+    'update_link_type'                      => 'Update link type',
+    'edit_link_type'                        => 'Edit link type ":name"',
+    'updated_link_type'                     => 'Updated link type ":name"',
+    'delete_link_type'                      => 'Delete link type ":name"',
+    'deleted_link_type'                     => 'Deleted link type ":name"',
+    'stored_new_link_type'                  => 'Store new link type ":name"',
+    'cannot_edit_link_type'                 => 'Cannot edit link type ":name"',
+    'link_type_help_name'                   => 'Ie. "Duplicates"',
+    'link_type_help_inward'                 => 'Ie. "duplicates"',
+    'link_type_help_outward'                => 'Ie. "is duplicated by"',
+    'save_connections_by_moving'            => 'Save the link between these transaction(s) by moving them to another link type:',
+    'do_not_save_connection'                => '(do not save connection)',
+    'link_transaction'                      => 'Link transaction',
+    'link_to_other_transaction'             => 'Link this transaction to another transaction',
+    'select_transaction_to_link'            => 'Select a transaction to link this transaction to',
+    'this_transaction'                      => 'This transaction',
+    'transaction'                           => 'Transaction',
+    'comments'                              => 'Comments',
 
 
     // split a transaction:

From a428aedf14ed9bc7e5fbbd51a91e3d70493de055 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Mon, 21 Aug 2017 07:21:04 +0200
Subject: [PATCH 101/668] New translations firefly.php (Portuguese, Brazilian)

---
 resources/lang/pt_BR/firefly.php | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/resources/lang/pt_BR/firefly.php b/resources/lang/pt_BR/firefly.php
index d7aeecb4d6..a9a19a189e 100644
--- a/resources/lang/pt_BR/firefly.php
+++ b/resources/lang/pt_BR/firefly.php
@@ -937,6 +937,26 @@ return [
     'no_block_code'                         => 'No reason for block or user not blocked',
     // links
     'journal_link_configuration'            => 'Transaction links configuration',
+    'create_new_link_type'                  => 'Create new link type',
+    'store_new_link_type'                   => 'Store new link type',
+    'update_link_type'                      => 'Update link type',
+    'edit_link_type'                        => 'Edit link type ":name"',
+    'updated_link_type'                     => 'Updated link type ":name"',
+    'delete_link_type'                      => 'Delete link type ":name"',
+    'deleted_link_type'                     => 'Deleted link type ":name"',
+    'stored_new_link_type'                  => 'Store new link type ":name"',
+    'cannot_edit_link_type'                 => 'Cannot edit link type ":name"',
+    'link_type_help_name'                   => 'Ie. "Duplicates"',
+    'link_type_help_inward'                 => 'Ie. "duplicates"',
+    'link_type_help_outward'                => 'Ie. "is duplicated by"',
+    'save_connections_by_moving'            => 'Save the link between these transaction(s) by moving them to another link type:',
+    'do_not_save_connection'                => '(do not save connection)',
+    'link_transaction'                      => 'Link transaction',
+    'link_to_other_transaction'             => 'Link this transaction to another transaction',
+    'select_transaction_to_link'            => 'Select a transaction to link this transaction to',
+    'this_transaction'                      => 'This transaction',
+    'transaction'                           => 'Transaction',
+    'comments'                              => 'Comments',
 
 
     // split a transaction:

From 637ccf1b2adb456db08f5d3f20bf1af495dc4281 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Mon, 21 Aug 2017 07:21:05 +0200
Subject: [PATCH 102/668] New translations form.php (Dutch)

---
 resources/lang/nl_NL/form.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/resources/lang/nl_NL/form.php b/resources/lang/nl_NL/form.php
index e3f2cb50b2..92453c5fe0 100644
--- a/resources/lang/nl_NL/form.php
+++ b/resources/lang/nl_NL/form.php
@@ -135,6 +135,7 @@ return [
     'delete_attachment'          => 'Verwijder bijlage ":name"',
     'delete_rule'                => 'Verwijder regel ":title"',
     'delete_rule_group'          => 'Verwijder regelgroep ":title"',
+    'delete_link_type'           => 'Delete link type ":name"',
     'attachment_areYouSure'      => 'Weet je zeker dat je de bijlage met naam ":name" wilt verwijderen?',
     'account_areYouSure'         => 'Weet je zeker dat je de rekening met naam ":name" wilt verwijderen?',
     'bill_areYouSure'            => 'Weet je zeker dat je het contract met naam ":name" wilt verwijderen?',
@@ -147,11 +148,13 @@ return [
     'journal_areYouSure'         => 'Weet je zeker dat je de transactie met naam ":description" wilt verwijderen?',
     'mass_journal_are_you_sure'  => 'Weet je zeker dat je al deze transacties wilt verwijderen?',
     'tag_areYouSure'             => 'Weet je zeker dat je de tag met naam ":tag" wilt verwijderen?',
+    'linkType_areYouSure'        => 'Are you sure you want to delete the link type ":name" (":inward" / ":outward")?',
     'permDeleteWarning'          => 'Dingen verwijderen uit Firefly is permanent en kan niet ongedaan gemaakt worden.',
     'mass_make_selection'        => 'Je kan items alsnog redden van de ondergang door het vinkje weg te halen.',
     'delete_all_permanently'     => 'Verwijder geselecteerde items permanent',
     'update_all_journals'        => 'Wijzig deze transacties',
     'also_delete_transactions'   => 'Ook de enige transactie verbonden aan deze rekening wordt verwijderd.|Ook alle :count transacties verbonden aan deze rekening worden verwijderd.',
+    'also_delete_connections'   => 'The only transaction linked with this link type will lose this connection.|All :count transactions linked with this link type will lose their connection.',
     'also_delete_rules'          => 'De enige regel in deze regelgroep wordt ook verwijderd.|Alle :count regels in deze regelgroep worden ook verwijderd.',
     'also_delete_piggyBanks'     => 'Ook het spaarpotje verbonden aan deze rekening wordt verwijderd.|Ook alle :count spaarpotjes verbonden aan deze rekening worden verwijderd.',
     'bill_keep_transactions'     => 'De transactie verbonden aan dit contract blijft bewaard.|De :count transacties verbonden aan dit contract blijven bewaard.',
@@ -189,4 +192,7 @@ return [
     'payment_date'       => 'Betalingsdatum',
     'invoice_date'       => 'Factuurdatum',
     'internal_reference' => 'Interne verwijzing',
+
+    'inward'  => 'Inward description',
+    'outward' => 'Outward description',
 ];
\ No newline at end of file

From 109c1ce2456f68f3eb0b7d945f2b3b8a9147c80e Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Mon, 21 Aug 2017 07:21:06 +0200
Subject: [PATCH 103/668] New translations form.php (French)

---
 resources/lang/fr_FR/form.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/resources/lang/fr_FR/form.php b/resources/lang/fr_FR/form.php
index f583f16d16..d66647d05b 100644
--- a/resources/lang/fr_FR/form.php
+++ b/resources/lang/fr_FR/form.php
@@ -135,6 +135,7 @@ return [
     'delete_attachment'          => 'Supprimer la pièce jointe ":name"',
     'delete_rule'                => 'Supprimer la règle ":title"',
     'delete_rule_group'          => 'Supprimer le groupe de filtres ":title"',
+    'delete_link_type'           => 'Delete link type ":name"',
     'attachment_areYouSure'      => 'Êtes-vous sûr de vouloir supprimer la pièce jointe nommée ":name" ?',
     'account_areYouSure'         => 'Êtes-vous sûr de vouloir supprimer le compte nommé ": ame" ?',
     'bill_areYouSure'            => 'Êtes-vous sûr de vouloir supprimer la facture nommée ":name" ?',
@@ -147,11 +148,13 @@ return [
     'journal_areYouSure'         => 'Êtes-vous sûr de vouloir supprimer la description de l\'opération ":description" ?',
     'mass_journal_are_you_sure'  => 'Êtes-vous sûr de que vouloir supprimer ces opérations ?',
     'tag_areYouSure'             => 'Êtes-vous sûr de vouloir supprimer le tag ":tag" ?',
+    'linkType_areYouSure'        => 'Are you sure you want to delete the link type ":name" (":inward" / ":outward")?',
     'permDeleteWarning'          => 'Supprimer quelque chose dans Firefly est permanent et ne peut pas être annulé.',
     'mass_make_selection'        => 'Vous pouvez toujours empêcher des éléments d’être supprimés en décochant la case à cocher.',
     'delete_all_permanently'     => 'Supprimer la selection définitivement',
     'update_all_journals'        => 'Mettre à jour ces opérations',
     'also_delete_transactions'   => 'La seule opération liée à ce compte sera aussi supprimée.|Les :count opérations liées à ce compte seront aussi supprimées.',
+    'also_delete_connections'   => 'The only transaction linked with this link type will lose this connection.|All :count transactions linked with this link type will lose their connection.',
     'also_delete_rules'          => 'La seule règle liée à ce groupe de règles sera aussi supprimée.|Les :count règles liées à ce groupe de règles seront aussi supprimées.',
     'also_delete_piggyBanks'     => 'La seule tirelire liée à ce compte sera aussi supprimée.|Les :count tirelires liées à ce compte seront aussi supprimées.',
     'bill_keep_transactions'     => 'La seule opération liée à cette facture ne sera pas supprimée.|Les :count opérations liées à cette facture ne seront pas supprimées.',
@@ -189,4 +192,7 @@ return [
     'payment_date'       => 'Date de paiement',
     'invoice_date'       => 'Date de facturation',
     'internal_reference' => 'Référence interne',
+
+    'inward'  => 'Inward description',
+    'outward' => 'Outward description',
 ];
\ No newline at end of file

From 926b1ae28b3a9a520d6521f61175fd8ce95ccb51 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Mon, 21 Aug 2017 07:21:08 +0200
Subject: [PATCH 104/668] New translations form.php (Chinese Traditional)

---
 resources/lang/zh_TW/form.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/resources/lang/zh_TW/form.php b/resources/lang/zh_TW/form.php
index d6e34d93a8..fdd71d3f2a 100644
--- a/resources/lang/zh_TW/form.php
+++ b/resources/lang/zh_TW/form.php
@@ -135,6 +135,7 @@ return [
     'delete_attachment'          => 'Delete attachment ":name"',
     'delete_rule'                => 'Delete rule ":title"',
     'delete_rule_group'          => 'Delete rule group ":title"',
+    'delete_link_type'           => 'Delete link type ":name"',
     'attachment_areYouSure'      => 'Are you sure you want to delete the attachment named ":name"?',
     'account_areYouSure'         => 'Are you sure you want to delete the account named ":name"?',
     'bill_areYouSure'            => '你確定要刪除賬單 ":name" 嗎？',
@@ -147,11 +148,13 @@ return [
     'journal_areYouSure'         => '你真的要刪除這個描述為 ":description" 的交易嗎？',
     'mass_journal_are_you_sure'  => 'Are you sure you want to delete these transactions?',
     'tag_areYouSure'             => '你真的要要刪除標籤 ":tag" 嗎？',
+    'linkType_areYouSure'        => 'Are you sure you want to delete the link type ":name" (":inward" / ":outward")?',
     'permDeleteWarning'          => 'Deleting stuff from Firely is permanent and cannot be undone.',
     'mass_make_selection'        => 'You can still prevent items from being deleted by removing the checkbox.',
     'delete_all_permanently'     => 'Delete selected permanently',
     'update_all_journals'        => 'Update these transactions',
     'also_delete_transactions'   => 'The only transaction connected to this account will be deleted as well.|All :count transactions connected to this account will be deleted as well.',
+    'also_delete_connections'   => 'The only transaction linked with this link type will lose this connection.|All :count transactions linked with this link type will lose their connection.',
     'also_delete_rules'          => 'The only rule connected to this rule group will be deleted as well.|All :count rules connected to this rule group will be deleted as well.',
     'also_delete_piggyBanks'     => 'The only piggy bank connected to this account will be deleted as well.|All :count piggy bank connected to this account will be deleted as well.',
     'bill_keep_transactions'     => 'The only transaction connected to this bill will not be deleted.|All :count transactions connected to this bill will spared deletion.',
@@ -189,4 +192,7 @@ return [
     'payment_date'       => 'Payment date',
     'invoice_date'       => 'Invoice date',
     'internal_reference' => 'Internal reference',
+
+    'inward'  => 'Inward description',
+    'outward' => 'Outward description',
 ];
\ No newline at end of file

From a8442ca0bb085992f5f89841807c04d85e971695 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Mon, 21 Aug 2017 07:21:10 +0200
Subject: [PATCH 105/668] New translations firefly.php (Spanish)

---
 resources/lang/es_ES/firefly.php | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/resources/lang/es_ES/firefly.php b/resources/lang/es_ES/firefly.php
index 53dad8f60b..f59551b36e 100644
--- a/resources/lang/es_ES/firefly.php
+++ b/resources/lang/es_ES/firefly.php
@@ -937,6 +937,26 @@ return [
     'no_block_code'                         => 'No reason for block or user not blocked',
     // links
     'journal_link_configuration'            => 'Transaction links configuration',
+    'create_new_link_type'                  => 'Create new link type',
+    'store_new_link_type'                   => 'Store new link type',
+    'update_link_type'                      => 'Update link type',
+    'edit_link_type'                        => 'Edit link type ":name"',
+    'updated_link_type'                     => 'Updated link type ":name"',
+    'delete_link_type'                      => 'Delete link type ":name"',
+    'deleted_link_type'                     => 'Deleted link type ":name"',
+    'stored_new_link_type'                  => 'Store new link type ":name"',
+    'cannot_edit_link_type'                 => 'Cannot edit link type ":name"',
+    'link_type_help_name'                   => 'Ie. "Duplicates"',
+    'link_type_help_inward'                 => 'Ie. "duplicates"',
+    'link_type_help_outward'                => 'Ie. "is duplicated by"',
+    'save_connections_by_moving'            => 'Save the link between these transaction(s) by moving them to another link type:',
+    'do_not_save_connection'                => '(do not save connection)',
+    'link_transaction'                      => 'Link transaction',
+    'link_to_other_transaction'             => 'Link this transaction to another transaction',
+    'select_transaction_to_link'            => 'Select a transaction to link this transaction to',
+    'this_transaction'                      => 'This transaction',
+    'transaction'                           => 'Transaction',
+    'comments'                              => 'Comments',
 
 
     // split a transaction:

From 78b44af7a28d84c59f4916ea500689a9c78453f8 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Mon, 21 Aug 2017 07:21:12 +0200
Subject: [PATCH 106/668] New translations firefly.php (Slovenian)

---
 resources/lang/sl_SI/firefly.php | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/resources/lang/sl_SI/firefly.php b/resources/lang/sl_SI/firefly.php
index 1ba7b86648..474627d335 100644
--- a/resources/lang/sl_SI/firefly.php
+++ b/resources/lang/sl_SI/firefly.php
@@ -937,6 +937,26 @@ return [
     'no_block_code'                         => 'No reason for block or user not blocked',
     // links
     'journal_link_configuration'            => 'Transaction links configuration',
+    'create_new_link_type'                  => 'Create new link type',
+    'store_new_link_type'                   => 'Store new link type',
+    'update_link_type'                      => 'Update link type',
+    'edit_link_type'                        => 'Edit link type ":name"',
+    'updated_link_type'                     => 'Updated link type ":name"',
+    'delete_link_type'                      => 'Delete link type ":name"',
+    'deleted_link_type'                     => 'Deleted link type ":name"',
+    'stored_new_link_type'                  => 'Store new link type ":name"',
+    'cannot_edit_link_type'                 => 'Cannot edit link type ":name"',
+    'link_type_help_name'                   => 'Ie. "Duplicates"',
+    'link_type_help_inward'                 => 'Ie. "duplicates"',
+    'link_type_help_outward'                => 'Ie. "is duplicated by"',
+    'save_connections_by_moving'            => 'Save the link between these transaction(s) by moving them to another link type:',
+    'do_not_save_connection'                => '(do not save connection)',
+    'link_transaction'                      => 'Link transaction',
+    'link_to_other_transaction'             => 'Link this transaction to another transaction',
+    'select_transaction_to_link'            => 'Select a transaction to link this transaction to',
+    'this_transaction'                      => 'This transaction',
+    'transaction'                           => 'Transaction',
+    'comments'                              => 'Comments',
 
 
     // split a transaction:

From 9f5c2b74eb78ee7a174859d378a115abec310657 Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Mon, 21 Aug 2017 08:44:04 +0200
Subject: [PATCH 107/668] Fix division by zero.

---
 app/Repositories/Tag/TagRepository.php | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/Repositories/Tag/TagRepository.php b/app/Repositories/Tag/TagRepository.php
index 01910c3a0f..ee0e6fe374 100644
--- a/app/Repositories/Tag/TagRepository.php
+++ b/app/Repositories/Tag/TagRepository.php
@@ -283,7 +283,7 @@ class TagRepository implements TagRepositoryInterface
         if (is_null($year)) {
             $query->whereNull('date');
         }
-        $tags      = $query->orderBy('id','desc')->get();
+        $tags      = $query->orderBy('id', 'desc')->get();
         $temporary = [];
         foreach ($tags as $tag) {
             $amount      = floatval($this->sumOfTag($tag, null, null));
@@ -339,8 +339,12 @@ class TagRepository implements TagRepositoryInterface
     {
         $amountDiff = $max - $min;
         $diff       = $range[1] - $range[0];
-        $step       = $amountDiff / $diff;
-        $extra      = round($amount / $step);
+        $step       = 1;
+        if ($diff !== 0) {
+            $step = $amountDiff / $diff;
+        }
+
+        $extra = round($amount / $step);
 
         return intval($range[0] + $extra);
     }

From f1a7f301679d672b4676b4b573183f3c7e5a2ac1 Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Mon, 21 Aug 2017 08:47:03 +0200
Subject: [PATCH 108/668] Fix division by zero. [skip ci]

---
 app/Repositories/Tag/TagRepository.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Repositories/Tag/TagRepository.php b/app/Repositories/Tag/TagRepository.php
index ee0e6fe374..3c9b9728c3 100644
--- a/app/Repositories/Tag/TagRepository.php
+++ b/app/Repositories/Tag/TagRepository.php
@@ -340,12 +340,12 @@ class TagRepository implements TagRepositoryInterface
         $amountDiff = $max - $min;
         $diff       = $range[1] - $range[0];
         $step       = 1;
-        if ($diff !== 0) {
+        if ($diff != 0) {
             $step = $amountDiff / $diff;
         }
-
         $extra = round($amount / $step);
 
+
         return intval($range[0] + $extra);
     }
 }

From 55b1c533cf8b82c0bdd1652c9eba0bc153c1bbd1 Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Mon, 21 Aug 2017 08:48:02 +0200
Subject: [PATCH 109/668] Fix division by zero. [skip ci]

---
 app/Repositories/Tag/TagRepository.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/Repositories/Tag/TagRepository.php b/app/Repositories/Tag/TagRepository.php
index 3c9b9728c3..d48d277ea6 100644
--- a/app/Repositories/Tag/TagRepository.php
+++ b/app/Repositories/Tag/TagRepository.php
@@ -343,6 +343,9 @@ class TagRepository implements TagRepositoryInterface
         if ($diff != 0) {
             $step = $amountDiff / $diff;
         }
+        if ($step == 0) {
+            $step = 1;
+        }
         $extra = round($amount / $step);
 
 

From 49e7b4f4eab06ec36086aa345e4a1ccc82b1a7d9 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Mon, 21 Aug 2017 10:40:15 +0200
Subject: [PATCH 110/668] New translations form.php (Dutch)

---
 resources/lang/nl_NL/form.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/resources/lang/nl_NL/form.php b/resources/lang/nl_NL/form.php
index 92453c5fe0..d77233351f 100644
--- a/resources/lang/nl_NL/form.php
+++ b/resources/lang/nl_NL/form.php
@@ -135,7 +135,7 @@ return [
     'delete_attachment'          => 'Verwijder bijlage ":name"',
     'delete_rule'                => 'Verwijder regel ":title"',
     'delete_rule_group'          => 'Verwijder regelgroep ":title"',
-    'delete_link_type'           => 'Delete link type ":name"',
+    'delete_link_type'           => 'Verwijder linktype ":name"',
     'attachment_areYouSure'      => 'Weet je zeker dat je de bijlage met naam ":name" wilt verwijderen?',
     'account_areYouSure'         => 'Weet je zeker dat je de rekening met naam ":name" wilt verwijderen?',
     'bill_areYouSure'            => 'Weet je zeker dat je het contract met naam ":name" wilt verwijderen?',
@@ -148,13 +148,13 @@ return [
     'journal_areYouSure'         => 'Weet je zeker dat je de transactie met naam ":description" wilt verwijderen?',
     'mass_journal_are_you_sure'  => 'Weet je zeker dat je al deze transacties wilt verwijderen?',
     'tag_areYouSure'             => 'Weet je zeker dat je de tag met naam ":tag" wilt verwijderen?',
-    'linkType_areYouSure'        => 'Are you sure you want to delete the link type ":name" (":inward" / ":outward")?',
+    'linkType_areYouSure'        => 'Weet je zeker dat je linktype ":name" (":inward" / ":outward") wilt verwijderen?',
     'permDeleteWarning'          => 'Dingen verwijderen uit Firefly is permanent en kan niet ongedaan gemaakt worden.',
     'mass_make_selection'        => 'Je kan items alsnog redden van de ondergang door het vinkje weg te halen.',
     'delete_all_permanently'     => 'Verwijder geselecteerde items permanent',
     'update_all_journals'        => 'Wijzig deze transacties',
     'also_delete_transactions'   => 'Ook de enige transactie verbonden aan deze rekening wordt verwijderd.|Ook alle :count transacties verbonden aan deze rekening worden verwijderd.',
-    'also_delete_connections'   => 'The only transaction linked with this link type will lose this connection.|All :count transactions linked with this link type will lose their connection.',
+    'also_delete_connections'   => 'De enige transactie gelinkt met dit linktype zal deze verbinding verliezen. | Alle :count transacties met dit linktype zullen deze verbinding verliezen.',
     'also_delete_rules'          => 'De enige regel in deze regelgroep wordt ook verwijderd.|Alle :count regels in deze regelgroep worden ook verwijderd.',
     'also_delete_piggyBanks'     => 'Ook het spaarpotje verbonden aan deze rekening wordt verwijderd.|Ook alle :count spaarpotjes verbonden aan deze rekening worden verwijderd.',
     'bill_keep_transactions'     => 'De transactie verbonden aan dit contract blijft bewaard.|De :count transacties verbonden aan dit contract blijven bewaard.',
@@ -193,6 +193,6 @@ return [
     'invoice_date'       => 'Factuurdatum',
     'internal_reference' => 'Interne verwijzing',
 
-    'inward'  => 'Inward description',
-    'outward' => 'Outward description',
+    'inward'  => 'Binnenwaartse beschrijving',
+    'outward' => 'Buitenwaartse beschrijving',
 ];
\ No newline at end of file

From 46adb7644a3370c8de37be58958a279f2ba4316c Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Mon, 21 Aug 2017 10:40:18 +0200
Subject: [PATCH 111/668] New translations firefly.php (Dutch)

---
 resources/lang/nl_NL/firefly.php | 42 ++++++++++++++++----------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/resources/lang/nl_NL/firefly.php b/resources/lang/nl_NL/firefly.php
index 1cceb076cf..6cca64e7f1 100644
--- a/resources/lang/nl_NL/firefly.php
+++ b/resources/lang/nl_NL/firefly.php
@@ -936,27 +936,27 @@ return [
     'block_code_expired'                    => 'Demo-account verlopen',
     'no_block_code'                         => 'Geen reden of gebruiker niet geblokkeerd',
     // links
-    'journal_link_configuration'            => 'Transaction links configuration',
-    'create_new_link_type'                  => 'Create new link type',
-    'store_new_link_type'                   => 'Store new link type',
-    'update_link_type'                      => 'Update link type',
-    'edit_link_type'                        => 'Edit link type ":name"',
-    'updated_link_type'                     => 'Updated link type ":name"',
-    'delete_link_type'                      => 'Delete link type ":name"',
-    'deleted_link_type'                     => 'Deleted link type ":name"',
-    'stored_new_link_type'                  => 'Store new link type ":name"',
-    'cannot_edit_link_type'                 => 'Cannot edit link type ":name"',
-    'link_type_help_name'                   => 'Ie. "Duplicates"',
-    'link_type_help_inward'                 => 'Ie. "duplicates"',
-    'link_type_help_outward'                => 'Ie. "is duplicated by"',
-    'save_connections_by_moving'            => 'Save the link between these transaction(s) by moving them to another link type:',
-    'do_not_save_connection'                => '(do not save connection)',
-    'link_transaction'                      => 'Link transaction',
-    'link_to_other_transaction'             => 'Link this transaction to another transaction',
-    'select_transaction_to_link'            => 'Select a transaction to link this transaction to',
-    'this_transaction'                      => 'This transaction',
-    'transaction'                           => 'Transaction',
-    'comments'                              => 'Comments',
+    'journal_link_configuration'            => 'Instellingen voor transactielinks',
+    'create_new_link_type'                  => 'Maak nieuw linktype',
+    'store_new_link_type'                   => 'Sla nieuw linktype op',
+    'update_link_type'                      => 'Update linktype',
+    'edit_link_type'                        => 'Wijzig linktype ":name"',
+    'updated_link_type'                     => 'Linktype ":name" gewijzigd',
+    'delete_link_type'                      => 'Linktype ":name" verwijderd',
+    'deleted_link_type'                     => 'Linktype ":name" verwijderd',
+    'stored_new_link_type'                  => 'Linktype ":name" opgeslagen',
+    'cannot_edit_link_type'                 => 'Kan linktype ":name" niet wijzigen',
+    'link_type_help_name'                   => 'Bijv. "Dupliceert"',
+    'link_type_help_inward'                 => 'Bijv. "dupliceert"',
+    'link_type_help_outward'                => 'Bijv. "is duplicaat van"',
+    'save_connections_by_moving'            => 'Sla de link tussen deze transactie(s) op door ze te op te slaan onder een ander linktype:',
+    'do_not_save_connection'                => '(gooi ook links weg)',
+    'link_transaction'                      => 'Link transactie',
+    'link_to_other_transaction'             => 'Link deze transactie aan een andere transactie',
+    'select_transaction_to_link'            => 'Selecteer een transactie om deze transactie aan te linken',
+    'this_transaction'                      => 'Deze transactie',
+    'transaction'                           => 'Transactie',
+    'comments'                              => 'Opmerkingen',
 
 
     // split a transaction:

From eebbbdd0dc9bd6080f8caf50564a1b17e0592007 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Mon, 21 Aug 2017 10:50:16 +0200
Subject: [PATCH 112/668] New translations list.php (Dutch)

---
 resources/lang/nl_NL/list.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/resources/lang/nl_NL/list.php b/resources/lang/nl_NL/list.php
index 0f6fef3101..38ccf0caba 100644
--- a/resources/lang/nl_NL/list.php
+++ b/resources/lang/nl_NL/list.php
@@ -88,7 +88,7 @@ return [
     'budget_count'           => 'Aantal budgetten',
     'rule_and_groups_count'  => 'Aantal regels en regelgroepen',
     'tags_count'             => 'Aantal tags',
-    'inward'                 => 'Inward description',
-    'outward'                => 'Outward description',
-    'number_of_transactions' => 'Number of transactions',
+    'inward'                 => 'Binnenwaartse beschrijving',
+    'outward'                => 'Buitenwaartse beschrijving',
+    'number_of_transactions' => 'Aantal transacties',
 ];
\ No newline at end of file

From d00b9515dec2aea73c36b425b2044313ccd01b73 Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Mon, 21 Aug 2017 17:11:18 +0200
Subject: [PATCH 113/668] fix #770

---
 app/Http/Controllers/Transaction/SingleController.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/Http/Controllers/Transaction/SingleController.php b/app/Http/Controllers/Transaction/SingleController.php
index b8baff5568..1265b2c8c3 100644
--- a/app/Http/Controllers/Transaction/SingleController.php
+++ b/app/Http/Controllers/Transaction/SingleController.php
@@ -14,6 +14,7 @@ declare(strict_types=1);
 namespace FireflyIII\Http\Controllers\Transaction;
 
 
+use Carbon\Carbon;
 use ExpandedForm;
 use FireflyIII\Events\StoredTransactionJournal;
 use FireflyIII\Events\UpdatedTransactionJournal;
@@ -115,7 +116,7 @@ class SingleController extends Controller
             'foreign_amount'            => $foreignAmount,
             'native_amount'             => $foreignAmount,
             'amount_currency_id_amount' => $transaction->foreign_currency_id ?? 0,
-            'date'                      => $journal->date->format('Y-m-d'),
+            'date'                      => (new Carbon())->format('Y-m-d'),
             'budget_id'                 => $budgetId,
             'category'                  => $categoryName,
             'tags'                      => $tags,

From 5f82e947b20cb6f8afc0f00ffa698a93a34dd30e Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Mon, 21 Aug 2017 17:20:12 +0200
Subject: [PATCH 114/668] New translations demo.php (Dutch)

---
 resources/lang/nl_NL/demo.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/resources/lang/nl_NL/demo.php b/resources/lang/nl_NL/demo.php
index cf4cd9258a..91e456317f 100644
--- a/resources/lang/nl_NL/demo.php
+++ b/resources/lang/nl_NL/demo.php
@@ -15,12 +15,12 @@ return [
     'index'                          => 'Welkom bij <strong>Firefly III</strong>! Op deze pagina krijg je een overzicht van je financiën. Meer diepgaande informatie vindt je onder Rekeningen &rarr;<a href=":asset">Betaalrekeningen</a> en natuurlijk onder <a href=":budgets">Budgetten</a>- en <a href=":reports">Overzichten</a>. Klik gerust rond en en kijk waar je terecht komt.',
     'accounts-index'                 => 'Betaalrekeningen zijn je persoonlijke bankrekeningen. Crediteuren zijn rekeningen waar jij geld uit geeft, zoals bij winkels of aan vrienden. Debiteuren zijn rekeningen waar jij geld van krijgt, zoals je werk, de overheid of andere bronnen van inkomsten. Op deze pagina kan je ze wijzigen of verwijderen.',
     'budgets-index'                  => 'Op deze pagina zie je je budgetten. De bovenste balk is het bedrag dat je kan gaan budgetteren. Dat kan je zelf aanpassen door op het bedrag te klikken. Wat je daadwerkelijk hebt uitgegeven zie je in de balk er onder. Daar weer onder zie je elk budget en wat je er voor gebudgetteerd hebt.',
-    'reports-index-start'            => 'Firefly III supports four types of reports. Read about them by clicking on the <i class="fa fa-question-circle"></i>-icon in the top right corner.',
-    'reports-index-examples'         => 'Be sure to check out these examples: <a href=":one">a monthly financial overview</a>, <a href=":two">a yearly financial overview</a> and <a href=":three">a budget overview</a>.',
-    'currencies-index'               => 'Firefly III supports multiple currencies. Although it defaults to the Euro it can be set to the US Dollar and many other currencies. As you can see a small selection of currencies has been included but you can add your own if you wish to. Changing the default currency will not change the currency of existing transactions however: Firefly III supports the use of multiple currencies at the same time.',
-    'transactions-index'             => 'These expenses, deposits and transfers are not particularly imaginative. They have been generated automatically.',
-    'piggy-banks-index'              => 'As you can see, there are three piggy banks. Use the plus and minus buttons to influence the amount of money in each piggy bank. Click the name of the piggy bank to see the administration for each piggy bank.',
-    'import-index'                   => 'Of course, any CSV file can be imported into Firefly III ',
-    'import-configure-security'      => 'Because of security concerns, your upload has been replaced with a local file.',
-    'import-configure-configuration' => 'The configuration you see below is correct for the local file.',
+    'reports-index-start'            => 'Firefly III ondersteunt vier soorten rapporten. Je kan meer over ze lezen door op het <i class="fa fa-question-circle"></i>-icoontje te klikken (rechtsboven).',
+    'reports-index-examples'         => 'Bekijk eens deze voorbeelden: <a href=":one">een maandelijks financieel overzicht</a>, <a href=":two">een jaarlijks financieel overzicht</a> en een <a href=":three">budgetrapport</a>.',
+    'currencies-index'               => 'Firefly ondersteunt meerdere valuta\'s. Hoewel het standaard de Euro is kan je ook kiezen voor de US dollar of een van de vele anderen. Er is een kleine selectie valuta meegeleverd maar je kan je eigen valuta toevoegen. Het veranderen van de standaardvaluta verandert de bestaande transacties niet: Firefly III ondersteunt het gebruik van meerdere valuta op hetzelfde moment.',
+    'transactions-index'             => 'Deze uitgaven, inkomsten en overschrijvingen zijn niet heel fantasierijk. Ze zijn automatisch gegenereerd.',
+    'piggy-banks-index'              => 'Zoals je kan zien zijn er drie spaarpotjes. Gebruik de plus- en minknoppen om het bedrag in de spaarpotjes te veranderen. Klik op de naam van het spaarpotje om er de geschiedenis van te zien.',
+    'import-index'                   => 'Uiteraard kan je elk CSV bestand importeren in Firefly III ',
+    'import-configure-security'      => 'Uit veiligheidsoverwegingen is je upload vervangen door een lokaal bestand.',
+    'import-configure-configuration' => 'Deze configuratie is correct voor het lokale bestand.',
 ];
\ No newline at end of file

From a5013ecbc3d3e09150e31e751bb4ec760ea08447 Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Mon, 21 Aug 2017 18:16:15 +0200
Subject: [PATCH 115/668] Expand link view and more features #616

---
 .../Transaction/LinkController.php            | 73 ++++++++++++++++++-
 .../Controllers/TransactionController.php     |  5 +-
 app/Http/Requests/JournalLinkRequest.php      | 40 ++++++++++
 app/Models/TransactionJournalLink.php         | 53 +++++++++++---
 .../LinkType/LinkTypeRepository.php           | 35 +++++++++
 .../LinkType/LinkTypeRepositoryInterface.php  | 44 ++++++++---
 .../2017_08_20_062014_changes_for_v470.php    |  6 +-
 database/seeds/LinkTypeSeeder.php             | 14 ++--
 resources/lang/en_US/firefly.php              |  5 +-
 resources/views/transactions/show.twig        | 51 ++++++++++++-
 10 files changed, 281 insertions(+), 45 deletions(-)
 create mode 100644 app/Http/Requests/JournalLinkRequest.php

diff --git a/app/Http/Controllers/Transaction/LinkController.php b/app/Http/Controllers/Transaction/LinkController.php
index 835661022e..3f5c1a1a37 100644
--- a/app/Http/Controllers/Transaction/LinkController.php
+++ b/app/Http/Controllers/Transaction/LinkController.php
@@ -13,13 +13,80 @@ declare(strict_types=1);
 namespace FireflyIII\Http\Controllers\Transaction;
 
 
-use Illuminate\Http\Request;
+use FireflyIII\Http\Requests\JournalLinkRequest;
+use FireflyIII\Models\TransactionJournal;
+use FireflyIII\Models\TransactionJournalLink;
+use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
+use FireflyIII\Repositories\LinkType\LinkTypeRepositoryInterface;
+use Log;
+use Session;
 
 class LinkController
 {
 
-    public function store(Request $request) {
-        var_dump($request->all());
+    /**
+     * @param JournalLinkRequest          $request
+     * @param LinkTypeRepositoryInterface $repository
+     * @param JournalRepositoryInterface  $journalRepository
+     * @param TransactionJournal          $journal
+     *
+     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
+     */
+    public function store(
+        JournalLinkRequest $request, LinkTypeRepositoryInterface $repository, JournalRepositoryInterface $journalRepository, TransactionJournal $journal
+    ) {
+        $linkType = $request->get('link_type');
+        $parts    = explode('_', $linkType);
+        if (count($parts) !== 2) {
+            Session::flash('error', trans('firefly.invalid_link_data'));
+
+            return redirect(route('transactions.show', $journal->id));
+        }
+        if (!in_array($parts[1], ['inward', 'outward'])) {
+            Session::flash('error', trans('firefly.invalid_link_data'));
+
+            return redirect(route('transactions.show', $journal->id));
+        }
+        $linkTypeId = intval($parts[0]);
+        $linkType   = $repository->find($linkTypeId);
+        if ($linkType->id !== $linkTypeId) {
+            Session::flash('error', trans('firefly.invalid_link_data'));
+
+            return redirect(route('transactions.show', $journal->id));
+        }
+        Log::debug('Will link using linktype', $linkType->toArray());
+        $linkJournalId = intval($request->get('link_journal_id'));
+
+        if ($linkJournalId === 0 && ctype_digit($request->string('link_other'))) {
+            $linkJournalId = intval($request->string('link_other'));
+        }
+
+        $opposing = $journalRepository->find($linkJournalId);
+        $result   = $repository->findLink($journal, $opposing);
+        if ($result) {
+            Session::flash('error', trans('firefly.journals_error_linked'));
+
+            return redirect(route('transactions.show', $journal->id));
+        }
+        Log::debug(sprintf('Journal is %d, opposing is %d', $journal->id, $opposing->id));
+
+        $journalLink = new TransactionJournalLink;
+        $journalLink->linkType()->associate($linkType);
+        if ($parts[1] === 'inward') {
+            Log::debug(sprintf('Link type is inwards ("%s"), so %d is source and %d is destination.', $linkType->inward, $opposing->id, $journal->id));
+            $journalLink->source()->associate($opposing);
+            $journalLink->destination()->associate($journal);
+        }
+        if ($parts[1] === 'outward') {
+            Log::debug(sprintf('Link type is inwards ("%s"), so %d is source and %d is destination.', $linkType->outward, $journal->id, $opposing->id));
+            $journalLink->source()->associate($journal);
+            $journalLink->destination()->associate($opposing);
+        }
+        $journalLink->comment = strlen($request->string('comments')) > 0 ? $request->string('comments') : null;
+        $journalLink->save();
+        Session::flash('success', trans('firefly.journals_linked'));
+
+        return redirect(route('transactions.show', $journal->id));
     }
 
 }
\ No newline at end of file
diff --git a/app/Http/Controllers/TransactionController.php b/app/Http/Controllers/TransactionController.php
index eb21c44356..8263a1f16f 100644
--- a/app/Http/Controllers/TransactionController.php
+++ b/app/Http/Controllers/TransactionController.php
@@ -161,13 +161,14 @@ class TransactionController extends Controller
         if ($this->isOpeningBalance($journal)) {
             return $this->redirectToAccount($journal);
         }
-        $linkTypes       = $linkTypeRepository->get();
+        $linkTypes    = $linkTypeRepository->get();
+        $links        = $linkTypeRepository->getLinks($journal);
         $events       = $tasker->getPiggyBankEvents($journal);
         $transactions = $tasker->getTransactionsOverview($journal);
         $what         = strtolower($journal->transaction_type_type ?? $journal->transactionType->type);
         $subTitle     = trans('firefly.' . $what) . ' "' . e($journal->description) . '"';
 
-        return view('transactions.show', compact('journal', 'events', 'subTitle', 'what', 'transactions', 'linkTypes'));
+        return view('transactions.show', compact('journal', 'events', 'subTitle', 'what', 'transactions', 'linkTypes','links'));
 
 
     }
diff --git a/app/Http/Requests/JournalLinkRequest.php b/app/Http/Requests/JournalLinkRequest.php
new file mode 100644
index 0000000000..048bc6d28b
--- /dev/null
+++ b/app/Http/Requests/JournalLinkRequest.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * JournalLinkRequest.php
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Http\Requests;
+
+/**
+ * Class JournalLink
+ *
+ *
+ * @package FireflyIII\Http\Requests
+ */
+class JournalLinkRequest extends Request
+{
+    /**
+     * @return bool
+     */
+    public function authorize()
+    {
+        // Only allow logged in users
+        return auth()->check();
+    }
+
+
+    /**
+     * @return array
+     */
+    public function rules()
+    {
+        return [];
+    }
+}
diff --git a/app/Models/TransactionJournalLink.php b/app/Models/TransactionJournalLink.php
index a864c66bb2..0bbcb2aa49 100644
--- a/app/Models/TransactionJournalLink.php
+++ b/app/Models/TransactionJournalLink.php
@@ -13,7 +13,9 @@ declare(strict_types=1);
 namespace FireflyIII\Models;
 
 
+use Crypt;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
 
 /**
  * Class TransactionJournalLink
@@ -22,31 +24,58 @@ use Illuminate\Database\Eloquent\Model;
  */
 class TransactionJournalLink extends Model
 {
-protected $table = 'journal_links';
-
+    protected $table = 'journal_links';
 
     /**
      * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
      */
-    public function linkType()
+    public function destination()
+    {
+        return $this->belongsTo(TransactionJournal::class, 'destination_id');
+    }
+
+    /**
+     * @param $value
+     *
+     * @return null|string
+     */
+    public function getCommentAttribute($value): ?string
+    {
+        if (!is_null($value)) {
+            return Crypt::decrypt($value);
+        }
+
+        return null;
+    }
+
+    /**
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
+     */
+    public function linkType(): BelongsTo
     {
         return $this->belongsTo(LinkType::class);
     }
 
+    /**
+     *
+     * @param $value
+     */
+    public function setCommentAttribute($value): void
+    {
+        if (!is_null($value) && strlen($value) > 0) {
+            $this->attributes['comment'] = Crypt::encrypt($value);
+
+            return;
+        }
+        $this->attributes['comment'] = null;
+    }
+
     /**
      * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
      */
     public function source()
     {
-        return $this->belongsTo(TransactionJournal::class,'source_id');
-    }
-
-    /**
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
-     */
-    public function destination()
-    {
-        return $this->belongsTo(TransactionJournal::class,'destination_id');
+        return $this->belongsTo(TransactionJournal::class, 'source_id');
     }
 
 
diff --git a/app/Repositories/LinkType/LinkTypeRepository.php b/app/Repositories/LinkType/LinkTypeRepository.php
index 2376dde92d..e2786718ca 100644
--- a/app/Repositories/LinkType/LinkTypeRepository.php
+++ b/app/Repositories/LinkType/LinkTypeRepository.php
@@ -13,6 +13,7 @@ declare(strict_types=1);
 namespace FireflyIII\Repositories\LinkType;
 
 use FireflyIII\Models\LinkType;
+use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Models\TransactionJournalLink;
 use FireflyIII\User;
 use Illuminate\Support\Collection;
@@ -49,6 +50,7 @@ class LinkTypeRepository implements LinkTypeRepositoryInterface
             TransactionJournalLink::where('link_type_id', $linkType->id)->update(['link_type_id' => $moveTo->id]);
         }
         $linkType->delete();
+
         return true;
     }
 
@@ -67,6 +69,24 @@ class LinkTypeRepository implements LinkTypeRepositoryInterface
         return $linkType;
     }
 
+    /**
+     * Check if link exists between journals.
+     *
+     * @param TransactionJournal $one
+     * @param TransactionJournal $two
+     *
+     * @return bool
+     */
+    public function findLink(TransactionJournal $one, TransactionJournal $two): bool
+    {
+        $count         = TransactionJournalLink::whereDestinationId($one->id)->whereSourceId($two->id)->count();
+        $opposingCount = TransactionJournalLink::whereDestinationId($two->id)->whereSourceId($one->id)->count();
+
+        return ($count + $opposingCount > 0);
+
+
+    }
+
     /**
      * @return Collection
      */
@@ -75,6 +95,21 @@ class LinkTypeRepository implements LinkTypeRepositoryInterface
         return LinkType::orderBy('name', 'ASC')->get();
     }
 
+    /**
+     * Return list of existing connections.
+     *
+     * @param TransactionJournal $journal
+     *
+     * @return Collection
+     */
+    public function getLinks(TransactionJournal $journal): Collection
+    {
+        $outward = TransactionJournalLink::whereSourceId($journal->id)->get();
+        $inward  = TransactionJournalLink::whereDestinationId($journal->id)->get();
+
+        return $outward->merge($inward);
+    }
+
     /**
      * @param User $user
      */
diff --git a/app/Repositories/LinkType/LinkTypeRepositoryInterface.php b/app/Repositories/LinkType/LinkTypeRepositoryInterface.php
index 9a35b431e6..145a69be35 100644
--- a/app/Repositories/LinkType/LinkTypeRepositoryInterface.php
+++ b/app/Repositories/LinkType/LinkTypeRepositoryInterface.php
@@ -13,6 +13,7 @@ declare(strict_types=1);
 namespace FireflyIII\Repositories\LinkType;
 
 use FireflyIII\Models\LinkType;
+use FireflyIII\Models\TransactionJournal;
 use Illuminate\Support\Collection;
 
 /**
@@ -22,18 +23,6 @@ use Illuminate\Support\Collection;
  */
 interface LinkTypeRepositoryInterface
 {
-    /**
-     * @param int $id
-     *
-     * @return LinkType
-     */
-    public function find(int $id): LinkType;
-
-    /**
-     * @return Collection
-     */
-    public function get(): Collection;
-
     /**
      * @param LinkType $linkType
      *
@@ -49,6 +38,37 @@ interface LinkTypeRepositoryInterface
      */
     public function destroy(LinkType $linkType, LinkType $moveTo): bool;
 
+    /**
+     * @param int $id
+     *
+     * @return LinkType
+     */
+    public function find(int $id): LinkType;
+
+    /**
+     * Check if link exists between journals.
+     *
+     * @param TransactionJournal $one
+     * @param TransactionJournal $two
+     *
+     * @return bool
+     */
+    public function findLink(TransactionJournal $one, TransactionJournal $two): bool;
+
+    /**
+     * @return Collection
+     */
+    public function get(): Collection;
+
+    /**
+     * Return list of existing connections.
+     *
+     * @param TransactionJournal $journal
+     *
+     * @return Collection
+     */
+    public function getLinks(TransactionJournal $journal): Collection;
+
     /**
      * @param array $data
      *
diff --git a/database/migrations/2017_08_20_062014_changes_for_v470.php b/database/migrations/2017_08_20_062014_changes_for_v470.php
index f3735202ad..c548d4fca3 100644
--- a/database/migrations/2017_08_20_062014_changes_for_v470.php
+++ b/database/migrations/2017_08_20_062014_changes_for_v470.php
@@ -40,8 +40,7 @@ class ChangesForV470 extends Migration
                 $table->string('inward');
                 $table->boolean('editable');
 
-                $table->unique(['name']);
-                $table->unique(['outward','inward']);
+                $table->unique(['name', 'outward','inward']);
             }
             );
         }
@@ -54,8 +53,7 @@ class ChangesForV470 extends Migration
                 $table->integer('link_type_id', false, true);
                 $table->integer('source_id', false, true);
                 $table->integer('destination_id', false, true);
-                $table->text('comment');
-                $table->integer('sequence', false, true);
+                $table->text('comment')->nullable();
 
                 $table->foreign('link_type_id')->references('id')->on('link_types')->onDelete('cascade');
                 $table->foreign('source_id')->references('id')->on('transaction_journals')->onDelete('cascade');
diff --git a/database/seeds/LinkTypeSeeder.php b/database/seeds/LinkTypeSeeder.php
index 179142ad87..3b872e4588 100644
--- a/database/seeds/LinkTypeSeeder.php
+++ b/database/seeds/LinkTypeSeeder.php
@@ -27,28 +27,28 @@ class LinkTypeSeeder extends Seeder
         $link           = new LinkType;
         $link->name     = 'Related';
         $link->inward   = 'relates to';
-        $link->outward  = 'is related to';
+        $link->outward  = 'relates to';
         $link->editable = false;
         $link->save();
 
         $link           = new LinkType;
         $link->name     = 'Refund';
-        $link->inward   = '(partially) refunds';
-        $link->outward  = 'is (partially) refunded by';
+        $link->inward   = 'is (partially) refunded by';
+        $link->outward  = '(partially) refunds';
         $link->editable = false;
         $link->save();
 
         $link           = new LinkType;
         $link->name     = 'Paid';
-        $link->inward   = '(partially) pays for';
-        $link->outward  = 'is (partially) paid for by';
+        $link->inward   = 'is (partially) paid for by';
+        $link->outward  = '(partially) pays for';
         $link->editable = false;
         $link->save();
 
         $link           = new LinkType;
         $link->name     = 'Reimbursement';
-        $link->inward   = '(partially) reimburses';
-        $link->outward  = 'is (partially) reimbursed by';
+        $link->inward   = 'is (partially) reimbursed by';
+        $link->outward  = '(partially) reimburses';
         $link->editable = false;
         $link->save();
 
diff --git a/resources/lang/en_US/firefly.php b/resources/lang/en_US/firefly.php
index 69c482ab9e..e8c9c2386a 100644
--- a/resources/lang/en_US/firefly.php
+++ b/resources/lang/en_US/firefly.php
@@ -957,7 +957,10 @@ return [
     'this_transaction'                      => 'This transaction',
     'transaction'                           => 'Transaction',
     'comments'                              => 'Comments',
-
+    'to_link_not_found'                     => 'If the transaction you want to link to is not listed, simply enter its ID.',
+    'invalid_link_data'                     => 'Invalid link type selected. Cannot link transaction.',
+    'journals_linked'                       => 'Transactions are linked.',
+    'journals_error_linked'                 => 'These journals are already linked.',
 
     // split a transaction:
     'transaction_meta_data'                 => 'Transaction meta-data',
diff --git a/resources/views/transactions/show.twig b/resources/views/transactions/show.twig
index 59ba96b99b..5a0bc35917 100644
--- a/resources/views/transactions/show.twig
+++ b/resources/views/transactions/show.twig
@@ -54,7 +54,8 @@
                                     </a>
                                 </li>
                                 <li>
-                                    <a href="#" data-toggle="modal" data-target="#linkJournalModal"><i class="fa fa-fw fa-link"></i> {{ 'link_transaction'|_ }}</a>
+                                    <a href="#" data-toggle="modal" data-target="#linkJournalModal"><i class="fa fa-fw fa-link"></i> {{ 'link_transaction'|_ }}
+                                    </a>
                                 </li>
                             </ul>
                         </div>
@@ -141,7 +142,8 @@
                                     </a>
                                 </li>
                                 <li>
-                                    <a href="#" data-toggle="modal" data-target="#linkJournalModal"><i class="fa fa-fw fa-link"></i> {{ 'link_transaction'|_ }}</a>
+                                    <a href="#" data-toggle="modal" data-target="#linkJournalModal"><i class="fa fa-fw fa-link"></i> {{ 'link_transaction'|_ }}
+                                    </a>
                                 </li>
                             </ul>
                             <a href="{{ route('transactions.delete',journal.id) }}" class="btn btn-danger"><i class="fa fa-trash fa-fw"></i> {{ 'delete'|_ }}
@@ -309,12 +311,52 @@
                     </div>
                 </div>
             {% endif %}
+            {% if links.count > 0 %}
+                <div class="box">
+                    <div class="box-header with-border">
+                        <h3 class="box-title">{{ 'journal_links'|_ }}</h3>
+                    </div>
+                    <div class="box-body table-responsive no-padding">
+                        <table class="table table-hover">
+                            {% for link in links %}
+                                <tr>
+                                    <td>
+                                        <div class="btn-group btn-group-xs">
+                                            <a href="{{ route('attachments.delete', att.id) }}" class="btn btn-danger"><i class="fa fa-trash"></i></a>
+                                        </div>
+                                    </td>
+                                    <td>
+                                        {{ 'this_transaction'|_ }}
+                                         (<a href="{{ route('transactions.show',journal.id) }}">#{{ journal.id }}</a>)
+                                        {% if link.source.id == journal.id %}
+                                            {{ link.linkType.outward }}
+                                            <a href="{{ route('transactions.show',link.destination.id) }}">#{{ link.destination.id }}</a>:
+                                            <a href="{{ route('transactions.show',link.destination.id) }}">{{ link.destination.description }}</a>
+                                            ({{ journalAmount(link.destination) }})
+                                        {% else %}
+                                            {{ link.linkType.inward }}
+                                            <a href="{{ route('transactions.show',link.source.id) }}">#{{ link.source.id }}</a>:
+                                            <a href="{{ route('transactions.show',link.source.id) }}">{{ link.source.description }}</a>
+                                            ({{ journalAmount(link.source) }})
+                                        {% endif %}
+                                        {% if link.comment != "" %}
+                                            <br/><em>{{ link.comment }}</em>
+                                        {% endif %}
+                                    </td>
+                                </tr>
+                            {% endfor %}
+                        </table>
+                    </div>
+                </div>
+                <p>
+
+                </p>
+            {% endif %}
         </div>
     </div>
 
     <div class="row">
         <div class="col-lg-12 col-md-12 col-sm-12">
-
             <div class="box">
                 <div class="box-header with-border">
                     <h3 class="box-title">{{ 'transactions'|_ }}</h3>
@@ -398,7 +440,7 @@
                                 <select id="link_type" class="form-control" name="link_type">
                                     {% for linkType in linkTypes %}
                                         <option label="{{ linkType.inward }}" value="{{ linkType.id }}_inward">{{ linkType.inward }}</option>
-                                        <option label="{{ linkType.outward }}" value="{{ linkType.id }}_inward">{{ linkType.outward }}</option>
+                                        <option label="{{ linkType.outward }}" value="{{ linkType.id }}_outward">{{ linkType.outward }}</option>
                                     {% endfor %}
                                 </select>
                             </div>
@@ -407,6 +449,7 @@
                             <label for="link_other" class="col-sm-2 control-label">{{ 'transaction'|_ }}</label>
                             <div class="col-sm-10">
                                 <input type="text" name="link_other" autocomplete="off" id="link_other" value="" class="form-control">
+                                <p class="help-block">{{ 'to_link_not_found'|_ }}</p>
                                 <input type="hidden" name="link_journal_id" value="0">
                             </div>
                         </div>

From fab5dc64e9a7a8075d9bddcf55eb720b1904d8c8 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Mon, 21 Aug 2017 18:20:31 +0200
Subject: [PATCH 116/668] New translations firefly.php (Russian)

---
 resources/lang/ru_RU/firefly.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/resources/lang/ru_RU/firefly.php b/resources/lang/ru_RU/firefly.php
index 90e139af7d..32671f97b1 100644
--- a/resources/lang/ru_RU/firefly.php
+++ b/resources/lang/ru_RU/firefly.php
@@ -957,7 +957,10 @@ return [
     'this_transaction'                      => 'This transaction',
     'transaction'                           => 'Transaction',
     'comments'                              => 'Comments',
-
+    'to_link_not_found'                     => 'If the transaction you want to link to is not listed, simply enter its ID.',
+    'invalid_link_data'                     => 'Invalid link type selected. Cannot link transaction.',
+    'journals_linked'                       => 'Transactions are linked.',
+    'journals_error_linked'                 => 'These journals are already linked.',
 
     // split a transaction:
     'transaction_meta_data'                 => 'Transaction meta-data',

From 0ea28c646a58094859353e4ca5838206f3a24384 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Mon, 21 Aug 2017 18:20:49 +0200
Subject: [PATCH 117/668] New translations firefly.php (French)

---
 resources/lang/fr_FR/firefly.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/resources/lang/fr_FR/firefly.php b/resources/lang/fr_FR/firefly.php
index b4e42e1e32..9c4b70905a 100644
--- a/resources/lang/fr_FR/firefly.php
+++ b/resources/lang/fr_FR/firefly.php
@@ -957,7 +957,10 @@ return [
     'this_transaction'                      => 'This transaction',
     'transaction'                           => 'Transaction',
     'comments'                              => 'Comments',
-
+    'to_link_not_found'                     => 'If the transaction you want to link to is not listed, simply enter its ID.',
+    'invalid_link_data'                     => 'Invalid link type selected. Cannot link transaction.',
+    'journals_linked'                       => 'Transactions are linked.',
+    'journals_error_linked'                 => 'These journals are already linked.',
 
     // split a transaction:
     'transaction_meta_data'                 => 'Transaction meta-data',

From 6d1ebf3952647e3430f300215babeb3e518eec8f Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Mon, 21 Aug 2017 18:20:52 +0200
Subject: [PATCH 118/668] New translations firefly.php (German)

---
 resources/lang/de_DE/firefly.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/resources/lang/de_DE/firefly.php b/resources/lang/de_DE/firefly.php
index 5b78485524..8f9ed85c7d 100644
--- a/resources/lang/de_DE/firefly.php
+++ b/resources/lang/de_DE/firefly.php
@@ -958,7 +958,10 @@ Sollen zusätzlich Ihre Girokonten angezeigt werden?',
     'this_transaction'                      => 'This transaction',
     'transaction'                           => 'Transaction',
     'comments'                              => 'Comments',
-
+    'to_link_not_found'                     => 'If the transaction you want to link to is not listed, simply enter its ID.',
+    'invalid_link_data'                     => 'Invalid link type selected. Cannot link transaction.',
+    'journals_linked'                       => 'Transactions are linked.',
+    'journals_error_linked'                 => 'These journals are already linked.',
 
     // split a transaction:
     'transaction_meta_data'                 => 'Transaktions Metadaten',

From 5663fd386a1043440ed3de03511908604aa993b3 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Mon, 21 Aug 2017 18:20:55 +0200
Subject: [PATCH 119/668] New translations firefly.php (Dutch)

---
 resources/lang/nl_NL/firefly.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/resources/lang/nl_NL/firefly.php b/resources/lang/nl_NL/firefly.php
index 6cca64e7f1..da4bbef064 100644
--- a/resources/lang/nl_NL/firefly.php
+++ b/resources/lang/nl_NL/firefly.php
@@ -957,7 +957,10 @@ return [
     'this_transaction'                      => 'Deze transactie',
     'transaction'                           => 'Transactie',
     'comments'                              => 'Opmerkingen',
-
+    'to_link_not_found'                     => 'If the transaction you want to link to is not listed, simply enter its ID.',
+    'invalid_link_data'                     => 'Invalid link type selected. Cannot link transaction.',
+    'journals_linked'                       => 'Transactions are linked.',
+    'journals_error_linked'                 => 'These journals are already linked.',
 
     // split a transaction:
     'transaction_meta_data'                 => 'Transactie meta-data',

From 2ccf82749ff83c19d2100d94feda8999916a0243 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Mon, 21 Aug 2017 18:20:58 +0200
Subject: [PATCH 120/668] New translations firefly.php (Chinese Traditional)

---
 resources/lang/zh_TW/firefly.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/resources/lang/zh_TW/firefly.php b/resources/lang/zh_TW/firefly.php
index b17b3c75a5..918637540a 100644
--- a/resources/lang/zh_TW/firefly.php
+++ b/resources/lang/zh_TW/firefly.php
@@ -957,7 +957,10 @@ return [
     'this_transaction'                      => 'This transaction',
     'transaction'                           => 'Transaction',
     'comments'                              => 'Comments',
-
+    'to_link_not_found'                     => 'If the transaction you want to link to is not listed, simply enter its ID.',
+    'invalid_link_data'                     => 'Invalid link type selected. Cannot link transaction.',
+    'journals_linked'                       => 'Transactions are linked.',
+    'journals_error_linked'                 => 'These journals are already linked.',
 
     // split a transaction:
     'transaction_meta_data'                 => 'Transaction meta-data',

From baafba1774c752b7dd58b4554ee74a569cc790b6 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Mon, 21 Aug 2017 18:21:01 +0200
Subject: [PATCH 121/668] New translations firefly.php (Polish)

---
 resources/lang/pl_PL/firefly.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/resources/lang/pl_PL/firefly.php b/resources/lang/pl_PL/firefly.php
index 98a2a063dc..050b1ea817 100644
--- a/resources/lang/pl_PL/firefly.php
+++ b/resources/lang/pl_PL/firefly.php
@@ -957,7 +957,10 @@ return [
     'this_transaction'                      => 'This transaction',
     'transaction'                           => 'Transaction',
     'comments'                              => 'Comments',
-
+    'to_link_not_found'                     => 'If the transaction you want to link to is not listed, simply enter its ID.',
+    'invalid_link_data'                     => 'Invalid link type selected. Cannot link transaction.',
+    'journals_linked'                       => 'Transactions are linked.',
+    'journals_error_linked'                 => 'These journals are already linked.',
 
     // split a transaction:
     'transaction_meta_data'                 => 'Transaction meta-data',

From e3ef729adfebb9c1a021047bfd07470edb58dc03 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Mon, 21 Aug 2017 18:21:04 +0200
Subject: [PATCH 122/668] New translations firefly.php (Portuguese, Brazilian)

---
 resources/lang/pt_BR/firefly.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/resources/lang/pt_BR/firefly.php b/resources/lang/pt_BR/firefly.php
index a9a19a189e..e07e20dda1 100644
--- a/resources/lang/pt_BR/firefly.php
+++ b/resources/lang/pt_BR/firefly.php
@@ -957,7 +957,10 @@ return [
     'this_transaction'                      => 'This transaction',
     'transaction'                           => 'Transaction',
     'comments'                              => 'Comments',
-
+    'to_link_not_found'                     => 'If the transaction you want to link to is not listed, simply enter its ID.',
+    'invalid_link_data'                     => 'Invalid link type selected. Cannot link transaction.',
+    'journals_linked'                       => 'Transactions are linked.',
+    'journals_error_linked'                 => 'These journals are already linked.',
 
     // split a transaction:
     'transaction_meta_data'                 => 'Dados de transação',

From 668ceda86c7b14ee0256c2fbd3eb6225b2e9c375 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Mon, 21 Aug 2017 18:21:09 +0200
Subject: [PATCH 123/668] New translations firefly.php (Spanish)

---
 resources/lang/es_ES/firefly.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/resources/lang/es_ES/firefly.php b/resources/lang/es_ES/firefly.php
index f59551b36e..638bac457e 100644
--- a/resources/lang/es_ES/firefly.php
+++ b/resources/lang/es_ES/firefly.php
@@ -957,7 +957,10 @@ return [
     'this_transaction'                      => 'This transaction',
     'transaction'                           => 'Transaction',
     'comments'                              => 'Comments',
-
+    'to_link_not_found'                     => 'If the transaction you want to link to is not listed, simply enter its ID.',
+    'invalid_link_data'                     => 'Invalid link type selected. Cannot link transaction.',
+    'journals_linked'                       => 'Transactions are linked.',
+    'journals_error_linked'                 => 'These journals are already linked.',
 
     // split a transaction:
     'transaction_meta_data'                 => 'Transaction meta-data',

From 434291b5922c32cb17b2d7691ec5b29728bb6e3c Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Mon, 21 Aug 2017 18:21:12 +0200
Subject: [PATCH 124/668] New translations firefly.php (Slovenian)

---
 resources/lang/sl_SI/firefly.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/resources/lang/sl_SI/firefly.php b/resources/lang/sl_SI/firefly.php
index 474627d335..8fb31716aa 100644
--- a/resources/lang/sl_SI/firefly.php
+++ b/resources/lang/sl_SI/firefly.php
@@ -957,7 +957,10 @@ return [
     'this_transaction'                      => 'This transaction',
     'transaction'                           => 'Transaction',
     'comments'                              => 'Comments',
-
+    'to_link_not_found'                     => 'If the transaction you want to link to is not listed, simply enter its ID.',
+    'invalid_link_data'                     => 'Invalid link type selected. Cannot link transaction.',
+    'journals_linked'                       => 'Transactions are linked.',
+    'journals_error_linked'                 => 'These journals are already linked.',
 
     // split a transaction:
     'transaction_meta_data'                 => 'Transaction meta-data',

From 0aae3498163761958d0c685e638d7bac0d5ac5f8 Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Mon, 21 Aug 2017 18:53:02 +0200
Subject: [PATCH 125/668] Missing translations

---
 resources/lang/en_US/firefly.php       | 5 +++++
 resources/views/transactions/show.twig | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/resources/lang/en_US/firefly.php b/resources/lang/en_US/firefly.php
index e8c9c2386a..e7901bb24d 100644
--- a/resources/lang/en_US/firefly.php
+++ b/resources/lang/en_US/firefly.php
@@ -961,6 +961,11 @@ return [
     'invalid_link_data'                     => 'Invalid link type selected. Cannot link transaction.',
     'journals_linked'                       => 'Transactions are linked.',
     'journals_error_linked'                 => 'These journals are already linked.',
+    'journal_links'                         => 'Transaction links',
+    'this_withdrawal'                       => 'This withdrawal',
+    'this_deposit'                          => 'This deposit',
+    'this_transfer'                         => 'This transfer',
+
 
     // split a transaction:
     'transaction_meta_data'                 => 'Transaction meta-data',
diff --git a/resources/views/transactions/show.twig b/resources/views/transactions/show.twig
index 5a0bc35917..0fdbd5e3de 100644
--- a/resources/views/transactions/show.twig
+++ b/resources/views/transactions/show.twig
@@ -326,7 +326,7 @@
                                         </div>
                                     </td>
                                     <td>
-                                        {{ 'this_transaction'|_ }}
+                                        {{ ('this_'~(what|lower))|_ }}
                                          (<a href="{{ route('transactions.show',journal.id) }}">#{{ journal.id }}</a>)
                                         {% if link.source.id == journal.id %}
                                             {{ link.linkType.outward }}

From 1a89e379a4869c91483c22706623884e2d76deeb Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Mon, 21 Aug 2017 18:55:25 +0200
Subject: [PATCH 126/668] Language fix [skip ci]

---
 resources/lang/en_US/firefly.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/en_US/firefly.php b/resources/lang/en_US/firefly.php
index e7901bb24d..aedee71623 100644
--- a/resources/lang/en_US/firefly.php
+++ b/resources/lang/en_US/firefly.php
@@ -960,7 +960,7 @@ return [
     'to_link_not_found'                     => 'If the transaction you want to link to is not listed, simply enter its ID.',
     'invalid_link_data'                     => 'Invalid link type selected. Cannot link transaction.',
     'journals_linked'                       => 'Transactions are linked.',
-    'journals_error_linked'                 => 'These journals are already linked.',
+    'journals_error_linked'                 => 'These transactions are already linked.',
     'journal_links'                         => 'Transaction links',
     'this_withdrawal'                       => 'This withdrawal',
     'this_deposit'                          => 'This deposit',

From 36778bb87e194eae809ea3b86d48f48496c30557 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Mon, 21 Aug 2017 19:00:23 +0200
Subject: [PATCH 127/668] New translations firefly.php (Dutch)

---
 resources/lang/nl_NL/firefly.php | 39 ++++++++++++++++++--------------
 1 file changed, 22 insertions(+), 17 deletions(-)

diff --git a/resources/lang/nl_NL/firefly.php b/resources/lang/nl_NL/firefly.php
index da4bbef064..bff0dd8616 100644
--- a/resources/lang/nl_NL/firefly.php
+++ b/resources/lang/nl_NL/firefly.php
@@ -936,31 +936,36 @@ return [
     'block_code_expired'                    => 'Demo-account verlopen',
     'no_block_code'                         => 'Geen reden of gebruiker niet geblokkeerd',
     // links
-    'journal_link_configuration'            => 'Instellingen voor transactielinks',
-    'create_new_link_type'                  => 'Maak nieuw linktype',
-    'store_new_link_type'                   => 'Sla nieuw linktype op',
-    'update_link_type'                      => 'Update linktype',
+    'journal_link_configuration'            => 'Instellingen voor transactiekoppelingen',
+    'create_new_link_type'                  => 'Maak nieuw koppeltype',
+    'store_new_link_type'                   => 'Sla nieuw koppeltype op',
+    'update_link_type'                      => 'Update koppeltype',
     'edit_link_type'                        => 'Wijzig linktype ":name"',
-    'updated_link_type'                     => 'Linktype ":name" gewijzigd',
-    'delete_link_type'                      => 'Linktype ":name" verwijderd',
-    'deleted_link_type'                     => 'Linktype ":name" verwijderd',
-    'stored_new_link_type'                  => 'Linktype ":name" opgeslagen',
-    'cannot_edit_link_type'                 => 'Kan linktype ":name" niet wijzigen',
+    'updated_link_type'                     => 'Koppeltype ":name" gewijzigd',
+    'delete_link_type'                      => 'Koppeltype ":name" verwijderen',
+    'deleted_link_type'                     => 'Koppeltype ":name" verwijderd',
+    'stored_new_link_type'                  => 'Koppeltype ":name" opgeslagen',
+    'cannot_edit_link_type'                 => 'Kan koppeltype ":name" niet wijzigen',
     'link_type_help_name'                   => 'Bijv. "Dupliceert"',
     'link_type_help_inward'                 => 'Bijv. "dupliceert"',
     'link_type_help_outward'                => 'Bijv. "is duplicaat van"',
     'save_connections_by_moving'            => 'Sla de link tussen deze transactie(s) op door ze te op te slaan onder een ander linktype:',
-    'do_not_save_connection'                => '(gooi ook links weg)',
-    'link_transaction'                      => 'Link transactie',
-    'link_to_other_transaction'             => 'Link deze transactie aan een andere transactie',
-    'select_transaction_to_link'            => 'Selecteer een transactie om deze transactie aan te linken',
+    'do_not_save_connection'                => '(gooi ook koppelingen weg)',
+    'link_transaction'                      => 'Koppel transactie',
+    'link_to_other_transaction'             => 'Koppel deze transactie aan een andere transactie',
+    'select_transaction_to_link'            => 'Selecteer een transactie om deze transactie aan te koppelen',
     'this_transaction'                      => 'Deze transactie',
     'transaction'                           => 'Transactie',
     'comments'                              => 'Opmerkingen',
-    'to_link_not_found'                     => 'If the transaction you want to link to is not listed, simply enter its ID.',
-    'invalid_link_data'                     => 'Invalid link type selected. Cannot link transaction.',
-    'journals_linked'                       => 'Transactions are linked.',
-    'journals_error_linked'                 => 'These journals are already linked.',
+    'to_link_not_found'                     => 'Als de transactie die je wilt koppelen niet gevonden wordt, voer dan het ID in.',
+    'invalid_link_data'                     => 'Ongeldige informatie, de transactie kan niet gekoppeld worden.',
+    'journals_linked'                       => 'De transacties zijn gekoppeld.',
+    'journals_error_linked'                 => 'These transactions are already linked.',
+    'journal_links'                         => 'Transaction links',
+    'this_withdrawal'                       => 'This withdrawal',
+    'this_deposit'                          => 'This deposit',
+    'this_transfer'                         => 'This transfer',
+
 
     // split a transaction:
     'transaction_meta_data'                 => 'Transactie meta-data',

From c3f8573950de4e9b307433aa596d3de77afeed60 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Mon, 21 Aug 2017 19:00:29 +0200
Subject: [PATCH 128/668] New translations firefly.php (Russian)

---
 resources/lang/ru_RU/firefly.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/resources/lang/ru_RU/firefly.php b/resources/lang/ru_RU/firefly.php
index 32671f97b1..000bf46200 100644
--- a/resources/lang/ru_RU/firefly.php
+++ b/resources/lang/ru_RU/firefly.php
@@ -960,7 +960,12 @@ return [
     'to_link_not_found'                     => 'If the transaction you want to link to is not listed, simply enter its ID.',
     'invalid_link_data'                     => 'Invalid link type selected. Cannot link transaction.',
     'journals_linked'                       => 'Transactions are linked.',
-    'journals_error_linked'                 => 'These journals are already linked.',
+    'journals_error_linked'                 => 'These transactions are already linked.',
+    'journal_links'                         => 'Transaction links',
+    'this_withdrawal'                       => 'This withdrawal',
+    'this_deposit'                          => 'This deposit',
+    'this_transfer'                         => 'This transfer',
+
 
     // split a transaction:
     'transaction_meta_data'                 => 'Transaction meta-data',

From a3884930308fe394487f2c740b16bdf744369ac4 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Mon, 21 Aug 2017 19:00:46 +0200
Subject: [PATCH 129/668] New translations firefly.php (French)

---
 resources/lang/fr_FR/firefly.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/resources/lang/fr_FR/firefly.php b/resources/lang/fr_FR/firefly.php
index 9c4b70905a..16a163d0bd 100644
--- a/resources/lang/fr_FR/firefly.php
+++ b/resources/lang/fr_FR/firefly.php
@@ -960,7 +960,12 @@ return [
     'to_link_not_found'                     => 'If the transaction you want to link to is not listed, simply enter its ID.',
     'invalid_link_data'                     => 'Invalid link type selected. Cannot link transaction.',
     'journals_linked'                       => 'Transactions are linked.',
-    'journals_error_linked'                 => 'These journals are already linked.',
+    'journals_error_linked'                 => 'These transactions are already linked.',
+    'journal_links'                         => 'Transaction links',
+    'this_withdrawal'                       => 'This withdrawal',
+    'this_deposit'                          => 'This deposit',
+    'this_transfer'                         => 'This transfer',
+
 
     // split a transaction:
     'transaction_meta_data'                 => 'Transaction meta-data',

From 18aeda47130857ec74758baaa37e6d3cd8d3bd61 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Mon, 21 Aug 2017 19:00:49 +0200
Subject: [PATCH 130/668] New translations firefly.php (German)

---
 resources/lang/de_DE/firefly.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/resources/lang/de_DE/firefly.php b/resources/lang/de_DE/firefly.php
index 8f9ed85c7d..c337d36d87 100644
--- a/resources/lang/de_DE/firefly.php
+++ b/resources/lang/de_DE/firefly.php
@@ -961,7 +961,12 @@ Sollen zusätzlich Ihre Girokonten angezeigt werden?',
     'to_link_not_found'                     => 'If the transaction you want to link to is not listed, simply enter its ID.',
     'invalid_link_data'                     => 'Invalid link type selected. Cannot link transaction.',
     'journals_linked'                       => 'Transactions are linked.',
-    'journals_error_linked'                 => 'These journals are already linked.',
+    'journals_error_linked'                 => 'These transactions are already linked.',
+    'journal_links'                         => 'Transaction links',
+    'this_withdrawal'                       => 'This withdrawal',
+    'this_deposit'                          => 'This deposit',
+    'this_transfer'                         => 'This transfer',
+
 
     // split a transaction:
     'transaction_meta_data'                 => 'Transaktions Metadaten',

From 82eb923689f932d4c89e7fb1c17a4a3a5f09a769 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Tue, 22 Aug 2017 14:10:21 +0200
Subject: [PATCH 131/668] New translations firefly.php (Spanish)

---
 resources/lang/es_ES/firefly.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/resources/lang/es_ES/firefly.php b/resources/lang/es_ES/firefly.php
index 638bac457e..76308dc060 100644
--- a/resources/lang/es_ES/firefly.php
+++ b/resources/lang/es_ES/firefly.php
@@ -960,7 +960,12 @@ return [
     'to_link_not_found'                     => 'If the transaction you want to link to is not listed, simply enter its ID.',
     'invalid_link_data'                     => 'Invalid link type selected. Cannot link transaction.',
     'journals_linked'                       => 'Transactions are linked.',
-    'journals_error_linked'                 => 'These journals are already linked.',
+    'journals_error_linked'                 => 'These transactions are already linked.',
+    'journal_links'                         => 'Transaction links',
+    'this_withdrawal'                       => 'This withdrawal',
+    'this_deposit'                          => 'This deposit',
+    'this_transfer'                         => 'This transfer',
+
 
     // split a transaction:
     'transaction_meta_data'                 => 'Transaction meta-data',

From 670ac4a34fe5ac682d80c719c3ac1609e45520fd Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Tue, 22 Aug 2017 14:10:27 +0200
Subject: [PATCH 132/668] New translations firefly.php (Slovenian)

---
 resources/lang/sl_SI/firefly.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/resources/lang/sl_SI/firefly.php b/resources/lang/sl_SI/firefly.php
index 8fb31716aa..5b4f73880e 100644
--- a/resources/lang/sl_SI/firefly.php
+++ b/resources/lang/sl_SI/firefly.php
@@ -960,7 +960,12 @@ return [
     'to_link_not_found'                     => 'If the transaction you want to link to is not listed, simply enter its ID.',
     'invalid_link_data'                     => 'Invalid link type selected. Cannot link transaction.',
     'journals_linked'                       => 'Transactions are linked.',
-    'journals_error_linked'                 => 'These journals are already linked.',
+    'journals_error_linked'                 => 'These transactions are already linked.',
+    'journal_links'                         => 'Transaction links',
+    'this_withdrawal'                       => 'This withdrawal',
+    'this_deposit'                          => 'This deposit',
+    'this_transfer'                         => 'This transfer',
+
 
     // split a transaction:
     'transaction_meta_data'                 => 'Transaction meta-data',

From 8b24716372f58dfb2b2ab6c9ec593374a78f6eb2 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Tue, 22 Aug 2017 14:10:31 +0200
Subject: [PATCH 133/668] New translations firefly.php (Portuguese, Brazilian)

---
 resources/lang/pt_BR/firefly.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/resources/lang/pt_BR/firefly.php b/resources/lang/pt_BR/firefly.php
index e07e20dda1..d6a223377f 100644
--- a/resources/lang/pt_BR/firefly.php
+++ b/resources/lang/pt_BR/firefly.php
@@ -960,7 +960,12 @@ return [
     'to_link_not_found'                     => 'If the transaction you want to link to is not listed, simply enter its ID.',
     'invalid_link_data'                     => 'Invalid link type selected. Cannot link transaction.',
     'journals_linked'                       => 'Transactions are linked.',
-    'journals_error_linked'                 => 'These journals are already linked.',
+    'journals_error_linked'                 => 'These transactions are already linked.',
+    'journal_links'                         => 'Transaction links',
+    'this_withdrawal'                       => 'This withdrawal',
+    'this_deposit'                          => 'This deposit',
+    'this_transfer'                         => 'This transfer',
+
 
     // split a transaction:
     'transaction_meta_data'                 => 'Dados de transação',

From 83fa13ea4b5f3da5cfa941ee91771c059536ce27 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Tue, 22 Aug 2017 14:10:35 +0200
Subject: [PATCH 134/668] New translations firefly.php (Chinese Traditional)

---
 resources/lang/zh_TW/firefly.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/resources/lang/zh_TW/firefly.php b/resources/lang/zh_TW/firefly.php
index 918637540a..4ea95fe25d 100644
--- a/resources/lang/zh_TW/firefly.php
+++ b/resources/lang/zh_TW/firefly.php
@@ -960,7 +960,12 @@ return [
     'to_link_not_found'                     => 'If the transaction you want to link to is not listed, simply enter its ID.',
     'invalid_link_data'                     => 'Invalid link type selected. Cannot link transaction.',
     'journals_linked'                       => 'Transactions are linked.',
-    'journals_error_linked'                 => 'These journals are already linked.',
+    'journals_error_linked'                 => 'These transactions are already linked.',
+    'journal_links'                         => 'Transaction links',
+    'this_withdrawal'                       => 'This withdrawal',
+    'this_deposit'                          => 'This deposit',
+    'this_transfer'                         => 'This transfer',
+
 
     // split a transaction:
     'transaction_meta_data'                 => 'Transaction meta-data',

From 875d5d50b8fa27016c038fed4cfbcf85d4685816 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Tue, 22 Aug 2017 14:10:39 +0200
Subject: [PATCH 135/668] New translations firefly.php (French)

---
 resources/lang/fr_FR/firefly.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/resources/lang/fr_FR/firefly.php b/resources/lang/fr_FR/firefly.php
index 16a163d0bd..f95b6a4a89 100644
--- a/resources/lang/fr_FR/firefly.php
+++ b/resources/lang/fr_FR/firefly.php
@@ -456,9 +456,9 @@ return [
     'convert_to_Deposit'                         => 'Convertir ":description" vers un dépôt',
     'convert_to_Transfer'                        => 'Convertir ":description" vers un transfert',
     'convert_options_WithdrawalDeposit'          => 'Convertir un retrait en dépôt',
-    'convert_options_WithdrawalTransfer'         => 'Convert a withdrawal into a transfer',
-    'convert_options_DepositTransfer'            => 'Convert a deposit into a transfer',
-    'convert_options_DepositWithdrawal'          => 'Convert a deposit into a withdrawal',
+    'convert_options_WithdrawalTransfer'         => 'Convertir un retrait en transfert',
+    'convert_options_DepositTransfer'            => 'Convertir un dépôt en transfert',
+    'convert_options_DepositWithdrawal'          => 'Convertir un dépôt en retrait',
     'convert_options_TransferWithdrawal'         => 'Convert a transfer into a withdrawal',
     'convert_options_TransferDeposit'            => 'Convert a transfer into a deposit',
     'transaction_journal_convert_options'        => 'Convertir cette transaction',

From 92ddf9bb2d05910ecc5c689dcaabe2626afa0d9a Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Tue, 22 Aug 2017 14:10:44 +0200
Subject: [PATCH 136/668] New translations firefly.php (Polish)

---
 resources/lang/pl_PL/firefly.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/resources/lang/pl_PL/firefly.php b/resources/lang/pl_PL/firefly.php
index 050b1ea817..099f0e3c10 100644
--- a/resources/lang/pl_PL/firefly.php
+++ b/resources/lang/pl_PL/firefly.php
@@ -960,7 +960,12 @@ return [
     'to_link_not_found'                     => 'If the transaction you want to link to is not listed, simply enter its ID.',
     'invalid_link_data'                     => 'Invalid link type selected. Cannot link transaction.',
     'journals_linked'                       => 'Transactions are linked.',
-    'journals_error_linked'                 => 'These journals are already linked.',
+    'journals_error_linked'                 => 'These transactions are already linked.',
+    'journal_links'                         => 'Transaction links',
+    'this_withdrawal'                       => 'This withdrawal',
+    'this_deposit'                          => 'This deposit',
+    'this_transfer'                         => 'This transfer',
+
 
     // split a transaction:
     'transaction_meta_data'                 => 'Transaction meta-data',

From ef29d4efe8810cfc538e8a636d9afacc16d48b75 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Tue, 22 Aug 2017 14:20:13 +0200
Subject: [PATCH 137/668] New translations firefly.php (French)

---
 resources/lang/fr_FR/firefly.php | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/resources/lang/fr_FR/firefly.php b/resources/lang/fr_FR/firefly.php
index f95b6a4a89..cd17a14308 100644
--- a/resources/lang/fr_FR/firefly.php
+++ b/resources/lang/fr_FR/firefly.php
@@ -459,25 +459,25 @@ return [
     'convert_options_WithdrawalTransfer'         => 'Convertir un retrait en transfert',
     'convert_options_DepositTransfer'            => 'Convertir un dépôt en transfert',
     'convert_options_DepositWithdrawal'          => 'Convertir un dépôt en retrait',
-    'convert_options_TransferWithdrawal'         => 'Convert a transfer into a withdrawal',
-    'convert_options_TransferDeposit'            => 'Convert a transfer into a deposit',
+    'convert_options_TransferWithdrawal'         => 'Convertir un transfert en retrait',
+    'convert_options_TransferDeposit'            => 'Convertir un transfert en dépôt',
     'transaction_journal_convert_options'        => 'Convertir cette transaction',
     'convert_Withdrawal_to_deposit'              => 'Convertir ce retrait en dépôt',
     'convert_Withdrawal_to_transfer'             => 'Convertir ce retrait en transfert',
     'convert_Deposit_to_withdrawal'              => 'Convertir ce dépôt en retrait',
-    'convert_Deposit_to_transfer'                => 'Convert this deposit to a transfer',
-    'convert_Transfer_to_deposit'                => 'Convert this transfer to a deposit',
-    'convert_Transfer_to_withdrawal'             => 'Convert this transfer to a withdrawal',
-    'convert_please_set_revenue_source'          => 'Please pick the revenue account where the money will come from.',
-    'convert_please_set_asset_destination'       => 'Please pick the asset account where the money will go to.',
-    'convert_please_set_expense_destination'     => 'Please pick the expense account where the money will go to.',
-    'convert_please_set_asset_source'            => 'Please pick the asset account where the money will come from.',
-    'convert_explanation_withdrawal_deposit'     => 'If you convert this withdrawal into a deposit, :amount will be deposited into <a href=":sourceRoute">:sourceName</a> instead of taken from it.',
-    'convert_explanation_withdrawal_transfer'    => 'If you convert this withdrawal into a transfer, :amount will be transferred from <a href=":sourceRoute">:sourceName</a> to a new asset account, instead of being paid to <a href=":destinationRoute">:destinationName</a>.',
-    'convert_explanation_deposit_withdrawal'     => 'If you convert this deposit into a withdrawal, :amount will be removed from <a href=":destinationRoute">:destinationName</a> instead of added to it.',
-    'convert_explanation_deposit_transfer'       => 'If you convert this deposit into a transfer, :amount will be transferred from an asset account of your choice into <a href=":destinationRoute">:destinationName</a>.',
-    'convert_explanation_transfer_withdrawal'    => 'If you convert this transfer into a withdrawal, :amount will go from <a href=":sourceRoute">:sourceName</a> to a new destination as an expense, instead of to <a href=":destinationRoute">:destinationName</a> as a transfer.',
-    'convert_explanation_transfer_deposit'       => 'If you convert this transfer into a deposit, :amount will be deposited into account <a href=":destinationRoute">:destinationName</a> instead of being transferred there.',
+    'convert_Deposit_to_transfer'                => 'Convertir ce dépôt en transfert',
+    'convert_Transfer_to_deposit'                => 'Convertir ce transfert en dépôt',
+    'convert_Transfer_to_withdrawal'             => 'Convertir ce transfert en retrait',
+    'convert_please_set_revenue_source'          => 'Veuillez choisir le compte de recettes d\'où proviendra l’argent.',
+    'convert_please_set_asset_destination'       => 'Veuillez choisir le compte d\'actifs auquel l\'argent sera versé.',
+    'convert_please_set_expense_destination'     => 'Veuillez choisir le compte de dépense auquel l\'argent sera versé.',
+    'convert_please_set_asset_source'            => 'Veuillez choisir le compte d’actif d\'où proviendra l’argent.',
+    'convert_explanation_withdrawal_deposit'     => 'Si vous convertissez ce retrait en dépôt, :amount sera déposé dans <a href=":sourceRoute">:sourceName</a> au lieu de le retirer.',
+    'convert_explanation_withdrawal_transfer'    => 'Si vous convertissez ce retrait en transfert, :amount sera transféré de <a href=":sourceRoute">:sourceName</a> vers un nouveau compte d\'actif, au lieu d\'être payé à <a href=":destinationRoute">:DestinationName </a>.',
+    'convert_explanation_deposit_withdrawal'     => 'Si vous convertissez ce dépôt dans un retrait :amount sera supprimé de <a href=":destinationRoute">:destinationName</a> au lieu d\'y être ajouté.',
+    'convert_explanation_deposit_transfer'       => 'Si vous convertissez ce dépôt en transfert, :amount sera transféré d\'un compte d\'actif de votre choix en <a href=":destinationRoute">: destinationName</a>.',
+    'convert_explanation_transfer_withdrawal'    => 'Si vous convertissez ce transfert en retrait, le montant passera de <a href=":sourceRoute">:sourceName</a> à une nouvelle destination comme une dépense, au lieu de <a href=":destinationRoute">:destinationName </a> en tant que transfert.',
+    'convert_explanation_transfer_deposit'       => 'Si vous convertissez ce transfert en dépôt, :amount sera déposé dans le compte <a href=":destinationRoute">:destinationName</a> au lieu d\'y être transféré.',
     'converted_to_Withdrawal'                    => 'The transaction has been converted to a withdrawal',
     'converted_to_Deposit'                       => 'The transaction has been converted to a deposit',
     'converted_to_Transfer'                      => 'The transaction has been converted to a transfer',

From b50d97c3b707b2cd08c843af94522636e7815b76 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Tue, 22 Aug 2017 14:30:16 +0200
Subject: [PATCH 138/668] New translations firefly.php (French)

---
 resources/lang/fr_FR/firefly.php | 34 ++++++++++++++++----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/resources/lang/fr_FR/firefly.php b/resources/lang/fr_FR/firefly.php
index cd17a14308..d307538a29 100644
--- a/resources/lang/fr_FR/firefly.php
+++ b/resources/lang/fr_FR/firefly.php
@@ -478,9 +478,9 @@ return [
     'convert_explanation_deposit_transfer'       => 'Si vous convertissez ce dépôt en transfert, :amount sera transféré d\'un compte d\'actif de votre choix en <a href=":destinationRoute">: destinationName</a>.',
     'convert_explanation_transfer_withdrawal'    => 'Si vous convertissez ce transfert en retrait, le montant passera de <a href=":sourceRoute">:sourceName</a> à une nouvelle destination comme une dépense, au lieu de <a href=":destinationRoute">:destinationName </a> en tant que transfert.',
     'convert_explanation_transfer_deposit'       => 'Si vous convertissez ce transfert en dépôt, :amount sera déposé dans le compte <a href=":destinationRoute">:destinationName</a> au lieu d\'y être transféré.',
-    'converted_to_Withdrawal'                    => 'The transaction has been converted to a withdrawal',
-    'converted_to_Deposit'                       => 'The transaction has been converted to a deposit',
-    'converted_to_Transfer'                      => 'The transaction has been converted to a transfer',
+    'converted_to_Withdrawal'                    => 'La transaction a été convertie en retrait',
+    'converted_to_Deposit'                       => 'La transaction a été convertie en dépôt',
+    'converted_to_Transfer'                      => 'La transaction a été convertie en transfert',
 
 
     // create new stuff:
@@ -531,10 +531,10 @@ return [
     'update_amount'                              => 'Mettre à jour le montant',
     'update_budget'                              => 'Mettre à jour le budget',
     'update_budget_amount_range'                 => 'Mettre à jour le montant disponible (prévu) entre le :start et le :end',
-    'budget_period_navigator'                    => 'Period navigator',
+    'budget_period_navigator'                    => 'Navigateur d\'époque',
 
     // bills:
-    'matching_on'                                => 'Matching on',
+    'matching_on'                                => 'Correspond à',
     'between_amounts'                            => 'entre :low et :high.',
     'repeats'                                    => 'Répétitions',
     'connected_journals'                         => 'Opérations liées',
@@ -553,11 +553,11 @@ return [
     'cannot_scan_inactive_bill'                  => 'Les factures inactives ne peuvent pas être analysées.',
     'rescanned_bill'                             => 'Réanalyser tout.',
     'average_bill_amount_year'                   => 'Montant moyen des factures ( :year)',
-    'average_bill_amount_overall'                => 'Average bill amount (overall)',
-    'not_or_not_yet'                             => 'Not (yet)',
-    'not_expected_period'                        => 'Not expected this period',
-    'bill_is_active'                             => 'Bill is active',
-    'bill_will_automatch'                        => 'Bill will automatically linked to matching transactions',
+    'average_bill_amount_overall'                => 'Montant moyen de la facture (global)',
+    'not_or_not_yet'                             => 'Pas du tout (pas encore)',
+    'not_expected_period'                        => 'Cette période n\'est pas prévu',
+    'bill_is_active'                             => 'Facture en cours',
+    'bill_will_automatch'                        => 'La facture sera automatiquement liée aux transactions correspondantes',
     // accounts:
     'details_for_asset'                          => 'Détails pour le compte d’actif ":name"',
     'details_for_expense'                        => 'Détail du compte de dépenses ":name"',
@@ -591,15 +591,15 @@ return [
     'stored_new_account'                         => 'Nouveau compte ":name" créé !',
     'updated_account'                            => 'Nom du compte ":name"',
     'credit_card_options'                        => 'Cartes de crédit',
-    'no_transactions_account'                    => 'There are no transactions (in this period) for asset account ":name".',
-    'no_data_for_chart'                          => 'There is not enough information (yet) to generate this chart.',
-    'select_more_than_one_account'               => 'Please select more than one account',
-    'select_more_than_one_category'              => 'Please select more than one category',
-    'select_more_than_one_budget'                => 'Please select more than one budget',
-    'select_more_than_one_tag'                   => 'Please select more than one tag',
+    'no_transactions_account'                    => 'Il n\'y a pas de transactions (dans cette période) pour le compte d\'actif ":name".',
+    'no_data_for_chart'                          => 'Il n\'y a pas assez d\'informations (pour le moment) pour générer ce graphique.',
+    'select_more_than_one_account'               => 'Veuillez sélectionner plus d\'un compte',
+    'select_more_than_one_category'              => 'Veuillez sélectionner plus d\'une catégorie',
+    'select_more_than_one_budget'                => 'Veuillez sélectionner plus d\'un budget',
+    'select_more_than_one_tag'                   => 'Veuillez sélectionner plus d\'un tag',
     'from_to'                                    => 'De :start à :end',
     'from_to_breadcrumb'                         => 'de :start à :end',
-    'account_default_currency'                   => 'If you select another currency, new transactions from this account will have this currency pre-selected.',
+    'account_default_currency'                   => 'Si vous sélectionnez une autre monnaie, les nouvelles transactions de ce compte auront cette monnaie pré-sélectionnées.',
 
     // categories:
     'new_category'                               => 'Nouvelle catégorie',

From 3936251363a0a49fdf1043dcbada275d830deb9e Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Tue, 22 Aug 2017 14:40:09 +0200
Subject: [PATCH 139/668] New translations firefly.php (French)

---
 resources/lang/fr_FR/firefly.php | 52 ++++++++++++++++----------------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/resources/lang/fr_FR/firefly.php b/resources/lang/fr_FR/firefly.php
index d307538a29..acf1611e56 100644
--- a/resources/lang/fr_FR/firefly.php
+++ b/resources/lang/fr_FR/firefly.php
@@ -614,7 +614,7 @@ return [
     'delete_category'                            => 'Supprimer la catégorie ":name"',
     'deleted_category'                           => 'Catégorie ":name" supprimée',
     'store_category'                             => 'Créer une nouvelle catgorie',
-    'stored_category'                            => 'Stored new category ":name"',
+    'stored_category'                            => 'Nouvelle catégorie stockée ":name"',
     'without_category_between'                   => 'Sans catégorie entre :start et :end',
 
     // transactions:
@@ -632,13 +632,13 @@ return [
     'deleted_transfer'                           => 'Opération ":name" correctement supprimée',
     'stored_journal'                             => 'Opération créée avec succès ":description"',
     'select_transactions'                        => 'Sélectionner des opérations',
-    'stop_selection'                             => 'Stop selecting transactions',
+    'stop_selection'                             => 'Arrêter de sélectionner les transactions',
     'edit_selected'                              => 'Modifier la sélection',
     'delete_selected'                            => 'Supprimer la sélection',
     'mass_delete_journals'                       => 'Supprimer un certain nombre de transactions',
     'mass_edit_journals'                         => 'Modifier un certain nombre d’opérations',
     'cannot_edit_other_fields'                   => 'Vous ne peut pas modifier en masse d\'autres champs que ceux ici, car il n’y a pas de place pour tous les montrer. S’il vous plaît suivez le lien et modifiez les par un par un, si vous devez modifier ces champs.',
-    'perm-delete-many'                           => 'Deleting many items in one go can be very disruptive. Please be cautious.',
+    'perm-delete-many'                           => 'Supprimer de nombreux éléments en une seule fois peut être très problématique. Soyez prudent.',
     'mass_deleted_transactions_success'          => 'Montant des opérations supprimées : :amount.',
     'mass_edited_transactions_success'           => 'Montant des opérations mises à jour : :amount',
 
@@ -647,9 +647,9 @@ return [
     'welcome'                                    => 'Bienvenue sur Firefly !',
     'submit'                                     => 'Soumettre',
     'getting_started'                            => 'Mise en route',
-    'to_get_started'                             => 'It is good to see you have successfully installed Firefly III. To get started with this tool please enter your bank\'s name and the balance of your main checking account. Do not worry yet if you have multiple accounts. You can add those later. It\'s just that Firefly III needs something to start with.',
-    'savings_balance_text'                       => 'Firefly III will automatically create a savings account for you. By default, there will be no money in your savings account, but if you tell Firefly III the balance it will be stored as such.',
-    'finish_up_new_user'                         => 'That\'s it! You can continue by pressing <strong>Submit</strong>. You will be taken to the index of Firefly III.',
+    'to_get_started'                             => 'Il est bon de voir que vous avez installé Firefly III avec succès. Pour commencer avec cet outil, entrez le nom de votre banque et le solde de votre compte courant principal. Ne vous inquiétez pas encore si vous avez plusieurs comptes. Vous pouvez les ajouter plus tard. C\'est juste que Firefly III a besoin de quelque chose pour commencer.',
+    'savings_balance_text'                       => 'Firefly III créera automatiquement un compte d\'épargne pour vous. Par défaut, il n\'y aura pas d\'argent dans votre compte d\'épargne, mais si vous dites à Firefly III, le solde sera stocké en tant que tel.',
+    'finish_up_new_user'                         => 'C\'est tout ! Vous pouvez continuer en appuyant sur <strong>Envoyer</strong>. Vous passerez à l\'index de Firefly III.',
     'stored_new_accounts_new_user'               => 'Super ! Vos nouveaux comptes ont été créé.',
 
     // home page:
@@ -711,18 +711,18 @@ return [
     'errors'                                     => 'Erreurs',
 
     // reports:
-    'report_default'                             => 'Default financial report between :start and :end',
-    'report_audit'                               => 'Transaction history overview between :start and :end',
-    'report_category'                            => 'Category report between :start and :end',
-    'report_budget'                              => 'Budget report between :start and :end',
-    'report_tag'                                 => 'Tag report between :start and :end',
+    'report_default'                             => 'Rapport financier par défaut entre :start et :end',
+    'report_audit'                               => 'Aperçu de l\'historique des transactions entre :start et :end',
+    'report_category'                            => 'Rapport de catégorie entre :start et :end',
+    'report_budget'                              => 'Rapport du budget entre :start et :end',
+    'report_tag'                                 => 'Marquer le rapport entre :start and :end',
     'quick_link_reports'                         => 'Liens rapides',
     'quick_link_default_report'                  => 'Rapport financier par défaut',
     'quick_link_audit_report'                    => 'Historique des transactions',
     'report_this_month_quick'                    => 'Mois en cours, tous les comptes',
     'report_this_year_quick'                     => 'Année en cours, tous les comptes',
     'report_this_fiscal_year_quick'              => 'Année fiscale en cours, tous les comptes',
-    'report_all_time_quick'                      => 'All-time, all accounts',
+    'report_all_time_quick'                      => 'Tous les temps, tous les comptes',
     'reports_can_bookmark'                       => 'N’oubliez pas que les rapports peuvent être mis en signet.',
     'incomeVsExpenses'                           => 'Revenus vs dépenses',
     'accountBalances'                            => 'Solde du compte',
@@ -734,8 +734,8 @@ return [
     'balanceEnd'                                 => 'Solde à la fin de la période',
     'reportsOwnAccounts'                         => 'Rapport pour vos propres comptes',
     'reportsOwnAccountsAndShared'                => 'Rapport pour vos comptes et ceux partagés',
-    'splitByAccount'                             => 'Split by account',
-    'balancedByTransfersAndTags'                 => 'Balanced by transfers and tags',
+    'splitByAccount'                             => 'Divisé par compte',
+    'balancedByTransfersAndTags'                 => 'Équilibré par des transferts et des tags',
     'coveredWithTags'                            => 'Covered with tags',
     'leftUnbalanced'                             => 'Left unbalanced',
     'expectedBalance'                            => 'Solde attendu',
@@ -816,20 +816,20 @@ return [
     'account_role_ccAsset'                       => 'Credit card',
 
     // charts:
-    'chart'                                      => 'Chart',
+    'chart'                                      => 'Diagramme',
     'dayOfMonth'                                 => 'Jour du mois',
     'month'                                      => 'Mois',
     'budget'                                     => 'Budget',
     'spent'                                      => 'Dépensé',
-    'spent_in_budget'                            => 'Spent in budget',
-    'left_to_spend'                              => 'Left to spend',
+    'spent_in_budget'                            => 'Dépensé dans le budget',
+    'left_to_spend'                              => 'Restant à dépenser',
     'earned'                                     => 'Gagné',
-    'overspent'                                  => 'Overspent',
+    'overspent'                                  => 'Trop dépensé',
     'left'                                       => 'Gauche',
     'no_budget'                                  => '(pas de budget)',
-    'max-amount'                                 => 'Maximum amount',
-    'min-amount'                                 => 'Minumum amount',
-    'journal-amount'                             => 'Current bill entry',
+    'max-amount'                                 => 'Montant maximum',
+    'min-amount'                                 => 'Montant minimum',
+    'journal-amount'                             => 'Entrée de facture courante',
     'name'                                       => 'Nom',
     'date'                                       => 'Date',
     'paid'                                       => 'Payé',
@@ -837,8 +837,8 @@ return [
     'day'                                        => 'Jour',
     'budgeted'                                   => 'Budgétisé',
     'period'                                     => 'Période',
-    'balance'                                    => 'Balance',
-    'summary'                                    => 'Summary',
+    'balance'                                    => 'Solde',
+    'summary'                                    => 'Résumé',
     'sum'                                        => 'Somme',
     'average'                                    => 'Moyenne',
     'balanceFor'                                 => 'Balance pour :name',
@@ -892,9 +892,9 @@ return [
     'deleted_tag'                => 'Tag ":tag" supprimé',
     'new_tag'                    => 'Créer un nouveau tag',
     'edit_tag'                   => 'Modifier le tag ":tag"',
-    'updated_tag'                => 'Updated tag ":tag"',
-    'created_tag'                => 'Tag ":tag" has been created!',
-    'no_year'                    => 'No year set',
+    'updated_tag'                => 'Mise à jour de la balise ": tag"',
+    'created_tag'                => 'Tag ":tag" a été créé !',
+    'no_year'                    => 'Aucune année définie',
     'no_month'                   => 'No month set',
     'tag_title_nothing'          => 'Tags par défaut',
     'tag_title_balancingAct'     => 'Balancing act tags',

From bf6b12cf57741963e9a2e9c203ead3b1bdc81062 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Tue, 22 Aug 2017 14:50:06 +0200
Subject: [PATCH 140/668] New translations form.php (French)

---
 resources/lang/fr_FR/form.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/resources/lang/fr_FR/form.php b/resources/lang/fr_FR/form.php
index d66647d05b..7d523360ff 100644
--- a/resources/lang/fr_FR/form.php
+++ b/resources/lang/fr_FR/form.php
@@ -135,7 +135,7 @@ return [
     'delete_attachment'          => 'Supprimer la pièce jointe ":name"',
     'delete_rule'                => 'Supprimer la règle ":title"',
     'delete_rule_group'          => 'Supprimer le groupe de filtres ":title"',
-    'delete_link_type'           => 'Delete link type ":name"',
+    'delete_link_type'           => 'Supprimer le type de lien ":name"',
     'attachment_areYouSure'      => 'Êtes-vous sûr de vouloir supprimer la pièce jointe nommée ":name" ?',
     'account_areYouSure'         => 'Êtes-vous sûr de vouloir supprimer le compte nommé ": ame" ?',
     'bill_areYouSure'            => 'Êtes-vous sûr de vouloir supprimer la facture nommée ":name" ?',
@@ -148,13 +148,13 @@ return [
     'journal_areYouSure'         => 'Êtes-vous sûr de vouloir supprimer la description de l\'opération ":description" ?',
     'mass_journal_are_you_sure'  => 'Êtes-vous sûr de que vouloir supprimer ces opérations ?',
     'tag_areYouSure'             => 'Êtes-vous sûr de vouloir supprimer le tag ":tag" ?',
-    'linkType_areYouSure'        => 'Are you sure you want to delete the link type ":name" (":inward" / ":outward")?',
+    'linkType_areYouSure'        => 'Êtes-vous sûr de vouloir supprimer le type de lien ":name" (":inward" / ":outward") ?',
     'permDeleteWarning'          => 'Supprimer quelque chose dans Firefly est permanent et ne peut pas être annulé.',
     'mass_make_selection'        => 'Vous pouvez toujours empêcher des éléments d’être supprimés en décochant la case à cocher.',
     'delete_all_permanently'     => 'Supprimer la selection définitivement',
     'update_all_journals'        => 'Mettre à jour ces opérations',
     'also_delete_transactions'   => 'La seule opération liée à ce compte sera aussi supprimée.|Les :count opérations liées à ce compte seront aussi supprimées.',
-    'also_delete_connections'   => 'The only transaction linked with this link type will lose this connection.|All :count transactions linked with this link type will lose their connection.',
+    'also_delete_connections'   => 'La seule transaction liée à ce type de lien perdra cette connexion. | Toutes les transactions :count liées à ce type de lien perdront leur connexion.',
     'also_delete_rules'          => 'La seule règle liée à ce groupe de règles sera aussi supprimée.|Les :count règles liées à ce groupe de règles seront aussi supprimées.',
     'also_delete_piggyBanks'     => 'La seule tirelire liée à ce compte sera aussi supprimée.|Les :count tirelires liées à ce compte seront aussi supprimées.',
     'bill_keep_transactions'     => 'La seule opération liée à cette facture ne sera pas supprimée.|Les :count opérations liées à cette facture ne seront pas supprimées.',
@@ -193,6 +193,6 @@ return [
     'invoice_date'       => 'Date de facturation',
     'internal_reference' => 'Référence interne',
 
-    'inward'  => 'Inward description',
-    'outward' => 'Outward description',
+    'inward'  => 'Description vers l’intérieur',
+    'outward' => 'Description de l’extérieur',
 ];
\ No newline at end of file

From 23be3afc9d11a6ac0ebbe595c552d00838628596 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Tue, 22 Aug 2017 14:50:07 +0200
Subject: [PATCH 141/668] New translations list.php (French)

---
 resources/lang/fr_FR/list.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/resources/lang/fr_FR/list.php b/resources/lang/fr_FR/list.php
index 99c046801a..786e6a801a 100644
--- a/resources/lang/fr_FR/list.php
+++ b/resources/lang/fr_FR/list.php
@@ -88,7 +88,7 @@ return [
     'budget_count'           => 'Nombre de budgets',
     'rule_and_groups_count'  => 'Nombre de règles et de groupes de règles',
     'tags_count'             => 'Nombre d’étiquettes',
-    'inward'                 => 'Inward description',
-    'outward'                => 'Outward description',
-    'number_of_transactions' => 'Number of transactions',
+    'inward'                 => 'Description vers l’intérieur',
+    'outward'                => 'Description de l’extérieur',
+    'number_of_transactions' => 'Nombre de transactions',
 ];
\ No newline at end of file

From 6ec397b9346ed1fad180da7255e8f80645faef0f Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Tue, 22 Aug 2017 23:00:17 +0200
Subject: [PATCH 142/668] New translations firefly.php (French)

---
 resources/lang/fr_FR/firefly.php | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/resources/lang/fr_FR/firefly.php b/resources/lang/fr_FR/firefly.php
index acf1611e56..d17efc1917 100644
--- a/resources/lang/fr_FR/firefly.php
+++ b/resources/lang/fr_FR/firefly.php
@@ -736,34 +736,34 @@ return [
     'reportsOwnAccountsAndShared'                => 'Rapport pour vos comptes et ceux partagés',
     'splitByAccount'                             => 'Divisé par compte',
     'balancedByTransfersAndTags'                 => 'Équilibré par des transferts et des tags',
-    'coveredWithTags'                            => 'Covered with tags',
-    'leftUnbalanced'                             => 'Left unbalanced',
+    'coveredWithTags'                            => 'Recouvert de tags',
+    'leftUnbalanced'                             => 'Restant déséquilibré',
     'expectedBalance'                            => 'Solde attendu',
-    'outsideOfBudgets'                           => 'Outside of budgets',
+    'outsideOfBudgets'                           => 'En dehors des budgets',
     'leftInBudget'                               => 'Budget restant',
     'sumOfSums'                                  => 'Montant des sommes',
     'noCategory'                                 => '(aucune catégorie)',
-    'notCharged'                                 => 'Not charged (yet)',
+    'notCharged'                                 => 'Pas encore chargé',
     'inactive'                                   => 'Désactivé',
     'active'                                     => 'Actif',
     'difference'                                 => 'Différence',
-    'in'                                         => 'In',
-    'out'                                        => 'Out',
-    'topX'                                       => 'top :number',
-    'show_full_list'                             => 'Show entire list',
-    'show_only_top'                              => 'Show only top :number',
+    'in'                                         => 'Dans',
+    'out'                                        => 'Sorti',
+    'topX'                                       => 'en haut :number',
+    'show_full_list'                             => 'Afficher la liste complète',
+    'show_only_top'                              => 'Afficher uniquement en haut :number',
     'sum_of_year'                                => 'Total sur l’année',
     'sum_of_years'                               => 'Total des années',
     'average_of_year'                            => 'Moyenne sur l\'année',
-    'average_of_years'                           => 'Average of years',
+    'average_of_years'                           => 'Moyenne des années',
     'categories_earned_in_year'                  => 'Catégories (selon le revenu)',
     'categories_spent_in_year'                   => 'Catégories (par dépenses)',
     'report_type'                                => 'Type de rapport',
     'report_type_default'                        => 'Rapport financier par défaut',
     'report_type_audit'                          => 'Historique des transactions',
-    'report_type_category'                       => 'Category report',
-    'report_type_budget'                         => 'Budget report',
-    'report_type_tag'                            => 'Tag report',
+    'report_type_category'                       => 'Rapport par catégories',
+    'report_type_budget'                         => 'Rapport du budget',
+    'report_type_tag'                            => 'Rapport de tag',
     'report_type_meta-history'                   => 'Vue d’ensemble des budgets, des catégories et des factures',
     'more_info_help'                             => 'Plus d’informations sur ces types de rapports se trouvent dans les pages d’aide. Appuyez sur l’icône ( ?) dans le coin supérieur droit.',
     'report_included_accounts'                   => 'Comptes inclus',
@@ -771,7 +771,7 @@ return [
     'report_preset_ranges'                       => 'Pré-configurer les étendues',
     'shared'                                     => 'Partagé',
     'fiscal_year'                                => 'Année fiscale',
-    'income_entry'                               => 'Income from account ":name" between :start and :end',
+    'income_entry'                               => 'Revenus du compte ":name" entre :start et :end',
     'expense_entry'                              => 'Dépenses du compte ":name" entre le :start et le :end',
     'category_entry'                             => 'Dépenses dans la catégorie ":name" entre le :start et le :end',
     'budget_spent_amount'                        => 'Dépenses dans le budget ":budget" entre le :start et le :end',

From 4a97a6403d0a24144078dbec9b16828557351b54 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Tue, 22 Aug 2017 23:10:07 +0200
Subject: [PATCH 143/668] New translations firefly.php (French)

---
 resources/lang/fr_FR/firefly.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/lang/fr_FR/firefly.php b/resources/lang/fr_FR/firefly.php
index d17efc1917..561971e155 100644
--- a/resources/lang/fr_FR/firefly.php
+++ b/resources/lang/fr_FR/firefly.php
@@ -776,8 +776,8 @@ return [
     'category_entry'                             => 'Dépenses dans la catégorie ":name" entre le :start et le :end',
     'budget_spent_amount'                        => 'Dépenses dans le budget ":budget" entre le :start et le :end',
     'balance_amount'                             => 'Dépenses dans le budget ":budget" payé depuis le compte ":account" entre le :start et le :end',
-    'no_audit_activity'                          => 'No activity was recorded on account <a href=":url" title=":account_name">:account_name</a> between :start and :end.',
-    'audit_end_balance'                          => 'Account balance of <a href=":url" title=":account_name">:account_name</a> at the end of :end was: :balance',
+    'no_audit_activity'                          => 'Aucune activité n\'a été enregistrée sur le compte <a href=":url" title=":account_name">:account_name</a> entre :start et :end.',
+    'audit_end_balance'                          => 'Solde du compte de <a href=":url" title=":account_name">:account_name</a> à la fin de :end était: :balance',
     'reports_extra_options'                      => 'Extra options',
     'report_has_no_extra_options'                => 'This report has no extra options',
     'reports_submit'                             => 'View report',

From ce53cdd4a4414a976f8262f950720415b2a2e3d0 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Tue, 22 Aug 2017 23:50:08 +0200
Subject: [PATCH 144/668] New translations firefly.php (French)

---
 resources/lang/fr_FR/firefly.php | 38 ++++++++++++++++----------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/resources/lang/fr_FR/firefly.php b/resources/lang/fr_FR/firefly.php
index 561971e155..7c9f2b32eb 100644
--- a/resources/lang/fr_FR/firefly.php
+++ b/resources/lang/fr_FR/firefly.php
@@ -778,25 +778,25 @@ return [
     'balance_amount'                             => 'Dépenses dans le budget ":budget" payé depuis le compte ":account" entre le :start et le :end',
     'no_audit_activity'                          => 'Aucune activité n\'a été enregistrée sur le compte <a href=":url" title=":account_name">:account_name</a> entre :start et :end.',
     'audit_end_balance'                          => 'Solde du compte de <a href=":url" title=":account_name">:account_name</a> à la fin de :end était: :balance',
-    'reports_extra_options'                      => 'Extra options',
-    'report_has_no_extra_options'                => 'This report has no extra options',
-    'reports_submit'                             => 'View report',
-    'end_after_start_date'                       => 'End date of report must be after start date.',
-    'select_category'                            => 'Select category(ies)',
-    'select_budget'                              => 'Select budget(s).',
-    'select_tag'                                 => 'Select tag(s).',
-    'income_per_category'                        => 'Income per category',
-    'expense_per_category'                       => 'Expense per category',
-    'expense_per_budget'                         => 'Expense per budget',
-    'income_per_account'                         => 'Income per account',
-    'expense_per_account'                        => 'Expense per account',
-    'expense_per_tag'                            => 'Expense per tag',
-    'income_per_tag'                             => 'Income per tag',
-    'include_expense_not_in_budget'              => 'Included expenses not in the selected budget(s)',
-    'include_expense_not_in_account'             => 'Included expenses not in the selected account(s)',
-    'include_expense_not_in_category'            => 'Included expenses not in the selected category(ies)',
-    'include_income_not_in_category'             => 'Included income not in the selected category(ies)',
-    'include_income_not_in_account'              => 'Included income not in the selected account(s)',
+    'reports_extra_options'                      => 'Options supplémentaires',
+    'report_has_no_extra_options'                => 'Ce rapport n\'a pas d\'options supplémentaires',
+    'reports_submit'                             => 'Afficher le rapport',
+    'end_after_start_date'                       => 'La date de fin du rapport doit être postérieure à la date de début.',
+    'select_category'                            => 'Sélectionner la/les catégorie(s)',
+    'select_budget'                              => 'Sélectionnez le(s) budget(s).',
+    'select_tag'                                 => 'Sélectionnez le(s) tag(s).',
+    'income_per_category'                        => 'Revenu par catégorie',
+    'expense_per_category'                       => 'Dépenses par catégorie',
+    'expense_per_budget'                         => 'Dépenses par budget',
+    'income_per_account'                         => 'Revenu par compte',
+    'expense_per_account'                        => 'Dépenses par compte',
+    'expense_per_tag'                            => 'Dépenses par tag',
+    'income_per_tag'                             => 'Revenu par tag',
+    'include_expense_not_in_budget'              => 'Frais inclus non compris dans le(s) budget(s) sélectionné(s)',
+    'include_expense_not_in_account'             => 'Frais inclus non compris dans le(s) compte(s) sélectionné(s)',
+    'include_expense_not_in_category'            => 'Les dépenses incluses ne sont pas dans la (les) catégorie(s) sélectionnée(s)',
+    'include_income_not_in_category'             => 'Les revenus inclus ne sont pas dans la (les) catégorie(s) sélectionnée(s)',
+    'include_income_not_in_account'              => 'Revenus inclus non compris dans le(s) compte(s) sélectionné(s)',
     'include_income_not_in_tags'                 => 'Included income not in the selected tag(s)',
     'include_expense_not_in_tags'                => 'Included expenses not in the selected tag(s)',
     'everything_else'                            => 'Everything else',

From f2f6239b5956d503d735326b18faddeffc8dec3c Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Wed, 23 Aug 2017 00:00:19 +0200
Subject: [PATCH 145/668] New translations firefly.php (French)

---
 resources/lang/fr_FR/firefly.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/fr_FR/firefly.php b/resources/lang/fr_FR/firefly.php
index 7c9f2b32eb..cbca24869b 100644
--- a/resources/lang/fr_FR/firefly.php
+++ b/resources/lang/fr_FR/firefly.php
@@ -797,7 +797,7 @@ return [
     'include_expense_not_in_category'            => 'Les dépenses incluses ne sont pas dans la (les) catégorie(s) sélectionnée(s)',
     'include_income_not_in_category'             => 'Les revenus inclus ne sont pas dans la (les) catégorie(s) sélectionnée(s)',
     'include_income_not_in_account'              => 'Revenus inclus non compris dans le(s) compte(s) sélectionné(s)',
-    'include_income_not_in_tags'                 => 'Included income not in the selected tag(s)',
+    'include_income_not_in_tags'                 => 'Les revenus inclus ne sont pas dans la (les) catégorie(s) sélectionnée(s)',
     'include_expense_not_in_tags'                => 'Included expenses not in the selected tag(s)',
     'everything_else'                            => 'Everything else',
     'income_and_expenses'                        => 'Income and expenses',

From 598eec219f9c21ae1ef02a64c49d8b15f525b1b4 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Wed, 23 Aug 2017 00:10:18 +0200
Subject: [PATCH 146/668] New translations firefly.php (French)

---
 resources/lang/fr_FR/firefly.php | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/resources/lang/fr_FR/firefly.php b/resources/lang/fr_FR/firefly.php
index cbca24869b..b838fb4243 100644
--- a/resources/lang/fr_FR/firefly.php
+++ b/resources/lang/fr_FR/firefly.php
@@ -798,22 +798,22 @@ return [
     'include_income_not_in_category'             => 'Les revenus inclus ne sont pas dans la (les) catégorie(s) sélectionnée(s)',
     'include_income_not_in_account'              => 'Revenus inclus non compris dans le(s) compte(s) sélectionné(s)',
     'include_income_not_in_tags'                 => 'Les revenus inclus ne sont pas dans la (les) catégorie(s) sélectionnée(s)',
-    'include_expense_not_in_tags'                => 'Included expenses not in the selected tag(s)',
-    'everything_else'                            => 'Everything else',
-    'income_and_expenses'                        => 'Income and expenses',
-    'spent_average'                              => 'Spent (average)',
-    'income_average'                             => 'Income (average)',
-    'transaction_count'                          => 'Transaction count',
-    'average_spending_per_account'               => 'Average spending per account',
-    'average_income_per_account'                 => 'Average income per account',
+    'include_expense_not_in_tags'                => 'Les dépenses incluses ne sont pas dans le(s) tag(s) sélectionnée(s)',
+    'everything_else'                            => 'Tout le reste',
+    'income_and_expenses'                        => 'Recettes et dépenses',
+    'spent_average'                              => 'Dépensé (moyenne)',
+    'income_average'                             => 'Revenu (moyenne)',
+    'transaction_count'                          => 'Nombre de transactions',
+    'average_spending_per_account'               => 'Dépenses moyennes par compte',
+    'average_income_per_account'                 => 'Revenu moyen par compte',
     'total'                                      => 'Total',
     'description'                                => 'Description',
-    'sum_of_period'                              => 'Sum of period',
-    'average_in_period'                          => 'Average in period',
-    'account_role_defaultAsset'                  => 'Default asset account',
-    'account_role_sharedAsset'                   => 'Shared asset account',
-    'account_role_savingAsset'                   => 'Savings account',
-    'account_role_ccAsset'                       => 'Credit card',
+    'sum_of_period'                              => 'Somme pour la période',
+    'average_in_period'                          => 'Moyenne pour la période',
+    'account_role_defaultAsset'                  => 'Compte d\'actif par défaut',
+    'account_role_sharedAsset'                   => 'Compte d\'actif partagé',
+    'account_role_savingAsset'                   => 'Compte d’épargne',
+    'account_role_ccAsset'                       => 'Carte de crédit',
 
     // charts:
     'chart'                                      => 'Diagramme',
@@ -895,9 +895,9 @@ return [
     'updated_tag'                => 'Mise à jour de la balise ": tag"',
     'created_tag'                => 'Tag ":tag" a été créé !',
     'no_year'                    => 'Aucune année définie',
-    'no_month'                   => 'No month set',
+    'no_month'                   => 'Pas de mois défini',
     'tag_title_nothing'          => 'Tags par défaut',
-    'tag_title_balancingAct'     => 'Balancing act tags',
+    'tag_title_balancingAct'     => 'Acte d\'équilibrage des tags',
     'tag_title_advancePayment'   => 'Tags de paiement anticipé',
 
     'transaction_journal_information'       => 'Transaction information',

From 73ddd239aa993eb7ac7dba4b955713b88f4fead6 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Wed, 23 Aug 2017 00:20:08 +0200
Subject: [PATCH 147/668] New translations firefly.php (French)

---
 resources/lang/fr_FR/firefly.php | 36 ++++++++++++++++----------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/resources/lang/fr_FR/firefly.php b/resources/lang/fr_FR/firefly.php
index b838fb4243..d36829c13b 100644
--- a/resources/lang/fr_FR/firefly.php
+++ b/resources/lang/fr_FR/firefly.php
@@ -900,10 +900,10 @@ return [
     'tag_title_balancingAct'     => 'Acte d\'équilibrage des tags',
     'tag_title_advancePayment'   => 'Tags de paiement anticipé',
 
-    'transaction_journal_information'       => 'Transaction information',
-    'transaction_journal_meta'              => 'Meta information',
-    'total_amount'                          => 'Total amount',
-    'number_of_decimals'                    => 'Number of decimals',
+    'transaction_journal_information'       => 'Informations sur les transactions',
+    'transaction_journal_meta'              => 'Méta informations',
+    'total_amount'                          => 'Montant total',
+    'number_of_decimals'                    => 'Nombre de décimales',
 
     // administration
     'administration'                        => 'Administration',
@@ -911,22 +911,22 @@ return [
     'list_all_users'                        => 'Tous les utilisateurs',
     'all_users'                             => 'Tous les utilisateurs',
     'instance_configuration'                => 'Configuration',
-    'firefly_instance_configuration'        => 'Configuration options for Firefly III',
-    'setting_single_user_mode'              => 'Single user mode',
-    'setting_single_user_mode_explain'      => 'By default, Firefly III only accepts one (1) registration: you. This is a security measure, preventing others from using your instance unless you allow them to. Future registrations are blocked. When you uncheck this box, others can use your instance as wel, assuming they can reach it (when it is connected to the internet).',
-    'store_configuration'                   => 'Store configuration',
-    'single_user_administration'            => 'User administration for :email',
-    'edit_user'                             => 'Edit user :email',
-    'hidden_fields_preferences'             => 'Not all fields are visible right now. You must enable them in your <a href=":link">settings</a>.',
-    'user_data_information'                 => 'User data',
-    'user_information'                      => 'User information',
-    'total_size'                            => 'total size',
+    'firefly_instance_configuration'        => 'Options de configuration pour Firefly III',
+    'setting_single_user_mode'              => 'Mode utilisateur unique',
+    'setting_single_user_mode_explain'      => 'Par défaut, Firefly III accepte uniquement un (1) enregistrement : vous. Il s\'agit d\'une mesure de sécurité qui empêche les autres d\'utiliser votre instance, à moins que vous ne les autorisiez. Les enregistrements futurs sont bloqués. Lorsque vous désactivez cette case, d\'autres personnes peuvent utiliser votre instance aussi bien, en supposant qu\'elles puissent l\'atteindre (quand il est connecté à Internet).',
+    'store_configuration'                   => 'Configuration de la boutique',
+    'single_user_administration'            => 'Gestion de l\'utilisateur pour :email',
+    'edit_user'                             => 'Modifier l\'utilisateur :email',
+    'hidden_fields_preferences'             => 'Tous les champs ne sont pas visibles dès maintenant. Vous devez les activer dans vos <a href=":link">paramètres</a>.',
+    'user_data_information'                 => 'Données utilisateur',
+    'user_information'                      => 'Informations utilisateur',
+    'total_size'                            => 'taille totale',
     'budget_or_budgets'                     => 'budget(s)',
-    'budgets_with_limits'                   => 'budget(s) with configured amount',
-    'rule_or_rules'                         => 'rule(s)',
+    'budgets_with_limits'                   => 'budget(s) avec montant configuré',
+    'rule_or_rules'                         => 'règle(s)',
     'rulegroup_or_groups'                   => 'rule group(s)',
-    'setting_must_confirm_account'          => 'Account confirmation',
-    'setting_must_confirm_account_explain'  => 'When this setting is enabled, users must activate their account before it can be used.',
+    'setting_must_confirm_account'          => 'Confirmation de compte',
+    'setting_must_confirm_account_explain'  => 'Lorsque ce paramètre est activé, les utilisateurs doivent activer leur compte avant de pouvoir l\'utiliser.',
     'configuration_updated'                 => 'The configuration has been updated',
     'setting_is_demo_site'                  => 'Demo site',
     'setting_is_demo_site_explain'          => 'If you check this box, this installation will behave as if it is the demo site, which can have weird side effects.',

From 9ccbebdc4fcb6ef70c4cf2d2c8f58fff3d65a494 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Wed, 23 Aug 2017 19:20:06 +0200
Subject: [PATCH 148/668] New translations breadcrumbs.php (Polish)

---
 resources/lang/pl_PL/breadcrumbs.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/pl_PL/breadcrumbs.php b/resources/lang/pl_PL/breadcrumbs.php
index e9f8069e2c..681cd8d0ee 100644
--- a/resources/lang/pl_PL/breadcrumbs.php
+++ b/resources/lang/pl_PL/breadcrumbs.php
@@ -26,7 +26,7 @@ return [
     'edit_bill'         => 'Modyfikuj rachunek ":name"',
     'delete_bill'       => 'Usuń rachunek ":name"',
     'reports'           => 'Raporty',
-    'search_result'     => 'Search results for ":query"',
+    'search_result'     => 'Wyniki wyszukiwania dla ":query"',
     'withdrawal_list'   => 'Wydatki',
     'deposit_list'      => 'Przychody, dochody oraz depozyty',
     'transfer_list'     => 'Transfery',

From d3e9fe37ebb1d7e5ba36f0f8036f08b353d73f32 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Wed, 23 Aug 2017 19:50:07 +0200
Subject: [PATCH 149/668] New translations config.php (Polish)

---
 resources/lang/pl_PL/config.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/pl_PL/config.php b/resources/lang/pl_PL/config.php
index 1e88ed4078..0d0f130178 100644
--- a/resources/lang/pl_PL/config.php
+++ b/resources/lang/pl_PL/config.php
@@ -15,7 +15,7 @@ return [
     'locale'          => 'pl, Polish, polski, pl_PL, pl_PL.utf8, pl_PL.UTF-8',
     'month'           => '%B %Y',
     'month_and_day'   => '%e %B %Y',
-    'date_time'       => '%B %e, %Y, @ %T',
+    'date_time'       => '%e %B %Y o %T',
     'specific_day'    => '%e %B %Y',
     'week_in_year'    => 'Tydzień %W, %Y',
     'quarter_of_year' => '%B %Y',

From 25256601a6446d315955e3589162756b89f02f7f Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Wed, 23 Aug 2017 20:00:06 +0200
Subject: [PATCH 150/668] New translations validation.php (Polish)

---
 resources/lang/pl_PL/validation.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/lang/pl_PL/validation.php b/resources/lang/pl_PL/validation.php
index 6d99bdde25..375a54465a 100644
--- a/resources/lang/pl_PL/validation.php
+++ b/resources/lang/pl_PL/validation.php
@@ -41,7 +41,7 @@ return [
     'between.string'                 => ':attribute musi zawierać pomiędzy :min a :max znaków.',
     'between.array'                  => ':attribute musi zawierać pomiędzy :min a :max elementów.',
     'boolean'                        => 'Pole :attribute musi być prawdą albo fałszem.',
-    'confirmed'                      => 'The :attribute confirmation does not match.',
+    'confirmed'                      => 'Pole :attribute i jego potwierdzenie nie pasują do siebie.',
     'date'                           => ':attribute nie jest prawidłową datą.',
     'date_format'                    => ':attribute rożni się od formatu :format.',
     'different'                      => ':attribute oraz :other muszą się różnić.',
@@ -90,5 +90,5 @@ return [
     'in_array'                       => 'Pole :attribute nie istnieje w :other.',
     'present'                        => 'Pole :attribute musi być obecne.',
     'amount_zero'                    => 'Całkowita kwota nie może być zerem',
-    'secure_password'                => 'This is not a secure password. Please try again. For more information, visit https://goo.gl/NCh2tN',
+    'secure_password'                => 'To nie jest bezpieczne hasło. Proszę spróbować ponownie. Aby uzyskać więcej informacji odwiedź https://goo.gl/NCh2tN',
 ];
\ No newline at end of file

From 9974f71f3e769657eb5f88419076810949f67bdd Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Wed, 23 Aug 2017 20:10:06 +0200
Subject: [PATCH 151/668] New translations list.php (Polish)

---
 resources/lang/pl_PL/list.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/resources/lang/pl_PL/list.php b/resources/lang/pl_PL/list.php
index 6a2de20588..552981dcf6 100644
--- a/resources/lang/pl_PL/list.php
+++ b/resources/lang/pl_PL/list.php
@@ -45,7 +45,7 @@ return [
     'date'                  => 'Data',
     'interest_date'         => 'Stopa procentowa',
     'book_date'             => 'Data księgowania',
-    'process_date'          => 'Processing date',
+    'process_date'          => 'Przetworzono',
     'due_date'              => 'Termin realizacji',
     'payment_date'          => 'Data płatności',
     'invoice_date'          => 'Data faktury',
@@ -65,14 +65,14 @@ return [
     'iban'                  => 'IBAN',
     'paid_current_period'   => 'Zapłacono w tym okresie',
     'email'                 => 'Adres E-Mail',
-    'registered_at'         => 'Registered at',
+    'registered_at'         => 'Zarejestrowano',
     'is_activated'          => 'Jest aktywny',
     'is_blocked'            => 'Jest zablokowany',
     'is_admin'              => 'Jest administratorem',
     'has_two_factor'        => 'Ma dwustopniową autoryzację',
     'confirmed_from'        => 'Potwierdzone z',
     'registered_from'       => 'Registered from',
-    'blocked_code'          => 'Block code',
+    'blocked_code'          => 'Kod blokady',
     'domain'                => 'Domena',
     'registration_attempts' => 'Próby rejestracji',
     'source_account'        => 'Konto źródłowe',
@@ -90,5 +90,5 @@ return [
     'tags_count'             => 'Liczba tagów',
     'inward'                 => 'Inward description',
     'outward'                => 'Outward description',
-    'number_of_transactions' => 'Number of transactions',
+    'number_of_transactions' => 'Liczba transakcji',
 ];
\ No newline at end of file

From dec29b3e22a6a88a33de1d18180a6362dac48f2c Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Wed, 23 Aug 2017 20:10:09 +0200
Subject: [PATCH 152/668] New translations firefly.php (Polish)

---
 resources/lang/pl_PL/firefly.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/lang/pl_PL/firefly.php b/resources/lang/pl_PL/firefly.php
index 099f0e3c10..c89f4d3f4a 100644
--- a/resources/lang/pl_PL/firefly.php
+++ b/resources/lang/pl_PL/firefly.php
@@ -913,7 +913,7 @@ return [
     'instance_configuration'                => 'Konfiguracja',
     'firefly_instance_configuration'        => 'Opcje konfiguracji dla Firefly III',
     'setting_single_user_mode'              => 'Tryb pojedynczego użytkownika',
-    'setting_single_user_mode_explain'      => 'By default, Firefly III only accepts one (1) registration: you. This is a security measure, preventing others from using your instance unless you allow them to. Future registrations are blocked. When you uncheck this box, others can use your instance as wel, assuming they can reach it (when it is connected to the internet).',
+    'setting_single_user_mode_explain'      => 'Domyślnie, Firefly III pozwala na jednego (1) użytkownika: Ciebie. Jest to środek bezpieczeństwa uniemożliwiający innym używanie Twojej instalacji, chyba że im pozwolisz. Kolejne rejestracje są zablokowane. Jeżeli odznaczysz to pole, inne osoby będą mogły używać Twojej instalacji Firefly III (zakładając, że jest ona dostępna w Internecie).',
     'store_configuration'                   => 'Zapisz konfigurację',
     'single_user_administration'            => 'User administration for :email',
     'edit_user'                             => 'Modyfikuj użytkownika :email',
@@ -932,7 +932,7 @@ return [
     'setting_is_demo_site_explain'          => 'If you check this box, this installation will behave as if it is the demo site, which can have weird side effects.',
     'setting_send_email_notifications'      => 'Wyślij powiadomienia emailem',
     'setting_send_email_explain'            => 'Firefly III can send you email notifications about certain events. They will be sent to <code>:site_owner</code>. This email address can be set in the <code>.env</code> file.',
-    'block_code_bounced'                    => 'Email message(s) bounced',
+    'block_code_bounced'                    => 'Odrzucony e-mail potwierdzający',
     'block_code_expired'                    => 'Demonstracyjne konto wygasło',
     'no_block_code'                         => 'No reason for block or user not blocked',
     // links

From 54e277e773fbe6ab1d2c67f8b3a52a10142f0791 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Wed, 23 Aug 2017 20:20:10 +0200
Subject: [PATCH 153/668] New translations firefly.php (Polish)

---
 resources/lang/pl_PL/firefly.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/resources/lang/pl_PL/firefly.php b/resources/lang/pl_PL/firefly.php
index c89f4d3f4a..b858c4a2c1 100644
--- a/resources/lang/pl_PL/firefly.php
+++ b/resources/lang/pl_PL/firefly.php
@@ -29,14 +29,14 @@ return [
     'showEverything'                             => 'Pokaż wszystko',
     'never'                                      => 'Nigdy',
     'search_results_for'                         => 'Wyniki wyszukiwania dla ":query"',
-    'no_results_for_empty_search'                => 'Your search was empty, so nothing was found.',
+    'no_results_for_empty_search'                => 'Twoje zapytanie były puste, wiec nic nie zostało znalezione.',
     'bounced_error'                              => 'Wiadomość wysłana na adres :email została odrzucona, więc nie ma dostępu dla Ciebie.',
     'deleted_error'                              => 'Te poświadczenia nie zgadzają się z naszymi danymi.',
     'general_blocked_error'                      => 'Twoje konto zostało zablokowane. Dlatego nie możesz się zalogować.',
     'expired_error'                              => 'Twoje konto wygasło i nie może być dalej używane.',
     'removed_amount'                             => 'Usunięto :amount',
     'added_amount'                               => 'Dodano :amount',
-    'asset_account_role_help'                    => 'Any extra options resulting from your choice can be set later.',
+    'asset_account_role_help'                    => 'Dodatkowe opcje wynikające z Twojego wyboru można ustawić później.',
     'Opening balance'                            => 'Bilans otwarcia',
     'create_new_stuff'                           => 'Utwórz nowe rzeczy',
     'new_withdrawal'                             => 'Nowa wypłata',
@@ -55,15 +55,15 @@ return [
     'flash_info_multiple'                        => 'Jest jedna wiadomość|Jest :count wiadomości',
     'flash_error_multiple'                       => 'Jest jeden błąd|Jest :count błędów',
     'net_worth'                                  => 'Wartość netto',
-    'route_has_no_help'                          => 'There is no help for this route.',
-    'help_may_not_be_your_language'              => 'This help text is in English. It is not yet available in your language',
+    'route_has_no_help'                          => 'Brak pomocy dla tej strony.',
+    'help_may_not_be_your_language'              => 'Ten tekst pomocy jest po angielsku, ponieważ nie został jeszcze przetłumaczony na język polski',
     'two_factor_welcome'                         => 'Witaj, :user!',
     'two_factor_enter_code'                      => 'Aby kontynuować, wprowadź kod uwierzytelniania dwuskładnikowego. Twoja aplikacja może wygenerować go dla Ciebie.',
     'two_factor_code_here'                       => 'Wprowadź tutaj kod',
     'two_factor_title'                           => 'Weryfikacja dwuskładnikowa',
     'authenticate'                               => 'Uwierzytelnij',
-    'two_factor_forgot_title'                    => 'Lost two factor authentication',
-    'two_factor_forgot'                          => 'I forgot my two-factor thing.',
+    'two_factor_forgot_title'                    => 'Utracone uwierzytelnianie dwuskładnikowe',
+    'two_factor_forgot'                          => 'Zapomniałem mojego uwierzytelnienia dwuskładnikowego.',
     'two_factor_lost_header'                     => 'Straciłeś uwierzytelnianie dwuskładnikowe?',
     'two_factor_lost_intro'                      => 'Unfortunately, this is not something you can reset from the web interface. You have two choices.',
     'two_factor_lost_fix_self'                   => 'If you run your own instance of Firefly III, check the logs in <code>storage/logs</code> for instructions.',
@@ -934,7 +934,7 @@ return [
     'setting_send_email_explain'            => 'Firefly III can send you email notifications about certain events. They will be sent to <code>:site_owner</code>. This email address can be set in the <code>.env</code> file.',
     'block_code_bounced'                    => 'Odrzucony e-mail potwierdzający',
     'block_code_expired'                    => 'Demonstracyjne konto wygasło',
-    'no_block_code'                         => 'No reason for block or user not blocked',
+    'no_block_code'                         => 'Brak powody blokady lub użytkownik niezablokowany',
     // links
     'journal_link_configuration'            => 'Transaction links configuration',
     'create_new_link_type'                  => 'Create new link type',

From 6bb3cf57197ec2c86347e57c26bad487056c0d93 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Wed, 23 Aug 2017 20:30:19 +0200
Subject: [PATCH 154/668] New translations firefly.php (Polish)

---
 resources/lang/pl_PL/firefly.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/resources/lang/pl_PL/firefly.php b/resources/lang/pl_PL/firefly.php
index b858c4a2c1..df37e9f8ea 100644
--- a/resources/lang/pl_PL/firefly.php
+++ b/resources/lang/pl_PL/firefly.php
@@ -65,9 +65,9 @@ return [
     'two_factor_forgot_title'                    => 'Utracone uwierzytelnianie dwuskładnikowe',
     'two_factor_forgot'                          => 'Zapomniałem mojego uwierzytelnienia dwuskładnikowego.',
     'two_factor_lost_header'                     => 'Straciłeś uwierzytelnianie dwuskładnikowe?',
-    'two_factor_lost_intro'                      => 'Unfortunately, this is not something you can reset from the web interface. You have two choices.',
-    'two_factor_lost_fix_self'                   => 'If you run your own instance of Firefly III, check the logs in <code>storage/logs</code> for instructions.',
-    'two_factor_lost_fix_owner'                  => 'Otherwise, email the site owner, <a href="mailto::site_owner">:site_owner</a> and ask them to reset your two factor authentication.',
+    'two_factor_lost_intro'                      => 'Niestety to nie jest coś, co można zresetować z poziomu strony www. Masz dwie możliwości.',
+    'two_factor_lost_fix_self'                   => 'Jeśli jesteś właścicielem tej instalacji Firefly III, sprawdź pliki w katalogu <code>storage/logs</code> aby uzyskać instrukcje.',
+    'two_factor_lost_fix_owner'                  => 'W przeciwnym razie, powiadom właściciela strony, <a href="mailto::site_owner">:site_owner</a> i poproś go o zresetowanie Twojego uwierzytelnienia dwuskładnikowego.',
     'warning_much_data'                          => 'Załadowanie :days dni danych może trochę potrwać.',
     'registered'                                 => 'Zarejestrowałeś się pomyślnie!',
     'tagbalancingAct'                            => 'Balancing act',

From ea2732b38c637c3334e7c1f7ce15622dc6dec2fd Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Wed, 23 Aug 2017 20:40:46 +0200
Subject: [PATCH 155/668] New translations firefly.php (Polish)

---
 resources/lang/pl_PL/firefly.php | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/resources/lang/pl_PL/firefly.php b/resources/lang/pl_PL/firefly.php
index df37e9f8ea..3beaeed413 100644
--- a/resources/lang/pl_PL/firefly.php
+++ b/resources/lang/pl_PL/firefly.php
@@ -118,11 +118,11 @@ return [
     'transaction_journal_other_options'          => 'Inne opcje',
     'multi_select_no_selection'                  => 'Nie wybrano',
     'multi_select_all_selected'                  => 'Wybrano wszystko',
-    'multi_select_filter_placeholder'            => 'Find..',
-    'between_dates_breadcrumb'                   => 'Between :start and :end',
-    'all_journals_without_budget'                => 'All transactions without a budget',
-    'journals_without_budget'                    => 'Transactions without a budget',
-    'all_journals_without_category'              => 'All transactions without a category',
+    'multi_select_filter_placeholder'            => 'Znajdź...',
+    'between_dates_breadcrumb'                   => 'Pomiędzy :start and :end',
+    'all_journals_without_budget'                => 'Wszystkie transakcje bez budżetu',
+    'journals_without_budget'                    => 'Transakcje bez budżetu',
+    'all_journals_without_category'              => 'Wszystkie transakcje bez kategorii',
     'journals_without_category'                  => 'Transakcje bez kategorii',
     'all_journals_for_account'                   => 'Wszystkie transakcje dla konta :name',
     'chart_all_journals_for_account'             => 'Wykres wszystkich transakcji dla konta :name',
@@ -130,11 +130,11 @@ return [
     'transferred'                                => 'Transferred',
     'all_withdrawal'                             => 'Wszystkie wydatki',
     'all_transactions'                           => 'Wszystkie transakcje',
-    'title_withdrawal_between'                   => 'All expenses between :start and :end',
+    'title_withdrawal_between'                   => 'Wszystkie wydatki między :start a :koniec',
     'all_deposit'                                => 'Wszystkie przychody',
-    'title_deposit_between'                      => 'All revenue between :start and :end',
+    'title_deposit_between'                      => 'Wszystkie przychody między :start a :end',
     'all_transfers'                              => 'Wszystkie transfery',
-    'title_transfers_between'                    => 'All transfers between :start and :end',
+    'title_transfers_between'                    => 'Wszystkie transfery między :start a :end',
     'all_transfer'                               => 'Wszystkie transfery',
     'all_journals_for_tag'                       => 'Wszystkie transakcje dla tagu ":tag"',
     'title_transfer_between'                     => 'Wszystkie transfery od :start do :end',
@@ -152,10 +152,10 @@ return [
     'search'                                     => 'Szukaj',
     'search_found_transactions'                  => 'Number of transactions found:',
     'general_search_error'                       => 'An error occured while searching. Please check the log files for more information.',
-    'search_box'                                 => 'Search',
-    'search_box_intro'                           => 'Welcome to the search function of Firefly III. Enter your search query in the box. Make sure you check out the help file because the search is pretty advanced.',
-    'search_error'                               => 'Error while searching',
-    'search_searching'                           => 'Searching ...',
+    'search_box'                                 => 'Szukaj',
+    'search_box_intro'                           => 'Witamy w funkcji wyszukiwania Firefly III. Wpisz zapytanie w polu. Upewnij się, że sprawdziłeś plik pomocy, ponieważ wyszukiwanie jest dość zaawansowane.',
+    'search_error'                               => 'Błąd podczas wyszukiwania',
+    'search_searching'                           => 'Wyszukiwanie...',
 
     // repeat frequencies:
     'repeat_freq_yearly'                         => 'rocznie',
@@ -167,10 +167,10 @@ return [
     // account confirmation:
     'confirm_account_header'                     => 'Proszę potwierdzić swoje konto',
     'confirm_account_intro'                      => 'Wiadomość e-mail została wysłana na adres, którego użyłeś podczas rejestracji. Sprawdź ją proszę w celu otrzymania dalszych instrukcji. Jeśli nie otrzymałeś tej wiadomości, możesz ją wysłać ponownie z Firefly.',
-    'confirm_account_resend_email'               => 'Send me the confirmation message I need to activate my account.',
+    'confirm_account_resend_email'               => 'Wyślij mi wiadomość potwierdzającą. Muszę aktywować moje konto.',
     'account_is_confirmed'                       => 'Twoje konto zostało potwierdzone!',
     'invalid_activation_code'                    => 'Wygląda na to że kod którego używasz jest nieprawidłowy lub wygasł.',
-    'confirm_account_is_resent_header'           => 'The confirmation has been resent',
+    'confirm_account_is_resent_header'           => 'Potwierdzenie wysłane ponownie',
     'confirm_account_is_resent_text'             => 'The confirmation message has been resent. If you still did not receive the confirmation message, please contact the site owner at <a href="mailto::owner">:owner</a> or check the log files to see what went wrong.',
     'confirm_account_is_resent_go_home'          => 'Przejdź do strony głównej Firefly',
     'confirm_account_not_resent_header'          => 'Coś poszło nie tak :(',

From 2bb4d7c8b9ff128d10cca4fc053d0d32afb99436 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Wed, 23 Aug 2017 20:50:07 +0200
Subject: [PATCH 156/668] New translations firefly.php (Polish)

---
 resources/lang/pl_PL/firefly.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/resources/lang/pl_PL/firefly.php b/resources/lang/pl_PL/firefly.php
index 3beaeed413..134b3106af 100644
--- a/resources/lang/pl_PL/firefly.php
+++ b/resources/lang/pl_PL/firefly.php
@@ -171,10 +171,10 @@ return [
     'account_is_confirmed'                       => 'Twoje konto zostało potwierdzone!',
     'invalid_activation_code'                    => 'Wygląda na to że kod którego używasz jest nieprawidłowy lub wygasł.',
     'confirm_account_is_resent_header'           => 'Potwierdzenie wysłane ponownie',
-    'confirm_account_is_resent_text'             => 'The confirmation message has been resent. If you still did not receive the confirmation message, please contact the site owner at <a href="mailto::owner">:owner</a> or check the log files to see what went wrong.',
+    'confirm_account_is_resent_text'             => 'Wiadomość potwierdzająca została wysłana ponownie. Jeżeli nadal nie została dostarczona, skontaktuj się proszę z właścicielem strony pod <a href="mailto::owner">:owner</a> lub sprawdź pliki z logami aby zobaczyć co poszło źle.',
     'confirm_account_is_resent_go_home'          => 'Przejdź do strony głównej Firefly',
     'confirm_account_not_resent_header'          => 'Coś poszło nie tak :(',
-    'confirm_account_not_resent_intro'           => 'The confirmation message has been not resent. If you still did not receive the confirmation message, please contact the site owner at <a href="mailto::owner">:owner</a> instead. Possibly, you have tried to resend the activation message too often. You can have Firefly III try to resend the confirmation message every hour.',
+    'confirm_account_not_resent_intro'           => 'Wiadomość potwierdzająca nie została wysłana ponownie. Jeżeli nadal nie została dostarczona, skontaktuj się proszę z właścicielem strony pod <a href="mailto::owner">:owner</a>. Prawdopodobnie próbowałeś wysłać wiadomość potwierdzającą zbyt często. Możesz poprosić Firefly III aby wysłał ją maksymalnie raz na godzinę.',
     'confirm_account_not_resent_go_home'         => 'Przejdź do strony głównej Firefly',
 
     // export data:
@@ -956,7 +956,7 @@ return [
     'select_transaction_to_link'            => 'Select a transaction to link this transaction to',
     'this_transaction'                      => 'This transaction',
     'transaction'                           => 'Transaction',
-    'comments'                              => 'Comments',
+    'comments'                              => 'Komentarze',
     'to_link_not_found'                     => 'If the transaction you want to link to is not listed, simply enter its ID.',
     'invalid_link_data'                     => 'Invalid link type selected. Cannot link transaction.',
     'journals_linked'                       => 'Transactions are linked.',
@@ -1007,9 +1007,9 @@ return [
     'import_data'                           => 'Importuj dane',
 
     // import index page:
-    'import_index_title'                    => 'Import data into Firefly III',
+    'import_index_title'                    => 'Importuj dane do Firefly III',
     'import_index_sub_title'                => 'Indeks',
-    'import_general_index_intro'            => 'Welcome to Firefly\'s import routine. There are a few ways of importing data into Firefly III, displayed here as buttons.',
+    'import_general_index_intro'            => 'Witamy w procedurze importu Firefly III. Istnieje kilka sposobów importowania danych do Firefly III.',
     'import_index_intro'                    => 'This routine will help you import files from your bank into Firefly III. Please check out the help pages in the top right corner.',
     'import_index_file'                     => 'Wybierz swój plik',
     'import_index_config'                   => 'If you have previously imported data into Firefly III, you may have a configuration file, which will pre-set configuration values for you. For some banks, other users have kindly provided their <a href="https://github.com/firefly-iii/import-configurations/wiki">configuration file</a>.',
@@ -1026,12 +1026,12 @@ return [
     // import status page:
     'import_status_bread_crumb'             => 'Status importu',
     'import_status_sub_title'               => 'Status importu',
-    'import_status_wait_title'              => 'Please hold...',
-    'import_status_wait_text'               => 'This box will disappear in a moment.',
+    'import_status_wait_title'              => 'Proszę czekać...',
+    'import_status_wait_text'               => 'To pole za chwilę zniknie.',
     'import_status_ready_title'             => 'Import jest gotowy do uruchomienia',
     'import_status_ready_text'              => 'The import is ready to start. All the configuration you needed to do has been done. Please download the configuration file. It will help you with the import should it not go as planned. To actually run the import, you can either execute the following command in your console, or run the web-based import. Depending on your configuration, the console import will give you more feedback.',
     'import_status_ready_config'            => 'Pobierz konfigurację',
-    'import_status_ready_start'             => 'Start the import',
+    'import_status_ready_start'             => 'Rozpocznij Importowanie',
     'import_status_ready_share'             => 'Please consider downloading your configuration and sharing it at the <strong><a href="https://github.com/firefly-iii/import-configurations/wiki">import configuration center</a></strong>. This will allow other users of Firefly III to import their files more easily.',
     'import_status_running_title'           => 'The import is running',
     'import_status_running_placeholder'     => 'Please hold for an update...',

From 093fe22ab54626a4536d921e48e7954afba34c70 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Wed, 23 Aug 2017 21:00:09 +0200
Subject: [PATCH 157/668] New translations firefly.php (Polish)

---
 resources/lang/pl_PL/firefly.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/resources/lang/pl_PL/firefly.php b/resources/lang/pl_PL/firefly.php
index 134b3106af..1179f35d59 100644
--- a/resources/lang/pl_PL/firefly.php
+++ b/resources/lang/pl_PL/firefly.php
@@ -1010,18 +1010,18 @@ return [
     'import_index_title'                    => 'Importuj dane do Firefly III',
     'import_index_sub_title'                => 'Indeks',
     'import_general_index_intro'            => 'Witamy w procedurze importu Firefly III. Istnieje kilka sposobów importowania danych do Firefly III.',
-    'import_index_intro'                    => 'This routine will help you import files from your bank into Firefly III. Please check out the help pages in the top right corner.',
+    'import_index_intro'                    => 'Ta procedura pomoże Ci zaimportować pliki z Twojego banku do Firefly III. Proszę sprawdzić stronę pomocy w prawym górnym rogu.',
     'import_index_file'                     => 'Wybierz swój plik',
-    'import_index_config'                   => 'If you have previously imported data into Firefly III, you may have a configuration file, which will pre-set configuration values for you. For some banks, other users have kindly provided their <a href="https://github.com/firefly-iii/import-configurations/wiki">configuration file</a>.',
-    'import_index_type'                     => 'Select the type of file you will upload',
+    'import_index_config'                   => 'Jeśli wcześniej importowałeś dane do Firefly III, może posiadać plik konfiguracji, który wstępnie ustawi wartości parametrów konfiguracyjnych dla Ciebie. Dla niektórych banków, inni użytkownicy uprzejmie dostarczyli swoje <a href="https://github.com/firefly-iii/import-configurations/wiki">pliki konfiguracji</a>.',
+    'import_index_type'                     => 'Wybierz typ pliku, który będziesz przesyłać',
     'import_index_start'                    => 'Rozpocznij import',
 
     // supported file types:
     'import_file_type_csv'                  => 'CSV (wartości oddzielone przecinkami)',
 
     // import configuration routine:
-    'import_config_sub_title'               => 'Set up your import file',
-    'import_config_bread_crumb'             => 'Set up your import file',
+    'import_config_sub_title'               => 'Skonfiguruj swój importowany plik',
+    'import_config_bread_crumb'             => 'Skonfiguruj swój plik',
 
     // import status page:
     'import_status_bread_crumb'             => 'Status importu',
@@ -1029,7 +1029,7 @@ return [
     'import_status_wait_title'              => 'Proszę czekać...',
     'import_status_wait_text'               => 'To pole za chwilę zniknie.',
     'import_status_ready_title'             => 'Import jest gotowy do uruchomienia',
-    'import_status_ready_text'              => 'The import is ready to start. All the configuration you needed to do has been done. Please download the configuration file. It will help you with the import should it not go as planned. To actually run the import, you can either execute the following command in your console, or run the web-based import. Depending on your configuration, the console import will give you more feedback.',
+    'import_status_ready_text'              => 'Import jest gotowy do uruchomienia. Wszystkie potrzebne ustawienia zostały skonfigurowane. Pobierz proszę plik konfiguracyjny. Pomoże Ci on gdy import nie pójdzie zgodnie z planem. Aby rzeczywiście uruchomić import, można wykonać następujące polecenie w konsoli lub uruchomić importowanie z poziomu strony www. W zależności od konfiguracji, import przez konsolę da Ci więcej informacji zwrotnych.',
     'import_status_ready_config'            => 'Pobierz konfigurację',
     'import_status_ready_start'             => 'Rozpocznij Importowanie',
     'import_status_ready_share'             => 'Please consider downloading your configuration and sharing it at the <strong><a href="https://github.com/firefly-iii/import-configurations/wiki">import configuration center</a></strong>. This will allow other users of Firefly III to import their files more easily.',

From 02ee9451d8a4a31933c6d1ec2744e8305f00d9f4 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Wed, 23 Aug 2017 21:10:09 +0200
Subject: [PATCH 158/668] New translations firefly.php (Polish)

---
 resources/lang/pl_PL/firefly.php | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/resources/lang/pl_PL/firefly.php b/resources/lang/pl_PL/firefly.php
index 1179f35d59..0449138819 100644
--- a/resources/lang/pl_PL/firefly.php
+++ b/resources/lang/pl_PL/firefly.php
@@ -1032,18 +1032,18 @@ return [
     'import_status_ready_text'              => 'Import jest gotowy do uruchomienia. Wszystkie potrzebne ustawienia zostały skonfigurowane. Pobierz proszę plik konfiguracyjny. Pomoże Ci on gdy import nie pójdzie zgodnie z planem. Aby rzeczywiście uruchomić import, można wykonać następujące polecenie w konsoli lub uruchomić importowanie z poziomu strony www. W zależności od konfiguracji, import przez konsolę da Ci więcej informacji zwrotnych.',
     'import_status_ready_config'            => 'Pobierz konfigurację',
     'import_status_ready_start'             => 'Rozpocznij Importowanie',
-    'import_status_ready_share'             => 'Please consider downloading your configuration and sharing it at the <strong><a href="https://github.com/firefly-iii/import-configurations/wiki">import configuration center</a></strong>. This will allow other users of Firefly III to import their files more easily.',
-    'import_status_running_title'           => 'The import is running',
-    'import_status_running_placeholder'     => 'Please hold for an update...',
-    'import_status_errors_title'            => 'Errors during the import',
-    'import_status_errors_single'           => 'An error has occured during the import. It does not appear to be fatal.',
-    'import_status_errors_multi'            => 'Some errors occured during the import. These do not appear to be fatal.',
-    'import_status_fatal_title'             => 'A fatal error occurred',
-    'import_status_fatal_text'              => 'A fatal error occurred, which the import-routine cannot recover from. Please see the explanation in red below.',
-    'import_status_fatal_more'              => 'If the error is a time-out, the import will have stopped half-way. For some server configurations, it is merely the server that stopped while the import keeps running in the background. To verify this, check out the log files. If the problem persists, consider importing over the command line instead.',
-    'import_status_finished_title'          => 'Import routine finished',
-    'import_status_finished_text'           => 'The import routine has imported your file.',
-    'import_status_finished_job'            => 'The transactions imported can be found in tag <a href=":link" class="label label-success" style="font-size:100%;font-weight:normal;">:tag</a>.',
+    'import_status_ready_share'             => 'Rozważ proszę pobranie swojej konfiguracji i udostępnienie jej w <strong><a href="https://github.com/firefly-iii/import-configurations/wiki">centrum konfiguracji importu</a></strong>. Pozwoli to innym użytkownikom Firefly III łatwo importować swoje pliki.',
+    'import_status_running_title'           => 'Importowanie jest uruchomione',
+    'import_status_running_placeholder'     => 'Proszę czekać na aktualizację...',
+    'import_status_errors_title'            => 'Błędy podczas importowania',
+    'import_status_errors_single'           => 'Wystąpił błąd podczas importowania. Nie wydaje się być krytyczny.',
+    'import_status_errors_multi'            => 'Wystąpiły błędy podczas importowania. Nie wydają się być śmiertelne.',
+    'import_status_fatal_title'             => 'Wystąpił krytyczny błąd',
+    'import_status_fatal_text'              => 'Wystąpił błąd krytyczny, którego procedura importu nie naprawić. Proszę sprawdzić wyjaśnienia na czerwono poniżej.',
+    'import_status_fatal_more'              => 'Jeśli przekroczono limitu czasu, import zostanie zatrzymany w połowie. W przypadku niektórych konfiguracji serwerów, jedynie serwer przestał odpowiadać podczas gdy importowanie nadal działa w tle. Aby to sprawdzić, należy sprawdzić pliki dziennika. Jeśli problem będzie się powtarzał, zamiast tego, należy rozważyć Importowanie poprzez konsolę.',
+    'import_status_finished_title'          => 'Importowanie zakończone',
+    'import_status_finished_text'           => 'Procedura importu pomyślnie zaimportowała Twój plik.',
+    'import_status_finished_job'            => 'Zaimportowane transakcje znajdują się w tagu <a href=":link" class="label label-success" style="font-size:100%;font-weight:normal;">:tag</a>.',
     'import_with_key'                       => 'Import z kluczem \':key\'',
 
     // different states:

From 394e92d538e08134f19d5682301e4154324f5724 Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Wed, 23 Aug 2017 21:21:42 +0200
Subject: [PATCH 159/668] Improvements for #616 and others.

---
 app/Http/Controllers/Admin/LinkController.php | 12 ++++
 .../Transaction/LinkController.php            | 68 ++++++++++++++++++-
 app/Http/breadcrumbs.php                      | 16 +++++
 app/Models/LinkType.php                       | 21 +++++-
 app/Models/TransactionJournalLink.php         | 23 +++++++
 .../LinkType/LinkTypeRepository.php           | 27 ++++++++
 .../LinkType/LinkTypeRepositoryInterface.php  | 15 ++++
 app/Support/Amount.php                        |  7 +-
 app/Support/Twig/AmountFormat.php             | 21 ++++++
 resources/lang/en_US/breadcrumbs.php          | 55 +++++++--------
 resources/lang/en_US/firefly.php              |  3 +
 resources/lang/en_US/form.php                 |  3 +-
 resources/views/admin/link/index.twig         | 12 +++-
 resources/views/admin/link/show.twig          | 62 +++++++++++++++++
 resources/views/partials/menu-sidebar.twig    |  6 +-
 resources/views/tags/delete.twig              |  2 +-
 .../views/transactions/links/delete.twig      | 33 +++++++++
 resources/views/transactions/show.twig        | 46 ++++++++-----
 routes/web.php                                |  6 ++
 19 files changed, 383 insertions(+), 55 deletions(-)
 create mode 100644 resources/views/admin/link/show.twig
 create mode 100644 resources/views/transactions/links/delete.twig

diff --git a/app/Http/Controllers/Admin/LinkController.php b/app/Http/Controllers/Admin/LinkController.php
index 06bf9daf69..e4bdeff52b 100644
--- a/app/Http/Controllers/Admin/LinkController.php
+++ b/app/Http/Controllers/Admin/LinkController.php
@@ -152,6 +152,18 @@ class LinkController extends Controller
         return view('admin.link.index', compact('subTitle', 'subTitleIcon', 'linkTypes'));
     }
 
+    /**
+     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
+     */
+    public function show(LinkType $linkType)
+    {
+        $subTitle     = trans('firefly.overview_for_link', ['name' => $linkType->name]);
+        $subTitleIcon = 'fa-link';
+        $links        = $linkType->transactionJournalLinks()->get();
+
+        return view('admin.link.show', compact('subTitle', 'subTitleIcon', 'linkType', 'links'));
+    }
+
     /**
      * @param LinkTypeFormRequest         $request
      * @param LinkTypeRepositoryInterface $repository
diff --git a/app/Http/Controllers/Transaction/LinkController.php b/app/Http/Controllers/Transaction/LinkController.php
index 3f5c1a1a37..09036ea562 100644
--- a/app/Http/Controllers/Transaction/LinkController.php
+++ b/app/Http/Controllers/Transaction/LinkController.php
@@ -13,17 +13,83 @@ declare(strict_types=1);
 namespace FireflyIII\Http\Controllers\Transaction;
 
 
+use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Http\Requests\JournalLinkRequest;
 use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Models\TransactionJournalLink;
 use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
 use FireflyIII\Repositories\LinkType\LinkTypeRepositoryInterface;
 use Log;
+use Preferences;
 use Session;
+use URL;
+use View;
 
-class LinkController
+/**
+ * Class LinkController
+ *
+ * @package FireflyIII\Http\Controllers\Transaction
+ */
+class LinkController extends Controller
 {
 
+
+    /**
+     *
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        // some useful repositories:
+        $this->middleware(
+            function ($request, $next) {
+                View::share('title', trans('firefly.transactions'));
+                View::share('mainTitleIcon', 'fa-repeat');
+
+                return $next($request);
+            }
+        );
+
+    }
+
+
+    /**
+     * @param TransactionJournalLink $link
+     *
+     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
+     */
+    public function delete(TransactionJournalLink $link)
+    {
+        $subTitleIcon = 'fa-link';
+        $subTitle     = trans('breadcrumbs.delete_journal_link');
+        $this->rememberPreviousUri('journal_links.delete.uri');
+
+        return view('transactions.links.delete', compact('link', 'subTitle', 'subTitleIcon'));
+    }
+
+    /**
+     * @param LinkTypeRepositoryInterface $repository
+     * @param TransactionJournalLink      $link
+     *
+     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
+     */
+    public function destroy(LinkTypeRepositoryInterface $repository, TransactionJournalLink $link)
+    {
+        $repository->destroyLink($link);
+
+        Session::flash('success', strval(trans('firefly.deleted_link')));
+        Preferences::mark();
+
+        return redirect(strval(session('journal_links.delete.uri')));
+    }
+
+    public function switch(LinkTypeRepositoryInterface $repository, TransactionJournalLink $link) {
+
+        $repository->switchLink($link);
+
+        return redirect(URL::previous());
+    }
+
     /**
      * @param JournalLinkRequest          $request
      * @param LinkTypeRepositoryInterface $repository
diff --git a/app/Http/breadcrumbs.php b/app/Http/breadcrumbs.php
index 98ba0c7234..cd0ed7939f 100644
--- a/app/Http/breadcrumbs.php
+++ b/app/Http/breadcrumbs.php
@@ -28,6 +28,7 @@ use FireflyIII\Models\RuleGroup;
 use FireflyIII\Models\Tag;
 use FireflyIII\Models\TransactionCurrency;
 use FireflyIII\Models\TransactionJournal;
+use FireflyIII\Models\TransactionJournalLink;
 use FireflyIII\Models\TransactionType;
 use FireflyIII\User;
 use Illuminate\Support\Collection;
@@ -167,6 +168,13 @@ Breadcrumbs::register(
 }
 );
 
+Breadcrumbs::register(
+    'admin.links.show', function (BreadCrumbGenerator $breadcrumbs, LinkType $linkType) {
+    $breadcrumbs->parent('admin.links.index');
+    $breadcrumbs->push(trans('firefly.overview_for_link', [$linkType->name]), route('admin.links.show', [$linkType->id]));
+}
+);
+
 Breadcrumbs::register(
     'admin.links.edit', function (BreadCrumbGenerator $breadcrumbs, LinkType $linkType) {
     $breadcrumbs->parent('admin.links.index');
@@ -181,6 +189,14 @@ Breadcrumbs::register(
 }
 );
 
+Breadcrumbs::register(
+    'transactions.link.delete', function (BreadCrumbGenerator $breadcrumbs, TransactionJournalLink $link) {
+    $breadcrumbs->parent('home');
+    $breadcrumbs->push(trans('breadcrumbs.delete_journal_link'), route('transactions.link.delete', $link->id));
+
+}
+);
+
 /**
  * ATTACHMENTS
  */
diff --git a/app/Models/LinkType.php b/app/Models/LinkType.php
index da8d60de5b..ced7c9a08f 100644
--- a/app/Models/LinkType.php
+++ b/app/Models/LinkType.php
@@ -14,6 +14,7 @@ namespace FireflyIII\Models;
 
 
 use Illuminate\Database\Eloquent\Model;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 /**
  * @property int $journalCount
@@ -36,7 +37,25 @@ class LinkType extends Model
             'editable'   => 'boolean',
         ];
 
-    public function transactionJournalLinks() {
+    /**
+     * @param $value
+     *
+     * @return mixed
+     * @throws NotFoundHttpException
+     */
+    public static function routeBinder($value)
+    {
+        if (auth()->check()) {
+            $model = self::where('id', $value)->first();
+            if (!is_null($model)) {
+                return $model;
+            }
+        }
+        throw new NotFoundHttpException;
+    }
+
+    public function transactionJournalLinks()
+    {
         return $this->hasMany(TransactionJournalLink::class);
     }
 
diff --git a/app/Models/TransactionJournalLink.php b/app/Models/TransactionJournalLink.php
index 0bbcb2aa49..5569091f5d 100644
--- a/app/Models/TransactionJournalLink.php
+++ b/app/Models/TransactionJournalLink.php
@@ -16,6 +16,7 @@ namespace FireflyIII\Models;
 use Crypt;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 /**
  * Class TransactionJournalLink
@@ -26,6 +27,28 @@ class TransactionJournalLink extends Model
 {
     protected $table = 'journal_links';
 
+    /**
+     * @param $value
+     *
+     * @return mixed
+     * @throws NotFoundHttpException
+     */
+    public static function routeBinder($value)
+    {
+        if (auth()->check()) {
+            $model = self::where('journal_links.id', $value)
+                         ->leftJoin('transaction_journals as t_a', 't_a.id', '=', 'source_id')
+                         ->leftJoin('transaction_journals as t_b', 't_b.id', '=', 'destination_id')
+                         ->where('t_a.user_id', auth()->user()->id)
+                         ->where('t_b.user_id', auth()->user()->id)
+                         ->first(['journal_links.*']);
+            if (!is_null($model)) {
+                return $model;
+            }
+        }
+        throw new NotFoundHttpException;
+    }
+
     /**
      * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
      */
diff --git a/app/Repositories/LinkType/LinkTypeRepository.php b/app/Repositories/LinkType/LinkTypeRepository.php
index e2786718ca..71227914f4 100644
--- a/app/Repositories/LinkType/LinkTypeRepository.php
+++ b/app/Repositories/LinkType/LinkTypeRepository.php
@@ -54,6 +54,18 @@ class LinkTypeRepository implements LinkTypeRepositoryInterface
         return true;
     }
 
+    /**
+     * @param TransactionJournalLink $link
+     *
+     * @return bool
+     */
+    public function destroyLink(TransactionJournalLink $link): bool
+    {
+        $link->delete();
+
+        return true;
+    }
+
     /**
      * @param int $id
      *
@@ -135,6 +147,21 @@ class LinkTypeRepository implements LinkTypeRepositoryInterface
         return $linkType;
     }
 
+    /**
+     * @param TransactionJournalLink $link
+     *
+     * @return bool
+     */
+    public function switchLink(TransactionJournalLink $link): bool
+    {
+        $source               = $link->source_id;
+        $link->source_id      = $link->destination_id;
+        $link->destination_id = $source;
+        $link->save();
+
+        return true;
+    }
+
     /**
      * @param LinkType $linkType
      * @param array    $data
diff --git a/app/Repositories/LinkType/LinkTypeRepositoryInterface.php b/app/Repositories/LinkType/LinkTypeRepositoryInterface.php
index 145a69be35..2be29a4084 100644
--- a/app/Repositories/LinkType/LinkTypeRepositoryInterface.php
+++ b/app/Repositories/LinkType/LinkTypeRepositoryInterface.php
@@ -14,6 +14,7 @@ namespace FireflyIII\Repositories\LinkType;
 
 use FireflyIII\Models\LinkType;
 use FireflyIII\Models\TransactionJournal;
+use FireflyIII\Models\TransactionJournalLink;
 use Illuminate\Support\Collection;
 
 /**
@@ -45,6 +46,20 @@ interface LinkTypeRepositoryInterface
      */
     public function find(int $id): LinkType;
 
+    /**
+     * @param TransactionJournalLink $link
+     *
+     * @return bool
+     */
+    public function destroyLink(TransactionJournalLink $link):bool;
+
+    /**
+     * @param TransactionJournalLink $link
+     *
+     * @return bool
+     */
+    public function switchLink(TransactionJournalLink $link): bool;
+
     /**
      * Check if link exists between journals.
      *
diff --git a/app/Support/Amount.php b/app/Support/Amount.php
index 5662f8261b..f1b6247cf8 100644
--- a/app/Support/Amount.php
+++ b/app/Support/Amount.php
@@ -300,6 +300,7 @@ class Amount
     public function transactionAmount(TransactionModel $transaction, bool $coloured = true): string
     {
         $amount = bcmul(app('steam')->positive(strval($transaction->transaction_amount)), '-1');
+
         $format = '%s';
 
         if ($transaction->transaction_type_type === TransactionType::DEPOSIT) {
@@ -322,7 +323,11 @@ class Amount
 
 
         if (!is_null($transaction->transaction_foreign_amount)) {
-            $amount = strval($transaction->transaction_foreign_amount);
+            $amount = bcmul(app('steam')->positive(strval($transaction->transaction_foreign_amount)), '-1');
+            if ($transaction->transaction_type_type === TransactionType::DEPOSIT) {
+                $amount = bcmul($amount, '-1');
+            }
+
 
             if ($transaction->transaction_type_type === TransactionType::TRANSFER) {
                 $amount   = app('steam')->positive($amount);
diff --git a/app/Support/Twig/AmountFormat.php b/app/Support/Twig/AmountFormat.php
index 55e5c28942..5033388258 100644
--- a/app/Support/Twig/AmountFormat.php
+++ b/app/Support/Twig/AmountFormat.php
@@ -46,6 +46,7 @@ class AmountFormat extends Twig_Extension
     {
         return [
             $this->formatAmountByAccount(),
+            $this->formatAmountBySymbol(),
             $this->transactionAmount(),
             $this->journalAmount(),
             $this->formatDestinationAfter(),
@@ -108,6 +109,26 @@ class AmountFormat extends Twig_Extension
         );
     }
 
+    /**
+     * Will format the amount by the currency related to the given account.
+     *
+     * @return Twig_SimpleFunction
+     */
+    protected function formatAmountBySymbol(): Twig_SimpleFunction
+    {
+        return new Twig_SimpleFunction(
+            'formatAmountBySymbol', function (string $amount, string $symbol, int $decimalPlaces = 2, bool $coloured = true): string {
+
+                $currency = new TransactionCurrency;
+                $currency->symbol = $symbol;
+            $currency->decimal_places = $decimalPlaces;
+            return app('amount')->formatAnything($currency, $amount, $coloured);
+
+
+        }, ['is_safe' => ['html']]
+        );
+    }
+
     /**
      * Will format the amount by the currency related to the given account.
      *
diff --git a/resources/lang/en_US/breadcrumbs.php b/resources/lang/en_US/breadcrumbs.php
index 7cdacba597..f1674d1f37 100644
--- a/resources/lang/en_US/breadcrumbs.php
+++ b/resources/lang/en_US/breadcrumbs.php
@@ -13,31 +13,32 @@ declare(strict_types=1);
  */
 
 return [
-    'home'              => 'Home',
-    'edit_currency'     => 'Edit currency ":name"',
-    'delete_currency'   => 'Delete currency ":name"',
-    'newPiggyBank'      => 'Create a new piggy bank',
-    'edit_piggyBank'    => 'Edit piggy bank ":name"',
-    'preferences'       => 'Preferences',
-    'profile'           => 'Profile',
-    'changePassword'    => 'Change your password',
-    'bills'             => 'Bills',
-    'newBill'           => 'New bill',
-    'edit_bill'         => 'Edit bill ":name"',
-    'delete_bill'       => 'Delete bill ":name"',
-    'reports'           => 'Reports',
-    'search_result'     => 'Search results for ":query"',
-    'withdrawal_list'   => 'Expenses',
-    'deposit_list'      => 'Revenue, income and deposits',
-    'transfer_list'     => 'Transfers',
-    'transfers_list'    => 'Transfers',
-    'create_withdrawal' => 'Create new withdrawal',
-    'create_deposit'    => 'Create new deposit',
-    'create_transfer'   => 'Create new transfer',
-    'edit_journal'      => 'Edit transaction ":description"',
-    'delete_journal'    => 'Delete transaction ":description"',
-    'tags'              => 'Tags',
-    'createTag'         => 'Create new tag',
-    'edit_tag'          => 'Edit tag ":tag"',
-    'delete_tag'        => 'Delete tag ":tag"',
+    'home'                => 'Home',
+    'edit_currency'       => 'Edit currency ":name"',
+    'delete_currency'     => 'Delete currency ":name"',
+    'newPiggyBank'        => 'Create a new piggy bank',
+    'edit_piggyBank'      => 'Edit piggy bank ":name"',
+    'preferences'         => 'Preferences',
+    'profile'             => 'Profile',
+    'changePassword'      => 'Change your password',
+    'bills'               => 'Bills',
+    'newBill'             => 'New bill',
+    'edit_bill'           => 'Edit bill ":name"',
+    'delete_bill'         => 'Delete bill ":name"',
+    'reports'             => 'Reports',
+    'search_result'       => 'Search results for ":query"',
+    'withdrawal_list'     => 'Expenses',
+    'deposit_list'        => 'Revenue, income and deposits',
+    'transfer_list'       => 'Transfers',
+    'transfers_list'      => 'Transfers',
+    'create_withdrawal'   => 'Create new withdrawal',
+    'create_deposit'      => 'Create new deposit',
+    'create_transfer'     => 'Create new transfer',
+    'edit_journal'        => 'Edit transaction ":description"',
+    'delete_journal'      => 'Delete transaction ":description"',
+    'tags'                => 'Tags',
+    'createTag'           => 'Create new tag',
+    'edit_tag'            => 'Edit tag ":tag"',
+    'delete_tag'          => 'Delete tag ":tag"',
+    'delete_journal_link' => 'Delete link between journals',
 ];
diff --git a/resources/lang/en_US/firefly.php b/resources/lang/en_US/firefly.php
index aedee71623..89d1ae1afb 100644
--- a/resources/lang/en_US/firefly.php
+++ b/resources/lang/en_US/firefly.php
@@ -965,6 +965,9 @@ return [
     'this_withdrawal'                       => 'This withdrawal',
     'this_deposit'                          => 'This deposit',
     'this_transfer'                         => 'This transfer',
+    'overview_for_link'                     => 'Overview for link type ":name"',
+    'delete_journal_link'                   => 'Delete the link between <a href=":source_link">:source</a> and <a href=":destination_link">:destination</a>',
+    'deleted_link'                          => 'Deleted link',
 
 
     // split a transaction:
diff --git a/resources/lang/en_US/form.php b/resources/lang/en_US/form.php
index f47f680876..311133b340 100644
--- a/resources/lang/en_US/form.php
+++ b/resources/lang/en_US/form.php
@@ -148,13 +148,14 @@ return [
     'journal_areYouSure'         => 'Are you sure you want to delete the transaction described ":description"?',
     'mass_journal_are_you_sure'  => 'Are you sure you want to delete these transactions?',
     'tag_areYouSure'             => 'Are you sure you want to delete the tag ":tag"?',
+    'journal_link_areYouSure'    => 'Are you sure you want to delete the link between <a href=":source_link">:source</a> and <a href=":destination_link">:destination</a>?',
     'linkType_areYouSure'        => 'Are you sure you want to delete the link type ":name" (":inward" / ":outward")?',
     'permDeleteWarning'          => 'Deleting stuff from Firely is permanent and cannot be undone.',
     'mass_make_selection'        => 'You can still prevent items from being deleted by removing the checkbox.',
     'delete_all_permanently'     => 'Delete selected permanently',
     'update_all_journals'        => 'Update these transactions',
     'also_delete_transactions'   => 'The only transaction connected to this account will be deleted as well.|All :count transactions connected to this account will be deleted as well.',
-    'also_delete_connections'   => 'The only transaction linked with this link type will lose this connection.|All :count transactions linked with this link type will lose their connection.',
+    'also_delete_connections'    => 'The only transaction linked with this link type will lose this connection.|All :count transactions linked with this link type will lose their connection.',
     'also_delete_rules'          => 'The only rule connected to this rule group will be deleted as well.|All :count rules connected to this rule group will be deleted as well.',
     'also_delete_piggyBanks'     => 'The only piggy bank connected to this account will be deleted as well.|All :count piggy bank connected to this account will be deleted as well.',
     'bill_keep_transactions'     => 'The only transaction connected to this bill will not be deleted.|All :count transactions connected to this bill will spared deletion.',
diff --git a/resources/views/admin/link/index.twig b/resources/views/admin/link/index.twig
index 4aafa5470c..72e7391e02 100644
--- a/resources/views/admin/link/index.twig
+++ b/resources/views/admin/link/index.twig
@@ -42,7 +42,7 @@
                                     {{ linkType.outward }}
                                 </td>
                                 <td data-value="{{ linkType.journalCount }}">
-                                    {{ linkType.journalCount }}
+                                    <a href="{{ route('admin.links.show', [linkType.id]) }}">{{ linkType.journalCount }}</a>
                                 </td>
                             </tr>
                         {% endfor %}
@@ -55,6 +55,12 @@
             </div>
         </div>
     </div>
-
-
 {% endblock %}
+
+{% block scripts %}
+    <script type="text/javascript" src="js/lib/bootstrap-sortable.js"></script>
+{% endblock %}
+
+{% block styles %}
+    <link rel="stylesheet" href="css/bootstrap-sortable.css" type="text/css" media="all"/>
+{% endblock %}
\ No newline at end of file
diff --git a/resources/views/admin/link/show.twig b/resources/views/admin/link/show.twig
new file mode 100644
index 0000000000..06a834d683
--- /dev/null
+++ b/resources/views/admin/link/show.twig
@@ -0,0 +1,62 @@
+{% extends "./layout/default" %}
+
+{% block breadcrumbs %}
+    {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, linkType) }}
+{% endblock %}
+{% block content %}
+    <div class="row">
+        <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
+            <div class="box box-default">
+                <div class="box-header with-border">
+                    <h3 class="box-title">{{ trans('firefly.overview_for_link', {name: linkType.name}) }}</h3>
+                </div>
+                <div class="box-body no-padding">
+                    <table class="table table-hover sortable">
+                        <thead>
+                        <tr>
+                            <th>&nbsp;</th>
+                            <th>Source transaction</th>
+                            <th>&nbsp;</th>
+                            <th>Link description</th>
+                            <th>Destination transaction</th>
+                            <th>&nbsp;</th>
+                        </tr>
+                        </thead>
+                        <tbody>
+                        {% for link in links %}
+                            <tr>
+                                <td>
+                                    <div class="btn-group btn-group-xs">
+                                        <a href="{{ route('transactions.link.delete', [link.id]) }}" class="btn btn-danger"><i class="fa fa-trash"></i></a>
+                                        <a href="{{ route('transactions.link.switch', [link.id]) }}" class="btn btn-default"><i class="fa fa-fw fa-arrows-h"></i></a>
+                                    </div>
+                                </td>
+                                <td data-value="{{ link.source.description }}">
+                                    <a href="{{ route('transactions.show', [link.source_id]) }}">{{ link.source.description }}</a>
+                                </td>
+                                <td>{{ journalAmount(link.source) }}</td>
+                                <td>{{ linkType.outward }}</td>
+                                <td data-value="{{ link.destination.description }}">
+                                    <a href="{{ route('transactions.show', [link.destination_id]) }}">{{ link.destination.description }}</a>
+                                </td>
+                                <td>
+                                    {{ journalAmount(link.destination) }}
+                                </td>
+                            </tr>
+                        {% endfor %}
+                        </tbody>
+                    </table>
+                </div>
+            </div>
+        </div>
+    </div>
+
+
+{% endblock %}
+{% block scripts %}
+    <script type="text/javascript" src="js/lib/bootstrap-sortable.js"></script>
+{% endblock %}
+
+{% block styles %}
+    <link rel="stylesheet" href="css/bootstrap-sortable.css" type="text/css" media="all"/>
+{% endblock %}
\ No newline at end of file
diff --git a/resources/views/partials/menu-sidebar.twig b/resources/views/partials/menu-sidebar.twig
index 83985bf6ad..f35d8770f0 100644
--- a/resources/views/partials/menu-sidebar.twig
+++ b/resources/views/partials/menu-sidebar.twig
@@ -138,7 +138,7 @@
     <!-- options and preferences -->
 
     <li id="option-menu"
-        class="{{ activeRoutePartial('admin') }} {{ activeRoutePartial('profile') }} {{ activeRoutePartial('preferences') }} {{ activeRoutePartial('currency') }} treeview">
+        class="{{ activeRoutePartial('admin') }} {{ activeRoutePartial('profile') }} {{ activeRoutePartial('preferences') }} {{ activeRoutePartial('currencies') }} treeview">
         <a href="#">
             <i class="fa fa-gears fa-fw"></i>
             <span>{{ 'options'|_ }}</span>
@@ -158,8 +158,8 @@
                 <a class="{{ activeRouteStrict('preferences.index') }}" href="{{ route('preferences.index') }}"><i
                             class="fa fa-gear fa-fw"></i> {{ 'preferences'|_ }}</a>
             </li>
-            <li class="{{ activeRoutePartial('currency') }}">
-                <a class="{{ activeRoutePartial('currency') }}" href="{{ route('currencies.index') }}"><i class="fa fa-usd fa-fw"></i> {{ 'currencies'|_ }}</a>
+            <li class="{{ activeRoutePartial('currencies') }}">
+                <a class="{{ activeRoutePartial('currencies') }}" href="{{ route('currencies.index') }}"><i class="fa fa-usd fa-fw"></i> {{ 'currencies'|_ }}</a>
             </li>
             <!-- admin (if user admin) -->
             {% if Auth.user.hasRole('owner') %}
diff --git a/resources/views/tags/delete.twig b/resources/views/tags/delete.twig
index 794c6e7f05..9ee307a8b4 100644
--- a/resources/views/tags/delete.twig
+++ b/resources/views/tags/delete.twig
@@ -12,7 +12,7 @@
             <div class="col-lg-6 col-lg-offset-3 col-md-6 col-sm-12">
                 <div class="box box-danger">
                     <div class="box-header with-border">
-                        <h3 class="box-title">Delete tag "{{ tag.tag }}"</h3>
+                        <h3 class="box-title">{{ trans('firefly.delete_tag',{tag: tag.tag}) }}</h3>
                     </div>
                     <div class="box-body">
                         <p class="text-danger">
diff --git a/resources/views/transactions/links/delete.twig b/resources/views/transactions/links/delete.twig
new file mode 100644
index 0000000000..e84db20c69
--- /dev/null
+++ b/resources/views/transactions/links/delete.twig
@@ -0,0 +1,33 @@
+{% extends "./layout/default" %}
+
+{% block breadcrumbs %}
+    {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, link) }}
+{% endblock %}
+
+{% block content %}
+
+    <form method="POST" action="{{ route('transactions.link.destroy', [link.id]) }}" accept-charset="UTF-8" class="form-horizontal" id="destroy">
+        <input name="_token" type="hidden" value="{{ csrf_token() }}">
+        <div class="row">
+            <div class="col-lg-6 col-lg-offset-3 col-md-6 col-sm-12">
+                <div class="box box-danger">
+                    <div class="box-header with-border">
+                        <h3 class="box-title">{{ trans('firefly.delete_journal_link', {source: link.source.description, destination: link.destination.description, source_link: route('transactions.show', [link.source_id]) , destination_link: route('transactions.show',link.destination_id)})|raw }}</h3>
+                    </div>
+                    <div class="box-body">
+                        <p class="text-danger">
+                            {{ trans('form.permDeleteWarning') }}
+                        </p>
+                        <p>
+                            {{ trans('form.journal_link_areYouSure', {source: link.source.description, destination: link.destination.description, source_link: route('transactions.show', [link.source_id]) , destination_link: route('transactions.show',link.destination_id)})|raw }}
+                        </p>
+                    </div>
+                    <div class="box-footer">
+                        <input type="submit" name="submit" value="{{ trans('form.deletePermanently') }}" class="btn pull-right btn-danger"/>
+                        <a href="{{ URL.previous() }}" class="btn-default btn">{{ trans('form.cancel') }}</a>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </form>
+{% endblock %}
diff --git a/resources/views/transactions/show.twig b/resources/views/transactions/show.twig
index 0fdbd5e3de..4b19773112 100644
--- a/resources/views/transactions/show.twig
+++ b/resources/views/transactions/show.twig
@@ -322,21 +322,22 @@
                                 <tr>
                                     <td>
                                         <div class="btn-group btn-group-xs">
-                                            <a href="{{ route('attachments.delete', att.id) }}" class="btn btn-danger"><i class="fa fa-trash"></i></a>
+                                            <a href="{{ route('transactions.link.delete', [link.id]) }}" class="btn btn-danger"><i class="fa fa-trash"></i></a>
+                                            <a href="{{ route('transactions.link.switch', [link.id]) }}" class="btn btn-default"><i class="fa fa-fw fa-arrows-h"></i></a>
                                         </div>
                                     </td>
                                     <td>
                                         {{ ('this_'~(what|lower))|_ }}
-                                         (<a href="{{ route('transactions.show',journal.id) }}">#{{ journal.id }}</a>)
                                         {% if link.source.id == journal.id %}
                                             {{ link.linkType.outward }}
-                                            <a href="{{ route('transactions.show',link.destination.id) }}">#{{ link.destination.id }}</a>:
-                                            <a href="{{ route('transactions.show',link.destination.id) }}">{{ link.destination.description }}</a>
+                                            <a href="{{ route('transactions.show',link.destination.id) }}">
+                                                #{{ link.destination.id }}: {{ link.destination.description }}
+                                            </a>
                                             ({{ journalAmount(link.destination) }})
                                         {% else %}
                                             {{ link.linkType.inward }}
-                                            <a href="{{ route('transactions.show',link.source.id) }}">#{{ link.source.id }}</a>:
-                                            <a href="{{ route('transactions.show',link.source.id) }}">{{ link.source.description }}</a>
+                                            <a href="{{ route('transactions.show',link.source.id) }}">
+                                                #{{ link.source.id }}: {{ link.source.description }}</a>
                                             ({{ journalAmount(link.source) }})
                                         {% endif %}
                                         {% if link.comment != "" %}
@@ -364,20 +365,20 @@
                 <table class="table table-bordered table-striped">
                     <thead>
                     <tr>
-                        <th>{{ trans('list.description') }}</th>
+                        <th class="hidden-md hidden-sm hidden-xs">{{ trans('list.description') }}</th>
                         <th>{{ trans('list.source_account') }}</th>
-                        <th>&#916;</th>
+                        <th class="hidden-sm hidden-xs">&#916;</th>
                         <th>{{ trans('list.destination_account') }}</th>
-                        <th>&#916;</th>
+                        <th class="hidden-sm hidden-xs">&#916;</th>
                         <th>{{ trans('list.amount') }}</th>
-                        <th>{{ trans('list.budget') }}</th>
-                        <th>{{ trans('list.category') }}</th>
+                        <th class="hidden-md hidden-xs">{{ trans('list.budget') }}</th>
+                        <th class="hidden-md hidden-xs">{{ trans('list.category') }}</th>
                     </tr>
                     </thead>
                     <tbody>
                     {% for transaction in transactions %}
                         <tr>
-                            <td>
+                            <td class="hidden-md hidden-sm hidden-xs">
                                 {% if transaction.description == "" %}
                                     {{ journal.description }}
                                 {% else %}
@@ -392,7 +393,7 @@
                                 {% endif %}
 
                             </td>
-                            <td>
+                            <td class="hidden-sm hidden-xs">
                                 {{ formatSourceBefore(transaction) }} &rarr; {{ formatSourceAfter(transaction) }}
                             </td>
                             <td>
@@ -403,16 +404,27 @@
                                 {% endif %}
 
                             </td>
-                            <td>
+                            <td class="hidden-sm hidden-xs">
                                 {{ formatDestinationBefore(transaction) }} &rarr; {{ formatDestinationAfter(transaction) }}
                             </td>
                             <td>
-                                {{ journalAmount(journal) }}
+                                {% if journal.transactionType.type == "Withdrawal" %}
+                                    {{ formatAmountBySymbol(transaction.source_amount, transaction.transaction_currency_symbol, transaction.transaction_currency_dp, true) }}
+                                    {% if(transaction.foreign_source_amount) %}
+                                        ({{ formatAmountBySymbol(transaction.foreign_source_amount, transaction.foreign_currency_symbol, transaction.foreign_currency_dp, true) }})
+                                    {% endif %}
+                                {% else %}
+                                    {{ formatAmountBySymbol(transaction.destination_amount, transaction.transaction_currency_symbol,2) }}
+
+                                    {% if(transaction.foreign_source_amount) %}
+                                        ({{ formatAmountBySymbol(transaction.foreign_destination_amount, transaction.foreign_currency_symbol, transaction.foreign_currency_dp, true) }})
+                                    {% endif %}
+                                {% endif %}
                             </td>
-                            <td>
+                            <td class="hidden-md hidden-xs">
                                 {{ transactionIdBudgets(transaction.source_id) }}
                             </td>
-                            <td>
+                            <td class="hidden-md hidden-xs">
                                 {{ transactionIdCategories(transaction.source_id) }}
                             </td>
                         </tr>
diff --git a/routes/web.php b/routes/web.php
index 6e25737e6b..99ceda197d 100755
--- a/routes/web.php
+++ b/routes/web.php
@@ -740,6 +740,11 @@ Route::group(
 Route::group(
     ['middleware' => 'user-full-auth', 'namespace' => 'Transaction', 'prefix' => 'transactions/link', 'as' => 'transactions.link.'], function () {
     Route::post('store/{tj}', ['uses' => 'LinkController@store', 'as' => 'store']);
+
+    Route::get('delete/{journalLink}', ['uses' => 'LinkController@delete', 'as' => 'delete']);
+    Route::get('switch/{journalLink}', ['uses' => 'LinkController@switch', 'as' => 'switch']);
+
+    Route::post('destroy/{journalLink}', ['uses' => 'LinkController@destroy', 'as' => 'destroy']);
 }
 );
 
@@ -771,6 +776,7 @@ Route::group(
     // journal links manager
     Route::get('links', ['uses' => 'LinkController@index', 'as' => 'links.index']);
     Route::get('links/create', ['uses' => 'LinkController@create', 'as' => 'links.create']);
+    Route::get('links/show/{linkType}', ['uses' => 'LinkController@show', 'as' => 'links.show']);
     Route::get('links/edit/{linkType}', ['uses' => 'LinkController@edit', 'as' => 'links.edit']);
     Route::get('links/delete/{linkType}', ['uses' => 'LinkController@delete', 'as' => 'links.delete']);
 

From e38b25909417741827a1f9a3b369c40d9e01c6c5 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Wed, 23 Aug 2017 21:30:29 +0200
Subject: [PATCH 160/668] New translations firefly.php (Russian)

---
 resources/lang/ru_RU/firefly.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/resources/lang/ru_RU/firefly.php b/resources/lang/ru_RU/firefly.php
index 000bf46200..8a7f9fd890 100644
--- a/resources/lang/ru_RU/firefly.php
+++ b/resources/lang/ru_RU/firefly.php
@@ -965,6 +965,9 @@ return [
     'this_withdrawal'                       => 'This withdrawal',
     'this_deposit'                          => 'This deposit',
     'this_transfer'                         => 'This transfer',
+    'overview_for_link'                     => 'Overview for link type ":name"',
+    'delete_journal_link'                   => 'Delete the link between <a href=":source_link">:source</a> and <a href=":destination_link">:destination</a>',
+    'deleted_link'                          => 'Deleted link',
 
 
     // split a transaction:

From 9bfa7acdee0159e0278964e57c62b6ba860b064c Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Wed, 23 Aug 2017 21:30:31 +0200
Subject: [PATCH 161/668] New translations form.php (Russian)

---
 resources/lang/ru_RU/form.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/resources/lang/ru_RU/form.php b/resources/lang/ru_RU/form.php
index 1f3892e7c8..26228ed515 100644
--- a/resources/lang/ru_RU/form.php
+++ b/resources/lang/ru_RU/form.php
@@ -148,13 +148,14 @@ return [
     'journal_areYouSure'         => 'Are you sure you want to delete the transaction described ":description"?',
     'mass_journal_are_you_sure'  => 'Are you sure you want to delete these transactions?',
     'tag_areYouSure'             => 'Are you sure you want to delete the tag ":tag"?',
+    'journal_link_areYouSure'    => 'Are you sure you want to delete the link between <a href=":source_link">:source</a> and <a href=":destination_link">:destination</a>?',
     'linkType_areYouSure'        => 'Are you sure you want to delete the link type ":name" (":inward" / ":outward")?',
     'permDeleteWarning'          => 'Deleting stuff from Firely is permanent and cannot be undone.',
     'mass_make_selection'        => 'You can still prevent items from being deleted by removing the checkbox.',
     'delete_all_permanently'     => 'Delete selected permanently',
     'update_all_journals'        => 'Update these transactions',
     'also_delete_transactions'   => 'The only transaction connected to this account will be deleted as well.|All :count transactions connected to this account will be deleted as well.',
-    'also_delete_connections'   => 'The only transaction linked with this link type will lose this connection.|All :count transactions linked with this link type will lose their connection.',
+    'also_delete_connections'    => 'The only transaction linked with this link type will lose this connection.|All :count transactions linked with this link type will lose their connection.',
     'also_delete_rules'          => 'The only rule connected to this rule group will be deleted as well.|All :count rules connected to this rule group will be deleted as well.',
     'also_delete_piggyBanks'     => 'The only piggy bank connected to this account will be deleted as well.|All :count piggy bank connected to this account will be deleted as well.',
     'bill_keep_transactions'     => 'The only transaction connected to this bill will not be deleted.|All :count transactions connected to this bill will spared deletion.',

From 6f5eb45144a37dfc4d2a003e0b5e9e73fc383572 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Wed, 23 Aug 2017 21:30:32 +0200
Subject: [PATCH 162/668] New translations breadcrumbs.php (Russian)

---
 resources/lang/ru_RU/breadcrumbs.php | 55 ++++++++++++++--------------
 1 file changed, 28 insertions(+), 27 deletions(-)

diff --git a/resources/lang/ru_RU/breadcrumbs.php b/resources/lang/ru_RU/breadcrumbs.php
index bad2440086..ee129f4b24 100644
--- a/resources/lang/ru_RU/breadcrumbs.php
+++ b/resources/lang/ru_RU/breadcrumbs.php
@@ -13,31 +13,32 @@ declare(strict_types=1);
  */
 
 return [
-    'home'              => 'Главная',
-    'edit_currency'     => 'Редактирование валюты ":name"',
-    'delete_currency'   => 'Удаление валюты ":name"',
-    'newPiggyBank'      => 'Создание новой копилки',
-    'edit_piggyBank'    => 'Редактирование копилки ":name"',
-    'preferences'       => 'Настройки',
-    'profile'           => 'Профиль',
-    'changePassword'    => 'Изменение вашего пароля',
-    'bills'             => 'Счета к оплате',
-    'newBill'           => 'Новый счёт к оплате',
-    'edit_bill'         => 'Редактирование счёта к оплате ":name"',
-    'delete_bill'       => 'Удаление счёта к оплате ":name"',
-    'reports'           => 'Отчёты',
-    'search_result'     => 'Результаты поиска для ":query"',
-    'withdrawal_list'   => 'Мои расходы',
-    'deposit_list'      => 'Мои доходы',
-    'transfer_list'     => 'Переводы',
-    'transfers_list'    => 'Переводы',
-    'create_withdrawal' => 'Создать новый расход',
-    'create_deposit'    => 'Создать новый доход',
-    'create_transfer'   => 'Создать новый перевод',
-    'edit_journal'      => 'Редактирование транзакции ":description"',
-    'delete_journal'    => 'Удаление транзакции ":description"',
-    'tags'              => 'Метки',
-    'createTag'         => 'Создать новую метку',
-    'edit_tag'          => 'Редактирование метки ":tag"',
-    'delete_tag'        => 'Удаление метки ":tag"',
+    'home'                => 'Главная',
+    'edit_currency'       => 'Редактирование валюты ":name"',
+    'delete_currency'     => 'Удаление валюты ":name"',
+    'newPiggyBank'        => 'Создание новой копилки',
+    'edit_piggyBank'      => 'Редактирование копилки ":name"',
+    'preferences'         => 'Настройки',
+    'profile'             => 'Профиль',
+    'changePassword'      => 'Изменение вашего пароля',
+    'bills'               => 'Счета к оплате',
+    'newBill'             => 'Новый счёт к оплате',
+    'edit_bill'           => 'Редактирование счёта к оплате ":name"',
+    'delete_bill'         => 'Удаление счёта к оплате ":name"',
+    'reports'             => 'Отчёты',
+    'search_result'       => 'Результаты поиска для ":query"',
+    'withdrawal_list'     => 'Мои расходы',
+    'deposit_list'        => 'Мои доходы',
+    'transfer_list'       => 'Переводы',
+    'transfers_list'      => 'Переводы',
+    'create_withdrawal'   => 'Создать новый расход',
+    'create_deposit'      => 'Создать новый доход',
+    'create_transfer'     => 'Создать новый перевод',
+    'edit_journal'        => 'Редактирование транзакции ":description"',
+    'delete_journal'      => 'Удаление транзакции ":description"',
+    'tags'                => 'Метки',
+    'createTag'           => 'Создать новую метку',
+    'edit_tag'            => 'Редактирование метки ":tag"',
+    'delete_tag'          => 'Удаление метки ":tag"',
+    'delete_journal_link' => 'Delete link between journals',
 ];
\ No newline at end of file

From f94193ad5358babb8ab768e56b8ae2ed1388a900 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Wed, 23 Aug 2017 21:30:37 +0200
Subject: [PATCH 163/668] New translations breadcrumbs.php (Spanish)

---
 resources/lang/es_ES/breadcrumbs.php | 55 ++++++++++++++--------------
 1 file changed, 28 insertions(+), 27 deletions(-)

diff --git a/resources/lang/es_ES/breadcrumbs.php b/resources/lang/es_ES/breadcrumbs.php
index fd58a4772c..900d8e1f0b 100644
--- a/resources/lang/es_ES/breadcrumbs.php
+++ b/resources/lang/es_ES/breadcrumbs.php
@@ -13,31 +13,32 @@ declare(strict_types=1);
  */
 
 return [
-    'home'              => 'Inicio',
-    'edit_currency'     => 'Editar moneda ":name"',
-    'delete_currency'   => 'Eliminar moneda ":name"',
-    'newPiggyBank'      => 'Crear nueva alcancía',
-    'edit_piggyBank'    => 'Editar alcancía ":name"',
-    'preferences'       => 'Preferencias',
-    'profile'           => 'Perfil',
-    'changePassword'    => 'Cambiar contraseña',
-    'bills'             => 'Facturas',
-    'newBill'           => 'Nueva factura',
-    'edit_bill'         => 'Editar factura ":name"',
-    'delete_bill'       => 'Eliminar factura ":name"',
-    'reports'           => 'Reportes',
-    'search_result'     => 'Resultados de la búsqueda para ":query"',
-    'withdrawal_list'   => 'Gastos',
-    'deposit_list'      => 'Ganancia, ingresos y depósitos',
-    'transfer_list'     => 'Transferencias',
-    'transfers_list'    => 'Transferencias',
-    'create_withdrawal' => 'Crear nuevo retiro',
-    'create_deposit'    => 'Crear nuevo depósito',
-    'create_transfer'   => 'Crear nueva transferencia',
-    'edit_journal'      => 'Editar transacción ":description"',
-    'delete_journal'    => 'Eliminar transacción ":description"',
-    'tags'              => 'Etiquetas',
-    'createTag'         => 'Crear nueva etiqueta',
-    'edit_tag'          => 'Editar etiqueta ":tag"',
-    'delete_tag'        => 'Eliminar etiqueta ":tag"',
+    'home'                => 'Inicio',
+    'edit_currency'       => 'Editar moneda ":name"',
+    'delete_currency'     => 'Eliminar moneda ":name"',
+    'newPiggyBank'        => 'Crear nueva alcancía',
+    'edit_piggyBank'      => 'Editar alcancía ":name"',
+    'preferences'         => 'Preferencias',
+    'profile'             => 'Perfil',
+    'changePassword'      => 'Cambiar contraseña',
+    'bills'               => 'Facturas',
+    'newBill'             => 'Nueva factura',
+    'edit_bill'           => 'Editar factura ":name"',
+    'delete_bill'         => 'Eliminar factura ":name"',
+    'reports'             => 'Reportes',
+    'search_result'       => 'Resultados de la búsqueda para ":query"',
+    'withdrawal_list'     => 'Gastos',
+    'deposit_list'        => 'Ganancia, ingresos y depósitos',
+    'transfer_list'       => 'Transferencias',
+    'transfers_list'      => 'Transferencias',
+    'create_withdrawal'   => 'Crear nuevo retiro',
+    'create_deposit'      => 'Crear nuevo depósito',
+    'create_transfer'     => 'Crear nueva transferencia',
+    'edit_journal'        => 'Editar transacción ":description"',
+    'delete_journal'      => 'Eliminar transacción ":description"',
+    'tags'                => 'Etiquetas',
+    'createTag'           => 'Crear nueva etiqueta',
+    'edit_tag'            => 'Editar etiqueta ":tag"',
+    'delete_tag'          => 'Eliminar etiqueta ":tag"',
+    'delete_journal_link' => 'Delete link between journals',
 ];
\ No newline at end of file

From 3308bc8a0f31715029838209c39b862c538313f4 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Wed, 23 Aug 2017 21:30:38 +0200
Subject: [PATCH 164/668] New translations breadcrumbs.php (Slovenian)

---
 resources/lang/sl_SI/breadcrumbs.php | 55 ++++++++++++++--------------
 1 file changed, 28 insertions(+), 27 deletions(-)

diff --git a/resources/lang/sl_SI/breadcrumbs.php b/resources/lang/sl_SI/breadcrumbs.php
index da4ec880d5..d9ed78be48 100644
--- a/resources/lang/sl_SI/breadcrumbs.php
+++ b/resources/lang/sl_SI/breadcrumbs.php
@@ -13,31 +13,32 @@ declare(strict_types=1);
  */
 
 return [
-    'home'              => 'Prva stran',
-    'edit_currency'     => 'uredi valuto ":name"',
-    'delete_currency'   => 'izbriši valuto ":name"',
-    'newPiggyBank'      => 'ustvari novega pujska',
-    'edit_piggyBank'    => 'uredi pujska za ":name"',
-    'preferences'       => 'nastavitve',
-    'profile'           => 'profil',
-    'changePassword'    => 'spremeni geslo',
-    'bills'             => 'Trajniki',
-    'newBill'           => 'nov trajnik',
-    'edit_bill'         => 'uredi trajnik ":name"',
-    'delete_bill'       => 'izbriši trajnik ":name"',
-    'reports'           => 'Poročila',
-    'search_result'     => 'Search results for ":query"',
-    'withdrawal_list'   => 'stroški',
-    'deposit_list'      => 'prihodki',
-    'transfer_list'     => 'prenosi',
-    'transfers_list'    => 'prenosi',
-    'create_withdrawal' => 'ustvari nov odhodek',
-    'create_deposit'    => 'ustvari nov prihodek',
-    'create_transfer'   => 'ustvari nov prenos',
-    'edit_journal'      => 'uredi transakcijo ":description"',
-    'delete_journal'    => 'izbriši transakcijo ":description"',
-    'tags'              => 'značke',
-    'createTag'         => 'ustvari novo značko',
-    'edit_tag'          => 'uredi značko ":tag"',
-    'delete_tag'        => 'izbriši značko ":tag"',
+    'home'                => 'Prva stran',
+    'edit_currency'       => 'uredi valuto ":name"',
+    'delete_currency'     => 'izbriši valuto ":name"',
+    'newPiggyBank'        => 'ustvari novega pujska',
+    'edit_piggyBank'      => 'uredi pujska za ":name"',
+    'preferences'         => 'nastavitve',
+    'profile'             => 'profil',
+    'changePassword'      => 'spremeni geslo',
+    'bills'               => 'Trajniki',
+    'newBill'             => 'nov trajnik',
+    'edit_bill'           => 'uredi trajnik ":name"',
+    'delete_bill'         => 'izbriši trajnik ":name"',
+    'reports'             => 'Poročila',
+    'search_result'       => 'Search results for ":query"',
+    'withdrawal_list'     => 'stroški',
+    'deposit_list'        => 'prihodki',
+    'transfer_list'       => 'prenosi',
+    'transfers_list'      => 'prenosi',
+    'create_withdrawal'   => 'ustvari nov odhodek',
+    'create_deposit'      => 'ustvari nov prihodek',
+    'create_transfer'     => 'ustvari nov prenos',
+    'edit_journal'        => 'uredi transakcijo ":description"',
+    'delete_journal'      => 'izbriši transakcijo ":description"',
+    'tags'                => 'značke',
+    'createTag'           => 'ustvari novo značko',
+    'edit_tag'            => 'uredi značko ":tag"',
+    'delete_tag'          => 'izbriši značko ":tag"',
+    'delete_journal_link' => 'Delete link between journals',
 ];
\ No newline at end of file

From e22745d1ff96ed0362dc84ce0f6b8439d5365995 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Wed, 23 Aug 2017 21:30:42 +0200
Subject: [PATCH 165/668] New translations breadcrumbs.php (Chinese
 Traditional)

---
 resources/lang/zh_TW/breadcrumbs.php | 55 ++++++++++++++--------------
 1 file changed, 28 insertions(+), 27 deletions(-)

diff --git a/resources/lang/zh_TW/breadcrumbs.php b/resources/lang/zh_TW/breadcrumbs.php
index 58c729fbbf..5706fc9331 100644
--- a/resources/lang/zh_TW/breadcrumbs.php
+++ b/resources/lang/zh_TW/breadcrumbs.php
@@ -13,31 +13,32 @@ declare(strict_types=1);
  */
 
 return [
-    'home'              => '首頁',
-    'edit_currency'     => '編輯貨幣 ":name"',
-    'delete_currency'   => '刪除貨幣 ":name"',
-    'newPiggyBank'      => '創建一個新的存錢筒',
-    'edit_piggyBank'    => '編輯存錢筒 ":name"',
-    'preferences'       => '設定',
-    'profile'           => '個人設定',
-    'changePassword'    => '更改密碼',
-    'bills'             => '賬單',
-    'newBill'           => '新增賬單',
-    'edit_bill'         => '編輯賬單 ":name"',
-    'delete_bill'       => '刪除賬單 ":name"',
-    'reports'           => '報表',
-    'search_result'     => 'Search results for ":query"',
-    'withdrawal_list'   => '支出',
-    'deposit_list'      => '收入、薪金與存款',
-    'transfer_list'     => '轉帳',
-    'transfers_list'    => '轉帳',
-    'create_withdrawal' => '新增提款',
-    'create_deposit'    => '新增存款',
-    'create_transfer'   => '新增轉帳',
-    'edit_journal'      => '編緝交易 ":description"',
-    'delete_journal'    => '刪除交易 ":description"',
-    'tags'              => '標籤',
-    'createTag'         => '建立新標籤',
-    'edit_tag'          => '編輯標籤 ":tag"',
-    'delete_tag'        => '刪除標籤 ":tag"',
+    'home'                => '首頁',
+    'edit_currency'       => '編輯貨幣 ":name"',
+    'delete_currency'     => '刪除貨幣 ":name"',
+    'newPiggyBank'        => '創建一個新的存錢筒',
+    'edit_piggyBank'      => '編輯存錢筒 ":name"',
+    'preferences'         => '設定',
+    'profile'             => '個人設定',
+    'changePassword'      => '更改密碼',
+    'bills'               => '賬單',
+    'newBill'             => '新增賬單',
+    'edit_bill'           => '編輯賬單 ":name"',
+    'delete_bill'         => '刪除賬單 ":name"',
+    'reports'             => '報表',
+    'search_result'       => 'Search results for ":query"',
+    'withdrawal_list'     => '支出',
+    'deposit_list'        => '收入、薪金與存款',
+    'transfer_list'       => '轉帳',
+    'transfers_list'      => '轉帳',
+    'create_withdrawal'   => '新增提款',
+    'create_deposit'      => '新增存款',
+    'create_transfer'     => '新增轉帳',
+    'edit_journal'        => '編緝交易 ":description"',
+    'delete_journal'      => '刪除交易 ":description"',
+    'tags'                => '標籤',
+    'createTag'           => '建立新標籤',
+    'edit_tag'            => '編輯標籤 ":tag"',
+    'delete_tag'          => '刪除標籤 ":tag"',
+    'delete_journal_link' => 'Delete link between journals',
 ];
\ No newline at end of file

From 93d1c06892412181f7f91c1d6b4d7de6ad31a07e Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Wed, 23 Aug 2017 21:30:43 +0200
Subject: [PATCH 166/668] New translations breadcrumbs.php (Polish)

---
 resources/lang/pl_PL/breadcrumbs.php | 55 ++++++++++++++--------------
 1 file changed, 28 insertions(+), 27 deletions(-)

diff --git a/resources/lang/pl_PL/breadcrumbs.php b/resources/lang/pl_PL/breadcrumbs.php
index 681cd8d0ee..ae8db89e3a 100644
--- a/resources/lang/pl_PL/breadcrumbs.php
+++ b/resources/lang/pl_PL/breadcrumbs.php
@@ -13,31 +13,32 @@ declare(strict_types=1);
  */
 
 return [
-    'home'              => 'Strona główna',
-    'edit_currency'     => 'Modyfikuj walutę ":name"',
-    'delete_currency'   => 'Usuń walutę ":name"',
-    'newPiggyBank'      => 'Utwórz nową skarbonkę',
-    'edit_piggyBank'    => 'Modyfikuj skarbonkę ":name"',
-    'preferences'       => 'Preferencje',
-    'profile'           => 'Profil',
-    'changePassword'    => 'Zmień swoje hasło',
-    'bills'             => 'Rachunki',
-    'newBill'           => 'Nowy rachunek',
-    'edit_bill'         => 'Modyfikuj rachunek ":name"',
-    'delete_bill'       => 'Usuń rachunek ":name"',
-    'reports'           => 'Raporty',
-    'search_result'     => 'Wyniki wyszukiwania dla ":query"',
-    'withdrawal_list'   => 'Wydatki',
-    'deposit_list'      => 'Przychody, dochody oraz depozyty',
-    'transfer_list'     => 'Transfery',
-    'transfers_list'    => 'Transfery',
-    'create_withdrawal' => 'Utwórz nową wypłatę',
-    'create_deposit'    => 'Utwórz nową wpłatę',
-    'create_transfer'   => 'Utwórz nowy transfer',
-    'edit_journal'      => 'Modyfikuj transakcję ":description"',
-    'delete_journal'    => 'Usuń transakcję ":description"',
-    'tags'              => 'Tagi',
-    'createTag'         => 'Utwórz nowy tag',
-    'edit_tag'          => 'Modyfikuj tag ":tag"',
-    'delete_tag'        => 'Usuń tag ":tag"',
+    'home'                => 'Strona główna',
+    'edit_currency'       => 'Modyfikuj walutę ":name"',
+    'delete_currency'     => 'Usuń walutę ":name"',
+    'newPiggyBank'        => 'Utwórz nową skarbonkę',
+    'edit_piggyBank'      => 'Modyfikuj skarbonkę ":name"',
+    'preferences'         => 'Preferencje',
+    'profile'             => 'Profil',
+    'changePassword'      => 'Zmień swoje hasło',
+    'bills'               => 'Rachunki',
+    'newBill'             => 'Nowy rachunek',
+    'edit_bill'           => 'Modyfikuj rachunek ":name"',
+    'delete_bill'         => 'Usuń rachunek ":name"',
+    'reports'             => 'Raporty',
+    'search_result'       => 'Wyniki wyszukiwania dla ":query"',
+    'withdrawal_list'     => 'Wydatki',
+    'deposit_list'        => 'Przychody, dochody oraz depozyty',
+    'transfer_list'       => 'Transfery',
+    'transfers_list'      => 'Transfery',
+    'create_withdrawal'   => 'Utwórz nową wypłatę',
+    'create_deposit'      => 'Utwórz nową wpłatę',
+    'create_transfer'     => 'Utwórz nowy transfer',
+    'edit_journal'        => 'Modyfikuj transakcję ":description"',
+    'delete_journal'      => 'Usuń transakcję ":description"',
+    'tags'                => 'Tagi',
+    'createTag'           => 'Utwórz nowy tag',
+    'edit_tag'            => 'Modyfikuj tag ":tag"',
+    'delete_tag'          => 'Usuń tag ":tag"',
+    'delete_journal_link' => 'Delete link between journals',
 ];
\ No newline at end of file

From 5e6e7ed152770601baedf11d722534bea3ecdb89 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Wed, 23 Aug 2017 21:30:44 +0200
Subject: [PATCH 167/668] New translations breadcrumbs.php (Portuguese,
 Brazilian)

---
 resources/lang/pt_BR/breadcrumbs.php | 55 ++++++++++++++--------------
 1 file changed, 28 insertions(+), 27 deletions(-)

diff --git a/resources/lang/pt_BR/breadcrumbs.php b/resources/lang/pt_BR/breadcrumbs.php
index d88bc12f6f..19e39cf388 100644
--- a/resources/lang/pt_BR/breadcrumbs.php
+++ b/resources/lang/pt_BR/breadcrumbs.php
@@ -13,31 +13,32 @@ declare(strict_types=1);
  */
 
 return [
-    'home'              => 'Início',
-    'edit_currency'     => 'Editar moeda ":name"',
-    'delete_currency'   => 'Excluir moeda ":moeda"',
-    'newPiggyBank'      => 'Criar um novo cofrinho',
-    'edit_piggyBank'    => 'Editar cofrinho ":name"',
-    'preferences'       => 'Preferências',
-    'profile'           => 'Perfil',
-    'changePassword'    => 'Alterar sua senha',
-    'bills'             => 'Faturas',
-    'newBill'           => 'Nova fatura',
-    'edit_bill'         => 'Editar fatura ":name"',
-    'delete_bill'       => 'Apagar fatura ":name"',
-    'reports'           => 'Relatórios',
-    'search_result'     => 'Search results for ":query"',
-    'withdrawal_list'   => 'Despesas',
-    'deposit_list'      => 'Receitas, renda e depósitos',
-    'transfer_list'     => 'Transferências',
-    'transfers_list'    => 'Transferências',
-    'create_withdrawal' => 'Criar uma nova retirada',
-    'create_deposit'    => 'Criar um novo depósito',
-    'create_transfer'   => 'Criar nova  transferência',
-    'edit_journal'      => 'Editar transação ":description"',
-    'delete_journal'    => 'Apagar transação ":description"',
-    'tags'              => 'Etiquetas',
-    'createTag'         => 'Criar nova etiqueta',
-    'edit_tag'          => 'Editar etiqueta ":tag"',
-    'delete_tag'        => 'Apagar etiqueta ":tag"',
+    'home'                => 'Início',
+    'edit_currency'       => 'Editar moeda ":name"',
+    'delete_currency'     => 'Excluir moeda ":moeda"',
+    'newPiggyBank'        => 'Criar um novo cofrinho',
+    'edit_piggyBank'      => 'Editar cofrinho ":name"',
+    'preferences'         => 'Preferências',
+    'profile'             => 'Perfil',
+    'changePassword'      => 'Alterar sua senha',
+    'bills'               => 'Faturas',
+    'newBill'             => 'Nova fatura',
+    'edit_bill'           => 'Editar fatura ":name"',
+    'delete_bill'         => 'Apagar fatura ":name"',
+    'reports'             => 'Relatórios',
+    'search_result'       => 'Search results for ":query"',
+    'withdrawal_list'     => 'Despesas',
+    'deposit_list'        => 'Receitas, renda e depósitos',
+    'transfer_list'       => 'Transferências',
+    'transfers_list'      => 'Transferências',
+    'create_withdrawal'   => 'Criar uma nova retirada',
+    'create_deposit'      => 'Criar um novo depósito',
+    'create_transfer'     => 'Criar nova  transferência',
+    'edit_journal'        => 'Editar transação ":description"',
+    'delete_journal'      => 'Apagar transação ":description"',
+    'tags'                => 'Etiquetas',
+    'createTag'           => 'Criar nova etiqueta',
+    'edit_tag'            => 'Editar etiqueta ":tag"',
+    'delete_tag'          => 'Apagar etiqueta ":tag"',
+    'delete_journal_link' => 'Delete link between journals',
 ];
\ No newline at end of file

From b16a9053b401b1120942ff055180f55d5ccd4faf Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Wed, 23 Aug 2017 21:30:45 +0200
Subject: [PATCH 168/668] New translations breadcrumbs.php (German)

---
 resources/lang/de_DE/breadcrumbs.php | 55 ++++++++++++++--------------
 1 file changed, 28 insertions(+), 27 deletions(-)

diff --git a/resources/lang/de_DE/breadcrumbs.php b/resources/lang/de_DE/breadcrumbs.php
index 24a40bcd42..ce6d467d2a 100644
--- a/resources/lang/de_DE/breadcrumbs.php
+++ b/resources/lang/de_DE/breadcrumbs.php
@@ -13,31 +13,32 @@ declare(strict_types=1);
  */
 
 return [
-    'home'              => 'Home',
-    'edit_currency'     => 'Bearbeite die Währung ":name"',
-    'delete_currency'   => 'Lösche die Währung ":name"',
-    'newPiggyBank'      => 'Erstellen Sie ein neues Sparschwein',
-    'edit_piggyBank'    => 'Bearbeite Sparschwein ":name"',
-    'preferences'       => 'Einstellungen',
-    'profile'           => 'Profil',
-    'changePassword'    => 'Passwort ändern',
-    'bills'             => 'Rechnungen',
-    'newBill'           => 'Neue Rechnung',
-    'edit_bill'         => 'Bearbeite Rechnung ":name"',
-    'delete_bill'       => 'Lösche Rechnung ":name"',
-    'reports'           => 'Berichte',
-    'search_result'     => 'Search results for ":query"',
-    'withdrawal_list'   => 'Ausgaben',
-    'deposit_list'      => 'Umsatz, Einkommen und Einlagen',
-    'transfer_list'     => 'Überweisungen',
-    'transfers_list'    => 'Überweisungen',
-    'create_withdrawal' => 'Erstelle eine neue Ausgabe',
-    'create_deposit'    => 'Erstelle ein neues Einkommen',
-    'create_transfer'   => 'Erstelle eine neue Überweisung',
-    'edit_journal'      => 'Bearbeite Transaktion ":description"',
-    'delete_journal'    => 'Lösche Transaktion ":description"',
-    'tags'              => 'Markierungen',
-    'createTag'         => 'Neuen Tag erstellen',
-    'edit_tag'          => 'Bearbeite Tag ":tag"',
-    'delete_tag'        => 'Lösche Tag ":tag"',
+    'home'                => 'Home',
+    'edit_currency'       => 'Bearbeite die Währung ":name"',
+    'delete_currency'     => 'Lösche die Währung ":name"',
+    'newPiggyBank'        => 'Erstellen Sie ein neues Sparschwein',
+    'edit_piggyBank'      => 'Bearbeite Sparschwein ":name"',
+    'preferences'         => 'Einstellungen',
+    'profile'             => 'Profil',
+    'changePassword'      => 'Passwort ändern',
+    'bills'               => 'Rechnungen',
+    'newBill'             => 'Neue Rechnung',
+    'edit_bill'           => 'Bearbeite Rechnung ":name"',
+    'delete_bill'         => 'Lösche Rechnung ":name"',
+    'reports'             => 'Berichte',
+    'search_result'       => 'Search results for ":query"',
+    'withdrawal_list'     => 'Ausgaben',
+    'deposit_list'        => 'Umsatz, Einkommen und Einlagen',
+    'transfer_list'       => 'Überweisungen',
+    'transfers_list'      => 'Überweisungen',
+    'create_withdrawal'   => 'Erstelle eine neue Ausgabe',
+    'create_deposit'      => 'Erstelle ein neues Einkommen',
+    'create_transfer'     => 'Erstelle eine neue Überweisung',
+    'edit_journal'        => 'Bearbeite Transaktion ":description"',
+    'delete_journal'      => 'Lösche Transaktion ":description"',
+    'tags'                => 'Markierungen',
+    'createTag'           => 'Neuen Tag erstellen',
+    'edit_tag'            => 'Bearbeite Tag ":tag"',
+    'delete_tag'          => 'Lösche Tag ":tag"',
+    'delete_journal_link' => 'Delete link between journals',
 ];
\ No newline at end of file

From ca9f0fde9bbf46d163a76502827c7b903e8b0eb1 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Wed, 23 Aug 2017 21:30:47 +0200
Subject: [PATCH 169/668] New translations breadcrumbs.php (French)

---
 resources/lang/fr_FR/breadcrumbs.php | 55 ++++++++++++++--------------
 1 file changed, 28 insertions(+), 27 deletions(-)

diff --git a/resources/lang/fr_FR/breadcrumbs.php b/resources/lang/fr_FR/breadcrumbs.php
index 48763edce1..927cebbeff 100644
--- a/resources/lang/fr_FR/breadcrumbs.php
+++ b/resources/lang/fr_FR/breadcrumbs.php
@@ -13,31 +13,32 @@ declare(strict_types=1);
  */
 
 return [
-    'home'              => 'Accueil',
-    'edit_currency'     => 'Modifier la devise "%name"',
-    'delete_currency'   => 'Supprimer la devise ":name"',
-    'newPiggyBank'      => 'Créer une nouvelle tirelire',
-    'edit_piggyBank'    => 'Modifier la tirelire ":name"',
-    'preferences'       => 'Préférences',
-    'profile'           => 'Profil',
-    'changePassword'    => 'Modifier le mot de passe',
-    'bills'             => 'Factures',
-    'newBill'           => 'Nouvelle facture',
-    'edit_bill'         => 'Editer la facture : ":name"',
-    'delete_bill'       => 'Supprimer la facture ":name"',
-    'reports'           => 'Rapport',
-    'search_result'     => 'Résultats de recherche pour ":query"',
-    'withdrawal_list'   => 'Dépenses',
-    'deposit_list'      => 'Revenu, salaire et versements',
-    'transfer_list'     => 'Virements',
-    'transfers_list'    => 'Virements',
-    'create_withdrawal' => 'Créer un nouveau retrait',
-    'create_deposit'    => 'Créer un nouveau versement',
-    'create_transfer'   => 'Creer un nouveau virement',
-    'edit_journal'      => 'Éditer la transaction ":description"',
-    'delete_journal'    => 'Supprimer la transaction ":description"',
-    'tags'              => 'Mots-clés',
-    'createTag'         => 'Créer un nouveau tag',
-    'edit_tag'          => 'Éditer le tag ":tag"',
-    'delete_tag'        => 'Supprimer le tag ":tag"',
+    'home'                => 'Accueil',
+    'edit_currency'       => 'Modifier la devise "%name"',
+    'delete_currency'     => 'Supprimer la devise ":name"',
+    'newPiggyBank'        => 'Créer une nouvelle tirelire',
+    'edit_piggyBank'      => 'Modifier la tirelire ":name"',
+    'preferences'         => 'Préférences',
+    'profile'             => 'Profil',
+    'changePassword'      => 'Modifier le mot de passe',
+    'bills'               => 'Factures',
+    'newBill'             => 'Nouvelle facture',
+    'edit_bill'           => 'Editer la facture : ":name"',
+    'delete_bill'         => 'Supprimer la facture ":name"',
+    'reports'             => 'Rapport',
+    'search_result'       => 'Résultats de recherche pour ":query"',
+    'withdrawal_list'     => 'Dépenses',
+    'deposit_list'        => 'Revenu, salaire et versements',
+    'transfer_list'       => 'Virements',
+    'transfers_list'      => 'Virements',
+    'create_withdrawal'   => 'Créer un nouveau retrait',
+    'create_deposit'      => 'Créer un nouveau versement',
+    'create_transfer'     => 'Creer un nouveau virement',
+    'edit_journal'        => 'Éditer la transaction ":description"',
+    'delete_journal'      => 'Supprimer la transaction ":description"',
+    'tags'                => 'Mots-clés',
+    'createTag'           => 'Créer un nouveau tag',
+    'edit_tag'            => 'Éditer le tag ":tag"',
+    'delete_tag'          => 'Supprimer le tag ":tag"',
+    'delete_journal_link' => 'Delete link between journals',
 ];
\ No newline at end of file

From 01a2d5e017d0594bd247a224bcf68c60a9bd86e6 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Wed, 23 Aug 2017 21:30:48 +0200
Subject: [PATCH 170/668] New translations breadcrumbs.php (Dutch)

---
 resources/lang/nl_NL/breadcrumbs.php | 55 ++++++++++++++--------------
 1 file changed, 28 insertions(+), 27 deletions(-)

diff --git a/resources/lang/nl_NL/breadcrumbs.php b/resources/lang/nl_NL/breadcrumbs.php
index 198dee2ba8..0a817ea921 100644
--- a/resources/lang/nl_NL/breadcrumbs.php
+++ b/resources/lang/nl_NL/breadcrumbs.php
@@ -13,31 +13,32 @@ declare(strict_types=1);
  */
 
 return [
-    'home'              => 'Home',
-    'edit_currency'     => 'Wijzig valuta ":name"',
-    'delete_currency'   => 'Verwijder valuta ":name"',
-    'newPiggyBank'      => 'Nieuw spaarpotje',
-    'edit_piggyBank'    => 'Wijzig spaarpotje ":name"',
-    'preferences'       => 'Voorkeuren',
-    'profile'           => 'Profiel',
-    'changePassword'    => 'Verander je wachtwoord',
-    'bills'             => 'Contracten',
-    'newBill'           => 'Nieuw contract',
-    'edit_bill'         => 'Wijzig contract ":name"',
-    'delete_bill'       => 'Verwijder contract ":name"',
-    'reports'           => 'Overzichten',
-    'search_result'     => 'Zoekresultaten voor ":query"',
-    'withdrawal_list'   => 'Uitgaven',
-    'deposit_list'      => 'Inkomsten',
-    'transfer_list'     => 'Overschrijvingen',
-    'transfers_list'    => 'Overschrijvingen',
-    'create_withdrawal' => 'Sla nieuwe uitgave op',
-    'create_deposit'    => 'Sla nieuwe inkomsten op',
-    'create_transfer'   => 'Sla nieuwe overschrijving op',
-    'edit_journal'      => 'Wijzig transactie ":description"',
-    'delete_journal'    => 'Verwijder transactie ":description"',
-    'tags'              => 'Tags',
-    'createTag'         => 'Maak nieuwe tag',
-    'edit_tag'          => 'Wijzig tag ":tag"',
-    'delete_tag'        => 'Verwijder tag ":tag"',
+    'home'                => 'Home',
+    'edit_currency'       => 'Wijzig valuta ":name"',
+    'delete_currency'     => 'Verwijder valuta ":name"',
+    'newPiggyBank'        => 'Nieuw spaarpotje',
+    'edit_piggyBank'      => 'Wijzig spaarpotje ":name"',
+    'preferences'         => 'Voorkeuren',
+    'profile'             => 'Profiel',
+    'changePassword'      => 'Verander je wachtwoord',
+    'bills'               => 'Contracten',
+    'newBill'             => 'Nieuw contract',
+    'edit_bill'           => 'Wijzig contract ":name"',
+    'delete_bill'         => 'Verwijder contract ":name"',
+    'reports'             => 'Overzichten',
+    'search_result'       => 'Zoekresultaten voor ":query"',
+    'withdrawal_list'     => 'Uitgaven',
+    'deposit_list'        => 'Inkomsten',
+    'transfer_list'       => 'Overschrijvingen',
+    'transfers_list'      => 'Overschrijvingen',
+    'create_withdrawal'   => 'Sla nieuwe uitgave op',
+    'create_deposit'      => 'Sla nieuwe inkomsten op',
+    'create_transfer'     => 'Sla nieuwe overschrijving op',
+    'edit_journal'        => 'Wijzig transactie ":description"',
+    'delete_journal'      => 'Verwijder transactie ":description"',
+    'tags'                => 'Tags',
+    'createTag'           => 'Maak nieuwe tag',
+    'edit_tag'            => 'Wijzig tag ":tag"',
+    'delete_tag'          => 'Verwijder tag ":tag"',
+    'delete_journal_link' => 'Delete link between journals',
 ];
\ No newline at end of file

From 068af6b0d514240d7207628658b214161cd01914 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Wed, 23 Aug 2017 21:30:51 +0200
Subject: [PATCH 171/668] New translations form.php (Spanish)

---
 resources/lang/es_ES/form.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/resources/lang/es_ES/form.php b/resources/lang/es_ES/form.php
index 46417389c3..2121358fdc 100644
--- a/resources/lang/es_ES/form.php
+++ b/resources/lang/es_ES/form.php
@@ -148,13 +148,14 @@ return [
     'journal_areYouSure'         => 'Are you sure you want to delete the transaction described ":description"?',
     'mass_journal_are_you_sure'  => 'Are you sure you want to delete these transactions?',
     'tag_areYouSure'             => 'Are you sure you want to delete the tag ":tag"?',
+    'journal_link_areYouSure'    => 'Are you sure you want to delete the link between <a href=":source_link">:source</a> and <a href=":destination_link">:destination</a>?',
     'linkType_areYouSure'        => 'Are you sure you want to delete the link type ":name" (":inward" / ":outward")?',
     'permDeleteWarning'          => 'Deleting stuff from Firely is permanent and cannot be undone.',
     'mass_make_selection'        => 'You can still prevent items from being deleted by removing the checkbox.',
     'delete_all_permanently'     => 'Delete selected permanently',
     'update_all_journals'        => 'Update these transactions',
     'also_delete_transactions'   => 'The only transaction connected to this account will be deleted as well.|All :count transactions connected to this account will be deleted as well.',
-    'also_delete_connections'   => 'The only transaction linked with this link type will lose this connection.|All :count transactions linked with this link type will lose their connection.',
+    'also_delete_connections'    => 'The only transaction linked with this link type will lose this connection.|All :count transactions linked with this link type will lose their connection.',
     'also_delete_rules'          => 'The only rule connected to this rule group will be deleted as well.|All :count rules connected to this rule group will be deleted as well.',
     'also_delete_piggyBanks'     => 'The only piggy bank connected to this account will be deleted as well.|All :count piggy bank connected to this account will be deleted as well.',
     'bill_keep_transactions'     => 'The only transaction connected to this bill will not be deleted.|All :count transactions connected to this bill will spared deletion.',

From c73a32f76d360f229bd641e0723a42af9da0d2f2 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Wed, 23 Aug 2017 21:30:53 +0200
Subject: [PATCH 172/668] New translations form.php (Portuguese, Brazilian)

---
 resources/lang/pt_BR/form.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/resources/lang/pt_BR/form.php b/resources/lang/pt_BR/form.php
index 2aa4b9f77a..f8d02b2be5 100644
--- a/resources/lang/pt_BR/form.php
+++ b/resources/lang/pt_BR/form.php
@@ -148,13 +148,14 @@ return [
     'journal_areYouSure'         => 'Tem certeza que deseja excluir a transação descrita ":description"?',
     'mass_journal_are_you_sure'  => 'Tem a certeza que pretende apagar estas transações?',
     'tag_areYouSure'             => 'Você tem certeza que quer apagar a tag ":tag"?',
+    'journal_link_areYouSure'    => 'Are you sure you want to delete the link between <a href=":source_link">:source</a> and <a href=":destination_link">:destination</a>?',
     'linkType_areYouSure'        => 'Are you sure you want to delete the link type ":name" (":inward" / ":outward")?',
     'permDeleteWarning'          => 'Exclusão de dados do Firely são permanentes e não podem ser desfeitos.',
     'mass_make_selection'        => 'Você ainda pode evitar que itens sejam excluídos, removendo a caixa de seleção.',
     'delete_all_permanently'     => 'Exclua os selecionados permanentemente',
     'update_all_journals'        => 'Atualizar essas transações',
     'also_delete_transactions'   => 'A única transação ligada a essa conta será excluída também.|Todas as :count transações ligadas a esta conta serão excluídas também.',
-    'also_delete_connections'   => 'The only transaction linked with this link type will lose this connection.|All :count transactions linked with this link type will lose their connection.',
+    'also_delete_connections'    => 'The only transaction linked with this link type will lose this connection.|All :count transactions linked with this link type will lose their connection.',
     'also_delete_rules'          => 'A única regra que ligado a este grupo de regras será excluída também.|Todos as :count regras ligadas a este grupo de regras serão excluídas também.',
     'also_delete_piggyBanks'     => 'O único cofrinho conectado a essa conta será excluído também.|Todos os :count cofrinhos conectados a esta conta serão excluídos também.',
     'bill_keep_transactions'     => 'A única transação a esta conta não será excluída.|Todos as :count transações conectadas a esta fatura não serão excluídos.',

From 1c93153d833f3e0b1ce3d1f6c4fdaa3ebfae20de Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Wed, 23 Aug 2017 21:30:54 +0200
Subject: [PATCH 173/668] New translations form.php (Slovenian)

---
 resources/lang/sl_SI/form.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/resources/lang/sl_SI/form.php b/resources/lang/sl_SI/form.php
index 3df2e86e35..1166ab5444 100644
--- a/resources/lang/sl_SI/form.php
+++ b/resources/lang/sl_SI/form.php
@@ -148,13 +148,14 @@ return [
     'journal_areYouSure'         => 'Are you sure you want to delete the transaction described ":description"?',
     'mass_journal_are_you_sure'  => 'Are you sure you want to delete these transactions?',
     'tag_areYouSure'             => 'Are you sure you want to delete the tag ":tag"?',
+    'journal_link_areYouSure'    => 'Are you sure you want to delete the link between <a href=":source_link">:source</a> and <a href=":destination_link">:destination</a>?',
     'linkType_areYouSure'        => 'Are you sure you want to delete the link type ":name" (":inward" / ":outward")?',
     'permDeleteWarning'          => 'Deleting stuff from Firely is permanent and cannot be undone.',
     'mass_make_selection'        => 'You can still prevent items from being deleted by removing the checkbox.',
     'delete_all_permanently'     => 'Delete selected permanently',
     'update_all_journals'        => 'Update these transactions',
     'also_delete_transactions'   => 'The only transaction connected to this account will be deleted as well.|All :count transactions connected to this account will be deleted as well.',
-    'also_delete_connections'   => 'The only transaction linked with this link type will lose this connection.|All :count transactions linked with this link type will lose their connection.',
+    'also_delete_connections'    => 'The only transaction linked with this link type will lose this connection.|All :count transactions linked with this link type will lose their connection.',
     'also_delete_rules'          => 'The only rule connected to this rule group will be deleted as well.|All :count rules connected to this rule group will be deleted as well.',
     'also_delete_piggyBanks'     => 'The only piggy bank connected to this account will be deleted as well.|All :count piggy bank connected to this account will be deleted as well.',
     'bill_keep_transactions'     => 'The only transaction connected to this bill will not be deleted.|All :count transactions connected to this bill will spared deletion.',

From adc9f92125ea9d5101d00579f2ec722bef64a80f Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Wed, 23 Aug 2017 21:30:57 +0200
Subject: [PATCH 174/668] New translations form.php (Polish)

---
 resources/lang/pl_PL/form.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/resources/lang/pl_PL/form.php b/resources/lang/pl_PL/form.php
index 62c422bc78..1061d0bc49 100644
--- a/resources/lang/pl_PL/form.php
+++ b/resources/lang/pl_PL/form.php
@@ -148,13 +148,14 @@ return [
     'journal_areYouSure'         => 'Czy na pewno chcesz usunąć transakcję opisaną ":description"?',
     'mass_journal_are_you_sure'  => 'Czy na pewno chcesz usunąć te transakcje?',
     'tag_areYouSure'             => 'Czy na pewno chcesz usunąć tag ":tag"?',
+    'journal_link_areYouSure'    => 'Are you sure you want to delete the link between <a href=":source_link">:source</a> and <a href=":destination_link">:destination</a>?',
     'linkType_areYouSure'        => 'Are you sure you want to delete the link type ":name" (":inward" / ":outward")?',
     'permDeleteWarning'          => 'Usuwanie rzeczy z Firefly jest trwałe i nie można tego cofnąć.',
     'mass_make_selection'        => 'You can still prevent items from being deleted by removing the checkbox.',
     'delete_all_permanently'     => 'Trwale usuń zaznaczone',
     'update_all_journals'        => 'Zmodyfikuj te transakcje',
     'also_delete_transactions'   => 'The only transaction connected to this account will be deleted as well.|All :count transactions connected to this account will be deleted as well.',
-    'also_delete_connections'   => 'The only transaction linked with this link type will lose this connection.|All :count transactions linked with this link type will lose their connection.',
+    'also_delete_connections'    => 'The only transaction linked with this link type will lose this connection.|All :count transactions linked with this link type will lose their connection.',
     'also_delete_rules'          => 'The only rule connected to this rule group will be deleted as well.|All :count rules connected to this rule group will be deleted as well.',
     'also_delete_piggyBanks'     => 'The only piggy bank connected to this account will be deleted as well.|All :count piggy bank connected to this account will be deleted as well.',
     'bill_keep_transactions'     => 'The only transaction connected to this bill will not be deleted.|All :count transactions connected to this bill will spared deletion.',

From e9724d8b41d36ac06b9d39cfafa849a8c0703f4a Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Wed, 23 Aug 2017 21:30:58 +0200
Subject: [PATCH 175/668] New translations form.php (German)

---
 resources/lang/de_DE/form.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/resources/lang/de_DE/form.php b/resources/lang/de_DE/form.php
index 921cadc2d0..b890cee4ff 100644
--- a/resources/lang/de_DE/form.php
+++ b/resources/lang/de_DE/form.php
@@ -148,13 +148,14 @@ return [
     'journal_areYouSure'         => 'Sind Sie sicher, dass Sie die Überweisung mit dem Namen ":description" löschen möchten?',
     'mass_journal_are_you_sure'  => 'Sind Sie sicher, dass Sie diese Überweisung löschen möchten?',
     'tag_areYouSure'             => 'Sind Sie sicher, dass Sie den Tag ":name" löschen möchten?',
+    'journal_link_areYouSure'    => 'Are you sure you want to delete the link between <a href=":source_link">:source</a> and <a href=":destination_link">:destination</a>?',
     'linkType_areYouSure'        => 'Are you sure you want to delete the link type ":name" (":inward" / ":outward")?',
     'permDeleteWarning'          => 'Das Löschen von Dingen in Firefly ist dauerhaft und kann nicht rückgängig gemacht werden.',
     'mass_make_selection'        => 'Sie können das Löschen von Elementen verhinden, indem Sie die Checkbox entfernen.',
     'delete_all_permanently'     => 'Ausgewähltes dauerhaft löschen',
     'update_all_journals'        => 'Diese Transaktionen aktualisieren',
     'also_delete_transactions'   => 'Die einzige Überweisung, die mit diesem Konto verknüpft ist, wird ebenfalls gelöscht. | Alle :count Überweisungen, die mit diesem Konto verknüpft sind, werden ebenfalls gelöscht.',
-    'also_delete_connections'   => 'The only transaction linked with this link type will lose this connection.|All :count transactions linked with this link type will lose their connection.',
+    'also_delete_connections'    => 'The only transaction linked with this link type will lose this connection.|All :count transactions linked with this link type will lose their connection.',
     'also_delete_rules'          => 'Die einzige Regel, die mit diesem Konto verknüpft ist, wird ebenfalls gelöscht. | Alle :count Regeln, die mit diesem Konto verknüpft sind, werden ebenfalls gelöscht.',
     'also_delete_piggyBanks'     => 'Das einzige Sparschwein, das mit diesem Konto verknüpft ist, wird ebenfalls gelöscht. | Alle :count Sparschweine, die mit diesem Konto verknüpft sind, werden ebenfalls gelöscht.',
     'bill_keep_transactions'     => 'Die einzige Überweisung, die mit dieser Rechnung verknüpft ist, wird nicht gelöscht. | Keine der :count Überweisungen, die mit dieser Rechnung verknüpft sind, werden gelöscht.',

From 139282a39e00a399817fc38a92b931bdeb880427 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Wed, 23 Aug 2017 21:31:02 +0200
Subject: [PATCH 176/668] New translations firefly.php (French)

---
 resources/lang/fr_FR/firefly.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/resources/lang/fr_FR/firefly.php b/resources/lang/fr_FR/firefly.php
index d36829c13b..56fa637fcb 100644
--- a/resources/lang/fr_FR/firefly.php
+++ b/resources/lang/fr_FR/firefly.php
@@ -965,6 +965,9 @@ return [
     'this_withdrawal'                       => 'This withdrawal',
     'this_deposit'                          => 'This deposit',
     'this_transfer'                         => 'This transfer',
+    'overview_for_link'                     => 'Overview for link type ":name"',
+    'delete_journal_link'                   => 'Delete the link between <a href=":source_link">:source</a> and <a href=":destination_link">:destination</a>',
+    'deleted_link'                          => 'Deleted link',
 
 
     // split a transaction:

From 1b14d7aa2da3b58aad456f826f661afb0903e632 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Wed, 23 Aug 2017 21:31:04 +0200
Subject: [PATCH 177/668] New translations firefly.php (German)

---
 resources/lang/de_DE/firefly.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/resources/lang/de_DE/firefly.php b/resources/lang/de_DE/firefly.php
index c337d36d87..2673ecc7e6 100644
--- a/resources/lang/de_DE/firefly.php
+++ b/resources/lang/de_DE/firefly.php
@@ -966,6 +966,9 @@ Sollen zusätzlich Ihre Girokonten angezeigt werden?',
     'this_withdrawal'                       => 'This withdrawal',
     'this_deposit'                          => 'This deposit',
     'this_transfer'                         => 'This transfer',
+    'overview_for_link'                     => 'Overview for link type ":name"',
+    'delete_journal_link'                   => 'Delete the link between <a href=":source_link">:source</a> and <a href=":destination_link">:destination</a>',
+    'deleted_link'                          => 'Deleted link',
 
 
     // split a transaction:

From 5e85d5ef325c72bcb0ec9cc4d0a12cb19f4a91ab Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Wed, 23 Aug 2017 21:31:07 +0200
Subject: [PATCH 178/668] New translations firefly.php (Dutch)

---
 resources/lang/nl_NL/firefly.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/resources/lang/nl_NL/firefly.php b/resources/lang/nl_NL/firefly.php
index bff0dd8616..e32c369321 100644
--- a/resources/lang/nl_NL/firefly.php
+++ b/resources/lang/nl_NL/firefly.php
@@ -965,6 +965,9 @@ return [
     'this_withdrawal'                       => 'This withdrawal',
     'this_deposit'                          => 'This deposit',
     'this_transfer'                         => 'This transfer',
+    'overview_for_link'                     => 'Overview for link type ":name"',
+    'delete_journal_link'                   => 'Delete the link between <a href=":source_link">:source</a> and <a href=":destination_link">:destination</a>',
+    'deleted_link'                          => 'Deleted link',
 
 
     // split a transaction:

From 343909f87a5b9c37e1a7597af74aac5d03bdc1c5 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Wed, 23 Aug 2017 21:31:10 +0200
Subject: [PATCH 179/668] New translations firefly.php (Chinese Traditional)

---
 resources/lang/zh_TW/firefly.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/resources/lang/zh_TW/firefly.php b/resources/lang/zh_TW/firefly.php
index 4ea95fe25d..127ca075af 100644
--- a/resources/lang/zh_TW/firefly.php
+++ b/resources/lang/zh_TW/firefly.php
@@ -965,6 +965,9 @@ return [
     'this_withdrawal'                       => 'This withdrawal',
     'this_deposit'                          => 'This deposit',
     'this_transfer'                         => 'This transfer',
+    'overview_for_link'                     => 'Overview for link type ":name"',
+    'delete_journal_link'                   => 'Delete the link between <a href=":source_link">:source</a> and <a href=":destination_link">:destination</a>',
+    'deleted_link'                          => 'Deleted link',
 
 
     // split a transaction:

From 8dfd2b9b07d31e297e5370887e4b73ce7486142e Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Wed, 23 Aug 2017 21:31:13 +0200
Subject: [PATCH 180/668] New translations firefly.php (Polish)

---
 resources/lang/pl_PL/firefly.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/resources/lang/pl_PL/firefly.php b/resources/lang/pl_PL/firefly.php
index 0449138819..655bff2d96 100644
--- a/resources/lang/pl_PL/firefly.php
+++ b/resources/lang/pl_PL/firefly.php
@@ -965,6 +965,9 @@ return [
     'this_withdrawal'                       => 'This withdrawal',
     'this_deposit'                          => 'This deposit',
     'this_transfer'                         => 'This transfer',
+    'overview_for_link'                     => 'Overview for link type ":name"',
+    'delete_journal_link'                   => 'Delete the link between <a href=":source_link">:source</a> and <a href=":destination_link">:destination</a>',
+    'deleted_link'                          => 'Deleted link',
 
 
     // split a transaction:

From 0ee825212e584a9ff25cdb900cb3dc575985649a Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Wed, 23 Aug 2017 21:31:16 +0200
Subject: [PATCH 181/668] New translations firefly.php (Portuguese, Brazilian)

---
 resources/lang/pt_BR/firefly.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/resources/lang/pt_BR/firefly.php b/resources/lang/pt_BR/firefly.php
index d6a223377f..d3ef255a63 100644
--- a/resources/lang/pt_BR/firefly.php
+++ b/resources/lang/pt_BR/firefly.php
@@ -965,6 +965,9 @@ return [
     'this_withdrawal'                       => 'This withdrawal',
     'this_deposit'                          => 'This deposit',
     'this_transfer'                         => 'This transfer',
+    'overview_for_link'                     => 'Overview for link type ":name"',
+    'delete_journal_link'                   => 'Delete the link between <a href=":source_link">:source</a> and <a href=":destination_link">:destination</a>',
+    'deleted_link'                          => 'Deleted link',
 
 
     // split a transaction:

From 6a29c64f08a2ee073f33b7670c71ed3872a5f750 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Wed, 23 Aug 2017 21:31:18 +0200
Subject: [PATCH 182/668] New translations form.php (Dutch)

---
 resources/lang/nl_NL/form.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/resources/lang/nl_NL/form.php b/resources/lang/nl_NL/form.php
index d77233351f..94245eece8 100644
--- a/resources/lang/nl_NL/form.php
+++ b/resources/lang/nl_NL/form.php
@@ -148,13 +148,14 @@ return [
     'journal_areYouSure'         => 'Weet je zeker dat je de transactie met naam ":description" wilt verwijderen?',
     'mass_journal_are_you_sure'  => 'Weet je zeker dat je al deze transacties wilt verwijderen?',
     'tag_areYouSure'             => 'Weet je zeker dat je de tag met naam ":tag" wilt verwijderen?',
+    'journal_link_areYouSure'    => 'Are you sure you want to delete the link between <a href=":source_link">:source</a> and <a href=":destination_link">:destination</a>?',
     'linkType_areYouSure'        => 'Weet je zeker dat je linktype ":name" (":inward" / ":outward") wilt verwijderen?',
     'permDeleteWarning'          => 'Dingen verwijderen uit Firefly is permanent en kan niet ongedaan gemaakt worden.',
     'mass_make_selection'        => 'Je kan items alsnog redden van de ondergang door het vinkje weg te halen.',
     'delete_all_permanently'     => 'Verwijder geselecteerde items permanent',
     'update_all_journals'        => 'Wijzig deze transacties',
     'also_delete_transactions'   => 'Ook de enige transactie verbonden aan deze rekening wordt verwijderd.|Ook alle :count transacties verbonden aan deze rekening worden verwijderd.',
-    'also_delete_connections'   => 'De enige transactie gelinkt met dit linktype zal deze verbinding verliezen. | Alle :count transacties met dit linktype zullen deze verbinding verliezen.',
+    'also_delete_connections'    => 'De enige transactie gelinkt met dit linktype zal deze verbinding verliezen. | Alle :count transacties met dit linktype zullen deze verbinding verliezen.',
     'also_delete_rules'          => 'De enige regel in deze regelgroep wordt ook verwijderd.|Alle :count regels in deze regelgroep worden ook verwijderd.',
     'also_delete_piggyBanks'     => 'Ook het spaarpotje verbonden aan deze rekening wordt verwijderd.|Ook alle :count spaarpotjes verbonden aan deze rekening worden verwijderd.',
     'bill_keep_transactions'     => 'De transactie verbonden aan dit contract blijft bewaard.|De :count transacties verbonden aan dit contract blijven bewaard.',

From 7aec367a3c2da23f29ceec424e3eddee12b855af Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Wed, 23 Aug 2017 21:31:19 +0200
Subject: [PATCH 183/668] New translations form.php (French)

---
 resources/lang/fr_FR/form.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/resources/lang/fr_FR/form.php b/resources/lang/fr_FR/form.php
index 7d523360ff..29802c139a 100644
--- a/resources/lang/fr_FR/form.php
+++ b/resources/lang/fr_FR/form.php
@@ -148,13 +148,14 @@ return [
     'journal_areYouSure'         => 'Êtes-vous sûr de vouloir supprimer la description de l\'opération ":description" ?',
     'mass_journal_are_you_sure'  => 'Êtes-vous sûr de que vouloir supprimer ces opérations ?',
     'tag_areYouSure'             => 'Êtes-vous sûr de vouloir supprimer le tag ":tag" ?',
+    'journal_link_areYouSure'    => 'Are you sure you want to delete the link between <a href=":source_link">:source</a> and <a href=":destination_link">:destination</a>?',
     'linkType_areYouSure'        => 'Êtes-vous sûr de vouloir supprimer le type de lien ":name" (":inward" / ":outward") ?',
     'permDeleteWarning'          => 'Supprimer quelque chose dans Firefly est permanent et ne peut pas être annulé.',
     'mass_make_selection'        => 'Vous pouvez toujours empêcher des éléments d’être supprimés en décochant la case à cocher.',
     'delete_all_permanently'     => 'Supprimer la selection définitivement',
     'update_all_journals'        => 'Mettre à jour ces opérations',
     'also_delete_transactions'   => 'La seule opération liée à ce compte sera aussi supprimée.|Les :count opérations liées à ce compte seront aussi supprimées.',
-    'also_delete_connections'   => 'La seule transaction liée à ce type de lien perdra cette connexion. | Toutes les transactions :count liées à ce type de lien perdront leur connexion.',
+    'also_delete_connections'    => 'La seule transaction liée à ce type de lien perdra cette connexion. | Toutes les transactions :count liées à ce type de lien perdront leur connexion.',
     'also_delete_rules'          => 'La seule règle liée à ce groupe de règles sera aussi supprimée.|Les :count règles liées à ce groupe de règles seront aussi supprimées.',
     'also_delete_piggyBanks'     => 'La seule tirelire liée à ce compte sera aussi supprimée.|Les :count tirelires liées à ce compte seront aussi supprimées.',
     'bill_keep_transactions'     => 'La seule opération liée à cette facture ne sera pas supprimée.|Les :count opérations liées à cette facture ne seront pas supprimées.',

From d7d874d48cdd1c0f26ac551ecc1ce470a67ce32c Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Wed, 23 Aug 2017 21:31:20 +0200
Subject: [PATCH 184/668] New translations form.php (Chinese Traditional)

---
 resources/lang/zh_TW/form.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/resources/lang/zh_TW/form.php b/resources/lang/zh_TW/form.php
index fdd71d3f2a..2889759d75 100644
--- a/resources/lang/zh_TW/form.php
+++ b/resources/lang/zh_TW/form.php
@@ -148,13 +148,14 @@ return [
     'journal_areYouSure'         => '你真的要刪除這個描述為 ":description" 的交易嗎？',
     'mass_journal_are_you_sure'  => 'Are you sure you want to delete these transactions?',
     'tag_areYouSure'             => '你真的要要刪除標籤 ":tag" 嗎？',
+    'journal_link_areYouSure'    => 'Are you sure you want to delete the link between <a href=":source_link">:source</a> and <a href=":destination_link">:destination</a>?',
     'linkType_areYouSure'        => 'Are you sure you want to delete the link type ":name" (":inward" / ":outward")?',
     'permDeleteWarning'          => 'Deleting stuff from Firely is permanent and cannot be undone.',
     'mass_make_selection'        => 'You can still prevent items from being deleted by removing the checkbox.',
     'delete_all_permanently'     => 'Delete selected permanently',
     'update_all_journals'        => 'Update these transactions',
     'also_delete_transactions'   => 'The only transaction connected to this account will be deleted as well.|All :count transactions connected to this account will be deleted as well.',
-    'also_delete_connections'   => 'The only transaction linked with this link type will lose this connection.|All :count transactions linked with this link type will lose their connection.',
+    'also_delete_connections'    => 'The only transaction linked with this link type will lose this connection.|All :count transactions linked with this link type will lose their connection.',
     'also_delete_rules'          => 'The only rule connected to this rule group will be deleted as well.|All :count rules connected to this rule group will be deleted as well.',
     'also_delete_piggyBanks'     => 'The only piggy bank connected to this account will be deleted as well.|All :count piggy bank connected to this account will be deleted as well.',
     'bill_keep_transactions'     => 'The only transaction connected to this bill will not be deleted.|All :count transactions connected to this bill will spared deletion.',

From 9348316b12cdad4fd22f146845ab720d116688e2 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Wed, 23 Aug 2017 21:31:23 +0200
Subject: [PATCH 185/668] New translations firefly.php (Spanish)

---
 resources/lang/es_ES/firefly.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/resources/lang/es_ES/firefly.php b/resources/lang/es_ES/firefly.php
index 76308dc060..3d14104ac9 100644
--- a/resources/lang/es_ES/firefly.php
+++ b/resources/lang/es_ES/firefly.php
@@ -965,6 +965,9 @@ return [
     'this_withdrawal'                       => 'This withdrawal',
     'this_deposit'                          => 'This deposit',
     'this_transfer'                         => 'This transfer',
+    'overview_for_link'                     => 'Overview for link type ":name"',
+    'delete_journal_link'                   => 'Delete the link between <a href=":source_link">:source</a> and <a href=":destination_link">:destination</a>',
+    'deleted_link'                          => 'Deleted link',
 
 
     // split a transaction:

From 3d639c7d45756b461e54fc45c743739229b6849a Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Wed, 23 Aug 2017 21:31:26 +0200
Subject: [PATCH 186/668] New translations firefly.php (Slovenian)

---
 resources/lang/sl_SI/firefly.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/resources/lang/sl_SI/firefly.php b/resources/lang/sl_SI/firefly.php
index 5b4f73880e..a559970283 100644
--- a/resources/lang/sl_SI/firefly.php
+++ b/resources/lang/sl_SI/firefly.php
@@ -965,6 +965,9 @@ return [
     'this_withdrawal'                       => 'This withdrawal',
     'this_deposit'                          => 'This deposit',
     'this_transfer'                         => 'This transfer',
+    'overview_for_link'                     => 'Overview for link type ":name"',
+    'delete_journal_link'                   => 'Delete the link between <a href=":source_link">:source</a> and <a href=":destination_link">:destination</a>',
+    'deleted_link'                          => 'Deleted link',
 
 
     // split a transaction:

From 7453f8982711c941109bf44657f18ea773f4558a Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Wed, 23 Aug 2017 23:10:06 +0200
Subject: [PATCH 187/668] New translations form.php (French)

---
 resources/lang/fr_FR/form.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/fr_FR/form.php b/resources/lang/fr_FR/form.php
index 29802c139a..bb05999dff 100644
--- a/resources/lang/fr_FR/form.php
+++ b/resources/lang/fr_FR/form.php
@@ -148,7 +148,7 @@ return [
     'journal_areYouSure'         => 'Êtes-vous sûr de vouloir supprimer la description de l\'opération ":description" ?',
     'mass_journal_are_you_sure'  => 'Êtes-vous sûr de que vouloir supprimer ces opérations ?',
     'tag_areYouSure'             => 'Êtes-vous sûr de vouloir supprimer le tag ":tag" ?',
-    'journal_link_areYouSure'    => 'Are you sure you want to delete the link between <a href=":source_link">:source</a> and <a href=":destination_link">:destination</a>?',
+    'journal_link_areYouSure'    => 'Êtes-vous sûr de vouloir supprimer le lien entre <a href=":source_link">:source</a> et <a href=":destination_link">:destination</a>?',
     'linkType_areYouSure'        => 'Êtes-vous sûr de vouloir supprimer le type de lien ":name" (":inward" / ":outward") ?',
     'permDeleteWarning'          => 'Supprimer quelque chose dans Firefly est permanent et ne peut pas être annulé.',
     'mass_make_selection'        => 'Vous pouvez toujours empêcher des éléments d’être supprimés en décochant la case à cocher.',

From dbad6e4e8c78827fcbc0ff9787c0b1a062bcc2e3 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Thu, 24 Aug 2017 16:20:10 +0200
Subject: [PATCH 188/668] New translations firefly.php (French)

---
 resources/lang/fr_FR/firefly.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/resources/lang/fr_FR/firefly.php b/resources/lang/fr_FR/firefly.php
index 56fa637fcb..c079051ef3 100644
--- a/resources/lang/fr_FR/firefly.php
+++ b/resources/lang/fr_FR/firefly.php
@@ -924,13 +924,13 @@ return [
     'budget_or_budgets'                     => 'budget(s)',
     'budgets_with_limits'                   => 'budget(s) avec montant configuré',
     'rule_or_rules'                         => 'règle(s)',
-    'rulegroup_or_groups'                   => 'rule group(s)',
+    'rulegroup_or_groups'                   => 'groupe(s) de règles',
     'setting_must_confirm_account'          => 'Confirmation de compte',
     'setting_must_confirm_account_explain'  => 'Lorsque ce paramètre est activé, les utilisateurs doivent activer leur compte avant de pouvoir l\'utiliser.',
-    'configuration_updated'                 => 'The configuration has been updated',
-    'setting_is_demo_site'                  => 'Demo site',
-    'setting_is_demo_site_explain'          => 'If you check this box, this installation will behave as if it is the demo site, which can have weird side effects.',
-    'setting_send_email_notifications'      => 'Send email notifications',
+    'configuration_updated'                 => 'La configuration a été mise à jour',
+    'setting_is_demo_site'                  => 'Site de démonstration',
+    'setting_is_demo_site_explain'          => 'Si vous cochez cette case, cette installation se comportera comme si c\'était le site de démonstration, ce qui peut engendrer des effets secondaires étranges.',
+    'setting_send_email_notifications'      => 'Envoyer notifications par email',
     'setting_send_email_explain'            => 'Firefly III can send you email notifications about certain events. They will be sent to <code>:site_owner</code>. This email address can be set in the <code>.env</code> file.',
     'block_code_bounced'                    => 'Email message(s) bounced',
     'block_code_expired'                    => 'Demo account expired',

From 829d3680d952db89040c2edb8de87dcf59376f44 Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Thu, 24 Aug 2017 18:39:46 +0200
Subject: [PATCH 189/668] Broken translation.

---
 resources/lang/en_US/breadcrumbs.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/en_US/breadcrumbs.php b/resources/lang/en_US/breadcrumbs.php
index f1674d1f37..0be3587f3c 100644
--- a/resources/lang/en_US/breadcrumbs.php
+++ b/resources/lang/en_US/breadcrumbs.php
@@ -40,5 +40,5 @@ return [
     'createTag'           => 'Create new tag',
     'edit_tag'            => 'Edit tag ":tag"',
     'delete_tag'          => 'Delete tag ":tag"',
-    'delete_journal_link' => 'Delete link between journals',
+    'delete_journal_link' => 'Delete link between transactions',
 ];

From 7ce631d52960f3b819318102f10e551077a3a0db Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Thu, 24 Aug 2017 18:40:26 +0200
Subject: [PATCH 190/668] New translations breadcrumbs.php (Russian)

---
 resources/lang/ru_RU/breadcrumbs.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/ru_RU/breadcrumbs.php b/resources/lang/ru_RU/breadcrumbs.php
index ee129f4b24..4b9bfd8f1d 100644
--- a/resources/lang/ru_RU/breadcrumbs.php
+++ b/resources/lang/ru_RU/breadcrumbs.php
@@ -40,5 +40,5 @@ return [
     'createTag'           => 'Создать новую метку',
     'edit_tag'            => 'Редактирование метки ":tag"',
     'delete_tag'          => 'Удаление метки ":tag"',
-    'delete_journal_link' => 'Delete link between journals',
+    'delete_journal_link' => 'Delete link between transactions',
 ];
\ No newline at end of file

From 087b4d5c7fd454b36669b35b0b0313c3f50af35a Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Thu, 24 Aug 2017 18:40:31 +0200
Subject: [PATCH 191/668] New translations breadcrumbs.php (Spanish)

---
 resources/lang/es_ES/breadcrumbs.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/es_ES/breadcrumbs.php b/resources/lang/es_ES/breadcrumbs.php
index 900d8e1f0b..6f94cb1792 100644
--- a/resources/lang/es_ES/breadcrumbs.php
+++ b/resources/lang/es_ES/breadcrumbs.php
@@ -40,5 +40,5 @@ return [
     'createTag'           => 'Crear nueva etiqueta',
     'edit_tag'            => 'Editar etiqueta ":tag"',
     'delete_tag'          => 'Eliminar etiqueta ":tag"',
-    'delete_journal_link' => 'Delete link between journals',
+    'delete_journal_link' => 'Delete link between transactions',
 ];
\ No newline at end of file

From e75d17ed24d3769d7217d7e76a31f8367481817a Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Thu, 24 Aug 2017 18:40:32 +0200
Subject: [PATCH 192/668] New translations breadcrumbs.php (Slovenian)

---
 resources/lang/sl_SI/breadcrumbs.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/sl_SI/breadcrumbs.php b/resources/lang/sl_SI/breadcrumbs.php
index d9ed78be48..70672da530 100644
--- a/resources/lang/sl_SI/breadcrumbs.php
+++ b/resources/lang/sl_SI/breadcrumbs.php
@@ -40,5 +40,5 @@ return [
     'createTag'           => 'ustvari novo značko',
     'edit_tag'            => 'uredi značko ":tag"',
     'delete_tag'          => 'izbriši značko ":tag"',
-    'delete_journal_link' => 'Delete link between journals',
+    'delete_journal_link' => 'Delete link between transactions',
 ];
\ No newline at end of file

From cdffd4a9952fb25314f9dec5b22a79e30c32da03 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Thu, 24 Aug 2017 18:40:34 +0200
Subject: [PATCH 193/668] New translations breadcrumbs.php (Chinese
 Traditional)

---
 resources/lang/zh_TW/breadcrumbs.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/zh_TW/breadcrumbs.php b/resources/lang/zh_TW/breadcrumbs.php
index 5706fc9331..a99899ab8a 100644
--- a/resources/lang/zh_TW/breadcrumbs.php
+++ b/resources/lang/zh_TW/breadcrumbs.php
@@ -40,5 +40,5 @@ return [
     'createTag'           => '建立新標籤',
     'edit_tag'            => '編輯標籤 ":tag"',
     'delete_tag'          => '刪除標籤 ":tag"',
-    'delete_journal_link' => 'Delete link between journals',
+    'delete_journal_link' => 'Delete link between transactions',
 ];
\ No newline at end of file

From b77a783f941364d96984d45c61c9080139ddc5c9 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Thu, 24 Aug 2017 18:40:35 +0200
Subject: [PATCH 194/668] New translations breadcrumbs.php (Polish)

---
 resources/lang/pl_PL/breadcrumbs.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/pl_PL/breadcrumbs.php b/resources/lang/pl_PL/breadcrumbs.php
index ae8db89e3a..924f6a1787 100644
--- a/resources/lang/pl_PL/breadcrumbs.php
+++ b/resources/lang/pl_PL/breadcrumbs.php
@@ -40,5 +40,5 @@ return [
     'createTag'           => 'Utwórz nowy tag',
     'edit_tag'            => 'Modyfikuj tag ":tag"',
     'delete_tag'          => 'Usuń tag ":tag"',
-    'delete_journal_link' => 'Delete link between journals',
+    'delete_journal_link' => 'Delete link between transactions',
 ];
\ No newline at end of file

From 8389b875561c87c4c8e3ae56e7da89540842c236 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Thu, 24 Aug 2017 18:40:36 +0200
Subject: [PATCH 195/668] New translations breadcrumbs.php (Portuguese,
 Brazilian)

---
 resources/lang/pt_BR/breadcrumbs.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/pt_BR/breadcrumbs.php b/resources/lang/pt_BR/breadcrumbs.php
index 19e39cf388..6a62264463 100644
--- a/resources/lang/pt_BR/breadcrumbs.php
+++ b/resources/lang/pt_BR/breadcrumbs.php
@@ -40,5 +40,5 @@ return [
     'createTag'           => 'Criar nova etiqueta',
     'edit_tag'            => 'Editar etiqueta ":tag"',
     'delete_tag'          => 'Apagar etiqueta ":tag"',
-    'delete_journal_link' => 'Delete link between journals',
+    'delete_journal_link' => 'Delete link between transactions',
 ];
\ No newline at end of file

From fc13df9a0947d5f2c082ffc4c545e252e42ec066 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Thu, 24 Aug 2017 18:40:37 +0200
Subject: [PATCH 196/668] New translations breadcrumbs.php (German)

---
 resources/lang/de_DE/breadcrumbs.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/de_DE/breadcrumbs.php b/resources/lang/de_DE/breadcrumbs.php
index ce6d467d2a..1666561f85 100644
--- a/resources/lang/de_DE/breadcrumbs.php
+++ b/resources/lang/de_DE/breadcrumbs.php
@@ -40,5 +40,5 @@ return [
     'createTag'           => 'Neuen Tag erstellen',
     'edit_tag'            => 'Bearbeite Tag ":tag"',
     'delete_tag'          => 'Lösche Tag ":tag"',
-    'delete_journal_link' => 'Delete link between journals',
+    'delete_journal_link' => 'Delete link between transactions',
 ];
\ No newline at end of file

From c1985b2fa2e713ab6aaf439824e4df4828fc42ef Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Thu, 24 Aug 2017 18:40:39 +0200
Subject: [PATCH 197/668] New translations breadcrumbs.php (French)

---
 resources/lang/fr_FR/breadcrumbs.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/fr_FR/breadcrumbs.php b/resources/lang/fr_FR/breadcrumbs.php
index 927cebbeff..a6d4c56e06 100644
--- a/resources/lang/fr_FR/breadcrumbs.php
+++ b/resources/lang/fr_FR/breadcrumbs.php
@@ -40,5 +40,5 @@ return [
     'createTag'           => 'Créer un nouveau tag',
     'edit_tag'            => 'Éditer le tag ":tag"',
     'delete_tag'          => 'Supprimer le tag ":tag"',
-    'delete_journal_link' => 'Delete link between journals',
+    'delete_journal_link' => 'Delete link between transactions',
 ];
\ No newline at end of file

From 237983cecf9244d90a92c4c73172f998283309ed Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Thu, 24 Aug 2017 18:40:40 +0200
Subject: [PATCH 198/668] New translations breadcrumbs.php (Dutch)

---
 resources/lang/nl_NL/breadcrumbs.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/nl_NL/breadcrumbs.php b/resources/lang/nl_NL/breadcrumbs.php
index 0a817ea921..40922f16e8 100644
--- a/resources/lang/nl_NL/breadcrumbs.php
+++ b/resources/lang/nl_NL/breadcrumbs.php
@@ -40,5 +40,5 @@ return [
     'createTag'           => 'Maak nieuwe tag',
     'edit_tag'            => 'Wijzig tag ":tag"',
     'delete_tag'          => 'Verwijder tag ":tag"',
-    'delete_journal_link' => 'Delete link between journals',
+    'delete_journal_link' => 'Delete link between transactions',
 ];
\ No newline at end of file

From 1a179c7a455b616bf1379df3611a2f0c1e9dc7da Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Thu, 24 Aug 2017 18:41:00 +0200
Subject: [PATCH 199/668] New translations form.php (Dutch)

---
 resources/lang/nl_NL/form.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/nl_NL/form.php b/resources/lang/nl_NL/form.php
index 94245eece8..5bc5e1f559 100644
--- a/resources/lang/nl_NL/form.php
+++ b/resources/lang/nl_NL/form.php
@@ -148,7 +148,7 @@ return [
     'journal_areYouSure'         => 'Weet je zeker dat je de transactie met naam ":description" wilt verwijderen?',
     'mass_journal_are_you_sure'  => 'Weet je zeker dat je al deze transacties wilt verwijderen?',
     'tag_areYouSure'             => 'Weet je zeker dat je de tag met naam ":tag" wilt verwijderen?',
-    'journal_link_areYouSure'    => 'Are you sure you want to delete the link between <a href=":source_link">:source</a> and <a href=":destination_link">:destination</a>?',
+    'journal_link_areYouSure'    => 'Weet je zeker dat je de koppeling tussen <a href=":source_link">:source</a> en <a href=":destination_link">:destination</a> wilt verwijderen?',
     'linkType_areYouSure'        => 'Weet je zeker dat je linktype ":name" (":inward" / ":outward") wilt verwijderen?',
     'permDeleteWarning'          => 'Dingen verwijderen uit Firefly is permanent en kan niet ongedaan gemaakt worden.',
     'mass_make_selection'        => 'Je kan items alsnog redden van de ondergang door het vinkje weg te halen.',

From c37ade8f5b40117ac897e0a50cf0eb9ecc576072 Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Thu, 24 Aug 2017 19:42:23 +0200
Subject: [PATCH 200/668] Catch link error.

---
 .../Transaction/LinkController.php            | 23 ++++++++++++-------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/app/Http/Controllers/Transaction/LinkController.php b/app/Http/Controllers/Transaction/LinkController.php
index 09036ea562..0b560c78c8 100644
--- a/app/Http/Controllers/Transaction/LinkController.php
+++ b/app/Http/Controllers/Transaction/LinkController.php
@@ -83,13 +83,6 @@ class LinkController extends Controller
         return redirect(strval(session('journal_links.delete.uri')));
     }
 
-    public function switch(LinkTypeRepositoryInterface $repository, TransactionJournalLink $link) {
-
-        $repository->switchLink($link);
-
-        return redirect(URL::previous());
-    }
-
     /**
      * @param JournalLinkRequest          $request
      * @param LinkTypeRepositoryInterface $repository
@@ -127,8 +120,14 @@ class LinkController extends Controller
             $linkJournalId = intval($request->string('link_other'));
         }
 
+
         $opposing = $journalRepository->find($linkJournalId);
-        $result   = $repository->findLink($journal, $opposing);
+        if (is_null($opposing->id)) {
+            Session::flash('error', trans('firefly.invalid_link_data'));
+
+            return redirect(route('transactions.show', $journal->id));
+        }
+        $result = $repository->findLink($journal, $opposing);
         if ($result) {
             Session::flash('error', trans('firefly.journals_error_linked'));
 
@@ -155,4 +154,12 @@ class LinkController extends Controller
         return redirect(route('transactions.show', $journal->id));
     }
 
+    public function switch(LinkTypeRepositoryInterface $repository, TransactionJournalLink $link)
+    {
+
+        $repository->switchLink($link);
+
+        return redirect(URL::previous());
+    }
+
 }
\ No newline at end of file

From 4ac5f252793d97527a6c880e98832baa7fdc45ee Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Thu, 24 Aug 2017 19:47:31 +0200
Subject: [PATCH 201/668] Expand config for links.

---
 config/firefly.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/config/firefly.php b/config/firefly.php
index b1e1660187..a31becc9af 100644
--- a/config/firefly.php
+++ b/config/firefly.php
@@ -39,14 +39,14 @@ return [
     'import_processors'          => [
         'csv' => 'FireflyIII\Import\FileProcessor\CsvProcessor',
     ],
-    'import_pre' => [
+    'import_pre'                 => [
         'bunq' => 'FireflyIII\Support\Import\Prerequisites\BunqPrerequisites',
     ],
-    'import_info' => [
+    'import_info'                => [
         'bunq' => 'FireflyIII\Support\Import\Information\BunqInformation',
     ],
-    'bunq' => [
-        'server' => 'https://sandbox.public.api.bunq.com',
+    'bunq'                       => [
+        'server' => 'https://api.bunq.com',
     ],
     'default_export_format'      => 'csv',
     'default_import_format'      => 'csv',
@@ -146,6 +146,7 @@ return [
         'budget'            => 'FireflyIII\Models\Budget',
         'category'          => 'FireflyIII\Models\Category',
         'transaction_type'  => 'FireflyIII\Models\TransactionType',
+        'journalLink'       => \FireflyIII\Models\TransactionJournalLink::class,
         'currency'          => 'FireflyIII\Models\TransactionCurrency',
         'fromCurrencyCode'  => 'FireflyIII\Support\Binder\CurrencyCode',
         'toCurrencyCode'    => 'FireflyIII\Support\Binder\CurrencyCode',

From 14a218e3195c8420e956d4642acdf8b1e78929e1 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Thu, 24 Aug 2017 19:50:07 +0200
Subject: [PATCH 202/668] New translations breadcrumbs.php (Dutch)

---
 resources/lang/nl_NL/breadcrumbs.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/nl_NL/breadcrumbs.php b/resources/lang/nl_NL/breadcrumbs.php
index 40922f16e8..ef303debe0 100644
--- a/resources/lang/nl_NL/breadcrumbs.php
+++ b/resources/lang/nl_NL/breadcrumbs.php
@@ -40,5 +40,5 @@ return [
     'createTag'           => 'Maak nieuwe tag',
     'edit_tag'            => 'Wijzig tag ":tag"',
     'delete_tag'          => 'Verwijder tag ":tag"',
-    'delete_journal_link' => 'Delete link between transactions',
+    'delete_journal_link' => 'Verwijder koppeling tussen transacties',
 ];
\ No newline at end of file

From 14aa261aca9a0083b3283c9c524cd8065a13c24c Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Thu, 24 Aug 2017 21:23:48 +0200
Subject: [PATCH 203/668] Remove unused translations.

---
 resources/lang/en_US/firefly.php | 94 --------------------------------
 1 file changed, 94 deletions(-)

diff --git a/resources/lang/en_US/firefly.php b/resources/lang/en_US/firefly.php
index 89d1ae1afb..54d8cebe46 100644
--- a/resources/lang/en_US/firefly.php
+++ b/resources/lang/en_US/firefly.php
@@ -13,7 +13,6 @@ declare(strict_types=1);
 
 return [
     // general stuff:
-    'language_incomplete'                        => 'incomplete translation',
     'close'                                      => 'Close',
     'actions'                                    => 'Actions',
     'edit'                                       => 'Edit',
@@ -28,12 +27,7 @@ return [
     'to'                                         => 'To',
     'showEverything'                             => 'Show everything',
     'never'                                      => 'Never',
-    'search_results_for'                         => 'Search results for ":query"',
     'no_results_for_empty_search'                => 'Your search was empty, so nothing was found.',
-    'bounced_error'                              => 'The message sent to :email bounced, so no access for you.',
-    'deleted_error'                              => 'These credentials do not match our records.',
-    'general_blocked_error'                      => 'Your account has been disabled, so you cannot login.',
-    'expired_error'                              => 'Your account has expired, and can no longer be used.',
     'removed_amount'                             => 'Removed :amount',
     'added_amount'                               => 'Added :amount',
     'asset_account_role_help'                    => 'Any extra options resulting from your choice can be set later.',
@@ -56,7 +50,6 @@ return [
     'flash_error_multiple'                       => 'There is one error|There are :count errors',
     'net_worth'                                  => 'Net worth',
     'route_has_no_help'                          => 'There is no help for this route.',
-    'help_may_not_be_your_language'              => 'This help text is in English. It is not yet available in your language',
     'two_factor_welcome'                         => 'Hello, :user!',
     'two_factor_enter_code'                      => 'To continue, please enter your two factor authentication code. Your application can generate it for you.',
     'two_factor_code_here'                       => 'Enter code here',
@@ -70,9 +63,6 @@ return [
     'two_factor_lost_fix_owner'                  => 'Otherwise, email the site owner, <a href="mailto::site_owner">:site_owner</a> and ask them to reset your two factor authentication.',
     'warning_much_data'                          => ':days days of data may take a while to load.',
     'registered'                                 => 'You have registered successfully!',
-    'tagbalancingAct'                            => 'Balancing act',
-    'tagadvancePayment'                          => 'Advance payment',
-    'tagnothing'                                 => '',
     'Default asset account'                      => '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.',
     'Savings account'                            => 'Savings account',
@@ -84,7 +74,6 @@ return [
     'need_more_help'                             => 'If you need more help using Firefly III, please <a href="https://github.com/firefly-iii/firefly-iii/issues">open a ticket on Github</a>.',
     'reenable_intro_text'                        => 'You can also reenable <a href="#" id="reenableGuidance">the introduction guidance</a>.',
     'intro_boxes_after_refresh'                  => 'The introduction boxes will reappear when you refresh the page.',
-    'nothing_to_display'                         => 'There are no transactions to show you',
     'show_all_no_filter'                         => 'Show all transactions without grouping them by date.',
     'expenses_by_category'                       => 'Expenses by category',
     'expenses_by_budget'                         => 'Expenses by budget',
@@ -98,11 +87,7 @@ return [
     'spent_in_specific_budget'                   => 'Spent in budget ":budget"',
     'sum_of_expenses_in_budget'                  => 'Spent total in budget ":budget"',
     'left_in_budget_limit'                       => 'Left to spend according to budgeting',
-    'cannot_change_demo'                         => 'You cannot change the password of the demonstration account.',
-    'cannot_delete_demo'                         => 'You cannot remove the demonstration account.',
     'cannot_reset_demo_user'                     => 'You cannot reset the password of the demonstration account',
-    'per_period'                                 => 'Per period',
-    'all_periods'                                => 'All periods',
     'current_period'                             => 'Current period',
     'show_the_current_period_and_overview'       => 'Show the current period and overview',
     'pref_languages_locale'                      => 'For a language other than English to work properly, your operating system must be equipped with the correct locale-information. If these are not present, currency data, dates and amounts may be formatted wrong.',
@@ -111,11 +96,9 @@ return [
     'chart_account_in_period'                    => 'Chart for all transactions for account ":name" between :start and :end',
     'chart_category_in_period'                   => 'Chart for all transactions for category ":name" between :start and :end',
     'chart_category_all'                         => 'Chart for all transactions for category ":name"',
-    'budget_in_period_breadcrumb'                => 'Between :start and :end',
     'clone_withdrawal'                           => 'Clone this withdrawal',
     'clone_deposit'                              => 'Clone this deposit',
     'clone_transfer'                             => 'Clone this transfer',
-    'transaction_journal_other_options'          => 'Other options',
     'multi_select_no_selection'                  => 'None selected',
     'multi_select_all_selected'                  => 'All selected',
     'multi_select_filter_placeholder'            => 'Find..',
@@ -164,18 +147,6 @@ return [
     'quarterly'                                  => 'quarterly',
     'half-year'                                  => 'every half year',
     'yearly'                                     => 'yearly',
-    // account confirmation:
-    'confirm_account_header'                     => 'Please confirm your account',
-    'confirm_account_intro'                      => 'An email has been sent to the address you used during your registration. Please check it out for further instructions. If you did not get this message, you can have Firefly send it again.',
-    'confirm_account_resend_email'               => 'Send me the confirmation message I need to activate my account.',
-    'account_is_confirmed'                       => 'Your account has been confirmed!',
-    'invalid_activation_code'                    => 'It seems the code you are using is not valid, or has expired.',
-    'confirm_account_is_resent_header'           => 'The confirmation has been resent',
-    'confirm_account_is_resent_text'             => 'The confirmation message has been resent. If you still did not receive the confirmation message, please contact the site owner at <a href="mailto::owner">:owner</a> or check the log files to see what went wrong.',
-    'confirm_account_is_resent_go_home'          => 'Go to the index page of Firefly',
-    'confirm_account_not_resent_header'          => 'Something went wrong :(',
-    'confirm_account_not_resent_intro'           => 'The confirmation message has been not resent. If you still did not receive the confirmation message, please contact the site owner at <a href="mailto::owner">:owner</a> instead. Possibly, you have tried to resend the activation message too often. You can have Firefly III try to resend the confirmation message every hour.',
-    'confirm_account_not_resent_go_home'         => 'Go to the index page of Firefly',
 
     // export data:
     'import_and_export'                          => 'Import and export',
@@ -205,7 +176,6 @@ return [
     'export_status_created_zip_file'             => 'Created a zip file!',
     'export_status_finished'                     => 'Export has succesfully finished! Yay!',
     'export_data_please_wait'                    => 'Please wait...',
-    'attachment_explanation'                     => 'The file called \':attachment_name\' (#:attachment_id) was originally uploaded to :type \':description\' (#:journal_id) dated :date for the amount of :amount.',
 
     // rules
     'rules'                                      => 'Rules',
@@ -523,7 +493,6 @@ return [
     'createBudget'                               => 'New budget',
     'inactiveBudgets'                            => 'Inactive budgets',
     'without_budget_between'                     => 'Transactions without a budget between :start and :end',
-    'budget_in_month'                            => ':name in :month',
     'delete_budget'                              => 'Delete budget ":name"',
     'deleted_budget'                             => 'Deleted budget ":name"',
     'edit_budget'                                => 'Edit budget ":name"',
@@ -597,8 +566,6 @@ return [
     'select_more_than_one_category'              => 'Please select more than one category',
     'select_more_than_one_budget'                => 'Please select more than one budget',
     'select_more_than_one_tag'                   => 'Please select more than one tag',
-    'from_to'                                    => 'From :start to :end',
-    'from_to_breadcrumb'                         => 'from :start to :end',
     'account_default_currency'                   => 'If you select another currency, new transactions from this account will have this currency pre-selected.',
 
     // categories:
@@ -656,8 +623,6 @@ return [
     'yourAccounts'                               => 'Your accounts',
     'budgetsAndSpending'                         => 'Budgets and spending',
     'savings'                                    => 'Savings',
-    'markAsSavingsToContinue'                    => 'Mark your asset accounts as "Savings account" to fill this panel',
-    'createPiggyToContinue'                      => 'Create piggy banks to fill this panel.',
     'newWithdrawal'                              => 'New expense',
     'newDeposit'                                 => 'New deposit',
     'newTransfer'                                => 'New transfer',
@@ -665,8 +630,6 @@ return [
     'moneyOut'                                   => 'Money out',
     'billsToPay'                                 => 'Bills to pay',
     'billsPaid'                                  => 'Bills paid',
-    'divided'                                    => 'divided',
-    'toDivide'                                   => 'left to divide',
 
     // menu and titles, should be recycled as often as possible:
     'currency'                                   => 'Currency',
@@ -726,20 +689,11 @@ return [
     'reports_can_bookmark'                       => 'Remember that reports can be bookmarked.',
     'incomeVsExpenses'                           => 'Income vs. expenses',
     'accountBalances'                            => 'Account balances',
-    'balanceStartOfYear'                         => 'Balance at start of year',
-    'balanceEndOfYear'                           => 'Balance at end of year',
-    'balanceStartOfMonth'                        => 'Balance at start of month',
-    'balanceEndOfMonth'                          => 'Balance at end of month',
     'balanceStart'                               => 'Balance at start of period',
     'balanceEnd'                                 => 'Balance at end of period',
-    'reportsOwnAccounts'                         => 'Reports for your own accounts',
-    'reportsOwnAccountsAndShared'                => 'Reports for your own accounts and shared accounts',
     'splitByAccount'                             => 'Split by account',
-    'balancedByTransfersAndTags'                 => 'Balanced by transfers and tags',
     'coveredWithTags'                            => 'Covered with tags',
     'leftUnbalanced'                             => 'Left unbalanced',
-    'expectedBalance'                            => 'Expected balance',
-    'outsideOfBudgets'                           => 'Outside of budgets',
     'leftInBudget'                               => 'Left in budget',
     'sumOfSums'                                  => 'Sum of sums',
     'noCategory'                                 => '(no category)',
@@ -752,19 +706,12 @@ return [
     'topX'                                       => 'top :number',
     'show_full_list'                             => 'Show entire list',
     'show_only_top'                              => 'Show only top :number',
-    'sum_of_year'                                => 'Sum of year',
-    'sum_of_years'                               => 'Sum of years',
-    'average_of_year'                            => 'Average of year',
-    'average_of_years'                           => 'Average of years',
-    'categories_earned_in_year'                  => 'Categories (by earnings)',
-    'categories_spent_in_year'                   => 'Categories (by spendings)',
     'report_type'                                => 'Report type',
     'report_type_default'                        => 'Default financial report',
     'report_type_audit'                          => 'Transaction history overview (audit)',
     'report_type_category'                       => 'Category report',
     'report_type_budget'                         => 'Budget report',
     'report_type_tag'                            => 'Tag report',
-    'report_type_meta-history'                   => 'Categories, budgets and bills overview',
     'more_info_help'                             => 'More information about these types of reports can be found in the help pages. Press the (?) icon in the top right corner.',
     'report_included_accounts'                   => 'Included accounts',
     'report_date_range'                          => 'Date range',
@@ -817,7 +764,6 @@ return [
 
     // charts:
     'chart'                                      => 'Chart',
-    'dayOfMonth'                                 => 'Day of the month',
     'month'                                      => 'Month',
     'budget'                                     => 'Budget',
     'spent'                                      => 'Spent',
@@ -838,7 +784,6 @@ return [
     'budgeted'                                   => 'Budgeted',
     'period'                                     => 'Period',
     'balance'                                    => 'Balance',
-    'summary'                                    => 'Summary',
     'sum'                                        => 'Sum',
     'average'                                    => 'Average',
     'balanceFor'                                 => 'Balance for :name',
@@ -871,18 +816,13 @@ return [
     'start_date'                 => 'Start date',
     'target_date'                => 'Target date',
     'no_target_date'             => 'No target date',
-    'todo'                       => 'to do',
     'table'                      => 'Table',
-    'piggy_bank_not_exists'      => 'Piggy bank no longer exists.',
-    'add_any_amount_to_piggy'    => 'Add money to this piggy bank to reach your target of :amount.',
-    'add_set_amount_to_piggy'    => 'Add :amount to fill this piggy bank on :date',
     'delete_piggy_bank'          => 'Delete piggy bank ":name"',
     'cannot_add_amount_piggy'    => 'Could not add :amount to ":name".',
     'cannot_remove_from_piggy'   => 'Could not remove :amount from ":name".',
     'deleted_piggy_bank'         => 'Deleted piggy bank ":name"',
     'added_amount_to_piggy'      => 'Added :amount to ":name"',
     'removed_amount_from_piggy'  => 'Removed :amount from ":name"',
-    'cannot_remove_amount_piggy' => 'Could not remove :amount from ":name".',
 
     // tags
     'regular_tag'                => 'Just a regular tag.',
@@ -894,11 +834,6 @@ return [
     'edit_tag'                   => 'Edit tag ":tag"',
     'updated_tag'                => 'Updated tag ":tag"',
     'created_tag'                => 'Tag ":tag" has been created!',
-    'no_year'                    => 'No year set',
-    'no_month'                   => 'No month set',
-    'tag_title_nothing'          => 'Default tags',
-    'tag_title_balancingAct'     => 'Balancing act tags',
-    'tag_title_advancePayment'   => 'Advance payment tags',
 
     'transaction_journal_information'       => 'Transaction information',
     'transaction_journal_meta'              => 'Meta information',
@@ -925,13 +860,9 @@ return [
     'budgets_with_limits'                   => 'budget(s) with configured amount',
     'rule_or_rules'                         => 'rule(s)',
     'rulegroup_or_groups'                   => 'rule group(s)',
-    'setting_must_confirm_account'          => 'Account confirmation',
-    'setting_must_confirm_account_explain'  => 'When this setting is enabled, users must activate their account before it can be used.',
     'configuration_updated'                 => 'The configuration has been updated',
     'setting_is_demo_site'                  => 'Demo site',
     'setting_is_demo_site_explain'          => 'If you check this box, this installation will behave as if it is the demo site, which can have weird side effects.',
-    'setting_send_email_notifications'      => 'Send email notifications',
-    'setting_send_email_explain'            => 'Firefly III can send you email notifications about certain events. They will be sent to <code>:site_owner</code>. This email address can be set in the <code>.env</code> file.',
     'block_code_bounced'                    => 'Email message(s) bounced',
     'block_code_expired'                    => 'Demo account expired',
     'no_block_code'                         => 'No reason for block or user not blocked',
@@ -971,31 +902,9 @@ return [
 
 
     // split a transaction:
-    'transaction_meta_data'                 => 'Transaction meta-data',
-    'transaction_dates'                     => 'Transaction dates',
     'splits'                                => 'Splits',
-    'split_title_withdrawal'                => 'Split your new withdrawal',
-    'split_intro_one_withdrawal'            => 'Firefly supports the "splitting" of a withdrawal.',
-    'split_intro_two_withdrawal'            => 'It means that the amount of money you\'ve spent is divided between several destination expense accounts, budgets or categories.',
-    'split_intro_three_withdrawal'          => 'For example: you could split your :total groceries so you pay :split_one from your "daily groceries" budget and :split_two from your "cigarettes" budget.',
-    'split_table_intro_withdrawal'          => 'Split your withdrawal in as many things as you want. By default the transaction will not split, there is just one entry. Add as many splits as you want to, below. Remember that you should not deviate from your total amount. If you do, Firefly will warn you but not correct you.',
-    'store_splitted_withdrawal'             => 'Store splitted withdrawal',
-    'update_splitted_withdrawal'            => 'Update splitted withdrawal',
-    'split_title_deposit'                   => 'Split your new deposit',
-    'split_intro_one_deposit'               => 'Firefly supports the "splitting" of a deposit.',
-    'split_intro_two_deposit'               => 'It means that the amount of money you\'ve earned is divided between several source revenue accounts or categories.',
-    'split_intro_three_deposit'             => 'For example: you could split your :total salary so you get :split_one as your base salary and :split_two as a reimbursment for expenses made.',
-    'split_table_intro_deposit'             => 'Split your deposit in as many things as you want. By default the transaction will not split, there is just one entry. Add as many splits as you want to, below. Remember that you should not deviate from your total amount. If you do, Firefly will warn you but not correct you.',
-    'store_splitted_deposit'                => 'Store splitted deposit',
-    'split_title_transfer'                  => 'Split your new transfer',
-    'split_intro_one_transfer'              => 'Firefly supports the "splitting" of a transfer.',
-    'split_intro_two_transfer'              => 'It means that the amount of money you\'re moving is divided between several categories or piggy banks.',
-    'split_intro_three_transfer'            => 'For example: you could split your :total move so you get :split_one in one piggy bank and :split_two in another.',
-    'split_table_intro_transfer'            => 'Split your transfer in as many things as you want. By default the transaction will not split, there is just one entry. Add as many splits as you want to, below. Remember that you should not deviate from your total amount. If you do, Firefly will warn you but not correct you.',
-    'store_splitted_transfer'               => 'Store splitted transfer',
     'add_another_split'                     => 'Add another split',
     'split-transactions'                    => 'Split transactions',
-    'split-new-transaction'                 => 'Split a new transaction',
     'do_split'                              => 'Do a split',
     'split_this_withdrawal'                 => 'Split this withdrawal',
     'split_this_deposit'                    => 'Split this deposit',
@@ -1049,9 +958,6 @@ return [
     'import_status_finished_job'            => 'The transactions imported can be found in tag <a href=":link" class="label label-success" style="font-size:100%;font-weight:normal;">:tag</a>.',
     'import_with_key'                       => 'Import with key \':key\'',
 
-    // different states:
-    'import_status_job_running'             => 'The import is underway. Please be patient...',
-
     // sandstorm.io errors and messages:
     'sandstorm_not_available'               => 'This function is not available when you are using Firefly III within a Sandstorm.io environment.',
 

From b192b5366a5b3a7f15663755183d2180bb7e37ee Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Thu, 24 Aug 2017 21:30:24 +0200
Subject: [PATCH 204/668] New translations firefly.php (Russian)

---
 resources/lang/ru_RU/firefly.php | 94 --------------------------------
 1 file changed, 94 deletions(-)

diff --git a/resources/lang/ru_RU/firefly.php b/resources/lang/ru_RU/firefly.php
index 8a7f9fd890..468735bab6 100644
--- a/resources/lang/ru_RU/firefly.php
+++ b/resources/lang/ru_RU/firefly.php
@@ -13,7 +13,6 @@ declare(strict_types=1);
 
 return [
     // general stuff:
-    'language_incomplete'                        => 'незавершённый перевод',
     'close'                                      => 'Закрыть',
     'actions'                                    => 'Действия',
     'edit'                                       => 'Изменить',
@@ -28,12 +27,7 @@ return [
     'to'                                         => 'Куда',
     'showEverything'                             => 'Показать всё',
     'never'                                      => 'Никогда',
-    'search_results_for'                         => 'Результаты поиска по запросу ":query"',
     'no_results_for_empty_search'                => 'Результатов не найдено.',
-    'bounced_error'                              => 'Сообщение, отправленное на :email было "отбито", доступ запрещен.',
-    'deleted_error'                              => 'Введенные вами данные не найдены в нашей базе.',
-    'general_blocked_error'                      => 'Ваш аккаунт был отключен, так что вы не можете войти.',
-    'expired_error'                              => 'Your account has expired, and can no longer be used.',
     'removed_amount'                             => 'Снято :amount',
     'added_amount'                               => 'Добавлено :amount',
     'asset_account_role_help'                    => 'Any extra options resulting from your choice can be set later.',
@@ -56,7 +50,6 @@ return [
     'flash_error_multiple'                       => 'There is one error|There are :count errors',
     'net_worth'                                  => 'Net worth',
     'route_has_no_help'                          => 'There is no help for this route.',
-    'help_may_not_be_your_language'              => 'This help text is in English. It is not yet available in your language',
     'two_factor_welcome'                         => 'Привет, :user!',
     'two_factor_enter_code'                      => 'To continue, please enter your two factor authentication code. Your application can generate it for you.',
     'two_factor_code_here'                       => 'Enter code here',
@@ -70,9 +63,6 @@ return [
     'two_factor_lost_fix_owner'                  => 'Otherwise, email the site owner, <a href="mailto::site_owner">:site_owner</a> and ask them to reset your two factor authentication.',
     'warning_much_data'                          => ':days days of data may take a while to load.',
     'registered'                                 => 'You have registered successfully!',
-    'tagbalancingAct'                            => 'Balancing act',
-    'tagadvancePayment'                          => 'Авансовый платеж',
-    'tagnothing'                                 => '',
     '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.',
     'Savings account'                            => 'Сберегательный счет',
@@ -84,7 +74,6 @@ return [
     'need_more_help'                             => 'If you need more help using Firefly III, please <a href="https://github.com/firefly-iii/firefly-iii/issues">open a ticket on Github</a>.',
     'reenable_intro_text'                        => 'You can also reenable <a href="#" id="reenableGuidance">the introduction guidance</a>.',
     'intro_boxes_after_refresh'                  => 'The introduction boxes will reappear when you refresh the page.',
-    'nothing_to_display'                         => 'There are no transactions to show you',
     'show_all_no_filter'                         => 'Показать все транзакции без группировки по датам.',
     'expenses_by_category'                       => 'Расходы по категориям',
     'expenses_by_budget'                         => 'Расходы по бюджетам',
@@ -98,11 +87,7 @@ return [
     'spent_in_specific_budget'                   => 'Spent in budget ":budget"',
     'sum_of_expenses_in_budget'                  => 'Spent total in budget ":budget"',
     'left_in_budget_limit'                       => 'Left to spend according to budgeting',
-    'cannot_change_demo'                         => 'Невозможно сменить пароль демонстрационной учетной записи.',
-    'cannot_delete_demo'                         => 'Вы не можете удалить демонстрационную учетную запись.',
     'cannot_reset_demo_user'                     => 'Невозможно сбросить пароль демонстрационной учетной записи',
-    'per_period'                                 => 'За период',
-    'all_periods'                                => 'Все периоды',
     'current_period'                             => 'Текущий период',
     'show_the_current_period_and_overview'       => 'Показать текущий период и обзор',
     'pref_languages_locale'                      => 'Для корректной работы с языками, отличными от английского, ваша операционная система должна отдавать корректную информацию о локали. Если это не так, валюты, даты и суммы могут отображаться некорректно.',
@@ -111,11 +96,9 @@ return [
     'chart_account_in_period'                    => 'Chart for all transactions for account ":name" between :start and :end',
     'chart_category_in_period'                   => 'Chart for all transactions for category ":name" between :start and :end',
     'chart_category_all'                         => 'Chart for all transactions for category ":name"',
-    'budget_in_period_breadcrumb'                => 'Между :start и :end',
     'clone_withdrawal'                           => 'Clone this withdrawal',
     'clone_deposit'                              => 'Clone this deposit',
     'clone_transfer'                             => 'Клонировать этот трансфер',
-    'transaction_journal_other_options'          => 'Другие параметры',
     'multi_select_no_selection'                  => 'Ничего не выбрано',
     'multi_select_all_selected'                  => 'Все выбранные',
     'multi_select_filter_placeholder'            => 'Поиск..',
@@ -164,18 +147,6 @@ return [
     'quarterly'                                  => 'раз в квартал',
     'half-year'                                  => 'раз в полгода',
     'yearly'                                     => 'ежегодно',
-    // account confirmation:
-    'confirm_account_header'                     => 'Please confirm your account',
-    'confirm_account_intro'                      => 'An email has been sent to the address you used during your registration. Please check it out for further instructions. If you did not get this message, you can have Firefly send it again.',
-    'confirm_account_resend_email'               => 'Send me the confirmation message I need to activate my account.',
-    'account_is_confirmed'                       => 'Your account has been confirmed!',
-    'invalid_activation_code'                    => 'It seems the code you are using is not valid, or has expired.',
-    'confirm_account_is_resent_header'           => 'The confirmation has been resent',
-    'confirm_account_is_resent_text'             => 'The confirmation message has been resent. If you still did not receive the confirmation message, please contact the site owner at <a href="mailto::owner">:owner</a> or check the log files to see what went wrong.',
-    'confirm_account_is_resent_go_home'          => 'Go to the index page of Firefly',
-    'confirm_account_not_resent_header'          => 'Something went wrong :(',
-    'confirm_account_not_resent_intro'           => 'The confirmation message has been not resent. If you still did not receive the confirmation message, please contact the site owner at <a href="mailto::owner">:owner</a> instead. Possibly, you have tried to resend the activation message too often. You can have Firefly III try to resend the confirmation message every hour.',
-    'confirm_account_not_resent_go_home'         => 'Go to the index page of Firefly',
 
     // export data:
     'import_and_export'                          => 'Импорт и экспорт',
@@ -205,7 +176,6 @@ return [
     'export_status_created_zip_file'             => 'Created a zip file!',
     'export_status_finished'                     => 'Export has succesfully finished! Yay!',
     'export_data_please_wait'                    => 'Подождите пожалуйста...',
-    'attachment_explanation'                     => 'The file called \':attachment_name\' (#:attachment_id) was originally uploaded to :type \':description\' (#:journal_id) dated :date for the amount of :amount.',
 
     // rules
     'rules'                                      => 'Rules',
@@ -523,7 +493,6 @@ return [
     'createBudget'                               => 'New budget',
     'inactiveBudgets'                            => 'Inactive budgets',
     'without_budget_between'                     => 'Transactions without a budget between :start and :end',
-    'budget_in_month'                            => ':name in :month',
     'delete_budget'                              => 'Delete budget ":name"',
     'deleted_budget'                             => 'Deleted budget ":name"',
     'edit_budget'                                => 'Edit budget ":name"',
@@ -597,8 +566,6 @@ return [
     'select_more_than_one_category'              => 'Please select more than one category',
     'select_more_than_one_budget'                => 'Please select more than one budget',
     'select_more_than_one_tag'                   => 'Please select more than one tag',
-    'from_to'                                    => 'From :start to :end',
-    'from_to_breadcrumb'                         => 'from :start to :end',
     'account_default_currency'                   => 'If you select another currency, new transactions from this account will have this currency pre-selected.',
 
     // categories:
@@ -656,8 +623,6 @@ return [
     'yourAccounts'                               => 'Ваши счета',
     'budgetsAndSpending'                         => 'Бюджеты и расходы',
     'savings'                                    => 'Savings',
-    'markAsSavingsToContinue'                    => 'Mark your asset accounts as "Savings account" to fill this panel',
-    'createPiggyToContinue'                      => 'Create piggy banks to fill this panel.',
     'newWithdrawal'                              => 'Новый расход',
     'newDeposit'                                 => 'Новый доход',
     'newTransfer'                                => 'Новый перевод',
@@ -665,8 +630,6 @@ return [
     'moneyOut'                                   => 'Расходы',
     'billsToPay'                                 => 'Счета к оплате',
     'billsPaid'                                  => 'Оплаченные счета',
-    'divided'                                    => 'divided',
-    'toDivide'                                   => 'left to divide',
 
     // menu and titles, should be recycled as often as possible:
     'currency'                                   => 'Валюта',
@@ -726,20 +689,11 @@ return [
     'reports_can_bookmark'                       => 'Remember that reports can be bookmarked.',
     'incomeVsExpenses'                           => 'Income vs. expenses',
     'accountBalances'                            => 'Account balances',
-    'balanceStartOfYear'                         => 'Balance at start of year',
-    'balanceEndOfYear'                           => 'Balance at end of year',
-    'balanceStartOfMonth'                        => 'Balance at start of month',
-    'balanceEndOfMonth'                          => 'Balance at end of month',
     'balanceStart'                               => 'Balance at start of period',
     'balanceEnd'                                 => 'Balance at end of period',
-    'reportsOwnAccounts'                         => 'Reports for your own accounts',
-    'reportsOwnAccountsAndShared'                => 'Reports for your own accounts and shared accounts',
     'splitByAccount'                             => 'Split by account',
-    'balancedByTransfersAndTags'                 => 'Balanced by transfers and tags',
     'coveredWithTags'                            => 'Covered with tags',
     'leftUnbalanced'                             => 'Left unbalanced',
-    'expectedBalance'                            => 'Expected balance',
-    'outsideOfBudgets'                           => 'Outside of budgets',
     'leftInBudget'                               => 'Left in budget',
     'sumOfSums'                                  => 'Sum of sums',
     'noCategory'                                 => '(no category)',
@@ -752,19 +706,12 @@ return [
     'topX'                                       => 'top :number',
     'show_full_list'                             => 'Show entire list',
     'show_only_top'                              => 'Show only top :number',
-    'sum_of_year'                                => 'Sum of year',
-    'sum_of_years'                               => 'Sum of years',
-    'average_of_year'                            => 'Average of year',
-    'average_of_years'                           => 'Average of years',
-    'categories_earned_in_year'                  => 'Categories (by earnings)',
-    'categories_spent_in_year'                   => 'Categories (by spendings)',
     'report_type'                                => 'Report type',
     'report_type_default'                        => 'Default financial report',
     'report_type_audit'                          => 'Transaction history overview (audit)',
     'report_type_category'                       => 'Category report',
     'report_type_budget'                         => 'Budget report',
     'report_type_tag'                            => 'Tag report',
-    'report_type_meta-history'                   => 'Categories, budgets and bills overview',
     'more_info_help'                             => 'More information about these types of reports can be found in the help pages. Press the (?) icon in the top right corner.',
     'report_included_accounts'                   => 'Included accounts',
     'report_date_range'                          => 'Date range',
@@ -817,7 +764,6 @@ return [
 
     // charts:
     'chart'                                      => 'Диаграмма',
-    'dayOfMonth'                                 => 'Day of the month',
     'month'                                      => 'Month',
     'budget'                                     => 'Budget',
     'spent'                                      => 'Spent',
@@ -838,7 +784,6 @@ return [
     'budgeted'                                   => 'Budgeted',
     'period'                                     => 'Period',
     'balance'                                    => 'Balance',
-    'summary'                                    => 'Summary',
     'sum'                                        => 'Sum',
     'average'                                    => 'Average',
     'balanceFor'                                 => 'Balance for :name',
@@ -871,18 +816,13 @@ return [
     'start_date'                 => 'Start date',
     'target_date'                => 'Target date',
     'no_target_date'             => 'No target date',
-    'todo'                       => 'to do',
     'table'                      => 'Table',
-    'piggy_bank_not_exists'      => 'Piggy bank no longer exists.',
-    'add_any_amount_to_piggy'    => 'Add money to this piggy bank to reach your target of :amount.',
-    'add_set_amount_to_piggy'    => 'Add :amount to fill this piggy bank on :date',
     'delete_piggy_bank'          => 'Delete piggy bank ":name"',
     'cannot_add_amount_piggy'    => 'Could not add :amount to ":name".',
     'cannot_remove_from_piggy'   => 'Could not remove :amount from ":name".',
     'deleted_piggy_bank'         => 'Deleted piggy bank ":name"',
     'added_amount_to_piggy'      => 'Added :amount to ":name"',
     'removed_amount_from_piggy'  => 'Removed :amount from ":name"',
-    'cannot_remove_amount_piggy' => 'Could not remove :amount from ":name".',
 
     // tags
     'regular_tag'                => 'Just a regular tag.',
@@ -894,11 +834,6 @@ return [
     'edit_tag'                   => 'Edit tag ":tag"',
     'updated_tag'                => 'Updated tag ":tag"',
     'created_tag'                => 'Tag ":tag" has been created!',
-    'no_year'                    => 'No year set',
-    'no_month'                   => 'No month set',
-    'tag_title_nothing'          => 'Default tags',
-    'tag_title_balancingAct'     => 'Balancing act tags',
-    'tag_title_advancePayment'   => 'Advance payment tags',
 
     'transaction_journal_information'       => 'Transaction information',
     'transaction_journal_meta'              => 'Meta information',
@@ -925,13 +860,9 @@ return [
     'budgets_with_limits'                   => 'budget(s) with configured amount',
     'rule_or_rules'                         => 'rule(s)',
     'rulegroup_or_groups'                   => 'rule group(s)',
-    'setting_must_confirm_account'          => 'Account confirmation',
-    'setting_must_confirm_account_explain'  => 'When this setting is enabled, users must activate their account before it can be used.',
     'configuration_updated'                 => 'The configuration has been updated',
     'setting_is_demo_site'                  => 'Demo site',
     'setting_is_demo_site_explain'          => 'If you check this box, this installation will behave as if it is the demo site, which can have weird side effects.',
-    'setting_send_email_notifications'      => 'Send email notifications',
-    'setting_send_email_explain'            => 'Firefly III can send you email notifications about certain events. They will be sent to <code>:site_owner</code>. This email address can be set in the <code>.env</code> file.',
     'block_code_bounced'                    => 'Email message(s) bounced',
     'block_code_expired'                    => 'Demo account expired',
     'no_block_code'                         => 'No reason for block or user not blocked',
@@ -971,31 +902,9 @@ return [
 
 
     // split a transaction:
-    'transaction_meta_data'                 => 'Transaction meta-data',
-    'transaction_dates'                     => 'Transaction dates',
     'splits'                                => 'Splits',
-    'split_title_withdrawal'                => 'Split your new withdrawal',
-    'split_intro_one_withdrawal'            => 'Firefly supports the "splitting" of a withdrawal.',
-    'split_intro_two_withdrawal'            => 'It means that the amount of money you\'ve spent is divided between several destination expense accounts, budgets or categories.',
-    'split_intro_three_withdrawal'          => 'For example: you could split your :total groceries so you pay :split_one from your "daily groceries" budget and :split_two from your "cigarettes" budget.',
-    'split_table_intro_withdrawal'          => 'Split your withdrawal in as many things as you want. By default the transaction will not split, there is just one entry. Add as many splits as you want to, below. Remember that you should not deviate from your total amount. If you do, Firefly will warn you but not correct you.',
-    'store_splitted_withdrawal'             => 'Store splitted withdrawal',
-    'update_splitted_withdrawal'            => 'Update splitted withdrawal',
-    'split_title_deposit'                   => 'Split your new deposit',
-    'split_intro_one_deposit'               => 'Firefly supports the "splitting" of a deposit.',
-    'split_intro_two_deposit'               => 'It means that the amount of money you\'ve earned is divided between several source revenue accounts or categories.',
-    'split_intro_three_deposit'             => 'For example: you could split your :total salary so you get :split_one as your base salary and :split_two as a reimbursment for expenses made.',
-    'split_table_intro_deposit'             => 'Split your deposit in as many things as you want. By default the transaction will not split, there is just one entry. Add as many splits as you want to, below. Remember that you should not deviate from your total amount. If you do, Firefly will warn you but not correct you.',
-    'store_splitted_deposit'                => 'Store splitted deposit',
-    'split_title_transfer'                  => 'Split your new transfer',
-    'split_intro_one_transfer'              => 'Firefly supports the "splitting" of a transfer.',
-    'split_intro_two_transfer'              => 'It means that the amount of money you\'re moving is divided between several categories or piggy banks.',
-    'split_intro_three_transfer'            => 'For example: you could split your :total move so you get :split_one in one piggy bank and :split_two in another.',
-    'split_table_intro_transfer'            => 'Split your transfer in as many things as you want. By default the transaction will not split, there is just one entry. Add as many splits as you want to, below. Remember that you should not deviate from your total amount. If you do, Firefly will warn you but not correct you.',
-    'store_splitted_transfer'               => 'Store splitted transfer',
     'add_another_split'                     => 'Add another split',
     'split-transactions'                    => 'Split transactions',
-    'split-new-transaction'                 => 'Split a new transaction',
     'do_split'                              => 'Do a split',
     'split_this_withdrawal'                 => 'Split this withdrawal',
     'split_this_deposit'                    => 'Split this deposit',
@@ -1049,9 +958,6 @@ return [
     'import_status_finished_job'            => 'The transactions imported can be found in tag <a href=":link" class="label label-success" style="font-size:100%;font-weight:normal;">:tag</a>.',
     'import_with_key'                       => 'Import with key \':key\'',
 
-    // different states:
-    'import_status_job_running'             => 'The import is underway. Please be patient...',
-
     // sandstorm.io errors and messages:
     'sandstorm_not_available'               => 'This function is not available when you are using Firefly III within a Sandstorm.io environment.',
 

From 733b5c62afa23cdb85c6b52f4df77795456accd3 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Thu, 24 Aug 2017 21:30:41 +0200
Subject: [PATCH 205/668] New translations firefly.php (French)

---
 resources/lang/fr_FR/firefly.php | 94 --------------------------------
 1 file changed, 94 deletions(-)

diff --git a/resources/lang/fr_FR/firefly.php b/resources/lang/fr_FR/firefly.php
index c079051ef3..607bb2dd50 100644
--- a/resources/lang/fr_FR/firefly.php
+++ b/resources/lang/fr_FR/firefly.php
@@ -13,7 +13,6 @@ declare(strict_types=1);
 
 return [
     // general stuff:
-    'language_incomplete'                        => 'traduction incomplète',
     'close'                                      => 'Fermer',
     'actions'                                    => 'Actions',
     'edit'                                       => 'Modifier',
@@ -28,12 +27,7 @@ return [
     'to'                                         => 'A',
     'showEverything'                             => 'Tout Afficher',
     'never'                                      => 'Jamais',
-    'search_results_for'                         => 'Résultats de recherche pour ":query"',
     'no_results_for_empty_search'                => 'Votre recherche était vide, rien n’a été trouvé.',
-    'bounced_error'                              => 'Le message envoyé à :email a été rejeté, donc pas d\'accès pour vous.',
-    'deleted_error'                              => 'Ces informations d\'identification ne sont pas présentes dans nos données.',
-    'general_blocked_error'                      => 'Votre compte a été désactivé, vous ne pouvez plus vous connecter.',
-    'expired_error'                              => 'Votre compte a expiré et ne peut plus être utilisé.',
     'removed_amount'                             => 'Supprimé :amount',
     'added_amount'                               => 'Ajouté :amount',
     'asset_account_role_help'                    => 'Toutes options supplémentaires résultant de votre choix peut être réglée plus tard.',
@@ -56,7 +50,6 @@ return [
     'flash_error_multiple'                       => 'Il y a une erreur|Il y a :count errors',
     'net_worth'                                  => 'Valeur nette',
     'route_has_no_help'                          => 'Il n\'y a pas d\'aide pour cette page.',
-    'help_may_not_be_your_language'              => 'Ce texte d’aide est en anglais. Il n’est pas encore disponible dans votre langue',
     'two_factor_welcome'                         => 'Bonjour, :user !',
     'two_factor_enter_code'                      => 'Pour continuer, veuillez entrer votre code d’authentification à deux facteurs. Votre application peut la générer pour vous.',
     'two_factor_code_here'                       => 'Entrez votre code ici',
@@ -70,9 +63,6 @@ return [
     'two_factor_lost_fix_owner'                  => 'Dans le cas contraire, contactez le propriétaire du site par courriel <a href="mailto::site_owner"> : site_owner</a> et demandez leur de réinitialiser votre authentification à deux facteurs.',
     'warning_much_data'                          => ':days de données peuvent prendre un certain temps à charger.',
     'registered'                                 => 'Vous avez été enregistré avec succès !',
-    'tagbalancingAct'                            => 'Acte d\'équilibre',
-    'tagadvancePayment'                          => 'Acompte',
-    'tagnothing'                                 => '',
     'Default asset account'                      => 'Compte d’actif par défaut',
     'no_budget_pointer'                          => 'Vous semblez n’avoir encore aucun budget. Vous devez en créer sur la page des <a href="/budgets"> budgets</a>. Les budgets peuvent vous aider à garder une trace des dépenses.',
     'Savings account'                            => 'Compte d’épargne',
@@ -84,7 +74,6 @@ return [
     'need_more_help'                             => 'Si vous désirez plus de renseignements sur l\'utilisation de Firefly III, merci <a href="https://github.com/firefly-iii/firefly-iii/issues">d\'ouvrir un ticket sur Github</a>.',
     'reenable_intro_text'                        => 'Vous pouvez également réactiver <a href="#" id="reenableGuidance">le guide d\'introduction</a>.',
     'intro_boxes_after_refresh'                  => 'Les boîtes d\'introduction réapparaîtront lorsque vous actualiserez la page.',
-    'nothing_to_display'                         => 'Il n’y a aucune transaction à afficher',
     'show_all_no_filter'                         => 'Montrer toutes les transactions sans les classer par date.',
     'expenses_by_category'                       => 'Dépenses par catégorie',
     'expenses_by_budget'                         => 'Dépenses par budget',
@@ -98,11 +87,7 @@ return [
     'spent_in_specific_budget'                   => 'Dépensé dans le budget ":budget"',
     'sum_of_expenses_in_budget'                  => 'Total dépensé dans le budget ":budget"',
     'left_in_budget_limit'                       => 'Reste à dépenser selon budget',
-    'cannot_change_demo'                         => 'Vous ne pouvez pas modifier le mot de passe du compte de démonstration.',
-    'cannot_delete_demo'                         => 'Vous ne pouvez pas supprimer le compte de démonstration.',
     'cannot_reset_demo_user'                     => 'Vous ne pouvez pas réinitialiser le mot de passe du compte démonstration',
-    'per_period'                                 => 'Par période',
-    'all_periods'                                => 'Toutes les périodes',
     'current_period'                             => 'Période en cours',
     'show_the_current_period_and_overview'       => 'Afficher l’exercice en cours et sa vue d’ensemble',
     'pref_languages_locale'                      => 'Pour une langue autre que l’anglais pour fonctionner correctement, votre système d’exploitation doit être équipé avec les paramètres régionaux correctes. Si ils ne sont pas présents, les données de devises, les dates et les montants peuvent être mal formatés.',
@@ -111,11 +96,9 @@ return [
     'chart_account_in_period'                    => 'Graphique pour toutes les transactions pour le compte ":name" entre :start et :end',
     'chart_category_in_period'                   => 'Graphique pour toutes les transactions pour la catégorie ":name" entre :start et :end',
     'chart_category_all'                         => 'Graphique pour toutes les transactions pour la catégorie ":name"',
-    'budget_in_period_breadcrumb'                => 'Entre :start et :end',
     'clone_withdrawal'                           => 'Cloner ce retrait',
     'clone_deposit'                              => 'Cloner ce dépôt',
     'clone_transfer'                             => 'Cloner ce transfert',
-    'transaction_journal_other_options'          => 'Autres options',
     'multi_select_no_selection'                  => 'Aucun selectionnez',
     'multi_select_all_selected'                  => 'Tous sélectionnés',
     'multi_select_filter_placeholder'            => 'Rechercher..',
@@ -164,18 +147,6 @@ return [
     'quarterly'                                  => 'trimestriel',
     'half-year'                                  => 'semestriel',
     'yearly'                                     => 'annuel',
-    // account confirmation:
-    'confirm_account_header'                     => 'Merci de vérifier votre compte',
-    'confirm_account_intro'                      => 'Un courriel a été envoyé à l’adresse utilisée lors de votre inscription. Merci de vous y référer pour obtenir des instructions supplémentaires. Si vous n’avez pas reçu ce message, Firefly peut vous l\'envoyer de nouveau.',
-    'confirm_account_resend_email'               => 'M’envoyer le message de confirmation nécessaire pour activer mon compte.',
-    'account_is_confirmed'                       => 'Votre compte a été validé !',
-    'invalid_activation_code'                    => 'Il semble que le code que vous utilisez n’est pas valide ou a expiré.',
-    'confirm_account_is_resent_header'           => 'La confirmation a été renvoyée',
-    'confirm_account_is_resent_text'             => 'Le message de confirmation a été renvoyé. Si vous n’avez toujours pas reçu le message de confirmation, veuillez prendre contact avec le propriétaire du site à <a href="mailto::owner"> :owner</a> ou vérifiez les logs pour voir ce qui s’est mal passé.',
-    'confirm_account_is_resent_go_home'          => 'Aller à la page d’accueil de Firefly',
-    'confirm_account_not_resent_header'          => 'Quelque chose s\'est mal passé :(',
-    'confirm_account_not_resent_intro'           => 'Le message de confirmation n\'a pas été renvoyé. Si vous continuez à ne pas recevoir le message de confirmation, veuillez communiquer avec le propriétaire du site au <a href="mailto::owner"> : propriétaire</a>. Vous pourriez avoir essayé de vous renvoyer le message d’activation trop souvent. Vous pouvez demander à Firefly III de vous renvoyer le message de confirmation toutes les heures.',
-    'confirm_account_not_resent_go_home'         => 'Aller à la page d’accueil de Firefly',
 
     // export data:
     'import_and_export'                          => 'Importer et Exporter',
@@ -205,7 +176,6 @@ return [
     'export_status_created_zip_file'             => 'Fichier zip créé!',
     'export_status_finished'                     => 'L\'export s\'est terminé avec succès ! Yay !',
     'export_data_please_wait'                    => 'Veuillez patienter...',
-    'attachment_explanation'                     => 'Le fichier appelé \':attachment_name\' (#:attachment_id) était initialement envoyé à :type \': description\' (#:journal_id) en date du :date pour un montant de :amount.',
 
     // rules
     'rules'                                      => 'Règles',
@@ -523,7 +493,6 @@ return [
     'createBudget'                               => 'Nouveau budget',
     'inactiveBudgets'                            => 'Budgets inactifs',
     'without_budget_between'                     => 'Opérations non budgetisées entre le :start et le :end',
-    'budget_in_month'                            => ':name en :month',
     'delete_budget'                              => 'Supprimer le budget ":name"',
     'deleted_budget'                             => 'Budget ":name" supprimé',
     'edit_budget'                                => 'Modifier le budget ":name"',
@@ -597,8 +566,6 @@ return [
     'select_more_than_one_category'              => 'Veuillez sélectionner plus d\'une catégorie',
     'select_more_than_one_budget'                => 'Veuillez sélectionner plus d\'un budget',
     'select_more_than_one_tag'                   => 'Veuillez sélectionner plus d\'un tag',
-    'from_to'                                    => 'De :start à :end',
-    'from_to_breadcrumb'                         => 'de :start à :end',
     'account_default_currency'                   => 'Si vous sélectionnez une autre monnaie, les nouvelles transactions de ce compte auront cette monnaie pré-sélectionnées.',
 
     // categories:
@@ -656,8 +623,6 @@ return [
     'yourAccounts'                               => 'Vos comptes',
     'budgetsAndSpending'                         => 'Budgets et dépenses',
     'savings'                                    => 'Épargne',
-    'markAsSavingsToContinue'                    => 'Marquez votre compte d’actif comme "Compte d\'épargne" pour remplir ce panneau',
-    'createPiggyToContinue'                      => 'Créer des tirelires pour remplir ce panneau.',
     'newWithdrawal'                              => 'Nouvelle dépense',
     'newDeposit'                                 => 'Nouveau dépôt',
     'newTransfer'                                => 'Nouveau transfert',
@@ -665,8 +630,6 @@ return [
     'moneyOut'                                   => 'Argent sortant',
     'billsToPay'                                 => 'Factures à payer',
     'billsPaid'                                  => 'Factures payées',
-    'divided'                                    => 'divisé',
-    'toDivide'                                   => 'Restant à dépenser',
 
     // menu and titles, should be recycled as often as possible:
     'currency'                                   => 'Devise',
@@ -726,20 +689,11 @@ return [
     'reports_can_bookmark'                       => 'N’oubliez pas que les rapports peuvent être mis en signet.',
     'incomeVsExpenses'                           => 'Revenus vs dépenses',
     'accountBalances'                            => 'Solde du compte',
-    'balanceStartOfYear'                         => 'Solde au début de l\'année',
-    'balanceEndOfYear'                           => 'Solde à la fin de l\'année',
-    'balanceStartOfMonth'                        => 'Solde au début du mois',
-    'balanceEndOfMonth'                          => 'Solde à la fin du mois',
     'balanceStart'                               => 'Solde au début de la période',
     'balanceEnd'                                 => 'Solde à la fin de la période',
-    'reportsOwnAccounts'                         => 'Rapport pour vos propres comptes',
-    'reportsOwnAccountsAndShared'                => 'Rapport pour vos comptes et ceux partagés',
     'splitByAccount'                             => 'Divisé par compte',
-    'balancedByTransfersAndTags'                 => 'Équilibré par des transferts et des tags',
     'coveredWithTags'                            => 'Recouvert de tags',
     'leftUnbalanced'                             => 'Restant déséquilibré',
-    'expectedBalance'                            => 'Solde attendu',
-    'outsideOfBudgets'                           => 'En dehors des budgets',
     'leftInBudget'                               => 'Budget restant',
     'sumOfSums'                                  => 'Montant des sommes',
     'noCategory'                                 => '(aucune catégorie)',
@@ -752,19 +706,12 @@ return [
     'topX'                                       => 'en haut :number',
     'show_full_list'                             => 'Afficher la liste complète',
     'show_only_top'                              => 'Afficher uniquement en haut :number',
-    'sum_of_year'                                => 'Total sur l’année',
-    'sum_of_years'                               => 'Total des années',
-    'average_of_year'                            => 'Moyenne sur l\'année',
-    'average_of_years'                           => 'Moyenne des années',
-    'categories_earned_in_year'                  => 'Catégories (selon le revenu)',
-    'categories_spent_in_year'                   => 'Catégories (par dépenses)',
     'report_type'                                => 'Type de rapport',
     'report_type_default'                        => 'Rapport financier par défaut',
     'report_type_audit'                          => 'Historique des transactions',
     'report_type_category'                       => 'Rapport par catégories',
     'report_type_budget'                         => 'Rapport du budget',
     'report_type_tag'                            => 'Rapport de tag',
-    'report_type_meta-history'                   => 'Vue d’ensemble des budgets, des catégories et des factures',
     'more_info_help'                             => 'Plus d’informations sur ces types de rapports se trouvent dans les pages d’aide. Appuyez sur l’icône ( ?) dans le coin supérieur droit.',
     'report_included_accounts'                   => 'Comptes inclus',
     'report_date_range'                          => 'Intervalle de dates',
@@ -817,7 +764,6 @@ return [
 
     // charts:
     'chart'                                      => 'Diagramme',
-    'dayOfMonth'                                 => 'Jour du mois',
     'month'                                      => 'Mois',
     'budget'                                     => 'Budget',
     'spent'                                      => 'Dépensé',
@@ -838,7 +784,6 @@ return [
     'budgeted'                                   => 'Budgétisé',
     'period'                                     => 'Période',
     'balance'                                    => 'Solde',
-    'summary'                                    => 'Résumé',
     'sum'                                        => 'Somme',
     'average'                                    => 'Moyenne',
     'balanceFor'                                 => 'Balance pour :name',
@@ -871,18 +816,13 @@ return [
     'start_date'                 => 'Date de début',
     'target_date'                => 'Date cible',
     'no_target_date'             => 'Aucune date butoir',
-    'todo'                       => 'à faire',
     'table'                      => 'Tableau',
-    'piggy_bank_not_exists'      => 'La tirelire n’existe plus.',
-    'add_any_amount_to_piggy'    => 'Ajouter de l’argent pour cette tirelire pour atteindre votre objectif de :amount.',
-    'add_set_amount_to_piggy'    => 'Ajouter :amount pour remplir cette tirelire au :date',
     'delete_piggy_bank'          => 'Supprimer la tirelire ":name"',
     'cannot_add_amount_piggy'    => 'Impossible d\'ajouter :amount à ":name".',
     'cannot_remove_from_piggy'   => 'Impossible de supprimer :amount à ":name".',
     'deleted_piggy_bank'         => 'Tirelire ":name" supprimée',
     'added_amount_to_piggy'      => 'Ajouté :amount à ":name"',
     'removed_amount_from_piggy'  => 'Supprimé :amount du ":name"',
-    'cannot_remove_amount_piggy' => 'Impossible de supprimer :amount de ":name".',
 
     // tags
     'regular_tag'                => 'Juste une balise ordinaire.',
@@ -894,11 +834,6 @@ return [
     'edit_tag'                   => 'Modifier le tag ":tag"',
     'updated_tag'                => 'Mise à jour de la balise ": tag"',
     'created_tag'                => 'Tag ":tag" a été créé !',
-    'no_year'                    => 'Aucune année définie',
-    'no_month'                   => 'Pas de mois défini',
-    'tag_title_nothing'          => 'Tags par défaut',
-    'tag_title_balancingAct'     => 'Acte d\'équilibrage des tags',
-    'tag_title_advancePayment'   => 'Tags de paiement anticipé',
 
     'transaction_journal_information'       => 'Informations sur les transactions',
     'transaction_journal_meta'              => 'Méta informations',
@@ -925,13 +860,9 @@ return [
     'budgets_with_limits'                   => 'budget(s) avec montant configuré',
     'rule_or_rules'                         => 'règle(s)',
     'rulegroup_or_groups'                   => 'groupe(s) de règles',
-    'setting_must_confirm_account'          => 'Confirmation de compte',
-    'setting_must_confirm_account_explain'  => 'Lorsque ce paramètre est activé, les utilisateurs doivent activer leur compte avant de pouvoir l\'utiliser.',
     'configuration_updated'                 => 'La configuration a été mise à jour',
     'setting_is_demo_site'                  => 'Site de démonstration',
     'setting_is_demo_site_explain'          => 'Si vous cochez cette case, cette installation se comportera comme si c\'était le site de démonstration, ce qui peut engendrer des effets secondaires étranges.',
-    'setting_send_email_notifications'      => 'Envoyer notifications par email',
-    'setting_send_email_explain'            => 'Firefly III can send you email notifications about certain events. They will be sent to <code>:site_owner</code>. This email address can be set in the <code>.env</code> file.',
     'block_code_bounced'                    => 'Email message(s) bounced',
     'block_code_expired'                    => 'Demo account expired',
     'no_block_code'                         => 'No reason for block or user not blocked',
@@ -971,31 +902,9 @@ return [
 
 
     // split a transaction:
-    'transaction_meta_data'                 => 'Transaction meta-data',
-    'transaction_dates'                     => 'Date de l\'opération',
     'splits'                                => 'Splits',
-    'split_title_withdrawal'                => 'Split your new withdrawal',
-    'split_intro_one_withdrawal'            => 'Firefly supports the "splitting" of a withdrawal.',
-    'split_intro_two_withdrawal'            => 'Cela signifie que le montant d’argent que vous avez dépensé est réparti entre plusieurs budgets, catégories ou comptes de revenus.',
-    'split_intro_three_withdrawal'          => 'For example: you could split your :total groceries so you pay :split_one from your "daily groceries" budget and :split_two from your "cigarettes" budget.',
-    'split_table_intro_withdrawal'          => 'Split your withdrawal in as many things as you want. By default the transaction will not split, there is just one entry. Add as many splits as you want to, below. Remember that you should not deviate from your total amount. If you do, Firefly will warn you but not correct you.',
-    'store_splitted_withdrawal'             => 'Store splitted withdrawal',
-    'update_splitted_withdrawal'            => 'Update splitted withdrawal',
-    'split_title_deposit'                   => 'Split your new deposit',
-    'split_intro_one_deposit'               => 'Firefly supports the "splitting" of a deposit.',
-    'split_intro_two_deposit'               => 'Cela signifie que le montant d’argent que vous avez gagné est réparti entre plusieurs catégories ou comptes de revenus source.',
-    'split_intro_three_deposit'             => 'Par exemple : vous pouvez fractionner votre salaire de :total donc vous obtenez :split_one comme votre salaire de base et :split_two comme un remboursement des dépenses faites.',
-    'split_table_intro_deposit'             => 'Split your deposit in as many things as you want. By default the transaction will not split, there is just one entry. Add as many splits as you want to, below. Remember that you should not deviate from your total amount. If you do, Firefly will warn you but not correct you.',
-    'store_splitted_deposit'                => 'Store splitted deposit',
-    'split_title_transfer'                  => 'Split your new transfer',
-    'split_intro_one_transfer'              => 'Firefly supports the "splitting" of a transfer.',
-    'split_intro_two_transfer'              => 'Cela signifie que le montant d’argent que vous déplacez est divisé entre plusieurs catégories ou tirelires.',
-    'split_intro_three_transfer'            => 'For example: you could split your :total move so you get :split_one in one piggy bank and :split_two in another.',
-    'split_table_intro_transfer'            => 'Split your transfer in as many things as you want. By default the transaction will not split, there is just one entry. Add as many splits as you want to, below. Remember that you should not deviate from your total amount. If you do, Firefly will warn you but not correct you.',
-    'store_splitted_transfer'               => 'Store splitted transfer',
     'add_another_split'                     => 'Add another split',
     'split-transactions'                    => 'Split transactions',
-    'split-new-transaction'                 => 'Split a new transaction',
     'do_split'                              => 'Do a split',
     'split_this_withdrawal'                 => 'Split this withdrawal',
     'split_this_deposit'                    => 'Split this deposit',
@@ -1049,9 +958,6 @@ return [
     'import_status_finished_job'            => 'The transactions imported can be found in tag <a href=":link" class="label label-success" style="font-size:100%;font-weight:normal;">:tag</a>.',
     'import_with_key'                       => 'Import with key \':key\'',
 
-    // different states:
-    'import_status_job_running'             => 'The import is underway. Please be patient...',
-
     // sandstorm.io errors and messages:
     'sandstorm_not_available'               => 'This function is not available when you are using Firefly III within a Sandstorm.io environment.',
 

From b72e8559f67ca3442d63574bea19d6957493c3dc Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Thu, 24 Aug 2017 21:30:44 +0200
Subject: [PATCH 206/668] New translations firefly.php (German)

---
 resources/lang/de_DE/firefly.php | 94 --------------------------------
 1 file changed, 94 deletions(-)

diff --git a/resources/lang/de_DE/firefly.php b/resources/lang/de_DE/firefly.php
index 2673ecc7e6..dd6a8153c1 100644
--- a/resources/lang/de_DE/firefly.php
+++ b/resources/lang/de_DE/firefly.php
@@ -13,7 +13,6 @@ declare(strict_types=1);
 
 return [
     // general stuff:
-    'language_incomplete'                        => 'unvollständige Übersetzung',
     'close'                                      => 'Schließen',
     'actions'                                    => 'Aktionen',
     'edit'                                       => 'Bearbeiten',
@@ -28,12 +27,7 @@ return [
     'to'                                         => 'Bis',
     'showEverything'                             => 'Alles anzeigen',
     'never'                                      => 'Nie',
-    'search_results_for'                         => 'Suchergebnisse für ":query"',
     'no_results_for_empty_search'                => 'Your search was empty, so nothing was found.',
-    'bounced_error'                              => 'Die Nachricht an :email ist nicht zustellbar, sodass Sie keinen Zugang haben.',
-    'deleted_error'                              => 'Die Zugangsdaten stimmen nicht überein.',
-    'general_blocked_error'                      => 'Ihr Benutzerkonto wurde deaktiviert, sodass Sie sich nicht anmelden können.',
-    'expired_error'                              => 'Ihr Benutzerkonto ist abgelaufen und kann nicht mehr genutzt werden.',
     'removed_amount'                             => ':amount enfernt',
     'added_amount'                               => ':amount hinzugefügt',
     'asset_account_role_help'                    => 'Alle zusätzlichen Optionen, welche aus ihren Entscheidung entstehen, können später eingestellt werden.',
@@ -56,7 +50,6 @@ return [
     'flash_error_multiple'                       => 'Es gibt einen Fehler|Es gibt :count Fehler',
     'net_worth'                                  => 'Vermögen',
     'route_has_no_help'                          => 'Es gibt keinen Hilfetext für diese Seite.',
-    'help_may_not_be_your_language'              => 'Dieser Hilfstext ist in Englisch. Er ist noch nicht in Deutsch verfügbar',
     'two_factor_welcome'                         => 'Hallo :user!',
     'two_factor_enter_code'                      => 'Um fortzufahren geben Sie bitte ihren Zwei-Faktor-Authentifizierungscode ein. Ihre Anwendung kann diesen für Sie generieren.',
     'two_factor_code_here'                       => 'Code hier eingeben',
@@ -70,9 +63,6 @@ return [
     'two_factor_lost_fix_owner'                  => 'Ansonsten, mailen Sie dem Inhaber der Website, <a href="mailto::site_owner">:site_owner</a> und bitten Sie ihn, Ihre Zwei-Faktor Authentifizierung zurückzusetzen.',
     'warning_much_data'                          => ':days Tage an Daten können eine Weile dauern zu laden.',
     'registered'                                 => 'Sie haben sich erfolgreich registriert!',
-    'tagbalancingAct'                            => 'Ausgleich',
-    'tagadvancePayment'                          => 'Vorauszahlung',
-    'tagnothing'                                 => '',
     'Default asset account'                      => 'Standard-Anlagekonto',
     'no_budget_pointer'                          => 'Sie scheinen keine Budgets festgelegt zu haben. Sie sollten welche auf der <a href="/budgets">Budget</a>-Seite erstellen. Budgets können Ihnen helfen ihre Ausgaben zu verfolgen.',
     'Savings account'                            => 'Sparkonto',
@@ -84,7 +74,6 @@ return [
     'need_more_help'                             => 'Wenn du hilfe beim bedienen von Firefly III brauchst, <a href="https://github.com/firefly-iii/firefly-iii/issues">erstelle ein Ticket auf Github</a>.',
     'reenable_intro_text'                        => 'You can also reenable <a href="#" id="reenableGuidance">the introduction guidance</a>.',
     'intro_boxes_after_refresh'                  => 'The introduction boxes will reappear when you refresh the page.',
-    'nothing_to_display'                         => 'Es gibt keine Transaktionen zum Anzeigen',
     'show_all_no_filter'                         => 'Alle Transaktionen anzeigen, ohne diese nach Datum zu gruppieren.',
     'expenses_by_category'                       => 'Ausgaben nach Kategorie',
     'expenses_by_budget'                         => 'Ausgaben nach Budget',
@@ -98,11 +87,7 @@ return [
     'spent_in_specific_budget'                   => 'Ausgegeben in Budget ":budget"',
     'sum_of_expenses_in_budget'                  => 'Vollkommen ausgegeben in Budget ":budget"',
     'left_in_budget_limit'                       => 'Übrig zum ausgeben aufgrund der Budgetierung',
-    'cannot_change_demo'                         => 'Sie können nicht das Kennwort des Demo-Kontos ändern.',
-    'cannot_delete_demo'                         => 'Das Demo-Konto kann nicht entfernt werden.',
     'cannot_reset_demo_user'                     => 'Sie können nicht das Kennwort des Demo-Kontos zurücksetzen',
-    'per_period'                                 => 'Pro Periode',
-    'all_periods'                                => 'Alle Perioden',
     'current_period'                             => 'Aktuelle Periode',
     'show_the_current_period_and_overview'       => 'Zeigen Sie die aktuelle Periode und die Übersicht',
     'pref_languages_locale'                      => 'Damit eine andere Sprache als Englisch richtig funktioniert muss Ihr Betriebssystem mit den korrekten Gebietsschema-Informationen ausgestattet werden. Wenn diese nicht vorhanden sind, können die Währungsdaten, Terminen und Mengen falsch formatiert.',
@@ -111,11 +96,9 @@ return [
     'chart_account_in_period'                    => 'Diagramm für alle Transaktionen des Kontos ":name" zwischen :start und :end',
     'chart_category_in_period'                   => 'Diagramm für alle Transaktionen der Kategorie ":name" zwischen :start und :end',
     'chart_category_all'                         => 'Diagramm für alle Transaktionen der Kategorie ":name"',
-    'budget_in_period_breadcrumb'                => 'Zwischen :start und :end',
     'clone_withdrawal'                           => 'Diese Ausgabe klonen',
     'clone_deposit'                              => 'Diese Einnahme klonen',
     'clone_transfer'                             => 'Diese Überweisung klonen',
-    'transaction_journal_other_options'          => 'Weitere Optionen',
     'multi_select_no_selection'                  => 'Nichts ausgewählt',
     'multi_select_all_selected'                  => 'Alle ausgewählt',
     'multi_select_filter_placeholder'            => 'Suche..',
@@ -164,18 +147,6 @@ return [
     'quarterly'                                  => 'vierteljährlich',
     'half-year'                                  => 'halbjährlich',
     'yearly'                                     => 'jährlich',
-    // account confirmation:
-    'confirm_account_header'                     => 'Bitte bestätigen Sie Ihr Konto',
-    'confirm_account_intro'                      => 'Eine E-Mail wurde an die Adresse gesendet, welche bei der Registrierung angegeben wurde. Bitte lese die Mail für weitere Anweisungen. Wenn Sie die Mail nicht erhalten haben, kann Firefly Sie erneut senden.',
-    'confirm_account_resend_email'               => 'Senden Sie mir die Bestätigung, ich möchte meinen Account aktivieren.',
-    'account_is_confirmed'                       => 'Ihr Benutzerkonto wurde bestätigt!',
-    'invalid_activation_code'                    => 'Es scheint der genutzte Code ist ungültig oder ist abgelaufen.',
-    'confirm_account_is_resent_header'           => 'Die Bestätigung wurde erneut gesendet',
-    'confirm_account_is_resent_text'             => 'Die Bestätigungsmail wurde erneut gesendet. Wenn Sie die Bestätigungsmail weiterhin nicht erhalten wenden Sie sich bitte an den Seitenbetreiber unter <a href="mailto::owner">Seitenbetreiber></a> oder überprüfen Sie das Fehlerprotokoll.',
-    'confirm_account_is_resent_go_home'          => 'Zur Hauptseite von Firefly wechseln',
-    'confirm_account_not_resent_header'          => 'Etwas ist schief gelaufen :(',
-    'confirm_account_not_resent_intro'           => 'Die Bestätigung wurde nicht erneut versendet. Wenn Sie immer noch keine Bestätigung erhalten haben, wenden Sie sich stattdessen bitte an den Inhaber der Webseite <a href="mailto::owner">:owner</a>. Möglicherweise haben Sie zu oft versucht die Bestätigung zu senden. Sie können die Bestätigung nur einmal pro Stunde durch Firefly III erneut senden lassen.',
-    'confirm_account_not_resent_go_home'         => 'Zur Hauptseite von Firefly wechseln',
 
     // export data:
     'import_and_export'                          => 'Import und Export',
@@ -205,7 +176,6 @@ return [
     'export_status_created_zip_file'             => 'Zip-Datei erstellt!',
     'export_status_finished'                     => 'Export erfolgreich beendet! Yay!',
     'export_data_please_wait'                    => 'Bitte warten...',
-    'attachment_explanation'                     => 'Die Datei mit dem Namen \':attachment_name\' (#:attachment_id) wurde urspünglich am :date mit dem Betrag :amount zu :type \':description\' (#:journal_id) hochgeladen.',
 
     // rules
     'rules'                                      => 'Regeln',
@@ -524,7 +494,6 @@ Sollen zusätzlich Ihre Girokonten angezeigt werden?',
     'createBudget'                               => 'Neues Budget',
     'inactiveBudgets'                            => 'Inaktive Budgets',
     'without_budget_between'                     => 'Überweisungen ohne Budget zwischen :start und :end',
-    'budget_in_month'                            => ':name in :month',
     'delete_budget'                              => 'Budget ":name" löschen',
     'deleted_budget'                             => 'Budget ":name" gelöscht',
     'edit_budget'                                => 'Budget ":name" bearbeiten',
@@ -598,8 +567,6 @@ Sollen zusätzlich Ihre Girokonten angezeigt werden?',
     'select_more_than_one_category'              => 'Bitte mehr als eine Kategorie wählen',
     'select_more_than_one_budget'                => 'Bitte mehr als ein Budget wählen',
     'select_more_than_one_tag'                   => 'Bitte wählen Sie mehr als einen Tag aus',
-    'from_to'                                    => 'Von :start bis :end',
-    'from_to_breadcrumb'                         => 'von :start bis :end',
     'account_default_currency'                   => 'Wenn Sie eine andere Währung auswählen, werden neue Transaktionen von diesem Konto standardmäßig diese Währung ausgewählt haben.',
 
     // categories:
@@ -657,8 +624,6 @@ Sollen zusätzlich Ihre Girokonten angezeigt werden?',
     'yourAccounts'                               => 'Deine Konten',
     'budgetsAndSpending'                         => 'Budgets und Ausgaben',
     'savings'                                    => 'Erspartes',
-    'markAsSavingsToContinue'                    => 'Markieren Sie ihre Girokonten als "Sparkonten" um diese Anzeige zu füllen',
-    'createPiggyToContinue'                      => 'Erstellen Sie Sparschweine um dieses Panel zu füllen.',
     'newWithdrawal'                              => 'Neue Ausgabe',
     'newDeposit'                                 => 'Neue Einnahme',
     'newTransfer'                                => 'Neue Überweisung',
@@ -666,8 +631,6 @@ Sollen zusätzlich Ihre Girokonten angezeigt werden?',
     'moneyOut'                                   => 'Geldausgang',
     'billsToPay'                                 => 'Rechnungen zu bezahlen',
     'billsPaid'                                  => 'Rechnungen bezahlt',
-    'divided'                                    => 'geteilt',
-    'toDivide'                                   => 'zu teilen',
 
     // menu and titles, should be recycled as often as possible:
     'currency'                                   => 'Währung',
@@ -727,20 +690,11 @@ Sollen zusätzlich Ihre Girokonten angezeigt werden?',
     'reports_can_bookmark'                       => 'Berichte können als Lesezeichen gespeichert werden.',
     'incomeVsExpenses'                           => 'Einkommen vs Ausgaben',
     'accountBalances'                            => 'Kontostände',
-    'balanceStartOfYear'                         => 'Bilanz zum Jahresbeginn',
-    'balanceEndOfYear'                           => 'Bilanz zum Jahresende',
-    'balanceStartOfMonth'                        => 'Bilanz zum Monatsbeginn',
-    'balanceEndOfMonth'                          => 'Bilanz zum Monatsende',
     'balanceStart'                               => 'Bilanz zum Beginn der Periode',
     'balanceEnd'                                 => 'Bilanz zum Ende der Periode',
-    'reportsOwnAccounts'                         => 'Berichte für Ihren eigenen Konten',
-    'reportsOwnAccountsAndShared'                => 'Reports for your own accounts and shared accounts',
     'splitByAccount'                             => 'Nach Konto aufteilen',
-    'balancedByTransfersAndTags'                 => 'Ausgeglichen durch Überweisungen und Tags',
     'coveredWithTags'                            => 'Abgedeckt durch Tags',
     'leftUnbalanced'                             => 'Left unbalanced',
-    'expectedBalance'                            => 'Erwarteter Kontostand',
-    'outsideOfBudgets'                           => 'Ausserhalb von Budgets',
     'leftInBudget'                               => 'Übrig im Budget',
     'sumOfSums'                                  => 'Summe der Summen',
     'noCategory'                                 => '(keine Kategorie)',
@@ -753,19 +707,12 @@ Sollen zusätzlich Ihre Girokonten angezeigt werden?',
     'topX'                                       => 'top :number',
     'show_full_list'                             => 'Zeige die gesamte Liste',
     'show_only_top'                              => 'Nur die Top :number anzeigen',
-    'sum_of_year'                                => 'Summe des Jahres',
-    'sum_of_years'                               => 'Summe der Jahre',
-    'average_of_year'                            => 'Durchschnitt des Jahres',
-    'average_of_years'                           => 'Durchschnitt der Jahre',
-    'categories_earned_in_year'                  => 'Kategorien (nach Einnahmen)',
-    'categories_spent_in_year'                   => 'Kategorien (nach Ausgaben)',
     'report_type'                                => 'Typ des Berichts',
     'report_type_default'                        => 'Standard-Finanzbericht',
     'report_type_audit'                          => 'Übersicht der Transaktionen (Prüfung)',
     'report_type_category'                       => 'Kategorie-Bericht',
     'report_type_budget'                         => 'Budgetbericht',
     'report_type_tag'                            => 'Tag report',
-    'report_type_meta-history'                   => 'Übersicht über Kategorien, Budgets und Rechnungen',
     'more_info_help'                             => 'Weitere Informationen über diese Art von Berichten finden Sie in der Hilfe. Drücken Sie hierfür das (?)-Symbol in der oberen rechten Ecke.',
     'report_included_accounts'                   => 'Eingezogene Konten',
     'report_date_range'                          => 'Zeitraum',
@@ -818,7 +765,6 @@ Sollen zusätzlich Ihre Girokonten angezeigt werden?',
 
     // charts:
     'chart'                                      => 'Diagram',
-    'dayOfMonth'                                 => 'Tag des Monats',
     'month'                                      => 'Monat',
     'budget'                                     => 'Budget',
     'spent'                                      => 'Ausgegeben',
@@ -839,7 +785,6 @@ Sollen zusätzlich Ihre Girokonten angezeigt werden?',
     'budgeted'                                   => 'Budgetiert',
     'period'                                     => 'Zeitraum',
     'balance'                                    => 'Kontostand',
-    'summary'                                    => 'Zusammenfasssung',
     'sum'                                        => 'Summe',
     'average'                                    => 'Durchschnitt',
     'balanceFor'                                 => 'Kontostand für :name',
@@ -872,18 +817,13 @@ Sollen zusätzlich Ihre Girokonten angezeigt werden?',
     'start_date'                 => 'Startdatum',
     'target_date'                => 'Zieldatum',
     'no_target_date'             => 'Kein Zieldatum',
-    'todo'                       => 'Zu erledigen',
     'table'                      => 'Tabelle',
-    'piggy_bank_not_exists'      => 'Dieses Sparschwein existiert nicht mehr.',
-    'add_any_amount_to_piggy'    => 'Fügen sie Geld ihrem Sparschein hinzu, um ihr Ziel von :amount zu erreichen.',
-    'add_set_amount_to_piggy'    => ':amount einzahlen um Sparschwein bis :date zu füllen',
     'delete_piggy_bank'          => 'Sparschwein ":name" löschen',
     'cannot_add_amount_piggy'    => ':amount konnte nicht zu ":name" hinzugefügt werden.',
     'cannot_remove_from_piggy'   => 'Could not remove :amount from ":name".',
     'deleted_piggy_bank'         => 'Sparschwein ":name" gelöscht',
     'added_amount_to_piggy'      => ':amount zu ":name" hinzugefügt',
     'removed_amount_from_piggy'  => ':amount von ":name" entfernt',
-    'cannot_remove_amount_piggy' => 'Konnten :amount nicht von ":name" entfernen.',
 
     // tags
     'regular_tag'                => 'Nur ein normaler Tag.',
@@ -895,11 +835,6 @@ Sollen zusätzlich Ihre Girokonten angezeigt werden?',
     'edit_tag'                   => 'Tag ":tag" bearbeiten',
     'updated_tag'                => 'Aktualisierter Tag ":tag"',
     'created_tag'                => 'Tag ":tag" wurde erstellt!',
-    'no_year'                    => 'Kein Jahr angegeben',
-    'no_month'                   => 'Kein Monat angegeben',
-    'tag_title_nothing'          => 'Standard-Tags',
-    'tag_title_balancingAct'     => 'Ausgleich Tags',
-    'tag_title_advancePayment'   => 'Vorauszahlung Tags',
 
     'transaction_journal_information'       => 'Transaktionsinformationen',
     'transaction_journal_meta'              => 'Metainformationen',
@@ -926,13 +861,9 @@ Sollen zusätzlich Ihre Girokonten angezeigt werden?',
     'budgets_with_limits'                   => 'Budget(s) mit konfigurierten Betrag',
     'rule_or_rules'                         => 'Regel(n)',
     'rulegroup_or_groups'                   => 'Regelgruppe(n)',
-    'setting_must_confirm_account'          => 'Kontobestätigung',
-    'setting_must_confirm_account_explain'  => 'Wenn sie diese Option auswählen, müssen Benutzer vor Benutzung ihr Konto aktivieren.',
     'configuration_updated'                 => 'Die Konfiguration wurde aktualisiert',
     'setting_is_demo_site'                  => 'Demonstrationsseite',
     'setting_is_demo_site_explain'          => 'Wenn sie diese Option auswählen, wird sich diese Installation wie eine Demonstrationsseite verhalten, was ungwollte Auswirkungen haben kann.',
-    'setting_send_email_notifications'      => 'E-Mail-Benachrichtigungen senden',
-    'setting_send_email_explain'            => 'Firefly III can send you email notifications about certain events. They will be sent to <code>:site_owner</code>. This email address can be set in the <code>.env</code> file.',
     'block_code_bounced'                    => 'Email message(s) bounced',
     'block_code_expired'                    => 'Demo-Konto abgelaufen',
     'no_block_code'                         => 'Kein Grund für Block oder Benutzer nicht blockiert',
@@ -972,31 +903,9 @@ Sollen zusätzlich Ihre Girokonten angezeigt werden?',
 
 
     // split a transaction:
-    'transaction_meta_data'                 => 'Transaktions Metadaten',
-    'transaction_dates'                     => 'Überweisungsdatum',
     'splits'                                => 'Geteilte',
-    'split_title_withdrawal'                => 'Teilen Sie Ihre neue Ausgabe',
-    'split_intro_one_withdrawal'            => 'Firefly unterstützt die "Aufteilung" einer Ausgabe.',
-    'split_intro_two_withdrawal'            => 'Es bedeutet, dass die Menge des Geldes, die Sie aufgegeben haben auf mehrere Zielkonten, Budgets oder Kategorien aufgeteilt werden kann.',
-    'split_intro_three_withdrawal'          => 'For example: you could split your :total groceries so you pay :split_one from your "daily groceries" budget and :split_two from your "cigarettes" budget.',
-    'split_table_intro_withdrawal'          => 'Split your withdrawal in as many things as you want. By default the transaction will not split, there is just one entry. Add as many splits as you want to, below. Remember that you should not deviate from your total amount. If you do, Firefly will warn you but not correct you.',
-    'store_splitted_withdrawal'             => 'Gesplittete Ausgabe speichern',
-    'update_splitted_withdrawal'            => 'Gesplittete Ausgabe aktualisieren',
-    'split_title_deposit'                   => 'Neue Einnahme aufteilen',
-    'split_intro_one_deposit'               => 'Firefly untestützt das "Aufteilen" von Einnahmen.',
-    'split_intro_two_deposit'               => 'It means that the amount of money you\'ve earned is divided between several source revenue accounts or categories.',
-    'split_intro_three_deposit'             => 'For example: you could split your :total salary so you get :split_one as your base salary and :split_two as a reimbursment for expenses made.',
-    'split_table_intro_deposit'             => 'Split your deposit in as many things as you want. By default the transaction will not split, there is just one entry. Add as many splits as you want to, below. Remember that you should not deviate from your total amount. If you do, Firefly will warn you but not correct you.',
-    'store_splitted_deposit'                => 'Store splitted deposit',
-    'split_title_transfer'                  => 'Split your new transfer',
-    'split_intro_one_transfer'              => 'Firefly supports the "splitting" of a transfer.',
-    'split_intro_two_transfer'              => 'It means that the amount of money you\'re moving is divided between several categories or piggy banks.',
-    'split_intro_three_transfer'            => 'For example: you could split your :total move so you get :split_one in one piggy bank and :split_two in another.',
-    'split_table_intro_transfer'            => 'Split your transfer in as many things as you want. By default the transaction will not split, there is just one entry. Add as many splits as you want to, below. Remember that you should not deviate from your total amount. If you do, Firefly will warn you but not correct you.',
-    'store_splitted_transfer'               => 'Store splitted transfer',
     'add_another_split'                     => 'Eine weitere Aufteilung hinzufügen',
     'split-transactions'                    => 'Transaktionen aufteilen',
-    'split-new-transaction'                 => 'Eine neue Transaktion aufteilen',
     'do_split'                              => 'Aufteilen',
     'split_this_withdrawal'                 => 'Diese Ausgabe aufteilen',
     'split_this_deposit'                    => 'Diese Einnahme aufteilen',
@@ -1050,9 +959,6 @@ Sollen zusätzlich Ihre Girokonten angezeigt werden?',
     'import_status_finished_job'            => 'The transactions imported can be found in tag <a href=":link" class="label label-success" style="font-size:100%;font-weight:normal;">:tag</a>.',
     'import_with_key'                       => 'Import with key \':key\'',
 
-    // different states:
-    'import_status_job_running'             => 'The import is underway. Please be patient...',
-
     // sandstorm.io errors and messages:
     'sandstorm_not_available'               => 'This function is not available when you are using Firefly III within a Sandstorm.io environment.',
 

From 995b879a28127859376c30fb967b1511278fe1d7 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Thu, 24 Aug 2017 21:30:46 +0200
Subject: [PATCH 207/668] New translations firefly.php (Dutch)

---
 resources/lang/nl_NL/firefly.php | 106 ++-----------------------------
 1 file changed, 6 insertions(+), 100 deletions(-)

diff --git a/resources/lang/nl_NL/firefly.php b/resources/lang/nl_NL/firefly.php
index e32c369321..808760d2b2 100644
--- a/resources/lang/nl_NL/firefly.php
+++ b/resources/lang/nl_NL/firefly.php
@@ -13,7 +13,6 @@ declare(strict_types=1);
 
 return [
     // general stuff:
-    'language_incomplete'                        => 'onvolledige vertaling',
     'close'                                      => 'Sluiten',
     'actions'                                    => 'Acties',
     'edit'                                       => 'Wijzig',
@@ -28,12 +27,7 @@ return [
     'to'                                         => 'Tot',
     'showEverything'                             => 'Laat alles zien',
     'never'                                      => 'Nooit',
-    'search_results_for'                         => 'Zoekresultaten voor ":query"',
     'no_results_for_empty_search'                => 'Je zoekopdracht was leeg, dus niets werd gevonden.',
-    'bounced_error'                              => 'Het emailtje naar :email kwam nooit aan.',
-    'deleted_error'                              => 'Deze gegevens zijn niet correct.',
-    'general_blocked_error'                      => 'Je account is uitgeschakeld, je kan helaas niet inloggen.',
-    'expired_error'                              => 'Je account is verlopen en kan niet meer worden gebruikt.',
     'removed_amount'                             => ':amount weggehaald',
     'added_amount'                               => ':amount toegevoegd',
     'asset_account_role_help'                    => 'Voorkeuren die voortkomen uit je keuze hier kan je later aangeven.',
@@ -56,7 +50,6 @@ return [
     'flash_error_multiple'                       => 'Er is één fout|Er zijn :count fouten',
     'net_worth'                                  => 'Kapitaal',
     'route_has_no_help'                          => 'Er is geen hulptekst voor deze pagina.',
-    'help_may_not_be_your_language'              => 'Deze hulptekst is in het Engels. Ze is nog niet beschikbaar in het Nederlands',
     'two_factor_welcome'                         => 'Hoi :user!',
     'two_factor_enter_code'                      => 'Vul je authenticatiecode in. Je authenticatieapplicatie kan deze voor je genereren.',
     'two_factor_code_here'                       => 'Code',
@@ -70,9 +63,6 @@ return [
     'two_factor_lost_fix_owner'                  => 'Zo niet, stuur dan een e-mail naar <a href="mailto::site_owner">:site_owner</a> en vraag of ze je authenticatie in twee stappen willen resetten.',
     'warning_much_data'                          => 'Het kan even duren voor :days dagen aan gegevens geladen zijn.',
     'registered'                                 => 'Je bent geregistreerd!',
-    'tagbalancingAct'                            => 'Balancerende tag',
-    'tagadvancePayment'                          => 'Vooruitbetaalde tag',
-    'tagnothing'                                 => '',
     'Default asset account'                      => 'Standaard betaalrekening',
     'no_budget_pointer'                          => 'Je hebt nog geen budgetten. Maak er een aantal op de <a href="/budgets">budgetten</a>-pagina. Met budgetten kan je je uitgaven beter bijhouden.',
     'Savings account'                            => 'Spaarrekening',
@@ -84,7 +74,6 @@ return [
     'need_more_help'                             => 'Als je meer hulp nodig hebt met Firefly III, <a href="https://github.com/firefly-iii/firefly-iii/issues">open dan een ticket op Github</a>.',
     'reenable_intro_text'                        => 'Je kan de <a href="#" id="reenableGuidance">introductie-popupjes</a> ook weer aan zetten.',
     'intro_boxes_after_refresh'                  => 'De introductie-popupjes komen tevoorschijn als je de pagina opnieuw laadt.',
-    'nothing_to_display'                         => 'Er zijn hier geen transacties te zien',
     'show_all_no_filter'                         => 'Laat alle transacties zien, zonder te groeperen op datum.',
     'expenses_by_category'                       => 'Uitgaven per categorie',
     'expenses_by_budget'                         => 'Uitgaven per budget',
@@ -98,11 +87,7 @@ return [
     'spent_in_specific_budget'                   => 'Uitgegeven in budget ":budget"',
     'sum_of_expenses_in_budget'                  => 'Totaal uitgegeven in budget ":budget"',
     'left_in_budget_limit'                       => 'Nog uit te geven volgens budgettering',
-    'cannot_change_demo'                         => 'Je kan het wachtwoord van de demonstratie-account niet wijzigen.',
-    'cannot_delete_demo'                         => 'Je kan de demonstratie-account niet verwijderen.',
     'cannot_reset_demo_user'                     => 'Je kan het wachtwoord van de demonstratie-account niet resetten',
-    'per_period'                                 => 'Per periode',
-    'all_periods'                                => 'Alle perioden',
     'current_period'                             => 'Huidige periode',
     'show_the_current_period_and_overview'       => 'Bekijk de huidige periode en overzicht',
     'pref_languages_locale'                      => 'Als je hier een andere taal dan Engels hebt geselecteerd, zorg er dan voor dat je besturingssysteem ook in staat is om valuta, data en bedragen in die taal weer te geven.',
@@ -111,11 +96,9 @@ return [
     'chart_account_in_period'                    => 'Grafiek voor alle transacties voor rekening ":name" tussen :start en :end',
     'chart_category_in_period'                   => 'Grafiek voor alle transacties voor categorie ":name" tussen :start en :end',
     'chart_category_all'                         => 'Grafiek voor alle transacties voor categorie ":name"',
-    'budget_in_period_breadcrumb'                => 'Tussen :start en :end',
     'clone_withdrawal'                           => 'Kopieer deze uitgave',
     'clone_deposit'                              => 'Kopieer deze inkomsten',
     'clone_transfer'                             => 'Kopieer deze overschrijving',
-    'transaction_journal_other_options'          => 'Andere opties',
     'multi_select_no_selection'                  => 'Niets geselecteerd',
     'multi_select_all_selected'                  => 'Alles geselecteerd',
     'multi_select_filter_placeholder'            => 'Vinden..',
@@ -164,18 +147,6 @@ return [
     'quarterly'                                  => 'elk kwartaal',
     'half-year'                                  => 'elk half jaar',
     'yearly'                                     => 'elk jaar',
-    // account confirmation:
-    'confirm_account_header'                     => 'Bevestig je account',
-    'confirm_account_intro'                      => 'TIjdens het registreren heb je een mailtje gehad. Kijk daar in voor instructies. Als je het mailtje niet hebt gehad, kan Firefly je een nieuwe sturen.',
-    'confirm_account_resend_email'               => 'Stuur me het bevestigingsmailtje dat ik nodig heb om mijn account te activeren.',
-    'account_is_confirmed'                       => 'Je account is geactiveerd!',
-    'invalid_activation_code'                    => 'Het lijkt er op dat de code die je gebruikt niet geldig is (of wellicht verlopen).',
-    'confirm_account_is_resent_header'           => 'De bevestiging is verstuurd',
-    'confirm_account_is_resent_text'             => 'De bevestiging is opnieuw verstuurd. Als je hem nu nog niet krijgt, stuur dan zelf een mailtje naar <a href="mailto::owner">:owner</a> of kijk in de logboeken om te zien wat er is fout gegaan.',
-    'confirm_account_is_resent_go_home'          => 'Ga naar de index van Firefly',
-    'confirm_account_not_resent_header'          => 'Er ging iets fout :(',
-    'confirm_account_not_resent_intro'           => 'Het bevestigingsmailtje is niet verstuurd. Als je het bevestigingsmailtje nog niet hebt gehad, neem dan even contact op met <a href="mailto::owner">:owner</a>.Het kan zijn dat je het bevestigingsmailtje te vaak laat versturen. Je kan dit slechts één keer per uur laten doen.',
-    'confirm_account_not_resent_go_home'         => 'Ga naar de index van Firefly',
 
     // export data:
     'import_and_export'                          => 'Import en export',
@@ -205,7 +176,6 @@ return [
     'export_status_created_zip_file'             => 'Zipbestand gemaakt!',
     'export_status_finished'                     => 'Klaar met exportbestand! Hoera!',
     'export_data_please_wait'                    => 'Een ogenblik geduld...',
-    'attachment_explanation'                     => 'Het bestand \':attachment_name\' (#:attachment_id) werd oorspronkelijk geüpload naar (Engels) :type \':description\' (#:journal_id), met datum :date en bedrag :amount.',
 
     // rules
     'rules'                                      => 'Regels',
@@ -523,7 +493,6 @@ return [
     'createBudget'                               => 'Maak nieuw budget',
     'inactiveBudgets'                            => 'Inactieve budgetten',
     'without_budget_between'                     => 'Transacties zonder budget tussen :start en :end',
-    'budget_in_month'                            => ':name in :month',
     'delete_budget'                              => 'Verwijder budget ":name"',
     'deleted_budget'                             => 'Budget ":name" verwijderd',
     'edit_budget'                                => 'Wijzig budget ":name"',
@@ -597,8 +566,6 @@ return [
     'select_more_than_one_category'              => 'Selecteer meer dan één categorie',
     'select_more_than_one_budget'                => 'Selecteer meer dan één budget',
     'select_more_than_one_tag'                   => 'Selecteer meer dan één tag',
-    'from_to'                                    => 'Van :start tot en met :end',
-    'from_to_breadcrumb'                         => 'van :start tot en met :end',
     'account_default_currency'                   => 'Nieuwe transacties van deze betaalrekening krijgen automatisch deze valuta.',
 
     // categories:
@@ -656,8 +623,6 @@ return [
     'yourAccounts'                               => 'Je betaalrekeningen',
     'budgetsAndSpending'                         => 'Budgetten en uitgaven',
     'savings'                                    => 'Sparen',
-    'markAsSavingsToContinue'                    => 'Om hier wat te zien stel je je betaalrekeningen in als "spaarrekening".',
-    'createPiggyToContinue'                      => 'Maak spaarpotjes om hier iets te zien.',
     'newWithdrawal'                              => 'Nieuwe uitgave',
     'newDeposit'                                 => 'Nieuwe inkomsten',
     'newTransfer'                                => 'Nieuwe overschrijving',
@@ -665,8 +630,6 @@ return [
     'moneyOut'                                   => 'Uitgaven',
     'billsToPay'                                 => 'Openstaande contracten',
     'billsPaid'                                  => 'Betaalde contracten',
-    'divided'                                    => 'verdeeld',
-    'toDivide'                                   => 'te verdelen',
 
     // menu and titles, should be recycled as often as possible:
     'currency'                                   => 'Valuta',
@@ -726,20 +689,11 @@ return [
     'reports_can_bookmark'                       => 'Je kan rapporten aan je favorieten toevoegen.',
     'incomeVsExpenses'                           => 'Inkomsten tegenover uitgaven',
     'accountBalances'                            => 'Rekeningsaldi',
-    'balanceStartOfYear'                         => 'Saldo aan het begin van het jaar',
-    'balanceEndOfYear'                           => 'Saldo aan het einde van het jaar',
-    'balanceStartOfMonth'                        => 'Saldo aan het begin van de maand',
-    'balanceEndOfMonth'                          => 'Saldo aan het einde van de maand',
     'balanceStart'                               => 'Saldo aan het begin van de periode',
     'balanceEnd'                                 => 'Saldo aan het einde van de periode',
-    'reportsOwnAccounts'                         => 'Overzichten voor je eigen betaalrekeningen',
-    'reportsOwnAccountsAndShared'                => 'Overzichten voor je eigen betaalrekeningen en gedeelde rekeningen',
     'splitByAccount'                             => 'Per betaalrekening',
-    'balancedByTransfersAndTags'                 => 'Gecorrigeerd met overschrijvingen en tags',
     'coveredWithTags'                            => 'Gecorrigeerd met tags',
     'leftUnbalanced'                             => 'Ongecorrigeerd',
-    'expectedBalance'                            => 'Verwacht saldo',
-    'outsideOfBudgets'                           => 'Buiten budgetten',
     'leftInBudget'                               => 'Over van budget',
     'sumOfSums'                                  => 'Alles bij elkaar',
     'noCategory'                                 => '(zonder categorie)',
@@ -752,19 +706,12 @@ return [
     'topX'                                       => 'top :number',
     'show_full_list'                             => 'Laat hele lijst zien',
     'show_only_top'                              => 'Alleen top :number',
-    'sum_of_year'                                => 'Som van jaar',
-    'sum_of_years'                               => 'Som van jaren',
-    'average_of_year'                            => 'Gemiddelde in jaar',
-    'average_of_years'                           => 'Gemiddelde in jaren',
-    'categories_earned_in_year'                  => 'Categorieën (inkomsten)',
-    'categories_spent_in_year'                   => 'Categorieën (uitgaven)',
     'report_type'                                => 'Rapporttype',
     'report_type_default'                        => 'Standard financieel rapport',
     'report_type_audit'                          => 'Transactiehistorie-overzicht (audit)',
     'report_type_category'                       => 'Categorierapport',
     'report_type_budget'                         => 'Budgetrapport',
     'report_type_tag'                            => 'Tagrapport',
-    'report_type_meta-history'                   => 'Overzicht van categorieën, budgetten en contracten',
     'more_info_help'                             => 'Meer informatie over deze rapporten vind je in de hulppagina\'s. Klik daarvoor op het (?) icoontje rechtsboven.',
     'report_included_accounts'                   => 'Accounts in rapport',
     'report_date_range'                          => 'Datumbereik',
@@ -817,7 +764,6 @@ return [
 
     // charts:
     'chart'                                      => 'Diagram',
-    'dayOfMonth'                                 => 'Dag vd maand',
     'month'                                      => 'Maand',
     'budget'                                     => 'Budget',
     'spent'                                      => 'Uitgegeven',
@@ -838,7 +784,6 @@ return [
     'budgeted'                                   => 'Gebudgetteerd',
     'period'                                     => 'Periode',
     'balance'                                    => 'Saldo',
-    'summary'                                    => 'Samenvatting',
     'sum'                                        => 'Som',
     'average'                                    => 'Gemiddeld',
     'balanceFor'                                 => 'Saldo op :name',
@@ -871,18 +816,13 @@ return [
     'start_date'                 => 'Startdatum',
     'target_date'                => 'Doeldatum',
     'no_target_date'             => 'Geen doeldatum',
-    'todo'                       => 'te doen',
     'table'                      => 'Tabel',
-    'piggy_bank_not_exists'      => 'Dit spaarpotje bestaat niet meer.',
-    'add_any_amount_to_piggy'    => 'Stop geld in dit spaarpotje om het doel van :amount te halen.',
-    'add_set_amount_to_piggy'    => 'Stop voor :date :amount in dit spaarpotje om hem op tijd te vullen.',
     'delete_piggy_bank'          => 'Verwijder spaarpotje ":name"',
     'cannot_add_amount_piggy'    => 'Kon bedrag :amount niet aan ":name" toevoegen.',
     'cannot_remove_from_piggy'   => 'Kon bedrag :amount niet weghalen uit ":name".',
     'deleted_piggy_bank'         => 'Spaarpotje ":name" verwijderd',
     'added_amount_to_piggy'      => ':amount aan ":name" toegevoegd',
     'removed_amount_from_piggy'  => ':amount uit ":name" gehaald',
-    'cannot_remove_amount_piggy' => 'Kon :amount niet uit ":name" halen.',
 
     // tags
     'regular_tag'                => 'Een gewone tag.',
@@ -894,11 +834,6 @@ return [
     'edit_tag'                   => 'Wijzig tag ":tag"',
     'updated_tag'                => 'Tag ":tag" geüpdatet',
     'created_tag'                => 'Tag ":tag" opgeslagen!',
-    'no_year'                    => 'Zonder jaar',
-    'no_month'                   => 'Zonder maand',
-    'tag_title_nothing'          => 'Standaard tags',
-    'tag_title_balancingAct'     => 'Balancerende tags',
-    'tag_title_advancePayment'   => 'Vooruitbetaalde tags',
 
     'transaction_journal_information'       => 'Transactieinformatie',
     'transaction_journal_meta'              => 'Metainformatie',
@@ -925,13 +860,9 @@ return [
     'budgets_with_limits'                   => 'budget(ten) met een ingesteld bedrag',
     'rule_or_rules'                         => 'regel(s)',
     'rulegroup_or_groups'                   => 'regelgroep(en)',
-    'setting_must_confirm_account'          => 'Accountbevestiging',
-    'setting_must_confirm_account_explain'  => 'Als je dit aanzet moeten gebruikers hun account activeren voor dat-ie werkt.',
     'configuration_updated'                 => 'De configuratie is bijgewerkt',
     'setting_is_demo_site'                  => 'Demo website',
     'setting_is_demo_site_explain'          => 'Als je dit aanzet doet jouw installatie alsof het een demo-site is, en dat kan problemen opleveren.',
-    'setting_send_email_notifications'      => 'Stuur e-mail notificaties',
-    'setting_send_email_explain'            => 'Firefly III kan je email notificaties sturen over allerhande zaken. Deze worden gestuurd naar <code>:site_owner</code>. Dat e-mailadres kan je instellen in het <code>.env</code>-bestand.',
     'block_code_bounced'                    => 'Email kwam niet aan',
     'block_code_expired'                    => 'Demo-account verlopen',
     'no_block_code'                         => 'Geen reden of gebruiker niet geblokkeerd',
@@ -960,42 +891,20 @@ return [
     'to_link_not_found'                     => 'Als de transactie die je wilt koppelen niet gevonden wordt, voer dan het ID in.',
     'invalid_link_data'                     => 'Ongeldige informatie, de transactie kan niet gekoppeld worden.',
     'journals_linked'                       => 'De transacties zijn gekoppeld.',
-    'journals_error_linked'                 => 'These transactions are already linked.',
-    'journal_links'                         => 'Transaction links',
-    'this_withdrawal'                       => 'This withdrawal',
-    'this_deposit'                          => 'This deposit',
-    'this_transfer'                         => 'This transfer',
-    'overview_for_link'                     => 'Overview for link type ":name"',
+    'journals_error_linked'                 => 'Deze transacties zijn al gekoppeld.',
+    'journal_links'                         => 'Transactiekoppelingen',
+    'this_withdrawal'                       => 'Deze uitgave',
+    'this_deposit'                          => 'Deze inkomsten',
+    'this_transfer'                         => 'Deze overschrijving',
+    'overview_for_link'                     => 'Overzicht voor koppeltype ":name"',
     'delete_journal_link'                   => 'Delete the link between <a href=":source_link">:source</a> and <a href=":destination_link">:destination</a>',
     'deleted_link'                          => 'Deleted link',
 
 
     // split a transaction:
-    'transaction_meta_data'                 => 'Transactie meta-data',
-    'transaction_dates'                     => 'Transactie data',
     'splits'                                => 'Splitten',
-    'split_title_withdrawal'                => 'Splits je nieuwe uitgave',
-    'split_intro_one_withdrawal'            => 'Firefly kan een uitgave "splitsen".',
-    'split_intro_two_withdrawal'            => 'Dat betekent dat de uitgave die je maakt wordt verdeeld over verschillende doelrekeningen, budgetten of categorieën.',
-    'split_intro_three_withdrawal'          => 'Je kan bijvoorbeeld je boodschappen van :total verdelen zodat :split_one uit je boodschappenbudget komt, en :split_two uit je sigarettenbudget.',
-    'split_table_intro_withdrawal'          => 'Split je uitgave in zoveel stukken als je maar wilt. Standaard is je uitgave niet gesplitst; er is maar één "split". Voeg hieronder zoveel splits toe als je wilt. Denk er aan dat je niet afwijkt van het totaalbedrag. Als je dat wel doet zal Firefly je waarschuwen maar niet corrigeren.',
-    'store_splitted_withdrawal'             => 'Sla gesplitste uitgave op',
-    'update_splitted_withdrawal'            => 'Gesplitste uitgave updaten',
-    'split_title_deposit'                   => 'Splits je nieuwe inkomsten',
-    'split_intro_one_deposit'               => 'Firefly kan inkomsten "splitsen".',
-    'split_intro_two_deposit'               => 'Dat betekent dat de inkomsten die je krijgt wordt verdeeld over verschillende doelrekeningen of categorieën.',
-    'split_intro_three_deposit'             => 'Je kan bijvoorbeeld je salaris van :total verdelen zodat :split_one wordt opgeslagen als je basissalaris, en :split_two als declaratieteruggave.',
-    'split_table_intro_deposit'             => 'Split je inkomsten in zoveel stukken als je maar wilt. Standaard zijn je inkomsten niet gesplitst; er is maar één "split". Voeg hieronder zoveel splits toe als je wilt. Denk er aan dat je niet afwijkt van het totaalbedrag. Als je dat wel doet zal Firefly je waarschuwen maar niet corrigeren.',
-    'store_splitted_deposit'                => 'Sla gesplitse inkomsten op',
-    'split_title_transfer'                  => 'Splits je nieuwe overschrijving',
-    'split_intro_one_transfer'              => 'Firefly kan overschrijvingen "splitsen".',
-    'split_intro_two_transfer'              => 'Dat betekent dat de uitgave die je maakt wordt verdeeld over verschillende categorieën of spaarpotjes.',
-    'split_intro_three_transfer'            => 'Je kan bijvoorbeeld je overschrijving van :total verdelen zodat :split_one in het ene spaarpotje terecht komt, en :split_two in het andere spaarpotje.',
-    'split_table_intro_transfer'            => 'Split je overschrijving in zoveel stukken als je maar wilt. Standaard is je overschrijving niet gesplitst; er is maar één "split". Voeg hieronder zoveel splits toe als je wilt. Denk er aan dat je niet afwijkt van het totaalbedrag. Als je dat wel doet zal Firefly je waarschuwen maar niet corrigeren.',
-    'store_splitted_transfer'               => 'Sla gesplitste overschrijving op',
     'add_another_split'                     => 'Voeg een split toe',
     'split-transactions'                    => 'Split transacties',
-    'split-new-transaction'                 => 'Split een nieuwe transactie',
     'do_split'                              => 'Splits',
     'split_this_withdrawal'                 => 'Splits deze uitgave',
     'split_this_deposit'                    => 'Splits deze inkomsten',
@@ -1049,9 +958,6 @@ return [
     'import_status_finished_job'            => 'De geimporteerde transacties kan je vinden onder tag <a href=":link" class="label label-success" style="font-size:100%;font-weight:normal;">:tag</a>.',
     'import_with_key'                       => 'Import met code \':key\'',
 
-    // different states:
-    'import_status_job_running'             => 'Het importeren is bezig. Een moment...',
-
     // sandstorm.io errors and messages:
     'sandstorm_not_available'               => 'Deze functie werkt niet als je Firefly III gebruikt in combinatie met Sandstorm.IO.',
 

From 2dc41df0c8d0e830d60fcaea995ce43a4a944f64 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Thu, 24 Aug 2017 21:30:49 +0200
Subject: [PATCH 208/668] New translations firefly.php (Chinese Traditional)

---
 resources/lang/zh_TW/firefly.php | 94 --------------------------------
 1 file changed, 94 deletions(-)

diff --git a/resources/lang/zh_TW/firefly.php b/resources/lang/zh_TW/firefly.php
index 127ca075af..3ea696070e 100644
--- a/resources/lang/zh_TW/firefly.php
+++ b/resources/lang/zh_TW/firefly.php
@@ -13,7 +13,6 @@ declare(strict_types=1);
 
 return [
     // general stuff:
-    'language_incomplete'                        => '翻譯不完整',
     'close'                                      => '關閉',
     'actions'                                    => '操作',
     'edit'                                       => '編輯',
@@ -28,12 +27,7 @@ return [
     'to'                                         => '到',
     'showEverything'                             => '全部顯示',
     'never'                                      => '從來沒有',
-    'search_results_for'                         => '":query" 的搜尋結果',
     'no_results_for_empty_search'                => 'Your search was empty, so nothing was found.',
-    'bounced_error'                              => '無法傳送電郵至 :email ，因此無法訪問。',
-    'deleted_error'                              => '帳號或密碼錯誤。',
-    'general_blocked_error'                      => '您的帳戶已被禁用，所以您不能登錄。',
-    'expired_error'                              => '你的帳戶已過期，不能使用。',
     'removed_amount'                             => '移除了 :amount',
     'added_amount'                               => '添加了 :amount',
     'asset_account_role_help'                    => '你可以稍後再設置其他選項。',
@@ -56,7 +50,6 @@ return [
     'flash_error_multiple'                       => '出現了一個錯誤|出現了 :count 個錯誤',
     'net_worth'                                  => '淨值',
     'route_has_no_help'                          => '目前還沒有說明。',
-    'help_may_not_be_your_language'              => '這個說明還沒有中文版本，將會顯示英文版本。',
     'two_factor_welcome'                         => '哈囉， :user ！',
     'two_factor_enter_code'                      => '若要繼續，請輸入你的雙重身份驗證 （2FA） 應用程序內顯示的驗證代碼。',
     'two_factor_code_here'                       => '在此輸入代碼',
@@ -70,9 +63,6 @@ return [
     'two_factor_lost_fix_owner'                  => '否則，請電郵網站擁有者，<a href="mailto::site_owner">:site_owner</a> 並要求他們重置你的雙重身份驗證。',
     'warning_much_data'                          => ':days 天的資料需要一點時間載入。',
     'registered'                                 => '您已成功註冊 ！',
-    'tagbalancingAct'                            => 'Balancing act',
-    'tagadvancePayment'                          => 'Advance payment',
-    'tagnothing'                                 => '',
     'Default asset account'                      => 'Default asset account',
     'no_budget_pointer'                          => '你還沒有預算。你可以在<a href="/budgets">預算</a>頁來建立預算。預算可以幫助你跟蹤支出情況。',
     'Savings account'                            => 'Savings account',
@@ -84,7 +74,6 @@ return [
     'need_more_help'                             => 'If you need more help using Firefly III, please <a href="https://github.com/firefly-iii/firefly-iii/issues">open a ticket on Github</a>.',
     'reenable_intro_text'                        => 'You can also reenable <a href="#" id="reenableGuidance">the introduction guidance</a>.',
     'intro_boxes_after_refresh'                  => 'The introduction boxes will reappear when you refresh the page.',
-    'nothing_to_display'                         => 'There are no transactions to show you',
     'show_all_no_filter'                         => 'Show all transactions without grouping them by date.',
     'expenses_by_category'                       => 'Expenses by category',
     'expenses_by_budget'                         => 'Expenses by budget',
@@ -98,11 +87,7 @@ return [
     'spent_in_specific_budget'                   => 'Spent in budget ":budget"',
     'sum_of_expenses_in_budget'                  => 'Spent total in budget ":budget"',
     'left_in_budget_limit'                       => 'Left to spend according to budgeting',
-    'cannot_change_demo'                         => 'You cannot change the password of the demonstration account.',
-    'cannot_delete_demo'                         => 'You cannot remove the demonstration account.',
     'cannot_reset_demo_user'                     => 'You cannot reset the password of the demonstration account',
-    'per_period'                                 => 'Per period',
-    'all_periods'                                => 'All periods',
     'current_period'                             => 'Current period',
     'show_the_current_period_and_overview'       => 'Show the current period and overview',
     'pref_languages_locale'                      => 'For a language other than English to work properly, your operating system must be equipped with the correct locale-information. If these are not present, currency data, dates and amounts may be formatted wrong.',
@@ -111,11 +96,9 @@ return [
     'chart_account_in_period'                    => 'Chart for all transactions for account ":name" between :start and :end',
     'chart_category_in_period'                   => 'Chart for all transactions for category ":name" between :start and :end',
     'chart_category_all'                         => 'Chart for all transactions for category ":name"',
-    'budget_in_period_breadcrumb'                => 'Between :start and :end',
     'clone_withdrawal'                           => 'Clone this withdrawal',
     'clone_deposit'                              => 'Clone this deposit',
     'clone_transfer'                             => 'Clone this transfer',
-    'transaction_journal_other_options'          => 'Other options',
     'multi_select_no_selection'                  => 'None selected',
     'multi_select_all_selected'                  => 'All selected',
     'multi_select_filter_placeholder'            => 'Find..',
@@ -164,18 +147,6 @@ return [
     'quarterly'                                  => '每季',
     'half-year'                                  => '每半年',
     'yearly'                                     => '每年',
-    // account confirmation:
-    'confirm_account_header'                     => '請確認你的帳戶',
-    'confirm_account_intro'                      => 'An email has been sent to the address you used during your registration. Please check it out for further instructions. If you did not get this message, you can have Firefly send it again.',
-    'confirm_account_resend_email'               => 'Send me the confirmation message I need to activate my account.',
-    'account_is_confirmed'                       => '你的帳戶已通過驗證。',
-    'invalid_activation_code'                    => 'It seems the code you are using is not valid, or has expired.',
-    'confirm_account_is_resent_header'           => '已重新發送確認郵件',
-    'confirm_account_is_resent_text'             => 'The confirmation message has been resent. If you still did not receive the confirmation message, please contact the site owner at <a href="mailto::owner">:owner</a> or check the log files to see what went wrong.',
-    'confirm_account_is_resent_go_home'          => '轉到 Firefly 的首頁',
-    'confirm_account_not_resent_header'          => '有些事不對勁 :(',
-    'confirm_account_not_resent_intro'           => 'The confirmation message has been not resent. If you still did not receive the confirmation message, please contact the site owner at <a href="mailto::owner">:owner</a> instead. Possibly, you have tried to resend the activation message too often. You can have Firefly III try to resend the confirmation message every hour.',
-    'confirm_account_not_resent_go_home'         => '轉到 Firefly 的首頁',
 
     // export data:
     'import_and_export'                          => '匯入與匯出',
@@ -205,7 +176,6 @@ return [
     'export_status_created_zip_file'             => 'Created a zip file!',
     'export_status_finished'                     => 'Export has succesfully finished! Yay!',
     'export_data_please_wait'                    => 'Please wait...',
-    'attachment_explanation'                     => '檔案 \':attachment_name\' (#:attachment_id) 本來於 :date 上傳到 :type \':description\' (#:journal_id) ，而其金額為 :amount 。',
 
     // rules
     'rules'                                      => 'Rules',
@@ -523,7 +493,6 @@ return [
     'createBudget'                               => 'New budget',
     'inactiveBudgets'                            => 'Inactive budgets',
     'without_budget_between'                     => 'Transactions without a budget between :start and :end',
-    'budget_in_month'                            => ':name in :month',
     'delete_budget'                              => 'Delete budget ":name"',
     'deleted_budget'                             => 'Deleted budget ":name"',
     'edit_budget'                                => 'Edit budget ":name"',
@@ -597,8 +566,6 @@ return [
     'select_more_than_one_category'              => 'Please select more than one category',
     'select_more_than_one_budget'                => 'Please select more than one budget',
     'select_more_than_one_tag'                   => 'Please select more than one tag',
-    'from_to'                                    => 'From :start to :end',
-    'from_to_breadcrumb'                         => 'from :start to :end',
     'account_default_currency'                   => 'If you select another currency, new transactions from this account will have this currency pre-selected.',
 
     // categories:
@@ -656,8 +623,6 @@ return [
     'yourAccounts'                               => 'Your accounts',
     'budgetsAndSpending'                         => 'Budgets and spending',
     'savings'                                    => 'Savings',
-    'markAsSavingsToContinue'                    => '將你的資產帳戶標記為 「儲蓄帳戶」 即可顯示在這裡',
-    'createPiggyToContinue'                      => 'Create piggy banks to fill this panel.',
     'newWithdrawal'                              => 'New expense',
     'newDeposit'                                 => 'New deposit',
     'newTransfer'                                => 'New transfer',
@@ -665,8 +630,6 @@ return [
     'moneyOut'                                   => 'Money out',
     'billsToPay'                                 => '待付賬單',
     'billsPaid'                                  => '已付賬單',
-    'divided'                                    => 'divided',
-    'toDivide'                                   => 'left to divide',
 
     // menu and titles, should be recycled as often as possible:
     'currency'                                   => 'Currency',
@@ -726,20 +689,11 @@ return [
     'reports_can_bookmark'                       => 'Remember that reports can be bookmarked.',
     'incomeVsExpenses'                           => 'Income vs. expenses',
     'accountBalances'                            => '帳戶餘額',
-    'balanceStartOfYear'                         => '年初結餘',
-    'balanceEndOfYear'                           => '年末結餘',
-    'balanceStartOfMonth'                        => '月初結餘',
-    'balanceEndOfMonth'                          => '月未結餘',
     'balanceStart'                               => '期間之初的結餘',
     'balanceEnd'                                 => '期間之未的結餘',
-    'reportsOwnAccounts'                         => 'Reports for your own accounts',
-    'reportsOwnAccountsAndShared'                => 'Reports for your own accounts and shared accounts',
     'splitByAccount'                             => '以帳號來分割',
-    'balancedByTransfersAndTags'                 => 'Balanced by transfers and tags',
     'coveredWithTags'                            => 'Covered with tags',
     'leftUnbalanced'                             => 'Left unbalanced',
-    'expectedBalance'                            => '預期餘額',
-    'outsideOfBudgets'                           => 'Outside of budgets',
     'leftInBudget'                               => 'Left in budget',
     'sumOfSums'                                  => 'Sum of sums',
     'noCategory'                                 => '(no category)',
@@ -752,19 +706,12 @@ return [
     'topX'                                       => 'top :number',
     'show_full_list'                             => 'Show entire list',
     'show_only_top'                              => 'Show only top :number',
-    'sum_of_year'                                => 'Sum of year',
-    'sum_of_years'                               => 'Sum of years',
-    'average_of_year'                            => 'Average of year',
-    'average_of_years'                           => 'Average of years',
-    'categories_earned_in_year'                  => 'Categories (by earnings)',
-    'categories_spent_in_year'                   => 'Categories (by spendings)',
     'report_type'                                => 'Report type',
     'report_type_default'                        => 'Default financial report',
     'report_type_audit'                          => 'Transaction history overview (audit)',
     'report_type_category'                       => 'Category report',
     'report_type_budget'                         => 'Budget report',
     'report_type_tag'                            => 'Tag report',
-    'report_type_meta-history'                   => '類別、 預算與賬單的概覽',
     'more_info_help'                             => 'More information about these types of reports can be found in the help pages. Press the (?) icon in the top right corner.',
     'report_included_accounts'                   => 'Included accounts',
     'report_date_range'                          => 'Date range',
@@ -817,7 +764,6 @@ return [
 
     // charts:
     'chart'                                      => 'Chart',
-    'dayOfMonth'                                 => 'Day of the month',
     'month'                                      => 'Month',
     'budget'                                     => 'Budget',
     'spent'                                      => 'Spent',
@@ -838,7 +784,6 @@ return [
     'budgeted'                                   => 'Budgeted',
     'period'                                     => 'Period',
     'balance'                                    => '餘額',
-    'summary'                                    => 'Summary',
     'sum'                                        => 'Sum',
     'average'                                    => 'Average',
     'balanceFor'                                 => ':name 的餘額',
@@ -871,18 +816,13 @@ return [
     'start_date'                 => 'Start date',
     'target_date'                => '儲蓄目標日期',
     'no_target_date'             => '沒有儲蓄目標日期',
-    'todo'                       => 'to do',
     'table'                      => 'Table',
-    'piggy_bank_not_exists'      => 'Piggy bank no longer exists.',
-    'add_any_amount_to_piggy'    => 'Add money to this piggy bank to reach your target of :amount.',
-    'add_set_amount_to_piggy'    => 'Add :amount to fill this piggy bank on :date',
     'delete_piggy_bank'          => 'Delete piggy bank ":name"',
     'cannot_add_amount_piggy'    => 'Could not add :amount to ":name".',
     'cannot_remove_from_piggy'   => 'Could not remove :amount from ":name".',
     'deleted_piggy_bank'         => 'Deleted piggy bank ":name"',
     'added_amount_to_piggy'      => 'Added :amount to ":name"',
     'removed_amount_from_piggy'  => 'Removed :amount from ":name"',
-    'cannot_remove_amount_piggy' => 'Could not remove :amount from ":name".',
 
     // tags
     'regular_tag'                => '只是一個普通的標籤。',
@@ -894,11 +834,6 @@ return [
     'edit_tag'                   => '編輯標籤 ":tag"',
     'updated_tag'                => '更新了標籤 ":tag"',
     'created_tag'                => '成功創建標籤 ":tag" ！',
-    'no_year'                    => 'No year set',
-    'no_month'                   => 'No month set',
-    'tag_title_nothing'          => '預設標籤',
-    'tag_title_balancingAct'     => '抵銷行為標籤',
-    'tag_title_advancePayment'   => '預付款標籤',
 
     'transaction_journal_information'       => 'Transaction information',
     'transaction_journal_meta'              => 'Meta information',
@@ -925,13 +860,9 @@ return [
     'budgets_with_limits'                   => 'budget(s) with configured amount',
     'rule_or_rules'                         => 'rule(s)',
     'rulegroup_or_groups'                   => 'rule group(s)',
-    'setting_must_confirm_account'          => 'Account confirmation',
-    'setting_must_confirm_account_explain'  => 'When this setting is enabled, users must activate their account before it can be used.',
     'configuration_updated'                 => 'The configuration has been updated',
     'setting_is_demo_site'                  => 'Demo site',
     'setting_is_demo_site_explain'          => 'If you check this box, this installation will behave as if it is the demo site, which can have weird side effects.',
-    'setting_send_email_notifications'      => 'Send email notifications',
-    'setting_send_email_explain'            => 'Firefly III can send you email notifications about certain events. They will be sent to <code>:site_owner</code>. This email address can be set in the <code>.env</code> file.',
     'block_code_bounced'                    => 'Email message(s) bounced',
     'block_code_expired'                    => 'Demo account expired',
     'no_block_code'                         => 'No reason for block or user not blocked',
@@ -971,31 +902,9 @@ return [
 
 
     // split a transaction:
-    'transaction_meta_data'                 => 'Transaction meta-data',
-    'transaction_dates'                     => 'Transaction dates',
     'splits'                                => '分割',
-    'split_title_withdrawal'                => '分割你的新提款',
-    'split_intro_one_withdrawal'            => 'Firefly 容許 "分割" 一個提款。',
-    'split_intro_two_withdrawal'            => 'It means that the amount of money you\'ve spent is divided between several destination expense accounts, budgets or categories.',
-    'split_intro_three_withdrawal'          => '例如：你可以分割你一共 :total 的日用品，所以你可以由你的「日用品」預算支付 :split_one 和由你的「香煙」預算中支付 :split_two 。',
-    'split_table_intro_withdrawal'          => 'Split your withdrawal in as many things as you want. By default the transaction will not split, there is just one entry. Add as many splits as you want to, below. Remember that you should not deviate from your total amount. If you do, Firefly will warn you but not correct you.',
-    'store_splitted_withdrawal'             => 'Store splitted withdrawal',
-    'update_splitted_withdrawal'            => 'Update splitted withdrawal',
-    'split_title_deposit'                   => 'Split your new deposit',
-    'split_intro_one_deposit'               => 'Firefly supports the "splitting" of a deposit.',
-    'split_intro_two_deposit'               => 'It means that the amount of money you\'ve earned is divided between several source revenue accounts or categories.',
-    'split_intro_three_deposit'             => 'For example: you could split your :total salary so you get :split_one as your base salary and :split_two as a reimbursment for expenses made.',
-    'split_table_intro_deposit'             => 'Split your deposit in as many things as you want. By default the transaction will not split, there is just one entry. Add as many splits as you want to, below. Remember that you should not deviate from your total amount. If you do, Firefly will warn you but not correct you.',
-    'store_splitted_deposit'                => 'Store splitted deposit',
-    'split_title_transfer'                  => 'Split your new transfer',
-    'split_intro_one_transfer'              => 'Firefly supports the "splitting" of a transfer.',
-    'split_intro_two_transfer'              => 'It means that the amount of money you\'re moving is divided between several categories or piggy banks.',
-    'split_intro_three_transfer'            => 'For example: you could split your :total move so you get :split_one in one piggy bank and :split_two in another.',
-    'split_table_intro_transfer'            => 'Split your transfer in as many things as you want. By default the transaction will not split, there is just one entry. Add as many splits as you want to, below. Remember that you should not deviate from your total amount. If you do, Firefly will warn you but not correct you.',
-    'store_splitted_transfer'               => 'Store splitted transfer',
     'add_another_split'                     => 'Add another split',
     'split-transactions'                    => 'Split transactions',
-    'split-new-transaction'                 => 'Split a new transaction',
     'do_split'                              => 'Do a split',
     'split_this_withdrawal'                 => 'Split this withdrawal',
     'split_this_deposit'                    => 'Split this deposit',
@@ -1049,9 +958,6 @@ return [
     'import_status_finished_job'            => 'The transactions imported can be found in tag <a href=":link" class="label label-success" style="font-size:100%;font-weight:normal;">:tag</a>.',
     'import_with_key'                       => '以鍵 \':key\' 作匯入',
 
-    // different states:
-    'import_status_job_running'             => 'The import is underway. Please be patient...',
-
     // sandstorm.io errors and messages:
     'sandstorm_not_available'               => 'This function is not available when you are using Firefly III within a Sandstorm.io environment.',
 

From 0f230834a1be11f3ce5835988f2d0c354b22d0fa Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Thu, 24 Aug 2017 21:30:52 +0200
Subject: [PATCH 209/668] New translations firefly.php (Polish)

---
 resources/lang/pl_PL/firefly.php | 94 --------------------------------
 1 file changed, 94 deletions(-)

diff --git a/resources/lang/pl_PL/firefly.php b/resources/lang/pl_PL/firefly.php
index 655bff2d96..2352179e23 100644
--- a/resources/lang/pl_PL/firefly.php
+++ b/resources/lang/pl_PL/firefly.php
@@ -13,7 +13,6 @@ declare(strict_types=1);
 
 return [
     // general stuff:
-    'language_incomplete'                        => 'niepełne tłumaczenie',
     'close'                                      => 'Zamknij',
     'actions'                                    => 'Akcje',
     'edit'                                       => 'Modyfikuj',
@@ -28,12 +27,7 @@ return [
     'to'                                         => 'Do',
     'showEverything'                             => 'Pokaż wszystko',
     'never'                                      => 'Nigdy',
-    'search_results_for'                         => 'Wyniki wyszukiwania dla ":query"',
     'no_results_for_empty_search'                => 'Twoje zapytanie były puste, wiec nic nie zostało znalezione.',
-    'bounced_error'                              => 'Wiadomość wysłana na adres :email została odrzucona, więc nie ma dostępu dla Ciebie.',
-    'deleted_error'                              => 'Te poświadczenia nie zgadzają się z naszymi danymi.',
-    'general_blocked_error'                      => 'Twoje konto zostało zablokowane. Dlatego nie możesz się zalogować.',
-    'expired_error'                              => 'Twoje konto wygasło i nie może być dalej używane.',
     'removed_amount'                             => 'Usunięto :amount',
     'added_amount'                               => 'Dodano :amount',
     'asset_account_role_help'                    => 'Dodatkowe opcje wynikające z Twojego wyboru można ustawić później.',
@@ -56,7 +50,6 @@ return [
     'flash_error_multiple'                       => 'Jest jeden błąd|Jest :count błędów',
     'net_worth'                                  => 'Wartość netto',
     'route_has_no_help'                          => 'Brak pomocy dla tej strony.',
-    'help_may_not_be_your_language'              => 'Ten tekst pomocy jest po angielsku, ponieważ nie został jeszcze przetłumaczony na język polski',
     'two_factor_welcome'                         => 'Witaj, :user!',
     'two_factor_enter_code'                      => 'Aby kontynuować, wprowadź kod uwierzytelniania dwuskładnikowego. Twoja aplikacja może wygenerować go dla Ciebie.',
     'two_factor_code_here'                       => 'Wprowadź tutaj kod',
@@ -70,9 +63,6 @@ return [
     'two_factor_lost_fix_owner'                  => 'W przeciwnym razie, powiadom właściciela strony, <a href="mailto::site_owner">:site_owner</a> i poproś go o zresetowanie Twojego uwierzytelnienia dwuskładnikowego.',
     'warning_much_data'                          => 'Załadowanie :days dni danych może trochę potrwać.',
     'registered'                                 => 'Zarejestrowałeś się pomyślnie!',
-    'tagbalancingAct'                            => 'Balancing act',
-    'tagadvancePayment'                          => 'Advance payment',
-    'tagnothing'                                 => '',
     'Default asset account'                      => 'Domyślne konto aktywów',
     'no_budget_pointer'                          => 'Wygląda na to że nie masz jeszcze budżetów. Powinieneś utworzyć kilka na stronie <a href="/budgets">budżety</a>. Budżety mogą Ci pomóc śledzić wydatki.',
     'Savings account'                            => 'Konto oszczędnościowe',
@@ -84,7 +74,6 @@ return [
     'need_more_help'                             => 'If you need more help using Firefly III, please <a href="https://github.com/firefly-iii/firefly-iii/issues">open a ticket on Github</a>.',
     'reenable_intro_text'                        => 'You can also reenable <a href="#" id="reenableGuidance">the introduction guidance</a>.',
     'intro_boxes_after_refresh'                  => 'The introduction boxes will reappear when you refresh the page.',
-    'nothing_to_display'                         => 'There are no transactions to show you',
     'show_all_no_filter'                         => 'Pokaż wszystkie transakcje bez grupowania ich według daty.',
     'expenses_by_category'                       => 'Wydatki wg kategorii',
     'expenses_by_budget'                         => 'Wydatki wg budżetu',
@@ -98,11 +87,7 @@ return [
     'spent_in_specific_budget'                   => 'Wydatki w budżecie ":budget"',
     'sum_of_expenses_in_budget'                  => 'Wydano łącznie w budżecie ":budget"',
     'left_in_budget_limit'                       => 'Left to spend according to budgeting',
-    'cannot_change_demo'                         => 'Nie można zmienić hasła do konta demonstracyjnego.',
-    'cannot_delete_demo'                         => 'Nie możesz usunąć konta demonstracyjnego.',
     'cannot_reset_demo_user'                     => 'Nie można zresetować hasła do konta demonstracyjnego',
-    'per_period'                                 => 'Za okres',
-    'all_periods'                                => 'Wszystkie okresy',
     'current_period'                             => 'Bieżący okres',
     'show_the_current_period_and_overview'       => 'Pokaż bieżący okres oraz przegląd',
     'pref_languages_locale'                      => 'For a language other than English to work properly, your operating system must be equipped with the correct locale-information. If these are not present, currency data, dates and amounts may be formatted wrong.',
@@ -111,11 +96,9 @@ return [
     'chart_account_in_period'                    => 'Chart for all transactions for account ":name" between :start and :end',
     'chart_category_in_period'                   => 'Chart for all transactions for category ":name" between :start and :end',
     'chart_category_all'                         => 'Chart for all transactions for category ":name"',
-    'budget_in_period_breadcrumb'                => 'Między :start i :end',
     'clone_withdrawal'                           => 'Zduplikuj tę wypłatę',
     'clone_deposit'                              => 'Zduplikuj tą wpłatę',
     'clone_transfer'                             => 'Zduplikuj ten transfer',
-    'transaction_journal_other_options'          => 'Inne opcje',
     'multi_select_no_selection'                  => 'Nie wybrano',
     'multi_select_all_selected'                  => 'Wybrano wszystko',
     'multi_select_filter_placeholder'            => 'Znajdź...',
@@ -164,18 +147,6 @@ return [
     'quarterly'                                  => 'kwartalnie',
     'half-year'                                  => 'co pół roku',
     'yearly'                                     => 'rocznie',
-    // account confirmation:
-    'confirm_account_header'                     => 'Proszę potwierdzić swoje konto',
-    'confirm_account_intro'                      => 'Wiadomość e-mail została wysłana na adres, którego użyłeś podczas rejestracji. Sprawdź ją proszę w celu otrzymania dalszych instrukcji. Jeśli nie otrzymałeś tej wiadomości, możesz ją wysłać ponownie z Firefly.',
-    'confirm_account_resend_email'               => 'Wyślij mi wiadomość potwierdzającą. Muszę aktywować moje konto.',
-    'account_is_confirmed'                       => 'Twoje konto zostało potwierdzone!',
-    'invalid_activation_code'                    => 'Wygląda na to że kod którego używasz jest nieprawidłowy lub wygasł.',
-    'confirm_account_is_resent_header'           => 'Potwierdzenie wysłane ponownie',
-    'confirm_account_is_resent_text'             => 'Wiadomość potwierdzająca została wysłana ponownie. Jeżeli nadal nie została dostarczona, skontaktuj się proszę z właścicielem strony pod <a href="mailto::owner">:owner</a> lub sprawdź pliki z logami aby zobaczyć co poszło źle.',
-    'confirm_account_is_resent_go_home'          => 'Przejdź do strony głównej Firefly',
-    'confirm_account_not_resent_header'          => 'Coś poszło nie tak :(',
-    'confirm_account_not_resent_intro'           => 'Wiadomość potwierdzająca nie została wysłana ponownie. Jeżeli nadal nie została dostarczona, skontaktuj się proszę z właścicielem strony pod <a href="mailto::owner">:owner</a>. Prawdopodobnie próbowałeś wysłać wiadomość potwierdzającą zbyt często. Możesz poprosić Firefly III aby wysłał ją maksymalnie raz na godzinę.',
-    'confirm_account_not_resent_go_home'         => 'Przejdź do strony głównej Firefly',
 
     // export data:
     'import_and_export'                          => 'Import / eksport',
@@ -205,7 +176,6 @@ return [
     'export_status_created_zip_file'             => 'Utworzono plik zip!',
     'export_status_finished'                     => 'Eksport został pomyślnie zakończony! Yay!',
     'export_data_please_wait'                    => 'Proszę czekać...',
-    'attachment_explanation'                     => 'The file called \':attachment_name\' (#:attachment_id) was originally uploaded to :type \':description\' (#:journal_id) dated :date for the amount of :amount.',
 
     // rules
     'rules'                                      => 'Reguły',
@@ -523,7 +493,6 @@ return [
     'createBudget'                               => 'Nowy budżet',
     'inactiveBudgets'                            => 'Nieaktywne budżety',
     'without_budget_between'                     => 'Transakcje bez budżetu między :start i :end',
-    'budget_in_month'                            => ':name w :month',
     'delete_budget'                              => 'Usuń budżet ":name"',
     'deleted_budget'                             => 'Usunięto budżet ":name"',
     'edit_budget'                                => 'Modyfikuj budżet ":name"',
@@ -597,8 +566,6 @@ return [
     'select_more_than_one_category'              => 'Proszę wybierz więcej niż jedną kategorię',
     'select_more_than_one_budget'                => 'Proszę wybierz więcej niż jeden budżet',
     'select_more_than_one_tag'                   => 'Proszę wybierz więcej niż jeden tag',
-    'from_to'                                    => 'Od :start do :end',
-    'from_to_breadcrumb'                         => 'od :start do :end',
     'account_default_currency'                   => 'If you select another currency, new transactions from this account will have this currency pre-selected.',
 
     // categories:
@@ -656,8 +623,6 @@ return [
     'yourAccounts'                               => 'Twoje konta',
     'budgetsAndSpending'                         => 'Budżety i wydatki',
     'savings'                                    => 'Oszczędności',
-    'markAsSavingsToContinue'                    => 'Mark your asset accounts as "Savings account" to fill this panel',
-    'createPiggyToContinue'                      => 'Utwórz skarbonki aby wypełnić ten panel.',
     'newWithdrawal'                              => 'Nowy wydatek',
     'newDeposit'                                 => 'Nowa wpłata',
     'newTransfer'                                => 'Nowy transfer',
@@ -665,8 +630,6 @@ return [
     'moneyOut'                                   => 'Obciążenia',
     'billsToPay'                                 => 'Rachunki do zapłacenia',
     'billsPaid'                                  => 'Zapłacone rachunki',
-    'divided'                                    => 'podzielone',
-    'toDivide'                                   => 'left to divide',
 
     // menu and titles, should be recycled as often as possible:
     'currency'                                   => 'Waluta',
@@ -726,20 +689,11 @@ return [
     'reports_can_bookmark'                       => 'Remember that reports can be bookmarked.',
     'incomeVsExpenses'                           => 'Dochody a wydatki',
     'accountBalances'                            => 'Salda kont',
-    'balanceStartOfYear'                         => 'Saldo na początku roku',
-    'balanceEndOfYear'                           => 'Saldo na końcu roku',
-    'balanceStartOfMonth'                        => 'Saldo na początku miesiąca',
-    'balanceEndOfMonth'                          => 'Saldo na końcu miesiąca',
     'balanceStart'                               => 'Saldo na początku okresu',
     'balanceEnd'                                 => 'Saldo na końcu okresu',
-    'reportsOwnAccounts'                         => 'Raporty dla własnych kont',
-    'reportsOwnAccountsAndShared'                => 'Reports for your own accounts and shared accounts',
     'splitByAccount'                             => 'Split by account',
-    'balancedByTransfersAndTags'                 => 'Balanced by transfers and tags',
     'coveredWithTags'                            => 'Covered with tags',
     'leftUnbalanced'                             => 'Left unbalanced',
-    'expectedBalance'                            => 'Przewidywane saldo',
-    'outsideOfBudgets'                           => 'Poza budżetami',
     'leftInBudget'                               => 'Pozostało w budżecie',
     'sumOfSums'                                  => 'Suma sum',
     'noCategory'                                 => '(bez kategorii)',
@@ -752,19 +706,12 @@ return [
     'topX'                                       => 'top :number',
     'show_full_list'                             => 'Pokaż całą listę',
     'show_only_top'                              => 'Show only top :number',
-    'sum_of_year'                                => 'Sum of year',
-    'sum_of_years'                               => 'Sum of years',
-    'average_of_year'                            => 'Average of year',
-    'average_of_years'                           => 'Average of years',
-    'categories_earned_in_year'                  => 'Kategorie (wg przychodów)',
-    'categories_spent_in_year'                   => 'Kategorie (wg wydatków)',
     'report_type'                                => 'Typ raportu',
     'report_type_default'                        => 'Domyślny raport finansowy',
     'report_type_audit'                          => 'Przegląd historii transakcji (audyt)',
     'report_type_category'                       => 'Raport kategorii',
     'report_type_budget'                         => 'Raport budżetów',
     'report_type_tag'                            => 'Raport tagów',
-    'report_type_meta-history'                   => 'Przegląd kategorii, budżetów i rachunków',
     'more_info_help'                             => 'More information about these types of reports can be found in the help pages. Press the (?) icon in the top right corner.',
     'report_included_accounts'                   => 'Uwzględnione konta',
     'report_date_range'                          => 'Zakres dat',
@@ -817,7 +764,6 @@ return [
 
     // charts:
     'chart'                                      => 'Wykres',
-    'dayOfMonth'                                 => 'Dzień miesiąca',
     'month'                                      => 'Miesiąc',
     'budget'                                     => 'Budżet',
     'spent'                                      => 'Wydano',
@@ -838,7 +784,6 @@ return [
     'budgeted'                                   => 'Zabudżetowano',
     'period'                                     => 'Okres',
     'balance'                                    => 'Saldo',
-    'summary'                                    => 'Podsumowanie',
     'sum'                                        => 'Suma',
     'average'                                    => 'Średno',
     'balanceFor'                                 => 'Saldo dla :name',
@@ -871,18 +816,13 @@ return [
     'start_date'                 => 'Data rozpoczęcia',
     'target_date'                => 'Data docelowa',
     'no_target_date'             => 'No target date',
-    'todo'                       => 'do wykonania',
     'table'                      => 'Tabela',
-    'piggy_bank_not_exists'      => 'Skarbonka już nie istnieje.',
-    'add_any_amount_to_piggy'    => 'Dodaj pieniądze do skarbonki aby osiągnąć twój cel w kwocie :amount.',
-    'add_set_amount_to_piggy'    => 'Add :amount to fill this piggy bank on :date',
     'delete_piggy_bank'          => 'Usuń skarbonkę ":name"',
     'cannot_add_amount_piggy'    => 'Nie można dodać :amount do ":name".',
     'cannot_remove_from_piggy'   => 'Could not remove :amount from ":name".',
     'deleted_piggy_bank'         => 'Usunięto skarbonkę ":name"',
     'added_amount_to_piggy'      => 'Added :amount to ":name"',
     'removed_amount_from_piggy'  => 'Removed :amount from ":name"',
-    'cannot_remove_amount_piggy' => 'Could not remove :amount from ":name".',
 
     // tags
     'regular_tag'                => 'Po prostu zwykły tag.',
@@ -894,11 +834,6 @@ return [
     'edit_tag'                   => 'Modyfikuj tag ":tag"',
     'updated_tag'                => 'Zaktualizowano tag ":tag"',
     'created_tag'                => 'Tag ":tag" został utworzony!',
-    'no_year'                    => 'Nie ustawiono roku',
-    'no_month'                   => 'Nie ustawiono miesiąca',
-    'tag_title_nothing'          => 'Domyślne tagi',
-    'tag_title_balancingAct'     => 'Balancing act tags',
-    'tag_title_advancePayment'   => 'Advance payment tags',
 
     'transaction_journal_information'       => 'Informacje o transakcji',
     'transaction_journal_meta'              => 'Meta informacje',
@@ -925,13 +860,9 @@ return [
     'budgets_with_limits'                   => 'budget(s) with configured amount',
     'rule_or_rules'                         => 'reguła(y)',
     'rulegroup_or_groups'                   => 'grupa(y) reguł',
-    'setting_must_confirm_account'          => 'Potwierdzenie konta',
-    'setting_must_confirm_account_explain'  => 'When this setting is enabled, users must activate their account before it can be used.',
     'configuration_updated'                 => 'Konfiguracja została zaktualizowana',
     'setting_is_demo_site'                  => 'Strona demonstracyjna',
     'setting_is_demo_site_explain'          => 'If you check this box, this installation will behave as if it is the demo site, which can have weird side effects.',
-    'setting_send_email_notifications'      => 'Wyślij powiadomienia emailem',
-    'setting_send_email_explain'            => 'Firefly III can send you email notifications about certain events. They will be sent to <code>:site_owner</code>. This email address can be set in the <code>.env</code> file.',
     'block_code_bounced'                    => 'Odrzucony e-mail potwierdzający',
     'block_code_expired'                    => 'Demonstracyjne konto wygasło',
     'no_block_code'                         => 'Brak powody blokady lub użytkownik niezablokowany',
@@ -971,31 +902,9 @@ return [
 
 
     // split a transaction:
-    'transaction_meta_data'                 => 'Transaction meta-data',
-    'transaction_dates'                     => 'Daty transakcji',
     'splits'                                => 'Podziały',
-    'split_title_withdrawal'                => 'Podziel swoją nową wypłatę',
-    'split_intro_one_withdrawal'            => 'Firefly obsługuje "dzielenie" wypłaty.',
-    'split_intro_two_withdrawal'            => 'Oznacza to, że ilość pieniędzy, które wydałeś jest podzielona między kilka kont wypłat, budżetów lub kategorii.',
-    'split_intro_three_withdrawal'          => 'For example: you could split your :total groceries so you pay :split_one from your "daily groceries" budget and :split_two from your "cigarettes" budget.',
-    'split_table_intro_withdrawal'          => 'Split your withdrawal in as many things as you want. By default the transaction will not split, there is just one entry. Add as many splits as you want to, below. Remember that you should not deviate from your total amount. If you do, Firefly will warn you but not correct you.',
-    'store_splitted_withdrawal'             => 'Zachowaj podzieloną wypłatę',
-    'update_splitted_withdrawal'            => 'Aktualizuj podzieloną wypłatę',
-    'split_title_deposit'                   => 'Podziel swoją nową wpłatę',
-    'split_intro_one_deposit'               => 'Firefly supports the "splitting" of a deposit.',
-    'split_intro_two_deposit'               => 'It means that the amount of money you\'ve earned is divided between several source revenue accounts or categories.',
-    'split_intro_three_deposit'             => 'For example: you could split your :total salary so you get :split_one as your base salary and :split_two as a reimbursment for expenses made.',
-    'split_table_intro_deposit'             => 'Split your deposit in as many things as you want. By default the transaction will not split, there is just one entry. Add as many splits as you want to, below. Remember that you should not deviate from your total amount. If you do, Firefly will warn you but not correct you.',
-    'store_splitted_deposit'                => 'Zachowaj podzieloną wpłatę',
-    'split_title_transfer'                  => 'Podziel swój nowy transfer',
-    'split_intro_one_transfer'              => 'Firefly supports the "splitting" of a transfer.',
-    'split_intro_two_transfer'              => 'It means that the amount of money you\'re moving is divided between several categories or piggy banks.',
-    'split_intro_three_transfer'            => 'For example: you could split your :total move so you get :split_one in one piggy bank and :split_two in another.',
-    'split_table_intro_transfer'            => 'Split your transfer in as many things as you want. By default the transaction will not split, there is just one entry. Add as many splits as you want to, below. Remember that you should not deviate from your total amount. If you do, Firefly will warn you but not correct you.',
-    'store_splitted_transfer'               => 'Zachowaj podzielony transfer',
     'add_another_split'                     => 'Dodaj kolejny podział',
     'split-transactions'                    => 'Podziel transakcję',
-    'split-new-transaction'                 => 'Podziel nową transakcję',
     'do_split'                              => 'Podziel',
     'split_this_withdrawal'                 => 'Podziel tą wypłatę',
     'split_this_deposit'                    => 'Podziel tą wpłatę',
@@ -1049,9 +958,6 @@ return [
     'import_status_finished_job'            => 'Zaimportowane transakcje znajdują się w tagu <a href=":link" class="label label-success" style="font-size:100%;font-weight:normal;">:tag</a>.',
     'import_with_key'                       => 'Import z kluczem \':key\'',
 
-    // different states:
-    'import_status_job_running'             => 'Import jest w toku. Proszę o cierpliwość...',
-
     // sandstorm.io errors and messages:
     'sandstorm_not_available'               => 'Ta funkcja nie jest dostępna, gdy używasz Firefly III w środowisku Sandstorm.io.',
 

From 8ebb39b8d5c98eaf2e1c786674c01237c913f89b Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Thu, 24 Aug 2017 21:30:55 +0200
Subject: [PATCH 210/668] New translations firefly.php (Portuguese, Brazilian)

---
 resources/lang/pt_BR/firefly.php | 94 --------------------------------
 1 file changed, 94 deletions(-)

diff --git a/resources/lang/pt_BR/firefly.php b/resources/lang/pt_BR/firefly.php
index d3ef255a63..4b99a70477 100644
--- a/resources/lang/pt_BR/firefly.php
+++ b/resources/lang/pt_BR/firefly.php
@@ -13,7 +13,6 @@ declare(strict_types=1);
 
 return [
     // general stuff:
-    'language_incomplete'                        => 'tradução incompleta',
     'close'                                      => 'Fechar',
     'actions'                                    => 'Ações',
     'edit'                                       => 'Editar',
@@ -28,12 +27,7 @@ return [
     'to'                                         => 'Até',
     'showEverything'                             => 'Mostrar tudo',
     'never'                                      => 'Nunca',
-    'search_results_for'                         => 'Pesquisar resultados por ":query"',
     'no_results_for_empty_search'                => 'Your search was empty, so nothing was found.',
-    'bounced_error'                              => 'A mensagem enviado para :email ressaltado, não tem acesso para você.',
-    'deleted_error'                              => 'Estas credenciais não correspondem aos nossos registros.',
-    'general_blocked_error'                      => 'Sua conta foi desativada, você não pode entrar.',
-    'expired_error'                              => 'Sua conta expirou e não pode mais ser usada.',
     'removed_amount'                             => ':amount removido',
     'added_amount'                               => ':amount adicionada',
     'asset_account_role_help'                    => 'Quaisquer opções extras resultantes da sua escolha pode ser definido mais tarde.',
@@ -56,7 +50,6 @@ return [
     'flash_error_multiple'                       => 'Houve um erro|Houve :count erros',
     'net_worth'                                  => 'Valor Líquido',
     'route_has_no_help'                          => 'Não existe ajuda para esta rota.',
-    'help_may_not_be_your_language'              => 'Este texto de ajuda é em inglês. Ainda não está disponível em seu idioma',
     'two_factor_welcome'                         => 'Olá, :user!',
     'two_factor_enter_code'                      => 'Para continuar, por favor, digite seu código de autenticação em duas etapas. Seu aplicativo pode gerá-lo para você.',
     'two_factor_code_here'                       => 'Insira o código aqui',
@@ -70,9 +63,6 @@ return [
     'two_factor_lost_fix_owner'                  => 'Caso contrário, o proprietário do site <a href="mailto::site_owner">:site_owner</a> e peça para redefinir a sua autenticação de duas etapas.',
     'warning_much_data'                          => ':days dias de dados podem demorar um pouco para carregar.',
     'registered'                                 => 'Você se registrou com sucesso!',
-    'tagbalancingAct'                            => 'Saldo',
-    'tagadvancePayment'                          => 'Pagamento antecipado',
-    'tagnothing'                                 => '',
     'Default asset account'                      => 'Conta padrão',
     'no_budget_pointer'                          => 'Parece que não há orçamentos ainda. Você deve criar alguns na página <a href="/budgets">orçamentos</a>. Orçamentos podem ajudá-lo a manter o controle de despesas.',
     'Savings account'                            => 'Conta poupança',
@@ -84,7 +74,6 @@ return [
     'need_more_help'                             => 'If you need more help using Firefly III, please <a href="https://github.com/firefly-iii/firefly-iii/issues">open a ticket on Github</a>.',
     'reenable_intro_text'                        => 'You can also reenable <a href="#" id="reenableGuidance">the introduction guidance</a>.',
     'intro_boxes_after_refresh'                  => 'The introduction boxes will reappear when you refresh the page.',
-    'nothing_to_display'                         => 'There are no transactions to show you',
     'show_all_no_filter'                         => 'Show all transactions without grouping them by date.',
     'expenses_by_category'                       => 'Despesa por categoria',
     'expenses_by_budget'                         => 'Despesas pelo orçamento',
@@ -98,11 +87,7 @@ return [
     'spent_in_specific_budget'                   => 'Spent in budget ":budget"',
     'sum_of_expenses_in_budget'                  => 'Spent total in budget ":budget"',
     'left_in_budget_limit'                       => 'Left to spend according to budgeting',
-    'cannot_change_demo'                         => 'You cannot change the password of the demonstration account.',
-    'cannot_delete_demo'                         => 'You cannot remove the demonstration account.',
     'cannot_reset_demo_user'                     => 'You cannot reset the password of the demonstration account',
-    'per_period'                                 => 'Per period',
-    'all_periods'                                => 'All periods',
     'current_period'                             => 'Current period',
     'show_the_current_period_and_overview'       => 'Show the current period and overview',
     'pref_languages_locale'                      => 'For a language other than English to work properly, your operating system must be equipped with the correct locale-information. If these are not present, currency data, dates and amounts may be formatted wrong.',
@@ -111,11 +96,9 @@ return [
     'chart_account_in_period'                    => 'Chart for all transactions for account ":name" between :start and :end',
     'chart_category_in_period'                   => 'Chart for all transactions for category ":name" between :start and :end',
     'chart_category_all'                         => 'Chart for all transactions for category ":name"',
-    'budget_in_period_breadcrumb'                => 'Between :start and :end',
     'clone_withdrawal'                           => 'Clone this withdrawal',
     'clone_deposit'                              => 'Clone this deposit',
     'clone_transfer'                             => 'Clone this transfer',
-    'transaction_journal_other_options'          => 'Other options',
     'multi_select_no_selection'                  => 'None selected',
     'multi_select_all_selected'                  => 'All selected',
     'multi_select_filter_placeholder'            => 'Find..',
@@ -164,18 +147,6 @@ return [
     'quarterly'                                  => 'trimestral',
     'half-year'                                  => 'metade de cada ano',
     'yearly'                                     => 'anual',
-    // account confirmation:
-    'confirm_account_header'                     => 'Por favor, confirme sua conta',
-    'confirm_account_intro'                      => 'Um e-mail foi enviado para o endereço que você usou durante o seu registro. Por favor confira-o para mais instruções. Se não recebeu esta mensagem, podemos enviá-lo novamente.',
-    'confirm_account_resend_email'               => 'Envie-me a mensagem de confirmação para eu ativar minha conta.',
-    'account_is_confirmed'                       => 'Sua conta foi confirmada!',
-    'invalid_activation_code'                    => 'Parece que você está usando o código não é válido ou expirado.',
-    'confirm_account_is_resent_header'           => 'A confirmação foi reenviada',
-    'confirm_account_is_resent_text'             => 'A mensagem de confirmação foi reenviada. Se ainda não receber a mensagem de confirmação, entre em contato com o proprietário do site em <a href="mailto::owner">:owner</a> ou verifique os arquivos de log para ver o que deu errado.',
-    'confirm_account_is_resent_go_home'          => 'Vá para a página de índice do Firefly',
-    'confirm_account_not_resent_header'          => 'Algo deu errado :(',
-    'confirm_account_not_resent_intro'           => 'A mensagem de confirmação não foi reenviada. Se ainda não recebeu a mensagem de confirmação, entre em contato com o proprietário do site através do email <a href="mailto::owner">:owner</a>. Possivelmente, você já tentou reenviar a mensagem de ativação, muitas vezes. Firefly III tentará reenviar a mensagem de confirmação a cada hora.',
-    'confirm_account_not_resent_go_home'         => 'Vá para a página de índice do Firefly',
 
     // export data:
     'import_and_export'                          => 'Importar / Exportar',
@@ -205,7 +176,6 @@ return [
     'export_status_created_zip_file'             => 'Criado um arquivo zip!',
     'export_status_finished'                     => 'Exportação terminou com sucesso! Yay!',
     'export_data_please_wait'                    => 'Por favor aguarde...',
-    'attachment_explanation'                     => 'O arquivo chamado \':attachment_name\' (#:attachment_id) foi originalmente enviado para: tipo \':description\' (#:journal_id) datado em :date para a quantia de :amount.',
 
     // rules
     'rules'                                      => 'Regras',
@@ -523,7 +493,6 @@ return [
     'createBudget'                               => 'Novo orçamento',
     'inactiveBudgets'                            => 'Orçamentos inativos',
     'without_budget_between'                     => 'Transações sem um orçamento entre :start e :end',
-    'budget_in_month'                            => ':name no :month',
     'delete_budget'                              => 'Excluir orçamento ":name"',
     'deleted_budget'                             => 'Orçamento ":name" excluído',
     'edit_budget'                                => 'Editar orçamento ":name"',
@@ -597,8 +566,6 @@ return [
     'select_more_than_one_category'              => 'Por favor, selecione mais de uma categoria',
     'select_more_than_one_budget'                => 'Please select more than one budget',
     'select_more_than_one_tag'                   => 'Please select more than one tag',
-    'from_to'                                    => 'From :start to :end',
-    'from_to_breadcrumb'                         => 'from :start to :end',
     'account_default_currency'                   => 'If you select another currency, new transactions from this account will have this currency pre-selected.',
 
     // categories:
@@ -656,8 +623,6 @@ return [
     'yourAccounts'                               => 'Suas contas',
     'budgetsAndSpending'                         => 'Orçamentos e despesas',
     'savings'                                    => 'Poupanças',
-    'markAsSavingsToContinue'                    => 'Marque suas contas de activo como "Poupança" para preencher este painel',
-    'createPiggyToContinue'                      => 'Crie cofrinhos para preencher este painel.',
     'newWithdrawal'                              => 'Nova despesa',
     'newDeposit'                                 => 'Novo depósito',
     'newTransfer'                                => 'Nova transferência',
@@ -665,8 +630,6 @@ return [
     'moneyOut'                                   => 'Dinheiro sai',
     'billsToPay'                                 => 'Faturas a pagar',
     'billsPaid'                                  => 'Faturas pagas',
-    'divided'                                    => 'dividida',
-    'toDivide'                                   => 'esquerda para dividir',
 
     // menu and titles, should be recycled as often as possible:
     'currency'                                   => 'Moeda',
@@ -726,20 +689,11 @@ return [
     'reports_can_bookmark'                       => 'Lembre-se que relatórios podem ser marcados.',
     'incomeVsExpenses'                           => 'Renda vs. Despesas',
     'accountBalances'                            => 'Saldos de Contas',
-    'balanceStartOfYear'                         => 'Saldo no início do ano',
-    'balanceEndOfYear'                           => 'Saldo no final do ano',
-    'balanceStartOfMonth'                        => 'Saldo no início do mês',
-    'balanceEndOfMonth'                          => 'Saldo no final do mês',
     'balanceStart'                               => 'Saldo no início do período',
     'balanceEnd'                                 => 'Saldo no final do período',
-    'reportsOwnAccounts'                         => 'Relatórios para suas próprias contas',
-    'reportsOwnAccountsAndShared'                => 'Relatórios para suas próprias contas e contas compartilhadas',
     'splitByAccount'                             => 'Dividir por conta',
-    'balancedByTransfersAndTags'                 => 'Balanço por transferências e tags',
     'coveredWithTags'                            => 'Coberto com tags',
     'leftUnbalanced'                             => 'Deixar desequilibrado',
-    'expectedBalance'                            => 'Saldo Experado',
-    'outsideOfBudgets'                           => 'Fora do orçamento',
     'leftInBudget'                               => 'Deixou no orçamento',
     'sumOfSums'                                  => 'Soma dos montantes',
     'noCategory'                                 => '(sem categoria)',
@@ -752,19 +706,12 @@ return [
     'topX'                                       => 'topo :number',
     'show_full_list'                             => 'Mostrar a lista inteira',
     'show_only_top'                              => 'Show only top :number',
-    'sum_of_year'                                => 'Soma do ano',
-    'sum_of_years'                               => 'Soma dos anos',
-    'average_of_year'                            => 'Média do ano',
-    'average_of_years'                           => 'Média dos anos',
-    'categories_earned_in_year'                  => 'Categorias (por lucro)',
-    'categories_spent_in_year'                   => 'Categorias (por gastos)',
     'report_type'                                => 'Tipo de relatório',
     'report_type_default'                        => 'Relatório financeiro padrão',
     'report_type_audit'                          => 'Visão geral do histórico de transação (auditoria)',
     'report_type_category'                       => 'Relatório por Categorias',
     'report_type_budget'                         => 'Budget report',
     'report_type_tag'                            => 'Tag report',
-    'report_type_meta-history'                   => 'Visão geral de categorias, orçamentos e faturas',
     'more_info_help'                             => 'Mais informações sobre esses tipos de relatórios podem ser encontradas nas páginas de ajuda. Pressione o ícone (?) no canto superior direito.',
     'report_included_accounts'                   => 'Contas incluídas',
     'report_date_range'                          => 'Período',
@@ -817,7 +764,6 @@ return [
 
     // charts:
     'chart'                                      => 'Gráfico',
-    'dayOfMonth'                                 => 'Dia do mês',
     'month'                                      => 'Mês',
     'budget'                                     => 'Orçamento',
     'spent'                                      => 'Gasto',
@@ -838,7 +784,6 @@ return [
     'budgeted'                                   => 'Orçado',
     'period'                                     => 'Período',
     'balance'                                    => 'Saldo',
-    'summary'                                    => 'Sumário',
     'sum'                                        => 'Soma',
     'average'                                    => 'Média',
     'balanceFor'                                 => 'Saldo para ":name"',
@@ -871,18 +816,13 @@ return [
     'start_date'                 => 'Data de Início',
     'target_date'                => 'Data Alvo',
     'no_target_date'             => 'Nenhum data',
-    'todo'                       => 'A fazer',
     'table'                      => 'Tabela',
-    'piggy_bank_not_exists'      => 'Cofrinho não existe mais.',
-    'add_any_amount_to_piggy'    => 'Adicionar dinheiro a este cofrinho para atingir sua meta de :amount.',
-    'add_set_amount_to_piggy'    => 'Adicionar :amount para encher este cofrinho em :date',
     'delete_piggy_bank'          => 'Apagar cofrinho ":name"',
     'cannot_add_amount_piggy'    => 'Não foi possível adicionar :amount a ":name".',
     'cannot_remove_from_piggy'   => 'Could not remove :amount from ":name".',
     'deleted_piggy_bank'         => 'Apagar cofrinho ":name"',
     'added_amount_to_piggy'      => 'Adicionado :amount de ":name"',
     'removed_amount_from_piggy'  => 'Removido :amount de ":name"',
-    'cannot_remove_amount_piggy' => 'Não foi possível remover :amount de ":name".',
 
     // tags
     'regular_tag'                => 'Apenas uma tag regular.',
@@ -894,11 +834,6 @@ return [
     'edit_tag'                   => 'Editar tag ":tag"',
     'updated_tag'                => 'Tag atualizada ":tag"',
     'created_tag'                => 'Tag ":tag" foi criada!',
-    'no_year'                    => 'Nenhum ano definido',
-    'no_month'                   => 'Nenhum mês definido',
-    'tag_title_nothing'          => 'Tags padrões',
-    'tag_title_balancingAct'     => 'Saldo das tags',
-    'tag_title_advancePayment'   => 'Tags de pagamento do adiantamento',
 
     'transaction_journal_information'       => 'Informação da transação',
     'transaction_journal_meta'              => 'Meta-informação',
@@ -925,13 +860,9 @@ return [
     'budgets_with_limits'                   => 'budget(s) com quantidade configurada',
     'rule_or_rules'                         => 'regra(s)',
     'rulegroup_or_groups'                   => 'grupo(s) de regra',
-    'setting_must_confirm_account'          => 'Confirmação de conta',
-    'setting_must_confirm_account_explain'  => 'When this setting is enabled, users must activate their account before it can be used.',
     'configuration_updated'                 => 'A configuração foi atualizada',
     'setting_is_demo_site'                  => 'Site demo',
     'setting_is_demo_site_explain'          => 'If you check this box, this installation will behave as if it is the demo site, which can have weird side effects.',
-    'setting_send_email_notifications'      => 'Send email notifications',
-    'setting_send_email_explain'            => 'Firefly III can send you email notifications about certain events. They will be sent to <code>:site_owner</code>. This email address can be set in the <code>.env</code> file.',
     'block_code_bounced'                    => 'Email message(s) bounced',
     'block_code_expired'                    => 'Demo account expired',
     'no_block_code'                         => 'No reason for block or user not blocked',
@@ -971,31 +902,9 @@ return [
 
 
     // split a transaction:
-    'transaction_meta_data'                 => 'Dados de transação',
-    'transaction_dates'                     => 'Data de transação',
     'splits'                                => 'Divide-se',
-    'split_title_withdrawal'                => 'Dividir sua nova retirada',
-    'split_intro_one_withdrawal'            => 'Firefly suporta a "divisão" de uma retirada.',
-    'split_intro_two_withdrawal'            => 'Isso significa que a quantidade de dinheiro que você gastou será dividida entre várias contas de despesas do destino, orçamentos ou categorias.',
-    'split_intro_three_withdrawal'          => 'Por exemplo: você pode dividir seu :total de mantimentos de modo que você pague :split_one de seu orçamento diário de mantimentos e :split_two do seu orçamento para "cigarros".',
-    'split_table_intro_withdrawal'          => 'Dividi sua retirada em tantas coisas quanto quiser. Por padrão, a transação não será dividida, há apenas uma entrada. Adicione muitas divisões como desejar, abaixo. Lembre-se de que você não deve se desviar do seu montante total. Se o fizeres, Firefly irá avisá-lo mas não corrigirá.',
-    'store_splitted_withdrawal'             => 'Armazenar retirada dividida',
-    'update_splitted_withdrawal'            => 'Atualização de retirada dividida',
-    'split_title_deposit'                   => 'Dividir seu novo depósito',
-    'split_intro_one_deposit'               => 'Firefly suporta a "divisão" de um depósito.',
-    'split_intro_two_deposit'               => 'Isso significa que a quantidade de dinheiro que você ganhou será dividida entre várias contas de receitas de fonte ou categorias.',
-    'split_intro_three_deposit'             => 'Por exemplo: você pode dividir seu :total salário para que você obtenha :split_one como seu salário-base e :split_two como um reembolso para alguma despesa.',
-    'split_table_intro_deposit'             => 'Dividi seu depósito em tantas coisas quanto quiser. Por padrão, a transação não será dividida, há apenas uma entrada. Adicione muitas divisões como desejar, abaixo. Lembre-se de que você não deve se desviar do seu montante total. Se o fizeres, Firefly irá avisá-lo mas não corrigirá.',
-    'store_splitted_deposit'                => 'Armazenar depósito dividido',
-    'split_title_transfer'                  => 'Dividir sua nova transferência',
-    'split_intro_one_transfer'              => 'Firefly suporta a "divisão" de uma transferência.',
-    'split_intro_two_transfer'              => 'Isso significa que a quantidade de dinheiro que você está movendo será dividida entre várias categorias ou cofrinhos.',
-    'split_intro_three_transfer'            => 'Por exemplo: você pode dividir sua movimentação :total , para que você obtenha :split_one em um cofrinho e :split_two em outro.',
-    'split_table_intro_transfer'            => 'Dividi sua transferência em tantas coisas quanto quiser. Por padrão, a transação não será dividida, há apenas uma entrada. Adicione muitas divisões como desejar, abaixo. Lembre-se de que você não deve se desviar do seu montante total. Se o fizeres, Firefly irá avisá-lo mas não corrigirá.',
-    'store_splitted_transfer'               => 'Armazenar transferência dividida',
     'add_another_split'                     => 'Adicionar outra divisão',
     'split-transactions'                    => 'Dividir transações',
-    'split-new-transaction'                 => 'Dividir uma nova transação',
     'do_split'                              => 'Fazer uma divisão',
     'split_this_withdrawal'                 => 'Dividir esta retirada',
     'split_this_deposit'                    => 'Dividir este depósito',
@@ -1049,9 +958,6 @@ return [
     'import_status_finished_job'            => 'The transactions imported can be found in tag <a href=":link" class="label label-success" style="font-size:100%;font-weight:normal;">:tag</a>.',
     'import_with_key'                       => 'Importação com chave \':key\'',
 
-    // different states:
-    'import_status_job_running'             => 'The import is underway. Please be patient...',
-
     // sandstorm.io errors and messages:
     'sandstorm_not_available'               => 'This function is not available when you are using Firefly III within a Sandstorm.io environment.',
 

From 8ba63338fc3a8bc30f64b7a378400e0b10c2f92e Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Thu, 24 Aug 2017 21:31:00 +0200
Subject: [PATCH 211/668] New translations firefly.php (Spanish)

---
 resources/lang/es_ES/firefly.php | 94 --------------------------------
 1 file changed, 94 deletions(-)

diff --git a/resources/lang/es_ES/firefly.php b/resources/lang/es_ES/firefly.php
index 3d14104ac9..b427e5317f 100644
--- a/resources/lang/es_ES/firefly.php
+++ b/resources/lang/es_ES/firefly.php
@@ -13,7 +13,6 @@ declare(strict_types=1);
 
 return [
     // general stuff:
-    'language_incomplete'                        => 'traducción incompleta',
     'close'                                      => 'Cerrar',
     'actions'                                    => 'Acciones',
     'edit'                                       => 'Editar',
@@ -28,12 +27,7 @@ return [
     'to'                                         => 'Hasta',
     'showEverything'                             => 'Mostrar todo',
     'never'                                      => 'Nunca',
-    'search_results_for'                         => 'Resultados de la búsqueda para %{query}',
     'no_results_for_empty_search'                => 'Su búsqueda estaba vacía, por lo que no se encontró nada.',
-    'bounced_error'                              => 'El mensaje enviado al: correo electrónico no ha sido recibido, así que no hay acceso para usted.',
-    'deleted_error'                              => 'Las credenciales no coinciden con los registros.',
-    'general_blocked_error'                      => 'Tu cuenta ha sido creada. Ahora puedes iniciar sesión.',
-    'expired_error'                              => 'Su cuenta ha caducado y ya no puede ser utilizado.',
     'removed_amount'                             => 'Eliminado: cantidad',
     'added_amount'                               => 'Agregado: cantidad',
     'asset_account_role_help'                    => 'Las opciones extras como resultado de su elección se pueden establecer más tarde.',
@@ -56,7 +50,6 @@ return [
     'flash_error_multiple'                       => 'Hay un error | Hay: contar errores',
     'net_worth'                                  => 'Valor Neto',
     'route_has_no_help'                          => 'No hay datos en este registro.',
-    'help_may_not_be_your_language'              => 'Este texto de ayuda está en inglés. Aún no está disponible en tu idioma',
     'two_factor_welcome'                         => 'Hola %{user}!',
     'two_factor_enter_code'                      => 'Para continuar, introduce tu código de autenticación de dos pasos. La aplicación puede generarlo para usted.',
     'two_factor_code_here'                       => 'Ingresar código aquí',
@@ -70,9 +63,6 @@ return [
     'two_factor_lost_fix_owner'                  => 'Otherwise, email the site owner, <a href="mailto::site_owner">:site_owner</a> and ask them to reset your two factor authentication.',
     'warning_much_data'                          => ':days days of data may take a while to load.',
     'registered'                                 => '¡Te has registrado con éxito!',
-    'tagbalancingAct'                            => 'Balancing act',
-    'tagadvancePayment'                          => 'Advance payment',
-    'tagnothing'                                 => '',
     'Default asset account'                      => '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.',
     'Savings account'                            => 'Savings account',
@@ -84,7 +74,6 @@ return [
     'need_more_help'                             => 'If you need more help using Firefly III, please <a href="https://github.com/firefly-iii/firefly-iii/issues">open a ticket on Github</a>.',
     'reenable_intro_text'                        => 'You can also reenable <a href="#" id="reenableGuidance">the introduction guidance</a>.',
     'intro_boxes_after_refresh'                  => 'The introduction boxes will reappear when you refresh the page.',
-    'nothing_to_display'                         => 'There are no transactions to show you',
     'show_all_no_filter'                         => 'Show all transactions without grouping them by date.',
     'expenses_by_category'                       => 'Expenses by category',
     'expenses_by_budget'                         => 'Expenses by budget',
@@ -98,11 +87,7 @@ return [
     'spent_in_specific_budget'                   => 'Spent in budget ":budget"',
     'sum_of_expenses_in_budget'                  => 'Spent total in budget ":budget"',
     'left_in_budget_limit'                       => 'Left to spend according to budgeting',
-    'cannot_change_demo'                         => 'You cannot change the password of the demonstration account.',
-    'cannot_delete_demo'                         => 'You cannot remove the demonstration account.',
     'cannot_reset_demo_user'                     => 'You cannot reset the password of the demonstration account',
-    'per_period'                                 => 'Per period',
-    'all_periods'                                => 'All periods',
     'current_period'                             => 'Current period',
     'show_the_current_period_and_overview'       => 'Show the current period and overview',
     'pref_languages_locale'                      => 'For a language other than English to work properly, your operating system must be equipped with the correct locale-information. If these are not present, currency data, dates and amounts may be formatted wrong.',
@@ -111,11 +96,9 @@ return [
     'chart_account_in_period'                    => 'Chart for all transactions for account ":name" between :start and :end',
     'chart_category_in_period'                   => 'Chart for all transactions for category ":name" between :start and :end',
     'chart_category_all'                         => 'Chart for all transactions for category ":name"',
-    'budget_in_period_breadcrumb'                => 'Between :start and :end',
     'clone_withdrawal'                           => 'Clone this withdrawal',
     'clone_deposit'                              => 'Clone this deposit',
     'clone_transfer'                             => 'Clone this transfer',
-    'transaction_journal_other_options'          => 'Other options',
     'multi_select_no_selection'                  => 'None selected',
     'multi_select_all_selected'                  => 'All selected',
     'multi_select_filter_placeholder'            => 'Find..',
@@ -164,18 +147,6 @@ return [
     'quarterly'                                  => 'quarterly',
     'half-year'                                  => 'every half year',
     'yearly'                                     => 'yearly',
-    // account confirmation:
-    'confirm_account_header'                     => 'Please confirm your account',
-    'confirm_account_intro'                      => 'An email has been sent to the address you used during your registration. Please check it out for further instructions. If you did not get this message, you can have Firefly send it again.',
-    'confirm_account_resend_email'               => 'Send me the confirmation message I need to activate my account.',
-    'account_is_confirmed'                       => 'Your account has been confirmed!',
-    'invalid_activation_code'                    => 'It seems the code you are using is not valid, or has expired.',
-    'confirm_account_is_resent_header'           => 'The confirmation has been resent',
-    'confirm_account_is_resent_text'             => 'The confirmation message has been resent. If you still did not receive the confirmation message, please contact the site owner at <a href="mailto::owner">:owner</a> or check the log files to see what went wrong.',
-    'confirm_account_is_resent_go_home'          => 'Go to the index page of Firefly',
-    'confirm_account_not_resent_header'          => 'Something went wrong :(',
-    'confirm_account_not_resent_intro'           => 'The confirmation message has been not resent. If you still did not receive the confirmation message, please contact the site owner at <a href="mailto::owner">:owner</a> instead. Possibly, you have tried to resend the activation message too often. You can have Firefly III try to resend the confirmation message every hour.',
-    'confirm_account_not_resent_go_home'         => 'Go to the index page of Firefly',
 
     // export data:
     'import_and_export'                          => 'Import and export',
@@ -205,7 +176,6 @@ return [
     'export_status_created_zip_file'             => 'Created a zip file!',
     'export_status_finished'                     => 'Export has succesfully finished! Yay!',
     'export_data_please_wait'                    => 'Please wait...',
-    'attachment_explanation'                     => 'The file called \':attachment_name\' (#:attachment_id) was originally uploaded to :type \':description\' (#:journal_id) dated :date for the amount of :amount.',
 
     // rules
     'rules'                                      => 'Rules',
@@ -523,7 +493,6 @@ return [
     'createBudget'                               => 'New budget',
     'inactiveBudgets'                            => 'Inactive budgets',
     'without_budget_between'                     => 'Transactions without a budget between :start and :end',
-    'budget_in_month'                            => ':name in :month',
     'delete_budget'                              => 'Delete budget ":name"',
     'deleted_budget'                             => 'Deleted budget ":name"',
     'edit_budget'                                => 'Edit budget ":name"',
@@ -597,8 +566,6 @@ return [
     'select_more_than_one_category'              => 'Please select more than one category',
     'select_more_than_one_budget'                => 'Please select more than one budget',
     'select_more_than_one_tag'                   => 'Please select more than one tag',
-    'from_to'                                    => 'From :start to :end',
-    'from_to_breadcrumb'                         => 'from :start to :end',
     'account_default_currency'                   => 'If you select another currency, new transactions from this account will have this currency pre-selected.',
 
     // categories:
@@ -656,8 +623,6 @@ return [
     'yourAccounts'                               => 'Your accounts',
     'budgetsAndSpending'                         => 'Budgets and spending',
     'savings'                                    => 'Savings',
-    'markAsSavingsToContinue'                    => 'Mark your asset accounts as "Savings account" to fill this panel',
-    'createPiggyToContinue'                      => 'Create piggy banks to fill this panel.',
     'newWithdrawal'                              => 'New expense',
     'newDeposit'                                 => 'New deposit',
     'newTransfer'                                => 'New transfer',
@@ -665,8 +630,6 @@ return [
     'moneyOut'                                   => 'Money out',
     'billsToPay'                                 => 'Bills to pay',
     'billsPaid'                                  => 'Bills paid',
-    'divided'                                    => 'divided',
-    'toDivide'                                   => 'left to divide',
 
     // menu and titles, should be recycled as often as possible:
     'currency'                                   => 'Currency',
@@ -726,20 +689,11 @@ return [
     'reports_can_bookmark'                       => 'Remember that reports can be bookmarked.',
     'incomeVsExpenses'                           => 'Income vs. expenses',
     'accountBalances'                            => 'Account balances',
-    'balanceStartOfYear'                         => 'Balance at start of year',
-    'balanceEndOfYear'                           => 'Balance at end of year',
-    'balanceStartOfMonth'                        => 'Balance at start of month',
-    'balanceEndOfMonth'                          => 'Balance at end of month',
     'balanceStart'                               => 'Balance at start of period',
     'balanceEnd'                                 => 'Balance at end of period',
-    'reportsOwnAccounts'                         => 'Reports for your own accounts',
-    'reportsOwnAccountsAndShared'                => 'Reports for your own accounts and shared accounts',
     'splitByAccount'                             => 'Split by account',
-    'balancedByTransfersAndTags'                 => 'Balanced by transfers and tags',
     'coveredWithTags'                            => 'Covered with tags',
     'leftUnbalanced'                             => 'Left unbalanced',
-    'expectedBalance'                            => 'Expected balance',
-    'outsideOfBudgets'                           => 'Outside of budgets',
     'leftInBudget'                               => 'Left in budget',
     'sumOfSums'                                  => 'Sum of sums',
     'noCategory'                                 => '(no category)',
@@ -752,19 +706,12 @@ return [
     'topX'                                       => 'top :number',
     'show_full_list'                             => 'Show entire list',
     'show_only_top'                              => 'Show only top :number',
-    'sum_of_year'                                => 'Sum of year',
-    'sum_of_years'                               => 'Sum of years',
-    'average_of_year'                            => 'Average of year',
-    'average_of_years'                           => 'Average of years',
-    'categories_earned_in_year'                  => 'Categories (by earnings)',
-    'categories_spent_in_year'                   => 'Categories (by spendings)',
     'report_type'                                => 'Report type',
     'report_type_default'                        => 'Default financial report',
     'report_type_audit'                          => 'Transaction history overview (audit)',
     'report_type_category'                       => 'Category report',
     'report_type_budget'                         => 'Budget report',
     'report_type_tag'                            => 'Tag report',
-    'report_type_meta-history'                   => 'Categories, budgets and bills overview',
     'more_info_help'                             => 'More information about these types of reports can be found in the help pages. Press the (?) icon in the top right corner.',
     'report_included_accounts'                   => 'Included accounts',
     'report_date_range'                          => 'Date range',
@@ -817,7 +764,6 @@ return [
 
     // charts:
     'chart'                                      => 'Chart',
-    'dayOfMonth'                                 => 'Day of the month',
     'month'                                      => 'Month',
     'budget'                                     => 'Budget',
     'spent'                                      => 'Spent',
@@ -838,7 +784,6 @@ return [
     'budgeted'                                   => 'Budgeted',
     'period'                                     => 'Period',
     'balance'                                    => 'Balance',
-    'summary'                                    => 'Summary',
     'sum'                                        => 'Sum',
     'average'                                    => 'Average',
     'balanceFor'                                 => 'Balance for :name',
@@ -871,18 +816,13 @@ return [
     'start_date'                 => 'Start date',
     'target_date'                => 'Target date',
     'no_target_date'             => 'No target date',
-    'todo'                       => 'to do',
     'table'                      => 'Table',
-    'piggy_bank_not_exists'      => 'Piggy bank no longer exists.',
-    'add_any_amount_to_piggy'    => 'Add money to this piggy bank to reach your target of :amount.',
-    'add_set_amount_to_piggy'    => 'Add :amount to fill this piggy bank on :date',
     'delete_piggy_bank'          => 'Delete piggy bank ":name"',
     'cannot_add_amount_piggy'    => 'Could not add :amount to ":name".',
     'cannot_remove_from_piggy'   => 'Could not remove :amount from ":name".',
     'deleted_piggy_bank'         => 'Deleted piggy bank ":name"',
     'added_amount_to_piggy'      => 'Added :amount to ":name"',
     'removed_amount_from_piggy'  => 'Removed :amount from ":name"',
-    'cannot_remove_amount_piggy' => 'Could not remove :amount from ":name".',
 
     // tags
     'regular_tag'                => 'Just a regular tag.',
@@ -894,11 +834,6 @@ return [
     'edit_tag'                   => 'Edit tag ":tag"',
     'updated_tag'                => 'Updated tag ":tag"',
     'created_tag'                => 'Tag ":tag" has been created!',
-    'no_year'                    => 'No year set',
-    'no_month'                   => 'No month set',
-    'tag_title_nothing'          => 'Default tags',
-    'tag_title_balancingAct'     => 'Balancing act tags',
-    'tag_title_advancePayment'   => 'Advance payment tags',
 
     'transaction_journal_information'       => 'Transaction information',
     'transaction_journal_meta'              => 'Meta information',
@@ -925,13 +860,9 @@ return [
     'budgets_with_limits'                   => 'budget(s) with configured amount',
     'rule_or_rules'                         => 'rule(s)',
     'rulegroup_or_groups'                   => 'rule group(s)',
-    'setting_must_confirm_account'          => 'Account confirmation',
-    'setting_must_confirm_account_explain'  => 'When this setting is enabled, users must activate their account before it can be used.',
     'configuration_updated'                 => 'The configuration has been updated',
     'setting_is_demo_site'                  => 'Demo site',
     'setting_is_demo_site_explain'          => 'If you check this box, this installation will behave as if it is the demo site, which can have weird side effects.',
-    'setting_send_email_notifications'      => 'Send email notifications',
-    'setting_send_email_explain'            => 'Firefly III can send you email notifications about certain events. They will be sent to <code>:site_owner</code>. This email address can be set in the <code>.env</code> file.',
     'block_code_bounced'                    => 'Email message(s) bounced',
     'block_code_expired'                    => 'Demo account expired',
     'no_block_code'                         => 'No reason for block or user not blocked',
@@ -971,31 +902,9 @@ return [
 
 
     // split a transaction:
-    'transaction_meta_data'                 => 'Transaction meta-data',
-    'transaction_dates'                     => 'Transaction dates',
     'splits'                                => 'Splits',
-    'split_title_withdrawal'                => 'Split your new withdrawal',
-    'split_intro_one_withdrawal'            => 'Firefly supports the "splitting" of a withdrawal.',
-    'split_intro_two_withdrawal'            => 'It means that the amount of money you\'ve spent is divided between several destination expense accounts, budgets or categories.',
-    'split_intro_three_withdrawal'          => 'For example: you could split your :total groceries so you pay :split_one from your "daily groceries" budget and :split_two from your "cigarettes" budget.',
-    'split_table_intro_withdrawal'          => 'Split your withdrawal in as many things as you want. By default the transaction will not split, there is just one entry. Add as many splits as you want to, below. Remember that you should not deviate from your total amount. If you do, Firefly will warn you but not correct you.',
-    'store_splitted_withdrawal'             => 'Store splitted withdrawal',
-    'update_splitted_withdrawal'            => 'Update splitted withdrawal',
-    'split_title_deposit'                   => 'Split your new deposit',
-    'split_intro_one_deposit'               => 'Firefly supports the "splitting" of a deposit.',
-    'split_intro_two_deposit'               => 'It means that the amount of money you\'ve earned is divided between several source revenue accounts or categories.',
-    'split_intro_three_deposit'             => 'For example: you could split your :total salary so you get :split_one as your base salary and :split_two as a reimbursment for expenses made.',
-    'split_table_intro_deposit'             => 'Split your deposit in as many things as you want. By default the transaction will not split, there is just one entry. Add as many splits as you want to, below. Remember that you should not deviate from your total amount. If you do, Firefly will warn you but not correct you.',
-    'store_splitted_deposit'                => 'Store splitted deposit',
-    'split_title_transfer'                  => 'Split your new transfer',
-    'split_intro_one_transfer'              => 'Firefly supports the "splitting" of a transfer.',
-    'split_intro_two_transfer'              => 'It means that the amount of money you\'re moving is divided between several categories or piggy banks.',
-    'split_intro_three_transfer'            => 'For example: you could split your :total move so you get :split_one in one piggy bank and :split_two in another.',
-    'split_table_intro_transfer'            => 'Split your transfer in as many things as you want. By default the transaction will not split, there is just one entry. Add as many splits as you want to, below. Remember that you should not deviate from your total amount. If you do, Firefly will warn you but not correct you.',
-    'store_splitted_transfer'               => 'Store splitted transfer',
     'add_another_split'                     => 'Add another split',
     'split-transactions'                    => 'Split transactions',
-    'split-new-transaction'                 => 'Split a new transaction',
     'do_split'                              => 'Do a split',
     'split_this_withdrawal'                 => 'Split this withdrawal',
     'split_this_deposit'                    => 'Split this deposit',
@@ -1049,9 +958,6 @@ return [
     'import_status_finished_job'            => 'The transactions imported can be found in tag <a href=":link" class="label label-success" style="font-size:100%;font-weight:normal;">:tag</a>.',
     'import_with_key'                       => 'Import with key \':key\'',
 
-    // different states:
-    'import_status_job_running'             => 'The import is underway. Please be patient...',
-
     // sandstorm.io errors and messages:
     'sandstorm_not_available'               => 'This function is not available when you are using Firefly III within a Sandstorm.io environment.',
 

From dda2080d01a622ba1b9d57deff8aa423948892ca Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Thu, 24 Aug 2017 21:31:03 +0200
Subject: [PATCH 212/668] New translations firefly.php (Slovenian)

---
 resources/lang/sl_SI/firefly.php | 94 --------------------------------
 1 file changed, 94 deletions(-)

diff --git a/resources/lang/sl_SI/firefly.php b/resources/lang/sl_SI/firefly.php
index a559970283..719fa02e72 100644
--- a/resources/lang/sl_SI/firefly.php
+++ b/resources/lang/sl_SI/firefly.php
@@ -13,7 +13,6 @@ declare(strict_types=1);
 
 return [
     // general stuff:
-    'language_incomplete'                        => 'nepopoln prevod',
     'close'                                      => 'zapri',
     'actions'                                    => 'Actions',
     'edit'                                       => 'uredi',
@@ -28,12 +27,7 @@ return [
     'to'                                         => 'To',
     'showEverything'                             => 'pokaži vse',
     'never'                                      => 'nikoli',
-    'search_results_for'                         => 'rezultati iskanja za ":query"',
     'no_results_for_empty_search'                => 'Your search was empty, so nothing was found.',
-    'bounced_error'                              => 'The message sent to :email bounced, so no access for you.',
-    'deleted_error'                              => 'These credentials do not match our records.',
-    'general_blocked_error'                      => 'Your account has been disabled, so you cannot login.',
-    'expired_error'                              => 'Your account has expired, and can no longer be used.',
     'removed_amount'                             => 'Removed :amount',
     'added_amount'                               => 'Added :amount',
     'asset_account_role_help'                    => 'Dodatne možnosti se lahko nastavljajo tudi kasneje.',
@@ -56,7 +50,6 @@ return [
     'flash_error_multiple'                       => 'There is one error|There are :count errors',
     'net_worth'                                  => 'Net worth',
     'route_has_no_help'                          => 'There is no help for this route.',
-    'help_may_not_be_your_language'              => 'This help text is in English. It is not yet available in your language',
     'two_factor_welcome'                         => 'Hello, :user!',
     'two_factor_enter_code'                      => 'To continue, please enter your two factor authentication code. Your application can generate it for you.',
     'two_factor_code_here'                       => 'Enter code here',
@@ -70,9 +63,6 @@ return [
     'two_factor_lost_fix_owner'                  => 'Otherwise, email the site owner, <a href="mailto::site_owner">:site_owner</a> and ask them to reset your two factor authentication.',
     'warning_much_data'                          => ':days days of data may take a while to load.',
     'registered'                                 => 'You have registered successfully!',
-    'tagbalancingAct'                            => 'Balancing act',
-    'tagadvancePayment'                          => 'Advance payment',
-    'tagnothing'                                 => '',
     'Default asset account'                      => 'privzeti premoženjski račun',
     'no_budget_pointer'                          => 'Kot kaže niste definirali še nobenega budžeta. Budžete lahko ustvarite na strani  <a href="/budgets">budžeti></a>. Budžeti vam pomagajo držati pregled nad vašimi stroški.',
     'Savings account'                            => 'Savings account',
@@ -84,7 +74,6 @@ return [
     'need_more_help'                             => 'If you need more help using Firefly III, please <a href="https://github.com/firefly-iii/firefly-iii/issues">open a ticket on Github</a>.',
     'reenable_intro_text'                        => 'You can also reenable <a href="#" id="reenableGuidance">the introduction guidance</a>.',
     'intro_boxes_after_refresh'                  => 'The introduction boxes will reappear when you refresh the page.',
-    'nothing_to_display'                         => 'There are no transactions to show you',
     'show_all_no_filter'                         => 'Show all transactions without grouping them by date.',
     'expenses_by_category'                       => 'stroški po kategorijah',
     'expenses_by_budget'                         => 'stroški po budžetih',
@@ -98,11 +87,7 @@ return [
     'spent_in_specific_budget'                   => 'Spent in budget ":budget"',
     'sum_of_expenses_in_budget'                  => 'Spent total in budget ":budget"',
     'left_in_budget_limit'                       => 'Left to spend according to budgeting',
-    'cannot_change_demo'                         => 'You cannot change the password of the demonstration account.',
-    'cannot_delete_demo'                         => 'You cannot remove the demonstration account.',
     'cannot_reset_demo_user'                     => 'You cannot reset the password of the demonstration account',
-    'per_period'                                 => 'Per period',
-    'all_periods'                                => 'All periods',
     'current_period'                             => 'Current period',
     'show_the_current_period_and_overview'       => 'Show the current period and overview',
     'pref_languages_locale'                      => 'For a language other than English to work properly, your operating system must be equipped with the correct locale-information. If these are not present, currency data, dates and amounts may be formatted wrong.',
@@ -111,11 +96,9 @@ return [
     'chart_account_in_period'                    => 'Chart for all transactions for account ":name" between :start and :end',
     'chart_category_in_period'                   => 'Chart for all transactions for category ":name" between :start and :end',
     'chart_category_all'                         => 'Chart for all transactions for category ":name"',
-    'budget_in_period_breadcrumb'                => 'Between :start and :end',
     'clone_withdrawal'                           => 'Clone this withdrawal',
     'clone_deposit'                              => 'Clone this deposit',
     'clone_transfer'                             => 'Clone this transfer',
-    'transaction_journal_other_options'          => 'Other options',
     'multi_select_no_selection'                  => 'None selected',
     'multi_select_all_selected'                  => 'All selected',
     'multi_select_filter_placeholder'            => 'Find..',
@@ -164,18 +147,6 @@ return [
     'quarterly'                                  => 'quarterly',
     'half-year'                                  => 'every half year',
     'yearly'                                     => 'yearly',
-    // account confirmation:
-    'confirm_account_header'                     => 'Please confirm your account',
-    'confirm_account_intro'                      => 'An email has been sent to the address you used during your registration. Please check it out for further instructions. If you did not get this message, you can have Firefly send it again.',
-    'confirm_account_resend_email'               => 'Send me the confirmation message I need to activate my account.',
-    'account_is_confirmed'                       => 'Your account has been confirmed!',
-    'invalid_activation_code'                    => 'It seems the code you are using is not valid, or has expired.',
-    'confirm_account_is_resent_header'           => 'The confirmation has been resent',
-    'confirm_account_is_resent_text'             => 'The confirmation message has been resent. If you still did not receive the confirmation message, please contact the site owner at <a href="mailto::owner">:owner</a> or check the log files to see what went wrong.',
-    'confirm_account_is_resent_go_home'          => 'Go to the index page of Firefly',
-    'confirm_account_not_resent_header'          => 'Something went wrong :(',
-    'confirm_account_not_resent_intro'           => 'The confirmation message has been not resent. If you still did not receive the confirmation message, please contact the site owner at <a href="mailto::owner">:owner</a> instead. Possibly, you have tried to resend the activation message too often. You can have Firefly III try to resend the confirmation message every hour.',
-    'confirm_account_not_resent_go_home'         => 'Go to the index page of Firefly',
 
     // export data:
     'import_and_export'                          => 'Import and export',
@@ -205,7 +176,6 @@ return [
     'export_status_created_zip_file'             => 'Created a zip file!',
     'export_status_finished'                     => 'Export has succesfully finished! Yay!',
     'export_data_please_wait'                    => 'Please wait...',
-    'attachment_explanation'                     => 'The file called \':attachment_name\' (#:attachment_id) was originally uploaded to :type \':description\' (#:journal_id) dated :date for the amount of :amount.',
 
     // rules
     'rules'                                      => 'Rules',
@@ -523,7 +493,6 @@ return [
     'createBudget'                               => 'New budget',
     'inactiveBudgets'                            => 'Inactive budgets',
     'without_budget_between'                     => 'Transactions without a budget between :start and :end',
-    'budget_in_month'                            => ':name in :month',
     'delete_budget'                              => 'Delete budget ":name"',
     'deleted_budget'                             => 'Deleted budget ":name"',
     'edit_budget'                                => 'Edit budget ":name"',
@@ -597,8 +566,6 @@ return [
     'select_more_than_one_category'              => 'Please select more than one category',
     'select_more_than_one_budget'                => 'Please select more than one budget',
     'select_more_than_one_tag'                   => 'Please select more than one tag',
-    'from_to'                                    => 'From :start to :end',
-    'from_to_breadcrumb'                         => 'from :start to :end',
     'account_default_currency'                   => 'If you select another currency, new transactions from this account will have this currency pre-selected.',
 
     // categories:
@@ -656,8 +623,6 @@ return [
     'yourAccounts'                               => 'Your accounts',
     'budgetsAndSpending'                         => 'Budgets and spending',
     'savings'                                    => 'Savings',
-    'markAsSavingsToContinue'                    => 'Označite ta premoženjski račun kot "varčevalni račun" da zapolnite ta okvir',
-    'createPiggyToContinue'                      => 'Create piggy banks to fill this panel.',
     'newWithdrawal'                              => 'New expense',
     'newDeposit'                                 => 'New deposit',
     'newTransfer'                                => 'New transfer',
@@ -665,8 +630,6 @@ return [
     'moneyOut'                                   => 'Money out',
     'billsToPay'                                 => 'Bills to pay',
     'billsPaid'                                  => 'Bills paid',
-    'divided'                                    => 'divided',
-    'toDivide'                                   => 'left to divide',
 
     // menu and titles, should be recycled as often as possible:
     'currency'                                   => 'Currency',
@@ -726,20 +689,11 @@ return [
     'reports_can_bookmark'                       => 'Remember that reports can be bookmarked.',
     'incomeVsExpenses'                           => 'prihodki napram odhodkom',
     'accountBalances'                            => 'Account balances',
-    'balanceStartOfYear'                         => 'Balance at start of year',
-    'balanceEndOfYear'                           => 'Balance at end of year',
-    'balanceStartOfMonth'                        => 'Balance at start of month',
-    'balanceEndOfMonth'                          => 'Balance at end of month',
     'balanceStart'                               => 'Balance at start of period',
     'balanceEnd'                                 => 'Balance at end of period',
-    'reportsOwnAccounts'                         => 'Reports for your own accounts',
-    'reportsOwnAccountsAndShared'                => 'Reports for your own accounts and shared accounts',
     'splitByAccount'                             => 'Split by account',
-    'balancedByTransfersAndTags'                 => 'Balanced by transfers and tags',
     'coveredWithTags'                            => 'Covered with tags',
     'leftUnbalanced'                             => 'Left unbalanced',
-    'expectedBalance'                            => 'Expected balance',
-    'outsideOfBudgets'                           => 'Outside of budgets',
     'leftInBudget'                               => 'Left in budget',
     'sumOfSums'                                  => 'Sum of sums',
     'noCategory'                                 => '(no category)',
@@ -752,19 +706,12 @@ return [
     'topX'                                       => 'top :number',
     'show_full_list'                             => 'Show entire list',
     'show_only_top'                              => 'Show only top :number',
-    'sum_of_year'                                => 'Sum of year',
-    'sum_of_years'                               => 'Sum of years',
-    'average_of_year'                            => 'Average of year',
-    'average_of_years'                           => 'Average of years',
-    'categories_earned_in_year'                  => 'Categories (by earnings)',
-    'categories_spent_in_year'                   => 'Categories (by spendings)',
     'report_type'                                => 'Report type',
     'report_type_default'                        => 'Default financial report',
     'report_type_audit'                          => 'Transaction history overview (audit)',
     'report_type_category'                       => 'Category report',
     'report_type_budget'                         => 'Budget report',
     'report_type_tag'                            => 'Tag report',
-    'report_type_meta-history'                   => 'Categories, budgets and bills overview',
     'more_info_help'                             => 'More information about these types of reports can be found in the help pages. Press the (?) icon in the top right corner.',
     'report_included_accounts'                   => 'Included accounts',
     'report_date_range'                          => 'Date range',
@@ -817,7 +764,6 @@ return [
 
     // charts:
     'chart'                                      => 'Chart',
-    'dayOfMonth'                                 => 'Day of the month',
     'month'                                      => 'Month',
     'budget'                                     => 'Budget',
     'spent'                                      => 'Spent',
@@ -838,7 +784,6 @@ return [
     'budgeted'                                   => 'Budgeted',
     'period'                                     => 'Period',
     'balance'                                    => 'Balance',
-    'summary'                                    => 'Summary',
     'sum'                                        => 'Sum',
     'average'                                    => 'Average',
     'balanceFor'                                 => 'Balance for :name',
@@ -871,18 +816,13 @@ return [
     'start_date'                 => 'Start date',
     'target_date'                => 'Target date',
     'no_target_date'             => 'No target date',
-    'todo'                       => 'to do',
     'table'                      => 'Table',
-    'piggy_bank_not_exists'      => 'Piggy bank no longer exists.',
-    'add_any_amount_to_piggy'    => 'Add money to this piggy bank to reach your target of :amount.',
-    'add_set_amount_to_piggy'    => 'Add :amount to fill this piggy bank on :date',
     'delete_piggy_bank'          => 'Delete piggy bank ":name"',
     'cannot_add_amount_piggy'    => 'Could not add :amount to ":name".',
     'cannot_remove_from_piggy'   => 'Could not remove :amount from ":name".',
     'deleted_piggy_bank'         => 'Deleted piggy bank ":name"',
     'added_amount_to_piggy'      => 'Added :amount to ":name"',
     'removed_amount_from_piggy'  => 'Removed :amount from ":name"',
-    'cannot_remove_amount_piggy' => 'Could not remove :amount from ":name".',
 
     // tags
     'regular_tag'                => 'Just a regular tag.',
@@ -894,11 +834,6 @@ return [
     'edit_tag'                   => 'Edit tag ":tag"',
     'updated_tag'                => 'Updated tag ":tag"',
     'created_tag'                => 'Tag ":tag" has been created!',
-    'no_year'                    => 'No year set',
-    'no_month'                   => 'No month set',
-    'tag_title_nothing'          => 'Default tags',
-    'tag_title_balancingAct'     => 'Balancing act tags',
-    'tag_title_advancePayment'   => 'Advance payment tags',
 
     'transaction_journal_information'       => 'Transaction information',
     'transaction_journal_meta'              => 'Meta information',
@@ -925,13 +860,9 @@ return [
     'budgets_with_limits'                   => 'budget(s) with configured amount',
     'rule_or_rules'                         => 'rule(s)',
     'rulegroup_or_groups'                   => 'rule group(s)',
-    'setting_must_confirm_account'          => 'Account confirmation',
-    'setting_must_confirm_account_explain'  => 'When this setting is enabled, users must activate their account before it can be used.',
     'configuration_updated'                 => 'The configuration has been updated',
     'setting_is_demo_site'                  => 'Demo site',
     'setting_is_demo_site_explain'          => 'If you check this box, this installation will behave as if it is the demo site, which can have weird side effects.',
-    'setting_send_email_notifications'      => 'Send email notifications',
-    'setting_send_email_explain'            => 'Firefly III can send you email notifications about certain events. They will be sent to <code>:site_owner</code>. This email address can be set in the <code>.env</code> file.',
     'block_code_bounced'                    => 'Email message(s) bounced',
     'block_code_expired'                    => 'Demo account expired',
     'no_block_code'                         => 'No reason for block or user not blocked',
@@ -971,31 +902,9 @@ return [
 
 
     // split a transaction:
-    'transaction_meta_data'                 => 'Transaction meta-data',
-    'transaction_dates'                     => 'Transaction dates',
     'splits'                                => 'Splits',
-    'split_title_withdrawal'                => 'Split your new withdrawal',
-    'split_intro_one_withdrawal'            => 'Firefly supports the "splitting" of a withdrawal.',
-    'split_intro_two_withdrawal'            => 'It means that the amount of money you\'ve spent is divided between several destination expense accounts, budgets or categories.',
-    'split_intro_three_withdrawal'          => 'For example: you could split your :total groceries so you pay :split_one from your "daily groceries" budget and :split_two from your "cigarettes" budget.',
-    'split_table_intro_withdrawal'          => 'Split your withdrawal in as many things as you want. By default the transaction will not split, there is just one entry. Add as many splits as you want to, below. Remember that you should not deviate from your total amount. If you do, Firefly will warn you but not correct you.',
-    'store_splitted_withdrawal'             => 'Store splitted withdrawal',
-    'update_splitted_withdrawal'            => 'Update splitted withdrawal',
-    'split_title_deposit'                   => 'Split your new deposit',
-    'split_intro_one_deposit'               => 'Firefly supports the "splitting" of a deposit.',
-    'split_intro_two_deposit'               => 'It means that the amount of money you\'ve earned is divided between several source revenue accounts or categories.',
-    'split_intro_three_deposit'             => 'For example: you could split your :total salary so you get :split_one as your base salary and :split_two as a reimbursment for expenses made.',
-    'split_table_intro_deposit'             => 'Split your deposit in as many things as you want. By default the transaction will not split, there is just one entry. Add as many splits as you want to, below. Remember that you should not deviate from your total amount. If you do, Firefly will warn you but not correct you.',
-    'store_splitted_deposit'                => 'Store splitted deposit',
-    'split_title_transfer'                  => 'Split your new transfer',
-    'split_intro_one_transfer'              => 'Firefly supports the "splitting" of a transfer.',
-    'split_intro_two_transfer'              => 'It means that the amount of money you\'re moving is divided between several categories or piggy banks.',
-    'split_intro_three_transfer'            => 'For example: you could split your :total move so you get :split_one in one piggy bank and :split_two in another.',
-    'split_table_intro_transfer'            => 'Split your transfer in as many things as you want. By default the transaction will not split, there is just one entry. Add as many splits as you want to, below. Remember that you should not deviate from your total amount. If you do, Firefly will warn you but not correct you.',
-    'store_splitted_transfer'               => 'Store splitted transfer',
     'add_another_split'                     => 'Add another split',
     'split-transactions'                    => 'Split transactions',
-    'split-new-transaction'                 => 'Split a new transaction',
     'do_split'                              => 'Do a split',
     'split_this_withdrawal'                 => 'Split this withdrawal',
     'split_this_deposit'                    => 'Split this deposit',
@@ -1049,9 +958,6 @@ return [
     'import_status_finished_job'            => 'The transactions imported can be found in tag <a href=":link" class="label label-success" style="font-size:100%;font-weight:normal;">:tag</a>.',
     'import_with_key'                       => 'Import with key \':key\'',
 
-    // different states:
-    'import_status_job_running'             => 'The import is underway. Please be patient...',
-
     // sandstorm.io errors and messages:
     'sandstorm_not_available'               => 'This function is not available when you are using Firefly III within a Sandstorm.io environment.',
 

From be6757c2904c19c2b27972792ec6ad05403462be Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Thu, 24 Aug 2017 21:36:26 +0200
Subject: [PATCH 213/668] Fix some strings [skip ci]

---
 resources/lang/en_US/intro.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/resources/lang/en_US/intro.php b/resources/lang/en_US/intro.php
index 007d726e06..309040f434 100644
--- a/resources/lang/en_US/intro.php
+++ b/resources/lang/en_US/intro.php
@@ -44,15 +44,15 @@ return [
     'reports_report_audit_intro'            => 'This report will give you detailed insights in your asset accounts.',
     'reports_report_audit_optionsBox'       => 'Use these check boxes to show or hide the columns you are interested in.',
 
-    'reports_report_category_intro'                  => 'This report will give you insight in or multiple categories.',
+    'reports_report_category_intro'                  => 'This report will give you insight in one or multiple categories.',
     'reports_report_category_pieCharts'              => 'These charts will give you insight in expenses and income per category or per account.',
     'reports_report_category_incomeAndExpensesChart' => 'This chart shows you how your expenses and income per category.',
 
-    'reports_report_tag_intro'                  => 'This report will give you insight in or multiple tags.',
+    'reports_report_tag_intro'                  => 'This report will give you insight in one or multiple tags.',
     'reports_report_tag_pieCharts'              => 'These charts will give you insight in expenses and income per tag, account, category or budget.',
     'reports_report_tag_incomeAndExpensesChart' => 'This chart shows you how your expenses and income per tag.',
 
-    'reports_report_budget_intro'                             => 'This report will give you insight in or multiple budgets.',
+    'reports_report_budget_intro'                             => 'This report will give you insight in one or multiple budgets.',
     'reports_report_budget_pieCharts'                         => 'These charts will give you insight in expenses and income per budget or per account.',
     'reports_report_budget_incomeAndExpensesChart'            => 'This chart shows you how your expenses and income per budget.',
 

From 54bfbf174bdb7c7199fd04b2b87c1b727229fd55 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Thu, 24 Aug 2017 21:40:16 +0200
Subject: [PATCH 214/668] New translations intro.php (Chinese Traditional)

---
 resources/lang/zh_TW/intro.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/resources/lang/zh_TW/intro.php b/resources/lang/zh_TW/intro.php
index e945adcec8..dd186ef0fb 100644
--- a/resources/lang/zh_TW/intro.php
+++ b/resources/lang/zh_TW/intro.php
@@ -44,15 +44,15 @@ return [
     'reports_report_audit_intro'            => 'This report will give you detailed insights in your asset accounts.',
     'reports_report_audit_optionsBox'       => 'Use these check boxes to show or hide the columns you are interested in.',
 
-    'reports_report_category_intro'                  => 'This report will give you insight in or multiple categories.',
+    'reports_report_category_intro'                  => 'This report will give you insight in one or multiple categories.',
     'reports_report_category_pieCharts'              => 'These charts will give you insight in expenses and income per category or per account.',
     'reports_report_category_incomeAndExpensesChart' => 'This chart shows you how your expenses and income per category.',
 
-    'reports_report_tag_intro'                  => 'This report will give you insight in or multiple tags.',
+    'reports_report_tag_intro'                  => 'This report will give you insight in one or multiple tags.',
     'reports_report_tag_pieCharts'              => 'These charts will give you insight in expenses and income per tag, account, category or budget.',
     'reports_report_tag_incomeAndExpensesChart' => 'This chart shows you how your expenses and income per tag.',
 
-    'reports_report_budget_intro'                             => 'This report will give you insight in or multiple budgets.',
+    'reports_report_budget_intro'                             => 'This report will give you insight in one or multiple budgets.',
     'reports_report_budget_pieCharts'                         => 'These charts will give you insight in expenses and income per budget or per account.',
     'reports_report_budget_incomeAndExpensesChart'            => 'This chart shows you how your expenses and income per budget.',
 

From a6f78aad7319d2afc9cd335c00038e9dc39588e6 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Thu, 24 Aug 2017 21:40:17 +0200
Subject: [PATCH 215/668] New translations intro.php (Dutch)

---
 resources/lang/nl_NL/intro.php | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/resources/lang/nl_NL/intro.php b/resources/lang/nl_NL/intro.php
index dfac61180c..6bb8e01823 100644
--- a/resources/lang/nl_NL/intro.php
+++ b/resources/lang/nl_NL/intro.php
@@ -25,34 +25,34 @@ return [
     'accounts_create_asset_virtual'         => 'Soms is het handig om je betaalrekening een virtueel saldo te geven: een extra bedrag dat altijd bij het daadwerkelijke saldo wordt opgeteld.',
 
     // budgets index
-    'budgets_index_intro'                   => 'Budgets are used to manage your finances and form one of the core functions of Firefly III.',
-    'budgets_index_set_budget'              => 'Set your total budget for every period so Firefly can tell you if you have budgeted all available money.',
-    'budgets_index_see_expenses_bar'        => 'Spending money will slowly fill this bar.',
-    'budgets_index_navigate_periods'        => 'Navigate through periods to easily set budgets ahead of time.',
-    'budgets_index_new_budget'              => 'Create new budgets as you see fit.',
-    'budgets_index_list_of_budgets'         => 'Use this table to set the amounts for each budget and see how you are doing.',
+    'budgets_index_intro'                   => 'Budgetten worden gebruikt om je financiën te beheren en vormen een van de kernfuncties van Firefly III.',
+    'budgets_index_set_budget'              => 'Stel je totale budget voor elke periode in, zodat Firefly je kan vertellen of je alle beschikbare geld hebt gebudgetteerd.',
+    'budgets_index_see_expenses_bar'        => 'Het besteden van geld zal deze balk langzaam vullen.',
+    'budgets_index_navigate_periods'        => 'Navigeer door periodes heen om je budget vooraf te bepalen.',
+    'budgets_index_new_budget'              => 'Maak nieuwe budgetten naar wens.',
+    'budgets_index_list_of_budgets'         => 'Gebruik deze tabel om de bedragen voor elk budget vast te stellen en te zien hoe je er voor staat.',
 
     // reports (index)
-    'reports_index_intro'                   => 'Use these reports to get detailed insights in your finances.',
-    'reports_index_inputReportType'         => 'Pick a report type. Check out the help pages to see what each report shows you.',
-    'reports_index_inputAccountsSelect'     => 'You can exclude or include asset accounts as you see fit.',
-    'reports_index_inputDateRange'          => 'The selected date range is entirely up to you: from one day to 10 years.',
-    'reports_index_extra-options-box'       => 'Depending on the report you have selected, you can select extra filters and options here. Watch this box when you change report types.',
+    'reports_index_intro'                   => 'Gebruik deze rapporten om gedetailleerde inzicht in je financiën te krijgen.',
+    'reports_index_inputReportType'         => 'Kies een rapporttype. Bekijk de helppagina\'s om te zien wat elk rapport laat zien.',
+    'reports_index_inputAccountsSelect'     => 'Je kunt naar keuze betaalrekeningen meenemen (of niet).',
+    'reports_index_inputDateRange'          => 'Kies zelf een datumbereik: van een dag tot tien jaar.',
+    'reports_index_extra-options-box'       => 'Sommige rapporten bieden extra filters en opties. Kies een rapporttype en kijk of hier iets verandert.',
 
     // reports (reports)
-    'reports_report_default_intro'          => 'This report will give you a quick and comprehensive overview of your finances. If you wish to see anything else, please don\'t hestitate to contact me!',
+    'reports_report_default_intro'          => 'Dit rapport geeft je een snel en uitgebreid overzicht van je financiën. Laat het me weten als je hier dingen mist!',
     'reports_report_audit_intro'            => 'This report will give you detailed insights in your asset accounts.',
     'reports_report_audit_optionsBox'       => 'Use these check boxes to show or hide the columns you are interested in.',
 
-    'reports_report_category_intro'                  => 'This report will give you insight in or multiple categories.',
+    'reports_report_category_intro'                  => 'This report will give you insight in one or multiple categories.',
     'reports_report_category_pieCharts'              => 'These charts will give you insight in expenses and income per category or per account.',
     'reports_report_category_incomeAndExpensesChart' => 'This chart shows you how your expenses and income per category.',
 
-    'reports_report_tag_intro'                  => 'This report will give you insight in or multiple tags.',
+    'reports_report_tag_intro'                  => 'This report will give you insight in one or multiple tags.',
     'reports_report_tag_pieCharts'              => 'These charts will give you insight in expenses and income per tag, account, category or budget.',
     'reports_report_tag_incomeAndExpensesChart' => 'This chart shows you how your expenses and income per tag.',
 
-    'reports_report_budget_intro'                             => 'This report will give you insight in or multiple budgets.',
+    'reports_report_budget_intro'                             => 'This report will give you insight in one or multiple budgets.',
     'reports_report_budget_pieCharts'                         => 'These charts will give you insight in expenses and income per budget or per account.',
     'reports_report_budget_incomeAndExpensesChart'            => 'This chart shows you how your expenses and income per budget.',
 
@@ -75,7 +75,7 @@ return [
 
     // show piggy
     'piggy-banks_show_piggyChart'                             => 'This chart will show the history of this piggy bank.',
-    'piggy-banks_show_piggyDetails'                           => 'Some details about your piggy bank',
+    'piggy-banks_show_piggyDetails'                           => 'Enkele details over je spaarpotje',
     'piggy-banks_show_piggyEvents'                            => 'Any additions or removals are also listed here.',
 
     // bill index
@@ -97,7 +97,7 @@ return [
     // rules index
     'rules_index_intro'                                       => 'Firefly III allows you to manage rules, that will automagically be applied to any transaction you create or edit.',
     'rules_index_new_rule_group'                              => 'You can combine rules in groups for easier management.',
-    'rules_index_new_rule'                                    => 'Create as many rules as you like.',
+    'rules_index_new_rule'                                    => 'Maak zoveel regels als je wilt.',
     'rules_index_prio_buttons'                                => 'Order them any way you see fit.',
     'rules_index_test_buttons'                                => 'You can test your rules or apply them to existing transactions.',
     'rules_index_rule-triggers'                               => 'Rules have "triggers" and "actions" that you can order by drag-and-drop.',

From 55aa3f11985f04ca195d886e9b78ee50113e9275 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Thu, 24 Aug 2017 21:40:19 +0200
Subject: [PATCH 216/668] New translations intro.php (French)

---
 resources/lang/fr_FR/intro.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/resources/lang/fr_FR/intro.php b/resources/lang/fr_FR/intro.php
index e945adcec8..dd186ef0fb 100644
--- a/resources/lang/fr_FR/intro.php
+++ b/resources/lang/fr_FR/intro.php
@@ -44,15 +44,15 @@ return [
     'reports_report_audit_intro'            => 'This report will give you detailed insights in your asset accounts.',
     'reports_report_audit_optionsBox'       => 'Use these check boxes to show or hide the columns you are interested in.',
 
-    'reports_report_category_intro'                  => 'This report will give you insight in or multiple categories.',
+    'reports_report_category_intro'                  => 'This report will give you insight in one or multiple categories.',
     'reports_report_category_pieCharts'              => 'These charts will give you insight in expenses and income per category or per account.',
     'reports_report_category_incomeAndExpensesChart' => 'This chart shows you how your expenses and income per category.',
 
-    'reports_report_tag_intro'                  => 'This report will give you insight in or multiple tags.',
+    'reports_report_tag_intro'                  => 'This report will give you insight in one or multiple tags.',
     'reports_report_tag_pieCharts'              => 'These charts will give you insight in expenses and income per tag, account, category or budget.',
     'reports_report_tag_incomeAndExpensesChart' => 'This chart shows you how your expenses and income per tag.',
 
-    'reports_report_budget_intro'                             => 'This report will give you insight in or multiple budgets.',
+    'reports_report_budget_intro'                             => 'This report will give you insight in one or multiple budgets.',
     'reports_report_budget_pieCharts'                         => 'These charts will give you insight in expenses and income per budget or per account.',
     'reports_report_budget_incomeAndExpensesChart'            => 'This chart shows you how your expenses and income per budget.',
 

From 88a911f6b768e8af7e0919637a64242779be7949 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Thu, 24 Aug 2017 21:40:20 +0200
Subject: [PATCH 217/668] New translations intro.php (German)

---
 resources/lang/de_DE/intro.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/resources/lang/de_DE/intro.php b/resources/lang/de_DE/intro.php
index e945adcec8..dd186ef0fb 100644
--- a/resources/lang/de_DE/intro.php
+++ b/resources/lang/de_DE/intro.php
@@ -44,15 +44,15 @@ return [
     'reports_report_audit_intro'            => 'This report will give you detailed insights in your asset accounts.',
     'reports_report_audit_optionsBox'       => 'Use these check boxes to show or hide the columns you are interested in.',
 
-    'reports_report_category_intro'                  => 'This report will give you insight in or multiple categories.',
+    'reports_report_category_intro'                  => 'This report will give you insight in one or multiple categories.',
     'reports_report_category_pieCharts'              => 'These charts will give you insight in expenses and income per category or per account.',
     'reports_report_category_incomeAndExpensesChart' => 'This chart shows you how your expenses and income per category.',
 
-    'reports_report_tag_intro'                  => 'This report will give you insight in or multiple tags.',
+    'reports_report_tag_intro'                  => 'This report will give you insight in one or multiple tags.',
     'reports_report_tag_pieCharts'              => 'These charts will give you insight in expenses and income per tag, account, category or budget.',
     'reports_report_tag_incomeAndExpensesChart' => 'This chart shows you how your expenses and income per tag.',
 
-    'reports_report_budget_intro'                             => 'This report will give you insight in or multiple budgets.',
+    'reports_report_budget_intro'                             => 'This report will give you insight in one or multiple budgets.',
     'reports_report_budget_pieCharts'                         => 'These charts will give you insight in expenses and income per budget or per account.',
     'reports_report_budget_incomeAndExpensesChart'            => 'This chart shows you how your expenses and income per budget.',
 

From 59ff1ff856329c5c787a8f92679f254a1cd3df9e Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Thu, 24 Aug 2017 21:40:21 +0200
Subject: [PATCH 218/668] New translations intro.php (Slovenian)

---
 resources/lang/sl_SI/intro.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/resources/lang/sl_SI/intro.php b/resources/lang/sl_SI/intro.php
index e945adcec8..dd186ef0fb 100644
--- a/resources/lang/sl_SI/intro.php
+++ b/resources/lang/sl_SI/intro.php
@@ -44,15 +44,15 @@ return [
     'reports_report_audit_intro'            => 'This report will give you detailed insights in your asset accounts.',
     'reports_report_audit_optionsBox'       => 'Use these check boxes to show or hide the columns you are interested in.',
 
-    'reports_report_category_intro'                  => 'This report will give you insight in or multiple categories.',
+    'reports_report_category_intro'                  => 'This report will give you insight in one or multiple categories.',
     'reports_report_category_pieCharts'              => 'These charts will give you insight in expenses and income per category or per account.',
     'reports_report_category_incomeAndExpensesChart' => 'This chart shows you how your expenses and income per category.',
 
-    'reports_report_tag_intro'                  => 'This report will give you insight in or multiple tags.',
+    'reports_report_tag_intro'                  => 'This report will give you insight in one or multiple tags.',
     'reports_report_tag_pieCharts'              => 'These charts will give you insight in expenses and income per tag, account, category or budget.',
     'reports_report_tag_incomeAndExpensesChart' => 'This chart shows you how your expenses and income per tag.',
 
-    'reports_report_budget_intro'                             => 'This report will give you insight in or multiple budgets.',
+    'reports_report_budget_intro'                             => 'This report will give you insight in one or multiple budgets.',
     'reports_report_budget_pieCharts'                         => 'These charts will give you insight in expenses and income per budget or per account.',
     'reports_report_budget_incomeAndExpensesChart'            => 'This chart shows you how your expenses and income per budget.',
 

From b561d86410c4e5f4b9f794f6bad2df44d09571ee Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Thu, 24 Aug 2017 21:40:22 +0200
Subject: [PATCH 219/668] New translations intro.php (Spanish)

---
 resources/lang/es_ES/intro.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/resources/lang/es_ES/intro.php b/resources/lang/es_ES/intro.php
index e945adcec8..dd186ef0fb 100644
--- a/resources/lang/es_ES/intro.php
+++ b/resources/lang/es_ES/intro.php
@@ -44,15 +44,15 @@ return [
     'reports_report_audit_intro'            => 'This report will give you detailed insights in your asset accounts.',
     'reports_report_audit_optionsBox'       => 'Use these check boxes to show or hide the columns you are interested in.',
 
-    'reports_report_category_intro'                  => 'This report will give you insight in or multiple categories.',
+    'reports_report_category_intro'                  => 'This report will give you insight in one or multiple categories.',
     'reports_report_category_pieCharts'              => 'These charts will give you insight in expenses and income per category or per account.',
     'reports_report_category_incomeAndExpensesChart' => 'This chart shows you how your expenses and income per category.',
 
-    'reports_report_tag_intro'                  => 'This report will give you insight in or multiple tags.',
+    'reports_report_tag_intro'                  => 'This report will give you insight in one or multiple tags.',
     'reports_report_tag_pieCharts'              => 'These charts will give you insight in expenses and income per tag, account, category or budget.',
     'reports_report_tag_incomeAndExpensesChart' => 'This chart shows you how your expenses and income per tag.',
 
-    'reports_report_budget_intro'                             => 'This report will give you insight in or multiple budgets.',
+    'reports_report_budget_intro'                             => 'This report will give you insight in one or multiple budgets.',
     'reports_report_budget_pieCharts'                         => 'These charts will give you insight in expenses and income per budget or per account.',
     'reports_report_budget_incomeAndExpensesChart'            => 'This chart shows you how your expenses and income per budget.',
 

From 3abf949e3fb264347dbe0accabe4751423fdbb95 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Thu, 24 Aug 2017 21:40:24 +0200
Subject: [PATCH 220/668] New translations intro.php (Russian)

---
 resources/lang/ru_RU/intro.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/resources/lang/ru_RU/intro.php b/resources/lang/ru_RU/intro.php
index e945adcec8..dd186ef0fb 100644
--- a/resources/lang/ru_RU/intro.php
+++ b/resources/lang/ru_RU/intro.php
@@ -44,15 +44,15 @@ return [
     'reports_report_audit_intro'            => 'This report will give you detailed insights in your asset accounts.',
     'reports_report_audit_optionsBox'       => 'Use these check boxes to show or hide the columns you are interested in.',
 
-    'reports_report_category_intro'                  => 'This report will give you insight in or multiple categories.',
+    'reports_report_category_intro'                  => 'This report will give you insight in one or multiple categories.',
     'reports_report_category_pieCharts'              => 'These charts will give you insight in expenses and income per category or per account.',
     'reports_report_category_incomeAndExpensesChart' => 'This chart shows you how your expenses and income per category.',
 
-    'reports_report_tag_intro'                  => 'This report will give you insight in or multiple tags.',
+    'reports_report_tag_intro'                  => 'This report will give you insight in one or multiple tags.',
     'reports_report_tag_pieCharts'              => 'These charts will give you insight in expenses and income per tag, account, category or budget.',
     'reports_report_tag_incomeAndExpensesChart' => 'This chart shows you how your expenses and income per tag.',
 
-    'reports_report_budget_intro'                             => 'This report will give you insight in or multiple budgets.',
+    'reports_report_budget_intro'                             => 'This report will give you insight in one or multiple budgets.',
     'reports_report_budget_pieCharts'                         => 'These charts will give you insight in expenses and income per budget or per account.',
     'reports_report_budget_incomeAndExpensesChart'            => 'This chart shows you how your expenses and income per budget.',
 

From 24a84de463ad53e9700047371b3449b530a1d839 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Thu, 24 Aug 2017 21:40:25 +0200
Subject: [PATCH 221/668] New translations intro.php (Portuguese, Brazilian)

---
 resources/lang/pt_BR/intro.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/resources/lang/pt_BR/intro.php b/resources/lang/pt_BR/intro.php
index e945adcec8..dd186ef0fb 100644
--- a/resources/lang/pt_BR/intro.php
+++ b/resources/lang/pt_BR/intro.php
@@ -44,15 +44,15 @@ return [
     'reports_report_audit_intro'            => 'This report will give you detailed insights in your asset accounts.',
     'reports_report_audit_optionsBox'       => 'Use these check boxes to show or hide the columns you are interested in.',
 
-    'reports_report_category_intro'                  => 'This report will give you insight in or multiple categories.',
+    'reports_report_category_intro'                  => 'This report will give you insight in one or multiple categories.',
     'reports_report_category_pieCharts'              => 'These charts will give you insight in expenses and income per category or per account.',
     'reports_report_category_incomeAndExpensesChart' => 'This chart shows you how your expenses and income per category.',
 
-    'reports_report_tag_intro'                  => 'This report will give you insight in or multiple tags.',
+    'reports_report_tag_intro'                  => 'This report will give you insight in one or multiple tags.',
     'reports_report_tag_pieCharts'              => 'These charts will give you insight in expenses and income per tag, account, category or budget.',
     'reports_report_tag_incomeAndExpensesChart' => 'This chart shows you how your expenses and income per tag.',
 
-    'reports_report_budget_intro'                             => 'This report will give you insight in or multiple budgets.',
+    'reports_report_budget_intro'                             => 'This report will give you insight in one or multiple budgets.',
     'reports_report_budget_pieCharts'                         => 'These charts will give you insight in expenses and income per budget or per account.',
     'reports_report_budget_incomeAndExpensesChart'            => 'This chart shows you how your expenses and income per budget.',
 

From cad3921c95aebd1acb70b57153808937aecf7d6b Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Thu, 24 Aug 2017 21:40:27 +0200
Subject: [PATCH 222/668] New translations intro.php (Polish)

---
 resources/lang/pl_PL/intro.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/resources/lang/pl_PL/intro.php b/resources/lang/pl_PL/intro.php
index e945adcec8..dd186ef0fb 100644
--- a/resources/lang/pl_PL/intro.php
+++ b/resources/lang/pl_PL/intro.php
@@ -44,15 +44,15 @@ return [
     'reports_report_audit_intro'            => 'This report will give you detailed insights in your asset accounts.',
     'reports_report_audit_optionsBox'       => 'Use these check boxes to show or hide the columns you are interested in.',
 
-    'reports_report_category_intro'                  => 'This report will give you insight in or multiple categories.',
+    'reports_report_category_intro'                  => 'This report will give you insight in one or multiple categories.',
     'reports_report_category_pieCharts'              => 'These charts will give you insight in expenses and income per category or per account.',
     'reports_report_category_incomeAndExpensesChart' => 'This chart shows you how your expenses and income per category.',
 
-    'reports_report_tag_intro'                  => 'This report will give you insight in or multiple tags.',
+    'reports_report_tag_intro'                  => 'This report will give you insight in one or multiple tags.',
     'reports_report_tag_pieCharts'              => 'These charts will give you insight in expenses and income per tag, account, category or budget.',
     'reports_report_tag_incomeAndExpensesChart' => 'This chart shows you how your expenses and income per tag.',
 
-    'reports_report_budget_intro'                             => 'This report will give you insight in or multiple budgets.',
+    'reports_report_budget_intro'                             => 'This report will give you insight in one or multiple budgets.',
     'reports_report_budget_pieCharts'                         => 'These charts will give you insight in expenses and income per budget or per account.',
     'reports_report_budget_incomeAndExpensesChart'            => 'This chart shows you how your expenses and income per budget.',
 

From fe4b3c6f36f03c9c9c5bb5abf0618ee3ebf1fede Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Thu, 24 Aug 2017 21:40:49 +0200
Subject: [PATCH 223/668] New translations firefly.php (Dutch)

---
 resources/lang/nl_NL/firefly.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/lang/nl_NL/firefly.php b/resources/lang/nl_NL/firefly.php
index 808760d2b2..299ecac582 100644
--- a/resources/lang/nl_NL/firefly.php
+++ b/resources/lang/nl_NL/firefly.php
@@ -897,8 +897,8 @@ return [
     'this_deposit'                          => 'Deze inkomsten',
     'this_transfer'                         => 'Deze overschrijving',
     'overview_for_link'                     => 'Overzicht voor koppeltype ":name"',
-    'delete_journal_link'                   => 'Delete the link between <a href=":source_link">:source</a> and <a href=":destination_link">:destination</a>',
-    'deleted_link'                          => 'Deleted link',
+    'delete_journal_link'                   => 'Verwijder de koppeling tussen <a href=":source_link">:source</a> en <a href=":destination_link">:destination</a>',
+    'deleted_link'                          => 'Koppeling verwijderd',
 
 
     // split a transaction:

From b829e5c0f60dde940cafb597f3179501d5c886d1 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Fri, 25 Aug 2017 06:20:06 +0200
Subject: [PATCH 224/668] New translations intro.php (Dutch)

---
 resources/lang/nl_NL/intro.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/resources/lang/nl_NL/intro.php b/resources/lang/nl_NL/intro.php
index 6bb8e01823..ac022d6046 100644
--- a/resources/lang/nl_NL/intro.php
+++ b/resources/lang/nl_NL/intro.php
@@ -41,11 +41,11 @@ return [
 
     // reports (reports)
     'reports_report_default_intro'          => 'Dit rapport geeft je een snel en uitgebreid overzicht van je financiën. Laat het me weten als je hier dingen mist!',
-    'reports_report_audit_intro'            => 'This report will give you detailed insights in your asset accounts.',
-    'reports_report_audit_optionsBox'       => 'Use these check boxes to show or hide the columns you are interested in.',
+    'reports_report_audit_intro'            => 'Dit rapport geeft je gedetailleerde inzichten in je betaalrekeningen.',
+    'reports_report_audit_optionsBox'       => 'Gebruik deze vinkjes om voor jou interessante kolommen te laten zien of te verbergen.',
 
-    'reports_report_category_intro'                  => 'This report will give you insight in one or multiple categories.',
-    'reports_report_category_pieCharts'              => 'These charts will give you insight in expenses and income per category or per account.',
+    'reports_report_category_intro'                  => 'Dit rapport geeft je inzicht in één of meerdere categorieën.',
+    'reports_report_category_pieCharts'              => 'Deze tabellen geven j inzicht in uitgaven en inkomsten per categorie of per account.',
     'reports_report_category_incomeAndExpensesChart' => 'This chart shows you how your expenses and income per category.',
 
     'reports_report_tag_intro'                  => 'This report will give you insight in one or multiple tags.',

From 972480269aa995d52c9906bb0463efd5de7dfcae Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Fri, 25 Aug 2017 06:21:26 +0200
Subject: [PATCH 225/668] Updated strings [skip ci]

---
 resources/lang/en_US/intro.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/resources/lang/en_US/intro.php b/resources/lang/en_US/intro.php
index 309040f434..9e1dec3657 100644
--- a/resources/lang/en_US/intro.php
+++ b/resources/lang/en_US/intro.php
@@ -46,15 +46,15 @@ return [
 
     'reports_report_category_intro'                  => 'This report will give you insight in one or multiple categories.',
     'reports_report_category_pieCharts'              => 'These charts will give you insight in expenses and income per category or per account.',
-    'reports_report_category_incomeAndExpensesChart' => 'This chart shows you how your expenses and income per category.',
+    'reports_report_category_incomeAndExpensesChart' => 'This chart shows your expenses and income per category.',
 
     'reports_report_tag_intro'                  => 'This report will give you insight in one or multiple tags.',
     'reports_report_tag_pieCharts'              => 'These charts will give you insight in expenses and income per tag, account, category or budget.',
-    'reports_report_tag_incomeAndExpensesChart' => 'This chart shows you how your expenses and income per tag.',
+    'reports_report_tag_incomeAndExpensesChart' => 'This chart shows your expenses and income per tag.',
 
     'reports_report_budget_intro'                             => 'This report will give you insight in one or multiple budgets.',
     'reports_report_budget_pieCharts'                         => 'These charts will give you insight in expenses and income per budget or per account.',
-    'reports_report_budget_incomeAndExpensesChart'            => 'This chart shows you how your expenses and income per budget.',
+    'reports_report_budget_incomeAndExpensesChart'            => 'This chart shows your expenses and income per budget.',
 
     // create transaction
     'transactions_create_switch_box'                          => 'Use these buttons to quickly switch the type of transaction you wish to save.',

From 86aa27d92c8787facd2821bc51d9e2278a25d962 Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Fri, 25 Aug 2017 06:23:01 +0200
Subject: [PATCH 226/668] Fix language string [skip ci]

---
 resources/lang/en_US/intro.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/lang/en_US/intro.php b/resources/lang/en_US/intro.php
index 9e1dec3657..02a0eead23 100644
--- a/resources/lang/en_US/intro.php
+++ b/resources/lang/en_US/intro.php
@@ -53,8 +53,8 @@ return [
     'reports_report_tag_incomeAndExpensesChart' => 'This chart shows your expenses and income per tag.',
 
     'reports_report_budget_intro'                             => 'This report will give you insight in one or multiple budgets.',
-    'reports_report_budget_pieCharts'                         => 'These charts will give you insight in expenses and income per budget or per account.',
-    'reports_report_budget_incomeAndExpensesChart'            => 'This chart shows your expenses and income per budget.',
+    'reports_report_budget_pieCharts'                         => 'These charts will give you insight in expenses per budget or per account.',
+    'reports_report_budget_incomeAndExpensesChart'            => 'This chart shows your expenses per budget.',
 
     // create transaction
     'transactions_create_switch_box'                          => 'Use these buttons to quickly switch the type of transaction you wish to save.',

From f63be8a47d10b856e92784d1b03715c7dab49483 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Fri, 25 Aug 2017 06:27:14 +0200
Subject: [PATCH 227/668] New translations intro.php (Chinese Traditional)

---
 resources/lang/zh_TW/intro.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/resources/lang/zh_TW/intro.php b/resources/lang/zh_TW/intro.php
index dd186ef0fb..c161cef362 100644
--- a/resources/lang/zh_TW/intro.php
+++ b/resources/lang/zh_TW/intro.php
@@ -46,15 +46,15 @@ return [
 
     'reports_report_category_intro'                  => 'This report will give you insight in one or multiple categories.',
     'reports_report_category_pieCharts'              => 'These charts will give you insight in expenses and income per category or per account.',
-    'reports_report_category_incomeAndExpensesChart' => 'This chart shows you how your expenses and income per category.',
+    'reports_report_category_incomeAndExpensesChart' => 'This chart shows your expenses and income per category.',
 
     'reports_report_tag_intro'                  => 'This report will give you insight in one or multiple tags.',
     'reports_report_tag_pieCharts'              => 'These charts will give you insight in expenses and income per tag, account, category or budget.',
-    'reports_report_tag_incomeAndExpensesChart' => 'This chart shows you how your expenses and income per tag.',
+    'reports_report_tag_incomeAndExpensesChart' => 'This chart shows your expenses and income per tag.',
 
     'reports_report_budget_intro'                             => 'This report will give you insight in one or multiple budgets.',
-    'reports_report_budget_pieCharts'                         => 'These charts will give you insight in expenses and income per budget or per account.',
-    'reports_report_budget_incomeAndExpensesChart'            => 'This chart shows you how your expenses and income per budget.',
+    'reports_report_budget_pieCharts'                         => 'These charts will give you insight in expenses per budget or per account.',
+    'reports_report_budget_incomeAndExpensesChart'            => 'This chart shows your expenses per budget.',
 
     // create transaction
     'transactions_create_switch_box'                          => 'Use these buttons to quickly switch the type of transaction you wish to save.',

From 7abedd176f0d3fb0289916cd5eb5af89b5173bfd Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Fri, 25 Aug 2017 06:27:15 +0200
Subject: [PATCH 228/668] New translations intro.php (Dutch)

---
 resources/lang/nl_NL/intro.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/resources/lang/nl_NL/intro.php b/resources/lang/nl_NL/intro.php
index ac022d6046..41ce69940f 100644
--- a/resources/lang/nl_NL/intro.php
+++ b/resources/lang/nl_NL/intro.php
@@ -45,20 +45,20 @@ return [
     'reports_report_audit_optionsBox'       => 'Gebruik deze vinkjes om voor jou interessante kolommen te laten zien of te verbergen.',
 
     'reports_report_category_intro'                  => 'Dit rapport geeft je inzicht in één of meerdere categorieën.',
-    'reports_report_category_pieCharts'              => 'Deze tabellen geven j inzicht in uitgaven en inkomsten per categorie of per account.',
-    'reports_report_category_incomeAndExpensesChart' => 'This chart shows you how your expenses and income per category.',
+    'reports_report_category_pieCharts'              => 'Deze grafieken geven je inzicht in de uitgaven en inkomsten per categorie of per account.',
+    'reports_report_category_incomeAndExpensesChart' => 'This chart shows your expenses and income per category.',
 
-    'reports_report_tag_intro'                  => 'This report will give you insight in one or multiple tags.',
+    'reports_report_tag_intro'                  => 'Dit rapport geeft je inzicht in één of meerdere tags.',
     'reports_report_tag_pieCharts'              => 'These charts will give you insight in expenses and income per tag, account, category or budget.',
-    'reports_report_tag_incomeAndExpensesChart' => 'This chart shows you how your expenses and income per tag.',
+    'reports_report_tag_incomeAndExpensesChart' => 'This chart shows your expenses and income per tag.',
 
-    'reports_report_budget_intro'                             => 'This report will give you insight in one or multiple budgets.',
-    'reports_report_budget_pieCharts'                         => 'These charts will give you insight in expenses and income per budget or per account.',
-    'reports_report_budget_incomeAndExpensesChart'            => 'This chart shows you how your expenses and income per budget.',
+    'reports_report_budget_intro'                             => 'Dit rapport geeft je inzicht in één of meerdere budgetten.',
+    'reports_report_budget_pieCharts'                         => 'These charts will give you insight in expenses per budget or per account.',
+    'reports_report_budget_incomeAndExpensesChart'            => 'This chart shows your expenses per budget.',
 
     // create transaction
-    'transactions_create_switch_box'                          => 'Use these buttons to quickly switch the type of transaction you wish to save.',
-    'transactions_create_ffInput_category'                    => 'You can freely type in this field. Previously created categories will be suggested.',
+    'transactions_create_switch_box'                          => 'Gebruik deze knoppen om snel van transactietype te wisselen.',
+    'transactions_create_ffInput_category'                    => 'Je kan in dit veld vrij typen. Eerder gemaakte categorieën komen als suggestie naar boven.',
     'transactions_create_withdrawal_ffInput_budget'           => 'Link your withdrawal to a budget for better financial control.',
     'transactions_create_withdrawal_currency_dropdown_amount' => 'Use this dropdown when your withdrawal is in another currency.',
     'transactions_create_deposit_currency_dropdown_amount'    => 'Use this dropdown when your deposit is in another currency.',

From a1727625589318da5e920ea436ea89e6165daf13 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Fri, 25 Aug 2017 06:27:17 +0200
Subject: [PATCH 229/668] New translations intro.php (French)

---
 resources/lang/fr_FR/intro.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/resources/lang/fr_FR/intro.php b/resources/lang/fr_FR/intro.php
index dd186ef0fb..c161cef362 100644
--- a/resources/lang/fr_FR/intro.php
+++ b/resources/lang/fr_FR/intro.php
@@ -46,15 +46,15 @@ return [
 
     'reports_report_category_intro'                  => 'This report will give you insight in one or multiple categories.',
     'reports_report_category_pieCharts'              => 'These charts will give you insight in expenses and income per category or per account.',
-    'reports_report_category_incomeAndExpensesChart' => 'This chart shows you how your expenses and income per category.',
+    'reports_report_category_incomeAndExpensesChart' => 'This chart shows your expenses and income per category.',
 
     'reports_report_tag_intro'                  => 'This report will give you insight in one or multiple tags.',
     'reports_report_tag_pieCharts'              => 'These charts will give you insight in expenses and income per tag, account, category or budget.',
-    'reports_report_tag_incomeAndExpensesChart' => 'This chart shows you how your expenses and income per tag.',
+    'reports_report_tag_incomeAndExpensesChart' => 'This chart shows your expenses and income per tag.',
 
     'reports_report_budget_intro'                             => 'This report will give you insight in one or multiple budgets.',
-    'reports_report_budget_pieCharts'                         => 'These charts will give you insight in expenses and income per budget or per account.',
-    'reports_report_budget_incomeAndExpensesChart'            => 'This chart shows you how your expenses and income per budget.',
+    'reports_report_budget_pieCharts'                         => 'These charts will give you insight in expenses per budget or per account.',
+    'reports_report_budget_incomeAndExpensesChart'            => 'This chart shows your expenses per budget.',
 
     // create transaction
     'transactions_create_switch_box'                          => 'Use these buttons to quickly switch the type of transaction you wish to save.',

From 32d6951c34ea6180202a9a4eb4ab40e2f9335f5b Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Fri, 25 Aug 2017 06:27:18 +0200
Subject: [PATCH 230/668] New translations intro.php (German)

---
 resources/lang/de_DE/intro.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/resources/lang/de_DE/intro.php b/resources/lang/de_DE/intro.php
index dd186ef0fb..c161cef362 100644
--- a/resources/lang/de_DE/intro.php
+++ b/resources/lang/de_DE/intro.php
@@ -46,15 +46,15 @@ return [
 
     'reports_report_category_intro'                  => 'This report will give you insight in one or multiple categories.',
     'reports_report_category_pieCharts'              => 'These charts will give you insight in expenses and income per category or per account.',
-    'reports_report_category_incomeAndExpensesChart' => 'This chart shows you how your expenses and income per category.',
+    'reports_report_category_incomeAndExpensesChart' => 'This chart shows your expenses and income per category.',
 
     'reports_report_tag_intro'                  => 'This report will give you insight in one or multiple tags.',
     'reports_report_tag_pieCharts'              => 'These charts will give you insight in expenses and income per tag, account, category or budget.',
-    'reports_report_tag_incomeAndExpensesChart' => 'This chart shows you how your expenses and income per tag.',
+    'reports_report_tag_incomeAndExpensesChart' => 'This chart shows your expenses and income per tag.',
 
     'reports_report_budget_intro'                             => 'This report will give you insight in one or multiple budgets.',
-    'reports_report_budget_pieCharts'                         => 'These charts will give you insight in expenses and income per budget or per account.',
-    'reports_report_budget_incomeAndExpensesChart'            => 'This chart shows you how your expenses and income per budget.',
+    'reports_report_budget_pieCharts'                         => 'These charts will give you insight in expenses per budget or per account.',
+    'reports_report_budget_incomeAndExpensesChart'            => 'This chart shows your expenses per budget.',
 
     // create transaction
     'transactions_create_switch_box'                          => 'Use these buttons to quickly switch the type of transaction you wish to save.',

From 8af45e8091f7c9116f988ded4d537b80d2c6a5fd Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Fri, 25 Aug 2017 06:27:20 +0200
Subject: [PATCH 231/668] New translations intro.php (Slovenian)

---
 resources/lang/sl_SI/intro.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/resources/lang/sl_SI/intro.php b/resources/lang/sl_SI/intro.php
index dd186ef0fb..c161cef362 100644
--- a/resources/lang/sl_SI/intro.php
+++ b/resources/lang/sl_SI/intro.php
@@ -46,15 +46,15 @@ return [
 
     'reports_report_category_intro'                  => 'This report will give you insight in one or multiple categories.',
     'reports_report_category_pieCharts'              => 'These charts will give you insight in expenses and income per category or per account.',
-    'reports_report_category_incomeAndExpensesChart' => 'This chart shows you how your expenses and income per category.',
+    'reports_report_category_incomeAndExpensesChart' => 'This chart shows your expenses and income per category.',
 
     'reports_report_tag_intro'                  => 'This report will give you insight in one or multiple tags.',
     'reports_report_tag_pieCharts'              => 'These charts will give you insight in expenses and income per tag, account, category or budget.',
-    'reports_report_tag_incomeAndExpensesChart' => 'This chart shows you how your expenses and income per tag.',
+    'reports_report_tag_incomeAndExpensesChart' => 'This chart shows your expenses and income per tag.',
 
     'reports_report_budget_intro'                             => 'This report will give you insight in one or multiple budgets.',
-    'reports_report_budget_pieCharts'                         => 'These charts will give you insight in expenses and income per budget or per account.',
-    'reports_report_budget_incomeAndExpensesChart'            => 'This chart shows you how your expenses and income per budget.',
+    'reports_report_budget_pieCharts'                         => 'These charts will give you insight in expenses per budget or per account.',
+    'reports_report_budget_incomeAndExpensesChart'            => 'This chart shows your expenses per budget.',
 
     // create transaction
     'transactions_create_switch_box'                          => 'Use these buttons to quickly switch the type of transaction you wish to save.',

From ebf4395bc9137be2b1781fee21d4064772932196 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Fri, 25 Aug 2017 06:27:21 +0200
Subject: [PATCH 232/668] New translations intro.php (Spanish)

---
 resources/lang/es_ES/intro.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/resources/lang/es_ES/intro.php b/resources/lang/es_ES/intro.php
index dd186ef0fb..c161cef362 100644
--- a/resources/lang/es_ES/intro.php
+++ b/resources/lang/es_ES/intro.php
@@ -46,15 +46,15 @@ return [
 
     'reports_report_category_intro'                  => 'This report will give you insight in one or multiple categories.',
     'reports_report_category_pieCharts'              => 'These charts will give you insight in expenses and income per category or per account.',
-    'reports_report_category_incomeAndExpensesChart' => 'This chart shows you how your expenses and income per category.',
+    'reports_report_category_incomeAndExpensesChart' => 'This chart shows your expenses and income per category.',
 
     'reports_report_tag_intro'                  => 'This report will give you insight in one or multiple tags.',
     'reports_report_tag_pieCharts'              => 'These charts will give you insight in expenses and income per tag, account, category or budget.',
-    'reports_report_tag_incomeAndExpensesChart' => 'This chart shows you how your expenses and income per tag.',
+    'reports_report_tag_incomeAndExpensesChart' => 'This chart shows your expenses and income per tag.',
 
     'reports_report_budget_intro'                             => 'This report will give you insight in one or multiple budgets.',
-    'reports_report_budget_pieCharts'                         => 'These charts will give you insight in expenses and income per budget or per account.',
-    'reports_report_budget_incomeAndExpensesChart'            => 'This chart shows you how your expenses and income per budget.',
+    'reports_report_budget_pieCharts'                         => 'These charts will give you insight in expenses per budget or per account.',
+    'reports_report_budget_incomeAndExpensesChart'            => 'This chart shows your expenses per budget.',
 
     // create transaction
     'transactions_create_switch_box'                          => 'Use these buttons to quickly switch the type of transaction you wish to save.',

From acb15e52093bd4cba71b6f03a71b6fa0c56e11b9 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Fri, 25 Aug 2017 06:27:22 +0200
Subject: [PATCH 233/668] New translations intro.php (Russian)

---
 resources/lang/ru_RU/intro.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/resources/lang/ru_RU/intro.php b/resources/lang/ru_RU/intro.php
index dd186ef0fb..c161cef362 100644
--- a/resources/lang/ru_RU/intro.php
+++ b/resources/lang/ru_RU/intro.php
@@ -46,15 +46,15 @@ return [
 
     'reports_report_category_intro'                  => 'This report will give you insight in one or multiple categories.',
     'reports_report_category_pieCharts'              => 'These charts will give you insight in expenses and income per category or per account.',
-    'reports_report_category_incomeAndExpensesChart' => 'This chart shows you how your expenses and income per category.',
+    'reports_report_category_incomeAndExpensesChart' => 'This chart shows your expenses and income per category.',
 
     'reports_report_tag_intro'                  => 'This report will give you insight in one or multiple tags.',
     'reports_report_tag_pieCharts'              => 'These charts will give you insight in expenses and income per tag, account, category or budget.',
-    'reports_report_tag_incomeAndExpensesChart' => 'This chart shows you how your expenses and income per tag.',
+    'reports_report_tag_incomeAndExpensesChart' => 'This chart shows your expenses and income per tag.',
 
     'reports_report_budget_intro'                             => 'This report will give you insight in one or multiple budgets.',
-    'reports_report_budget_pieCharts'                         => 'These charts will give you insight in expenses and income per budget or per account.',
-    'reports_report_budget_incomeAndExpensesChart'            => 'This chart shows you how your expenses and income per budget.',
+    'reports_report_budget_pieCharts'                         => 'These charts will give you insight in expenses per budget or per account.',
+    'reports_report_budget_incomeAndExpensesChart'            => 'This chart shows your expenses per budget.',
 
     // create transaction
     'transactions_create_switch_box'                          => 'Use these buttons to quickly switch the type of transaction you wish to save.',

From 62a854c2ea2b3456520eb7d0ea8083c7cf4bd61e Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Fri, 25 Aug 2017 06:27:24 +0200
Subject: [PATCH 234/668] New translations intro.php (Portuguese, Brazilian)

---
 resources/lang/pt_BR/intro.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/resources/lang/pt_BR/intro.php b/resources/lang/pt_BR/intro.php
index dd186ef0fb..c161cef362 100644
--- a/resources/lang/pt_BR/intro.php
+++ b/resources/lang/pt_BR/intro.php
@@ -46,15 +46,15 @@ return [
 
     'reports_report_category_intro'                  => 'This report will give you insight in one or multiple categories.',
     'reports_report_category_pieCharts'              => 'These charts will give you insight in expenses and income per category or per account.',
-    'reports_report_category_incomeAndExpensesChart' => 'This chart shows you how your expenses and income per category.',
+    'reports_report_category_incomeAndExpensesChart' => 'This chart shows your expenses and income per category.',
 
     'reports_report_tag_intro'                  => 'This report will give you insight in one or multiple tags.',
     'reports_report_tag_pieCharts'              => 'These charts will give you insight in expenses and income per tag, account, category or budget.',
-    'reports_report_tag_incomeAndExpensesChart' => 'This chart shows you how your expenses and income per tag.',
+    'reports_report_tag_incomeAndExpensesChart' => 'This chart shows your expenses and income per tag.',
 
     'reports_report_budget_intro'                             => 'This report will give you insight in one or multiple budgets.',
-    'reports_report_budget_pieCharts'                         => 'These charts will give you insight in expenses and income per budget or per account.',
-    'reports_report_budget_incomeAndExpensesChart'            => 'This chart shows you how your expenses and income per budget.',
+    'reports_report_budget_pieCharts'                         => 'These charts will give you insight in expenses per budget or per account.',
+    'reports_report_budget_incomeAndExpensesChart'            => 'This chart shows your expenses per budget.',
 
     // create transaction
     'transactions_create_switch_box'                          => 'Use these buttons to quickly switch the type of transaction you wish to save.',

From 58db856b9d2f8cfeeef25d8d653b29b1e3a2ac0f Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Fri, 25 Aug 2017 06:27:25 +0200
Subject: [PATCH 235/668] New translations intro.php (Polish)

---
 resources/lang/pl_PL/intro.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/resources/lang/pl_PL/intro.php b/resources/lang/pl_PL/intro.php
index dd186ef0fb..c161cef362 100644
--- a/resources/lang/pl_PL/intro.php
+++ b/resources/lang/pl_PL/intro.php
@@ -46,15 +46,15 @@ return [
 
     'reports_report_category_intro'                  => 'This report will give you insight in one or multiple categories.',
     'reports_report_category_pieCharts'              => 'These charts will give you insight in expenses and income per category or per account.',
-    'reports_report_category_incomeAndExpensesChart' => 'This chart shows you how your expenses and income per category.',
+    'reports_report_category_incomeAndExpensesChart' => 'This chart shows your expenses and income per category.',
 
     'reports_report_tag_intro'                  => 'This report will give you insight in one or multiple tags.',
     'reports_report_tag_pieCharts'              => 'These charts will give you insight in expenses and income per tag, account, category or budget.',
-    'reports_report_tag_incomeAndExpensesChart' => 'This chart shows you how your expenses and income per tag.',
+    'reports_report_tag_incomeAndExpensesChart' => 'This chart shows your expenses and income per tag.',
 
     'reports_report_budget_intro'                             => 'This report will give you insight in one or multiple budgets.',
-    'reports_report_budget_pieCharts'                         => 'These charts will give you insight in expenses and income per budget or per account.',
-    'reports_report_budget_incomeAndExpensesChart'            => 'This chart shows you how your expenses and income per budget.',
+    'reports_report_budget_pieCharts'                         => 'These charts will give you insight in expenses per budget or per account.',
+    'reports_report_budget_incomeAndExpensesChart'            => 'This chart shows your expenses per budget.',
 
     // create transaction
     'transactions_create_switch_box'                          => 'Use these buttons to quickly switch the type of transaction you wish to save.',

From 7fe2ed81e21e605798cc35b6ec5252473cf6599c Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Fri, 25 Aug 2017 06:40:14 +0200
Subject: [PATCH 236/668] New translations intro.php (Dutch)

---
 resources/lang/nl_NL/intro.php | 52 +++++++++++++++++-----------------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/resources/lang/nl_NL/intro.php b/resources/lang/nl_NL/intro.php
index 41ce69940f..6ac54580e8 100644
--- a/resources/lang/nl_NL/intro.php
+++ b/resources/lang/nl_NL/intro.php
@@ -45,52 +45,52 @@ return [
     'reports_report_audit_optionsBox'       => 'Gebruik deze vinkjes om voor jou interessante kolommen te laten zien of te verbergen.',
 
     'reports_report_category_intro'                  => 'Dit rapport geeft je inzicht in één of meerdere categorieën.',
-    'reports_report_category_pieCharts'              => 'Deze grafieken geven je inzicht in de uitgaven en inkomsten per categorie of per account.',
-    'reports_report_category_incomeAndExpensesChart' => 'This chart shows your expenses and income per category.',
+    'reports_report_category_pieCharts'              => 'Deze grafieken geven je inzicht in de uitgaven en inkomsten per categorie of per rekening.',
+    'reports_report_category_incomeAndExpensesChart' => 'Deze grafiek toont je uitgaven en inkomsten per categorie.',
 
     'reports_report_tag_intro'                  => 'Dit rapport geeft je inzicht in één of meerdere tags.',
-    'reports_report_tag_pieCharts'              => 'These charts will give you insight in expenses and income per tag, account, category or budget.',
-    'reports_report_tag_incomeAndExpensesChart' => 'This chart shows your expenses and income per tag.',
+    'reports_report_tag_pieCharts'              => 'Deze grafieken geven je inzicht in de uitgaven en inkomsten per tag, rekening, categorie of budget.',
+    'reports_report_tag_incomeAndExpensesChart' => 'Deze grafiek toont je uitgaven en inkomsten per tag.',
 
     'reports_report_budget_intro'                             => 'Dit rapport geeft je inzicht in één of meerdere budgetten.',
-    'reports_report_budget_pieCharts'                         => 'These charts will give you insight in expenses per budget or per account.',
-    'reports_report_budget_incomeAndExpensesChart'            => 'This chart shows your expenses per budget.',
+    'reports_report_budget_pieCharts'                         => 'Deze grafieken geven je inzicht in de uitgaven en inkomsten per budget of per rekening.',
+    'reports_report_budget_incomeAndExpensesChart'            => 'Deze grafiek toont je uitgaven per budget.',
 
     // create transaction
     'transactions_create_switch_box'                          => 'Gebruik deze knoppen om snel van transactietype te wisselen.',
     'transactions_create_ffInput_category'                    => 'Je kan in dit veld vrij typen. Eerder gemaakte categorieën komen als suggestie naar boven.',
-    'transactions_create_withdrawal_ffInput_budget'           => 'Link your withdrawal to a budget for better financial control.',
-    'transactions_create_withdrawal_currency_dropdown_amount' => 'Use this dropdown when your withdrawal is in another currency.',
-    'transactions_create_deposit_currency_dropdown_amount'    => 'Use this dropdown when your deposit is in another currency.',
-    'transactions_create_transfer_ffInput_piggy_bank_id'      => 'Select a piggy bank and link this transfer to your savings.',
+    'transactions_create_withdrawal_ffInput_budget'           => 'Link je uitgave aan een budget voor een beter financieel overzicht.',
+    'transactions_create_withdrawal_currency_dropdown_amount' => 'Gebruik deze dropdown als je uitgave in een andere valuta is.',
+    'transactions_create_deposit_currency_dropdown_amount'    => 'Gebruik deze dropdown als je inkomsten in een andere valuta zijn.',
+    'transactions_create_transfer_ffInput_piggy_bank_id'      => 'Selecteer een spaarpotje en link deze overschrijving aan je spaargeld.',
 
     // piggy banks index:
-    'piggy-banks_index_saved'                                 => 'This field shows you how much you\'ve saved in each piggy bank.',
-    'piggy-banks_index_button'                                => 'Next to this progress bar are two buttons (+ and -) to add or remove money from each piggy bank.',
-    'piggy-banks_index_accountStatus'                         => 'For each asset account with at least one piggy bank the status is listed in this table.',
+    'piggy-banks_index_saved'                                 => 'Dit veld laat zien hoeveel geld er in elk spaarpotje zit.',
+    'piggy-banks_index_button'                                => 'Naast deze balk zitten twee knoppen (+ en -) om geld aan je spaarpotje toe te voegen, of er uit te halen.',
+    'piggy-banks_index_accountStatus'                         => 'Voor elke betaalrekening met minstens één spaarpotje zie je hier de status.',
 
     // create piggy
-    'piggy-banks_create_name'                                 => 'What is your goal? A new couch, a camera, money for emergencies?',
-    'piggy-banks_create_date'                                 => 'You can set a target date or a deadline for your piggy bank.',
+    'piggy-banks_create_name'                                 => 'Wat is je doel? Een nieuwe zithoek, een camera of geld voor noodgevallen?',
+    'piggy-banks_create_date'                                 => 'Je kan een doeldatum of een deadline voor je spaarpot instellen.',
 
     // show piggy
-    'piggy-banks_show_piggyChart'                             => 'This chart will show the history of this piggy bank.',
+    'piggy-banks_show_piggyChart'                             => 'Deze grafiek toont de geschiedenis van dit spaarpotje.',
     'piggy-banks_show_piggyDetails'                           => 'Enkele details over je spaarpotje',
-    'piggy-banks_show_piggyEvents'                            => 'Any additions or removals are also listed here.',
+    'piggy-banks_show_piggyEvents'                            => 'Eventuele stortingen (van en naar) worden hier ook vermeld.',
 
     // bill index
-    'bills_index_paid_in_period'                              => 'This field indicates when the bill was last paid.',
-    'bills_index_expected_in_period'                          => 'This field indicates for each bill if and when the next bill is expected to hit.',
+    'bills_index_paid_in_period'                              => 'Dit veld geeft aan wanneer het contract het laatst is betaald.',
+    'bills_index_expected_in_period'                          => 'Dit veld geeft aan voor elk contract of en wanneer je hem weer moet betalen.',
 
     // show bill
-    'bills_show_billInfo'                                     => 'This table shows some general information about this bill.',
-    'bills_show_billButtons'                                  => 'Use this button to re-scan old transactions so they will be matched to this bill.',
-    'bills_show_billChart'                                    => 'This chart shows the transactions linked to this bill.',
+    'bills_show_billInfo'                                     => 'Deze tabel bevat wat algemene informatie over dit contract.',
+    'bills_show_billButtons'                                  => 'Gebruik deze knop om oude transacties opnieuw te scannen, zodat ze aan dit contract worden gekoppeld.',
+    'bills_show_billChart'                                    => 'Deze grafiek toont de transacties gekoppeld aan dit contract.',
 
     // create bill
-    'bills_create_name'                                       => 'Use a descriptive name such as "Rent" or "Health insurance".',
-    'bills_create_match'                                      => 'To match transactions, use terms from those transactions or the expense account involved. All words must match.',
-    'bills_create_amount_min_holder'                          => 'Select a minimum and maximum amount for this bill.',
+    'bills_create_name'                                       => 'Gebruik een beschrijvende naam zoals "huur" of "zorgverzekering".',
+    'bills_create_match'                                      => 'Om transacties te koppelen gebruik je termen uit de transacties of de bijbehorende crediteur. Alle termen moeten overeen komen.',
+    'bills_create_amount_min_holder'                          => 'Stel ook een minimum- en maximumbedrag in.',
     'bills_create_repeat_freq_holder'                         => 'Most bills repeat monthly, but you can set another frequency here.',
     'bills_create_skip_holder'                                => 'If a bill repeats every 2 weeks for example, the "skip"-field should be set to "1" to skip every other week.',
 
@@ -110,7 +110,7 @@ return [
     'rules_create_actions'                                    => 'Set as many actions as you like.',
 
     // preferences
-    'preferences_index_tabs'                                  => 'More options are available behind these tabs.',
+    'preferences_index_tabs'                                  => 'Meer opties zijn beschikbaar achter deze tabbladen.',
 
     // currencies
     'currencies_index_intro'                                  => 'Firefly III supports multiple currencies, which you can change on this page.',

From 8e4a480f055e78e33a63563b3efd1975bec15e5a Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Fri, 25 Aug 2017 06:50:05 +0200
Subject: [PATCH 237/668] New translations intro.php (Dutch)

---
 resources/lang/nl_NL/intro.php | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/resources/lang/nl_NL/intro.php b/resources/lang/nl_NL/intro.php
index 6ac54580e8..239af2976a 100644
--- a/resources/lang/nl_NL/intro.php
+++ b/resources/lang/nl_NL/intro.php
@@ -91,31 +91,31 @@ return [
     'bills_create_name'                                       => 'Gebruik een beschrijvende naam zoals "huur" of "zorgverzekering".',
     'bills_create_match'                                      => 'Om transacties te koppelen gebruik je termen uit de transacties of de bijbehorende crediteur. Alle termen moeten overeen komen.',
     'bills_create_amount_min_holder'                          => 'Stel ook een minimum- en maximumbedrag in.',
-    'bills_create_repeat_freq_holder'                         => 'Most bills repeat monthly, but you can set another frequency here.',
-    'bills_create_skip_holder'                                => 'If a bill repeats every 2 weeks for example, the "skip"-field should be set to "1" to skip every other week.',
+    'bills_create_repeat_freq_holder'                         => 'De meeste contracten herhalen maandelijks, maar dat kan je eventueel veranderen.',
+    'bills_create_skip_holder'                                => 'Als een contract elke twee weken herhaalt, zet je het "skip"-veld op 1 om elke andere week over te slaan.',
 
     // rules index
-    'rules_index_intro'                                       => 'Firefly III allows you to manage rules, that will automagically be applied to any transaction you create or edit.',
-    'rules_index_new_rule_group'                              => 'You can combine rules in groups for easier management.',
+    'rules_index_intro'                                       => 'In Firefly III kan je regels maken die automagisch op transacties worden toegepast.',
+    'rules_index_new_rule_group'                              => 'Je kan regels combineren in groepen voor makkelijker beheer.',
     'rules_index_new_rule'                                    => 'Maak zoveel regels als je wilt.',
-    'rules_index_prio_buttons'                                => 'Order them any way you see fit.',
-    'rules_index_test_buttons'                                => 'You can test your rules or apply them to existing transactions.',
-    'rules_index_rule-triggers'                               => 'Rules have "triggers" and "actions" that you can order by drag-and-drop.',
-    'rules_index_outro'                                       => 'Be sure to check out the help pages using the (?) icon in the top right!',
+    'rules_index_prio_buttons'                                => 'Zet ze in elke willekeurige volgorde.',
+    'rules_index_test_buttons'                                => 'Je kan je regels testen of toepassen op bestaande transacties.',
+    'rules_index_rule-triggers'                               => 'Regels hebben "triggers" en "acties" die je kan sorteren met drag-en-drop.',
+    'rules_index_outro'                                       => 'Check ook de helppagina\'s met het (?)-icoontje rechtsboven!',
 
     // create rule:
-    'rules_create_mandatory'                                  => 'Choose a descriptive title, and set when the rule should be fired.',
-    'rules_create_ruletriggerholder'                          => 'Add as many triggers as you like, but remember that ALL triggers must match before any actions are fired.',
-    'rules_create_test_rule_triggers'                         => 'Use this button to see which transactions would match your rule.',
-    'rules_create_actions'                                    => 'Set as many actions as you like.',
+    'rules_create_mandatory'                                  => 'Kies een beschrijvende titel en wanneer de regel af moet gaan.',
+    'rules_create_ruletriggerholder'                          => 'Voeg zoveel triggers toe als je wilt, maar denk er aan dat ALLE triggers moeten matchen voor de acties worden uitgevoerd.',
+    'rules_create_test_rule_triggers'                         => 'Gebruik deze knop om te zien welke bestaande transacties overeen zouden komen.',
+    'rules_create_actions'                                    => 'Stel zoveel acties in als je wilt.',
 
     // preferences
     'preferences_index_tabs'                                  => 'Meer opties zijn beschikbaar achter deze tabbladen.',
 
     // currencies
-    'currencies_index_intro'                                  => 'Firefly III supports multiple currencies, which you can change on this page.',
-    'currencies_index_default'                                => 'Firefly III has one default currency. You can always switch of course using these buttons.',
+    'currencies_index_intro'                                  => 'Firefly III ondersteunt meerdere valuta, die je op deze pagina kunt wijzigen.',
+    'currencies_index_default'                                => 'Firefly III heeft één standaardvaluta. Je kan natuurlijk altijd wisselen met deze knoppen.',
 
     // create currency
-    'currencies_create_code'                                  => 'This code should be ISO compliant (Google it for your new currency).',
+    'currencies_create_code'                                  => 'Deze code moet ISO-compatibel zijn (Google die code voor je nieuwe valuta).',
 ];
\ No newline at end of file

From dba3d890277bea4e8dc25cc1026cc36e0e72f1c4 Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Fri, 25 Aug 2017 06:58:28 +0200
Subject: [PATCH 238/668] Update form for linking.

---
 .../Transaction/LinkController.php            | 58 +++++--------------
 app/Http/Requests/JournalLinkRequest.php      | 36 +++++++++++-
 2 files changed, 50 insertions(+), 44 deletions(-)

diff --git a/app/Http/Controllers/Transaction/LinkController.php b/app/Http/Controllers/Transaction/LinkController.php
index 0b560c78c8..8fd296bfb0 100644
--- a/app/Http/Controllers/Transaction/LinkController.php
+++ b/app/Http/Controllers/Transaction/LinkController.php
@@ -94,60 +94,32 @@ class LinkController extends Controller
     public function store(
         JournalLinkRequest $request, LinkTypeRepositoryInterface $repository, JournalRepositoryInterface $journalRepository, TransactionJournal $journal
     ) {
-        $linkType = $request->get('link_type');
-        $parts    = explode('_', $linkType);
-        if (count($parts) !== 2) {
-            Session::flash('error', trans('firefly.invalid_link_data'));
-
-            return redirect(route('transactions.show', $journal->id));
-        }
-        if (!in_array($parts[1], ['inward', 'outward'])) {
-            Session::flash('error', trans('firefly.invalid_link_data'));
-
-            return redirect(route('transactions.show', $journal->id));
-        }
-        $linkTypeId = intval($parts[0]);
-        $linkType   = $repository->find($linkTypeId);
-        if ($linkType->id !== $linkTypeId) {
-            Session::flash('error', trans('firefly.invalid_link_data'));
-
-            return redirect(route('transactions.show', $journal->id));
-        }
-        Log::debug('Will link using linktype', $linkType->toArray());
-        $linkJournalId = intval($request->get('link_journal_id'));
-
-        if ($linkJournalId === 0 && ctype_digit($request->string('link_other'))) {
-            $linkJournalId = intval($request->string('link_other'));
-        }
-
-
-        $opposing = $journalRepository->find($linkJournalId);
-        if (is_null($opposing->id)) {
-            Session::flash('error', trans('firefly.invalid_link_data'));
-
-            return redirect(route('transactions.show', $journal->id));
-        }
-        $result = $repository->findLink($journal, $opposing);
-        if ($result) {
+        $linkInfo      = $request->getLinkInfo();
+        $linkType      = $repository->find($linkInfo['link_type_id']);
+        $other         = $journalRepository->find($linkInfo['transaction_journal_id']);
+        $alreadyLinked = $repository->findLink($journal, $other);
+        if ($alreadyLinked) {
             Session::flash('error', trans('firefly.journals_error_linked'));
 
             return redirect(route('transactions.show', $journal->id));
         }
-        Log::debug(sprintf('Journal is %d, opposing is %d', $journal->id, $opposing->id));
+        Log::debug(sprintf('Journal is %d, opposing is %d', $journal->id, $other->id));
 
         $journalLink = new TransactionJournalLink;
         $journalLink->linkType()->associate($linkType);
-        if ($parts[1] === 'inward') {
-            Log::debug(sprintf('Link type is inwards ("%s"), so %d is source and %d is destination.', $linkType->inward, $opposing->id, $journal->id));
-            $journalLink->source()->associate($opposing);
+        if ($linkInfo['direction'] === 'inward') {
+            Log::debug(sprintf('Link type is inwards ("%s"), so %d is source and %d is destination.', $linkType->inward, $other->id, $journal->id));
+            $journalLink->source()->associate($other);
             $journalLink->destination()->associate($journal);
         }
-        if ($parts[1] === 'outward') {
-            Log::debug(sprintf('Link type is inwards ("%s"), so %d is source and %d is destination.', $linkType->outward, $journal->id, $opposing->id));
+
+        if ($linkInfo['direction'] === 'outward') {
+            Log::debug(sprintf('Link type is inwards ("%s"), so %d is source and %d is destination.', $linkType->outward, $journal->id, $other->id));
             $journalLink->source()->associate($journal);
-            $journalLink->destination()->associate($opposing);
+            $journalLink->destination()->associate($other);
         }
-        $journalLink->comment = strlen($request->string('comments')) > 0 ? $request->string('comments') : null;
+
+        $journalLink->comment = $linkInfo['comments'];
         $journalLink->save();
         Session::flash('success', trans('firefly.journals_linked'));
 
diff --git a/app/Http/Requests/JournalLinkRequest.php b/app/Http/Requests/JournalLinkRequest.php
index 048bc6d28b..50b2069d47 100644
--- a/app/Http/Requests/JournalLinkRequest.php
+++ b/app/Http/Requests/JournalLinkRequest.php
@@ -12,6 +12,8 @@ declare(strict_types=1);
 
 namespace FireflyIII\Http\Requests;
 
+use FireflyIII\Models\LinkType;
+
 /**
  * Class JournalLink
  *
@@ -29,12 +31,44 @@ class JournalLinkRequest extends Request
         return auth()->check();
     }
 
+    /**
+     * @return array
+     */
+    public function getLinkInfo(): array
+    {
+        $return                           = [];
+        $linkType                         = $this->get('link_type');
+        $parts                            = explode('_', $linkType);
+        $return['link_type_id']           = intval($parts[0]);
+        $return['transaction_journal_id'] = $this->integer('link_journal_id');
+        $return['comments']               = strlen($this->string('comments')) > 0 ? $this->string('comments') : null;
+        $return['direction']              = $parts[1];
+        if ($return['transaction_journal_id'] === 0 && ctype_digit($this->string('link_other'))) {
+            $return['transaction_journal_id'] = $this->integer('link_other');
+        }
+
+        return $return;
+    }
 
     /**
      * @return array
      */
     public function rules()
     {
-        return [];
+        // all possible combinations of link types and inward / outward:
+        $combinations = [];
+        $linkTypes    = LinkType::get(['id']);
+        /** @var LinkType $type */
+        foreach ($linkTypes as $type) {
+            $combinations[] = sprintf('%d_inward', $type->id);
+            $combinations[] = sprintf('%d_outward', $type->id);
+        }
+        $string = join(',', $combinations);
+
+        return [
+            'link_type'       => sprintf('required|in:%s', $string),
+            'link_other'      => 'belongsToUser:transaction_journals',
+            'link_journal_id' => 'belongsToUser:transaction_journals',
+        ];
     }
 }

From 455c6e0d39a96a8aff193f24cc0fb1431571de7a Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Fri, 25 Aug 2017 07:06:48 +0200
Subject: [PATCH 239/668] New translations validation.php (Chinese Traditional)

---
 resources/lang/zh_TW/validation.php | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/resources/lang/zh_TW/validation.php b/resources/lang/zh_TW/validation.php
index 0c42f0ff72..c94797b2a2 100644
--- a/resources/lang/zh_TW/validation.php
+++ b/resources/lang/zh_TW/validation.php
@@ -14,7 +14,7 @@ declare(strict_types=1);
 return [
     'iban'                           => '這不是有效的 IBAN。',
     'unique_account_number_for_user' => '此帳號號碼已經存在。',
-    'deleted_user'                   => 'Due to security constraints, you cannot register using this email address.',
+    'deleted_user'                   => '',
     'rule_trigger_value'             => '此值不能用於所選擇的事件。',
     'rule_action_value'              => '此值不能用於所選擇的動作。',
     'invalid_domain'                 => '基於安全理由，你無法使用此域名註冊。',
@@ -24,8 +24,8 @@ return [
     'file_too_large'                 => '檔案 ":name" 過大。',
     'belongs_to_user'                => ':attribute 的值是未知的。',
     'accepted'                       => ':attribute 必須被接受。',
-    'bic'                            => 'This is not a valid BIC.',
-    'more'                           => ':attribute must be larger than zero.',
+    'bic'                            => '',
+    'more'                           => '',
     'active_url'                     => ':attribute 不是有效的URL。',
     'after'                          => ':attribute 必須是一個在 :date 之後的日期。',
     'alpha'                          => ':attribute 只允許包含字母。',
@@ -84,11 +84,11 @@ return [
     'url'                            => ':attribute 格式無效。',
     'timezone'                       => ':attribute 必須是有效的區域。',
     '2fa_code'                       => ':attribute 格式無效。',
-    'dimensions'                     => 'The :attribute has invalid image dimensions.',
-    'distinct'                       => 'The :attribute field has a duplicate value.',
-    'file'                           => 'The :attribute must be a file.',
-    'in_array'                       => 'The :attribute field does not exist in :other.',
-    'present'                        => 'The :attribute field must be present.',
-    'amount_zero'                    => 'The total amount cannot be zero',
-    'secure_password'                => 'This is not a secure password. Please try again. For more information, visit https://goo.gl/NCh2tN',
+    'dimensions'                     => '',
+    'distinct'                       => '',
+    'file'                           => '',
+    'in_array'                       => '',
+    'present'                        => '',
+    'amount_zero'                    => '',
+    'secure_password'                => '',
 ];
\ No newline at end of file

From cf2cda6694501a1cec5f795a9a8664f2cca42164 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Fri, 25 Aug 2017 07:06:52 +0200
Subject: [PATCH 240/668] New translations validation.php (Slovenian)

---
 resources/lang/sl_SI/validation.php | 150 ++++++++++++++--------------
 1 file changed, 75 insertions(+), 75 deletions(-)

diff --git a/resources/lang/sl_SI/validation.php b/resources/lang/sl_SI/validation.php
index fff91fb426..860669162b 100644
--- a/resources/lang/sl_SI/validation.php
+++ b/resources/lang/sl_SI/validation.php
@@ -16,79 +16,79 @@ return [
     'unique_account_number_for_user' => 'Kaže, da je ta številka računa že v uporabi.',
     'deleted_user'                   => 'Iz varnostnih razlogov ne morete ustvariti uporabnika s takim e-poštnim naslovom.',
     'rule_trigger_value'             => 'Ta vrednost je neveljavna za izbrani sprožilec.',
-    'rule_action_value'              => 'This value is invalid for the selected action.',
-    'invalid_domain'                 => 'Due to security constraints, you cannot register from this domain.',
-    'file_already_attached'          => 'Uploaded file ":name" is already attached to this object.',
-    'file_attached'                  => 'Succesfully uploaded file ":name".',
-    'file_invalid_mime'              => 'File ":name" is of type ":mime" which is not accepted as a new upload.',
-    'file_too_large'                 => 'File ":name" is too large.',
-    'belongs_to_user'                => 'The value of :attribute is unknown',
-    'accepted'                       => 'The :attribute must be accepted.',
-    'bic'                            => 'This is not a valid BIC.',
-    'more'                           => ':attribute must be larger than zero.',
-    'active_url'                     => 'The :attribute is not a valid URL.',
-    'after'                          => 'The :attribute must be a date after :date.',
-    'alpha'                          => 'The :attribute may only contain letters.',
-    'alpha_dash'                     => 'The :attribute may only contain letters, numbers, and dashes.',
-    'alpha_num'                      => 'The :attribute may only contain letters and numbers.',
-    'array'                          => 'The :attribute must be an array.',
-    'unique_for_user'                => 'There already is an entry with this :attribute.',
-    'before'                         => 'The :attribute must be a date before :date.',
-    'unique_object_for_user'         => 'This name is already in use',
-    'unique_account_for_user'        => 'This account name is already in use',
-    'between.numeric'                => 'The :attribute must be between :min and :max.',
-    'between.file'                   => 'The :attribute must be between :min and :max kilobytes.',
-    'between.string'                 => 'The :attribute must be between :min and :max characters.',
-    'between.array'                  => 'The :attribute must have between :min and :max items.',
-    'boolean'                        => 'The :attribute field must be true or false.',
-    'confirmed'                      => 'The :attribute confirmation does not match.',
-    'date'                           => 'The :attribute is not a valid date.',
-    'date_format'                    => 'The :attribute does not match the format :format.',
-    'different'                      => 'The :attribute and :other must be different.',
-    'digits'                         => 'The :attribute must be :digits digits.',
-    'digits_between'                 => 'The :attribute must be between :min and :max digits.',
-    'email'                          => 'The :attribute must be a valid email address.',
-    'filled'                         => 'The :attribute field is required.',
-    'exists'                         => 'The selected :attribute is invalid.',
-    'image'                          => 'The :attribute must be an image.',
-    'in'                             => 'The selected :attribute is invalid.',
-    'integer'                        => 'The :attribute must be an integer.',
-    'ip'                             => 'The :attribute must be a valid IP address.',
-    'json'                           => 'The :attribute must be a valid JSON string.',
-    'max.numeric'                    => 'The :attribute may not be greater than :max.',
-    'max.file'                       => 'The :attribute may not be greater than :max kilobytes.',
-    'max.string'                     => 'The :attribute may not be greater than :max characters.',
-    'max.array'                      => 'The :attribute may not have more than :max items.',
-    'mimes'                          => 'The :attribute must be a file of type: :values.',
-    'min.numeric'                    => 'The :attribute must be at least :min.',
-    'min.file'                       => 'The :attribute must be at least :min kilobytes.',
-    'min.string'                     => 'The :attribute must be at least :min characters.',
-    'min.array'                      => 'The :attribute must have at least :min items.',
-    'not_in'                         => 'The selected :attribute is invalid.',
-    'numeric'                        => 'The :attribute must be a number.',
-    'regex'                          => 'The :attribute format is invalid.',
-    'required'                       => 'The :attribute field is required.',
-    'required_if'                    => 'The :attribute field is required when :other is :value.',
-    'required_unless'                => 'The :attribute field is required unless :other is in :values.',
-    'required_with'                  => 'The :attribute field is required when :values is present.',
-    'required_with_all'              => 'The :attribute field is required when :values is present.',
-    'required_without'               => 'The :attribute field is required when :values is not present.',
-    'required_without_all'           => 'The :attribute field is required when none of :values are present.',
-    'same'                           => 'The :attribute and :other must match.',
-    'size.numeric'                   => 'The :attribute must be :size.',
-    'size.file'                      => 'The :attribute must be :size kilobytes.',
-    'size.string'                    => 'The :attribute must be :size characters.',
-    'size.array'                     => 'The :attribute must contain :size items.',
-    'unique'                         => 'The :attribute has already been taken.',
-    'string'                         => 'The :attribute must be a string.',
-    'url'                            => 'The :attribute format is invalid.',
-    'timezone'                       => 'The :attribute must be a valid zone.',
-    '2fa_code'                       => 'The :attribute field is invalid.',
-    'dimensions'                     => 'The :attribute has invalid image dimensions.',
-    'distinct'                       => 'The :attribute field has a duplicate value.',
-    'file'                           => 'The :attribute must be a file.',
-    'in_array'                       => 'The :attribute field does not exist in :other.',
-    'present'                        => 'The :attribute field must be present.',
-    'amount_zero'                    => 'The total amount cannot be zero',
-    'secure_password'                => 'This is not a secure password. Please try again. For more information, visit https://goo.gl/NCh2tN',
+    'rule_action_value'              => '',
+    'invalid_domain'                 => '',
+    'file_already_attached'          => '',
+    'file_attached'                  => '',
+    'file_invalid_mime'              => '',
+    'file_too_large'                 => '',
+    'belongs_to_user'                => '',
+    'accepted'                       => '',
+    'bic'                            => '',
+    'more'                           => '',
+    'active_url'                     => '',
+    'after'                          => '',
+    'alpha'                          => '',
+    'alpha_dash'                     => '',
+    'alpha_num'                      => '',
+    'array'                          => '',
+    'unique_for_user'                => '',
+    'before'                         => '',
+    'unique_object_for_user'         => '',
+    'unique_account_for_user'        => '',
+    'between.numeric'                => '',
+    'between.file'                   => '',
+    'between.string'                 => '',
+    'between.array'                  => '',
+    'boolean'                        => '',
+    'confirmed'                      => '',
+    'date'                           => '',
+    'date_format'                    => '',
+    'different'                      => '',
+    'digits'                         => '',
+    'digits_between'                 => '',
+    'email'                          => '',
+    'filled'                         => '',
+    'exists'                         => '',
+    'image'                          => '',
+    'in'                             => '',
+    'integer'                        => '',
+    'ip'                             => '',
+    'json'                           => '',
+    'max.numeric'                    => '',
+    'max.file'                       => '',
+    'max.string'                     => '',
+    'max.array'                      => '',
+    'mimes'                          => '',
+    'min.numeric'                    => '',
+    'min.file'                       => '',
+    'min.string'                     => '',
+    'min.array'                      => '',
+    'not_in'                         => '',
+    'numeric'                        => '',
+    'regex'                          => '',
+    'required'                       => '',
+    'required_if'                    => '',
+    'required_unless'                => '',
+    'required_with'                  => '',
+    'required_with_all'              => '',
+    'required_without'               => '',
+    'required_without_all'           => '',
+    'same'                           => '',
+    'size.numeric'                   => '',
+    'size.file'                      => '',
+    'size.string'                    => '',
+    'size.array'                     => '',
+    'unique'                         => '',
+    'string'                         => '',
+    'url'                            => '',
+    'timezone'                       => '',
+    '2fa_code'                       => '',
+    'dimensions'                     => '',
+    'distinct'                       => '',
+    'file'                           => '',
+    'in_array'                       => '',
+    'present'                        => '',
+    'amount_zero'                    => '',
+    'secure_password'                => '',
 ];
\ No newline at end of file

From f83afd82d159d3a2fc1bedf474f1804075fc7eb8 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Fri, 25 Aug 2017 07:06:53 +0200
Subject: [PATCH 241/668] New translations validation.php (Portuguese,
 Brazilian)

---
 resources/lang/pt_BR/validation.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/lang/pt_BR/validation.php b/resources/lang/pt_BR/validation.php
index ecf55dc8e6..e0c432ddaa 100644
--- a/resources/lang/pt_BR/validation.php
+++ b/resources/lang/pt_BR/validation.php
@@ -25,7 +25,7 @@ return [
     'belongs_to_user'                => 'O valor de :attribute é desconhecido',
     'accepted'                       => 'O campo :attribute deve ser aceito.',
     'bic'                            => 'Este não é um BIC válido.',
-    'more'                           => ':attribute must be larger than zero.',
+    'more'                           => '',
     'active_url'                     => 'O campo :attribute não contém um URL válido.',
     'after'                          => 'O campo :attribute deverá conter uma data posterior a :date.',
     'alpha'                          => 'O campo :attribute deverá conter apenas letras.',
@@ -90,5 +90,5 @@ return [
     'in_array'                       => 'O campo :attribute não existe em :other.',
     'present'                        => 'O campo :attribute deve estar presente.',
     'amount_zero'                    => 'A quantidade total não pode ser zero',
-    'secure_password'                => 'This is not a secure password. Please try again. For more information, visit https://goo.gl/NCh2tN',
+    'secure_password'                => '',
 ];
\ No newline at end of file

From 91c3f2fb2df24feaf4a920399a5ef13fc446cd95 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Fri, 25 Aug 2017 07:06:55 +0200
Subject: [PATCH 242/668] New translations validation.php (German)

---
 resources/lang/de_DE/validation.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/de_DE/validation.php b/resources/lang/de_DE/validation.php
index 583ebb4302..43e00ea9b4 100644
--- a/resources/lang/de_DE/validation.php
+++ b/resources/lang/de_DE/validation.php
@@ -90,5 +90,5 @@ return [
     'in_array'                       => ':attribute existiert nicht in :other.',
     'present'                        => 'Das :attribute Feld muss vorhanden sein.',
     'amount_zero'                    => 'Der Gesamtbetrag darf nicht Null sein',
-    'secure_password'                => 'This is not a secure password. Please try again. For more information, visit https://goo.gl/NCh2tN',
+    'secure_password'                => '',
 ];
\ No newline at end of file

From c0673b10b5b337f8aa8e6a29ba1d6ea79825f40a Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Fri, 25 Aug 2017 07:06:56 +0200
Subject: [PATCH 243/668] New translations list.php (Spanish)

---
 resources/lang/es_ES/list.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/resources/lang/es_ES/list.php b/resources/lang/es_ES/list.php
index b26fb4f2ad..4a961d2b88 100644
--- a/resources/lang/es_ES/list.php
+++ b/resources/lang/es_ES/list.php
@@ -88,7 +88,7 @@ return [
     'budget_count'           => 'Número de presupuestos',
     'rule_and_groups_count'  => 'Número de reglas y grupos de reglas',
     'tags_count'             => 'Número de etiquetas',
-    'inward'                 => 'Inward description',
-    'outward'                => 'Outward description',
-    'number_of_transactions' => 'Number of transactions',
+    'inward'                 => '',
+    'outward'                => '',
+    'number_of_transactions' => '',
 ];
\ No newline at end of file

From 8dec3717ebc982aa1a7645ec05b8b475ce5f6ef2 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Fri, 25 Aug 2017 07:06:57 +0200
Subject: [PATCH 244/668] New translations list.php (Slovenian)

---
 resources/lang/sl_SI/list.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/resources/lang/sl_SI/list.php b/resources/lang/sl_SI/list.php
index e2cb94be16..5856af081d 100644
--- a/resources/lang/sl_SI/list.php
+++ b/resources/lang/sl_SI/list.php
@@ -88,7 +88,7 @@ return [
     'budget_count'           => 'Število budžetov',
     'rule_and_groups_count'  => 'Število pravil in skupin pravil',
     'tags_count'             => 'Število značk',
-    'inward'                 => 'Inward description',
-    'outward'                => 'Outward description',
-    'number_of_transactions' => 'Number of transactions',
+    'inward'                 => '',
+    'outward'                => '',
+    'number_of_transactions' => '',
 ];
\ No newline at end of file

From c7703cd70ca0fcced2239e9873ded825b3a20ccc Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Fri, 25 Aug 2017 07:06:59 +0200
Subject: [PATCH 245/668] New translations list.php (Polish)

---
 resources/lang/pl_PL/list.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/resources/lang/pl_PL/list.php b/resources/lang/pl_PL/list.php
index 552981dcf6..50228a783f 100644
--- a/resources/lang/pl_PL/list.php
+++ b/resources/lang/pl_PL/list.php
@@ -41,7 +41,7 @@ return [
     'repeat_freq'           => 'Powtarza się',
     'description'           => 'Opis',
     'amount'                => 'Kwota',
-    'internal_reference'    => 'Internal reference',
+    'internal_reference'    => '',
     'date'                  => 'Data',
     'interest_date'         => 'Stopa procentowa',
     'book_date'             => 'Data księgowania',
@@ -49,7 +49,7 @@ return [
     'due_date'              => 'Termin realizacji',
     'payment_date'          => 'Data płatności',
     'invoice_date'          => 'Data faktury',
-    'interal_reference'     => 'Internal reference',
+    'interal_reference'     => '',
     'notes'                 => 'Notatki',
     'from'                  => 'Z',
     'piggy_bank'            => 'Skarbonka',
@@ -71,7 +71,7 @@ return [
     'is_admin'              => 'Jest administratorem',
     'has_two_factor'        => 'Ma dwustopniową autoryzację',
     'confirmed_from'        => 'Potwierdzone z',
-    'registered_from'       => 'Registered from',
+    'registered_from'       => '',
     'blocked_code'          => 'Kod blokady',
     'domain'                => 'Domena',
     'registration_attempts' => 'Próby rejestracji',
@@ -88,7 +88,7 @@ return [
     'budget_count'           => 'Liczba budżetów',
     'rule_and_groups_count'  => 'Liczba reguł i grup reguł',
     'tags_count'             => 'Liczba tagów',
-    'inward'                 => 'Inward description',
-    'outward'                => 'Outward description',
+    'inward'                 => '',
+    'outward'                => '',
     'number_of_transactions' => 'Liczba transakcji',
 ];
\ No newline at end of file

From d7b81157249c98577316840f705557164bb27f92 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Fri, 25 Aug 2017 07:07:00 +0200
Subject: [PATCH 246/668] New translations list.php (Portuguese, Brazilian)

---
 resources/lang/pt_BR/list.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/resources/lang/pt_BR/list.php b/resources/lang/pt_BR/list.php
index cf8d04a2f8..1211d3e377 100644
--- a/resources/lang/pt_BR/list.php
+++ b/resources/lang/pt_BR/list.php
@@ -14,7 +14,7 @@ declare(strict_types=1);
 return [
     'buttons'               => 'Botões',
     'icon'                  => 'Ícone',
-    'id'                    => 'ID',
+    'id'                    => '',
     'create_date'           => 'Criado em',
     'update_date'           => 'Atualizado em',
     'balance_before'        => 'Saldo Antes',
@@ -79,7 +79,7 @@ return [
     'destination_account'   => 'Conta de destino',
 
     'accounts_count'         => 'Número de Contas',
-    'journals_count'         => 'Number of transactions',
+    'journals_count'         => '',
     'attachments_count'      => 'Número de anexos',
     'bills_count'            => 'Número de contas',
     'categories_count'       => 'Número de categorias',
@@ -88,7 +88,7 @@ return [
     'budget_count'           => 'Número de orçamentos',
     'rule_and_groups_count'  => 'Número de regras e grupos de regras',
     'tags_count'             => 'Número de tags',
-    'inward'                 => 'Inward description',
-    'outward'                => 'Outward description',
-    'number_of_transactions' => 'Number of transactions',
+    'inward'                 => '',
+    'outward'                => '',
+    'number_of_transactions' => '',
 ];
\ No newline at end of file

From a06097b012f66c673ad5ef8e46053d8269db0b1a Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Fri, 25 Aug 2017 07:07:02 +0200
Subject: [PATCH 247/668] New translations demo.php (Chinese Traditional)

---
 resources/lang/zh_TW/demo.php | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/resources/lang/zh_TW/demo.php b/resources/lang/zh_TW/demo.php
index 8b442add2d..f06ac94ae9 100644
--- a/resources/lang/zh_TW/demo.php
+++ b/resources/lang/zh_TW/demo.php
@@ -10,17 +10,17 @@ declare(strict_types=1);
  */
 
 return [
-    'no_demo_text'                   => 'Sorry, there is no extra demo-explanation text for <abbr title=":route">this page</abbr>.',
-    'see_help_icon'                  => 'However, the <i class="fa fa-question-circle"></i>-icon in the top right corner may tell you more.',
-    'index'                          => 'Welcome to <strong>Firefly III</strong>! On this page you get a quick overview of your finances. For more information, check out Accounts &rarr; <a href=":asset">Asset Accounts</a> and of course the <a href=":budgets">Budgets</a> and <a href=":reports">Reports</a> pages. Or just take a look around and see where you end up.',
-    'accounts-index'                 => 'Asset accounts are your personal bank accounts. Expense accounts are the accounts you spend money at, such as stores and friends. Revenue accounts are accounts you receive money from, such as your job, the government or other sources of income. On this page you can edit or remove them.',
-    'budgets-index'                  => 'This page shows you an overview of your budgets. The top bar shows the amount that is available to be budgeted. This can be customized for any period by clicking the amount on the right. The amount you\'ve actually spent is shown in the bar below. Below that are the expenses per budget and what you\'ve budgeted for them.',
-    'reports-index-start'            => 'Firefly III supports four types of reports. Read about them by clicking on the <i class="fa fa-question-circle"></i>-icon in the top right corner.',
-    'reports-index-examples'         => 'Be sure to check out these examples: <a href=":one">a monthly financial overview</a>, <a href=":two">a yearly financial overview</a> and <a href=":three">a budget overview</a>.',
-    'currencies-index'               => 'Firefly III supports multiple currencies. Although it defaults to the Euro it can be set to the US Dollar and many other currencies. As you can see a small selection of currencies has been included but you can add your own if you wish to. Changing the default currency will not change the currency of existing transactions however: Firefly III supports the use of multiple currencies at the same time.',
-    'transactions-index'             => 'These expenses, deposits and transfers are not particularly imaginative. They have been generated automatically.',
-    'piggy-banks-index'              => 'As you can see, there are three piggy banks. Use the plus and minus buttons to influence the amount of money in each piggy bank. Click the name of the piggy bank to see the administration for each piggy bank.',
-    'import-index'                   => 'Of course, any CSV file can be imported into Firefly III ',
-    'import-configure-security'      => 'Because of security concerns, your upload has been replaced with a local file.',
-    'import-configure-configuration' => 'The configuration you see below is correct for the local file.',
+    'no_demo_text'                   => '',
+    'see_help_icon'                  => '',
+    'index'                          => '',
+    'accounts-index'                 => '',
+    'budgets-index'                  => '',
+    'reports-index-start'            => '',
+    'reports-index-examples'         => '',
+    'currencies-index'               => '',
+    'transactions-index'             => '',
+    'piggy-banks-index'              => '',
+    'import-index'                   => '',
+    'import-configure-security'      => '',
+    'import-configure-configuration' => '',
 ];
\ No newline at end of file

From 42cbb7b7232d8b707fae3a3a544261501fb73203 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Fri, 25 Aug 2017 07:07:03 +0200
Subject: [PATCH 248/668] New translations intro.php (Chinese Traditional)

---
 resources/lang/zh_TW/intro.php | 144 ++++++++++++++++-----------------
 1 file changed, 72 insertions(+), 72 deletions(-)

diff --git a/resources/lang/zh_TW/intro.php b/resources/lang/zh_TW/intro.php
index c161cef362..cca2854e02 100644
--- a/resources/lang/zh_TW/intro.php
+++ b/resources/lang/zh_TW/intro.php
@@ -11,111 +11,111 @@ declare(strict_types=1);
 
 return [
     // index
-    'index_intro'                           => 'Welcome to the index page of Firefly III. Please take the time to walk through this intro to get a feeling of how Firefly III works.',
-    'index_accounts-chart'                  => 'This chart shows the current balance of your asset accounts. You can select the accounts visible here in your preferences.',
-    'index_box_out_holder'                  => 'This little box and the boxes next to this one will give you a quick overview of your financial situation.',
-    'index_help'                            => 'If you ever need help with a page or a form, press this button.',
-    'index_outro'                           => 'Most pages of Firefly III will start with a little tour like this one. Please contact me when you have questions or comments. Enjoy!',
-    'index_sidebar-toggle'                  => 'To create new transactions, accounts or other things, use the menu under this icon.',
+    'index_intro'                           => '',
+    'index_accounts-chart'                  => '',
+    'index_box_out_holder'                  => '',
+    'index_help'                            => '',
+    'index_outro'                           => '',
+    'index_sidebar-toggle'                  => '',
 
     // create account:
-    'accounts_create_iban'                  => 'Give your accounts a valid IBAN. This could make a data import very easy in the future.',
-    'accounts_create_asset_opening_balance' => 'Assets accounts may have an "opening balance", indicating the start of this account\'s history in Firefly.',
-    'accounts_create_asset_currency'        => 'Firefly III supports multiple currencies. Asset accounts have one main currency, which you must set here.',
-    'accounts_create_asset_virtual'         => 'It can sometimes help to give your account a virtual balance: an extra amount always added to or removed from the actual balance.',
+    'accounts_create_iban'                  => '',
+    'accounts_create_asset_opening_balance' => '',
+    'accounts_create_asset_currency'        => '',
+    'accounts_create_asset_virtual'         => '',
 
     // budgets index
-    'budgets_index_intro'                   => 'Budgets are used to manage your finances and form one of the core functions of Firefly III.',
-    'budgets_index_set_budget'              => 'Set your total budget for every period so Firefly can tell you if you have budgeted all available money.',
-    'budgets_index_see_expenses_bar'        => 'Spending money will slowly fill this bar.',
-    'budgets_index_navigate_periods'        => 'Navigate through periods to easily set budgets ahead of time.',
-    'budgets_index_new_budget'              => 'Create new budgets as you see fit.',
-    'budgets_index_list_of_budgets'         => 'Use this table to set the amounts for each budget and see how you are doing.',
+    'budgets_index_intro'                   => '',
+    'budgets_index_set_budget'              => '',
+    'budgets_index_see_expenses_bar'        => '',
+    'budgets_index_navigate_periods'        => '',
+    'budgets_index_new_budget'              => '',
+    'budgets_index_list_of_budgets'         => '',
 
     // reports (index)
-    'reports_index_intro'                   => 'Use these reports to get detailed insights in your finances.',
-    'reports_index_inputReportType'         => 'Pick a report type. Check out the help pages to see what each report shows you.',
-    'reports_index_inputAccountsSelect'     => 'You can exclude or include asset accounts as you see fit.',
-    'reports_index_inputDateRange'          => 'The selected date range is entirely up to you: from one day to 10 years.',
-    'reports_index_extra-options-box'       => 'Depending on the report you have selected, you can select extra filters and options here. Watch this box when you change report types.',
+    'reports_index_intro'                   => '',
+    'reports_index_inputReportType'         => '',
+    'reports_index_inputAccountsSelect'     => '',
+    'reports_index_inputDateRange'          => '',
+    'reports_index_extra-options-box'       => '',
 
     // reports (reports)
-    'reports_report_default_intro'          => 'This report will give you a quick and comprehensive overview of your finances. If you wish to see anything else, please don\'t hestitate to contact me!',
-    'reports_report_audit_intro'            => 'This report will give you detailed insights in your asset accounts.',
-    'reports_report_audit_optionsBox'       => 'Use these check boxes to show or hide the columns you are interested in.',
+    'reports_report_default_intro'          => '',
+    'reports_report_audit_intro'            => '',
+    'reports_report_audit_optionsBox'       => '',
 
-    'reports_report_category_intro'                  => 'This report will give you insight in one or multiple categories.',
-    'reports_report_category_pieCharts'              => 'These charts will give you insight in expenses and income per category or per account.',
-    'reports_report_category_incomeAndExpensesChart' => 'This chart shows your expenses and income per category.',
+    'reports_report_category_intro'                  => '',
+    'reports_report_category_pieCharts'              => '',
+    'reports_report_category_incomeAndExpensesChart' => '',
 
-    'reports_report_tag_intro'                  => 'This report will give you insight in one or multiple tags.',
-    'reports_report_tag_pieCharts'              => 'These charts will give you insight in expenses and income per tag, account, category or budget.',
-    'reports_report_tag_incomeAndExpensesChart' => 'This chart shows your expenses and income per tag.',
+    'reports_report_tag_intro'                  => '',
+    'reports_report_tag_pieCharts'              => '',
+    'reports_report_tag_incomeAndExpensesChart' => '',
 
-    'reports_report_budget_intro'                             => 'This report will give you insight in one or multiple budgets.',
-    'reports_report_budget_pieCharts'                         => 'These charts will give you insight in expenses per budget or per account.',
-    'reports_report_budget_incomeAndExpensesChart'            => 'This chart shows your expenses per budget.',
+    'reports_report_budget_intro'                             => '',
+    'reports_report_budget_pieCharts'                         => '',
+    'reports_report_budget_incomeAndExpensesChart'            => '',
 
     // create transaction
-    'transactions_create_switch_box'                          => 'Use these buttons to quickly switch the type of transaction you wish to save.',
-    'transactions_create_ffInput_category'                    => 'You can freely type in this field. Previously created categories will be suggested.',
-    'transactions_create_withdrawal_ffInput_budget'           => 'Link your withdrawal to a budget for better financial control.',
-    'transactions_create_withdrawal_currency_dropdown_amount' => 'Use this dropdown when your withdrawal is in another currency.',
-    'transactions_create_deposit_currency_dropdown_amount'    => 'Use this dropdown when your deposit is in another currency.',
-    'transactions_create_transfer_ffInput_piggy_bank_id'      => 'Select a piggy bank and link this transfer to your savings.',
+    'transactions_create_switch_box'                          => '',
+    'transactions_create_ffInput_category'                    => '',
+    'transactions_create_withdrawal_ffInput_budget'           => '',
+    'transactions_create_withdrawal_currency_dropdown_amount' => '',
+    'transactions_create_deposit_currency_dropdown_amount'    => '',
+    'transactions_create_transfer_ffInput_piggy_bank_id'      => '',
 
     // piggy banks index:
-    'piggy-banks_index_saved'                                 => 'This field shows you how much you\'ve saved in each piggy bank.',
-    'piggy-banks_index_button'                                => 'Next to this progress bar are two buttons (+ and -) to add or remove money from each piggy bank.',
-    'piggy-banks_index_accountStatus'                         => 'For each asset account with at least one piggy bank the status is listed in this table.',
+    'piggy-banks_index_saved'                                 => '',
+    'piggy-banks_index_button'                                => '',
+    'piggy-banks_index_accountStatus'                         => '',
 
     // create piggy
-    'piggy-banks_create_name'                                 => 'What is your goal? A new couch, a camera, money for emergencies?',
-    'piggy-banks_create_date'                                 => 'You can set a target date or a deadline for your piggy bank.',
+    'piggy-banks_create_name'                                 => '',
+    'piggy-banks_create_date'                                 => '',
 
     // show piggy
-    'piggy-banks_show_piggyChart'                             => 'This chart will show the history of this piggy bank.',
-    'piggy-banks_show_piggyDetails'                           => 'Some details about your piggy bank',
-    'piggy-banks_show_piggyEvents'                            => 'Any additions or removals are also listed here.',
+    'piggy-banks_show_piggyChart'                             => '',
+    'piggy-banks_show_piggyDetails'                           => '',
+    'piggy-banks_show_piggyEvents'                            => '',
 
     // bill index
-    'bills_index_paid_in_period'                              => 'This field indicates when the bill was last paid.',
-    'bills_index_expected_in_period'                          => 'This field indicates for each bill if and when the next bill is expected to hit.',
+    'bills_index_paid_in_period'                              => '',
+    'bills_index_expected_in_period'                          => '',
 
     // show bill
-    'bills_show_billInfo'                                     => 'This table shows some general information about this bill.',
-    'bills_show_billButtons'                                  => 'Use this button to re-scan old transactions so they will be matched to this bill.',
-    'bills_show_billChart'                                    => 'This chart shows the transactions linked to this bill.',
+    'bills_show_billInfo'                                     => '',
+    'bills_show_billButtons'                                  => '',
+    'bills_show_billChart'                                    => '',
 
     // create bill
-    'bills_create_name'                                       => 'Use a descriptive name such as "Rent" or "Health insurance".',
-    'bills_create_match'                                      => 'To match transactions, use terms from those transactions or the expense account involved. All words must match.',
-    'bills_create_amount_min_holder'                          => 'Select a minimum and maximum amount for this bill.',
-    'bills_create_repeat_freq_holder'                         => 'Most bills repeat monthly, but you can set another frequency here.',
-    'bills_create_skip_holder'                                => 'If a bill repeats every 2 weeks for example, the "skip"-field should be set to "1" to skip every other week.',
+    'bills_create_name'                                       => '',
+    'bills_create_match'                                      => '',
+    'bills_create_amount_min_holder'                          => '',
+    'bills_create_repeat_freq_holder'                         => '',
+    'bills_create_skip_holder'                                => '',
 
     // rules index
-    'rules_index_intro'                                       => 'Firefly III allows you to manage rules, that will automagically be applied to any transaction you create or edit.',
-    'rules_index_new_rule_group'                              => 'You can combine rules in groups for easier management.',
-    'rules_index_new_rule'                                    => 'Create as many rules as you like.',
-    'rules_index_prio_buttons'                                => 'Order them any way you see fit.',
-    'rules_index_test_buttons'                                => 'You can test your rules or apply them to existing transactions.',
-    'rules_index_rule-triggers'                               => 'Rules have "triggers" and "actions" that you can order by drag-and-drop.',
-    'rules_index_outro'                                       => 'Be sure to check out the help pages using the (?) icon in the top right!',
+    'rules_index_intro'                                       => '',
+    'rules_index_new_rule_group'                              => '',
+    'rules_index_new_rule'                                    => '',
+    'rules_index_prio_buttons'                                => '',
+    'rules_index_test_buttons'                                => '',
+    'rules_index_rule-triggers'                               => '',
+    'rules_index_outro'                                       => '',
 
     // create rule:
-    'rules_create_mandatory'                                  => 'Choose a descriptive title, and set when the rule should be fired.',
-    'rules_create_ruletriggerholder'                          => 'Add as many triggers as you like, but remember that ALL triggers must match before any actions are fired.',
-    'rules_create_test_rule_triggers'                         => 'Use this button to see which transactions would match your rule.',
-    'rules_create_actions'                                    => 'Set as many actions as you like.',
+    'rules_create_mandatory'                                  => '',
+    'rules_create_ruletriggerholder'                          => '',
+    'rules_create_test_rule_triggers'                         => '',
+    'rules_create_actions'                                    => '',
 
     // preferences
-    'preferences_index_tabs'                                  => 'More options are available behind these tabs.',
+    'preferences_index_tabs'                                  => '',
 
     // currencies
-    'currencies_index_intro'                                  => 'Firefly III supports multiple currencies, which you can change on this page.',
-    'currencies_index_default'                                => 'Firefly III has one default currency. You can always switch of course using these buttons.',
+    'currencies_index_intro'                                  => '',
+    'currencies_index_default'                                => '',
 
     // create currency
-    'currencies_create_code'                                  => 'This code should be ISO compliant (Google it for your new currency).',
+    'currencies_create_code'                                  => '',
 ];
\ No newline at end of file

From eea1ddc2881d62087e1ab97bb46f8471cbb4ac2c Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Fri, 25 Aug 2017 07:07:05 +0200
Subject: [PATCH 249/668] New translations demo.php (Russian)

---
 resources/lang/ru_RU/demo.php | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/resources/lang/ru_RU/demo.php b/resources/lang/ru_RU/demo.php
index 91b0d75915..bebb1ab57d 100644
--- a/resources/lang/ru_RU/demo.php
+++ b/resources/lang/ru_RU/demo.php
@@ -10,17 +10,17 @@ declare(strict_types=1);
  */
 
 return [
-    'no_demo_text'                   => 'Sorry, there is no extra demo-explanation text for <abbr title=":route">this page</abbr>.',
-    'see_help_icon'                  => 'However, the <i class="fa fa-question-circle"></i>-icon in the top right corner may tell you more.',
+    'no_demo_text'                   => '',
+    'see_help_icon'                  => '',
     'index'                          => 'Добро пожаловать в <strong>Firefly III</strong>! На этой странице вы видите вашу финансовую ситуацию в общих чертах. Более подробная информация доступна на страницах &rarr; <a href=":asset">Активные счета</a> <a href=":budgets">Бюджет</a> и <a href=":reports">Отчёты</a>. Или просто внимательно оглядитесь и изучите всё вокруг.',
-    'accounts-index'                 => 'Asset accounts are your personal bank accounts. Expense accounts are the accounts you spend money at, such as stores and friends. Revenue accounts are accounts you receive money from, such as your job, the government or other sources of income. On this page you can edit or remove them.',
-    'budgets-index'                  => 'This page shows you an overview of your budgets. The top bar shows the amount that is available to be budgeted. This can be customized for any period by clicking the amount on the right. The amount you\'ve actually spent is shown in the bar below. Below that are the expenses per budget and what you\'ve budgeted for them.',
-    'reports-index-start'            => 'Firefly III supports four types of reports. Read about them by clicking on the <i class="fa fa-question-circle"></i>-icon in the top right corner.',
-    'reports-index-examples'         => 'Be sure to check out these examples: <a href=":one">a monthly financial overview</a>, <a href=":two">a yearly financial overview</a> and <a href=":three">a budget overview</a>.',
-    'currencies-index'               => 'Firefly III supports multiple currencies. Although it defaults to the Euro it can be set to the US Dollar and many other currencies. As you can see a small selection of currencies has been included but you can add your own if you wish to. Changing the default currency will not change the currency of existing transactions however: Firefly III supports the use of multiple currencies at the same time.',
-    'transactions-index'             => 'These expenses, deposits and transfers are not particularly imaginative. They have been generated automatically.',
-    'piggy-banks-index'              => 'As you can see, there are three piggy banks. Use the plus and minus buttons to influence the amount of money in each piggy bank. Click the name of the piggy bank to see the administration for each piggy bank.',
-    'import-index'                   => 'Of course, any CSV file can be imported into Firefly III ',
-    'import-configure-security'      => 'Because of security concerns, your upload has been replaced with a local file.',
-    'import-configure-configuration' => 'The configuration you see below is correct for the local file.',
+    'accounts-index'                 => '',
+    'budgets-index'                  => '',
+    'reports-index-start'            => '',
+    'reports-index-examples'         => '',
+    'currencies-index'               => '',
+    'transactions-index'             => '',
+    'piggy-banks-index'              => '',
+    'import-index'                   => '',
+    'import-configure-security'      => '',
+    'import-configure-configuration' => '',
 ];
\ No newline at end of file

From 6abb21949988d529278025a9e5fa54270d182399 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Fri, 25 Aug 2017 07:07:06 +0200
Subject: [PATCH 250/668] New translations validation.php (Russian)

---
 resources/lang/ru_RU/validation.php | 136 ++++++++++++++--------------
 1 file changed, 68 insertions(+), 68 deletions(-)

diff --git a/resources/lang/ru_RU/validation.php b/resources/lang/ru_RU/validation.php
index 5a8fa83725..bc7760d66b 100644
--- a/resources/lang/ru_RU/validation.php
+++ b/resources/lang/ru_RU/validation.php
@@ -23,72 +23,72 @@ return [
     'file_invalid_mime'              => 'Файл ":name" имеет тип ":mime". Загрузка файлов такого типа невозможна.',
     'file_too_large'                 => 'Файл ":name" слишком большой.',
     'belongs_to_user'                => 'Значение :attribute неизвестно',
-    'accepted'                       => 'The :attribute must be accepted.',
-    'bic'                            => 'This is not a valid BIC.',
-    'more'                           => ':attribute must be larger than zero.',
-    'active_url'                     => 'The :attribute is not a valid URL.',
-    'after'                          => 'The :attribute must be a date after :date.',
-    'alpha'                          => 'The :attribute may only contain letters.',
-    'alpha_dash'                     => 'The :attribute may only contain letters, numbers, and dashes.',
-    'alpha_num'                      => 'The :attribute may only contain letters and numbers.',
-    'array'                          => 'The :attribute must be an array.',
-    'unique_for_user'                => 'There already is an entry with this :attribute.',
-    'before'                         => 'The :attribute must be a date before :date.',
-    'unique_object_for_user'         => 'This name is already in use',
-    'unique_account_for_user'        => 'This account name is already in use',
-    'between.numeric'                => 'The :attribute must be between :min and :max.',
-    'between.file'                   => 'The :attribute must be between :min and :max kilobytes.',
-    'between.string'                 => 'The :attribute must be between :min and :max characters.',
-    'between.array'                  => 'The :attribute must have between :min and :max items.',
-    'boolean'                        => 'The :attribute field must be true or false.',
-    'confirmed'                      => 'The :attribute confirmation does not match.',
-    'date'                           => 'The :attribute is not a valid date.',
-    'date_format'                    => 'The :attribute does not match the format :format.',
-    'different'                      => 'The :attribute and :other must be different.',
-    'digits'                         => 'The :attribute must be :digits digits.',
-    'digits_between'                 => 'The :attribute must be between :min and :max digits.',
-    'email'                          => 'The :attribute must be a valid email address.',
-    'filled'                         => 'The :attribute field is required.',
-    'exists'                         => 'The selected :attribute is invalid.',
-    'image'                          => 'The :attribute must be an image.',
-    'in'                             => 'The selected :attribute is invalid.',
-    'integer'                        => 'The :attribute must be an integer.',
-    'ip'                             => 'The :attribute must be a valid IP address.',
-    'json'                           => 'The :attribute must be a valid JSON string.',
-    'max.numeric'                    => 'The :attribute may not be greater than :max.',
-    'max.file'                       => 'The :attribute may not be greater than :max kilobytes.',
-    'max.string'                     => 'The :attribute may not be greater than :max characters.',
-    'max.array'                      => 'The :attribute may not have more than :max items.',
-    'mimes'                          => 'The :attribute must be a file of type: :values.',
-    'min.numeric'                    => 'The :attribute must be at least :min.',
-    'min.file'                       => 'The :attribute must be at least :min kilobytes.',
-    'min.string'                     => 'The :attribute must be at least :min characters.',
-    'min.array'                      => 'The :attribute must have at least :min items.',
-    'not_in'                         => 'The selected :attribute is invalid.',
-    'numeric'                        => 'The :attribute must be a number.',
-    'regex'                          => 'The :attribute format is invalid.',
-    'required'                       => 'The :attribute field is required.',
-    'required_if'                    => 'The :attribute field is required when :other is :value.',
-    'required_unless'                => 'The :attribute field is required unless :other is in :values.',
-    'required_with'                  => 'The :attribute field is required when :values is present.',
-    'required_with_all'              => 'The :attribute field is required when :values is present.',
-    'required_without'               => 'The :attribute field is required when :values is not present.',
-    'required_without_all'           => 'The :attribute field is required when none of :values are present.',
-    'same'                           => 'The :attribute and :other must match.',
-    'size.numeric'                   => 'The :attribute must be :size.',
-    'size.file'                      => 'The :attribute must be :size kilobytes.',
-    'size.string'                    => 'The :attribute must be :size characters.',
-    'size.array'                     => 'The :attribute must contain :size items.',
-    'unique'                         => 'The :attribute has already been taken.',
-    'string'                         => 'The :attribute must be a string.',
-    'url'                            => 'The :attribute format is invalid.',
-    'timezone'                       => 'The :attribute must be a valid zone.',
-    '2fa_code'                       => 'The :attribute field is invalid.',
-    'dimensions'                     => 'The :attribute has invalid image dimensions.',
-    'distinct'                       => 'The :attribute field has a duplicate value.',
-    'file'                           => 'The :attribute must be a file.',
-    'in_array'                       => 'The :attribute field does not exist in :other.',
-    'present'                        => 'The :attribute field must be present.',
-    'amount_zero'                    => 'The total amount cannot be zero',
-    'secure_password'                => 'This is not a secure password. Please try again. For more information, visit https://goo.gl/NCh2tN',
+    'accepted'                       => '',
+    'bic'                            => '',
+    'more'                           => '',
+    'active_url'                     => '',
+    'after'                          => '',
+    'alpha'                          => '',
+    'alpha_dash'                     => '',
+    'alpha_num'                      => '',
+    'array'                          => '',
+    'unique_for_user'                => '',
+    'before'                         => '',
+    'unique_object_for_user'         => '',
+    'unique_account_for_user'        => '',
+    'between.numeric'                => '',
+    'between.file'                   => '',
+    'between.string'                 => '',
+    'between.array'                  => '',
+    'boolean'                        => '',
+    'confirmed'                      => '',
+    'date'                           => '',
+    'date_format'                    => '',
+    'different'                      => '',
+    'digits'                         => '',
+    'digits_between'                 => '',
+    'email'                          => '',
+    'filled'                         => '',
+    'exists'                         => '',
+    'image'                          => '',
+    'in'                             => '',
+    'integer'                        => '',
+    'ip'                             => '',
+    'json'                           => '',
+    'max.numeric'                    => '',
+    'max.file'                       => '',
+    'max.string'                     => '',
+    'max.array'                      => '',
+    'mimes'                          => '',
+    'min.numeric'                    => '',
+    'min.file'                       => '',
+    'min.string'                     => '',
+    'min.array'                      => '',
+    'not_in'                         => '',
+    'numeric'                        => '',
+    'regex'                          => '',
+    'required'                       => '',
+    'required_if'                    => '',
+    'required_unless'                => '',
+    'required_with'                  => '',
+    'required_with_all'              => '',
+    'required_without'               => '',
+    'required_without_all'           => '',
+    'same'                           => '',
+    'size.numeric'                   => '',
+    'size.file'                      => '',
+    'size.string'                    => '',
+    'size.array'                     => '',
+    'unique'                         => '',
+    'string'                         => '',
+    'url'                            => '',
+    'timezone'                       => '',
+    '2fa_code'                       => '',
+    'dimensions'                     => '',
+    'distinct'                       => '',
+    'file'                           => '',
+    'in_array'                       => '',
+    'present'                        => '',
+    'amount_zero'                    => '',
+    'secure_password'                => '',
 ];
\ No newline at end of file

From 0c3174c2b5f44e209a31fc7cb5cf8a347a32d333 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Fri, 25 Aug 2017 07:07:07 +0200
Subject: [PATCH 251/668] New translations intro.php (French)

---
 resources/lang/fr_FR/intro.php | 144 ++++++++++++++++-----------------
 1 file changed, 72 insertions(+), 72 deletions(-)

diff --git a/resources/lang/fr_FR/intro.php b/resources/lang/fr_FR/intro.php
index c161cef362..cca2854e02 100644
--- a/resources/lang/fr_FR/intro.php
+++ b/resources/lang/fr_FR/intro.php
@@ -11,111 +11,111 @@ declare(strict_types=1);
 
 return [
     // index
-    'index_intro'                           => 'Welcome to the index page of Firefly III. Please take the time to walk through this intro to get a feeling of how Firefly III works.',
-    'index_accounts-chart'                  => 'This chart shows the current balance of your asset accounts. You can select the accounts visible here in your preferences.',
-    'index_box_out_holder'                  => 'This little box and the boxes next to this one will give you a quick overview of your financial situation.',
-    'index_help'                            => 'If you ever need help with a page or a form, press this button.',
-    'index_outro'                           => 'Most pages of Firefly III will start with a little tour like this one. Please contact me when you have questions or comments. Enjoy!',
-    'index_sidebar-toggle'                  => 'To create new transactions, accounts or other things, use the menu under this icon.',
+    'index_intro'                           => '',
+    'index_accounts-chart'                  => '',
+    'index_box_out_holder'                  => '',
+    'index_help'                            => '',
+    'index_outro'                           => '',
+    'index_sidebar-toggle'                  => '',
 
     // create account:
-    'accounts_create_iban'                  => 'Give your accounts a valid IBAN. This could make a data import very easy in the future.',
-    'accounts_create_asset_opening_balance' => 'Assets accounts may have an "opening balance", indicating the start of this account\'s history in Firefly.',
-    'accounts_create_asset_currency'        => 'Firefly III supports multiple currencies. Asset accounts have one main currency, which you must set here.',
-    'accounts_create_asset_virtual'         => 'It can sometimes help to give your account a virtual balance: an extra amount always added to or removed from the actual balance.',
+    'accounts_create_iban'                  => '',
+    'accounts_create_asset_opening_balance' => '',
+    'accounts_create_asset_currency'        => '',
+    'accounts_create_asset_virtual'         => '',
 
     // budgets index
-    'budgets_index_intro'                   => 'Budgets are used to manage your finances and form one of the core functions of Firefly III.',
-    'budgets_index_set_budget'              => 'Set your total budget for every period so Firefly can tell you if you have budgeted all available money.',
-    'budgets_index_see_expenses_bar'        => 'Spending money will slowly fill this bar.',
-    'budgets_index_navigate_periods'        => 'Navigate through periods to easily set budgets ahead of time.',
-    'budgets_index_new_budget'              => 'Create new budgets as you see fit.',
-    'budgets_index_list_of_budgets'         => 'Use this table to set the amounts for each budget and see how you are doing.',
+    'budgets_index_intro'                   => '',
+    'budgets_index_set_budget'              => '',
+    'budgets_index_see_expenses_bar'        => '',
+    'budgets_index_navigate_periods'        => '',
+    'budgets_index_new_budget'              => '',
+    'budgets_index_list_of_budgets'         => '',
 
     // reports (index)
-    'reports_index_intro'                   => 'Use these reports to get detailed insights in your finances.',
-    'reports_index_inputReportType'         => 'Pick a report type. Check out the help pages to see what each report shows you.',
-    'reports_index_inputAccountsSelect'     => 'You can exclude or include asset accounts as you see fit.',
-    'reports_index_inputDateRange'          => 'The selected date range is entirely up to you: from one day to 10 years.',
-    'reports_index_extra-options-box'       => 'Depending on the report you have selected, you can select extra filters and options here. Watch this box when you change report types.',
+    'reports_index_intro'                   => '',
+    'reports_index_inputReportType'         => '',
+    'reports_index_inputAccountsSelect'     => '',
+    'reports_index_inputDateRange'          => '',
+    'reports_index_extra-options-box'       => '',
 
     // reports (reports)
-    'reports_report_default_intro'          => 'This report will give you a quick and comprehensive overview of your finances. If you wish to see anything else, please don\'t hestitate to contact me!',
-    'reports_report_audit_intro'            => 'This report will give you detailed insights in your asset accounts.',
-    'reports_report_audit_optionsBox'       => 'Use these check boxes to show or hide the columns you are interested in.',
+    'reports_report_default_intro'          => '',
+    'reports_report_audit_intro'            => '',
+    'reports_report_audit_optionsBox'       => '',
 
-    'reports_report_category_intro'                  => 'This report will give you insight in one or multiple categories.',
-    'reports_report_category_pieCharts'              => 'These charts will give you insight in expenses and income per category or per account.',
-    'reports_report_category_incomeAndExpensesChart' => 'This chart shows your expenses and income per category.',
+    'reports_report_category_intro'                  => '',
+    'reports_report_category_pieCharts'              => '',
+    'reports_report_category_incomeAndExpensesChart' => '',
 
-    'reports_report_tag_intro'                  => 'This report will give you insight in one or multiple tags.',
-    'reports_report_tag_pieCharts'              => 'These charts will give you insight in expenses and income per tag, account, category or budget.',
-    'reports_report_tag_incomeAndExpensesChart' => 'This chart shows your expenses and income per tag.',
+    'reports_report_tag_intro'                  => '',
+    'reports_report_tag_pieCharts'              => '',
+    'reports_report_tag_incomeAndExpensesChart' => '',
 
-    'reports_report_budget_intro'                             => 'This report will give you insight in one or multiple budgets.',
-    'reports_report_budget_pieCharts'                         => 'These charts will give you insight in expenses per budget or per account.',
-    'reports_report_budget_incomeAndExpensesChart'            => 'This chart shows your expenses per budget.',
+    'reports_report_budget_intro'                             => '',
+    'reports_report_budget_pieCharts'                         => '',
+    'reports_report_budget_incomeAndExpensesChart'            => '',
 
     // create transaction
-    'transactions_create_switch_box'                          => 'Use these buttons to quickly switch the type of transaction you wish to save.',
-    'transactions_create_ffInput_category'                    => 'You can freely type in this field. Previously created categories will be suggested.',
-    'transactions_create_withdrawal_ffInput_budget'           => 'Link your withdrawal to a budget for better financial control.',
-    'transactions_create_withdrawal_currency_dropdown_amount' => 'Use this dropdown when your withdrawal is in another currency.',
-    'transactions_create_deposit_currency_dropdown_amount'    => 'Use this dropdown when your deposit is in another currency.',
-    'transactions_create_transfer_ffInput_piggy_bank_id'      => 'Select a piggy bank and link this transfer to your savings.',
+    'transactions_create_switch_box'                          => '',
+    'transactions_create_ffInput_category'                    => '',
+    'transactions_create_withdrawal_ffInput_budget'           => '',
+    'transactions_create_withdrawal_currency_dropdown_amount' => '',
+    'transactions_create_deposit_currency_dropdown_amount'    => '',
+    'transactions_create_transfer_ffInput_piggy_bank_id'      => '',
 
     // piggy banks index:
-    'piggy-banks_index_saved'                                 => 'This field shows you how much you\'ve saved in each piggy bank.',
-    'piggy-banks_index_button'                                => 'Next to this progress bar are two buttons (+ and -) to add or remove money from each piggy bank.',
-    'piggy-banks_index_accountStatus'                         => 'For each asset account with at least one piggy bank the status is listed in this table.',
+    'piggy-banks_index_saved'                                 => '',
+    'piggy-banks_index_button'                                => '',
+    'piggy-banks_index_accountStatus'                         => '',
 
     // create piggy
-    'piggy-banks_create_name'                                 => 'What is your goal? A new couch, a camera, money for emergencies?',
-    'piggy-banks_create_date'                                 => 'You can set a target date or a deadline for your piggy bank.',
+    'piggy-banks_create_name'                                 => '',
+    'piggy-banks_create_date'                                 => '',
 
     // show piggy
-    'piggy-banks_show_piggyChart'                             => 'This chart will show the history of this piggy bank.',
-    'piggy-banks_show_piggyDetails'                           => 'Some details about your piggy bank',
-    'piggy-banks_show_piggyEvents'                            => 'Any additions or removals are also listed here.',
+    'piggy-banks_show_piggyChart'                             => '',
+    'piggy-banks_show_piggyDetails'                           => '',
+    'piggy-banks_show_piggyEvents'                            => '',
 
     // bill index
-    'bills_index_paid_in_period'                              => 'This field indicates when the bill was last paid.',
-    'bills_index_expected_in_period'                          => 'This field indicates for each bill if and when the next bill is expected to hit.',
+    'bills_index_paid_in_period'                              => '',
+    'bills_index_expected_in_period'                          => '',
 
     // show bill
-    'bills_show_billInfo'                                     => 'This table shows some general information about this bill.',
-    'bills_show_billButtons'                                  => 'Use this button to re-scan old transactions so they will be matched to this bill.',
-    'bills_show_billChart'                                    => 'This chart shows the transactions linked to this bill.',
+    'bills_show_billInfo'                                     => '',
+    'bills_show_billButtons'                                  => '',
+    'bills_show_billChart'                                    => '',
 
     // create bill
-    'bills_create_name'                                       => 'Use a descriptive name such as "Rent" or "Health insurance".',
-    'bills_create_match'                                      => 'To match transactions, use terms from those transactions or the expense account involved. All words must match.',
-    'bills_create_amount_min_holder'                          => 'Select a minimum and maximum amount for this bill.',
-    'bills_create_repeat_freq_holder'                         => 'Most bills repeat monthly, but you can set another frequency here.',
-    'bills_create_skip_holder'                                => 'If a bill repeats every 2 weeks for example, the "skip"-field should be set to "1" to skip every other week.',
+    'bills_create_name'                                       => '',
+    'bills_create_match'                                      => '',
+    'bills_create_amount_min_holder'                          => '',
+    'bills_create_repeat_freq_holder'                         => '',
+    'bills_create_skip_holder'                                => '',
 
     // rules index
-    'rules_index_intro'                                       => 'Firefly III allows you to manage rules, that will automagically be applied to any transaction you create or edit.',
-    'rules_index_new_rule_group'                              => 'You can combine rules in groups for easier management.',
-    'rules_index_new_rule'                                    => 'Create as many rules as you like.',
-    'rules_index_prio_buttons'                                => 'Order them any way you see fit.',
-    'rules_index_test_buttons'                                => 'You can test your rules or apply them to existing transactions.',
-    'rules_index_rule-triggers'                               => 'Rules have "triggers" and "actions" that you can order by drag-and-drop.',
-    'rules_index_outro'                                       => 'Be sure to check out the help pages using the (?) icon in the top right!',
+    'rules_index_intro'                                       => '',
+    'rules_index_new_rule_group'                              => '',
+    'rules_index_new_rule'                                    => '',
+    'rules_index_prio_buttons'                                => '',
+    'rules_index_test_buttons'                                => '',
+    'rules_index_rule-triggers'                               => '',
+    'rules_index_outro'                                       => '',
 
     // create rule:
-    'rules_create_mandatory'                                  => 'Choose a descriptive title, and set when the rule should be fired.',
-    'rules_create_ruletriggerholder'                          => 'Add as many triggers as you like, but remember that ALL triggers must match before any actions are fired.',
-    'rules_create_test_rule_triggers'                         => 'Use this button to see which transactions would match your rule.',
-    'rules_create_actions'                                    => 'Set as many actions as you like.',
+    'rules_create_mandatory'                                  => '',
+    'rules_create_ruletriggerholder'                          => '',
+    'rules_create_test_rule_triggers'                         => '',
+    'rules_create_actions'                                    => '',
 
     // preferences
-    'preferences_index_tabs'                                  => 'More options are available behind these tabs.',
+    'preferences_index_tabs'                                  => '',
 
     // currencies
-    'currencies_index_intro'                                  => 'Firefly III supports multiple currencies, which you can change on this page.',
-    'currencies_index_default'                                => 'Firefly III has one default currency. You can always switch of course using these buttons.',
+    'currencies_index_intro'                                  => '',
+    'currencies_index_default'                                => '',
 
     // create currency
-    'currencies_create_code'                                  => 'This code should be ISO compliant (Google it for your new currency).',
+    'currencies_create_code'                                  => '',
 ];
\ No newline at end of file

From d72bdcfe9b5342e84623d90b59a21ace5849a1ee Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Fri, 25 Aug 2017 07:07:08 +0200
Subject: [PATCH 252/668] New translations intro.php (German)

---
 resources/lang/de_DE/intro.php | 144 ++++++++++++++++-----------------
 1 file changed, 72 insertions(+), 72 deletions(-)

diff --git a/resources/lang/de_DE/intro.php b/resources/lang/de_DE/intro.php
index c161cef362..cca2854e02 100644
--- a/resources/lang/de_DE/intro.php
+++ b/resources/lang/de_DE/intro.php
@@ -11,111 +11,111 @@ declare(strict_types=1);
 
 return [
     // index
-    'index_intro'                           => 'Welcome to the index page of Firefly III. Please take the time to walk through this intro to get a feeling of how Firefly III works.',
-    'index_accounts-chart'                  => 'This chart shows the current balance of your asset accounts. You can select the accounts visible here in your preferences.',
-    'index_box_out_holder'                  => 'This little box and the boxes next to this one will give you a quick overview of your financial situation.',
-    'index_help'                            => 'If you ever need help with a page or a form, press this button.',
-    'index_outro'                           => 'Most pages of Firefly III will start with a little tour like this one. Please contact me when you have questions or comments. Enjoy!',
-    'index_sidebar-toggle'                  => 'To create new transactions, accounts or other things, use the menu under this icon.',
+    'index_intro'                           => '',
+    'index_accounts-chart'                  => '',
+    'index_box_out_holder'                  => '',
+    'index_help'                            => '',
+    'index_outro'                           => '',
+    'index_sidebar-toggle'                  => '',
 
     // create account:
-    'accounts_create_iban'                  => 'Give your accounts a valid IBAN. This could make a data import very easy in the future.',
-    'accounts_create_asset_opening_balance' => 'Assets accounts may have an "opening balance", indicating the start of this account\'s history in Firefly.',
-    'accounts_create_asset_currency'        => 'Firefly III supports multiple currencies. Asset accounts have one main currency, which you must set here.',
-    'accounts_create_asset_virtual'         => 'It can sometimes help to give your account a virtual balance: an extra amount always added to or removed from the actual balance.',
+    'accounts_create_iban'                  => '',
+    'accounts_create_asset_opening_balance' => '',
+    'accounts_create_asset_currency'        => '',
+    'accounts_create_asset_virtual'         => '',
 
     // budgets index
-    'budgets_index_intro'                   => 'Budgets are used to manage your finances and form one of the core functions of Firefly III.',
-    'budgets_index_set_budget'              => 'Set your total budget for every period so Firefly can tell you if you have budgeted all available money.',
-    'budgets_index_see_expenses_bar'        => 'Spending money will slowly fill this bar.',
-    'budgets_index_navigate_periods'        => 'Navigate through periods to easily set budgets ahead of time.',
-    'budgets_index_new_budget'              => 'Create new budgets as you see fit.',
-    'budgets_index_list_of_budgets'         => 'Use this table to set the amounts for each budget and see how you are doing.',
+    'budgets_index_intro'                   => '',
+    'budgets_index_set_budget'              => '',
+    'budgets_index_see_expenses_bar'        => '',
+    'budgets_index_navigate_periods'        => '',
+    'budgets_index_new_budget'              => '',
+    'budgets_index_list_of_budgets'         => '',
 
     // reports (index)
-    'reports_index_intro'                   => 'Use these reports to get detailed insights in your finances.',
-    'reports_index_inputReportType'         => 'Pick a report type. Check out the help pages to see what each report shows you.',
-    'reports_index_inputAccountsSelect'     => 'You can exclude or include asset accounts as you see fit.',
-    'reports_index_inputDateRange'          => 'The selected date range is entirely up to you: from one day to 10 years.',
-    'reports_index_extra-options-box'       => 'Depending on the report you have selected, you can select extra filters and options here. Watch this box when you change report types.',
+    'reports_index_intro'                   => '',
+    'reports_index_inputReportType'         => '',
+    'reports_index_inputAccountsSelect'     => '',
+    'reports_index_inputDateRange'          => '',
+    'reports_index_extra-options-box'       => '',
 
     // reports (reports)
-    'reports_report_default_intro'          => 'This report will give you a quick and comprehensive overview of your finances. If you wish to see anything else, please don\'t hestitate to contact me!',
-    'reports_report_audit_intro'            => 'This report will give you detailed insights in your asset accounts.',
-    'reports_report_audit_optionsBox'       => 'Use these check boxes to show or hide the columns you are interested in.',
+    'reports_report_default_intro'          => '',
+    'reports_report_audit_intro'            => '',
+    'reports_report_audit_optionsBox'       => '',
 
-    'reports_report_category_intro'                  => 'This report will give you insight in one or multiple categories.',
-    'reports_report_category_pieCharts'              => 'These charts will give you insight in expenses and income per category or per account.',
-    'reports_report_category_incomeAndExpensesChart' => 'This chart shows your expenses and income per category.',
+    'reports_report_category_intro'                  => '',
+    'reports_report_category_pieCharts'              => '',
+    'reports_report_category_incomeAndExpensesChart' => '',
 
-    'reports_report_tag_intro'                  => 'This report will give you insight in one or multiple tags.',
-    'reports_report_tag_pieCharts'              => 'These charts will give you insight in expenses and income per tag, account, category or budget.',
-    'reports_report_tag_incomeAndExpensesChart' => 'This chart shows your expenses and income per tag.',
+    'reports_report_tag_intro'                  => '',
+    'reports_report_tag_pieCharts'              => '',
+    'reports_report_tag_incomeAndExpensesChart' => '',
 
-    'reports_report_budget_intro'                             => 'This report will give you insight in one or multiple budgets.',
-    'reports_report_budget_pieCharts'                         => 'These charts will give you insight in expenses per budget or per account.',
-    'reports_report_budget_incomeAndExpensesChart'            => 'This chart shows your expenses per budget.',
+    'reports_report_budget_intro'                             => '',
+    'reports_report_budget_pieCharts'                         => '',
+    'reports_report_budget_incomeAndExpensesChart'            => '',
 
     // create transaction
-    'transactions_create_switch_box'                          => 'Use these buttons to quickly switch the type of transaction you wish to save.',
-    'transactions_create_ffInput_category'                    => 'You can freely type in this field. Previously created categories will be suggested.',
-    'transactions_create_withdrawal_ffInput_budget'           => 'Link your withdrawal to a budget for better financial control.',
-    'transactions_create_withdrawal_currency_dropdown_amount' => 'Use this dropdown when your withdrawal is in another currency.',
-    'transactions_create_deposit_currency_dropdown_amount'    => 'Use this dropdown when your deposit is in another currency.',
-    'transactions_create_transfer_ffInput_piggy_bank_id'      => 'Select a piggy bank and link this transfer to your savings.',
+    'transactions_create_switch_box'                          => '',
+    'transactions_create_ffInput_category'                    => '',
+    'transactions_create_withdrawal_ffInput_budget'           => '',
+    'transactions_create_withdrawal_currency_dropdown_amount' => '',
+    'transactions_create_deposit_currency_dropdown_amount'    => '',
+    'transactions_create_transfer_ffInput_piggy_bank_id'      => '',
 
     // piggy banks index:
-    'piggy-banks_index_saved'                                 => 'This field shows you how much you\'ve saved in each piggy bank.',
-    'piggy-banks_index_button'                                => 'Next to this progress bar are two buttons (+ and -) to add or remove money from each piggy bank.',
-    'piggy-banks_index_accountStatus'                         => 'For each asset account with at least one piggy bank the status is listed in this table.',
+    'piggy-banks_index_saved'                                 => '',
+    'piggy-banks_index_button'                                => '',
+    'piggy-banks_index_accountStatus'                         => '',
 
     // create piggy
-    'piggy-banks_create_name'                                 => 'What is your goal? A new couch, a camera, money for emergencies?',
-    'piggy-banks_create_date'                                 => 'You can set a target date or a deadline for your piggy bank.',
+    'piggy-banks_create_name'                                 => '',
+    'piggy-banks_create_date'                                 => '',
 
     // show piggy
-    'piggy-banks_show_piggyChart'                             => 'This chart will show the history of this piggy bank.',
-    'piggy-banks_show_piggyDetails'                           => 'Some details about your piggy bank',
-    'piggy-banks_show_piggyEvents'                            => 'Any additions or removals are also listed here.',
+    'piggy-banks_show_piggyChart'                             => '',
+    'piggy-banks_show_piggyDetails'                           => '',
+    'piggy-banks_show_piggyEvents'                            => '',
 
     // bill index
-    'bills_index_paid_in_period'                              => 'This field indicates when the bill was last paid.',
-    'bills_index_expected_in_period'                          => 'This field indicates for each bill if and when the next bill is expected to hit.',
+    'bills_index_paid_in_period'                              => '',
+    'bills_index_expected_in_period'                          => '',
 
     // show bill
-    'bills_show_billInfo'                                     => 'This table shows some general information about this bill.',
-    'bills_show_billButtons'                                  => 'Use this button to re-scan old transactions so they will be matched to this bill.',
-    'bills_show_billChart'                                    => 'This chart shows the transactions linked to this bill.',
+    'bills_show_billInfo'                                     => '',
+    'bills_show_billButtons'                                  => '',
+    'bills_show_billChart'                                    => '',
 
     // create bill
-    'bills_create_name'                                       => 'Use a descriptive name such as "Rent" or "Health insurance".',
-    'bills_create_match'                                      => 'To match transactions, use terms from those transactions or the expense account involved. All words must match.',
-    'bills_create_amount_min_holder'                          => 'Select a minimum and maximum amount for this bill.',
-    'bills_create_repeat_freq_holder'                         => 'Most bills repeat monthly, but you can set another frequency here.',
-    'bills_create_skip_holder'                                => 'If a bill repeats every 2 weeks for example, the "skip"-field should be set to "1" to skip every other week.',
+    'bills_create_name'                                       => '',
+    'bills_create_match'                                      => '',
+    'bills_create_amount_min_holder'                          => '',
+    'bills_create_repeat_freq_holder'                         => '',
+    'bills_create_skip_holder'                                => '',
 
     // rules index
-    'rules_index_intro'                                       => 'Firefly III allows you to manage rules, that will automagically be applied to any transaction you create or edit.',
-    'rules_index_new_rule_group'                              => 'You can combine rules in groups for easier management.',
-    'rules_index_new_rule'                                    => 'Create as many rules as you like.',
-    'rules_index_prio_buttons'                                => 'Order them any way you see fit.',
-    'rules_index_test_buttons'                                => 'You can test your rules or apply them to existing transactions.',
-    'rules_index_rule-triggers'                               => 'Rules have "triggers" and "actions" that you can order by drag-and-drop.',
-    'rules_index_outro'                                       => 'Be sure to check out the help pages using the (?) icon in the top right!',
+    'rules_index_intro'                                       => '',
+    'rules_index_new_rule_group'                              => '',
+    'rules_index_new_rule'                                    => '',
+    'rules_index_prio_buttons'                                => '',
+    'rules_index_test_buttons'                                => '',
+    'rules_index_rule-triggers'                               => '',
+    'rules_index_outro'                                       => '',
 
     // create rule:
-    'rules_create_mandatory'                                  => 'Choose a descriptive title, and set when the rule should be fired.',
-    'rules_create_ruletriggerholder'                          => 'Add as many triggers as you like, but remember that ALL triggers must match before any actions are fired.',
-    'rules_create_test_rule_triggers'                         => 'Use this button to see which transactions would match your rule.',
-    'rules_create_actions'                                    => 'Set as many actions as you like.',
+    'rules_create_mandatory'                                  => '',
+    'rules_create_ruletriggerholder'                          => '',
+    'rules_create_test_rule_triggers'                         => '',
+    'rules_create_actions'                                    => '',
 
     // preferences
-    'preferences_index_tabs'                                  => 'More options are available behind these tabs.',
+    'preferences_index_tabs'                                  => '',
 
     // currencies
-    'currencies_index_intro'                                  => 'Firefly III supports multiple currencies, which you can change on this page.',
-    'currencies_index_default'                                => 'Firefly III has one default currency. You can always switch of course using these buttons.',
+    'currencies_index_intro'                                  => '',
+    'currencies_index_default'                                => '',
 
     // create currency
-    'currencies_create_code'                                  => 'This code should be ISO compliant (Google it for your new currency).',
+    'currencies_create_code'                                  => '',
 ];
\ No newline at end of file

From 596dd03bb4c8145aeb55e0d6c50d7a248aca0c3d Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Fri, 25 Aug 2017 07:07:09 +0200
Subject: [PATCH 253/668] New translations intro.php (Slovenian)

---
 resources/lang/sl_SI/intro.php | 144 ++++++++++++++++-----------------
 1 file changed, 72 insertions(+), 72 deletions(-)

diff --git a/resources/lang/sl_SI/intro.php b/resources/lang/sl_SI/intro.php
index c161cef362..cca2854e02 100644
--- a/resources/lang/sl_SI/intro.php
+++ b/resources/lang/sl_SI/intro.php
@@ -11,111 +11,111 @@ declare(strict_types=1);
 
 return [
     // index
-    'index_intro'                           => 'Welcome to the index page of Firefly III. Please take the time to walk through this intro to get a feeling of how Firefly III works.',
-    'index_accounts-chart'                  => 'This chart shows the current balance of your asset accounts. You can select the accounts visible here in your preferences.',
-    'index_box_out_holder'                  => 'This little box and the boxes next to this one will give you a quick overview of your financial situation.',
-    'index_help'                            => 'If you ever need help with a page or a form, press this button.',
-    'index_outro'                           => 'Most pages of Firefly III will start with a little tour like this one. Please contact me when you have questions or comments. Enjoy!',
-    'index_sidebar-toggle'                  => 'To create new transactions, accounts or other things, use the menu under this icon.',
+    'index_intro'                           => '',
+    'index_accounts-chart'                  => '',
+    'index_box_out_holder'                  => '',
+    'index_help'                            => '',
+    'index_outro'                           => '',
+    'index_sidebar-toggle'                  => '',
 
     // create account:
-    'accounts_create_iban'                  => 'Give your accounts a valid IBAN. This could make a data import very easy in the future.',
-    'accounts_create_asset_opening_balance' => 'Assets accounts may have an "opening balance", indicating the start of this account\'s history in Firefly.',
-    'accounts_create_asset_currency'        => 'Firefly III supports multiple currencies. Asset accounts have one main currency, which you must set here.',
-    'accounts_create_asset_virtual'         => 'It can sometimes help to give your account a virtual balance: an extra amount always added to or removed from the actual balance.',
+    'accounts_create_iban'                  => '',
+    'accounts_create_asset_opening_balance' => '',
+    'accounts_create_asset_currency'        => '',
+    'accounts_create_asset_virtual'         => '',
 
     // budgets index
-    'budgets_index_intro'                   => 'Budgets are used to manage your finances and form one of the core functions of Firefly III.',
-    'budgets_index_set_budget'              => 'Set your total budget for every period so Firefly can tell you if you have budgeted all available money.',
-    'budgets_index_see_expenses_bar'        => 'Spending money will slowly fill this bar.',
-    'budgets_index_navigate_periods'        => 'Navigate through periods to easily set budgets ahead of time.',
-    'budgets_index_new_budget'              => 'Create new budgets as you see fit.',
-    'budgets_index_list_of_budgets'         => 'Use this table to set the amounts for each budget and see how you are doing.',
+    'budgets_index_intro'                   => '',
+    'budgets_index_set_budget'              => '',
+    'budgets_index_see_expenses_bar'        => '',
+    'budgets_index_navigate_periods'        => '',
+    'budgets_index_new_budget'              => '',
+    'budgets_index_list_of_budgets'         => '',
 
     // reports (index)
-    'reports_index_intro'                   => 'Use these reports to get detailed insights in your finances.',
-    'reports_index_inputReportType'         => 'Pick a report type. Check out the help pages to see what each report shows you.',
-    'reports_index_inputAccountsSelect'     => 'You can exclude or include asset accounts as you see fit.',
-    'reports_index_inputDateRange'          => 'The selected date range is entirely up to you: from one day to 10 years.',
-    'reports_index_extra-options-box'       => 'Depending on the report you have selected, you can select extra filters and options here. Watch this box when you change report types.',
+    'reports_index_intro'                   => '',
+    'reports_index_inputReportType'         => '',
+    'reports_index_inputAccountsSelect'     => '',
+    'reports_index_inputDateRange'          => '',
+    'reports_index_extra-options-box'       => '',
 
     // reports (reports)
-    'reports_report_default_intro'          => 'This report will give you a quick and comprehensive overview of your finances. If you wish to see anything else, please don\'t hestitate to contact me!',
-    'reports_report_audit_intro'            => 'This report will give you detailed insights in your asset accounts.',
-    'reports_report_audit_optionsBox'       => 'Use these check boxes to show or hide the columns you are interested in.',
+    'reports_report_default_intro'          => '',
+    'reports_report_audit_intro'            => '',
+    'reports_report_audit_optionsBox'       => '',
 
-    'reports_report_category_intro'                  => 'This report will give you insight in one or multiple categories.',
-    'reports_report_category_pieCharts'              => 'These charts will give you insight in expenses and income per category or per account.',
-    'reports_report_category_incomeAndExpensesChart' => 'This chart shows your expenses and income per category.',
+    'reports_report_category_intro'                  => '',
+    'reports_report_category_pieCharts'              => '',
+    'reports_report_category_incomeAndExpensesChart' => '',
 
-    'reports_report_tag_intro'                  => 'This report will give you insight in one or multiple tags.',
-    'reports_report_tag_pieCharts'              => 'These charts will give you insight in expenses and income per tag, account, category or budget.',
-    'reports_report_tag_incomeAndExpensesChart' => 'This chart shows your expenses and income per tag.',
+    'reports_report_tag_intro'                  => '',
+    'reports_report_tag_pieCharts'              => '',
+    'reports_report_tag_incomeAndExpensesChart' => '',
 
-    'reports_report_budget_intro'                             => 'This report will give you insight in one or multiple budgets.',
-    'reports_report_budget_pieCharts'                         => 'These charts will give you insight in expenses per budget or per account.',
-    'reports_report_budget_incomeAndExpensesChart'            => 'This chart shows your expenses per budget.',
+    'reports_report_budget_intro'                             => '',
+    'reports_report_budget_pieCharts'                         => '',
+    'reports_report_budget_incomeAndExpensesChart'            => '',
 
     // create transaction
-    'transactions_create_switch_box'                          => 'Use these buttons to quickly switch the type of transaction you wish to save.',
-    'transactions_create_ffInput_category'                    => 'You can freely type in this field. Previously created categories will be suggested.',
-    'transactions_create_withdrawal_ffInput_budget'           => 'Link your withdrawal to a budget for better financial control.',
-    'transactions_create_withdrawal_currency_dropdown_amount' => 'Use this dropdown when your withdrawal is in another currency.',
-    'transactions_create_deposit_currency_dropdown_amount'    => 'Use this dropdown when your deposit is in another currency.',
-    'transactions_create_transfer_ffInput_piggy_bank_id'      => 'Select a piggy bank and link this transfer to your savings.',
+    'transactions_create_switch_box'                          => '',
+    'transactions_create_ffInput_category'                    => '',
+    'transactions_create_withdrawal_ffInput_budget'           => '',
+    'transactions_create_withdrawal_currency_dropdown_amount' => '',
+    'transactions_create_deposit_currency_dropdown_amount'    => '',
+    'transactions_create_transfer_ffInput_piggy_bank_id'      => '',
 
     // piggy banks index:
-    'piggy-banks_index_saved'                                 => 'This field shows you how much you\'ve saved in each piggy bank.',
-    'piggy-banks_index_button'                                => 'Next to this progress bar are two buttons (+ and -) to add or remove money from each piggy bank.',
-    'piggy-banks_index_accountStatus'                         => 'For each asset account with at least one piggy bank the status is listed in this table.',
+    'piggy-banks_index_saved'                                 => '',
+    'piggy-banks_index_button'                                => '',
+    'piggy-banks_index_accountStatus'                         => '',
 
     // create piggy
-    'piggy-banks_create_name'                                 => 'What is your goal? A new couch, a camera, money for emergencies?',
-    'piggy-banks_create_date'                                 => 'You can set a target date or a deadline for your piggy bank.',
+    'piggy-banks_create_name'                                 => '',
+    'piggy-banks_create_date'                                 => '',
 
     // show piggy
-    'piggy-banks_show_piggyChart'                             => 'This chart will show the history of this piggy bank.',
-    'piggy-banks_show_piggyDetails'                           => 'Some details about your piggy bank',
-    'piggy-banks_show_piggyEvents'                            => 'Any additions or removals are also listed here.',
+    'piggy-banks_show_piggyChart'                             => '',
+    'piggy-banks_show_piggyDetails'                           => '',
+    'piggy-banks_show_piggyEvents'                            => '',
 
     // bill index
-    'bills_index_paid_in_period'                              => 'This field indicates when the bill was last paid.',
-    'bills_index_expected_in_period'                          => 'This field indicates for each bill if and when the next bill is expected to hit.',
+    'bills_index_paid_in_period'                              => '',
+    'bills_index_expected_in_period'                          => '',
 
     // show bill
-    'bills_show_billInfo'                                     => 'This table shows some general information about this bill.',
-    'bills_show_billButtons'                                  => 'Use this button to re-scan old transactions so they will be matched to this bill.',
-    'bills_show_billChart'                                    => 'This chart shows the transactions linked to this bill.',
+    'bills_show_billInfo'                                     => '',
+    'bills_show_billButtons'                                  => '',
+    'bills_show_billChart'                                    => '',
 
     // create bill
-    'bills_create_name'                                       => 'Use a descriptive name such as "Rent" or "Health insurance".',
-    'bills_create_match'                                      => 'To match transactions, use terms from those transactions or the expense account involved. All words must match.',
-    'bills_create_amount_min_holder'                          => 'Select a minimum and maximum amount for this bill.',
-    'bills_create_repeat_freq_holder'                         => 'Most bills repeat monthly, but you can set another frequency here.',
-    'bills_create_skip_holder'                                => 'If a bill repeats every 2 weeks for example, the "skip"-field should be set to "1" to skip every other week.',
+    'bills_create_name'                                       => '',
+    'bills_create_match'                                      => '',
+    'bills_create_amount_min_holder'                          => '',
+    'bills_create_repeat_freq_holder'                         => '',
+    'bills_create_skip_holder'                                => '',
 
     // rules index
-    'rules_index_intro'                                       => 'Firefly III allows you to manage rules, that will automagically be applied to any transaction you create or edit.',
-    'rules_index_new_rule_group'                              => 'You can combine rules in groups for easier management.',
-    'rules_index_new_rule'                                    => 'Create as many rules as you like.',
-    'rules_index_prio_buttons'                                => 'Order them any way you see fit.',
-    'rules_index_test_buttons'                                => 'You can test your rules or apply them to existing transactions.',
-    'rules_index_rule-triggers'                               => 'Rules have "triggers" and "actions" that you can order by drag-and-drop.',
-    'rules_index_outro'                                       => 'Be sure to check out the help pages using the (?) icon in the top right!',
+    'rules_index_intro'                                       => '',
+    'rules_index_new_rule_group'                              => '',
+    'rules_index_new_rule'                                    => '',
+    'rules_index_prio_buttons'                                => '',
+    'rules_index_test_buttons'                                => '',
+    'rules_index_rule-triggers'                               => '',
+    'rules_index_outro'                                       => '',
 
     // create rule:
-    'rules_create_mandatory'                                  => 'Choose a descriptive title, and set when the rule should be fired.',
-    'rules_create_ruletriggerholder'                          => 'Add as many triggers as you like, but remember that ALL triggers must match before any actions are fired.',
-    'rules_create_test_rule_triggers'                         => 'Use this button to see which transactions would match your rule.',
-    'rules_create_actions'                                    => 'Set as many actions as you like.',
+    'rules_create_mandatory'                                  => '',
+    'rules_create_ruletriggerholder'                          => '',
+    'rules_create_test_rule_triggers'                         => '',
+    'rules_create_actions'                                    => '',
 
     // preferences
-    'preferences_index_tabs'                                  => 'More options are available behind these tabs.',
+    'preferences_index_tabs'                                  => '',
 
     // currencies
-    'currencies_index_intro'                                  => 'Firefly III supports multiple currencies, which you can change on this page.',
-    'currencies_index_default'                                => 'Firefly III has one default currency. You can always switch of course using these buttons.',
+    'currencies_index_intro'                                  => '',
+    'currencies_index_default'                                => '',
 
     // create currency
-    'currencies_create_code'                                  => 'This code should be ISO compliant (Google it for your new currency).',
+    'currencies_create_code'                                  => '',
 ];
\ No newline at end of file

From c5eb3923c1435f693b1981256f8164254da715fe Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Fri, 25 Aug 2017 07:07:10 +0200
Subject: [PATCH 254/668] New translations intro.php (Spanish)

---
 resources/lang/es_ES/intro.php | 144 ++++++++++++++++-----------------
 1 file changed, 72 insertions(+), 72 deletions(-)

diff --git a/resources/lang/es_ES/intro.php b/resources/lang/es_ES/intro.php
index c161cef362..cca2854e02 100644
--- a/resources/lang/es_ES/intro.php
+++ b/resources/lang/es_ES/intro.php
@@ -11,111 +11,111 @@ declare(strict_types=1);
 
 return [
     // index
-    'index_intro'                           => 'Welcome to the index page of Firefly III. Please take the time to walk through this intro to get a feeling of how Firefly III works.',
-    'index_accounts-chart'                  => 'This chart shows the current balance of your asset accounts. You can select the accounts visible here in your preferences.',
-    'index_box_out_holder'                  => 'This little box and the boxes next to this one will give you a quick overview of your financial situation.',
-    'index_help'                            => 'If you ever need help with a page or a form, press this button.',
-    'index_outro'                           => 'Most pages of Firefly III will start with a little tour like this one. Please contact me when you have questions or comments. Enjoy!',
-    'index_sidebar-toggle'                  => 'To create new transactions, accounts or other things, use the menu under this icon.',
+    'index_intro'                           => '',
+    'index_accounts-chart'                  => '',
+    'index_box_out_holder'                  => '',
+    'index_help'                            => '',
+    'index_outro'                           => '',
+    'index_sidebar-toggle'                  => '',
 
     // create account:
-    'accounts_create_iban'                  => 'Give your accounts a valid IBAN. This could make a data import very easy in the future.',
-    'accounts_create_asset_opening_balance' => 'Assets accounts may have an "opening balance", indicating the start of this account\'s history in Firefly.',
-    'accounts_create_asset_currency'        => 'Firefly III supports multiple currencies. Asset accounts have one main currency, which you must set here.',
-    'accounts_create_asset_virtual'         => 'It can sometimes help to give your account a virtual balance: an extra amount always added to or removed from the actual balance.',
+    'accounts_create_iban'                  => '',
+    'accounts_create_asset_opening_balance' => '',
+    'accounts_create_asset_currency'        => '',
+    'accounts_create_asset_virtual'         => '',
 
     // budgets index
-    'budgets_index_intro'                   => 'Budgets are used to manage your finances and form one of the core functions of Firefly III.',
-    'budgets_index_set_budget'              => 'Set your total budget for every period so Firefly can tell you if you have budgeted all available money.',
-    'budgets_index_see_expenses_bar'        => 'Spending money will slowly fill this bar.',
-    'budgets_index_navigate_periods'        => 'Navigate through periods to easily set budgets ahead of time.',
-    'budgets_index_new_budget'              => 'Create new budgets as you see fit.',
-    'budgets_index_list_of_budgets'         => 'Use this table to set the amounts for each budget and see how you are doing.',
+    'budgets_index_intro'                   => '',
+    'budgets_index_set_budget'              => '',
+    'budgets_index_see_expenses_bar'        => '',
+    'budgets_index_navigate_periods'        => '',
+    'budgets_index_new_budget'              => '',
+    'budgets_index_list_of_budgets'         => '',
 
     // reports (index)
-    'reports_index_intro'                   => 'Use these reports to get detailed insights in your finances.',
-    'reports_index_inputReportType'         => 'Pick a report type. Check out the help pages to see what each report shows you.',
-    'reports_index_inputAccountsSelect'     => 'You can exclude or include asset accounts as you see fit.',
-    'reports_index_inputDateRange'          => 'The selected date range is entirely up to you: from one day to 10 years.',
-    'reports_index_extra-options-box'       => 'Depending on the report you have selected, you can select extra filters and options here. Watch this box when you change report types.',
+    'reports_index_intro'                   => '',
+    'reports_index_inputReportType'         => '',
+    'reports_index_inputAccountsSelect'     => '',
+    'reports_index_inputDateRange'          => '',
+    'reports_index_extra-options-box'       => '',
 
     // reports (reports)
-    'reports_report_default_intro'          => 'This report will give you a quick and comprehensive overview of your finances. If you wish to see anything else, please don\'t hestitate to contact me!',
-    'reports_report_audit_intro'            => 'This report will give you detailed insights in your asset accounts.',
-    'reports_report_audit_optionsBox'       => 'Use these check boxes to show or hide the columns you are interested in.',
+    'reports_report_default_intro'          => '',
+    'reports_report_audit_intro'            => '',
+    'reports_report_audit_optionsBox'       => '',
 
-    'reports_report_category_intro'                  => 'This report will give you insight in one or multiple categories.',
-    'reports_report_category_pieCharts'              => 'These charts will give you insight in expenses and income per category or per account.',
-    'reports_report_category_incomeAndExpensesChart' => 'This chart shows your expenses and income per category.',
+    'reports_report_category_intro'                  => '',
+    'reports_report_category_pieCharts'              => '',
+    'reports_report_category_incomeAndExpensesChart' => '',
 
-    'reports_report_tag_intro'                  => 'This report will give you insight in one or multiple tags.',
-    'reports_report_tag_pieCharts'              => 'These charts will give you insight in expenses and income per tag, account, category or budget.',
-    'reports_report_tag_incomeAndExpensesChart' => 'This chart shows your expenses and income per tag.',
+    'reports_report_tag_intro'                  => '',
+    'reports_report_tag_pieCharts'              => '',
+    'reports_report_tag_incomeAndExpensesChart' => '',
 
-    'reports_report_budget_intro'                             => 'This report will give you insight in one or multiple budgets.',
-    'reports_report_budget_pieCharts'                         => 'These charts will give you insight in expenses per budget or per account.',
-    'reports_report_budget_incomeAndExpensesChart'            => 'This chart shows your expenses per budget.',
+    'reports_report_budget_intro'                             => '',
+    'reports_report_budget_pieCharts'                         => '',
+    'reports_report_budget_incomeAndExpensesChart'            => '',
 
     // create transaction
-    'transactions_create_switch_box'                          => 'Use these buttons to quickly switch the type of transaction you wish to save.',
-    'transactions_create_ffInput_category'                    => 'You can freely type in this field. Previously created categories will be suggested.',
-    'transactions_create_withdrawal_ffInput_budget'           => 'Link your withdrawal to a budget for better financial control.',
-    'transactions_create_withdrawal_currency_dropdown_amount' => 'Use this dropdown when your withdrawal is in another currency.',
-    'transactions_create_deposit_currency_dropdown_amount'    => 'Use this dropdown when your deposit is in another currency.',
-    'transactions_create_transfer_ffInput_piggy_bank_id'      => 'Select a piggy bank and link this transfer to your savings.',
+    'transactions_create_switch_box'                          => '',
+    'transactions_create_ffInput_category'                    => '',
+    'transactions_create_withdrawal_ffInput_budget'           => '',
+    'transactions_create_withdrawal_currency_dropdown_amount' => '',
+    'transactions_create_deposit_currency_dropdown_amount'    => '',
+    'transactions_create_transfer_ffInput_piggy_bank_id'      => '',
 
     // piggy banks index:
-    'piggy-banks_index_saved'                                 => 'This field shows you how much you\'ve saved in each piggy bank.',
-    'piggy-banks_index_button'                                => 'Next to this progress bar are two buttons (+ and -) to add or remove money from each piggy bank.',
-    'piggy-banks_index_accountStatus'                         => 'For each asset account with at least one piggy bank the status is listed in this table.',
+    'piggy-banks_index_saved'                                 => '',
+    'piggy-banks_index_button'                                => '',
+    'piggy-banks_index_accountStatus'                         => '',
 
     // create piggy
-    'piggy-banks_create_name'                                 => 'What is your goal? A new couch, a camera, money for emergencies?',
-    'piggy-banks_create_date'                                 => 'You can set a target date or a deadline for your piggy bank.',
+    'piggy-banks_create_name'                                 => '',
+    'piggy-banks_create_date'                                 => '',
 
     // show piggy
-    'piggy-banks_show_piggyChart'                             => 'This chart will show the history of this piggy bank.',
-    'piggy-banks_show_piggyDetails'                           => 'Some details about your piggy bank',
-    'piggy-banks_show_piggyEvents'                            => 'Any additions or removals are also listed here.',
+    'piggy-banks_show_piggyChart'                             => '',
+    'piggy-banks_show_piggyDetails'                           => '',
+    'piggy-banks_show_piggyEvents'                            => '',
 
     // bill index
-    'bills_index_paid_in_period'                              => 'This field indicates when the bill was last paid.',
-    'bills_index_expected_in_period'                          => 'This field indicates for each bill if and when the next bill is expected to hit.',
+    'bills_index_paid_in_period'                              => '',
+    'bills_index_expected_in_period'                          => '',
 
     // show bill
-    'bills_show_billInfo'                                     => 'This table shows some general information about this bill.',
-    'bills_show_billButtons'                                  => 'Use this button to re-scan old transactions so they will be matched to this bill.',
-    'bills_show_billChart'                                    => 'This chart shows the transactions linked to this bill.',
+    'bills_show_billInfo'                                     => '',
+    'bills_show_billButtons'                                  => '',
+    'bills_show_billChart'                                    => '',
 
     // create bill
-    'bills_create_name'                                       => 'Use a descriptive name such as "Rent" or "Health insurance".',
-    'bills_create_match'                                      => 'To match transactions, use terms from those transactions or the expense account involved. All words must match.',
-    'bills_create_amount_min_holder'                          => 'Select a minimum and maximum amount for this bill.',
-    'bills_create_repeat_freq_holder'                         => 'Most bills repeat monthly, but you can set another frequency here.',
-    'bills_create_skip_holder'                                => 'If a bill repeats every 2 weeks for example, the "skip"-field should be set to "1" to skip every other week.',
+    'bills_create_name'                                       => '',
+    'bills_create_match'                                      => '',
+    'bills_create_amount_min_holder'                          => '',
+    'bills_create_repeat_freq_holder'                         => '',
+    'bills_create_skip_holder'                                => '',
 
     // rules index
-    'rules_index_intro'                                       => 'Firefly III allows you to manage rules, that will automagically be applied to any transaction you create or edit.',
-    'rules_index_new_rule_group'                              => 'You can combine rules in groups for easier management.',
-    'rules_index_new_rule'                                    => 'Create as many rules as you like.',
-    'rules_index_prio_buttons'                                => 'Order them any way you see fit.',
-    'rules_index_test_buttons'                                => 'You can test your rules or apply them to existing transactions.',
-    'rules_index_rule-triggers'                               => 'Rules have "triggers" and "actions" that you can order by drag-and-drop.',
-    'rules_index_outro'                                       => 'Be sure to check out the help pages using the (?) icon in the top right!',
+    'rules_index_intro'                                       => '',
+    'rules_index_new_rule_group'                              => '',
+    'rules_index_new_rule'                                    => '',
+    'rules_index_prio_buttons'                                => '',
+    'rules_index_test_buttons'                                => '',
+    'rules_index_rule-triggers'                               => '',
+    'rules_index_outro'                                       => '',
 
     // create rule:
-    'rules_create_mandatory'                                  => 'Choose a descriptive title, and set when the rule should be fired.',
-    'rules_create_ruletriggerholder'                          => 'Add as many triggers as you like, but remember that ALL triggers must match before any actions are fired.',
-    'rules_create_test_rule_triggers'                         => 'Use this button to see which transactions would match your rule.',
-    'rules_create_actions'                                    => 'Set as many actions as you like.',
+    'rules_create_mandatory'                                  => '',
+    'rules_create_ruletriggerholder'                          => '',
+    'rules_create_test_rule_triggers'                         => '',
+    'rules_create_actions'                                    => '',
 
     // preferences
-    'preferences_index_tabs'                                  => 'More options are available behind these tabs.',
+    'preferences_index_tabs'                                  => '',
 
     // currencies
-    'currencies_index_intro'                                  => 'Firefly III supports multiple currencies, which you can change on this page.',
-    'currencies_index_default'                                => 'Firefly III has one default currency. You can always switch of course using these buttons.',
+    'currencies_index_intro'                                  => '',
+    'currencies_index_default'                                => '',
 
     // create currency
-    'currencies_create_code'                                  => 'This code should be ISO compliant (Google it for your new currency).',
+    'currencies_create_code'                                  => '',
 ];
\ No newline at end of file

From 33d1fc085b00be3748eec744193df702c495ee2c Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Fri, 25 Aug 2017 07:07:12 +0200
Subject: [PATCH 255/668] New translations intro.php (Russian)

---
 resources/lang/ru_RU/intro.php | 144 ++++++++++++++++-----------------
 1 file changed, 72 insertions(+), 72 deletions(-)

diff --git a/resources/lang/ru_RU/intro.php b/resources/lang/ru_RU/intro.php
index c161cef362..cca2854e02 100644
--- a/resources/lang/ru_RU/intro.php
+++ b/resources/lang/ru_RU/intro.php
@@ -11,111 +11,111 @@ declare(strict_types=1);
 
 return [
     // index
-    'index_intro'                           => 'Welcome to the index page of Firefly III. Please take the time to walk through this intro to get a feeling of how Firefly III works.',
-    'index_accounts-chart'                  => 'This chart shows the current balance of your asset accounts. You can select the accounts visible here in your preferences.',
-    'index_box_out_holder'                  => 'This little box and the boxes next to this one will give you a quick overview of your financial situation.',
-    'index_help'                            => 'If you ever need help with a page or a form, press this button.',
-    'index_outro'                           => 'Most pages of Firefly III will start with a little tour like this one. Please contact me when you have questions or comments. Enjoy!',
-    'index_sidebar-toggle'                  => 'To create new transactions, accounts or other things, use the menu under this icon.',
+    'index_intro'                           => '',
+    'index_accounts-chart'                  => '',
+    'index_box_out_holder'                  => '',
+    'index_help'                            => '',
+    'index_outro'                           => '',
+    'index_sidebar-toggle'                  => '',
 
     // create account:
-    'accounts_create_iban'                  => 'Give your accounts a valid IBAN. This could make a data import very easy in the future.',
-    'accounts_create_asset_opening_balance' => 'Assets accounts may have an "opening balance", indicating the start of this account\'s history in Firefly.',
-    'accounts_create_asset_currency'        => 'Firefly III supports multiple currencies. Asset accounts have one main currency, which you must set here.',
-    'accounts_create_asset_virtual'         => 'It can sometimes help to give your account a virtual balance: an extra amount always added to or removed from the actual balance.',
+    'accounts_create_iban'                  => '',
+    'accounts_create_asset_opening_balance' => '',
+    'accounts_create_asset_currency'        => '',
+    'accounts_create_asset_virtual'         => '',
 
     // budgets index
-    'budgets_index_intro'                   => 'Budgets are used to manage your finances and form one of the core functions of Firefly III.',
-    'budgets_index_set_budget'              => 'Set your total budget for every period so Firefly can tell you if you have budgeted all available money.',
-    'budgets_index_see_expenses_bar'        => 'Spending money will slowly fill this bar.',
-    'budgets_index_navigate_periods'        => 'Navigate through periods to easily set budgets ahead of time.',
-    'budgets_index_new_budget'              => 'Create new budgets as you see fit.',
-    'budgets_index_list_of_budgets'         => 'Use this table to set the amounts for each budget and see how you are doing.',
+    'budgets_index_intro'                   => '',
+    'budgets_index_set_budget'              => '',
+    'budgets_index_see_expenses_bar'        => '',
+    'budgets_index_navigate_periods'        => '',
+    'budgets_index_new_budget'              => '',
+    'budgets_index_list_of_budgets'         => '',
 
     // reports (index)
-    'reports_index_intro'                   => 'Use these reports to get detailed insights in your finances.',
-    'reports_index_inputReportType'         => 'Pick a report type. Check out the help pages to see what each report shows you.',
-    'reports_index_inputAccountsSelect'     => 'You can exclude or include asset accounts as you see fit.',
-    'reports_index_inputDateRange'          => 'The selected date range is entirely up to you: from one day to 10 years.',
-    'reports_index_extra-options-box'       => 'Depending on the report you have selected, you can select extra filters and options here. Watch this box when you change report types.',
+    'reports_index_intro'                   => '',
+    'reports_index_inputReportType'         => '',
+    'reports_index_inputAccountsSelect'     => '',
+    'reports_index_inputDateRange'          => '',
+    'reports_index_extra-options-box'       => '',
 
     // reports (reports)
-    'reports_report_default_intro'          => 'This report will give you a quick and comprehensive overview of your finances. If you wish to see anything else, please don\'t hestitate to contact me!',
-    'reports_report_audit_intro'            => 'This report will give you detailed insights in your asset accounts.',
-    'reports_report_audit_optionsBox'       => 'Use these check boxes to show or hide the columns you are interested in.',
+    'reports_report_default_intro'          => '',
+    'reports_report_audit_intro'            => '',
+    'reports_report_audit_optionsBox'       => '',
 
-    'reports_report_category_intro'                  => 'This report will give you insight in one or multiple categories.',
-    'reports_report_category_pieCharts'              => 'These charts will give you insight in expenses and income per category or per account.',
-    'reports_report_category_incomeAndExpensesChart' => 'This chart shows your expenses and income per category.',
+    'reports_report_category_intro'                  => '',
+    'reports_report_category_pieCharts'              => '',
+    'reports_report_category_incomeAndExpensesChart' => '',
 
-    'reports_report_tag_intro'                  => 'This report will give you insight in one or multiple tags.',
-    'reports_report_tag_pieCharts'              => 'These charts will give you insight in expenses and income per tag, account, category or budget.',
-    'reports_report_tag_incomeAndExpensesChart' => 'This chart shows your expenses and income per tag.',
+    'reports_report_tag_intro'                  => '',
+    'reports_report_tag_pieCharts'              => '',
+    'reports_report_tag_incomeAndExpensesChart' => '',
 
-    'reports_report_budget_intro'                             => 'This report will give you insight in one or multiple budgets.',
-    'reports_report_budget_pieCharts'                         => 'These charts will give you insight in expenses per budget or per account.',
-    'reports_report_budget_incomeAndExpensesChart'            => 'This chart shows your expenses per budget.',
+    'reports_report_budget_intro'                             => '',
+    'reports_report_budget_pieCharts'                         => '',
+    'reports_report_budget_incomeAndExpensesChart'            => '',
 
     // create transaction
-    'transactions_create_switch_box'                          => 'Use these buttons to quickly switch the type of transaction you wish to save.',
-    'transactions_create_ffInput_category'                    => 'You can freely type in this field. Previously created categories will be suggested.',
-    'transactions_create_withdrawal_ffInput_budget'           => 'Link your withdrawal to a budget for better financial control.',
-    'transactions_create_withdrawal_currency_dropdown_amount' => 'Use this dropdown when your withdrawal is in another currency.',
-    'transactions_create_deposit_currency_dropdown_amount'    => 'Use this dropdown when your deposit is in another currency.',
-    'transactions_create_transfer_ffInput_piggy_bank_id'      => 'Select a piggy bank and link this transfer to your savings.',
+    'transactions_create_switch_box'                          => '',
+    'transactions_create_ffInput_category'                    => '',
+    'transactions_create_withdrawal_ffInput_budget'           => '',
+    'transactions_create_withdrawal_currency_dropdown_amount' => '',
+    'transactions_create_deposit_currency_dropdown_amount'    => '',
+    'transactions_create_transfer_ffInput_piggy_bank_id'      => '',
 
     // piggy banks index:
-    'piggy-banks_index_saved'                                 => 'This field shows you how much you\'ve saved in each piggy bank.',
-    'piggy-banks_index_button'                                => 'Next to this progress bar are two buttons (+ and -) to add or remove money from each piggy bank.',
-    'piggy-banks_index_accountStatus'                         => 'For each asset account with at least one piggy bank the status is listed in this table.',
+    'piggy-banks_index_saved'                                 => '',
+    'piggy-banks_index_button'                                => '',
+    'piggy-banks_index_accountStatus'                         => '',
 
     // create piggy
-    'piggy-banks_create_name'                                 => 'What is your goal? A new couch, a camera, money for emergencies?',
-    'piggy-banks_create_date'                                 => 'You can set a target date or a deadline for your piggy bank.',
+    'piggy-banks_create_name'                                 => '',
+    'piggy-banks_create_date'                                 => '',
 
     // show piggy
-    'piggy-banks_show_piggyChart'                             => 'This chart will show the history of this piggy bank.',
-    'piggy-banks_show_piggyDetails'                           => 'Some details about your piggy bank',
-    'piggy-banks_show_piggyEvents'                            => 'Any additions or removals are also listed here.',
+    'piggy-banks_show_piggyChart'                             => '',
+    'piggy-banks_show_piggyDetails'                           => '',
+    'piggy-banks_show_piggyEvents'                            => '',
 
     // bill index
-    'bills_index_paid_in_period'                              => 'This field indicates when the bill was last paid.',
-    'bills_index_expected_in_period'                          => 'This field indicates for each bill if and when the next bill is expected to hit.',
+    'bills_index_paid_in_period'                              => '',
+    'bills_index_expected_in_period'                          => '',
 
     // show bill
-    'bills_show_billInfo'                                     => 'This table shows some general information about this bill.',
-    'bills_show_billButtons'                                  => 'Use this button to re-scan old transactions so they will be matched to this bill.',
-    'bills_show_billChart'                                    => 'This chart shows the transactions linked to this bill.',
+    'bills_show_billInfo'                                     => '',
+    'bills_show_billButtons'                                  => '',
+    'bills_show_billChart'                                    => '',
 
     // create bill
-    'bills_create_name'                                       => 'Use a descriptive name such as "Rent" or "Health insurance".',
-    'bills_create_match'                                      => 'To match transactions, use terms from those transactions or the expense account involved. All words must match.',
-    'bills_create_amount_min_holder'                          => 'Select a minimum and maximum amount for this bill.',
-    'bills_create_repeat_freq_holder'                         => 'Most bills repeat monthly, but you can set another frequency here.',
-    'bills_create_skip_holder'                                => 'If a bill repeats every 2 weeks for example, the "skip"-field should be set to "1" to skip every other week.',
+    'bills_create_name'                                       => '',
+    'bills_create_match'                                      => '',
+    'bills_create_amount_min_holder'                          => '',
+    'bills_create_repeat_freq_holder'                         => '',
+    'bills_create_skip_holder'                                => '',
 
     // rules index
-    'rules_index_intro'                                       => 'Firefly III allows you to manage rules, that will automagically be applied to any transaction you create or edit.',
-    'rules_index_new_rule_group'                              => 'You can combine rules in groups for easier management.',
-    'rules_index_new_rule'                                    => 'Create as many rules as you like.',
-    'rules_index_prio_buttons'                                => 'Order them any way you see fit.',
-    'rules_index_test_buttons'                                => 'You can test your rules or apply them to existing transactions.',
-    'rules_index_rule-triggers'                               => 'Rules have "triggers" and "actions" that you can order by drag-and-drop.',
-    'rules_index_outro'                                       => 'Be sure to check out the help pages using the (?) icon in the top right!',
+    'rules_index_intro'                                       => '',
+    'rules_index_new_rule_group'                              => '',
+    'rules_index_new_rule'                                    => '',
+    'rules_index_prio_buttons'                                => '',
+    'rules_index_test_buttons'                                => '',
+    'rules_index_rule-triggers'                               => '',
+    'rules_index_outro'                                       => '',
 
     // create rule:
-    'rules_create_mandatory'                                  => 'Choose a descriptive title, and set when the rule should be fired.',
-    'rules_create_ruletriggerholder'                          => 'Add as many triggers as you like, but remember that ALL triggers must match before any actions are fired.',
-    'rules_create_test_rule_triggers'                         => 'Use this button to see which transactions would match your rule.',
-    'rules_create_actions'                                    => 'Set as many actions as you like.',
+    'rules_create_mandatory'                                  => '',
+    'rules_create_ruletriggerholder'                          => '',
+    'rules_create_test_rule_triggers'                         => '',
+    'rules_create_actions'                                    => '',
 
     // preferences
-    'preferences_index_tabs'                                  => 'More options are available behind these tabs.',
+    'preferences_index_tabs'                                  => '',
 
     // currencies
-    'currencies_index_intro'                                  => 'Firefly III supports multiple currencies, which you can change on this page.',
-    'currencies_index_default'                                => 'Firefly III has one default currency. You can always switch of course using these buttons.',
+    'currencies_index_intro'                                  => '',
+    'currencies_index_default'                                => '',
 
     // create currency
-    'currencies_create_code'                                  => 'This code should be ISO compliant (Google it for your new currency).',
+    'currencies_create_code'                                  => '',
 ];
\ No newline at end of file

From df3a4d0d454a9529f68828f1820fb665e73a84bc Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Fri, 25 Aug 2017 07:07:13 +0200
Subject: [PATCH 256/668] New translations intro.php (Portuguese, Brazilian)

---
 resources/lang/pt_BR/intro.php | 144 ++++++++++++++++-----------------
 1 file changed, 72 insertions(+), 72 deletions(-)

diff --git a/resources/lang/pt_BR/intro.php b/resources/lang/pt_BR/intro.php
index c161cef362..cca2854e02 100644
--- a/resources/lang/pt_BR/intro.php
+++ b/resources/lang/pt_BR/intro.php
@@ -11,111 +11,111 @@ declare(strict_types=1);
 
 return [
     // index
-    'index_intro'                           => 'Welcome to the index page of Firefly III. Please take the time to walk through this intro to get a feeling of how Firefly III works.',
-    'index_accounts-chart'                  => 'This chart shows the current balance of your asset accounts. You can select the accounts visible here in your preferences.',
-    'index_box_out_holder'                  => 'This little box and the boxes next to this one will give you a quick overview of your financial situation.',
-    'index_help'                            => 'If you ever need help with a page or a form, press this button.',
-    'index_outro'                           => 'Most pages of Firefly III will start with a little tour like this one. Please contact me when you have questions or comments. Enjoy!',
-    'index_sidebar-toggle'                  => 'To create new transactions, accounts or other things, use the menu under this icon.',
+    'index_intro'                           => '',
+    'index_accounts-chart'                  => '',
+    'index_box_out_holder'                  => '',
+    'index_help'                            => '',
+    'index_outro'                           => '',
+    'index_sidebar-toggle'                  => '',
 
     // create account:
-    'accounts_create_iban'                  => 'Give your accounts a valid IBAN. This could make a data import very easy in the future.',
-    'accounts_create_asset_opening_balance' => 'Assets accounts may have an "opening balance", indicating the start of this account\'s history in Firefly.',
-    'accounts_create_asset_currency'        => 'Firefly III supports multiple currencies. Asset accounts have one main currency, which you must set here.',
-    'accounts_create_asset_virtual'         => 'It can sometimes help to give your account a virtual balance: an extra amount always added to or removed from the actual balance.',
+    'accounts_create_iban'                  => '',
+    'accounts_create_asset_opening_balance' => '',
+    'accounts_create_asset_currency'        => '',
+    'accounts_create_asset_virtual'         => '',
 
     // budgets index
-    'budgets_index_intro'                   => 'Budgets are used to manage your finances and form one of the core functions of Firefly III.',
-    'budgets_index_set_budget'              => 'Set your total budget for every period so Firefly can tell you if you have budgeted all available money.',
-    'budgets_index_see_expenses_bar'        => 'Spending money will slowly fill this bar.',
-    'budgets_index_navigate_periods'        => 'Navigate through periods to easily set budgets ahead of time.',
-    'budgets_index_new_budget'              => 'Create new budgets as you see fit.',
-    'budgets_index_list_of_budgets'         => 'Use this table to set the amounts for each budget and see how you are doing.',
+    'budgets_index_intro'                   => '',
+    'budgets_index_set_budget'              => '',
+    'budgets_index_see_expenses_bar'        => '',
+    'budgets_index_navigate_periods'        => '',
+    'budgets_index_new_budget'              => '',
+    'budgets_index_list_of_budgets'         => '',
 
     // reports (index)
-    'reports_index_intro'                   => 'Use these reports to get detailed insights in your finances.',
-    'reports_index_inputReportType'         => 'Pick a report type. Check out the help pages to see what each report shows you.',
-    'reports_index_inputAccountsSelect'     => 'You can exclude or include asset accounts as you see fit.',
-    'reports_index_inputDateRange'          => 'The selected date range is entirely up to you: from one day to 10 years.',
-    'reports_index_extra-options-box'       => 'Depending on the report you have selected, you can select extra filters and options here. Watch this box when you change report types.',
+    'reports_index_intro'                   => '',
+    'reports_index_inputReportType'         => '',
+    'reports_index_inputAccountsSelect'     => '',
+    'reports_index_inputDateRange'          => '',
+    'reports_index_extra-options-box'       => '',
 
     // reports (reports)
-    'reports_report_default_intro'          => 'This report will give you a quick and comprehensive overview of your finances. If you wish to see anything else, please don\'t hestitate to contact me!',
-    'reports_report_audit_intro'            => 'This report will give you detailed insights in your asset accounts.',
-    'reports_report_audit_optionsBox'       => 'Use these check boxes to show or hide the columns you are interested in.',
+    'reports_report_default_intro'          => '',
+    'reports_report_audit_intro'            => '',
+    'reports_report_audit_optionsBox'       => '',
 
-    'reports_report_category_intro'                  => 'This report will give you insight in one or multiple categories.',
-    'reports_report_category_pieCharts'              => 'These charts will give you insight in expenses and income per category or per account.',
-    'reports_report_category_incomeAndExpensesChart' => 'This chart shows your expenses and income per category.',
+    'reports_report_category_intro'                  => '',
+    'reports_report_category_pieCharts'              => '',
+    'reports_report_category_incomeAndExpensesChart' => '',
 
-    'reports_report_tag_intro'                  => 'This report will give you insight in one or multiple tags.',
-    'reports_report_tag_pieCharts'              => 'These charts will give you insight in expenses and income per tag, account, category or budget.',
-    'reports_report_tag_incomeAndExpensesChart' => 'This chart shows your expenses and income per tag.',
+    'reports_report_tag_intro'                  => '',
+    'reports_report_tag_pieCharts'              => '',
+    'reports_report_tag_incomeAndExpensesChart' => '',
 
-    'reports_report_budget_intro'                             => 'This report will give you insight in one or multiple budgets.',
-    'reports_report_budget_pieCharts'                         => 'These charts will give you insight in expenses per budget or per account.',
-    'reports_report_budget_incomeAndExpensesChart'            => 'This chart shows your expenses per budget.',
+    'reports_report_budget_intro'                             => '',
+    'reports_report_budget_pieCharts'                         => '',
+    'reports_report_budget_incomeAndExpensesChart'            => '',
 
     // create transaction
-    'transactions_create_switch_box'                          => 'Use these buttons to quickly switch the type of transaction you wish to save.',
-    'transactions_create_ffInput_category'                    => 'You can freely type in this field. Previously created categories will be suggested.',
-    'transactions_create_withdrawal_ffInput_budget'           => 'Link your withdrawal to a budget for better financial control.',
-    'transactions_create_withdrawal_currency_dropdown_amount' => 'Use this dropdown when your withdrawal is in another currency.',
-    'transactions_create_deposit_currency_dropdown_amount'    => 'Use this dropdown when your deposit is in another currency.',
-    'transactions_create_transfer_ffInput_piggy_bank_id'      => 'Select a piggy bank and link this transfer to your savings.',
+    'transactions_create_switch_box'                          => '',
+    'transactions_create_ffInput_category'                    => '',
+    'transactions_create_withdrawal_ffInput_budget'           => '',
+    'transactions_create_withdrawal_currency_dropdown_amount' => '',
+    'transactions_create_deposit_currency_dropdown_amount'    => '',
+    'transactions_create_transfer_ffInput_piggy_bank_id'      => '',
 
     // piggy banks index:
-    'piggy-banks_index_saved'                                 => 'This field shows you how much you\'ve saved in each piggy bank.',
-    'piggy-banks_index_button'                                => 'Next to this progress bar are two buttons (+ and -) to add or remove money from each piggy bank.',
-    'piggy-banks_index_accountStatus'                         => 'For each asset account with at least one piggy bank the status is listed in this table.',
+    'piggy-banks_index_saved'                                 => '',
+    'piggy-banks_index_button'                                => '',
+    'piggy-banks_index_accountStatus'                         => '',
 
     // create piggy
-    'piggy-banks_create_name'                                 => 'What is your goal? A new couch, a camera, money for emergencies?',
-    'piggy-banks_create_date'                                 => 'You can set a target date or a deadline for your piggy bank.',
+    'piggy-banks_create_name'                                 => '',
+    'piggy-banks_create_date'                                 => '',
 
     // show piggy
-    'piggy-banks_show_piggyChart'                             => 'This chart will show the history of this piggy bank.',
-    'piggy-banks_show_piggyDetails'                           => 'Some details about your piggy bank',
-    'piggy-banks_show_piggyEvents'                            => 'Any additions or removals are also listed here.',
+    'piggy-banks_show_piggyChart'                             => '',
+    'piggy-banks_show_piggyDetails'                           => '',
+    'piggy-banks_show_piggyEvents'                            => '',
 
     // bill index
-    'bills_index_paid_in_period'                              => 'This field indicates when the bill was last paid.',
-    'bills_index_expected_in_period'                          => 'This field indicates for each bill if and when the next bill is expected to hit.',
+    'bills_index_paid_in_period'                              => '',
+    'bills_index_expected_in_period'                          => '',
 
     // show bill
-    'bills_show_billInfo'                                     => 'This table shows some general information about this bill.',
-    'bills_show_billButtons'                                  => 'Use this button to re-scan old transactions so they will be matched to this bill.',
-    'bills_show_billChart'                                    => 'This chart shows the transactions linked to this bill.',
+    'bills_show_billInfo'                                     => '',
+    'bills_show_billButtons'                                  => '',
+    'bills_show_billChart'                                    => '',
 
     // create bill
-    'bills_create_name'                                       => 'Use a descriptive name such as "Rent" or "Health insurance".',
-    'bills_create_match'                                      => 'To match transactions, use terms from those transactions or the expense account involved. All words must match.',
-    'bills_create_amount_min_holder'                          => 'Select a minimum and maximum amount for this bill.',
-    'bills_create_repeat_freq_holder'                         => 'Most bills repeat monthly, but you can set another frequency here.',
-    'bills_create_skip_holder'                                => 'If a bill repeats every 2 weeks for example, the "skip"-field should be set to "1" to skip every other week.',
+    'bills_create_name'                                       => '',
+    'bills_create_match'                                      => '',
+    'bills_create_amount_min_holder'                          => '',
+    'bills_create_repeat_freq_holder'                         => '',
+    'bills_create_skip_holder'                                => '',
 
     // rules index
-    'rules_index_intro'                                       => 'Firefly III allows you to manage rules, that will automagically be applied to any transaction you create or edit.',
-    'rules_index_new_rule_group'                              => 'You can combine rules in groups for easier management.',
-    'rules_index_new_rule'                                    => 'Create as many rules as you like.',
-    'rules_index_prio_buttons'                                => 'Order them any way you see fit.',
-    'rules_index_test_buttons'                                => 'You can test your rules or apply them to existing transactions.',
-    'rules_index_rule-triggers'                               => 'Rules have "triggers" and "actions" that you can order by drag-and-drop.',
-    'rules_index_outro'                                       => 'Be sure to check out the help pages using the (?) icon in the top right!',
+    'rules_index_intro'                                       => '',
+    'rules_index_new_rule_group'                              => '',
+    'rules_index_new_rule'                                    => '',
+    'rules_index_prio_buttons'                                => '',
+    'rules_index_test_buttons'                                => '',
+    'rules_index_rule-triggers'                               => '',
+    'rules_index_outro'                                       => '',
 
     // create rule:
-    'rules_create_mandatory'                                  => 'Choose a descriptive title, and set when the rule should be fired.',
-    'rules_create_ruletriggerholder'                          => 'Add as many triggers as you like, but remember that ALL triggers must match before any actions are fired.',
-    'rules_create_test_rule_triggers'                         => 'Use this button to see which transactions would match your rule.',
-    'rules_create_actions'                                    => 'Set as many actions as you like.',
+    'rules_create_mandatory'                                  => '',
+    'rules_create_ruletriggerholder'                          => '',
+    'rules_create_test_rule_triggers'                         => '',
+    'rules_create_actions'                                    => '',
 
     // preferences
-    'preferences_index_tabs'                                  => 'More options are available behind these tabs.',
+    'preferences_index_tabs'                                  => '',
 
     // currencies
-    'currencies_index_intro'                                  => 'Firefly III supports multiple currencies, which you can change on this page.',
-    'currencies_index_default'                                => 'Firefly III has one default currency. You can always switch of course using these buttons.',
+    'currencies_index_intro'                                  => '',
+    'currencies_index_default'                                => '',
 
     // create currency
-    'currencies_create_code'                                  => 'This code should be ISO compliant (Google it for your new currency).',
+    'currencies_create_code'                                  => '',
 ];
\ No newline at end of file

From f62dee262c4fc7e43700418c0f3bd9f6df897ff2 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Fri, 25 Aug 2017 07:07:14 +0200
Subject: [PATCH 257/668] New translations intro.php (Polish)

---
 resources/lang/pl_PL/intro.php | 144 ++++++++++++++++-----------------
 1 file changed, 72 insertions(+), 72 deletions(-)

diff --git a/resources/lang/pl_PL/intro.php b/resources/lang/pl_PL/intro.php
index c161cef362..cca2854e02 100644
--- a/resources/lang/pl_PL/intro.php
+++ b/resources/lang/pl_PL/intro.php
@@ -11,111 +11,111 @@ declare(strict_types=1);
 
 return [
     // index
-    'index_intro'                           => 'Welcome to the index page of Firefly III. Please take the time to walk through this intro to get a feeling of how Firefly III works.',
-    'index_accounts-chart'                  => 'This chart shows the current balance of your asset accounts. You can select the accounts visible here in your preferences.',
-    'index_box_out_holder'                  => 'This little box and the boxes next to this one will give you a quick overview of your financial situation.',
-    'index_help'                            => 'If you ever need help with a page or a form, press this button.',
-    'index_outro'                           => 'Most pages of Firefly III will start with a little tour like this one. Please contact me when you have questions or comments. Enjoy!',
-    'index_sidebar-toggle'                  => 'To create new transactions, accounts or other things, use the menu under this icon.',
+    'index_intro'                           => '',
+    'index_accounts-chart'                  => '',
+    'index_box_out_holder'                  => '',
+    'index_help'                            => '',
+    'index_outro'                           => '',
+    'index_sidebar-toggle'                  => '',
 
     // create account:
-    'accounts_create_iban'                  => 'Give your accounts a valid IBAN. This could make a data import very easy in the future.',
-    'accounts_create_asset_opening_balance' => 'Assets accounts may have an "opening balance", indicating the start of this account\'s history in Firefly.',
-    'accounts_create_asset_currency'        => 'Firefly III supports multiple currencies. Asset accounts have one main currency, which you must set here.',
-    'accounts_create_asset_virtual'         => 'It can sometimes help to give your account a virtual balance: an extra amount always added to or removed from the actual balance.',
+    'accounts_create_iban'                  => '',
+    'accounts_create_asset_opening_balance' => '',
+    'accounts_create_asset_currency'        => '',
+    'accounts_create_asset_virtual'         => '',
 
     // budgets index
-    'budgets_index_intro'                   => 'Budgets are used to manage your finances and form one of the core functions of Firefly III.',
-    'budgets_index_set_budget'              => 'Set your total budget for every period so Firefly can tell you if you have budgeted all available money.',
-    'budgets_index_see_expenses_bar'        => 'Spending money will slowly fill this bar.',
-    'budgets_index_navigate_periods'        => 'Navigate through periods to easily set budgets ahead of time.',
-    'budgets_index_new_budget'              => 'Create new budgets as you see fit.',
-    'budgets_index_list_of_budgets'         => 'Use this table to set the amounts for each budget and see how you are doing.',
+    'budgets_index_intro'                   => '',
+    'budgets_index_set_budget'              => '',
+    'budgets_index_see_expenses_bar'        => '',
+    'budgets_index_navigate_periods'        => '',
+    'budgets_index_new_budget'              => '',
+    'budgets_index_list_of_budgets'         => '',
 
     // reports (index)
-    'reports_index_intro'                   => 'Use these reports to get detailed insights in your finances.',
-    'reports_index_inputReportType'         => 'Pick a report type. Check out the help pages to see what each report shows you.',
-    'reports_index_inputAccountsSelect'     => 'You can exclude or include asset accounts as you see fit.',
-    'reports_index_inputDateRange'          => 'The selected date range is entirely up to you: from one day to 10 years.',
-    'reports_index_extra-options-box'       => 'Depending on the report you have selected, you can select extra filters and options here. Watch this box when you change report types.',
+    'reports_index_intro'                   => '',
+    'reports_index_inputReportType'         => '',
+    'reports_index_inputAccountsSelect'     => '',
+    'reports_index_inputDateRange'          => '',
+    'reports_index_extra-options-box'       => '',
 
     // reports (reports)
-    'reports_report_default_intro'          => 'This report will give you a quick and comprehensive overview of your finances. If you wish to see anything else, please don\'t hestitate to contact me!',
-    'reports_report_audit_intro'            => 'This report will give you detailed insights in your asset accounts.',
-    'reports_report_audit_optionsBox'       => 'Use these check boxes to show or hide the columns you are interested in.',
+    'reports_report_default_intro'          => '',
+    'reports_report_audit_intro'            => '',
+    'reports_report_audit_optionsBox'       => '',
 
-    'reports_report_category_intro'                  => 'This report will give you insight in one or multiple categories.',
-    'reports_report_category_pieCharts'              => 'These charts will give you insight in expenses and income per category or per account.',
-    'reports_report_category_incomeAndExpensesChart' => 'This chart shows your expenses and income per category.',
+    'reports_report_category_intro'                  => '',
+    'reports_report_category_pieCharts'              => '',
+    'reports_report_category_incomeAndExpensesChart' => '',
 
-    'reports_report_tag_intro'                  => 'This report will give you insight in one or multiple tags.',
-    'reports_report_tag_pieCharts'              => 'These charts will give you insight in expenses and income per tag, account, category or budget.',
-    'reports_report_tag_incomeAndExpensesChart' => 'This chart shows your expenses and income per tag.',
+    'reports_report_tag_intro'                  => '',
+    'reports_report_tag_pieCharts'              => '',
+    'reports_report_tag_incomeAndExpensesChart' => '',
 
-    'reports_report_budget_intro'                             => 'This report will give you insight in one or multiple budgets.',
-    'reports_report_budget_pieCharts'                         => 'These charts will give you insight in expenses per budget or per account.',
-    'reports_report_budget_incomeAndExpensesChart'            => 'This chart shows your expenses per budget.',
+    'reports_report_budget_intro'                             => '',
+    'reports_report_budget_pieCharts'                         => '',
+    'reports_report_budget_incomeAndExpensesChart'            => '',
 
     // create transaction
-    'transactions_create_switch_box'                          => 'Use these buttons to quickly switch the type of transaction you wish to save.',
-    'transactions_create_ffInput_category'                    => 'You can freely type in this field. Previously created categories will be suggested.',
-    'transactions_create_withdrawal_ffInput_budget'           => 'Link your withdrawal to a budget for better financial control.',
-    'transactions_create_withdrawal_currency_dropdown_amount' => 'Use this dropdown when your withdrawal is in another currency.',
-    'transactions_create_deposit_currency_dropdown_amount'    => 'Use this dropdown when your deposit is in another currency.',
-    'transactions_create_transfer_ffInput_piggy_bank_id'      => 'Select a piggy bank and link this transfer to your savings.',
+    'transactions_create_switch_box'                          => '',
+    'transactions_create_ffInput_category'                    => '',
+    'transactions_create_withdrawal_ffInput_budget'           => '',
+    'transactions_create_withdrawal_currency_dropdown_amount' => '',
+    'transactions_create_deposit_currency_dropdown_amount'    => '',
+    'transactions_create_transfer_ffInput_piggy_bank_id'      => '',
 
     // piggy banks index:
-    'piggy-banks_index_saved'                                 => 'This field shows you how much you\'ve saved in each piggy bank.',
-    'piggy-banks_index_button'                                => 'Next to this progress bar are two buttons (+ and -) to add or remove money from each piggy bank.',
-    'piggy-banks_index_accountStatus'                         => 'For each asset account with at least one piggy bank the status is listed in this table.',
+    'piggy-banks_index_saved'                                 => '',
+    'piggy-banks_index_button'                                => '',
+    'piggy-banks_index_accountStatus'                         => '',
 
     // create piggy
-    'piggy-banks_create_name'                                 => 'What is your goal? A new couch, a camera, money for emergencies?',
-    'piggy-banks_create_date'                                 => 'You can set a target date or a deadline for your piggy bank.',
+    'piggy-banks_create_name'                                 => '',
+    'piggy-banks_create_date'                                 => '',
 
     // show piggy
-    'piggy-banks_show_piggyChart'                             => 'This chart will show the history of this piggy bank.',
-    'piggy-banks_show_piggyDetails'                           => 'Some details about your piggy bank',
-    'piggy-banks_show_piggyEvents'                            => 'Any additions or removals are also listed here.',
+    'piggy-banks_show_piggyChart'                             => '',
+    'piggy-banks_show_piggyDetails'                           => '',
+    'piggy-banks_show_piggyEvents'                            => '',
 
     // bill index
-    'bills_index_paid_in_period'                              => 'This field indicates when the bill was last paid.',
-    'bills_index_expected_in_period'                          => 'This field indicates for each bill if and when the next bill is expected to hit.',
+    'bills_index_paid_in_period'                              => '',
+    'bills_index_expected_in_period'                          => '',
 
     // show bill
-    'bills_show_billInfo'                                     => 'This table shows some general information about this bill.',
-    'bills_show_billButtons'                                  => 'Use this button to re-scan old transactions so they will be matched to this bill.',
-    'bills_show_billChart'                                    => 'This chart shows the transactions linked to this bill.',
+    'bills_show_billInfo'                                     => '',
+    'bills_show_billButtons'                                  => '',
+    'bills_show_billChart'                                    => '',
 
     // create bill
-    'bills_create_name'                                       => 'Use a descriptive name such as "Rent" or "Health insurance".',
-    'bills_create_match'                                      => 'To match transactions, use terms from those transactions or the expense account involved. All words must match.',
-    'bills_create_amount_min_holder'                          => 'Select a minimum and maximum amount for this bill.',
-    'bills_create_repeat_freq_holder'                         => 'Most bills repeat monthly, but you can set another frequency here.',
-    'bills_create_skip_holder'                                => 'If a bill repeats every 2 weeks for example, the "skip"-field should be set to "1" to skip every other week.',
+    'bills_create_name'                                       => '',
+    'bills_create_match'                                      => '',
+    'bills_create_amount_min_holder'                          => '',
+    'bills_create_repeat_freq_holder'                         => '',
+    'bills_create_skip_holder'                                => '',
 
     // rules index
-    'rules_index_intro'                                       => 'Firefly III allows you to manage rules, that will automagically be applied to any transaction you create or edit.',
-    'rules_index_new_rule_group'                              => 'You can combine rules in groups for easier management.',
-    'rules_index_new_rule'                                    => 'Create as many rules as you like.',
-    'rules_index_prio_buttons'                                => 'Order them any way you see fit.',
-    'rules_index_test_buttons'                                => 'You can test your rules or apply them to existing transactions.',
-    'rules_index_rule-triggers'                               => 'Rules have "triggers" and "actions" that you can order by drag-and-drop.',
-    'rules_index_outro'                                       => 'Be sure to check out the help pages using the (?) icon in the top right!',
+    'rules_index_intro'                                       => '',
+    'rules_index_new_rule_group'                              => '',
+    'rules_index_new_rule'                                    => '',
+    'rules_index_prio_buttons'                                => '',
+    'rules_index_test_buttons'                                => '',
+    'rules_index_rule-triggers'                               => '',
+    'rules_index_outro'                                       => '',
 
     // create rule:
-    'rules_create_mandatory'                                  => 'Choose a descriptive title, and set when the rule should be fired.',
-    'rules_create_ruletriggerholder'                          => 'Add as many triggers as you like, but remember that ALL triggers must match before any actions are fired.',
-    'rules_create_test_rule_triggers'                         => 'Use this button to see which transactions would match your rule.',
-    'rules_create_actions'                                    => 'Set as many actions as you like.',
+    'rules_create_mandatory'                                  => '',
+    'rules_create_ruletriggerholder'                          => '',
+    'rules_create_test_rule_triggers'                         => '',
+    'rules_create_actions'                                    => '',
 
     // preferences
-    'preferences_index_tabs'                                  => 'More options are available behind these tabs.',
+    'preferences_index_tabs'                                  => '',
 
     // currencies
-    'currencies_index_intro'                                  => 'Firefly III supports multiple currencies, which you can change on this page.',
-    'currencies_index_default'                                => 'Firefly III has one default currency. You can always switch of course using these buttons.',
+    'currencies_index_intro'                                  => '',
+    'currencies_index_default'                                => '',
 
     // create currency
-    'currencies_create_code'                                  => 'This code should be ISO compliant (Google it for your new currency).',
+    'currencies_create_code'                                  => '',
 ];
\ No newline at end of file

From 7061730abc6b4923766a2f339f327c2b1497f499 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Fri, 25 Aug 2017 07:07:15 +0200
Subject: [PATCH 258/668] New translations list.php (Russian)

---
 resources/lang/ru_RU/list.php | 68 +++++++++++++++++------------------
 1 file changed, 34 insertions(+), 34 deletions(-)

diff --git a/resources/lang/ru_RU/list.php b/resources/lang/ru_RU/list.php
index 95fe61c6bb..4e16d96f3a 100644
--- a/resources/lang/ru_RU/list.php
+++ b/resources/lang/ru_RU/list.php
@@ -25,31 +25,31 @@ return [
     'active'                => 'Активен?',
     'lastActivity'          => 'Последняя активность',
     'balanceDiff'           => 'Разница баланса между :start и :end',
-    'matchedOn'             => 'Matched on',
-    'matchesOn'             => 'Matched on',
+    'matchedOn'             => '',
+    'matchesOn'             => '',
     'account_type'          => 'Тип профиля',
-    'created_at'            => 'Created at',
-    'new_balance'           => 'New balance',
-    'account'               => 'Account',
-    'matchingAmount'        => 'Amount',
-    'lastMatch'             => 'Last match',
-    'split_number'          => 'Split #',
-    'destination'           => 'Destination',
-    'source'                => 'Source',
-    'next_expected_match'   => 'Next expected match',
-    'automatch'             => 'Auto match?',
-    'repeat_freq'           => 'Repeats',
+    'created_at'            => '',
+    'new_balance'           => '',
+    'account'               => '',
+    'matchingAmount'        => '',
+    'lastMatch'             => '',
+    'split_number'          => '',
+    'destination'           => '',
+    'source'                => '',
+    'next_expected_match'   => '',
+    'automatch'             => '',
+    'repeat_freq'           => '',
     'description'           => 'Описание',
     'amount'                => 'Сумма',
-    'internal_reference'    => 'Internal reference',
+    'internal_reference'    => '',
     'date'                  => 'Дата',
-    'interest_date'         => 'Interest date',
-    'book_date'             => 'Book date',
-    'process_date'          => 'Processing date',
-    'due_date'              => 'Due date',
-    'payment_date'          => 'Payment date',
-    'invoice_date'          => 'Invoice date',
-    'interal_reference'     => 'Internal reference',
+    'interest_date'         => '',
+    'book_date'             => '',
+    'process_date'          => '',
+    'due_date'              => '',
+    'payment_date'          => '',
+    'invoice_date'          => '',
+    'interal_reference'     => '',
     'notes'                 => 'Заметки',
     'from'                  => 'Откуда',
     'piggy_bank'            => 'Копилка',
@@ -60,23 +60,23 @@ return [
     'withdrawal'            => 'Расход',
     'deposit'               => 'Доход',
     'transfer'              => 'Перевод',
-    'type'                  => 'Type',
-    'completed'             => 'Completed',
-    'iban'                  => 'IBAN',
-    'paid_current_period'   => 'Paid this period',
+    'type'                  => '',
+    'completed'             => '',
+    'iban'                  => '',
+    'paid_current_period'   => '',
     'email'                 => 'E-mail',
     'registered_at'         => 'Дата регистрации',
     'is_activated'          => 'Активен?',
     'is_blocked'            => 'Заблокирован?',
     'is_admin'              => 'Администратор?',
     'has_two_factor'        => 'Защита (2FA)?',
-    'confirmed_from'        => 'Confirmed from',
-    'registered_from'       => 'Registered from',
-    'blocked_code'          => 'Block code',
+    'confirmed_from'        => '',
+    'registered_from'       => '',
+    'blocked_code'          => '',
     'domain'                => 'Домен',
-    'registration_attempts' => 'Registration attempts',
-    'source_account'        => 'Source account',
-    'destination_account'   => 'Destination account',
+    'registration_attempts' => '',
+    'source_account'        => '',
+    'destination_account'   => '',
 
     'accounts_count'         => 'Всего счетов',
     'journals_count'         => 'Всего транзакций',
@@ -88,7 +88,7 @@ return [
     'budget_count'           => 'Всего категорий бюджета',
     'rule_and_groups_count'  => 'Всего правил и групп правил',
     'tags_count'             => 'Всего меток',
-    'inward'                 => 'Inward description',
-    'outward'                => 'Outward description',
-    'number_of_transactions' => 'Number of transactions',
+    'inward'                 => '',
+    'outward'                => '',
+    'number_of_transactions' => '',
 ];
\ No newline at end of file

From 4759713d9d595a54f81c1efcb35e99b561055221 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Fri, 25 Aug 2017 07:07:16 +0200
Subject: [PATCH 259/668] New translations demo.php (Slovenian)

---
 resources/lang/sl_SI/demo.php | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/resources/lang/sl_SI/demo.php b/resources/lang/sl_SI/demo.php
index e6a07ca5c4..a8a4edea33 100644
--- a/resources/lang/sl_SI/demo.php
+++ b/resources/lang/sl_SI/demo.php
@@ -10,18 +10,18 @@ declare(strict_types=1);
  */
 
 return [
-    'no_demo_text'                   => 'Sorry, there is no extra demo-explanation text for <abbr title=":route">this page</abbr>.',
-    'see_help_icon'                  => 'However, the <i class="fa fa-question-circle"></i>-icon in the top right corner may tell you more.',
+    'no_demo_text'                   => '',
+    'see_help_icon'                  => '',
     'index'                          => 'Dobrodošli v <strong>Firefly III</strong>! Na tej strani boste dobili hiter pregled nad vašimi financami. Za več informacij preverite račune &rarr; <a href=":asset">premoženjski računi</a> in seveda <a href=":budgets">budžet</a> in <a href=":reports">poročila</a>. Ali pa se samo malo razglejte naokoli in videli boste, kje boste končali.',
     'accounts-index'                 => 'Premoženjski računi so vaši osebni bančni računi. Konti stroškov so računi na katere zapravljate vaš denar, kot npr. trgovine in prijatelji.
 Konti prihodkov so računi iz katerih dobivate denar, kot npr. vaš delodajalec, država in drugi viri vaših prihodkov. Na tej strani lahko račune urejate ali jih odstranite.',
     'budgets-index'                  => 'Na tej strani najdete pregled nad vašimi budžeti. Zgornji kazalec prikazuje vsoto ki je na razpolago za ta budžet. To lahko nastavljate za katerokoli obdobje, tako da kliknete na vsoto na desni. Vsota, ki ste jo dejansko porabili je prikazana na spodnjem kazalcu. Spodaj so prikazani vaši stroški razporejeni po budžetih.',
-    'reports-index-start'            => 'Firefly III supports four types of reports. Read about them by clicking on the <i class="fa fa-question-circle"></i>-icon in the top right corner.',
-    'reports-index-examples'         => 'Be sure to check out these examples: <a href=":one">a monthly financial overview</a>, <a href=":two">a yearly financial overview</a> and <a href=":three">a budget overview</a>.',
-    'currencies-index'               => 'Firefly III supports multiple currencies. Although it defaults to the Euro it can be set to the US Dollar and many other currencies. As you can see a small selection of currencies has been included but you can add your own if you wish to. Changing the default currency will not change the currency of existing transactions however: Firefly III supports the use of multiple currencies at the same time.',
-    'transactions-index'             => 'These expenses, deposits and transfers are not particularly imaginative. They have been generated automatically.',
-    'piggy-banks-index'              => 'As you can see, there are three piggy banks. Use the plus and minus buttons to influence the amount of money in each piggy bank. Click the name of the piggy bank to see the administration for each piggy bank.',
-    'import-index'                   => 'Of course, any CSV file can be imported into Firefly III ',
-    'import-configure-security'      => 'Because of security concerns, your upload has been replaced with a local file.',
-    'import-configure-configuration' => 'The configuration you see below is correct for the local file.',
+    'reports-index-start'            => '',
+    'reports-index-examples'         => '',
+    'currencies-index'               => '',
+    'transactions-index'             => '',
+    'piggy-banks-index'              => '',
+    'import-index'                   => '',
+    'import-configure-security'      => '',
+    'import-configure-configuration' => '',
 ];
\ No newline at end of file

From 06a50a5e450ad3f95a84c109cef09068db7e834e Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Fri, 25 Aug 2017 07:07:17 +0200
Subject: [PATCH 260/668] New translations demo.php (Polish)

---
 resources/lang/pl_PL/demo.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/resources/lang/pl_PL/demo.php b/resources/lang/pl_PL/demo.php
index 84446f6be6..5c0af0c796 100644
--- a/resources/lang/pl_PL/demo.php
+++ b/resources/lang/pl_PL/demo.php
@@ -10,17 +10,17 @@ declare(strict_types=1);
  */
 
 return [
-    'no_demo_text'                   => 'Sorry, there is no extra demo-explanation text for <abbr title=":route">this page</abbr>.',
+    'no_demo_text'                   => '',
     'see_help_icon'                  => 'Jednakże ikona <i class="fa fa-question-circle"></i> w prawym górnym rogu może powiedzieć Ci więcej.',
     'index'                          => 'Witaj w <strong>Firefly III</strong>! Na tej stronie znajduje się szybki przegląd Twoich finansów. Aby uzyskać więcej informacji sprawdź Konta &rarr; <a href=":asset">Konta aktywów</a> oraz oczywiście strony <a href=":budgets">Budżety</a> oraz <a href=":reports">Raporty</a>. Lub po prostu się rozejrzyj i zobacz gdzie trafisz w końcu.',
     'accounts-index'                 => 'Konta aktywów są Twoimi osobistymi kontami bankowymi. Konta wydatków to konta na które wydajesz pieniądze takie jak sklepy oraz przyjaciele. Kona przychodów są kontami, z których otrzymujesz pieniądze takie jak twoja praca, zwrot podatków lub inne źródła przychodów. Na tej stronie możesz je modyfikować oraz usuwać.',
-    'budgets-index'                  => 'This page shows you an overview of your budgets. The top bar shows the amount that is available to be budgeted. This can be customized for any period by clicking the amount on the right. The amount you\'ve actually spent is shown in the bar below. Below that are the expenses per budget and what you\'ve budgeted for them.',
-    'reports-index-start'            => 'Firefly III supports four types of reports. Read about them by clicking on the <i class="fa fa-question-circle"></i>-icon in the top right corner.',
-    'reports-index-examples'         => 'Be sure to check out these examples: <a href=":one">a monthly financial overview</a>, <a href=":two">a yearly financial overview</a> and <a href=":three">a budget overview</a>.',
-    'currencies-index'               => 'Firefly III supports multiple currencies. Although it defaults to the Euro it can be set to the US Dollar and many other currencies. As you can see a small selection of currencies has been included but you can add your own if you wish to. Changing the default currency will not change the currency of existing transactions however: Firefly III supports the use of multiple currencies at the same time.',
-    'transactions-index'             => 'These expenses, deposits and transfers are not particularly imaginative. They have been generated automatically.',
-    'piggy-banks-index'              => 'As you can see, there are three piggy banks. Use the plus and minus buttons to influence the amount of money in each piggy bank. Click the name of the piggy bank to see the administration for each piggy bank.',
-    'import-index'                   => 'Of course, any CSV file can be imported into Firefly III ',
-    'import-configure-security'      => 'Because of security concerns, your upload has been replaced with a local file.',
+    'budgets-index'                  => '',
+    'reports-index-start'            => '',
+    'reports-index-examples'         => '',
+    'currencies-index'               => '',
+    'transactions-index'             => '',
+    'piggy-banks-index'              => '',
+    'import-index'                   => '',
+    'import-configure-security'      => '',
     'import-configure-configuration' => 'Konfiguracja, która widzisz poniżej jest prawidłowa dla lokalnego pliku.',
 ];
\ No newline at end of file

From 8eb6092f91727d5e92cdb4f99b997e964d87e52c Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Fri, 25 Aug 2017 07:07:20 +0200
Subject: [PATCH 261/668] New translations firefly.php (Russian)

---
 resources/lang/ru_RU/firefly.php | 1378 +++++++++++++++---------------
 1 file changed, 689 insertions(+), 689 deletions(-)

diff --git a/resources/lang/ru_RU/firefly.php b/resources/lang/ru_RU/firefly.php
index 468735bab6..403d0d7391 100644
--- a/resources/lang/ru_RU/firefly.php
+++ b/resources/lang/ru_RU/firefly.php
@@ -30,9 +30,9 @@ return [
     'no_results_for_empty_search'                => 'Результатов не найдено.',
     'removed_amount'                             => 'Снято :amount',
     'added_amount'                               => 'Добавлено :amount',
-    'asset_account_role_help'                    => 'Any extra options resulting from your choice can be set later.',
+    'asset_account_role_help'                    => '',
     'Opening balance'                            => 'Баланс на момент открытия',
-    'create_new_stuff'                           => 'Create new stuff',
+    'create_new_stuff'                           => '',
     'new_withdrawal'                             => 'Новый вывод',
     'new_deposit'                                => 'Новый доход',
     'new_transfer'                               => 'Новый перевод',
@@ -41,94 +41,94 @@ return [
     'new_revenue_account'                        => 'Новый доходный счет',
     'new_budget'                                 => 'Новый бюджет',
     'new_bill'                                   => 'Новый счет',
-    'block_account_logout'                       => 'You have been logged out. Blocked accounts cannot use this site. Did you register with a valid email address?',
+    'block_account_logout'                       => '',
     'flash_success'                              => 'Успешно!',
     'flash_info'                                 => 'Сообщение',
     'flash_warning'                              => 'Предупреждение!',
     'flash_error'                                => 'Ошибка!',
-    'flash_info_multiple'                        => 'There is one message|There are :count messages',
-    'flash_error_multiple'                       => 'There is one error|There are :count errors',
-    'net_worth'                                  => 'Net worth',
-    'route_has_no_help'                          => 'There is no help for this route.',
+    'flash_info_multiple'                        => '',
+    'flash_error_multiple'                       => '',
+    'net_worth'                                  => '',
+    'route_has_no_help'                          => '',
     'two_factor_welcome'                         => 'Привет, :user!',
-    'two_factor_enter_code'                      => 'To continue, please enter your two factor authentication code. Your application can generate it for you.',
-    'two_factor_code_here'                       => 'Enter code here',
-    'two_factor_title'                           => 'Two factor authentication',
-    'authenticate'                               => 'Authenticate',
-    'two_factor_forgot_title'                    => 'Lost two factor authentication',
-    'two_factor_forgot'                          => 'I forgot my two-factor thing.',
-    'two_factor_lost_header'                     => 'Lost your two factor authentication?',
-    'two_factor_lost_intro'                      => 'Unfortunately, this is not something you can reset from the web interface. You have two choices.',
-    'two_factor_lost_fix_self'                   => 'If you run your own instance of Firefly III, check the logs in <code>storage/logs</code> for instructions.',
-    'two_factor_lost_fix_owner'                  => 'Otherwise, email the site owner, <a href="mailto::site_owner">:site_owner</a> and ask them to reset your two factor authentication.',
-    'warning_much_data'                          => ':days days of data may take a while to load.',
-    'registered'                                 => 'You have registered successfully!',
+    'two_factor_enter_code'                      => '',
+    'two_factor_code_here'                       => '',
+    'two_factor_title'                           => '',
+    'authenticate'                               => '',
+    'two_factor_forgot_title'                    => '',
+    'two_factor_forgot'                          => '',
+    'two_factor_lost_header'                     => '',
+    'two_factor_lost_intro'                      => '',
+    'two_factor_lost_fix_self'                   => '',
+    'two_factor_lost_fix_owner'                  => '',
+    'warning_much_data'                          => '',
+    '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'                          => '',
     'Savings account'                            => 'Сберегательный счет',
     'Credit card'                                => 'Кредитная карта',
     'source_accounts'                            => 'Исходный счет(а)',
     'destination_accounts'                       => 'Счет(а) назначения',
     'user_id_is'                                 => 'Ваш id пользователя <strong>:user</strong>',
     'field_supports_markdown'                    => 'Это поле поддерживает <a href="https://en.support.wordpress.com/markdown-quick-reference/">Markdown</a>.',
-    'need_more_help'                             => 'If you need more help using Firefly III, please <a href="https://github.com/firefly-iii/firefly-iii/issues">open a ticket on Github</a>.',
-    'reenable_intro_text'                        => 'You can also reenable <a href="#" id="reenableGuidance">the introduction guidance</a>.',
-    'intro_boxes_after_refresh'                  => 'The introduction boxes will reappear when you refresh the page.',
+    'need_more_help'                             => '',
+    'reenable_intro_text'                        => '',
+    'intro_boxes_after_refresh'                  => '',
     'show_all_no_filter'                         => 'Показать все транзакции без группировки по датам.',
     'expenses_by_category'                       => 'Расходы по категориям',
     'expenses_by_budget'                         => 'Расходы по бюджетам',
     'income_by_category'                         => 'Доход по категориям',
-    'expenses_by_asset_account'                  => 'Expenses by asset account',
-    'expenses_by_expense_account'                => 'Expenses by expense account',
-    'cannot_redirect_to_account'                 => 'Firefly III cannot redirect you to the correct page. Apologies.',
+    'expenses_by_asset_account'                  => '',
+    'expenses_by_expense_account'                => '',
+    'cannot_redirect_to_account'                 => '',
     'sum_of_expenses'                            => 'Сумма расходов',
     'sum_of_income'                              => 'Сумма дохода',
     'total_sum'                                  => 'Итого',
-    'spent_in_specific_budget'                   => 'Spent in budget ":budget"',
-    'sum_of_expenses_in_budget'                  => 'Spent total in budget ":budget"',
-    'left_in_budget_limit'                       => 'Left to spend according to budgeting',
+    'spent_in_specific_budget'                   => '',
+    'sum_of_expenses_in_budget'                  => '',
+    'left_in_budget_limit'                       => '',
     'cannot_reset_demo_user'                     => 'Невозможно сбросить пароль демонстрационной учетной записи',
     'current_period'                             => 'Текущий период',
     'show_the_current_period_and_overview'       => 'Показать текущий период и обзор',
     'pref_languages_locale'                      => 'Для корректной работы с языками, отличными от английского, ваша операционная система должна отдавать корректную информацию о локали. Если это не так, валюты, даты и суммы могут отображаться некорректно.',
-    'budget_in_period'                           => 'All transactions for budget ":name" between :start and :end',
-    'chart_budget_in_period'                     => 'Chart for all transactions for budget ":name" between :start and :end',
-    'chart_account_in_period'                    => 'Chart for all transactions for account ":name" between :start and :end',
-    'chart_category_in_period'                   => 'Chart for all transactions for category ":name" between :start and :end',
-    'chart_category_all'                         => 'Chart for all transactions for category ":name"',
-    'clone_withdrawal'                           => 'Clone this withdrawal',
-    'clone_deposit'                              => 'Clone this deposit',
+    'budget_in_period'                           => '',
+    'chart_budget_in_period'                     => '',
+    'chart_account_in_period'                    => '',
+    'chart_category_in_period'                   => '',
+    'chart_category_all'                         => '',
+    'clone_withdrawal'                           => '',
+    'clone_deposit'                              => '',
     'clone_transfer'                             => 'Клонировать этот трансфер',
     'multi_select_no_selection'                  => 'Ничего не выбрано',
     'multi_select_all_selected'                  => 'Все выбранные',
     'multi_select_filter_placeholder'            => 'Поиск..',
     'between_dates_breadcrumb'                   => 'Между :start и :end',
-    'all_journals_without_budget'                => 'All transactions without a budget',
-    'journals_without_budget'                    => 'Transactions without a budget',
-    'all_journals_without_category'              => 'All transactions without a category',
-    'journals_without_category'                  => 'Transactions without a category',
-    'all_journals_for_account'                   => 'All transactions for account :name',
-    'chart_all_journals_for_account'             => 'Chart of all transactions for account :name',
-    'journals_in_period_for_account'             => 'All transactions for account :name between :start and :end',
+    'all_journals_without_budget'                => '',
+    'journals_without_budget'                    => '',
+    'all_journals_without_category'              => '',
+    'journals_without_category'                  => '',
+    'all_journals_for_account'                   => '',
+    'chart_all_journals_for_account'             => '',
+    'journals_in_period_for_account'             => '',
     'transferred'                                => 'Переведено',
-    'all_withdrawal'                             => 'All expenses',
-    'all_transactions'                           => 'All transactions',
-    'title_withdrawal_between'                   => 'All expenses between :start and :end',
+    'all_withdrawal'                             => '',
+    'all_transactions'                           => '',
+    'title_withdrawal_between'                   => '',
     'all_deposit'                                => 'Все доходы',
     'title_deposit_between'                      => 'Все доходы между :start и :end',
     'all_transfers'                              => 'Все переводы',
     'title_transfers_between'                    => 'Все переводы между :start и :end',
     'all_transfer'                               => 'Все переводы',
-    'all_journals_for_tag'                       => 'All transactions for tag ":tag"',
-    'title_transfer_between'                     => 'All transfers between :start and :end',
-    'all_journals_for_category'                  => 'All transactions for category :name',
-    'all_journals_for_budget'                    => 'All transactions for budget :name',
-    'chart_all_journals_for_budget'              => 'Chart of all transactions for budget :name',
-    'journals_in_period_for_category'            => 'All transactions for category :name between :start and :end',
-    'journals_in_period_for_tag'                 => 'All transactions for tag :tag between :start and :end',
-    'not_available_demo_user'                    => 'The feature you try to access is not available to demo users.',
-    'exchange_rate_instructions'                 => 'Asset account "@name" only accepts transactions in @native_currency. If you wish to use @foreign_currency instead, make sure that the amount in @native_currency is known as well:',
-    'transfer_exchange_rate_instructions'        => 'Source asset account "@source_name" only accepts transactions in @source_currency. Destination asset account "@dest_name" only accepts transactions in @dest_currency. You must provide the transferred amount correctly in both currencies.',
+    'all_journals_for_tag'                       => '',
+    'title_transfer_between'                     => '',
+    'all_journals_for_category'                  => '',
+    'all_journals_for_budget'                    => '',
+    'chart_all_journals_for_budget'              => '',
+    'journals_in_period_for_category'            => '',
+    'journals_in_period_for_tag'                 => '',
+    'not_available_demo_user'                    => '',
+    'exchange_rate_instructions'                 => '',
+    'transfer_exchange_rate_instructions'        => '',
     'transaction_data'                           => 'Данные транзакции',
 
     // search
@@ -136,9 +136,9 @@ return [
     'search_found_transactions'                  => 'Количество транзакций найдено:',
     'general_search_error'                       => 'Произошла ошибка при поиске. Пожалуйста, проверьте файлы журнала для получения дополнительной информации.',
     'search_box'                                 => 'Поиск',
-    'search_box_intro'                           => 'Welcome to the search function of Firefly III. Enter your search query in the box. Make sure you check out the help file because the search is pretty advanced.',
-    'search_error'                               => 'Error while searching',
-    'search_searching'                           => 'Searching ...',
+    'search_box_intro'                           => '',
+    'search_error'                               => '',
+    'search_searching'                           => '',
 
     // repeat frequencies:
     'repeat_freq_yearly'                         => 'ежегодно',
@@ -151,170 +151,170 @@ return [
     // export data:
     'import_and_export'                          => 'Импорт и экспорт',
     'export_data'                                => 'Экспорт данных',
-    'export_data_intro'                          => 'For backup purposes, when migrating to another system or when migrating to another Firefly III installation.',
+    'export_data_intro'                          => '',
     'export_format'                              => 'Формат для экспорта',
-    'export_format_csv'                          => 'Comma separated values (CSV file)',
-    'export_format_mt940'                        => 'MT940 compatible format',
-    'export_included_accounts'                   => 'Export transactions from these accounts',
-    'include_old_uploads_help'                   => 'Firefly III does not throw away the original CSV files you have imported in the past. You can include them in your export.',
+    'export_format_csv'                          => '',
+    'export_format_mt940'                        => '',
+    'export_included_accounts'                   => '',
+    'include_old_uploads_help'                   => '',
     'do_export'                                  => 'Экспорт',
-    'export_status_never_started'                => 'The export has not started yet',
-    'export_status_make_exporter'                => 'Creating exporter thing...',
-    'export_status_collecting_journals'          => 'Collecting your transactions...',
-    'export_status_collected_journals'           => 'Collected your transactions!',
-    'export_status_converting_to_export_format'  => 'Converting your transactions...',
-    'export_status_converted_to_export_format'   => 'Converted your transactions!',
-    'export_status_creating_journal_file'        => 'Creating the export file...',
-    'export_status_created_journal_file'         => 'Created the export file!',
-    'export_status_collecting_attachments'       => 'Collecting all your attachments...',
-    'export_status_collected_attachments'        => 'Collected all your attachments!',
-    'export_status_collecting_old_uploads'       => 'Collecting all your previous uploads...',
-    'export_status_collected_old_uploads'        => 'Collected all your previous uploads!',
-    'export_status_creating_config_file'         => 'Creating a configuration file...',
-    'export_status_created_config_file'          => 'Created a configuration file!',
-    'export_status_creating_zip_file'            => 'Creating a zip file...',
-    'export_status_created_zip_file'             => 'Created a zip file!',
-    'export_status_finished'                     => 'Export has succesfully finished! Yay!',
+    'export_status_never_started'                => '',
+    'export_status_make_exporter'                => '',
+    'export_status_collecting_journals'          => '',
+    'export_status_collected_journals'           => '',
+    'export_status_converting_to_export_format'  => '',
+    'export_status_converted_to_export_format'   => '',
+    'export_status_creating_journal_file'        => '',
+    'export_status_created_journal_file'         => '',
+    'export_status_collecting_attachments'       => '',
+    'export_status_collected_attachments'        => '',
+    'export_status_collecting_old_uploads'       => '',
+    'export_status_collected_old_uploads'        => '',
+    'export_status_creating_config_file'         => '',
+    'export_status_created_config_file'          => '',
+    'export_status_creating_zip_file'            => '',
+    'export_status_created_zip_file'             => '',
+    'export_status_finished'                     => '',
     'export_data_please_wait'                    => 'Подождите пожалуйста...',
 
     // rules
-    'rules'                                      => 'Rules',
-    'rule_name'                                  => 'Name of rule',
-    'rule_triggers'                              => 'Rule triggers when',
-    'rule_actions'                               => 'Rule will',
-    'new_rule'                                   => 'New rule',
-    'new_rule_group'                             => 'New rule group',
-    'rule_priority_up'                           => 'Give rule more priority',
-    'rule_priority_down'                         => 'Give rule less priority',
-    'make_new_rule_group'                        => 'Make new rule group',
-    'store_new_rule_group'                       => 'Store new rule group',
-    'created_new_rule_group'                     => 'New rule group ":title" stored!',
-    'updated_rule_group'                         => 'Successfully updated rule group ":title".',
-    'edit_rule_group'                            => 'Edit rule group ":title"',
-    'delete_rule_group'                          => 'Delete rule group ":title"',
-    'deleted_rule_group'                         => 'Deleted rule group ":title"',
-    'update_rule_group'                          => 'Update rule group',
-    'no_rules_in_group'                          => 'There are no rules in this group',
-    'move_rule_group_up'                         => 'Move rule group up',
-    'move_rule_group_down'                       => 'Move rule group down',
-    'save_rules_by_moving'                       => 'Save these rule(s) by moving them to another rule group:',
-    'make_new_rule'                              => 'Make new rule in rule group ":title"',
-    'rule_help_stop_processing'                  => 'When you check this box, later rules in this group will not be executed.',
-    'rule_help_active'                           => 'Inactive rules will never fire.',
-    'stored_new_rule'                            => 'Stored new rule with title ":title"',
-    'deleted_rule'                               => 'Deleted rule with title ":title"',
-    'store_new_rule'                             => 'Store new rule',
-    'updated_rule'                               => 'Updated rule with title ":title"',
-    'default_rule_group_name'                    => 'Default rules',
-    'default_rule_group_description'             => 'All your rules not in a particular group.',
-    'default_rule_name'                          => 'Your first default rule',
-    'default_rule_description'                   => 'This rule is an example. You can safely delete it.',
-    'default_rule_trigger_description'           => 'The Man Who Sold the World',
-    'default_rule_trigger_from_account'          => 'David Bowie',
-    'default_rule_action_prepend'                => 'Bought the world from ',
-    'default_rule_action_set_category'           => 'Large expenses',
-    'trigger'                                    => 'Trigger',
-    'trigger_value'                              => 'Trigger on value',
-    'stop_processing_other_triggers'             => 'Stop processing other triggers',
-    'add_rule_trigger'                           => 'Add new trigger',
-    'action'                                     => 'Action',
-    'action_value'                               => 'Action value',
-    'stop_executing_other_actions'               => 'Stop executing other actions',
-    'add_rule_action'                            => 'Add new action',
-    'edit_rule'                                  => 'Edit rule ":title"',
-    'delete_rule'                                => 'Delete rule ":title"',
-    'update_rule'                                => 'Update rule',
-    'test_rule_triggers'                         => 'See matching transactions',
-    'warning_transaction_subset'                 => 'For performance reasons this list is limited to :max_num_transactions and may only show a subset of matching transactions',
-    'warning_no_matching_transactions'           => 'No matching transactions found. Please note that for performance reasons, only the last :num_transactions transactions have been checked.',
-    'warning_no_valid_triggers'                  => 'No valid triggers provided.',
-    'apply_rule_selection'                       => 'Apply rule ":title" to a selection of your transactions',
-    'apply_rule_selection_intro'                 => 'Rules like ":title" are normally only applied to new or updated transactions, but you can tell Firefly III to run it on a selection of your existing transactions. This can be useful when you have updated a rule and you need the changes to be applied to all of your other transactions.',
-    'include_transactions_from_accounts'         => 'Include transactions from these accounts',
-    'applied_rule_selection'                     => 'Rule ":title" has been applied to your selection.',
-    'execute'                                    => 'Execute',
-    'apply_rule_group_selection'                 => 'Apply rule group ":title" to a selection of your transactions',
-    'apply_rule_group_selection_intro'           => 'Rule groups like ":title" are normally only applied to new or updated transactions, but you can tell Firefly III to run all the rules in this group on a selection of your existing transactions. This can be useful when you have updated a group of rules and you need the changes to be applied to all of your other transactions.',
-    'applied_rule_group_selection'               => 'Rule group ":title" has been applied to your selection.',
+    'rules'                                      => '',
+    'rule_name'                                  => '',
+    'rule_triggers'                              => '',
+    'rule_actions'                               => '',
+    'new_rule'                                   => '',
+    'new_rule_group'                             => '',
+    'rule_priority_up'                           => '',
+    'rule_priority_down'                         => '',
+    'make_new_rule_group'                        => '',
+    'store_new_rule_group'                       => '',
+    'created_new_rule_group'                     => '',
+    'updated_rule_group'                         => '',
+    'edit_rule_group'                            => '',
+    'delete_rule_group'                          => '',
+    'deleted_rule_group'                         => '',
+    'update_rule_group'                          => '',
+    'no_rules_in_group'                          => '',
+    'move_rule_group_up'                         => '',
+    'move_rule_group_down'                       => '',
+    'save_rules_by_moving'                       => '',
+    'make_new_rule'                              => '',
+    'rule_help_stop_processing'                  => '',
+    'rule_help_active'                           => '',
+    'stored_new_rule'                            => '',
+    'deleted_rule'                               => '',
+    'store_new_rule'                             => '',
+    'updated_rule'                               => '',
+    'default_rule_group_name'                    => '',
+    'default_rule_group_description'             => '',
+    'default_rule_name'                          => '',
+    'default_rule_description'                   => '',
+    'default_rule_trigger_description'           => '',
+    'default_rule_trigger_from_account'          => '',
+    'default_rule_action_prepend'                => '',
+    'default_rule_action_set_category'           => '',
+    'trigger'                                    => '',
+    'trigger_value'                              => '',
+    'stop_processing_other_triggers'             => '',
+    'add_rule_trigger'                           => '',
+    'action'                                     => '',
+    'action_value'                               => '',
+    'stop_executing_other_actions'               => '',
+    'add_rule_action'                            => '',
+    'edit_rule'                                  => '',
+    'delete_rule'                                => '',
+    'update_rule'                                => '',
+    'test_rule_triggers'                         => '',
+    'warning_transaction_subset'                 => '',
+    'warning_no_matching_transactions'           => '',
+    'warning_no_valid_triggers'                  => '',
+    'apply_rule_selection'                       => '',
+    'apply_rule_selection_intro'                 => '',
+    'include_transactions_from_accounts'         => '',
+    'applied_rule_selection'                     => '',
+    'execute'                                    => '',
+    'apply_rule_group_selection'                 => '',
+    'apply_rule_group_selection_intro'           => '',
+    'applied_rule_group_selection'               => '',
 
     // actions and triggers
-    'rule_trigger_user_action'                   => 'User action is ":trigger_value"',
-    'rule_trigger_from_account_starts'           => 'Source account starts with ":trigger_value"',
-    'rule_trigger_from_account_ends'             => 'Source account ends with ":trigger_value"',
-    'rule_trigger_from_account_is'               => 'Source account is ":trigger_value"',
-    'rule_trigger_from_account_contains'         => 'Source account contains ":trigger_value"',
-    'rule_trigger_to_account_starts'             => 'Destination account starts with ":trigger_value"',
-    'rule_trigger_to_account_ends'               => 'Destination account ends with ":trigger_value"',
-    'rule_trigger_to_account_is'                 => 'Destination account is ":trigger_value"',
-    'rule_trigger_to_account_contains'           => 'Destination account contains ":trigger_value"',
-    'rule_trigger_transaction_type'              => 'Transaction is of type ":trigger_value"',
-    'rule_trigger_category_is'                   => 'Category is ":trigger_value"',
-    'rule_trigger_amount_less'                   => 'Amount is less than :trigger_value',
-    'rule_trigger_amount_exactly'                => 'Amount is :trigger_value',
-    'rule_trigger_amount_more'                   => 'Amount is more than :trigger_value',
-    'rule_trigger_description_starts'            => 'Description starts with ":trigger_value"',
-    'rule_trigger_description_ends'              => 'Description ends with ":trigger_value"',
-    'rule_trigger_description_contains'          => 'Description contains ":trigger_value"',
-    'rule_trigger_description_is'                => 'Description is ":trigger_value"',
-    'rule_trigger_from_account_starts_choice'    => 'Source account starts with..',
-    'rule_trigger_from_account_ends_choice'      => 'Source account ends with..',
-    'rule_trigger_from_account_is_choice'        => 'Source account is..',
-    'rule_trigger_from_account_contains_choice'  => 'Source account contains..',
-    'rule_trigger_to_account_starts_choice'      => 'Destination account starts with..',
-    'rule_trigger_to_account_ends_choice'        => 'Destination account ends with..',
-    'rule_trigger_to_account_is_choice'          => 'Destination account is..',
-    'rule_trigger_to_account_contains_choice'    => 'Destination account contains..',
-    'rule_trigger_transaction_type_choice'       => 'Transaction is of type..',
-    'rule_trigger_amount_less_choice'            => 'Amount is less than..',
-    'rule_trigger_amount_exactly_choice'         => 'Amount is..',
-    'rule_trigger_amount_more_choice'            => 'Amount is more than..',
-    'rule_trigger_description_starts_choice'     => 'Description starts with..',
-    'rule_trigger_description_ends_choice'       => 'Description ends with..',
-    'rule_trigger_description_contains_choice'   => 'Description contains..',
-    'rule_trigger_description_is_choice'         => 'Description is..',
-    'rule_trigger_category_is_choice'            => 'Category is..',
-    'rule_trigger_budget_is_choice'              => 'Budget is..',
-    'rule_trigger_tag_is_choice'                 => '(A) tag is..',
-    'rule_trigger_has_attachments_choice'        => 'Has at least this many attachments',
-    'rule_trigger_has_attachments'               => 'Has at least :trigger_value attachment(s)',
-    'rule_trigger_store_journal'                 => 'When a transaction is created',
-    'rule_trigger_update_journal'                => 'When a transaction is updated',
-    'rule_action_set_category'                   => 'Set category to ":action_value"',
-    'rule_action_clear_category'                 => 'Clear category',
-    'rule_action_set_budget'                     => 'Set budget to ":action_value"',
-    'rule_action_clear_budget'                   => 'Clear budget',
-    'rule_action_add_tag'                        => 'Add tag ":action_value"',
-    'rule_action_remove_tag'                     => 'Remove tag ":action_value"',
-    'rule_action_remove_all_tags'                => 'Remove all tags',
-    'rule_action_set_description'                => 'Set description to ":action_value"',
-    'rule_action_append_description'             => 'Append description with ":action_value"',
-    'rule_action_prepend_description'            => 'Prepend description with ":action_value"',
-    'rule_action_set_category_choice'            => 'Set category to..',
-    'rule_action_clear_category_choice'          => 'Clear any category',
-    'rule_action_set_budget_choice'              => 'Set budget to..',
-    'rule_action_clear_budget_choice'            => 'Clear any budget',
-    'rule_action_add_tag_choice'                 => 'Add tag..',
-    'rule_action_remove_tag_choice'              => 'Remove tag..',
-    'rule_action_remove_all_tags_choice'         => 'Remove all tags',
-    'rule_action_set_description_choice'         => 'Set description to..',
-    'rule_action_append_description_choice'      => 'Append description with..',
-    'rule_action_prepend_description_choice'     => 'Prepend description with..',
-    'rule_action_set_source_account_choice'      => 'Set source account to...',
-    'rule_action_set_source_account'             => 'Set source account to :action_value',
-    'rule_action_set_destination_account_choice' => 'Set destination account to...',
-    'rule_action_set_destination_account'        => 'Set destination account to :action_value',
+    'rule_trigger_user_action'                   => '',
+    'rule_trigger_from_account_starts'           => '',
+    'rule_trigger_from_account_ends'             => '',
+    'rule_trigger_from_account_is'               => '',
+    'rule_trigger_from_account_contains'         => '',
+    'rule_trigger_to_account_starts'             => '',
+    'rule_trigger_to_account_ends'               => '',
+    'rule_trigger_to_account_is'                 => '',
+    'rule_trigger_to_account_contains'           => '',
+    'rule_trigger_transaction_type'              => '',
+    'rule_trigger_category_is'                   => '',
+    'rule_trigger_amount_less'                   => '',
+    'rule_trigger_amount_exactly'                => '',
+    'rule_trigger_amount_more'                   => '',
+    'rule_trigger_description_starts'            => '',
+    'rule_trigger_description_ends'              => '',
+    'rule_trigger_description_contains'          => '',
+    'rule_trigger_description_is'                => '',
+    'rule_trigger_from_account_starts_choice'    => '',
+    'rule_trigger_from_account_ends_choice'      => '',
+    'rule_trigger_from_account_is_choice'        => '',
+    'rule_trigger_from_account_contains_choice'  => '',
+    'rule_trigger_to_account_starts_choice'      => '',
+    'rule_trigger_to_account_ends_choice'        => '',
+    'rule_trigger_to_account_is_choice'          => '',
+    'rule_trigger_to_account_contains_choice'    => '',
+    'rule_trigger_transaction_type_choice'       => '',
+    'rule_trigger_amount_less_choice'            => '',
+    'rule_trigger_amount_exactly_choice'         => '',
+    'rule_trigger_amount_more_choice'            => '',
+    'rule_trigger_description_starts_choice'     => '',
+    'rule_trigger_description_ends_choice'       => '',
+    'rule_trigger_description_contains_choice'   => '',
+    'rule_trigger_description_is_choice'         => '',
+    'rule_trigger_category_is_choice'            => '',
+    'rule_trigger_budget_is_choice'              => '',
+    'rule_trigger_tag_is_choice'                 => '',
+    'rule_trigger_has_attachments_choice'        => '',
+    'rule_trigger_has_attachments'               => '',
+    'rule_trigger_store_journal'                 => '',
+    'rule_trigger_update_journal'                => '',
+    'rule_action_set_category'                   => '',
+    'rule_action_clear_category'                 => '',
+    'rule_action_set_budget'                     => '',
+    'rule_action_clear_budget'                   => '',
+    'rule_action_add_tag'                        => '',
+    'rule_action_remove_tag'                     => '',
+    'rule_action_remove_all_tags'                => '',
+    'rule_action_set_description'                => '',
+    'rule_action_append_description'             => '',
+    'rule_action_prepend_description'            => '',
+    'rule_action_set_category_choice'            => '',
+    'rule_action_clear_category_choice'          => '',
+    'rule_action_set_budget_choice'              => '',
+    'rule_action_clear_budget_choice'            => '',
+    'rule_action_add_tag_choice'                 => '',
+    'rule_action_remove_tag_choice'              => '',
+    'rule_action_remove_all_tags_choice'         => '',
+    'rule_action_set_description_choice'         => '',
+    'rule_action_append_description_choice'      => '',
+    'rule_action_prepend_description_choice'     => '',
+    'rule_action_set_source_account_choice'      => '',
+    'rule_action_set_source_account'             => '',
+    'rule_action_set_destination_account_choice' => '',
+    'rule_action_set_destination_account'        => '',
 
     // tags
-    'store_new_tag'                              => 'Store new tag',
-    'update_tag'                                 => 'Update tag',
-    'no_location_set'                            => 'No location set.',
-    'meta_data'                                  => 'Meta data',
-    'location'                                   => 'Location',
+    'store_new_tag'                              => '',
+    'update_tag'                                 => '',
+    'no_location_set'                            => '',
+    'meta_data'                                  => '',
+    'location'                                   => '',
 
     // preferences
     'pref_home_screen_accounts'                  => 'Счета, отображаемые в сводке',
     'pref_home_screen_accounts_help'             => 'Какие счета нужно отображать в сводке на главной странице?',
-    'pref_view_range'                            => 'View range',
+    'pref_view_range'                            => '',
     'pref_view_range_help'                       => 'Некоторые диаграммы автоматически группируются по периодам. Какой период вы предпочитаете?',
     'pref_1D'                                    => 'Один день',
     'pref_1W'                                    => 'Одна неделя',
@@ -328,48 +328,48 @@ return [
     'pref_custom_fiscal_year_label'              => 'Включить',
     'pref_custom_fiscal_year_help'               => 'Для стран, в которых финансовый год начинается не 1 января, а заканчивается не 31 декабря, вы должны указать даты начала и окончания финансового года',
     'pref_fiscal_year_start_label'               => 'Дата начала финансового года',
-    'pref_two_factor_auth'                       => '2-step verification',
-    'pref_two_factor_auth_help'                  => 'When you enable 2-step verification (also known as two-factor authentication), you add an extra layer of security to your account. You sign in with something you know (your password) and something you have (a verification code). Verification codes are generated by an application on your phone, such as Authy or Google Authenticator.',
-    'pref_enable_two_factor_auth'                => 'Enable 2-step verification',
-    'pref_two_factor_auth_disabled'              => '2-step verification code removed and disabled',
-    'pref_two_factor_auth_remove_it'             => 'Don\'t forget to remove the account from your authentication app!',
-    'pref_two_factor_auth_code'                  => 'Verify code',
-    'pref_two_factor_auth_code_help'             => 'Scan the QR code with an application on your phone such as Authy or Google Authenticator and enter the generated code.',
-    'pref_two_factor_auth_reset_code'            => 'Reset verification code',
-    'pref_two_factor_auth_remove_code'           => 'Remove verification code',
-    'pref_two_factor_auth_remove_will_disable'   => '(this will also disable two-factor authentication)',
+    'pref_two_factor_auth'                       => '',
+    'pref_two_factor_auth_help'                  => '',
+    'pref_enable_two_factor_auth'                => '',
+    'pref_two_factor_auth_disabled'              => '',
+    'pref_two_factor_auth_remove_it'             => '',
+    'pref_two_factor_auth_code'                  => '',
+    'pref_two_factor_auth_code_help'             => '',
+    'pref_two_factor_auth_reset_code'            => '',
+    'pref_two_factor_auth_remove_code'           => '',
+    'pref_two_factor_auth_remove_will_disable'   => '',
     'pref_save_settings'                         => 'Сохранить настройки',
     'saved_preferences'                          => 'Настройки сохранены!',
     'preferences_general'                        => 'Основные',
     'preferences_frontpage'                      => 'Сводка',
     'preferences_security'                       => 'Безопасность',
     'preferences_layout'                         => 'Отображение',
-    'pref_home_show_deposits'                    => 'Show deposits on the home screen',
-    'pref_home_show_deposits_info'               => 'The home screen already shows your expense accounts. Should it also show your revenue accounts?',
-    'pref_home_do_show_deposits'                 => 'Yes, show them',
-    'successful_count'                           => 'of which :count successful',
-    'transaction_page_size_title'                => 'Page size',
-    'transaction_page_size_help'                 => 'Any list of transactions shows at most this many transactions',
-    'transaction_page_size_label'                => 'Page size',
-    'between_dates'                              => '(:start and :end)',
+    'pref_home_show_deposits'                    => '',
+    'pref_home_show_deposits_info'               => '',
+    'pref_home_do_show_deposits'                 => '',
+    'successful_count'                           => '',
+    'transaction_page_size_title'                => '',
+    'transaction_page_size_help'                 => '',
+    'transaction_page_size_label'                => '',
+    'between_dates'                              => '',
     'pref_optional_fields_transaction'           => 'Дополнительные поля для транзакций',
     'pref_optional_fields_transaction_help'      => 'По умолчанию при создании новой транзакции включены не все поля (чтобы не создавать беспорядок). Но вы можете включить эти поля, если лично вам они могут быть полезны. Любое поле, которое в последствии будет отключено, будет по-прежнему отображаться, если оно уже заполнено (независимо от данный настроек).',
     'optional_tj_date_fields'                    => 'Поля с датами',
     'optional_tj_business_fields'                => 'Бизнес-поля',
     'optional_tj_attachment_fields'              => 'Поля вложений',
-    'pref_optional_tj_interest_date'             => 'Interest date',
-    'pref_optional_tj_book_date'                 => 'Book date',
-    'pref_optional_tj_process_date'              => 'Processing date',
-    'pref_optional_tj_due_date'                  => 'Due date',
-    'pref_optional_tj_payment_date'              => 'Payment date',
-    'pref_optional_tj_invoice_date'              => 'Invoice date',
-    'pref_optional_tj_internal_reference'        => 'Internal reference',
+    'pref_optional_tj_interest_date'             => '',
+    'pref_optional_tj_book_date'                 => '',
+    'pref_optional_tj_process_date'              => '',
+    'pref_optional_tj_due_date'                  => '',
+    'pref_optional_tj_payment_date'              => '',
+    'pref_optional_tj_invoice_date'              => '',
+    'pref_optional_tj_internal_reference'        => '',
     'pref_optional_tj_notes'                     => 'Заметки',
     'pref_optional_tj_attachments'               => 'Вложения',
     'optional_field_meta_dates'                  => 'Даты',
     'optional_field_meta_business'               => 'Бизнес',
     'optional_field_attachments'                 => 'Вложения',
-    'optional_field_meta_data'                   => 'Optional meta data',
+    'optional_field_meta_data'                   => '',
 
 
     // profile:
@@ -388,69 +388,69 @@ return [
     'password_changed'                           => 'Пароль изменён!',
     'should_change'                              => 'Кажется, нужно изменить пароль.',
     'invalid_password'                           => 'Неверный пароль!',
-    'what_is_pw_security'                        => 'What is "verify password security"?',
-    'secure_pw_title'                            => 'How to choose a secure password',
-    'secure_pw_history'                          => 'In August 2017 well known security researcher Troy Hunt released a list of 306 million stolen passwords. These passwords were stolen during breakins at companies like LinkedIn, Adobe and NeoPets (and many more).',
-    'secure_pw_check_box'                        => 'By checking the box, Firefly III will send the SHA1 hash of your password to <a href="https://www.troyhunt.com/introducing-306-million-freely-downloadable-pwned-passwords/">the website of Troy Hunt</a> to see if it is on the list. This will stop you from using unsafe passwords as is recommended in the latest <a href="https://pages.nist.gov/800-63-3/sp800-63b.html">NIST Special Publication</a> on this subject.',
-    'secure_pw_sha1'                             => 'But I thought SHA1 was broken?',
-    'secure_pw_hash_speed'                       => 'Yes, but not in this context. As you can read on <a href="https://shattered.io/">the website detailing how they broke SHA1</a>, it is now slightly easier to find a "collision": another string that results in the same SHA1-hash. It now only takes 10,000 years using a single-GPU machine.',
-    'secure_pw_hash_security'                    => 'This collision would not be equal to your password, nor would it be useful on (a site like) Firefly III. This application does not use SHA1 for password verification. So it is safe to check this box. Your password is hashed and sent over HTTPS.',
-    'secure_pw_should'                           => 'Should I check the box?',
-    'secure_pw_long_password'                    => 'If you just generated a long, single-use password for Firefly III using some kind of password generator: <strong>no</strong>.',
-    'secure_pw_short'                            => 'If you just entered the password you always use: <em>Please yes</em>.',
+    'what_is_pw_security'                        => '',
+    'secure_pw_title'                            => '',
+    'secure_pw_history'                          => '',
+    'secure_pw_check_box'                        => '',
+    'secure_pw_sha1'                             => '',
+    'secure_pw_hash_speed'                       => '',
+    'secure_pw_hash_security'                    => '',
+    'secure_pw_should'                           => '',
+    'secure_pw_long_password'                    => '',
+    'secure_pw_short'                            => '',
 
 
     // attachments
-    'nr_of_attachments'                          => 'One attachment|:count attachments',
-    'attachments'                                => 'Attachments',
-    'edit_attachment'                            => 'Edit attachment ":name"',
-    'update_attachment'                          => 'Update attachment',
-    'delete_attachment'                          => 'Delete attachment ":name"',
-    'attachment_deleted'                         => 'Deleted attachment ":name"',
-    'attachment_updated'                         => 'Updated attachment ":name"',
-    'upload_max_file_size'                       => 'Maximum file size: :size',
+    'nr_of_attachments'                          => '',
+    'attachments'                                => '',
+    'edit_attachment'                            => '',
+    'update_attachment'                          => '',
+    'delete_attachment'                          => '',
+    'attachment_deleted'                         => '',
+    'attachment_updated'                         => '',
+    'upload_max_file_size'                       => '',
 
     // transaction index
-    'title_expenses'                             => 'Expenses',
-    'title_withdrawal'                           => 'Expenses',
-    'title_revenue'                              => 'Revenue / income',
-    'title_deposit'                              => 'Revenue / income',
-    'title_transfer'                             => 'Transfers',
-    'title_transfers'                            => 'Transfers',
+    'title_expenses'                             => '',
+    'title_withdrawal'                           => '',
+    'title_revenue'                              => '',
+    'title_deposit'                              => '',
+    'title_transfer'                             => '',
+    'title_transfers'                            => '',
 
     // convert stuff:
-    'convert_is_already_type_Withdrawal'         => 'This transaction is already a withdrawal',
-    'convert_is_already_type_Deposit'            => 'This transaction is already a deposit',
-    'convert_is_already_type_Transfer'           => 'This transaction is already a transfer',
-    'convert_to_Withdrawal'                      => 'Convert ":description" to a withdrawal',
-    'convert_to_Deposit'                         => 'Convert ":description" to a deposit',
-    'convert_to_Transfer'                        => 'Convert ":description" to a transfer',
-    'convert_options_WithdrawalDeposit'          => 'Convert a withdrawal into a deposit',
-    'convert_options_WithdrawalTransfer'         => 'Convert a withdrawal into a transfer',
-    'convert_options_DepositTransfer'            => 'Convert a deposit into a transfer',
-    'convert_options_DepositWithdrawal'          => 'Convert a deposit into a withdrawal',
-    'convert_options_TransferWithdrawal'         => 'Convert a transfer into a withdrawal',
-    'convert_options_TransferDeposit'            => 'Convert a transfer into a deposit',
-    'transaction_journal_convert_options'        => 'Convert this transaction',
-    'convert_Withdrawal_to_deposit'              => 'Convert this withdrawal to a deposit',
-    'convert_Withdrawal_to_transfer'             => 'Convert this withdrawal to a transfer',
-    'convert_Deposit_to_withdrawal'              => 'Convert this deposit to a withdrawal',
-    'convert_Deposit_to_transfer'                => 'Convert this deposit to a transfer',
-    'convert_Transfer_to_deposit'                => 'Convert this transfer to a deposit',
-    'convert_Transfer_to_withdrawal'             => 'Convert this transfer to a withdrawal',
-    'convert_please_set_revenue_source'          => 'Please pick the revenue account where the money will come from.',
-    'convert_please_set_asset_destination'       => 'Please pick the asset account where the money will go to.',
-    'convert_please_set_expense_destination'     => 'Please pick the expense account where the money will go to.',
-    'convert_please_set_asset_source'            => 'Please pick the asset account where the money will come from.',
-    'convert_explanation_withdrawal_deposit'     => 'If you convert this withdrawal into a deposit, :amount will be deposited into <a href=":sourceRoute">:sourceName</a> instead of taken from it.',
-    'convert_explanation_withdrawal_transfer'    => 'If you convert this withdrawal into a transfer, :amount will be transferred from <a href=":sourceRoute">:sourceName</a> to a new asset account, instead of being paid to <a href=":destinationRoute">:destinationName</a>.',
-    'convert_explanation_deposit_withdrawal'     => 'If you convert this deposit into a withdrawal, :amount will be removed from <a href=":destinationRoute">:destinationName</a> instead of added to it.',
-    'convert_explanation_deposit_transfer'       => 'If you convert this deposit into a transfer, :amount will be transferred from an asset account of your choice into <a href=":destinationRoute">:destinationName</a>.',
-    'convert_explanation_transfer_withdrawal'    => 'If you convert this transfer into a withdrawal, :amount will go from <a href=":sourceRoute">:sourceName</a> to a new destination as an expense, instead of to <a href=":destinationRoute">:destinationName</a> as a transfer.',
-    'convert_explanation_transfer_deposit'       => 'If you convert this transfer into a deposit, :amount will be deposited into account <a href=":destinationRoute">:destinationName</a> instead of being transferred there.',
-    'converted_to_Withdrawal'                    => 'The transaction has been converted to a withdrawal',
-    'converted_to_Deposit'                       => 'The transaction has been converted to a deposit',
-    'converted_to_Transfer'                      => 'The transaction has been converted to a transfer',
+    'convert_is_already_type_Withdrawal'         => '',
+    'convert_is_already_type_Deposit'            => '',
+    'convert_is_already_type_Transfer'           => '',
+    'convert_to_Withdrawal'                      => '',
+    'convert_to_Deposit'                         => '',
+    'convert_to_Transfer'                        => '',
+    'convert_options_WithdrawalDeposit'          => '',
+    'convert_options_WithdrawalTransfer'         => '',
+    'convert_options_DepositTransfer'            => '',
+    'convert_options_DepositWithdrawal'          => '',
+    'convert_options_TransferWithdrawal'         => '',
+    'convert_options_TransferDeposit'            => '',
+    'transaction_journal_convert_options'        => '',
+    'convert_Withdrawal_to_deposit'              => '',
+    'convert_Withdrawal_to_transfer'             => '',
+    'convert_Deposit_to_withdrawal'              => '',
+    'convert_Deposit_to_transfer'                => '',
+    'convert_Transfer_to_deposit'                => '',
+    'convert_Transfer_to_withdrawal'             => '',
+    'convert_please_set_revenue_source'          => '',
+    'convert_please_set_asset_destination'       => '',
+    'convert_please_set_expense_destination'     => '',
+    'convert_please_set_asset_source'            => '',
+    'convert_explanation_withdrawal_deposit'     => '',
+    'convert_explanation_withdrawal_transfer'    => '',
+    'convert_explanation_deposit_withdrawal'     => '',
+    'convert_explanation_deposit_transfer'       => '',
+    'convert_explanation_transfer_withdrawal'    => '',
+    'convert_explanation_transfer_deposit'       => '',
+    'converted_to_Withdrawal'                    => '',
+    'converted_to_Deposit'                       => '',
+    'converted_to_Transfer'                      => '',
 
 
     // create new stuff:
@@ -458,10 +458,10 @@ return [
     'create_new_deposit'                         => 'Создать новый доход',
     'create_new_transfer'                        => 'Создать новый перевод',
     'create_new_asset'                           => 'Создать новый активный счёт',
-    'create_new_expense'                         => 'Create new expense account',
-    'create_new_revenue'                         => 'Create new revenue account',
+    'create_new_expense'                         => '',
+    'create_new_revenue'                         => '',
     'create_new_piggy_bank'                      => 'Создать новую копилку',
-    'create_new_bill'                            => 'Create new bill',
+    'create_new_bill'                            => '',
 
     // currencies:
     'create_currency'                            => 'Создать новую валюту',
@@ -478,95 +478,95 @@ return [
     'default_currency'                           => 'основная',
 
     // forms:
-    'mandatoryFields'                            => 'Mandatory fields',
-    'optionalFields'                             => 'Optional fields',
+    'mandatoryFields'                            => '',
+    'optionalFields'                             => '',
     'options'                                    => 'Параметры',
 
     // budgets:
-    'create_new_budget'                          => 'Create a new budget',
-    'store_new_budget'                           => 'Store new budget',
-    'stored_new_budget'                          => 'Stored new budget ":name"',
-    'available_between'                          => 'Available between :start and :end',
-    'transactionsWithoutBudget'                  => 'Expenses without budget',
-    'transactions_no_budget'                     => 'Expenses without budget between :start and :end',
-    'spent_between'                              => 'Spent between :start and :end',
-    'createBudget'                               => 'New budget',
-    'inactiveBudgets'                            => 'Inactive budgets',
-    'without_budget_between'                     => 'Transactions without a budget between :start and :end',
-    'delete_budget'                              => 'Delete budget ":name"',
-    'deleted_budget'                             => 'Deleted budget ":name"',
-    'edit_budget'                                => 'Edit budget ":name"',
-    'updated_budget'                             => 'Updated budget ":name"',
-    'update_amount'                              => 'Update amount',
-    'update_budget'                              => 'Update budget',
-    'update_budget_amount_range'                 => 'Update (expected) available amount between :start and :end',
-    'budget_period_navigator'                    => 'Period navigator',
+    'create_new_budget'                          => '',
+    'store_new_budget'                           => '',
+    'stored_new_budget'                          => '',
+    'available_between'                          => '',
+    'transactionsWithoutBudget'                  => '',
+    'transactions_no_budget'                     => '',
+    'spent_between'                              => '',
+    'createBudget'                               => '',
+    'inactiveBudgets'                            => '',
+    'without_budget_between'                     => '',
+    'delete_budget'                              => '',
+    'deleted_budget'                             => '',
+    'edit_budget'                                => '',
+    'updated_budget'                             => '',
+    'update_amount'                              => '',
+    'update_budget'                              => '',
+    'update_budget_amount_range'                 => '',
+    'budget_period_navigator'                    => '',
 
     // bills:
-    'matching_on'                                => 'Matching on',
-    'between_amounts'                            => 'between :low and :high.',
-    'repeats'                                    => 'Repeats',
-    'connected_journals'                         => 'Connected transactions',
-    'auto_match_on'                              => 'Automatically matched by Firefly',
-    'auto_match_off'                             => 'Not automatically matched by Firefly',
-    'next_expected_match'                        => 'Next expected match',
-    'delete_bill'                                => 'Delete bill ":name"',
-    'deleted_bill'                               => 'Deleted bill ":name"',
-    'edit_bill'                                  => 'Edit bill ":name"',
-    'more'                                       => 'More',
-    'rescan_old'                                 => 'Rescan old transactions',
-    'update_bill'                                => 'Update bill',
-    'updated_bill'                               => 'Updated bill ":name"',
-    'store_new_bill'                             => 'Store new bill',
-    'stored_new_bill'                            => 'Stored new bill ":name"',
-    'cannot_scan_inactive_bill'                  => 'Inactive bills cannot be scanned.',
-    'rescanned_bill'                             => 'Rescanned everything.',
-    'average_bill_amount_year'                   => 'Average bill amount (:year)',
-    'average_bill_amount_overall'                => 'Average bill amount (overall)',
-    'not_or_not_yet'                             => 'Not (yet)',
-    'not_expected_period'                        => 'Not expected this period',
-    'bill_is_active'                             => 'Bill is active',
-    'bill_will_automatch'                        => 'Bill will automatically linked to matching transactions',
+    'matching_on'                                => '',
+    'between_amounts'                            => '',
+    'repeats'                                    => '',
+    'connected_journals'                         => '',
+    'auto_match_on'                              => '',
+    'auto_match_off'                             => '',
+    'next_expected_match'                        => '',
+    'delete_bill'                                => '',
+    'deleted_bill'                               => '',
+    'edit_bill'                                  => '',
+    'more'                                       => '',
+    'rescan_old'                                 => '',
+    'update_bill'                                => '',
+    'updated_bill'                               => '',
+    'store_new_bill'                             => '',
+    'stored_new_bill'                            => '',
+    'cannot_scan_inactive_bill'                  => '',
+    'rescanned_bill'                             => '',
+    'average_bill_amount_year'                   => '',
+    'average_bill_amount_overall'                => '',
+    'not_or_not_yet'                             => '',
+    'not_expected_period'                        => '',
+    'bill_is_active'                             => '',
+    'bill_will_automatch'                        => '',
     // accounts:
-    'details_for_asset'                          => 'Details for asset account ":name"',
-    'details_for_expense'                        => 'Details for expense account ":name"',
-    'details_for_revenue'                        => 'Details for revenue account ":name"',
-    'details_for_cash'                           => 'Details for cash account ":name"',
-    'store_new_asset_account'                    => 'Store new asset account',
-    'store_new_expense_account'                  => 'Store new expense account',
-    'store_new_revenue_account'                  => 'Store new revenue account',
-    'edit_asset_account'                         => 'Edit asset account ":name"',
-    'edit_expense_account'                       => 'Edit expense account ":name"',
-    'edit_revenue_account'                       => 'Edit revenue account ":name"',
-    'delete_asset_account'                       => 'Delete asset account ":name"',
-    'delete_expense_account'                     => 'Delete expense account ":name"',
-    'delete_revenue_account'                     => 'Delete revenue account ":name"',
-    'asset_deleted'                              => 'Successfully deleted asset account ":name"',
-    'expense_deleted'                            => 'Successfully deleted expense account ":name"',
-    'revenue_deleted'                            => 'Successfully deleted revenue account ":name"',
-    'update_asset_account'                       => 'Update asset account',
-    'update_expense_account'                     => 'Update expense account',
-    'update_revenue_account'                     => 'Update revenue account',
-    'make_new_asset_account'                     => 'Create a new asset account',
-    'make_new_expense_account'                   => 'Create a new expense account',
-    'make_new_revenue_account'                   => 'Create a new revenue account',
-    'asset_accounts'                             => 'Asset accounts',
-    'expense_accounts'                           => 'Expense accounts',
-    'revenue_accounts'                           => 'Revenue accounts',
-    'cash_accounts'                              => 'Cash accounts',
-    'Cash account'                               => 'Cash account',
-    'account_type'                               => 'Account type',
-    'save_transactions_by_moving'                => 'Save these transaction(s) by moving them to another account:',
-    'stored_new_account'                         => 'New account ":name" stored!',
-    'updated_account'                            => 'Updated account ":name"',
-    'credit_card_options'                        => 'Credit card options',
-    'no_transactions_account'                    => 'There are no transactions (in this period) for asset account ":name".',
+    'details_for_asset'                          => '',
+    'details_for_expense'                        => '',
+    'details_for_revenue'                        => '',
+    'details_for_cash'                           => '',
+    'store_new_asset_account'                    => '',
+    'store_new_expense_account'                  => '',
+    'store_new_revenue_account'                  => '',
+    'edit_asset_account'                         => '',
+    'edit_expense_account'                       => '',
+    'edit_revenue_account'                       => '',
+    'delete_asset_account'                       => '',
+    'delete_expense_account'                     => '',
+    'delete_revenue_account'                     => '',
+    'asset_deleted'                              => '',
+    'expense_deleted'                            => '',
+    'revenue_deleted'                            => '',
+    'update_asset_account'                       => '',
+    'update_expense_account'                     => '',
+    'update_revenue_account'                     => '',
+    'make_new_asset_account'                     => '',
+    'make_new_expense_account'                   => '',
+    'make_new_revenue_account'                   => '',
+    'asset_accounts'                             => '',
+    'expense_accounts'                           => '',
+    'revenue_accounts'                           => '',
+    'cash_accounts'                              => '',
+    'Cash account'                               => '',
+    'account_type'                               => '',
+    'save_transactions_by_moving'                => '',
+    'stored_new_account'                         => '',
+    'updated_account'                            => '',
+    'credit_card_options'                        => '',
+    'no_transactions_account'                    => '',
     'no_data_for_chart'                          => 'Недостаточно информации (пока) для построения этой диаграммы.',
-    'select_more_than_one_account'               => 'Please select more than one account',
-    'select_more_than_one_category'              => 'Please select more than one category',
-    'select_more_than_one_budget'                => 'Please select more than one budget',
-    'select_more_than_one_tag'                   => 'Please select more than one tag',
-    'account_default_currency'                   => 'If you select another currency, new transactions from this account will have this currency pre-selected.',
+    'select_more_than_one_account'               => '',
+    'select_more_than_one_category'              => '',
+    'select_more_than_one_budget'                => '',
+    'select_more_than_one_tag'                   => '',
+    'account_default_currency'                   => '',
 
     // categories:
     'new_category'                               => 'Новая категория',
@@ -582,47 +582,47 @@ return [
     'deleted_category'                           => 'Удалить категорию ":name"',
     'store_category'                             => 'Сохранить новую категорию',
     'stored_category'                            => 'Новая категория ":name" успешно сохранена!',
-    'without_category_between'                   => 'Without category between :start and :end',
+    'without_category_between'                   => '',
 
     // transactions:
-    'update_withdrawal'                          => 'Update withdrawal',
-    'update_deposit'                             => 'Update deposit',
-    'update_transfer'                            => 'Update transfer',
-    'updated_withdrawal'                         => 'Updated withdrawal ":description"',
-    'updated_deposit'                            => 'Updated deposit ":description"',
-    'updated_transfer'                           => 'Updated transfer ":description"',
-    'delete_withdrawal'                          => 'Delete withdrawal ":description"',
-    'delete_deposit'                             => 'Delete deposit ":description"',
-    'delete_transfer'                            => 'Delete transfer ":description"',
-    'deleted_withdrawal'                         => 'Successfully deleted withdrawal ":description"',
-    'deleted_deposit'                            => 'Successfully deleted deposit ":description"',
-    'deleted_transfer'                           => 'Successfully deleted transfer ":description"',
-    'stored_journal'                             => 'Successfully created new transaction ":description"',
+    'update_withdrawal'                          => '',
+    'update_deposit'                             => '',
+    'update_transfer'                            => '',
+    'updated_withdrawal'                         => '',
+    'updated_deposit'                            => '',
+    'updated_transfer'                           => '',
+    'delete_withdrawal'                          => '',
+    'delete_deposit'                             => '',
+    'delete_transfer'                            => '',
+    'deleted_withdrawal'                         => '',
+    'deleted_deposit'                            => '',
+    'deleted_transfer'                           => '',
+    'stored_journal'                             => '',
     'select_transactions'                        => 'Выбрать транзакции',
     'stop_selection'                             => 'Завершить выбор транзакций',
-    'edit_selected'                              => 'Edit selected',
-    'delete_selected'                            => 'Delete selected',
-    'mass_delete_journals'                       => 'Delete a number of transactions',
-    'mass_edit_journals'                         => 'Edit a number of transactions',
-    'cannot_edit_other_fields'                   => 'You cannot mass-edit other fields than the ones here, because there is no room to show them. Please follow the link and edit them by one-by-one, if you need to edit these fields.',
-    'perm-delete-many'                           => 'Deleting many items in one go can be very disruptive. Please be cautious.',
-    'mass_deleted_transactions_success'          => 'Deleted :amount transaction(s).',
-    'mass_edited_transactions_success'           => 'Updated :amount transaction(s)',
+    'edit_selected'                              => '',
+    'delete_selected'                            => '',
+    'mass_delete_journals'                       => '',
+    'mass_edit_journals'                         => '',
+    'cannot_edit_other_fields'                   => '',
+    'perm-delete-many'                           => '',
+    'mass_deleted_transactions_success'          => '',
+    'mass_edited_transactions_success'           => '',
 
 
     // new user:
     'welcome'                                    => 'Добро пожаловать в Firefly!',
     'submit'                                     => 'Подтвердить',
     'getting_started'                            => 'Начало работы',
-    'to_get_started'                             => 'It is good to see you have successfully installed Firefly III. To get started with this tool please enter your bank\'s name and the balance of your main checking account. Do not worry yet if you have multiple accounts. You can add those later. It\'s just that Firefly III needs something to start with.',
-    'savings_balance_text'                       => 'Firefly III will automatically create a savings account for you. By default, there will be no money in your savings account, but if you tell Firefly III the balance it will be stored as such.',
-    'finish_up_new_user'                         => 'That\'s it! You can continue by pressing <strong>Submit</strong>. You will be taken to the index of Firefly III.',
-    'stored_new_accounts_new_user'               => 'Yay! Your new accounts have been stored.',
+    'to_get_started'                             => '',
+    'savings_balance_text'                       => '',
+    'finish_up_new_user'                         => '',
+    'stored_new_accounts_new_user'               => '',
 
     // home page:
     'yourAccounts'                               => 'Ваши счета',
     'budgetsAndSpending'                         => 'Бюджеты и расходы',
-    'savings'                                    => 'Savings',
+    'savings'                                    => '',
     'newWithdrawal'                              => 'Новый расход',
     'newDeposit'                                 => 'Новый доход',
     'newTransfer'                                => 'Новый перевод',
@@ -666,179 +666,179 @@ return [
     'no'                                         => 'Нет',
     'amount'                                     => 'Сумма',
     'overview'                                   => 'Обзор',
-    'saveOnAccount'                              => 'Save on account',
-    'unknown'                                    => 'Unknown',
-    'daily'                                      => 'Daily',
-    'monthly'                                    => 'Monthly',
+    'saveOnAccount'                              => '',
+    'unknown'                                    => '',
+    'daily'                                      => '',
+    'monthly'                                    => '',
     'profile'                                    => 'Профиль',
     'errors'                                     => 'Ошибки',
 
     // reports:
-    'report_default'                             => 'Default financial report between :start and :end',
-    'report_audit'                               => 'Transaction history overview between :start and :end',
-    'report_category'                            => 'Category report between :start and :end',
-    'report_budget'                              => 'Budget report between :start and :end',
-    'report_tag'                                 => 'Tag report between :start and :end',
-    'quick_link_reports'                         => 'Quick links',
-    'quick_link_default_report'                  => 'Default financial report',
-    'quick_link_audit_report'                    => 'Transaction history overview',
-    'report_this_month_quick'                    => 'Current month, all accounts',
-    'report_this_year_quick'                     => 'Current year, all accounts',
-    'report_this_fiscal_year_quick'              => 'Current fiscal year, all accounts',
-    'report_all_time_quick'                      => 'All-time, all accounts',
-    'reports_can_bookmark'                       => 'Remember that reports can be bookmarked.',
-    'incomeVsExpenses'                           => 'Income vs. expenses',
-    'accountBalances'                            => 'Account balances',
-    'balanceStart'                               => 'Balance at start of period',
-    'balanceEnd'                                 => 'Balance at end of period',
-    'splitByAccount'                             => 'Split by account',
-    'coveredWithTags'                            => 'Covered with tags',
-    'leftUnbalanced'                             => 'Left unbalanced',
-    'leftInBudget'                               => 'Left in budget',
-    'sumOfSums'                                  => 'Sum of sums',
-    'noCategory'                                 => '(no category)',
-    'notCharged'                                 => 'Not charged (yet)',
-    'inactive'                                   => 'Inactive',
-    'active'                                     => 'Active',
-    'difference'                                 => 'Difference',
-    'in'                                         => 'In',
-    'out'                                        => 'Out',
-    'topX'                                       => 'top :number',
-    'show_full_list'                             => 'Show entire list',
-    'show_only_top'                              => 'Show only top :number',
-    'report_type'                                => 'Report type',
-    'report_type_default'                        => 'Default financial report',
-    'report_type_audit'                          => 'Transaction history overview (audit)',
-    'report_type_category'                       => 'Category report',
-    'report_type_budget'                         => 'Budget report',
-    'report_type_tag'                            => 'Tag report',
-    'more_info_help'                             => 'More information about these types of reports can be found in the help pages. Press the (?) icon in the top right corner.',
-    'report_included_accounts'                   => 'Included accounts',
-    'report_date_range'                          => 'Date range',
-    'report_preset_ranges'                       => 'Pre-set ranges',
+    'report_default'                             => '',
+    'report_audit'                               => '',
+    'report_category'                            => '',
+    'report_budget'                              => '',
+    'report_tag'                                 => '',
+    'quick_link_reports'                         => '',
+    'quick_link_default_report'                  => '',
+    'quick_link_audit_report'                    => '',
+    'report_this_month_quick'                    => '',
+    'report_this_year_quick'                     => '',
+    'report_this_fiscal_year_quick'              => '',
+    'report_all_time_quick'                      => '',
+    'reports_can_bookmark'                       => '',
+    'incomeVsExpenses'                           => '',
+    'accountBalances'                            => '',
+    'balanceStart'                               => '',
+    'balanceEnd'                                 => '',
+    'splitByAccount'                             => '',
+    'coveredWithTags'                            => '',
+    'leftUnbalanced'                             => '',
+    'leftInBudget'                               => '',
+    'sumOfSums'                                  => '',
+    'noCategory'                                 => '',
+    'notCharged'                                 => '',
+    'inactive'                                   => '',
+    'active'                                     => '',
+    'difference'                                 => '',
+    'in'                                         => '',
+    'out'                                        => '',
+    'topX'                                       => '',
+    'show_full_list'                             => '',
+    'show_only_top'                              => '',
+    'report_type'                                => '',
+    'report_type_default'                        => '',
+    'report_type_audit'                          => '',
+    'report_type_category'                       => '',
+    'report_type_budget'                         => '',
+    'report_type_tag'                            => '',
+    'more_info_help'                             => '',
+    'report_included_accounts'                   => '',
+    'report_date_range'                          => '',
+    'report_preset_ranges'                       => '',
     'shared'                                     => 'Общие',
     'fiscal_year'                                => 'Фискальный год',
-    'income_entry'                               => 'Income from account ":name" between :start and :end',
-    'expense_entry'                              => 'Expenses to account ":name" between :start and :end',
-    'category_entry'                             => 'Expenses in category ":name" between :start and :end',
-    'budget_spent_amount'                        => 'Expenses in budget ":budget" between :start and :end',
-    'balance_amount'                             => 'Expenses in budget ":budget" paid from account ":account" between :start and :end',
-    'no_audit_activity'                          => 'No activity was recorded on account <a href=":url" title=":account_name">:account_name</a> between :start and :end.',
-    'audit_end_balance'                          => 'Account balance of <a href=":url" title=":account_name">:account_name</a> at the end of :end was: :balance',
+    'income_entry'                               => '',
+    'expense_entry'                              => '',
+    'category_entry'                             => '',
+    'budget_spent_amount'                        => '',
+    'balance_amount'                             => '',
+    'no_audit_activity'                          => '',
+    'audit_end_balance'                          => '',
     'reports_extra_options'                      => 'Дополнительные опции',
-    'report_has_no_extra_options'                => 'This report has no extra options',
+    'report_has_no_extra_options'                => '',
     'reports_submit'                             => 'Просмотреть отчет',
-    'end_after_start_date'                       => 'End date of report must be after start date.',
-    'select_category'                            => 'Select category(ies)',
-    'select_budget'                              => 'Select budget(s).',
-    'select_tag'                                 => 'Select tag(s).',
-    'income_per_category'                        => 'Income per category',
-    'expense_per_category'                       => 'Expense per category',
-    'expense_per_budget'                         => 'Expense per budget',
-    'income_per_account'                         => 'Income per account',
-    'expense_per_account'                        => 'Expense per account',
-    'expense_per_tag'                            => 'Expense per tag',
-    'income_per_tag'                             => 'Income per tag',
-    'include_expense_not_in_budget'              => 'Included expenses not in the selected budget(s)',
-    'include_expense_not_in_account'             => 'Included expenses not in the selected account(s)',
-    'include_expense_not_in_category'            => 'Included expenses not in the selected category(ies)',
-    'include_income_not_in_category'             => 'Included income not in the selected category(ies)',
-    'include_income_not_in_account'              => 'Included income not in the selected account(s)',
-    'include_income_not_in_tags'                 => 'Included income not in the selected tag(s)',
-    'include_expense_not_in_tags'                => 'Included expenses not in the selected tag(s)',
-    'everything_else'                            => 'Everything else',
-    'income_and_expenses'                        => 'Income and expenses',
-    'spent_average'                              => 'Spent (average)',
-    'income_average'                             => 'Income (average)',
-    'transaction_count'                          => 'Transaction count',
-    'average_spending_per_account'               => 'Average spending per account',
-    'average_income_per_account'                 => 'Average income per account',
+    'end_after_start_date'                       => '',
+    'select_category'                            => '',
+    'select_budget'                              => '',
+    'select_tag'                                 => '',
+    'income_per_category'                        => '',
+    'expense_per_category'                       => '',
+    'expense_per_budget'                         => '',
+    'income_per_account'                         => '',
+    'expense_per_account'                        => '',
+    'expense_per_tag'                            => '',
+    'income_per_tag'                             => '',
+    'include_expense_not_in_budget'              => '',
+    'include_expense_not_in_account'             => '',
+    'include_expense_not_in_category'            => '',
+    'include_income_not_in_category'             => '',
+    'include_income_not_in_account'              => '',
+    'include_income_not_in_tags'                 => '',
+    'include_expense_not_in_tags'                => '',
+    'everything_else'                            => '',
+    'income_and_expenses'                        => '',
+    'spent_average'                              => '',
+    'income_average'                             => '',
+    'transaction_count'                          => '',
+    'average_spending_per_account'               => '',
+    'average_income_per_account'                 => '',
     'total'                                      => 'Итого',
     'description'                                => 'Описание',
-    'sum_of_period'                              => 'Sum of period',
-    'average_in_period'                          => 'Average in period',
+    'sum_of_period'                              => '',
+    'average_in_period'                          => '',
     'account_role_defaultAsset'                  => 'Счёт по умолчанию',
-    'account_role_sharedAsset'                   => 'Shared asset account',
-    'account_role_savingAsset'                   => 'Savings account',
-    'account_role_ccAsset'                       => 'Credit card',
+    'account_role_sharedAsset'                   => '',
+    'account_role_savingAsset'                   => '',
+    'account_role_ccAsset'                       => '',
 
     // charts:
     'chart'                                      => 'Диаграмма',
-    'month'                                      => 'Month',
-    'budget'                                     => 'Budget',
-    'spent'                                      => 'Spent',
-    'spent_in_budget'                            => 'Spent in budget',
-    'left_to_spend'                              => 'Left to spend',
+    'month'                                      => '',
+    'budget'                                     => '',
+    'spent'                                      => '',
+    'spent_in_budget'                            => '',
+    'left_to_spend'                              => '',
     'earned'                                     => 'Заработано',
-    'overspent'                                  => 'Overspent',
-    'left'                                       => 'Left',
-    'no_budget'                                  => '(no budget)',
-    'max-amount'                                 => 'Maximum amount',
-    'min-amount'                                 => 'Minumum amount',
-    'journal-amount'                             => 'Current bill entry',
-    'name'                                       => 'Name',
-    'date'                                       => 'Date',
-    'paid'                                       => 'Paid',
-    'unpaid'                                     => 'Unpaid',
-    'day'                                        => 'Day',
-    'budgeted'                                   => 'Budgeted',
-    'period'                                     => 'Period',
-    'balance'                                    => 'Balance',
-    'sum'                                        => 'Sum',
-    'average'                                    => 'Average',
-    'balanceFor'                                 => 'Balance for :name',
+    'overspent'                                  => '',
+    'left'                                       => '',
+    'no_budget'                                  => '',
+    'max-amount'                                 => '',
+    'min-amount'                                 => '',
+    'journal-amount'                             => '',
+    'name'                                       => '',
+    'date'                                       => '',
+    'paid'                                       => '',
+    'unpaid'                                     => '',
+    'day'                                        => '',
+    'budgeted'                                   => '',
+    'period'                                     => '',
+    'balance'                                    => '',
+    'sum'                                        => '',
+    'average'                                    => '',
+    'balanceFor'                                 => '',
 
     // piggy banks:
-    'add_money_to_piggy'                         => 'Add money to piggy bank ":name"',
-    'piggy_bank'                                 => 'Piggy bank',
-    'new_piggy_bank'                             => 'New piggy bank',
-    'store_piggy_bank'                           => 'Store new piggy bank',
-    'stored_piggy_bank'                          => 'Store new piggy bank ":name"',
-    'account_status'                             => 'Account status',
-    'left_for_piggy_banks'                       => 'Left for piggy banks',
-    'sum_of_piggy_banks'                         => 'Sum of piggy banks',
-    'saved_so_far'                               => 'Saved so far',
-    'left_to_save'                               => 'Left to save',
-    'suggested_amount'                           => 'Suggested monthly amount to save',
-    'add_money_to_piggy_title'                   => 'Add money to piggy bank ":name"',
-    'remove_money_from_piggy_title'              => 'Remove money from piggy bank ":name"',
-    'add'                                        => 'Add',
+    'add_money_to_piggy'                         => '',
+    'piggy_bank'                                 => '',
+    'new_piggy_bank'                             => '',
+    'store_piggy_bank'                           => '',
+    'stored_piggy_bank'                          => '',
+    'account_status'                             => '',
+    'left_for_piggy_banks'                       => '',
+    'sum_of_piggy_banks'                         => '',
+    'saved_so_far'                               => '',
+    'left_to_save'                               => '',
+    'suggested_amount'                           => '',
+    'add_money_to_piggy_title'                   => '',
+    'remove_money_from_piggy_title'              => '',
+    'add'                                        => '',
 
-    'remove'                     => 'Remove',
-    'max_amount_add'             => 'The maximum amount you can add is',
-    'max_amount_remove'          => 'The maximum amount you can remove is',
-    'update_piggy_button'        => 'Update piggy bank',
-    'update_piggy_title'         => 'Update piggy bank ":name"',
-    'updated_piggy_bank'         => 'Updated piggy bank ":name"',
-    'details'                    => 'Details',
-    'events'                     => 'Events',
-    'target_amount'              => 'Target amount',
-    'start_date'                 => 'Start date',
-    'target_date'                => 'Target date',
-    'no_target_date'             => 'No target date',
-    'table'                      => 'Table',
-    'delete_piggy_bank'          => 'Delete piggy bank ":name"',
-    'cannot_add_amount_piggy'    => 'Could not add :amount to ":name".',
-    'cannot_remove_from_piggy'   => 'Could not remove :amount from ":name".',
-    'deleted_piggy_bank'         => 'Deleted piggy bank ":name"',
-    'added_amount_to_piggy'      => 'Added :amount to ":name"',
-    'removed_amount_from_piggy'  => 'Removed :amount from ":name"',
+    'remove'                     => '',
+    'max_amount_add'             => '',
+    'max_amount_remove'          => '',
+    'update_piggy_button'        => '',
+    'update_piggy_title'         => '',
+    'updated_piggy_bank'         => '',
+    'details'                    => '',
+    'events'                     => '',
+    'target_amount'              => '',
+    'start_date'                 => '',
+    'target_date'                => '',
+    'no_target_date'             => '',
+    'table'                      => '',
+    'delete_piggy_bank'          => '',
+    'cannot_add_amount_piggy'    => '',
+    'cannot_remove_from_piggy'   => '',
+    'deleted_piggy_bank'         => '',
+    'added_amount_to_piggy'      => '',
+    'removed_amount_from_piggy'  => '',
 
     // tags
-    'regular_tag'                => 'Just a regular tag.',
-    'balancing_act'              => 'The tag takes at most two transactions; an expense and a transfer. They\'ll balance each other out.',
-    'advance_payment'            => 'The tag accepts one expense and any number of deposits aimed to repay the original expense.',
-    'delete_tag'                 => 'Delete tag ":tag"',
-    'deleted_tag'                => 'Deleted tag ":tag"',
-    'new_tag'                    => 'Make new tag',
-    'edit_tag'                   => 'Edit tag ":tag"',
-    'updated_tag'                => 'Updated tag ":tag"',
-    'created_tag'                => 'Tag ":tag" has been created!',
+    'regular_tag'                => '',
+    'balancing_act'              => '',
+    'advance_payment'            => '',
+    'delete_tag'                 => '',
+    'deleted_tag'                => '',
+    'new_tag'                    => '',
+    'edit_tag'                   => '',
+    'updated_tag'                => '',
+    'created_tag'                => '',
 
-    'transaction_journal_information'       => 'Transaction information',
-    'transaction_journal_meta'              => 'Meta information',
-    'total_amount'                          => 'Total amount',
-    'number_of_decimals'                    => 'Number of decimals',
+    'transaction_journal_information'       => '',
+    'transaction_journal_meta'              => '',
+    'total_amount'                          => '',
+    'number_of_decimals'                    => '',
 
     // administration
     'administration'                        => 'Администрирование',
@@ -847,72 +847,72 @@ return [
     'all_users'                             => 'Все пользователи',
     'instance_configuration'                => 'Конфигурация',
     'firefly_instance_configuration'        => 'Базовая конфигурация Firefly III',
-    'setting_single_user_mode'              => 'Single user mode',
-    'setting_single_user_mode_explain'      => 'By default, Firefly III only accepts one (1) registration: you. This is a security measure, preventing others from using your instance unless you allow them to. Future registrations are blocked. When you uncheck this box, others can use your instance as wel, assuming they can reach it (when it is connected to the internet).',
-    'store_configuration'                   => 'Store configuration',
-    'single_user_administration'            => 'User administration for :email',
-    'edit_user'                             => 'Edit user :email',
-    'hidden_fields_preferences'             => 'Not all fields are visible right now. You must enable them in your <a href=":link">settings</a>.',
-    'user_data_information'                 => 'User data',
-    'user_information'                      => 'User information',
+    'setting_single_user_mode'              => '',
+    'setting_single_user_mode_explain'      => '',
+    'store_configuration'                   => '',
+    'single_user_administration'            => '',
+    'edit_user'                             => '',
+    'hidden_fields_preferences'             => '',
+    'user_data_information'                 => '',
+    'user_information'                      => '',
     'total_size'                            => 'общий размер',
-    'budget_or_budgets'                     => 'budget(s)',
-    'budgets_with_limits'                   => 'budget(s) with configured amount',
-    'rule_or_rules'                         => 'rule(s)',
-    'rulegroup_or_groups'                   => 'rule group(s)',
-    'configuration_updated'                 => 'The configuration has been updated',
-    'setting_is_demo_site'                  => 'Demo site',
-    'setting_is_demo_site_explain'          => 'If you check this box, this installation will behave as if it is the demo site, which can have weird side effects.',
-    'block_code_bounced'                    => 'Email message(s) bounced',
-    'block_code_expired'                    => 'Demo account expired',
-    'no_block_code'                         => 'No reason for block or user not blocked',
+    'budget_or_budgets'                     => '',
+    'budgets_with_limits'                   => '',
+    'rule_or_rules'                         => '',
+    'rulegroup_or_groups'                   => '',
+    'configuration_updated'                 => '',
+    'setting_is_demo_site'                  => '',
+    'setting_is_demo_site_explain'          => '',
+    'block_code_bounced'                    => '',
+    'block_code_expired'                    => '',
+    'no_block_code'                         => '',
     // links
-    'journal_link_configuration'            => 'Transaction links configuration',
-    'create_new_link_type'                  => 'Create new link type',
-    'store_new_link_type'                   => 'Store new link type',
-    'update_link_type'                      => 'Update link type',
-    'edit_link_type'                        => 'Edit link type ":name"',
-    'updated_link_type'                     => 'Updated link type ":name"',
-    'delete_link_type'                      => 'Delete link type ":name"',
-    'deleted_link_type'                     => 'Deleted link type ":name"',
-    'stored_new_link_type'                  => 'Store new link type ":name"',
-    'cannot_edit_link_type'                 => 'Cannot edit link type ":name"',
-    'link_type_help_name'                   => 'Ie. "Duplicates"',
-    'link_type_help_inward'                 => 'Ie. "duplicates"',
-    'link_type_help_outward'                => 'Ie. "is duplicated by"',
-    'save_connections_by_moving'            => 'Save the link between these transaction(s) by moving them to another link type:',
-    'do_not_save_connection'                => '(do not save connection)',
-    'link_transaction'                      => 'Link transaction',
-    'link_to_other_transaction'             => 'Link this transaction to another transaction',
-    'select_transaction_to_link'            => 'Select a transaction to link this transaction to',
-    'this_transaction'                      => 'This transaction',
-    'transaction'                           => 'Transaction',
-    'comments'                              => 'Comments',
-    'to_link_not_found'                     => 'If the transaction you want to link to is not listed, simply enter its ID.',
-    'invalid_link_data'                     => 'Invalid link type selected. Cannot link transaction.',
-    'journals_linked'                       => 'Transactions are linked.',
-    'journals_error_linked'                 => 'These transactions are already linked.',
-    'journal_links'                         => 'Transaction links',
-    'this_withdrawal'                       => 'This withdrawal',
-    'this_deposit'                          => 'This deposit',
-    'this_transfer'                         => 'This transfer',
-    'overview_for_link'                     => 'Overview for link type ":name"',
-    'delete_journal_link'                   => 'Delete the link between <a href=":source_link">:source</a> and <a href=":destination_link">:destination</a>',
-    'deleted_link'                          => 'Deleted link',
+    'journal_link_configuration'            => '',
+    'create_new_link_type'                  => '',
+    'store_new_link_type'                   => '',
+    'update_link_type'                      => '',
+    'edit_link_type'                        => '',
+    'updated_link_type'                     => '',
+    'delete_link_type'                      => '',
+    'deleted_link_type'                     => '',
+    'stored_new_link_type'                  => '',
+    'cannot_edit_link_type'                 => '',
+    'link_type_help_name'                   => '',
+    'link_type_help_inward'                 => '',
+    'link_type_help_outward'                => '',
+    'save_connections_by_moving'            => '',
+    'do_not_save_connection'                => '',
+    'link_transaction'                      => '',
+    'link_to_other_transaction'             => '',
+    'select_transaction_to_link'            => '',
+    'this_transaction'                      => '',
+    'transaction'                           => '',
+    'comments'                              => '',
+    'to_link_not_found'                     => '',
+    'invalid_link_data'                     => '',
+    'journals_linked'                       => '',
+    'journals_error_linked'                 => '',
+    'journal_links'                         => '',
+    'this_withdrawal'                       => '',
+    'this_deposit'                          => '',
+    'this_transfer'                         => '',
+    'overview_for_link'                     => '',
+    'delete_journal_link'                   => '',
+    'deleted_link'                          => '',
 
 
     // split a transaction:
-    'splits'                                => 'Splits',
-    'add_another_split'                     => 'Add another split',
-    'split-transactions'                    => 'Split transactions',
-    'do_split'                              => 'Do a split',
-    'split_this_withdrawal'                 => 'Split this withdrawal',
-    'split_this_deposit'                    => 'Split this deposit',
-    'split_this_transfer'                   => 'Split this transfer',
-    'cannot_edit_multiple_source'           => 'You cannot edit splitted transaction #:id with description ":description" because it contains multiple source accounts.',
-    'cannot_edit_multiple_dest'             => 'You cannot edit splitted transaction #:id with description ":description" because it contains multiple destination accounts.',
-    'cannot_edit_opening_balance'           => 'You cannot edit the opening balance of an account.',
-    'no_edit_multiple_left'                 => 'You have selected no valid transactions to edit.',
+    'splits'                                => '',
+    'add_another_split'                     => '',
+    'split-transactions'                    => '',
+    'do_split'                              => '',
+    'split_this_withdrawal'                 => '',
+    'split_this_deposit'                    => '',
+    'split_this_transfer'                   => '',
+    'cannot_edit_multiple_source'           => '',
+    'cannot_edit_multiple_dest'             => '',
+    'cannot_edit_opening_balance'           => '',
+    'no_edit_multiple_left'                 => '',
 
     // import bread crumbs and titles:
     'import'                                => 'Импорт',
@@ -920,93 +920,93 @@ return [
 
     // import index page:
     'import_index_title'                    => 'Импорт данных в Firefly III',
-    'import_index_sub_title'                => 'Index',
-    'import_general_index_intro'            => 'Welcome to Firefly\'s import routine. There are a few ways of importing data into Firefly III, displayed here as buttons.',
-    'import_index_intro'                    => 'This routine will help you import files from your bank into Firefly III. Please check out the help pages in the top right corner.',
-    'import_index_file'                     => 'Select your file',
-    'import_index_config'                   => 'If you have previously imported data into Firefly III, you may have a configuration file, which will pre-set configuration values for you. For some banks, other users have kindly provided their <a href="https://github.com/firefly-iii/import-configurations/wiki">configuration file</a>.',
-    'import_index_type'                     => 'Select the type of file you will upload',
-    'import_index_start'                    => 'Start importing',
+    'import_index_sub_title'                => '',
+    'import_general_index_intro'            => '',
+    'import_index_intro'                    => '',
+    'import_index_file'                     => '',
+    'import_index_config'                   => '',
+    'import_index_type'                     => '',
+    'import_index_start'                    => '',
 
     // supported file types:
-    'import_file_type_csv'                  => 'CSV (comma separated values)',
+    'import_file_type_csv'                  => '',
 
     // import configuration routine:
-    'import_config_sub_title'               => 'Set up your import file',
-    'import_config_bread_crumb'             => 'Set up your import file',
+    'import_config_sub_title'               => '',
+    'import_config_bread_crumb'             => '',
 
     // import status page:
-    'import_status_bread_crumb'             => 'Import status',
-    'import_status_sub_title'               => 'Import status',
-    'import_status_wait_title'              => 'Please hold...',
-    'import_status_wait_text'               => 'This box will disappear in a moment.',
-    'import_status_ready_title'             => 'Import is ready to start',
-    'import_status_ready_text'              => 'The import is ready to start. All the configuration you needed to do has been done. Please download the configuration file. It will help you with the import should it not go as planned. To actually run the import, you can either execute the following command in your console, or run the web-based import. Depending on your configuration, the console import will give you more feedback.',
-    'import_status_ready_config'            => 'Download configuration',
-    'import_status_ready_start'             => 'Start the import',
-    'import_status_ready_share'             => 'Please consider downloading your configuration and sharing it at the <strong><a href="https://github.com/firefly-iii/import-configurations/wiki">import configuration center</a></strong>. This will allow other users of Firefly III to import their files more easily.',
-    'import_status_running_title'           => 'The import is running',
-    'import_status_running_placeholder'     => 'Please hold for an update...',
-    'import_status_errors_title'            => 'Errors during the import',
-    'import_status_errors_single'           => 'An error has occured during the import. It does not appear to be fatal.',
-    'import_status_errors_multi'            => 'Some errors occured during the import. These do not appear to be fatal.',
-    'import_status_fatal_title'             => 'A fatal error occurred',
-    'import_status_fatal_text'              => 'A fatal error occurred, which the import-routine cannot recover from. Please see the explanation in red below.',
-    'import_status_fatal_more'              => 'If the error is a time-out, the import will have stopped half-way. For some server configurations, it is merely the server that stopped while the import keeps running in the background. To verify this, check out the log files. If the problem persists, consider importing over the command line instead.',
-    'import_status_finished_title'          => 'Import routine finished',
-    'import_status_finished_text'           => 'The import routine has imported your file.',
-    'import_status_finished_job'            => 'The transactions imported can be found in tag <a href=":link" class="label label-success" style="font-size:100%;font-weight:normal;">:tag</a>.',
-    'import_with_key'                       => 'Import with key \':key\'',
+    'import_status_bread_crumb'             => '',
+    'import_status_sub_title'               => '',
+    'import_status_wait_title'              => '',
+    'import_status_wait_text'               => '',
+    'import_status_ready_title'             => '',
+    'import_status_ready_text'              => '',
+    'import_status_ready_config'            => '',
+    'import_status_ready_start'             => '',
+    'import_status_ready_share'             => '',
+    'import_status_running_title'           => '',
+    'import_status_running_placeholder'     => '',
+    'import_status_errors_title'            => '',
+    'import_status_errors_single'           => '',
+    'import_status_errors_multi'            => '',
+    'import_status_fatal_title'             => '',
+    'import_status_fatal_text'              => '',
+    'import_status_fatal_more'              => '',
+    'import_status_finished_title'          => '',
+    'import_status_finished_text'           => '',
+    'import_status_finished_job'            => '',
+    'import_with_key'                       => '',
 
     // sandstorm.io errors and messages:
-    'sandstorm_not_available'               => 'This function is not available when you are using Firefly III within a Sandstorm.io environment.',
+    'sandstorm_not_available'               => '',
 
     // empty lists? no objects? instructions:
-    'no_transactions_in_period'             => 'There are no transactions in this period.',
-    'no_accounts_title_asset'               => 'Let\'s create an asset account!',
-    'no_accounts_intro_asset'               => 'You have no asset accounts yet. Asset accounts are your main accounts: your checking account, savings account, shared account or even your credit card.',
-    'no_accounts_imperative_asset'          => 'To start using Firefly III you must create at least one asset account. Let\'s do so now:',
+    'no_transactions_in_period'             => '',
+    'no_accounts_title_asset'               => '',
+    'no_accounts_intro_asset'               => '',
+    'no_accounts_imperative_asset'          => '',
     'no_accounts_create_asset'              => 'Создание расходного счёта',
     'no_accounts_title_expense'             => 'Давайте создадим расходный счёт!',
     'no_accounts_intro_expense'             => 'Пока у вас нет ни одного расходного счёта. Расходные счета используются для контроля за тем, где именно вы расходуете свои финансы. Например, в магазинах или на оплату коммунальных счетов.',
     'no_accounts_imperative_expense'        => 'Расходные счета создаются автоматически, когда вы создаёте транзакции (расходы), но вы можете также создать их вручную, если хотите. Давайте создадим один прямо сейчас:',
     'no_accounts_create_expense'            => 'Создать расходный счёт',
-    'no_accounts_title_revenue'             => 'Let\'s create a revenue account!',
-    'no_accounts_intro_revenue'             => 'You have no revenue accounts yet. Revenue accounts are the places where you receive money from, such as your employer.',
-    'no_accounts_imperative_revenue'        => 'Revenue accounts are created automatically when you create transactions, but you can create one manually too, if you want. Let\'s create one now:',
-    'no_accounts_create_revenue'            => 'Create a revenue account',
-    'no_budgets_title_default'              => 'Let\'s create a budget',
-    'no_budgets_intro_default'              => 'You have no budgets yet. Budgets are used to organise your expenses into logical groups, which you can give a soft-cap to limit your expenses.',
-    'no_budgets_imperative_default'         => 'Budgets are the basic tools of financial management. Let\'s create one now:',
-    'no_budgets_create_default'             => 'Create a budget',
-    'no_categories_title_default'           => 'Let\'s create a category!',
-    'no_categories_intro_default'           => 'You have no categories yet. Categories are used to fine tune your transactions and label them with their designated category.',
-    'no_categories_imperative_default'      => 'Categories are created automatically when you create transactions, but you can create one manually too. Let\'s create one now:',
-    'no_categories_create_default'          => 'Create a category',
-    'no_tags_title_default'                 => 'Let\'s create a tag!',
-    'no_tags_intro_default'                 => 'You have no tags yet. Tags are used to fine tune your transactions and label them with specific keywords.',
-    'no_tags_imperative_default'            => 'Tags are created automatically when you create transactions, but you can create one manually too. Let\'s create one now:',
-    'no_tags_create_default'                => 'Create a tag',
-    'no_transactions_title_withdrawal'      => 'Let\'s create an expense!',
-    'no_transactions_intro_withdrawal'      => 'You have no expenses yet. You should create expenses to start managing your finances.',
-    'no_transactions_imperative_withdrawal' => 'Have you spent some money? Then you should write it down:',
-    'no_transactions_create_withdrawal'     => 'Create an expense',
-    'no_transactions_title_deposit'         => 'Let\'s create some income!',
-    'no_transactions_intro_deposit'         => 'You have no recorded income yet. You should create income entries to start managing your finances.',
-    'no_transactions_imperative_deposit'    => 'Have you received some money? Then you should write it down:',
-    'no_transactions_create_deposit'        => 'Create a deposit',
-    'no_transactions_title_transfers'       => 'Let\'s create a transfer!',
-    'no_transactions_intro_transfers'       => 'You have no transfers yet. When you move money between asset accounts, it is recorded as a transfer.',
-    'no_transactions_imperative_transfers'  => 'Have you moved some money around? Then you should write it down:',
-    'no_transactions_create_transfers'      => 'Create a transfer',
-    'no_piggies_title_default'              => 'Let\'s create a piggy bank!',
-    'no_piggies_intro_default'              => 'You have no piggy banks yet. You can create piggy banks to divide your savings and keep track of what you\'re saving up for.',
-    'no_piggies_imperative_default'         => 'Do you have things you\'re saving money for? Create a piggy bank and keep track:',
-    'no_piggies_create_default'             => 'Create a new piggy bank',
-    'no_bills_title_default'                => 'Let\'s create a bill!',
-    'no_bills_intro_default'                => 'You have no bills yet. You can create bills to keep track of regular expenses, like your rent of insurance.',
-    'no_bills_imperative_default'           => 'Do you have such regular bills? Create a bill and keep track of your payments:',
-    'no_bills_create_default'               => 'Create a bill',
+    'no_accounts_title_revenue'             => '',
+    'no_accounts_intro_revenue'             => '',
+    'no_accounts_imperative_revenue'        => '',
+    'no_accounts_create_revenue'            => '',
+    'no_budgets_title_default'              => '',
+    'no_budgets_intro_default'              => '',
+    'no_budgets_imperative_default'         => '',
+    'no_budgets_create_default'             => '',
+    'no_categories_title_default'           => '',
+    'no_categories_intro_default'           => '',
+    'no_categories_imperative_default'      => '',
+    'no_categories_create_default'          => '',
+    'no_tags_title_default'                 => '',
+    'no_tags_intro_default'                 => '',
+    'no_tags_imperative_default'            => '',
+    'no_tags_create_default'                => '',
+    'no_transactions_title_withdrawal'      => '',
+    'no_transactions_intro_withdrawal'      => '',
+    'no_transactions_imperative_withdrawal' => '',
+    'no_transactions_create_withdrawal'     => '',
+    'no_transactions_title_deposit'         => '',
+    'no_transactions_intro_deposit'         => '',
+    'no_transactions_imperative_deposit'    => '',
+    'no_transactions_create_deposit'        => '',
+    'no_transactions_title_transfers'       => '',
+    'no_transactions_intro_transfers'       => '',
+    'no_transactions_imperative_transfers'  => '',
+    'no_transactions_create_transfers'      => '',
+    'no_piggies_title_default'              => '',
+    'no_piggies_intro_default'              => '',
+    'no_piggies_imperative_default'         => '',
+    'no_piggies_create_default'             => '',
+    'no_bills_title_default'                => '',
+    'no_bills_intro_default'                => '',
+    'no_bills_imperative_default'           => '',
+    'no_bills_create_default'               => '',
 
 
 ];
\ No newline at end of file

From f9aa33315a4d3e52e4eae556bcf922be1970a237 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Fri, 25 Aug 2017 07:07:21 +0200
Subject: [PATCH 262/668] New translations form.php (Russian)

---
 resources/lang/ru_RU/form.php | 270 +++++++++++++++++-----------------
 1 file changed, 135 insertions(+), 135 deletions(-)

diff --git a/resources/lang/ru_RU/form.php b/resources/lang/ru_RU/form.php
index 26228ed515..e7e1245724 100644
--- a/resources/lang/ru_RU/form.php
+++ b/resources/lang/ru_RU/form.php
@@ -14,103 +14,103 @@ declare(strict_types=1);
 return [
 
     // new user:
-    'bank_name'                      => 'Bank name',
-    'bank_balance'                   => 'Balance',
-    'savings_balance'                => 'Savings balance',
-    'credit_card_limit'              => 'Credit card limit',
-    'automatch'                      => 'Match automatically',
-    'skip'                           => 'Skip',
-    'name'                           => 'Name',
-    'active'                         => 'Active',
-    'amount_min'                     => 'Minimum amount',
-    'amount_max'                     => 'Maximum amount',
-    'match'                          => 'Matches on',
-    'repeat_freq'                    => 'Repeats',
-    'journal_currency_id'            => 'Currency',
-    'currency_id'                    => 'Currency',
-    'attachments'                    => 'Attachments',
-    'journal_amount'                 => 'Amount',
-    'journal_asset_source_account'   => 'Asset account (source)',
-    'journal_source_account_name'    => 'Revenue account (source)',
-    'journal_source_account_id'      => 'Asset account (source)',
-    'BIC'                            => 'BIC',
-    'verify_password'                => 'Verify password security',
-    'account_from_id'                => 'From account',
-    'account_to_id'                  => 'To account',
-    'source_account'                 => 'Source account',
-    'destination_account'            => 'Destination account',
-    'journal_destination_account_id' => 'Asset account (destination)',
-    'asset_destination_account'      => 'Asset account (destination)',
-    'asset_source_account'           => 'Asset account (source)',
-    'journal_description'            => 'Description',
-    'note'                           => 'Notes',
-    'split_journal'                  => 'Split this transaction',
-    'split_journal_explanation'      => 'Split this transaction in multiple parts',
-    'currency'                       => 'Currency',
-    'account_id'                     => 'Asset account',
-    'budget_id'                      => 'Budget',
-    'openingBalance'                 => 'Opening balance',
-    'tagMode'                        => 'Tag mode',
-    'tagPosition'                    => 'Tag location',
-    'virtualBalance'                 => 'Virtual balance',
-    'longitude_latitude'             => 'Location',
-    'targetamount'                   => 'Target amount',
-    'accountRole'                    => 'Account role',
-    'openingBalanceDate'             => 'Opening balance date',
-    'ccType'                         => 'Credit card payment plan',
-    'ccMonthlyPaymentDate'           => 'Credit card monthly payment date',
-    'piggy_bank_id'                  => 'Piggy bank',
-    'returnHere'                     => 'Return here',
-    'returnHereExplanation'          => 'After storing, return here to create another one.',
-    'returnHereUpdateExplanation'    => 'After updating, return here.',
-    'description'                    => 'Description',
-    'expense_account'                => 'Expense account',
+    'bank_name'                      => '',
+    'bank_balance'                   => '',
+    'savings_balance'                => '',
+    'credit_card_limit'              => '',
+    'automatch'                      => '',
+    'skip'                           => '',
+    'name'                           => '',
+    'active'                         => '',
+    'amount_min'                     => '',
+    'amount_max'                     => '',
+    'match'                          => '',
+    'repeat_freq'                    => '',
+    'journal_currency_id'            => '',
+    'currency_id'                    => '',
+    'attachments'                    => '',
+    'journal_amount'                 => '',
+    'journal_asset_source_account'   => '',
+    'journal_source_account_name'    => '',
+    'journal_source_account_id'      => '',
+    'BIC'                            => '',
+    'verify_password'                => '',
+    'account_from_id'                => '',
+    'account_to_id'                  => '',
+    'source_account'                 => '',
+    'destination_account'            => '',
+    'journal_destination_account_id' => '',
+    'asset_destination_account'      => '',
+    'asset_source_account'           => '',
+    'journal_description'            => '',
+    'note'                           => '',
+    'split_journal'                  => '',
+    'split_journal_explanation'      => '',
+    'currency'                       => '',
+    'account_id'                     => '',
+    'budget_id'                      => '',
+    'openingBalance'                 => '',
+    'tagMode'                        => '',
+    'tagPosition'                    => '',
+    'virtualBalance'                 => '',
+    'longitude_latitude'             => '',
+    'targetamount'                   => '',
+    'accountRole'                    => '',
+    'openingBalanceDate'             => '',
+    'ccType'                         => '',
+    'ccMonthlyPaymentDate'           => '',
+    'piggy_bank_id'                  => '',
+    'returnHere'                     => '',
+    'returnHereExplanation'          => '',
+    'returnHereUpdateExplanation'    => '',
+    'description'                    => '',
+    'expense_account'                => '',
     'revenue_account'                => 'Доходный счет',
     'decimal_places'                 => 'Количество цифр после точки',
     'exchange_rate_instruction'      => 'Иностранные валюты',
     'exchanged_amount'               => 'Сумма обмена',
     'source_amount'                  => 'Сумма (источник)',
     'destination_amount'             => 'Сумма (назначение)',
-    'native_amount'                  => 'Native amount',
+    'native_amount'                  => '',
 
     'revenue_account_source'      => 'Доходный счет (источник)',
-    'source_account_asset'        => 'Source account (asset account)',
-    'destination_account_expense' => 'Destination account (expense account)',
-    'destination_account_asset'   => 'Destination account (asset account)',
-    'source_account_revenue'      => 'Source account (revenue account)',
+    'source_account_asset'        => '',
+    'destination_account_expense' => '',
+    'destination_account_asset'   => '',
+    'source_account_revenue'      => '',
     'type'                        => 'Тип',
-    'convert_Withdrawal'          => 'Convert withdrawal',
-    'convert_Deposit'             => 'Convert deposit',
-    'convert_Transfer'            => 'Convert transfer',
+    'convert_Withdrawal'          => '',
+    'convert_Deposit'             => '',
+    'convert_Transfer'            => '',
 
 
     'amount'                     => 'Сумма',
     'date'                       => 'Дата',
-    'interest_date'              => 'Interest date',
-    'book_date'                  => 'Book date',
-    'process_date'               => 'Processing date',
-    'category'                   => 'Category',
-    'tags'                       => 'Tags',
-    'deletePermanently'          => 'Delete permanently',
+    'interest_date'              => '',
+    'book_date'                  => '',
+    'process_date'               => '',
+    'category'                   => '',
+    'tags'                       => '',
+    'deletePermanently'          => '',
     'cancel'                     => 'Отмена',
     'targetdate'                 => 'Намеченная дата',
     'tag'                        => 'Тег',
-    'under'                      => 'Under',
+    'under'                      => '',
     'symbol'                     => 'Символ',
     'code'                       => 'Код',
-    'iban'                       => 'IBAN',
+    'iban'                       => '',
     'accountNumber'              => 'Номер счета',
     'has_headers'                => 'Заголовки',
     'date_format'                => 'Формат даты',
-    'specifix'                   => 'Bank- or file specific fixes',
-    'attachments[]'              => 'Attachments',
-    'store_new_withdrawal'       => 'Store new withdrawal',
-    'store_new_deposit'          => 'Store new deposit',
-    'store_new_transfer'         => 'Store new transfer',
-    'add_new_withdrawal'         => 'Add a new withdrawal',
-    'add_new_deposit'            => 'Add a new deposit',
-    'add_new_transfer'           => 'Add a new transfer',
-    'noPiggybank'                => '(no piggy bank)',
+    'specifix'                   => '',
+    'attachments[]'              => '',
+    'store_new_withdrawal'       => '',
+    'store_new_deposit'          => '',
+    'store_new_transfer'         => '',
+    'add_new_withdrawal'         => '',
+    'add_new_deposit'            => '',
+    'add_new_transfer'           => '',
+    'noPiggybank'                => '',
     'title'                      => 'Заголовок',
     'notes'                      => 'Заметки',
     'filename'                   => 'Имя файла',
@@ -118,63 +118,63 @@ return [
     'size'                       => 'Размер',
     'trigger'                    => 'Триггер',
     'stop_processing'            => 'Остановить обработку',
-    'start_date'                 => 'Start of range',
-    'end_date'                   => 'End of range',
-    'export_start_range'         => 'Start of export range',
-    'export_end_range'           => 'End of export range',
-    'export_format'              => 'File format',
-    'include_attachments'        => 'Include uploaded attachments',
-    'include_old_uploads'        => 'Include imported data',
-    'accounts'                   => 'Export transactions from these accounts',
-    'delete_account'             => 'Delete account ":name"',
-    'delete_bill'                => 'Delete bill ":name"',
-    'delete_budget'              => 'Delete budget ":name"',
-    'delete_category'            => 'Delete category ":name"',
-    'delete_currency'            => 'Delete currency ":name"',
-    'delete_journal'             => 'Delete transaction with description ":description"',
-    'delete_attachment'          => 'Delete attachment ":name"',
-    'delete_rule'                => 'Delete rule ":title"',
-    'delete_rule_group'          => 'Delete rule group ":title"',
-    'delete_link_type'           => 'Delete link type ":name"',
-    'attachment_areYouSure'      => 'Are you sure you want to delete the attachment named ":name"?',
-    'account_areYouSure'         => 'Are you sure you want to delete the account named ":name"?',
-    'bill_areYouSure'            => 'Are you sure you want to delete the bill named ":name"?',
-    'rule_areYouSure'            => 'Are you sure you want to delete the rule titled ":title"?',
-    'ruleGroup_areYouSure'       => 'Are you sure you want to delete the rule group titled ":title"?',
-    'budget_areYouSure'          => 'Are you sure you want to delete the budget named ":name"?',
-    'category_areYouSure'        => 'Are you sure you want to delete the category named ":name"?',
-    'currency_areYouSure'        => 'Are you sure you want to delete the currency named ":name"?',
-    'piggyBank_areYouSure'       => 'Are you sure you want to delete the piggy bank named ":name"?',
-    'journal_areYouSure'         => 'Are you sure you want to delete the transaction described ":description"?',
-    'mass_journal_are_you_sure'  => 'Are you sure you want to delete these transactions?',
-    'tag_areYouSure'             => 'Are you sure you want to delete the tag ":tag"?',
-    'journal_link_areYouSure'    => 'Are you sure you want to delete the link between <a href=":source_link">:source</a> and <a href=":destination_link">:destination</a>?',
-    'linkType_areYouSure'        => 'Are you sure you want to delete the link type ":name" (":inward" / ":outward")?',
-    'permDeleteWarning'          => 'Deleting stuff from Firely is permanent and cannot be undone.',
-    'mass_make_selection'        => 'You can still prevent items from being deleted by removing the checkbox.',
-    'delete_all_permanently'     => 'Delete selected permanently',
-    'update_all_journals'        => 'Update these transactions',
-    'also_delete_transactions'   => 'The only transaction connected to this account will be deleted as well.|All :count transactions connected to this account will be deleted as well.',
-    'also_delete_connections'    => 'The only transaction linked with this link type will lose this connection.|All :count transactions linked with this link type will lose their connection.',
-    'also_delete_rules'          => 'The only rule connected to this rule group will be deleted as well.|All :count rules connected to this rule group will be deleted as well.',
-    'also_delete_piggyBanks'     => 'The only piggy bank connected to this account will be deleted as well.|All :count piggy bank connected to this account will be deleted as well.',
-    'bill_keep_transactions'     => 'The only transaction connected to this bill will not be deleted.|All :count transactions connected to this bill will spared deletion.',
-    'budget_keep_transactions'   => 'The only transaction connected to this budget will not be deleted.|All :count transactions connected to this budget will spared deletion.',
-    'category_keep_transactions' => 'The only transaction connected to this category will not be deleted.|All :count transactions connected to this category will spared deletion.',
-    'tag_keep_transactions'      => 'The only transaction connected to this tag will not be deleted.|All :count transactions connected to this tag will spared deletion.',
+    'start_date'                 => '',
+    'end_date'                   => '',
+    'export_start_range'         => '',
+    'export_end_range'           => '',
+    'export_format'              => '',
+    'include_attachments'        => '',
+    'include_old_uploads'        => '',
+    'accounts'                   => '',
+    'delete_account'             => '',
+    'delete_bill'                => '',
+    'delete_budget'              => '',
+    'delete_category'            => '',
+    'delete_currency'            => '',
+    'delete_journal'             => '',
+    'delete_attachment'          => '',
+    'delete_rule'                => '',
+    'delete_rule_group'          => '',
+    'delete_link_type'           => '',
+    'attachment_areYouSure'      => '',
+    'account_areYouSure'         => '',
+    'bill_areYouSure'            => '',
+    'rule_areYouSure'            => '',
+    'ruleGroup_areYouSure'       => '',
+    'budget_areYouSure'          => '',
+    'category_areYouSure'        => '',
+    'currency_areYouSure'        => '',
+    'piggyBank_areYouSure'       => '',
+    'journal_areYouSure'         => '',
+    'mass_journal_are_you_sure'  => '',
+    'tag_areYouSure'             => '',
+    'journal_link_areYouSure'    => '',
+    'linkType_areYouSure'        => '',
+    'permDeleteWarning'          => '',
+    'mass_make_selection'        => '',
+    'delete_all_permanently'     => '',
+    'update_all_journals'        => '',
+    'also_delete_transactions'   => '',
+    'also_delete_connections'    => '',
+    'also_delete_rules'          => '',
+    'also_delete_piggyBanks'     => '',
+    'bill_keep_transactions'     => '',
+    'budget_keep_transactions'   => '',
+    'category_keep_transactions' => '',
+    'tag_keep_transactions'      => '',
 
-    'email'                 => 'Email address',
-    'password'              => 'Password',
-    'password_confirmation' => 'Password (again)',
-    'blocked'               => 'Is blocked?',
-    'blocked_code'          => 'Reason for block',
+    'email'                 => '',
+    'password'              => '',
+    'password_confirmation' => '',
+    'blocked'               => '',
+    'blocked_code'          => '',
 
 
     // admin
-    'domain'                => 'Domain',
-    'single_user_mode'      => 'Single user mode',
-    'must_confirm_account'  => 'New users must activate account',
-    'is_demo_site'          => 'Is demo site',
+    'domain'                => '',
+    'single_user_mode'      => '',
+    'must_confirm_account'  => '',
+    'is_demo_site'          => '',
 
 
     // import
@@ -189,11 +189,11 @@ return [
     'csv_config'            => 'Параметры импорта CSV',
 
 
-    'due_date'           => 'Due date',
-    'payment_date'       => 'Payment date',
-    'invoice_date'       => 'Invoice date',
-    'internal_reference' => 'Internal reference',
+    'due_date'           => '',
+    'payment_date'       => '',
+    'invoice_date'       => '',
+    'internal_reference' => '',
 
-    'inward'  => 'Inward description',
-    'outward' => 'Outward description',
+    'inward'  => '',
+    'outward' => '',
 ];
\ No newline at end of file

From 3d06fba918b79ccce42509f1b4de8f8b4e5ecf16 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Fri, 25 Aug 2017 07:07:22 +0200
Subject: [PATCH 263/668] New translations csv.php (Russian)

---
 resources/lang/ru_RU/csv.php | 104 +++++++++++++++++------------------
 1 file changed, 52 insertions(+), 52 deletions(-)

diff --git a/resources/lang/ru_RU/csv.php b/resources/lang/ru_RU/csv.php
index 599cb9171f..7bb197ef80 100644
--- a/resources/lang/ru_RU/csv.php
+++ b/resources/lang/ru_RU/csv.php
@@ -17,7 +17,7 @@ return [
     'initial_title'                 => 'Импорт данных (1/3) - Подготовка к импорту CSV',
     'initial_text'                  => 'Чтобы импорт данных прошёл успешно, пожалуйста проверьте несколько параметров.',
     'initial_box'                   => 'Основные параметры импорта CSV',
-    'initial_box_title'             => 'Basic CSV import setup options',
+    'initial_box_title'             => '',
     'initial_header_help'           => 'Установите этот флажок, если первая строка CSV-файла содержит заголовки столбцов.',
     'initial_date_help'             => 'Формат даты и времени в вашем CSV-файле. Придерживайтесь формата, описанного <a href="https://secure.php.net/manual/en/datetime.createfromformat.php#refsect1-datetime.createfromformat-parameters">на этой</a> странице. По умолчанию дату будут анализироваться на соответствие такому формату: :dateExample.',
     'initial_delimiter_help'        => 'Выберите разделитель полей, который используется в вашем файле. Если вы не уверены, помните, что запятая - это самый безопасный вариант.',
@@ -25,59 +25,59 @@ return [
     'initial_submit'                => 'Перейти к шагу 2/3',
 
     // roles config
-    'roles_title'                   => 'Import setup (2/3) - Define each column\'s role',
-    'roles_text'                    => 'Each column in your CSV file contains certain data. Please indicate what kind of data the importer should expect. The option to "map" data means that you will link each entry found in the column to a value in your database. An often mapped column is the column that contains the IBAN of the opposing account. That can be easily matched to IBAN\'s present in your database already.',
-    'roles_table'                   => 'Table',
-    'roles_column_name'             => 'Name of column',
-    'roles_column_example'          => 'Column example data',
-    'roles_column_role'             => 'Column data meaning',
-    'roles_do_map_value'            => 'Map these values',
-    'roles_column'                  => 'Column',
-    'roles_no_example_data'         => 'No example data available',
-    'roles_submit'                  => 'Continue with step 3/3',
-    'roles_warning'                 => 'At the very least, mark one column as the amount-column. It is advisable to also select a column for the description, date and the opposing account.',
+    'roles_title'                   => '',
+    'roles_text'                    => '',
+    'roles_table'                   => '',
+    'roles_column_name'             => '',
+    'roles_column_example'          => '',
+    'roles_column_role'             => '',
+    'roles_do_map_value'            => '',
+    'roles_column'                  => '',
+    'roles_no_example_data'         => '',
+    'roles_submit'                  => '',
+    'roles_warning'                 => '',
 
     // map data
-    'map_title'                     => 'Import setup (3/3) - Connect import data to Firefly III data',
-    'map_text'                      => 'In the following tables, the left value shows you information found in your uploaded CSV file. It is your task to map this value, if possible, to a value already present in your database. Firefly will stick to this mapping. If there is no value to map to, or you do not wish to map the specific value, select nothing.',
-    'map_field_value'               => 'Field value',
-    'map_field_mapped_to'           => 'Mapped to',
-    'map_do_not_map'                => '(do not map)',
-    'map_submit'                    => 'Start the import',
+    'map_title'                     => '',
+    'map_text'                      => '',
+    'map_field_value'               => '',
+    'map_field_mapped_to'           => '',
+    'map_do_not_map'                => '',
+    'map_submit'                    => '',
 
     // map things.
-    'column__ignore'                => '(ignore this column)',
-    'column_account-iban'           => 'Asset account (IBAN)',
-    'column_account-id'             => 'Asset account  ID (matching Firefly)',
-    'column_account-name'           => 'Asset account (name)',
-    'column_amount'                 => 'Amount',
-    'column_amount-comma-separated' => 'Amount (comma as decimal separator)',
-    'column_bill-id'                => 'Bill ID (matching Firefly)',
-    'column_bill-name'              => 'Bill name',
-    'column_budget-id'              => 'Budget ID (matching Firefly)',
-    'column_budget-name'            => 'Budget name',
-    'column_category-id'            => 'Category ID (matching Firefly)',
-    'column_category-name'          => 'Category name',
-    'column_currency-code'          => 'Currency code (ISO 4217)',
-    'column_currency-id'            => 'Currency ID (matching Firefly)',
-    'column_currency-name'          => 'Currency name (matching Firefly)',
-    'column_currency-symbol'        => 'Currency symbol (matching Firefly)',
-    'column_date-interest'          => 'Interest calculation date',
-    'column_date-book'              => 'Transaction booking date',
-    'column_date-process'           => 'Transaction process date',
-    'column_date-transaction'       => 'Date',
-    'column_description'            => 'Description',
-    'column_opposing-iban'          => 'Opposing account (IBAN)',
-    'column_opposing-id'            => 'Opposing account ID (matching Firefly)',
-    'column_external-id'            => 'External ID',
-    'column_opposing-name'          => 'Opposing account (name)',
-    'column_rabo-debet-credit'      => 'Rabobank specific debet/credit indicator',
-    'column_ing-debet-credit'       => 'ING specific debet/credit indicator',
-    'column_sepa-ct-id'             => 'SEPA Credit Transfer end-to-end ID',
-    'column_sepa-ct-op'             => 'SEPA Credit Transfer opposing account',
-    'column_sepa-db'                => 'SEPA Direct Debet',
-    'column_tags-comma'             => 'Tags (comma separated)',
-    'column_tags-space'             => 'Tags (space separated)',
-    'column_account-number'         => 'Asset account (account number)',
-    'column_opposing-number'        => 'Opposing account (account number)',
+    'column__ignore'                => '',
+    'column_account-iban'           => '',
+    'column_account-id'             => '',
+    'column_account-name'           => '',
+    'column_amount'                 => '',
+    'column_amount-comma-separated' => '',
+    'column_bill-id'                => '',
+    'column_bill-name'              => '',
+    'column_budget-id'              => '',
+    'column_budget-name'            => '',
+    'column_category-id'            => '',
+    'column_category-name'          => '',
+    'column_currency-code'          => '',
+    'column_currency-id'            => '',
+    'column_currency-name'          => '',
+    'column_currency-symbol'        => '',
+    'column_date-interest'          => '',
+    'column_date-book'              => '',
+    'column_date-process'           => '',
+    'column_date-transaction'       => '',
+    'column_description'            => '',
+    'column_opposing-iban'          => '',
+    'column_opposing-id'            => '',
+    'column_external-id'            => '',
+    'column_opposing-name'          => '',
+    'column_rabo-debet-credit'      => '',
+    'column_ing-debet-credit'       => '',
+    'column_sepa-ct-id'             => '',
+    'column_sepa-ct-op'             => '',
+    'column_sepa-db'                => '',
+    'column_tags-comma'             => '',
+    'column_tags-space'             => '',
+    'column_account-number'         => '',
+    'column_opposing-number'        => '',
 ];
\ No newline at end of file

From 97ab06ea22f4c235a34bac7d72f5266f2115276a Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Fri, 25 Aug 2017 07:07:23 +0200
Subject: [PATCH 264/668] New translations breadcrumbs.php (Russian)

---
 resources/lang/ru_RU/breadcrumbs.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/ru_RU/breadcrumbs.php b/resources/lang/ru_RU/breadcrumbs.php
index 4b9bfd8f1d..0aef5ba012 100644
--- a/resources/lang/ru_RU/breadcrumbs.php
+++ b/resources/lang/ru_RU/breadcrumbs.php
@@ -40,5 +40,5 @@ return [
     'createTag'           => 'Создать новую метку',
     'edit_tag'            => 'Редактирование метки ":tag"',
     'delete_tag'          => 'Удаление метки ":tag"',
-    'delete_journal_link' => 'Delete link between transactions',
+    'delete_journal_link' => '',
 ];
\ No newline at end of file

From 289e1445217f0ed0beb835f075df75afff620b45 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Fri, 25 Aug 2017 07:07:24 +0200
Subject: [PATCH 265/668] New translations list.php (German)

---
 resources/lang/de_DE/list.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/resources/lang/de_DE/list.php b/resources/lang/de_DE/list.php
index d18f01a6d5..b281e29a43 100644
--- a/resources/lang/de_DE/list.php
+++ b/resources/lang/de_DE/list.php
@@ -88,7 +88,7 @@ return [
     'budget_count'           => 'Anzahl Budgets',
     'rule_and_groups_count'  => 'Anzahl Regeln und Regelgruppen',
     'tags_count'             => 'Anzahl Tags',
-    'inward'                 => 'Inward description',
-    'outward'                => 'Outward description',
-    'number_of_transactions' => 'Number of transactions',
+    'inward'                 => '',
+    'outward'                => '',
+    'number_of_transactions' => '',
 ];
\ No newline at end of file

From 8419cfae2b64b6831547497e4f0dc43455a83eef Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Fri, 25 Aug 2017 07:07:26 +0200
Subject: [PATCH 266/668] New translations config.php (Chinese Traditional)

---
 resources/lang/zh_TW/config.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/resources/lang/zh_TW/config.php b/resources/lang/zh_TW/config.php
index a0f1890833..199240c436 100644
--- a/resources/lang/zh_TW/config.php
+++ b/resources/lang/zh_TW/config.php
@@ -12,14 +12,14 @@ declare(strict_types=1);
  */
 
 return [
-    'locale'          => 'en, English, en_US, en_US.utf8, en_US.UTF-8',
-    'month'           => '%B %Y',
-    'month_and_day'   => '%B %e, %Y',
-    'date_time'       => '%B %e, %Y, @ %T',
-    'specific_day'    => '%e %B %Y',
-    'week_in_year'    => 'Week %W, %Y',
-    'quarter_of_year' => '%B %Y',
-    'year'            => '%Y',
-    'half_year'       => '%B %Y',
+    'locale'          => '',
+    'month'           => '',
+    'month_and_day'   => '',
+    'date_time'       => '',
+    'specific_day'    => '',
+    'week_in_year'    => '',
+    'quarter_of_year' => '',
+    'year'            => '',
+    'half_year'       => '',
 
 ];
\ No newline at end of file

From ef5a950ecb1516167da78b9aa036c0c45581f5ce Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Fri, 25 Aug 2017 07:07:28 +0200
Subject: [PATCH 267/668] New translations csv.php (German)

---
 resources/lang/de_DE/csv.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/lang/de_DE/csv.php b/resources/lang/de_DE/csv.php
index c110606470..df847e619a 100644
--- a/resources/lang/de_DE/csv.php
+++ b/resources/lang/de_DE/csv.php
@@ -17,7 +17,7 @@ return [
     'initial_title'                 => 'Import Einrichten (1/3) - Grundlegende Einstellungen',
     'initial_text'                  => 'Um Ihre Datei korrekt importieren zu können, überprüfen Sie die folgenden Optionen.',
     'initial_box'                   => 'Standard CSV Importeinstellungen',
-    'initial_box_title'             => 'Basic CSV import setup options',
+    'initial_box_title'             => '',
     'initial_header_help'           => 'Hier auswählen, wenn die ersten Zeilen der CSV-Datei die Spaltenüberschriften sind.',
     'initial_date_help'             => 'Datumsformat in ihrer CSV-Datei. Geben Sie das Format so an, wie es <a href="https://secure.php.net/manual/en/datetime.createfromformat.php#refsect1-datetime.createfromformat-parameters">diese Seite</a> zeigt. Die Standardeinstellung ergibt Daten die so aussehen: :dateExample.',
     'initial_delimiter_help'        => 'Wählen Sie das Trennzeichen, welches in ihrer Datei genutzt wird. Wenn Sie nicht sicher sind ist Komma die sicherste Option.',
@@ -35,7 +35,7 @@ return [
     'roles_column'                  => 'Spalte',
     'roles_no_example_data'         => 'Keine Beispieldaten vorhanden',
     'roles_submit'                  => 'Fortfahren mit Schritt 3/3',
-    'roles_warning'                 => 'At the very least, mark one column as the amount-column. It is advisable to also select a column for the description, date and the opposing account.',
+    'roles_warning'                 => '',
 
     // map data
     'map_title'                     => 'Import Einrichten (3/3) - Import mit bereits vorhandenen Daten verknüpfen',

From 5ddad51911c66b41470b6a034246d8cd568ea0b0 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Fri, 25 Aug 2017 07:07:29 +0200
Subject: [PATCH 268/668] New translations csv.php (Polish)

---
 resources/lang/pl_PL/csv.php | 38 ++++++++++++++++++------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/resources/lang/pl_PL/csv.php b/resources/lang/pl_PL/csv.php
index b6cea58e05..b99196d4c2 100644
--- a/resources/lang/pl_PL/csv.php
+++ b/resources/lang/pl_PL/csv.php
@@ -17,16 +17,16 @@ return [
     'initial_title'                 => 'Konfiguracja importu (1/3) - Podstawowa konfiguracja importu CSV',
     'initial_text'                  => 'Abyś mógł poprawnie zaimportować plik, sprawdź poprawność poniższych opcji.',
     'initial_box'                   => 'Podstawowa konfiguracja importu CSV',
-    'initial_box_title'             => 'Basic CSV import setup options',
-    'initial_header_help'           => 'Check this box if the first row of your CSV file are the column titles.',
-    'initial_date_help'             => 'Date time format in your CSV. Follow the format like <a href="https://secure.php.net/manual/en/datetime.createfromformat.php#refsect1-datetime.createfromformat-parameters">this page</a> indicates. The default value will parse dates that look like this: :dateExample.',
-    'initial_delimiter_help'        => 'Choose the field delimiter that is used in your input file. If not sure, comma is the safest option.',
-    'initial_import_account_help'   => 'If your CSV file does NOT contain information about your asset account(s), use this dropdown to select to which account the transactions in the CSV belong to.',
+    'initial_box_title'             => '',
+    'initial_header_help'           => '',
+    'initial_date_help'             => '',
+    'initial_delimiter_help'        => '',
+    'initial_import_account_help'   => '',
     'initial_submit'                => 'Przejdź do kroku 2/3',
 
     // roles config
     'roles_title'                   => 'Konfiguracja importu (2/3) - Określ rolę każdej z kolumn',
-    'roles_text'                    => 'Each column in your CSV file contains certain data. Please indicate what kind of data the importer should expect. The option to "map" data means that you will link each entry found in the column to a value in your database. An often mapped column is the column that contains the IBAN of the opposing account. That can be easily matched to IBAN\'s present in your database already.',
+    'roles_text'                    => '',
     'roles_table'                   => 'Tabela',
     'roles_column_name'             => 'Nazwa kolumny',
     'roles_column_example'          => 'Przykładowe dane w kolumnie',
@@ -35,11 +35,11 @@ return [
     'roles_column'                  => 'Kolumna',
     'roles_no_example_data'         => 'Brak dostępnych danych przykładowych',
     'roles_submit'                  => 'Przejdź do kroku 3/3',
-    'roles_warning'                 => 'At the very least, mark one column as the amount-column. It is advisable to also select a column for the description, date and the opposing account.',
+    'roles_warning'                 => '',
 
     // map data
     'map_title'                     => 'Konfiguracja importu (3/3) - Połącz importowane dane z danymi w Firefly III',
-    'map_text'                      => 'In the following tables, the left value shows you information found in your uploaded CSV file. It is your task to map this value, if possible, to a value already present in your database. Firefly will stick to this mapping. If there is no value to map to, or you do not wish to map the specific value, select nothing.',
+    'map_text'                      => '',
     'map_field_value'               => 'Wartość pola',
     'map_field_mapped_to'           => 'Zmapowane na',
     'map_do_not_map'                => '(nie mapuj)',
@@ -62,22 +62,22 @@ return [
     'column_currency-id'            => 'ID waluty (taki sam jak w Firefly)',
     'column_currency-name'          => 'Nazwa waluty (taka sama jak w Firefly)',
     'column_currency-symbol'        => 'Symbol waluty (taki sam jak w Firefly)',
-    'column_date-interest'          => 'Interest calculation date',
+    'column_date-interest'          => '',
     'column_date-book'              => 'Data księgowania transakcji',
-    'column_date-process'           => 'Transaction process date',
+    'column_date-process'           => '',
     'column_date-transaction'       => 'Data',
     'column_description'            => 'Opis',
-    'column_opposing-iban'          => 'Opposing account (IBAN)',
-    'column_opposing-id'            => 'Opposing account ID (matching Firefly)',
+    'column_opposing-iban'          => '',
+    'column_opposing-id'            => '',
     'column_external-id'            => 'Zewnętrzne ID',
-    'column_opposing-name'          => 'Opposing account (name)',
-    'column_rabo-debet-credit'      => 'Rabobank specific debet/credit indicator',
-    'column_ing-debet-credit'       => 'ING specific debet/credit indicator',
-    'column_sepa-ct-id'             => 'SEPA Credit Transfer end-to-end ID',
-    'column_sepa-ct-op'             => 'SEPA Credit Transfer opposing account',
-    'column_sepa-db'                => 'SEPA Direct Debet',
+    'column_opposing-name'          => '',
+    'column_rabo-debet-credit'      => '',
+    'column_ing-debet-credit'       => '',
+    'column_sepa-ct-id'             => '',
+    'column_sepa-ct-op'             => '',
+    'column_sepa-db'                => '',
     'column_tags-comma'             => 'Tagi (oddzielone przecinkami)',
     'column_tags-space'             => 'Tagi (oddzielone spacjami)',
     'column_account-number'         => 'Konto aktywów (numer konta)',
-    'column_opposing-number'        => 'Opposing account (account number)',
+    'column_opposing-number'        => '',
 ];
\ No newline at end of file

From 9d5a021b1e88688ade7b65c3a9164726ec181ca3 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Fri, 25 Aug 2017 07:07:30 +0200
Subject: [PATCH 269/668] New translations csv.php (Chinese Traditional)

---
 resources/lang/zh_TW/csv.php | 54 ++++++++++++++++++------------------
 1 file changed, 27 insertions(+), 27 deletions(-)

diff --git a/resources/lang/zh_TW/csv.php b/resources/lang/zh_TW/csv.php
index 7d9cc46f46..cf781c5b74 100644
--- a/resources/lang/zh_TW/csv.php
+++ b/resources/lang/zh_TW/csv.php
@@ -14,36 +14,36 @@ declare(strict_types=1);
 return [
 
     // initial config
-    'initial_title'                 => 'Import setup (1/3) - Basic CSV import setup',
-    'initial_text'                  => 'To be able to import your file correctly, please validate the options below.',
-    'initial_box'                   => 'Basic CSV import setup',
-    'initial_box_title'             => 'Basic CSV import setup options',
-    'initial_header_help'           => 'Check this box if the first row of your CSV file are the column titles.',
-    'initial_date_help'             => 'Date time format in your CSV. Follow the format like <a href="https://secure.php.net/manual/en/datetime.createfromformat.php#refsect1-datetime.createfromformat-parameters">this page</a> indicates. The default value will parse dates that look like this: :dateExample.',
-    'initial_delimiter_help'        => 'Choose the field delimiter that is used in your input file. If not sure, comma is the safest option.',
-    'initial_import_account_help'   => 'If your CSV file does NOT contain information about your asset account(s), use this dropdown to select to which account the transactions in the CSV belong to.',
-    'initial_submit'                => 'Continue with step 2/3',
+    'initial_title'                 => '',
+    'initial_text'                  => '',
+    'initial_box'                   => '',
+    'initial_box_title'             => '',
+    'initial_header_help'           => '',
+    'initial_date_help'             => '',
+    'initial_delimiter_help'        => '',
+    'initial_import_account_help'   => '',
+    'initial_submit'                => '',
 
     // roles config
-    'roles_title'                   => 'Import setup (2/3) - Define each column\'s role',
-    'roles_text'                    => 'Each column in your CSV file contains certain data. Please indicate what kind of data the importer should expect. The option to "map" data means that you will link each entry found in the column to a value in your database. An often mapped column is the column that contains the IBAN of the opposing account. That can be easily matched to IBAN\'s present in your database already.',
-    'roles_table'                   => 'Table',
-    'roles_column_name'             => 'Name of column',
-    'roles_column_example'          => 'Column example data',
-    'roles_column_role'             => 'Column data meaning',
-    'roles_do_map_value'            => 'Map these values',
-    'roles_column'                  => 'Column',
-    'roles_no_example_data'         => 'No example data available',
-    'roles_submit'                  => 'Continue with step 3/3',
-    'roles_warning'                 => 'At the very least, mark one column as the amount-column. It is advisable to also select a column for the description, date and the opposing account.',
+    'roles_title'                   => '',
+    'roles_text'                    => '',
+    'roles_table'                   => '',
+    'roles_column_name'             => '',
+    'roles_column_example'          => '',
+    'roles_column_role'             => '',
+    'roles_do_map_value'            => '',
+    'roles_column'                  => '',
+    'roles_no_example_data'         => '',
+    'roles_submit'                  => '',
+    'roles_warning'                 => '',
 
     // map data
-    'map_title'                     => 'Import setup (3/3) - Connect import data to Firefly III data',
+    'map_title'                     => '',
     'map_text'                      => '在下表中，左邊的是在你的CSV 檔中的資料。而你現在要把這些資料配對到資料庫中的資料（如有的話）。如果沒有資料能夠進行配對，或者你不想進行配對，請選擇不進行配對。',
-    'map_field_value'               => 'Field value',
-    'map_field_mapped_to'           => 'Mapped to',
-    'map_do_not_map'                => '(do not map)',
-    'map_submit'                    => 'Start the import',
+    'map_field_value'               => '',
+    'map_field_mapped_to'           => '',
+    'map_do_not_map'                => '',
+    'map_submit'                    => '',
 
     // map things.
     'column__ignore'                => '（忽略此欄）',
@@ -63,7 +63,7 @@ return [
     'column_currency-name'          => '貨幣名稱（與 Firefly 匹配）',
     'column_currency-symbol'        => '貨幣符號 （與 Firefly 匹配）',
     'column_date-interest'          => '利息計算日',
-    'column_date-book'              => 'Transaction booking date',
+    'column_date-book'              => '',
     'column_date-process'           => '交易處理日期',
     'column_date-transaction'       => '日期',
     'column_description'            => '描述',
@@ -73,7 +73,7 @@ return [
     'column_opposing-name'          => '抵銷的帳戶 （名稱）',
     'column_rabo-debet-credit'      => '荷蘭合作銀行獨有的借記/貸記指標',
     'column_ing-debet-credit'       => 'ING 集團獨有的借記/貸記指標',
-    'column_sepa-ct-id'             => 'SEPA Credit Transfer end-to-end ID',
+    'column_sepa-ct-id'             => '',
     'column_sepa-ct-op'             => 'SEPA 貸記劃撥抵銷的帳戶',
     'column_sepa-db'                => 'SEPA 直接付款',
     'column_tags-comma'             => '標籤 （逗號分隔）',

From e36abd2dfbbbbe968730561587a36e37966a5b77 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Fri, 25 Aug 2017 07:07:31 +0200
Subject: [PATCH 270/668] New translations breadcrumbs.php (Spanish)

---
 resources/lang/es_ES/breadcrumbs.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/es_ES/breadcrumbs.php b/resources/lang/es_ES/breadcrumbs.php
index 6f94cb1792..eda8a063ac 100644
--- a/resources/lang/es_ES/breadcrumbs.php
+++ b/resources/lang/es_ES/breadcrumbs.php
@@ -40,5 +40,5 @@ return [
     'createTag'           => 'Crear nueva etiqueta',
     'edit_tag'            => 'Editar etiqueta ":tag"',
     'delete_tag'          => 'Eliminar etiqueta ":tag"',
-    'delete_journal_link' => 'Delete link between transactions',
+    'delete_journal_link' => '',
 ];
\ No newline at end of file

From aa66cfaae79ca123c58fc15b895457f8df21d6b5 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Fri, 25 Aug 2017 07:07:32 +0200
Subject: [PATCH 271/668] New translations breadcrumbs.php (Slovenian)

---
 resources/lang/sl_SI/breadcrumbs.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/lang/sl_SI/breadcrumbs.php b/resources/lang/sl_SI/breadcrumbs.php
index 70672da530..45d398b6fc 100644
--- a/resources/lang/sl_SI/breadcrumbs.php
+++ b/resources/lang/sl_SI/breadcrumbs.php
@@ -26,7 +26,7 @@ return [
     'edit_bill'           => 'uredi trajnik ":name"',
     'delete_bill'         => 'izbriši trajnik ":name"',
     'reports'             => 'Poročila',
-    'search_result'       => 'Search results for ":query"',
+    'search_result'       => '',
     'withdrawal_list'     => 'stroški',
     'deposit_list'        => 'prihodki',
     'transfer_list'       => 'prenosi',
@@ -40,5 +40,5 @@ return [
     'createTag'           => 'ustvari novo značko',
     'edit_tag'            => 'uredi značko ":tag"',
     'delete_tag'          => 'izbriši značko ":tag"',
-    'delete_journal_link' => 'Delete link between transactions',
+    'delete_journal_link' => '',
 ];
\ No newline at end of file

From 9f62df36dc09068dbf044fc4d301abc5aa45ae87 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Fri, 25 Aug 2017 07:07:34 +0200
Subject: [PATCH 272/668] New translations breadcrumbs.php (Chinese
 Traditional)

---
 resources/lang/zh_TW/breadcrumbs.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/lang/zh_TW/breadcrumbs.php b/resources/lang/zh_TW/breadcrumbs.php
index a99899ab8a..66aa9b325b 100644
--- a/resources/lang/zh_TW/breadcrumbs.php
+++ b/resources/lang/zh_TW/breadcrumbs.php
@@ -26,7 +26,7 @@ return [
     'edit_bill'           => '編輯賬單 ":name"',
     'delete_bill'         => '刪除賬單 ":name"',
     'reports'             => '報表',
-    'search_result'       => 'Search results for ":query"',
+    'search_result'       => '',
     'withdrawal_list'     => '支出',
     'deposit_list'        => '收入、薪金與存款',
     'transfer_list'       => '轉帳',
@@ -40,5 +40,5 @@ return [
     'createTag'           => '建立新標籤',
     'edit_tag'            => '編輯標籤 ":tag"',
     'delete_tag'          => '刪除標籤 ":tag"',
-    'delete_journal_link' => 'Delete link between transactions',
+    'delete_journal_link' => '',
 ];
\ No newline at end of file

From d36801c58944ef9d1559275e09bf3ae6cdfc8877 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Fri, 25 Aug 2017 07:07:35 +0200
Subject: [PATCH 273/668] New translations breadcrumbs.php (Polish)

---
 resources/lang/pl_PL/breadcrumbs.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/pl_PL/breadcrumbs.php b/resources/lang/pl_PL/breadcrumbs.php
index 924f6a1787..5f4ed1aed5 100644
--- a/resources/lang/pl_PL/breadcrumbs.php
+++ b/resources/lang/pl_PL/breadcrumbs.php
@@ -40,5 +40,5 @@ return [
     'createTag'           => 'Utwórz nowy tag',
     'edit_tag'            => 'Modyfikuj tag ":tag"',
     'delete_tag'          => 'Usuń tag ":tag"',
-    'delete_journal_link' => 'Delete link between transactions',
+    'delete_journal_link' => '',
 ];
\ No newline at end of file

From 8dd61e1f86589985b52daffd935d14adb8fff510 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Fri, 25 Aug 2017 07:07:36 +0200
Subject: [PATCH 274/668] New translations breadcrumbs.php (Portuguese,
 Brazilian)

---
 resources/lang/pt_BR/breadcrumbs.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/lang/pt_BR/breadcrumbs.php b/resources/lang/pt_BR/breadcrumbs.php
index 6a62264463..0ab94a1743 100644
--- a/resources/lang/pt_BR/breadcrumbs.php
+++ b/resources/lang/pt_BR/breadcrumbs.php
@@ -26,7 +26,7 @@ return [
     'edit_bill'           => 'Editar fatura ":name"',
     'delete_bill'         => 'Apagar fatura ":name"',
     'reports'             => 'Relatórios',
-    'search_result'       => 'Search results for ":query"',
+    'search_result'       => '',
     'withdrawal_list'     => 'Despesas',
     'deposit_list'        => 'Receitas, renda e depósitos',
     'transfer_list'       => 'Transferências',
@@ -40,5 +40,5 @@ return [
     'createTag'           => 'Criar nova etiqueta',
     'edit_tag'            => 'Editar etiqueta ":tag"',
     'delete_tag'          => 'Apagar etiqueta ":tag"',
-    'delete_journal_link' => 'Delete link between transactions',
+    'delete_journal_link' => '',
 ];
\ No newline at end of file

From 57d196fdce3e3e5e2ad444f2ab0880788c8dd50d Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Fri, 25 Aug 2017 07:07:37 +0200
Subject: [PATCH 275/668] New translations breadcrumbs.php (German)

---
 resources/lang/de_DE/breadcrumbs.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/lang/de_DE/breadcrumbs.php b/resources/lang/de_DE/breadcrumbs.php
index 1666561f85..07625cbf42 100644
--- a/resources/lang/de_DE/breadcrumbs.php
+++ b/resources/lang/de_DE/breadcrumbs.php
@@ -26,7 +26,7 @@ return [
     'edit_bill'           => 'Bearbeite Rechnung ":name"',
     'delete_bill'         => 'Lösche Rechnung ":name"',
     'reports'             => 'Berichte',
-    'search_result'       => 'Search results for ":query"',
+    'search_result'       => '',
     'withdrawal_list'     => 'Ausgaben',
     'deposit_list'        => 'Umsatz, Einkommen und Einlagen',
     'transfer_list'       => 'Überweisungen',
@@ -40,5 +40,5 @@ return [
     'createTag'           => 'Neuen Tag erstellen',
     'edit_tag'            => 'Bearbeite Tag ":tag"',
     'delete_tag'          => 'Lösche Tag ":tag"',
-    'delete_journal_link' => 'Delete link between transactions',
+    'delete_journal_link' => '',
 ];
\ No newline at end of file

From 70ed0af475324dc97724a8786a6886ee76b091ea Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Fri, 25 Aug 2017 07:07:38 +0200
Subject: [PATCH 276/668] New translations breadcrumbs.php (French)

---
 resources/lang/fr_FR/breadcrumbs.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/fr_FR/breadcrumbs.php b/resources/lang/fr_FR/breadcrumbs.php
index a6d4c56e06..4ef0b8d701 100644
--- a/resources/lang/fr_FR/breadcrumbs.php
+++ b/resources/lang/fr_FR/breadcrumbs.php
@@ -40,5 +40,5 @@ return [
     'createTag'           => 'Créer un nouveau tag',
     'edit_tag'            => 'Éditer le tag ":tag"',
     'delete_tag'          => 'Supprimer le tag ":tag"',
-    'delete_journal_link' => 'Delete link between transactions',
+    'delete_journal_link' => '',
 ];
\ No newline at end of file

From c7978150c4ad63e1c88a45d348dc152fd24d670e Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Fri, 25 Aug 2017 07:07:39 +0200
Subject: [PATCH 277/668] New translations csv.php (Portuguese, Brazilian)

---
 resources/lang/pt_BR/csv.php | 46 ++++++++++++++++++------------------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/resources/lang/pt_BR/csv.php b/resources/lang/pt_BR/csv.php
index 2853590877..1b61320763 100644
--- a/resources/lang/pt_BR/csv.php
+++ b/resources/lang/pt_BR/csv.php
@@ -14,36 +14,36 @@ declare(strict_types=1);
 return [
 
     // initial config
-    'initial_title'                 => 'Import setup (1/3) - Basic CSV import setup',
-    'initial_text'                  => 'To be able to import your file correctly, please validate the options below.',
-    'initial_box'                   => 'Basic CSV import setup',
-    'initial_box_title'             => 'Basic CSV import setup options',
-    'initial_header_help'           => 'Check this box if the first row of your CSV file are the column titles.',
-    'initial_date_help'             => 'Date time format in your CSV. Follow the format like <a href="https://secure.php.net/manual/en/datetime.createfromformat.php#refsect1-datetime.createfromformat-parameters">this page</a> indicates. The default value will parse dates that look like this: :dateExample.',
-    'initial_delimiter_help'        => 'Choose the field delimiter that is used in your input file. If not sure, comma is the safest option.',
-    'initial_import_account_help'   => 'If your CSV file does NOT contain information about your asset account(s), use this dropdown to select to which account the transactions in the CSV belong to.',
-    'initial_submit'                => 'Continue with step 2/3',
+    'initial_title'                 => '',
+    'initial_text'                  => '',
+    'initial_box'                   => '',
+    'initial_box_title'             => '',
+    'initial_header_help'           => '',
+    'initial_date_help'             => '',
+    'initial_delimiter_help'        => '',
+    'initial_import_account_help'   => '',
+    'initial_submit'                => '',
 
     // roles config
-    'roles_title'                   => 'Import setup (2/3) - Define each column\'s role',
-    'roles_text'                    => 'Each column in your CSV file contains certain data. Please indicate what kind of data the importer should expect. The option to "map" data means that you will link each entry found in the column to a value in your database. An often mapped column is the column that contains the IBAN of the opposing account. That can be easily matched to IBAN\'s present in your database already.',
-    'roles_table'                   => 'Table',
-    'roles_column_name'             => 'Name of column',
-    'roles_column_example'          => 'Column example data',
-    'roles_column_role'             => 'Column data meaning',
-    'roles_do_map_value'            => 'Map these values',
-    'roles_column'                  => 'Column',
-    'roles_no_example_data'         => 'No example data available',
-    'roles_submit'                  => 'Continue with step 3/3',
-    'roles_warning'                 => 'At the very least, mark one column as the amount-column. It is advisable to also select a column for the description, date and the opposing account.',
+    'roles_title'                   => '',
+    'roles_text'                    => '',
+    'roles_table'                   => '',
+    'roles_column_name'             => '',
+    'roles_column_example'          => '',
+    'roles_column_role'             => '',
+    'roles_do_map_value'            => '',
+    'roles_column'                  => '',
+    'roles_no_example_data'         => '',
+    'roles_submit'                  => '',
+    'roles_warning'                 => '',
 
     // map data
-    'map_title'                     => 'Import setup (3/3) - Connect import data to Firefly III data',
+    'map_title'                     => '',
     'map_text'                      => 'Nas tabelas a seguir, o valor à esquerda mostra informações encontradas no seu arquivo CSV carregado. É sua tarefa mapear esse valor, se possível, para um valor já presente em seu banco de dados. O Firefly vai se ater a esse mapeamento. Se não há nenhum valor para mapear, ou não quer mapear o valor específico, não selecione nada.',
-    'map_field_value'               => 'Field value',
+    'map_field_value'               => '',
     'map_field_mapped_to'           => 'Mapeado para',
     'map_do_not_map'                => '(não mapear)',
-    'map_submit'                    => 'Start the import',
+    'map_submit'                    => '',
 
     // map things.
     'column__ignore'                => '(ignorar esta coluna)',

From e80822f1c5fcbf9bc3a08a490de3cc7fc58a4072 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Fri, 25 Aug 2017 07:07:41 +0200
Subject: [PATCH 278/668] New translations csv.php (Slovenian)

---
 resources/lang/sl_SI/csv.php | 50 ++++++++++++++++++------------------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/resources/lang/sl_SI/csv.php b/resources/lang/sl_SI/csv.php
index dc35628e17..5a5049c3cd 100644
--- a/resources/lang/sl_SI/csv.php
+++ b/resources/lang/sl_SI/csv.php
@@ -14,36 +14,36 @@ declare(strict_types=1);
 return [
 
     // initial config
-    'initial_title'                 => 'Import setup (1/3) - Basic CSV import setup',
-    'initial_text'                  => 'To be able to import your file correctly, please validate the options below.',
-    'initial_box'                   => 'Basic CSV import setup',
-    'initial_box_title'             => 'Basic CSV import setup options',
-    'initial_header_help'           => 'Check this box if the first row of your CSV file are the column titles.',
-    'initial_date_help'             => 'Date time format in your CSV. Follow the format like <a href="https://secure.php.net/manual/en/datetime.createfromformat.php#refsect1-datetime.createfromformat-parameters">this page</a> indicates. The default value will parse dates that look like this: :dateExample.',
-    'initial_delimiter_help'        => 'Choose the field delimiter that is used in your input file. If not sure, comma is the safest option.',
-    'initial_import_account_help'   => 'If your CSV file does NOT contain information about your asset account(s), use this dropdown to select to which account the transactions in the CSV belong to.',
-    'initial_submit'                => 'Continue with step 2/3',
+    'initial_title'                 => '',
+    'initial_text'                  => '',
+    'initial_box'                   => '',
+    'initial_box_title'             => '',
+    'initial_header_help'           => '',
+    'initial_date_help'             => '',
+    'initial_delimiter_help'        => '',
+    'initial_import_account_help'   => '',
+    'initial_submit'                => '',
 
     // roles config
-    'roles_title'                   => 'Import setup (2/3) - Define each column\'s role',
-    'roles_text'                    => 'Each column in your CSV file contains certain data. Please indicate what kind of data the importer should expect. The option to "map" data means that you will link each entry found in the column to a value in your database. An often mapped column is the column that contains the IBAN of the opposing account. That can be easily matched to IBAN\'s present in your database already.',
-    'roles_table'                   => 'Table',
-    'roles_column_name'             => 'Name of column',
-    'roles_column_example'          => 'Column example data',
-    'roles_column_role'             => 'Column data meaning',
-    'roles_do_map_value'            => 'Map these values',
-    'roles_column'                  => 'Column',
-    'roles_no_example_data'         => 'No example data available',
-    'roles_submit'                  => 'Continue with step 3/3',
-    'roles_warning'                 => 'At the very least, mark one column as the amount-column. It is advisable to also select a column for the description, date and the opposing account.',
+    'roles_title'                   => '',
+    'roles_text'                    => '',
+    'roles_table'                   => '',
+    'roles_column_name'             => '',
+    'roles_column_example'          => '',
+    'roles_column_role'             => '',
+    'roles_do_map_value'            => '',
+    'roles_column'                  => '',
+    'roles_no_example_data'         => '',
+    'roles_submit'                  => '',
+    'roles_warning'                 => '',
 
     // map data
-    'map_title'                     => 'Import setup (3/3) - Connect import data to Firefly III data',
+    'map_title'                     => '',
     'map_text'                      => 'Vrednosti na levi v spodnji tabeli prikazujejo podatke iz naložene CSV datoteke. Vaša naloga je, da jim, če je možno, določite obtoječio vrednost iz podatkovne baze. Firefly bo to upošteval pri uvozu. Če v podatkovni bazi ni ustrezne vrednosti, ali vrednosti ne želite določiti ničesar, potem pustite prazno.',
-    'map_field_value'               => 'Field value',
-    'map_field_mapped_to'           => 'Mapped to',
-    'map_do_not_map'                => '(do not map)',
-    'map_submit'                    => 'Start the import',
+    'map_field_value'               => '',
+    'map_field_mapped_to'           => '',
+    'map_do_not_map'                => '',
+    'map_submit'                    => '',
 
     // map things.
     'column__ignore'                => '(ignoriraj ta stolpec)',

From 5b5bbd29c3572d66e893af4dc15f21e290454927 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Fri, 25 Aug 2017 07:07:43 +0200
Subject: [PATCH 279/668] New translations form.php (Spanish)

---
 resources/lang/es_ES/form.php | 258 +++++++++++++++++-----------------
 1 file changed, 129 insertions(+), 129 deletions(-)

diff --git a/resources/lang/es_ES/form.php b/resources/lang/es_ES/form.php
index 2121358fdc..6b4c18ad81 100644
--- a/resources/lang/es_ES/form.php
+++ b/resources/lang/es_ES/form.php
@@ -24,176 +24,176 @@ return [
     'active'                         => 'Activo',
     'amount_min'                     => 'Importe mínimo',
     'amount_max'                     => 'Importe máximo',
-    'match'                          => 'Matches on',
+    'match'                          => '',
     'repeat_freq'                    => 'Repetición',
     'journal_currency_id'            => 'Divisa',
     'currency_id'                    => 'Divisa',
     'attachments'                    => 'Adjuntos',
     'journal_amount'                 => 'Importe',
-    'journal_asset_source_account'   => 'Asset account (source)',
-    'journal_source_account_name'    => 'Revenue account (source)',
-    'journal_source_account_id'      => 'Asset account (source)',
+    'journal_asset_source_account'   => '',
+    'journal_source_account_name'    => '',
+    'journal_source_account_id'      => '',
     'BIC'                            => 'BIC',
     'verify_password'                => 'Verificar la seguridad de contraseña',
     'account_from_id'                => 'Cuenta origen',
     'account_to_id'                  => 'Cuenta destino',
     'source_account'                 => 'Cuenta origen',
     'destination_account'            => 'Cuenta destino',
-    'journal_destination_account_id' => 'Asset account (destination)',
-    'asset_destination_account'      => 'Asset account (destination)',
-    'asset_source_account'           => 'Asset account (source)',
+    'journal_destination_account_id' => '',
+    'asset_destination_account'      => '',
+    'asset_source_account'           => '',
     'journal_description'            => 'Descripción',
     'note'                           => 'Notas',
-    'split_journal'                  => 'Split this transaction',
-    'split_journal_explanation'      => 'Split this transaction in multiple parts',
-    'currency'                       => 'Currency',
-    'account_id'                     => 'Asset account',
-    'budget_id'                      => 'Budget',
-    'openingBalance'                 => 'Opening balance',
-    'tagMode'                        => 'Tag mode',
-    'tagPosition'                    => 'Tag location',
-    'virtualBalance'                 => 'Virtual balance',
-    'longitude_latitude'             => 'Location',
-    'targetamount'                   => 'Target amount',
-    'accountRole'                    => 'Account role',
-    'openingBalanceDate'             => 'Opening balance date',
-    'ccType'                         => 'Credit card payment plan',
-    'ccMonthlyPaymentDate'           => 'Credit card monthly payment date',
-    'piggy_bank_id'                  => 'Piggy bank',
-    'returnHere'                     => 'Return here',
-    'returnHereExplanation'          => 'After storing, return here to create another one.',
-    'returnHereUpdateExplanation'    => 'After updating, return here.',
-    'description'                    => 'Description',
-    'expense_account'                => 'Expense account',
-    'revenue_account'                => 'Revenue account',
-    'decimal_places'                 => 'Decimal places',
-    'exchange_rate_instruction'      => 'Foreign currencies',
-    'exchanged_amount'               => 'Exchanged amount',
-    'source_amount'                  => 'Amount (source)',
-    'destination_amount'             => 'Amount (destination)',
-    'native_amount'                  => 'Native amount',
+    'split_journal'                  => '',
+    'split_journal_explanation'      => '',
+    'currency'                       => '',
+    'account_id'                     => '',
+    'budget_id'                      => '',
+    'openingBalance'                 => '',
+    'tagMode'                        => '',
+    'tagPosition'                    => '',
+    'virtualBalance'                 => '',
+    'longitude_latitude'             => '',
+    'targetamount'                   => '',
+    'accountRole'                    => '',
+    'openingBalanceDate'             => '',
+    'ccType'                         => '',
+    'ccMonthlyPaymentDate'           => '',
+    'piggy_bank_id'                  => '',
+    'returnHere'                     => '',
+    'returnHereExplanation'          => '',
+    'returnHereUpdateExplanation'    => '',
+    'description'                    => '',
+    'expense_account'                => '',
+    'revenue_account'                => '',
+    'decimal_places'                 => '',
+    'exchange_rate_instruction'      => '',
+    'exchanged_amount'               => '',
+    'source_amount'                  => '',
+    'destination_amount'             => '',
+    'native_amount'                  => '',
 
-    'revenue_account_source'      => 'Revenue account (source)',
-    'source_account_asset'        => 'Source account (asset account)',
-    'destination_account_expense' => 'Destination account (expense account)',
-    'destination_account_asset'   => 'Destination account (asset account)',
-    'source_account_revenue'      => 'Source account (revenue account)',
+    'revenue_account_source'      => '',
+    'source_account_asset'        => '',
+    'destination_account_expense' => '',
+    'destination_account_asset'   => '',
+    'source_account_revenue'      => '',
     'type'                        => 'Tipo',
-    'convert_Withdrawal'          => 'Convert withdrawal',
-    'convert_Deposit'             => 'Convert deposit',
-    'convert_Transfer'            => 'Convert transfer',
+    'convert_Withdrawal'          => '',
+    'convert_Deposit'             => '',
+    'convert_Transfer'            => '',
 
 
     'amount'                     => 'Importe',
     'date'                       => 'Fecha',
-    'interest_date'              => 'Interest date',
-    'book_date'                  => 'Book date',
-    'process_date'               => 'Processing date',
-    'category'                   => 'Category',
-    'tags'                       => 'Tags',
-    'deletePermanently'          => 'Delete permanently',
-    'cancel'                     => 'Cancel',
-    'targetdate'                 => 'Target date',
+    'interest_date'              => '',
+    'book_date'                  => '',
+    'process_date'               => '',
+    'category'                   => '',
+    'tags'                       => '',
+    'deletePermanently'          => '',
+    'cancel'                     => '',
+    'targetdate'                 => '',
     'tag'                        => 'Etiqueta',
-    'under'                      => 'Under',
+    'under'                      => '',
     'symbol'                     => 'Símbolo',
     'code'                       => 'Código',
     'iban'                       => 'IBAN',
     'accountNumber'              => 'Número de cuenta',
     'has_headers'                => 'Encabezados',
     'date_format'                => 'Formato de fecha',
-    'specifix'                   => 'Bank- or file specific fixes',
+    'specifix'                   => '',
     'attachments[]'              => 'Adjuntos',
-    'store_new_withdrawal'       => 'Store new withdrawal',
-    'store_new_deposit'          => 'Store new deposit',
-    'store_new_transfer'         => 'Store new transfer',
-    'add_new_withdrawal'         => 'Add a new withdrawal',
-    'add_new_deposit'            => 'Add a new deposit',
-    'add_new_transfer'           => 'Add a new transfer',
-    'noPiggybank'                => '(no piggy bank)',
+    'store_new_withdrawal'       => '',
+    'store_new_deposit'          => '',
+    'store_new_transfer'         => '',
+    'add_new_withdrawal'         => '',
+    'add_new_deposit'            => '',
+    'add_new_transfer'           => '',
+    'noPiggybank'                => '',
     'title'                      => 'Título',
     'notes'                      => 'Notas',
     'filename'                   => 'Nombre de fichero',
     'mime'                       => 'Tipo Mime',
     'size'                       => 'Tamaño',
     'trigger'                    => 'Disparador',
-    'stop_processing'            => 'Stop processing',
-    'start_date'                 => 'Start of range',
-    'end_date'                   => 'End of range',
-    'export_start_range'         => 'Start of export range',
-    'export_end_range'           => 'End of export range',
-    'export_format'              => 'File format',
-    'include_attachments'        => 'Include uploaded attachments',
-    'include_old_uploads'        => 'Include imported data',
-    'accounts'                   => 'Export transactions from these accounts',
-    'delete_account'             => 'Delete account ":name"',
-    'delete_bill'                => 'Delete bill ":name"',
-    'delete_budget'              => 'Delete budget ":name"',
-    'delete_category'            => 'Delete category ":name"',
-    'delete_currency'            => 'Delete currency ":name"',
-    'delete_journal'             => 'Delete transaction with description ":description"',
-    'delete_attachment'          => 'Delete attachment ":name"',
-    'delete_rule'                => 'Delete rule ":title"',
-    'delete_rule_group'          => 'Delete rule group ":title"',
-    'delete_link_type'           => 'Delete link type ":name"',
-    'attachment_areYouSure'      => 'Are you sure you want to delete the attachment named ":name"?',
-    'account_areYouSure'         => 'Are you sure you want to delete the account named ":name"?',
-    'bill_areYouSure'            => 'Are you sure you want to delete the bill named ":name"?',
-    'rule_areYouSure'            => 'Are you sure you want to delete the rule titled ":title"?',
-    'ruleGroup_areYouSure'       => 'Are you sure you want to delete the rule group titled ":title"?',
-    'budget_areYouSure'          => 'Are you sure you want to delete the budget named ":name"?',
-    'category_areYouSure'        => 'Are you sure you want to delete the category named ":name"?',
-    'currency_areYouSure'        => 'Are you sure you want to delete the currency named ":name"?',
-    'piggyBank_areYouSure'       => 'Are you sure you want to delete the piggy bank named ":name"?',
-    'journal_areYouSure'         => 'Are you sure you want to delete the transaction described ":description"?',
-    'mass_journal_are_you_sure'  => 'Are you sure you want to delete these transactions?',
-    'tag_areYouSure'             => 'Are you sure you want to delete the tag ":tag"?',
-    'journal_link_areYouSure'    => 'Are you sure you want to delete the link between <a href=":source_link">:source</a> and <a href=":destination_link">:destination</a>?',
-    'linkType_areYouSure'        => 'Are you sure you want to delete the link type ":name" (":inward" / ":outward")?',
-    'permDeleteWarning'          => 'Deleting stuff from Firely is permanent and cannot be undone.',
-    'mass_make_selection'        => 'You can still prevent items from being deleted by removing the checkbox.',
-    'delete_all_permanently'     => 'Delete selected permanently',
-    'update_all_journals'        => 'Update these transactions',
-    'also_delete_transactions'   => 'The only transaction connected to this account will be deleted as well.|All :count transactions connected to this account will be deleted as well.',
-    'also_delete_connections'    => 'The only transaction linked with this link type will lose this connection.|All :count transactions linked with this link type will lose their connection.',
-    'also_delete_rules'          => 'The only rule connected to this rule group will be deleted as well.|All :count rules connected to this rule group will be deleted as well.',
-    'also_delete_piggyBanks'     => 'The only piggy bank connected to this account will be deleted as well.|All :count piggy bank connected to this account will be deleted as well.',
-    'bill_keep_transactions'     => 'The only transaction connected to this bill will not be deleted.|All :count transactions connected to this bill will spared deletion.',
-    'budget_keep_transactions'   => 'The only transaction connected to this budget will not be deleted.|All :count transactions connected to this budget will spared deletion.',
-    'category_keep_transactions' => 'The only transaction connected to this category will not be deleted.|All :count transactions connected to this category will spared deletion.',
-    'tag_keep_transactions'      => 'The only transaction connected to this tag will not be deleted.|All :count transactions connected to this tag will spared deletion.',
+    'stop_processing'            => '',
+    'start_date'                 => '',
+    'end_date'                   => '',
+    'export_start_range'         => '',
+    'export_end_range'           => '',
+    'export_format'              => '',
+    'include_attachments'        => '',
+    'include_old_uploads'        => '',
+    'accounts'                   => '',
+    'delete_account'             => '',
+    'delete_bill'                => '',
+    'delete_budget'              => '',
+    'delete_category'            => '',
+    'delete_currency'            => '',
+    'delete_journal'             => '',
+    'delete_attachment'          => '',
+    'delete_rule'                => '',
+    'delete_rule_group'          => '',
+    'delete_link_type'           => '',
+    'attachment_areYouSure'      => '',
+    'account_areYouSure'         => '',
+    'bill_areYouSure'            => '',
+    'rule_areYouSure'            => '',
+    'ruleGroup_areYouSure'       => '',
+    'budget_areYouSure'          => '',
+    'category_areYouSure'        => '',
+    'currency_areYouSure'        => '',
+    'piggyBank_areYouSure'       => '',
+    'journal_areYouSure'         => '',
+    'mass_journal_are_you_sure'  => '',
+    'tag_areYouSure'             => '',
+    'journal_link_areYouSure'    => '',
+    'linkType_areYouSure'        => '',
+    'permDeleteWarning'          => '',
+    'mass_make_selection'        => '',
+    'delete_all_permanently'     => '',
+    'update_all_journals'        => '',
+    'also_delete_transactions'   => '',
+    'also_delete_connections'    => '',
+    'also_delete_rules'          => '',
+    'also_delete_piggyBanks'     => '',
+    'bill_keep_transactions'     => '',
+    'budget_keep_transactions'   => '',
+    'category_keep_transactions' => '',
+    'tag_keep_transactions'      => '',
 
-    'email'                 => 'Email address',
-    'password'              => 'Password',
-    'password_confirmation' => 'Password (again)',
-    'blocked'               => 'Is blocked?',
-    'blocked_code'          => 'Reason for block',
+    'email'                 => '',
+    'password'              => '',
+    'password_confirmation' => '',
+    'blocked'               => '',
+    'blocked_code'          => '',
 
 
     // admin
-    'domain'                => 'Domain',
-    'single_user_mode'      => 'Single user mode',
-    'must_confirm_account'  => 'New users must activate account',
-    'is_demo_site'          => 'Is demo site',
+    'domain'                => '',
+    'single_user_mode'      => '',
+    'must_confirm_account'  => '',
+    'is_demo_site'          => '',
 
 
     // import
-    'import_file'           => 'Import file',
-    'configuration_file'    => 'Configuration file',
-    'import_file_type'      => 'Import file type',
-    'csv_comma'             => 'A comma (,)',
-    'csv_semicolon'         => 'A semicolon (;)',
-    'csv_tab'               => 'A tab (invisible)',
-    'csv_delimiter'         => 'CSV field delimiter',
-    'csv_import_account'    => 'Default import account',
-    'csv_config'            => 'CSV import configuration',
+    'import_file'           => '',
+    'configuration_file'    => '',
+    'import_file_type'      => '',
+    'csv_comma'             => '',
+    'csv_semicolon'         => '',
+    'csv_tab'               => '',
+    'csv_delimiter'         => '',
+    'csv_import_account'    => '',
+    'csv_config'            => '',
 
 
-    'due_date'           => 'Due date',
-    'payment_date'       => 'Payment date',
-    'invoice_date'       => 'Invoice date',
-    'internal_reference' => 'Internal reference',
+    'due_date'           => '',
+    'payment_date'       => '',
+    'invoice_date'       => '',
+    'internal_reference' => '',
 
-    'inward'  => 'Inward description',
-    'outward' => 'Outward description',
+    'inward'  => '',
+    'outward' => '',
 ];
\ No newline at end of file

From 57bea64ad4109c6915a069833c049c4d6025d2c7 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Fri, 25 Aug 2017 07:07:44 +0200
Subject: [PATCH 280/668] New translations form.php (Portuguese, Brazilian)

---
 resources/lang/pt_BR/form.php | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/resources/lang/pt_BR/form.php b/resources/lang/pt_BR/form.php
index f8d02b2be5..7b5b88d021 100644
--- a/resources/lang/pt_BR/form.php
+++ b/resources/lang/pt_BR/form.php
@@ -34,7 +34,7 @@ return [
     'journal_source_account_name'    => 'Conta de receita (fonte)',
     'journal_source_account_id'      => 'Conta de ativo (fonte)',
     'BIC'                            => 'BIC',
-    'verify_password'                => 'Verify password security',
+    'verify_password'                => '',
     'account_from_id'                => 'da conta',
     'account_to_id'                  => 'para conta',
     'source_account'                 => 'Conta de origem',
@@ -68,10 +68,10 @@ return [
     'revenue_account'                => 'Conta de Receita',
     'decimal_places'                 => 'Casas décimais',
     'exchange_rate_instruction'      => 'Moedas estrangeiras',
-    'exchanged_amount'               => 'Exchanged amount',
-    'source_amount'                  => 'Amount (source)',
-    'destination_amount'             => 'Amount (destination)',
-    'native_amount'                  => 'Native amount',
+    'exchanged_amount'               => '',
+    'source_amount'                  => '',
+    'destination_amount'             => '',
+    'native_amount'                  => '',
 
     'revenue_account_source'      => 'Conta de receita (fonte)',
     'source_account_asset'        => 'Conta de origem (conta de ativo)',
@@ -135,7 +135,7 @@ return [
     'delete_attachment'          => 'Apagar anexo ":name"',
     'delete_rule'                => 'Excluir regra ":title"',
     'delete_rule_group'          => 'Exclua o grupo de regras ":title"',
-    'delete_link_type'           => 'Delete link type ":name"',
+    'delete_link_type'           => '',
     'attachment_areYouSure'      => 'Tem certeza que deseja excluir o anexo denominado ":name"?',
     'account_areYouSure'         => 'Tem certeza que deseja excluir a conta denominada ":name"?',
     'bill_areYouSure'            => 'Você tem certeza que quer apagar a fatura ":name"?',
@@ -148,14 +148,14 @@ return [
     'journal_areYouSure'         => 'Tem certeza que deseja excluir a transação descrita ":description"?',
     'mass_journal_are_you_sure'  => 'Tem a certeza que pretende apagar estas transações?',
     'tag_areYouSure'             => 'Você tem certeza que quer apagar a tag ":tag"?',
-    'journal_link_areYouSure'    => 'Are you sure you want to delete the link between <a href=":source_link">:source</a> and <a href=":destination_link">:destination</a>?',
-    'linkType_areYouSure'        => 'Are you sure you want to delete the link type ":name" (":inward" / ":outward")?',
+    'journal_link_areYouSure'    => '',
+    'linkType_areYouSure'        => '',
     'permDeleteWarning'          => 'Exclusão de dados do Firely são permanentes e não podem ser desfeitos.',
     'mass_make_selection'        => 'Você ainda pode evitar que itens sejam excluídos, removendo a caixa de seleção.',
     'delete_all_permanently'     => 'Exclua os selecionados permanentemente',
     'update_all_journals'        => 'Atualizar essas transações',
     'also_delete_transactions'   => 'A única transação ligada a essa conta será excluída também.|Todas as :count transações ligadas a esta conta serão excluídas também.',
-    'also_delete_connections'    => 'The only transaction linked with this link type will lose this connection.|All :count transactions linked with this link type will lose their connection.',
+    'also_delete_connections'    => '',
     'also_delete_rules'          => 'A única regra que ligado a este grupo de regras será excluída também.|Todos as :count regras ligadas a este grupo de regras serão excluídas também.',
     'also_delete_piggyBanks'     => 'O único cofrinho conectado a essa conta será excluído também.|Todos os :count cofrinhos conectados a esta conta serão excluídos também.',
     'bill_keep_transactions'     => 'A única transação a esta conta não será excluída.|Todos as :count transações conectadas a esta fatura não serão excluídos.',
@@ -167,7 +167,7 @@ return [
     'password'              => 'Senha',
     'password_confirmation' => 'Senha(Confirmar)',
     'blocked'               => 'Está bloqueado?',
-    'blocked_code'          => 'Reason for block',
+    'blocked_code'          => '',
 
 
     // admin
@@ -194,6 +194,6 @@ return [
     'invoice_date'       => 'Data da Fatura',
     'internal_reference' => 'Referência interna',
 
-    'inward'  => 'Inward description',
-    'outward' => 'Outward description',
+    'inward'  => '',
+    'outward' => '',
 ];
\ No newline at end of file

From b36589b2e6ca3f0509cf86a5848ca703309ce509 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Fri, 25 Aug 2017 07:07:45 +0200
Subject: [PATCH 281/668] New translations form.php (Slovenian)

---
 resources/lang/sl_SI/form.php | 316 +++++++++++++++++-----------------
 1 file changed, 158 insertions(+), 158 deletions(-)

diff --git a/resources/lang/sl_SI/form.php b/resources/lang/sl_SI/form.php
index 1166ab5444..d469f0bbe5 100644
--- a/resources/lang/sl_SI/form.php
+++ b/resources/lang/sl_SI/form.php
@@ -15,185 +15,185 @@ return [
 
     // new user:
     'bank_name'                      => 'Naziv banke',
-    'bank_balance'                   => 'Balance',
-    'savings_balance'                => 'Savings balance',
-    'credit_card_limit'              => 'Credit card limit',
-    'automatch'                      => 'Match automatically',
-    'skip'                           => 'Skip',
-    'name'                           => 'Name',
-    'active'                         => 'Active',
-    'amount_min'                     => 'Minimum amount',
-    'amount_max'                     => 'Maximum amount',
-    'match'                          => 'Matches on',
-    'repeat_freq'                    => 'Repeats',
-    'journal_currency_id'            => 'Currency',
-    'currency_id'                    => 'Currency',
-    'attachments'                    => 'Attachments',
-    'journal_amount'                 => 'Amount',
+    'bank_balance'                   => '',
+    'savings_balance'                => '',
+    'credit_card_limit'              => '',
+    'automatch'                      => '',
+    'skip'                           => '',
+    'name'                           => '',
+    'active'                         => '',
+    'amount_min'                     => '',
+    'amount_max'                     => '',
+    'match'                          => '',
+    'repeat_freq'                    => '',
+    'journal_currency_id'            => '',
+    'currency_id'                    => '',
+    'attachments'                    => '',
+    'journal_amount'                 => '',
     'journal_asset_source_account'   => 'premoženjski račun (vir)',
-    'journal_source_account_name'    => 'Revenue account (source)',
+    'journal_source_account_name'    => '',
     'journal_source_account_id'      => 'premoženjski račun (vir)',
-    'BIC'                            => 'BIC',
-    'verify_password'                => 'Verify password security',
-    'account_from_id'                => 'From account',
-    'account_to_id'                  => 'To account',
-    'source_account'                 => 'Source account',
-    'destination_account'            => 'Destination account',
+    'BIC'                            => '',
+    'verify_password'                => '',
+    'account_from_id'                => '',
+    'account_to_id'                  => '',
+    'source_account'                 => '',
+    'destination_account'            => '',
     'journal_destination_account_id' => 'premoženjski račun (cilj)',
     'asset_destination_account'      => 'premoženjski račun (cilj)',
     'asset_source_account'           => 'premoženjski račun (vir)',
-    'journal_description'            => 'Description',
-    'note'                           => 'Notes',
-    'split_journal'                  => 'Split this transaction',
-    'split_journal_explanation'      => 'Split this transaction in multiple parts',
-    'currency'                       => 'Currency',
+    'journal_description'            => '',
+    'note'                           => '',
+    'split_journal'                  => '',
+    'split_journal_explanation'      => '',
+    'currency'                       => '',
     'account_id'                     => 'premoženjski račun',
-    'budget_id'                      => 'Budget',
-    'openingBalance'                 => 'Opening balance',
-    'tagMode'                        => 'Tag mode',
-    'tagPosition'                    => 'Tag location',
-    'virtualBalance'                 => 'Virtual balance',
-    'longitude_latitude'             => 'Location',
-    'targetamount'                   => 'Target amount',
-    'accountRole'                    => 'Account role',
-    'openingBalanceDate'             => 'Opening balance date',
-    'ccType'                         => 'Credit card payment plan',
-    'ccMonthlyPaymentDate'           => 'Credit card monthly payment date',
-    'piggy_bank_id'                  => 'Piggy bank',
-    'returnHere'                     => 'Return here',
-    'returnHereExplanation'          => 'After storing, return here to create another one.',
-    'returnHereUpdateExplanation'    => 'After updating, return here.',
-    'description'                    => 'Description',
+    'budget_id'                      => '',
+    'openingBalance'                 => '',
+    'tagMode'                        => '',
+    'tagPosition'                    => '',
+    'virtualBalance'                 => '',
+    'longitude_latitude'             => '',
+    'targetamount'                   => '',
+    'accountRole'                    => '',
+    'openingBalanceDate'             => '',
+    'ccType'                         => '',
+    'ccMonthlyPaymentDate'           => '',
+    'piggy_bank_id'                  => '',
+    'returnHere'                     => '',
+    'returnHereExplanation'          => '',
+    'returnHereUpdateExplanation'    => '',
+    'description'                    => '',
     'expense_account'                => 'konto stroškov',
-    'revenue_account'                => 'Revenue account',
-    'decimal_places'                 => 'Decimal places',
-    'exchange_rate_instruction'      => 'Foreign currencies',
-    'exchanged_amount'               => 'Exchanged amount',
-    'source_amount'                  => 'Amount (source)',
-    'destination_amount'             => 'Amount (destination)',
-    'native_amount'                  => 'Native amount',
+    'revenue_account'                => '',
+    'decimal_places'                 => '',
+    'exchange_rate_instruction'      => '',
+    'exchanged_amount'               => '',
+    'source_amount'                  => '',
+    'destination_amount'             => '',
+    'native_amount'                  => '',
 
-    'revenue_account_source'      => 'Revenue account (source)',
+    'revenue_account_source'      => '',
     'source_account_asset'        => 'vir (premoženjski račun)',
     'destination_account_expense' => 'ciljni konto (stroški)',
     'destination_account_asset'   => 'ciljni račun (premoženjski račun)',
-    'source_account_revenue'      => 'Source account (revenue account)',
-    'type'                        => 'Type',
-    'convert_Withdrawal'          => 'Convert withdrawal',
-    'convert_Deposit'             => 'Convert deposit',
-    'convert_Transfer'            => 'Convert transfer',
+    'source_account_revenue'      => '',
+    'type'                        => '',
+    'convert_Withdrawal'          => '',
+    'convert_Deposit'             => '',
+    'convert_Transfer'            => '',
 
 
-    'amount'                     => 'Amount',
-    'date'                       => 'Date',
-    'interest_date'              => 'Interest date',
-    'book_date'                  => 'Book date',
-    'process_date'               => 'Processing date',
-    'category'                   => 'Category',
-    'tags'                       => 'Tags',
-    'deletePermanently'          => 'Delete permanently',
-    'cancel'                     => 'Cancel',
-    'targetdate'                 => 'Target date',
-    'tag'                        => 'Tag',
-    'under'                      => 'Under',
-    'symbol'                     => 'Symbol',
-    'code'                       => 'Code',
-    'iban'                       => 'IBAN',
-    'accountNumber'              => 'Account number',
-    'has_headers'                => 'Headers',
-    'date_format'                => 'Date format',
-    'specifix'                   => 'Bank- or file specific fixes',
-    'attachments[]'              => 'Attachments',
-    'store_new_withdrawal'       => 'Store new withdrawal',
-    'store_new_deposit'          => 'Store new deposit',
-    'store_new_transfer'         => 'Store new transfer',
-    'add_new_withdrawal'         => 'Add a new withdrawal',
-    'add_new_deposit'            => 'Add a new deposit',
-    'add_new_transfer'           => 'Add a new transfer',
-    'noPiggybank'                => '(no piggy bank)',
-    'title'                      => 'Title',
-    'notes'                      => 'Notes',
-    'filename'                   => 'File name',
-    'mime'                       => 'Mime type',
-    'size'                       => 'Size',
-    'trigger'                    => 'Trigger',
-    'stop_processing'            => 'Stop processing',
-    'start_date'                 => 'Start of range',
-    'end_date'                   => 'End of range',
-    'export_start_range'         => 'Start of export range',
-    'export_end_range'           => 'End of export range',
-    'export_format'              => 'File format',
-    'include_attachments'        => 'Include uploaded attachments',
-    'include_old_uploads'        => 'Include imported data',
-    'accounts'                   => 'Export transactions from these accounts',
-    'delete_account'             => 'Delete account ":name"',
-    'delete_bill'                => 'Delete bill ":name"',
-    'delete_budget'              => 'Delete budget ":name"',
-    'delete_category'            => 'Delete category ":name"',
-    'delete_currency'            => 'Delete currency ":name"',
-    'delete_journal'             => 'Delete transaction with description ":description"',
-    'delete_attachment'          => 'Delete attachment ":name"',
-    'delete_rule'                => 'Delete rule ":title"',
-    'delete_rule_group'          => 'Delete rule group ":title"',
-    'delete_link_type'           => 'Delete link type ":name"',
-    'attachment_areYouSure'      => 'Are you sure you want to delete the attachment named ":name"?',
-    'account_areYouSure'         => 'Are you sure you want to delete the account named ":name"?',
-    'bill_areYouSure'            => 'Are you sure you want to delete the bill named ":name"?',
-    'rule_areYouSure'            => 'Are you sure you want to delete the rule titled ":title"?',
-    'ruleGroup_areYouSure'       => 'Are you sure you want to delete the rule group titled ":title"?',
-    'budget_areYouSure'          => 'Are you sure you want to delete the budget named ":name"?',
-    'category_areYouSure'        => 'Are you sure you want to delete the category named ":name"?',
-    'currency_areYouSure'        => 'Are you sure you want to delete the currency named ":name"?',
-    'piggyBank_areYouSure'       => 'Are you sure you want to delete the piggy bank named ":name"?',
-    'journal_areYouSure'         => 'Are you sure you want to delete the transaction described ":description"?',
-    'mass_journal_are_you_sure'  => 'Are you sure you want to delete these transactions?',
-    'tag_areYouSure'             => 'Are you sure you want to delete the tag ":tag"?',
-    'journal_link_areYouSure'    => 'Are you sure you want to delete the link between <a href=":source_link">:source</a> and <a href=":destination_link">:destination</a>?',
-    'linkType_areYouSure'        => 'Are you sure you want to delete the link type ":name" (":inward" / ":outward")?',
-    'permDeleteWarning'          => 'Deleting stuff from Firely is permanent and cannot be undone.',
-    'mass_make_selection'        => 'You can still prevent items from being deleted by removing the checkbox.',
-    'delete_all_permanently'     => 'Delete selected permanently',
-    'update_all_journals'        => 'Update these transactions',
-    'also_delete_transactions'   => 'The only transaction connected to this account will be deleted as well.|All :count transactions connected to this account will be deleted as well.',
-    'also_delete_connections'    => 'The only transaction linked with this link type will lose this connection.|All :count transactions linked with this link type will lose their connection.',
-    'also_delete_rules'          => 'The only rule connected to this rule group will be deleted as well.|All :count rules connected to this rule group will be deleted as well.',
-    'also_delete_piggyBanks'     => 'The only piggy bank connected to this account will be deleted as well.|All :count piggy bank connected to this account will be deleted as well.',
-    'bill_keep_transactions'     => 'The only transaction connected to this bill will not be deleted.|All :count transactions connected to this bill will spared deletion.',
-    'budget_keep_transactions'   => 'The only transaction connected to this budget will not be deleted.|All :count transactions connected to this budget will spared deletion.',
-    'category_keep_transactions' => 'The only transaction connected to this category will not be deleted.|All :count transactions connected to this category will spared deletion.',
-    'tag_keep_transactions'      => 'The only transaction connected to this tag will not be deleted.|All :count transactions connected to this tag will spared deletion.',
+    'amount'                     => '',
+    'date'                       => '',
+    'interest_date'              => '',
+    'book_date'                  => '',
+    'process_date'               => '',
+    'category'                   => '',
+    'tags'                       => '',
+    'deletePermanently'          => '',
+    'cancel'                     => '',
+    'targetdate'                 => '',
+    'tag'                        => '',
+    'under'                      => '',
+    'symbol'                     => '',
+    'code'                       => '',
+    'iban'                       => '',
+    'accountNumber'              => '',
+    'has_headers'                => '',
+    'date_format'                => '',
+    'specifix'                   => '',
+    'attachments[]'              => '',
+    'store_new_withdrawal'       => '',
+    'store_new_deposit'          => '',
+    'store_new_transfer'         => '',
+    'add_new_withdrawal'         => '',
+    'add_new_deposit'            => '',
+    'add_new_transfer'           => '',
+    'noPiggybank'                => '',
+    'title'                      => '',
+    'notes'                      => '',
+    'filename'                   => '',
+    'mime'                       => '',
+    'size'                       => '',
+    'trigger'                    => '',
+    'stop_processing'            => '',
+    'start_date'                 => '',
+    'end_date'                   => '',
+    'export_start_range'         => '',
+    'export_end_range'           => '',
+    'export_format'              => '',
+    'include_attachments'        => '',
+    'include_old_uploads'        => '',
+    'accounts'                   => '',
+    'delete_account'             => '',
+    'delete_bill'                => '',
+    'delete_budget'              => '',
+    'delete_category'            => '',
+    'delete_currency'            => '',
+    'delete_journal'             => '',
+    'delete_attachment'          => '',
+    'delete_rule'                => '',
+    'delete_rule_group'          => '',
+    'delete_link_type'           => '',
+    'attachment_areYouSure'      => '',
+    'account_areYouSure'         => '',
+    'bill_areYouSure'            => '',
+    'rule_areYouSure'            => '',
+    'ruleGroup_areYouSure'       => '',
+    'budget_areYouSure'          => '',
+    'category_areYouSure'        => '',
+    'currency_areYouSure'        => '',
+    'piggyBank_areYouSure'       => '',
+    'journal_areYouSure'         => '',
+    'mass_journal_are_you_sure'  => '',
+    'tag_areYouSure'             => '',
+    'journal_link_areYouSure'    => '',
+    'linkType_areYouSure'        => '',
+    'permDeleteWarning'          => '',
+    'mass_make_selection'        => '',
+    'delete_all_permanently'     => '',
+    'update_all_journals'        => '',
+    'also_delete_transactions'   => '',
+    'also_delete_connections'    => '',
+    'also_delete_rules'          => '',
+    'also_delete_piggyBanks'     => '',
+    'bill_keep_transactions'     => '',
+    'budget_keep_transactions'   => '',
+    'category_keep_transactions' => '',
+    'tag_keep_transactions'      => '',
 
-    'email'                 => 'Email address',
-    'password'              => 'Password',
-    'password_confirmation' => 'Password (again)',
-    'blocked'               => 'Is blocked?',
-    'blocked_code'          => 'Reason for block',
+    'email'                 => '',
+    'password'              => '',
+    'password_confirmation' => '',
+    'blocked'               => '',
+    'blocked_code'          => '',
 
 
     // admin
-    'domain'                => 'Domain',
-    'single_user_mode'      => 'Single user mode',
-    'must_confirm_account'  => 'New users must activate account',
-    'is_demo_site'          => 'Is demo site',
+    'domain'                => '',
+    'single_user_mode'      => '',
+    'must_confirm_account'  => '',
+    'is_demo_site'          => '',
 
 
     // import
-    'import_file'           => 'Import file',
-    'configuration_file'    => 'Configuration file',
-    'import_file_type'      => 'Import file type',
-    'csv_comma'             => 'A comma (,)',
-    'csv_semicolon'         => 'A semicolon (;)',
-    'csv_tab'               => 'A tab (invisible)',
-    'csv_delimiter'         => 'CSV field delimiter',
-    'csv_import_account'    => 'Default import account',
-    'csv_config'            => 'CSV import configuration',
+    'import_file'           => '',
+    'configuration_file'    => '',
+    'import_file_type'      => '',
+    'csv_comma'             => '',
+    'csv_semicolon'         => '',
+    'csv_tab'               => '',
+    'csv_delimiter'         => '',
+    'csv_import_account'    => '',
+    'csv_config'            => '',
 
 
-    'due_date'           => 'Due date',
-    'payment_date'       => 'Payment date',
-    'invoice_date'       => 'Invoice date',
-    'internal_reference' => 'Internal reference',
+    'due_date'           => '',
+    'payment_date'       => '',
+    'invoice_date'       => '',
+    'internal_reference' => '',
 
-    'inward'  => 'Inward description',
-    'outward' => 'Outward description',
+    'inward'  => '',
+    'outward' => '',
 ];
\ No newline at end of file

From 0dcfddc169fb4023c9b0d351ca0b7d403bee9c0b Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Fri, 25 Aug 2017 07:07:47 +0200
Subject: [PATCH 282/668] New translations list.php (Chinese Traditional)

---
 resources/lang/zh_TW/list.php | 44 +++++++++++++++++------------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/resources/lang/zh_TW/list.php b/resources/lang/zh_TW/list.php
index 60c67ed53a..9c30cbd4df 100644
--- a/resources/lang/zh_TW/list.php
+++ b/resources/lang/zh_TW/list.php
@@ -14,7 +14,7 @@ declare(strict_types=1);
 return [
     'buttons'               => '按鈕',
     'icon'                  => '圖標',
-    'id'                    => 'ID',
+    'id'                    => '',
     'create_date'           => '建立於',
     'update_date'           => '更新於',
     'balance_before'        => '交易前餘額',
@@ -36,7 +36,7 @@ return [
     'split_number'          => '分割編號 #',
     'destination'           => '到',
     'source'                => '來源',
-    'next_expected_match'   => 'Next expected match',
+    'next_expected_match'   => '',
     'automatch'             => '自動匹配？',
     'repeat_freq'           => '重複',
     'description'           => '描述',
@@ -44,7 +44,7 @@ return [
     'internal_reference'    => '內部參考',
     'date'                  => '日期',
     'interest_date'         => '付息日',
-    'book_date'             => 'Book date',
+    'book_date'             => '',
     'process_date'          => '處理日期',
     'due_date'              => '到期日',
     'payment_date'          => '付款日期',
@@ -70,25 +70,25 @@ return [
     'is_blocked'            => '被阻止',
     'is_admin'              => '是管理員',
     'has_two_factor'        => '有雙重身份驗證 （2FA）',
-    'confirmed_from'        => 'Confirmed from',
-    'registered_from'       => 'Registered from',
-    'blocked_code'          => 'Block code',
-    'domain'                => 'Domain',
-    'registration_attempts' => 'Registration attempts',
+    'confirmed_from'        => '',
+    'registered_from'       => '',
+    'blocked_code'          => '',
+    'domain'                => '',
+    'registration_attempts' => '',
     'source_account'        => '來源帳戶',
-    'destination_account'   => 'Destination account',
+    'destination_account'   => '',
 
-    'accounts_count'         => 'Number of accounts',
-    'journals_count'         => 'Number of transactions',
-    'attachments_count'      => 'Number of attachments',
-    'bills_count'            => 'Number of bills',
-    'categories_count'       => 'Number of categories',
-    'export_jobs_count'      => 'Number of export jobs',
-    'import_jobs_count'      => 'Number of import jobs',
-    'budget_count'           => 'Number of budgets',
-    'rule_and_groups_count'  => 'Number of rules and rule groups',
-    'tags_count'             => 'Number of tags',
-    'inward'                 => 'Inward description',
-    'outward'                => 'Outward description',
-    'number_of_transactions' => 'Number of transactions',
+    'accounts_count'         => '',
+    'journals_count'         => '',
+    'attachments_count'      => '',
+    'bills_count'            => '',
+    'categories_count'       => '',
+    'export_jobs_count'      => '',
+    'import_jobs_count'      => '',
+    'budget_count'           => '',
+    'rule_and_groups_count'  => '',
+    'tags_count'             => '',
+    'inward'                 => '',
+    'outward'                => '',
+    'number_of_transactions' => '',
 ];
\ No newline at end of file

From e2643ead1a536bd23abf9dbd053275281d5f12d4 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Fri, 25 Aug 2017 07:07:48 +0200
Subject: [PATCH 283/668] New translations help.php (Spanish)

---
 resources/lang/es_ES/help.php | 36 +++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/resources/lang/es_ES/help.php b/resources/lang/es_ES/help.php
index 0f77f62304..62c5695f3b 100644
--- a/resources/lang/es_ES/help.php
+++ b/resources/lang/es_ES/help.php
@@ -14,22 +14,22 @@ declare(strict_types=1);
 return [
 
     // tour!
-    'main-content-title'     => 'Welcome to Firefly III',
-    'main-content-text'      => 'Do yourself a favor and follow this short guide to make sure you know your way around.',
-    'sidebar-toggle-title'   => 'Sidebar to create stuff',
-    'sidebar-toggle-text'    => 'Hidden under the plus icon are all the buttons to create new stuff. Accounts, transactions, everything!',
-    'account-menu-title'     => 'All your accounts',
-    'account-menu-text'      => 'Here you can find all the accounts you\'ve made.',
-    'budget-menu-title'      => 'Budgets',
-    'budget-menu-text'       => 'Use this page to organise your finances and limit spending.',
-    'report-menu-title'      => 'Reports',
-    'report-menu-text'       => 'Check this out when you want a solid overview of your finances.',
-    'transaction-menu-title' => 'Transactions',
-    'transaction-menu-text'  => 'All transactions you\'ve created can be found here.',
-    'option-menu-title'      => 'Options',
-    'option-menu-text'       => 'This is pretty self-explanatory.',
-    'main-content-end-title' => 'The end!',
-    'main-content-end-text'  => 'Remember that every page has a small question mark at the right top. Click it to get help about the page you\'re on.',
-    'index'                  => 'index',
-    'home'                   => 'home',
+    'main-content-title'     => '',
+    'main-content-text'      => '',
+    'sidebar-toggle-title'   => '',
+    'sidebar-toggle-text'    => '',
+    'account-menu-title'     => '',
+    'account-menu-text'      => '',
+    'budget-menu-title'      => '',
+    'budget-menu-text'       => '',
+    'report-menu-title'      => '',
+    'report-menu-text'       => '',
+    'transaction-menu-title' => '',
+    'transaction-menu-text'  => '',
+    'option-menu-title'      => '',
+    'option-menu-text'       => '',
+    'main-content-end-title' => '',
+    'main-content-end-text'  => '',
+    'index'                  => '',
+    'home'                   => '',
 ];
\ No newline at end of file

From 65b3dab91631d5dbb32d10423f9491cf5a8edafa Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Fri, 25 Aug 2017 07:07:49 +0200
Subject: [PATCH 284/668] New translations help.php (Slovenian)

---
 resources/lang/sl_SI/help.php | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/resources/lang/sl_SI/help.php b/resources/lang/sl_SI/help.php
index d9b1d8d381..5d58c5a936 100644
--- a/resources/lang/sl_SI/help.php
+++ b/resources/lang/sl_SI/help.php
@@ -15,21 +15,21 @@ return [
 
     // tour!
     'main-content-title'     => 'Dobrodošli na Firefly III',
-    'main-content-text'      => 'Do yourself a favor and follow this short guide to make sure you know your way around.',
-    'sidebar-toggle-title'   => 'Sidebar to create stuff',
-    'sidebar-toggle-text'    => 'Hidden under the plus icon are all the buttons to create new stuff. Accounts, transactions, everything!',
-    'account-menu-title'     => 'All your accounts',
-    'account-menu-text'      => 'Here you can find all the accounts you\'ve made.',
-    'budget-menu-title'      => 'Budgets',
-    'budget-menu-text'       => 'Use this page to organise your finances and limit spending.',
-    'report-menu-title'      => 'Reports',
-    'report-menu-text'       => 'Check this out when you want a solid overview of your finances.',
-    'transaction-menu-title' => 'Transactions',
-    'transaction-menu-text'  => 'All transactions you\'ve created can be found here.',
-    'option-menu-title'      => 'Options',
-    'option-menu-text'       => 'This is pretty self-explanatory.',
-    'main-content-end-title' => 'The end!',
-    'main-content-end-text'  => 'Remember that every page has a small question mark at the right top. Click it to get help about the page you\'re on.',
-    'index'                  => 'index',
-    'home'                   => 'home',
+    'main-content-text'      => '',
+    'sidebar-toggle-title'   => '',
+    'sidebar-toggle-text'    => '',
+    'account-menu-title'     => '',
+    'account-menu-text'      => '',
+    'budget-menu-title'      => '',
+    'budget-menu-text'       => '',
+    'report-menu-title'      => '',
+    'report-menu-text'       => '',
+    'transaction-menu-title' => '',
+    'transaction-menu-text'  => '',
+    'option-menu-title'      => '',
+    'option-menu-text'       => '',
+    'main-content-end-title' => '',
+    'main-content-end-text'  => '',
+    'index'                  => '',
+    'home'                   => '',
 ];
\ No newline at end of file

From 5b135ada24813891444bd9d8ad476825a8a8951a Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Fri, 25 Aug 2017 07:07:50 +0200
Subject: [PATCH 285/668] New translations form.php (Polish)

---
 resources/lang/pl_PL/form.php | 58 +++++++++++++++++------------------
 1 file changed, 29 insertions(+), 29 deletions(-)

diff --git a/resources/lang/pl_PL/form.php b/resources/lang/pl_PL/form.php
index 1061d0bc49..e21e225a02 100644
--- a/resources/lang/pl_PL/form.php
+++ b/resources/lang/pl_PL/form.php
@@ -34,7 +34,7 @@ return [
     'journal_source_account_name'    => 'Konto przychodów (źródło)',
     'journal_source_account_id'      => 'Konto aktywów (źródło)',
     'BIC'                            => 'BIC',
-    'verify_password'                => 'Verify password security',
+    'verify_password'                => '',
     'account_from_id'                => 'Z konta',
     'account_to_id'                  => 'Na konto',
     'source_account'                 => 'Konto źródłowe',
@@ -50,7 +50,7 @@ return [
     'account_id'                     => 'Konto aktywów',
     'budget_id'                      => 'Budżet',
     'openingBalance'                 => 'Bilans otwarcia',
-    'tagMode'                        => 'Tag mode',
+    'tagMode'                        => '',
     'tagPosition'                    => 'Lokalizacja taga',
     'virtualBalance'                 => 'Wirtualne saldo',
     'longitude_latitude'             => 'Lokalizacja',
@@ -58,20 +58,20 @@ return [
     'accountRole'                    => 'Rola konta',
     'openingBalanceDate'             => 'Data salda otwarcia',
     'ccType'                         => 'Plan płatności kartą kredytową',
-    'ccMonthlyPaymentDate'           => 'Credit card monthly payment date',
+    'ccMonthlyPaymentDate'           => '',
     'piggy_bank_id'                  => 'Skarbonka',
     'returnHere'                     => 'Wróć tutaj',
-    'returnHereExplanation'          => 'After storing, return here to create another one.',
+    'returnHereExplanation'          => '',
     'returnHereUpdateExplanation'    => 'Po aktualizacji, wróć tutaj.',
     'description'                    => 'Opis',
     'expense_account'                => 'Konto wydatków',
     'revenue_account'                => 'Konto przychodów',
     'decimal_places'                 => 'Miejsca dziesiętne',
-    'exchange_rate_instruction'      => 'Foreign currencies',
-    'exchanged_amount'               => 'Exchanged amount',
-    'source_amount'                  => 'Amount (source)',
-    'destination_amount'             => 'Amount (destination)',
-    'native_amount'                  => 'Native amount',
+    'exchange_rate_instruction'      => '',
+    'exchanged_amount'               => '',
+    'source_amount'                  => '',
+    'destination_amount'             => '',
+    'native_amount'                  => '',
 
     'revenue_account_source'      => 'Konto przychodów (źródło)',
     'source_account_asset'        => 'Konto źródłowe (konto aktywów)',
@@ -86,9 +86,9 @@ return [
 
     'amount'                     => 'Kwota',
     'date'                       => 'Data',
-    'interest_date'              => 'Interest date',
+    'interest_date'              => '',
     'book_date'                  => 'Data księgowania',
-    'process_date'               => 'Processing date',
+    'process_date'               => '',
     'category'                   => 'Kategoria',
     'tags'                       => 'Tagi',
     'deletePermanently'          => 'Usuń trwale',
@@ -102,7 +102,7 @@ return [
     'accountNumber'              => 'Numer konta',
     'has_headers'                => 'Nagłówki',
     'date_format'                => 'Format daty',
-    'specifix'                   => 'Bank- or file specific fixes',
+    'specifix'                   => '',
     'attachments[]'              => 'Załączniki',
     'store_new_withdrawal'       => 'Zapisz nową wypłatę',
     'store_new_deposit'          => 'Zapisz nową wpłatę',
@@ -135,7 +135,7 @@ return [
     'delete_attachment'          => 'Usuń załącznik ":name"',
     'delete_rule'                => 'Usuń regułę ":title"',
     'delete_rule_group'          => 'Usuń grupę reguł ":title"',
-    'delete_link_type'           => 'Delete link type ":name"',
+    'delete_link_type'           => '',
     'attachment_areYouSure'      => 'Czy na pewno chcesz usunąć załącznik o nazwie ":name"?',
     'account_areYouSure'         => 'Czy na pewno chcesz usunąć konto o nazwie ":name"?',
     'bill_areYouSure'            => 'Czy na pewno chcesz usunąć rachunek o nazwie ":name"?',
@@ -148,20 +148,20 @@ return [
     'journal_areYouSure'         => 'Czy na pewno chcesz usunąć transakcję opisaną ":description"?',
     'mass_journal_are_you_sure'  => 'Czy na pewno chcesz usunąć te transakcje?',
     'tag_areYouSure'             => 'Czy na pewno chcesz usunąć tag ":tag"?',
-    'journal_link_areYouSure'    => 'Are you sure you want to delete the link between <a href=":source_link">:source</a> and <a href=":destination_link">:destination</a>?',
-    'linkType_areYouSure'        => 'Are you sure you want to delete the link type ":name" (":inward" / ":outward")?',
+    'journal_link_areYouSure'    => '',
+    'linkType_areYouSure'        => '',
     'permDeleteWarning'          => 'Usuwanie rzeczy z Firefly jest trwałe i nie można tego cofnąć.',
-    'mass_make_selection'        => 'You can still prevent items from being deleted by removing the checkbox.',
+    'mass_make_selection'        => '',
     'delete_all_permanently'     => 'Trwale usuń zaznaczone',
     'update_all_journals'        => 'Zmodyfikuj te transakcje',
-    'also_delete_transactions'   => 'The only transaction connected to this account will be deleted as well.|All :count transactions connected to this account will be deleted as well.',
-    'also_delete_connections'    => 'The only transaction linked with this link type will lose this connection.|All :count transactions linked with this link type will lose their connection.',
-    'also_delete_rules'          => 'The only rule connected to this rule group will be deleted as well.|All :count rules connected to this rule group will be deleted as well.',
-    'also_delete_piggyBanks'     => 'The only piggy bank connected to this account will be deleted as well.|All :count piggy bank connected to this account will be deleted as well.',
-    'bill_keep_transactions'     => 'The only transaction connected to this bill will not be deleted.|All :count transactions connected to this bill will spared deletion.',
-    'budget_keep_transactions'   => 'The only transaction connected to this budget will not be deleted.|All :count transactions connected to this budget will spared deletion.',
-    'category_keep_transactions' => 'The only transaction connected to this category will not be deleted.|All :count transactions connected to this category will spared deletion.',
-    'tag_keep_transactions'      => 'The only transaction connected to this tag will not be deleted.|All :count transactions connected to this tag will spared deletion.',
+    'also_delete_transactions'   => '',
+    'also_delete_connections'    => '',
+    'also_delete_rules'          => '',
+    'also_delete_piggyBanks'     => '',
+    'bill_keep_transactions'     => '',
+    'budget_keep_transactions'   => '',
+    'category_keep_transactions' => '',
+    'tag_keep_transactions'      => '',
 
     'email'                 => 'Adres email',
     'password'              => 'Hasło',
@@ -174,7 +174,7 @@ return [
     'domain'                => 'Domena',
     'single_user_mode'      => 'Tryb pojedynczego użytkownika',
     'must_confirm_account'  => 'Nowi użytkownicy muszą aktywować konto',
-    'is_demo_site'          => 'Is demo site',
+    'is_demo_site'          => '',
 
 
     // import
@@ -184,7 +184,7 @@ return [
     'csv_comma'             => 'Przecinek (,)',
     'csv_semicolon'         => 'Średnik (;)',
     'csv_tab'               => 'Tabulator (niewidoczny)',
-    'csv_delimiter'         => 'CSV field delimiter',
+    'csv_delimiter'         => '',
     'csv_import_account'    => 'Domyślne konto importu',
     'csv_config'            => 'Konfiguracja importu CSV',
 
@@ -192,8 +192,8 @@ return [
     'due_date'           => 'Termin realizacji',
     'payment_date'       => 'Data płatności',
     'invoice_date'       => 'Data faktury',
-    'internal_reference' => 'Internal reference',
+    'internal_reference' => '',
 
-    'inward'  => 'Inward description',
-    'outward' => 'Outward description',
+    'inward'  => '',
+    'outward' => '',
 ];
\ No newline at end of file

From 5dc4cf4c17c7e84889b032c999bc694813628c75 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Fri, 25 Aug 2017 07:07:51 +0200
Subject: [PATCH 286/668] New translations form.php (German)

---
 resources/lang/de_DE/form.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/resources/lang/de_DE/form.php b/resources/lang/de_DE/form.php
index b890cee4ff..41d976d77a 100644
--- a/resources/lang/de_DE/form.php
+++ b/resources/lang/de_DE/form.php
@@ -34,7 +34,7 @@ return [
     'journal_source_account_name'    => 'Kreditor (Quelle)',
     'journal_source_account_id'      => 'Girokonto (Quelle)',
     'BIC'                            => 'BIC',
-    'verify_password'                => 'Verify password security',
+    'verify_password'                => '',
     'account_from_id'                => 'Vom Konto',
     'account_to_id'                  => 'Auf Konto',
     'source_account'                 => 'Quellkonto',
@@ -135,7 +135,7 @@ return [
     'delete_attachment'          => 'Lösche Anhang ":name"',
     'delete_rule'                => 'Lösche Regel ":title"',
     'delete_rule_group'          => 'Lösche Regelgruppe ":title"',
-    'delete_link_type'           => 'Delete link type ":name"',
+    'delete_link_type'           => '',
     'attachment_areYouSure'      => 'Sind Sie sicher, dass Sie den Anhang ":name" löschen möchten?',
     'account_areYouSure'         => 'Sind Sie sicher, dass Sie das Konto ":name" löschen möchten?',
     'bill_areYouSure'            => 'Sind Sie sicher, dass Sie die Rechnung ":name" löschen möchten?',
@@ -148,14 +148,14 @@ return [
     'journal_areYouSure'         => 'Sind Sie sicher, dass Sie die Überweisung mit dem Namen ":description" löschen möchten?',
     'mass_journal_are_you_sure'  => 'Sind Sie sicher, dass Sie diese Überweisung löschen möchten?',
     'tag_areYouSure'             => 'Sind Sie sicher, dass Sie den Tag ":name" löschen möchten?',
-    'journal_link_areYouSure'    => 'Are you sure you want to delete the link between <a href=":source_link">:source</a> and <a href=":destination_link">:destination</a>?',
-    'linkType_areYouSure'        => 'Are you sure you want to delete the link type ":name" (":inward" / ":outward")?',
+    'journal_link_areYouSure'    => '',
+    'linkType_areYouSure'        => '',
     'permDeleteWarning'          => 'Das Löschen von Dingen in Firefly ist dauerhaft und kann nicht rückgängig gemacht werden.',
     'mass_make_selection'        => 'Sie können das Löschen von Elementen verhinden, indem Sie die Checkbox entfernen.',
     'delete_all_permanently'     => 'Ausgewähltes dauerhaft löschen',
     'update_all_journals'        => 'Diese Transaktionen aktualisieren',
     'also_delete_transactions'   => 'Die einzige Überweisung, die mit diesem Konto verknüpft ist, wird ebenfalls gelöscht. | Alle :count Überweisungen, die mit diesem Konto verknüpft sind, werden ebenfalls gelöscht.',
-    'also_delete_connections'    => 'The only transaction linked with this link type will lose this connection.|All :count transactions linked with this link type will lose their connection.',
+    'also_delete_connections'    => '',
     'also_delete_rules'          => 'Die einzige Regel, die mit diesem Konto verknüpft ist, wird ebenfalls gelöscht. | Alle :count Regeln, die mit diesem Konto verknüpft sind, werden ebenfalls gelöscht.',
     'also_delete_piggyBanks'     => 'Das einzige Sparschwein, das mit diesem Konto verknüpft ist, wird ebenfalls gelöscht. | Alle :count Sparschweine, die mit diesem Konto verknüpft sind, werden ebenfalls gelöscht.',
     'bill_keep_transactions'     => 'Die einzige Überweisung, die mit dieser Rechnung verknüpft ist, wird nicht gelöscht. | Keine der :count Überweisungen, die mit dieser Rechnung verknüpft sind, werden gelöscht.',
@@ -194,6 +194,6 @@ return [
     'invoice_date'       => 'Rechnungsdatum',
     'internal_reference' => 'Interner Verweis',
 
-    'inward'  => 'Inward description',
-    'outward' => 'Outward description',
+    'inward'  => '',
+    'outward' => '',
 ];
\ No newline at end of file

From bbe8fff1e6929338bfdedfa75db8ada37ab38d10 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Fri, 25 Aug 2017 07:07:54 +0200
Subject: [PATCH 287/668] New translations firefly.php (French)

---
 resources/lang/fr_FR/firefly.php | 252 +++++++++++++++----------------
 1 file changed, 126 insertions(+), 126 deletions(-)

diff --git a/resources/lang/fr_FR/firefly.php b/resources/lang/fr_FR/firefly.php
index 607bb2dd50..534d205cb0 100644
--- a/resources/lang/fr_FR/firefly.php
+++ b/resources/lang/fr_FR/firefly.php
@@ -863,150 +863,150 @@ return [
     'configuration_updated'                 => 'La configuration a été mise à jour',
     'setting_is_demo_site'                  => 'Site de démonstration',
     'setting_is_demo_site_explain'          => 'Si vous cochez cette case, cette installation se comportera comme si c\'était le site de démonstration, ce qui peut engendrer des effets secondaires étranges.',
-    'block_code_bounced'                    => 'Email message(s) bounced',
-    'block_code_expired'                    => 'Demo account expired',
-    'no_block_code'                         => 'No reason for block or user not blocked',
+    'block_code_bounced'                    => '',
+    'block_code_expired'                    => '',
+    'no_block_code'                         => '',
     // links
-    'journal_link_configuration'            => 'Transaction links configuration',
-    'create_new_link_type'                  => 'Create new link type',
-    'store_new_link_type'                   => 'Store new link type',
-    'update_link_type'                      => 'Update link type',
-    'edit_link_type'                        => 'Edit link type ":name"',
-    'updated_link_type'                     => 'Updated link type ":name"',
-    'delete_link_type'                      => 'Delete link type ":name"',
-    'deleted_link_type'                     => 'Deleted link type ":name"',
-    'stored_new_link_type'                  => 'Store new link type ":name"',
-    'cannot_edit_link_type'                 => 'Cannot edit link type ":name"',
-    'link_type_help_name'                   => 'Ie. "Duplicates"',
-    'link_type_help_inward'                 => 'Ie. "duplicates"',
-    'link_type_help_outward'                => 'Ie. "is duplicated by"',
-    'save_connections_by_moving'            => 'Save the link between these transaction(s) by moving them to another link type:',
-    'do_not_save_connection'                => '(do not save connection)',
-    'link_transaction'                      => 'Link transaction',
-    'link_to_other_transaction'             => 'Link this transaction to another transaction',
-    'select_transaction_to_link'            => 'Select a transaction to link this transaction to',
-    'this_transaction'                      => 'This transaction',
-    'transaction'                           => 'Transaction',
-    'comments'                              => 'Comments',
-    'to_link_not_found'                     => 'If the transaction you want to link to is not listed, simply enter its ID.',
-    'invalid_link_data'                     => 'Invalid link type selected. Cannot link transaction.',
-    'journals_linked'                       => 'Transactions are linked.',
-    'journals_error_linked'                 => 'These transactions are already linked.',
-    'journal_links'                         => 'Transaction links',
-    'this_withdrawal'                       => 'This withdrawal',
-    'this_deposit'                          => 'This deposit',
-    'this_transfer'                         => 'This transfer',
-    'overview_for_link'                     => 'Overview for link type ":name"',
-    'delete_journal_link'                   => 'Delete the link between <a href=":source_link">:source</a> and <a href=":destination_link">:destination</a>',
-    'deleted_link'                          => 'Deleted link',
+    'journal_link_configuration'            => '',
+    'create_new_link_type'                  => '',
+    'store_new_link_type'                   => '',
+    'update_link_type'                      => '',
+    'edit_link_type'                        => '',
+    'updated_link_type'                     => '',
+    'delete_link_type'                      => '',
+    'deleted_link_type'                     => '',
+    'stored_new_link_type'                  => '',
+    'cannot_edit_link_type'                 => '',
+    'link_type_help_name'                   => '',
+    'link_type_help_inward'                 => '',
+    'link_type_help_outward'                => '',
+    'save_connections_by_moving'            => '',
+    'do_not_save_connection'                => '',
+    'link_transaction'                      => '',
+    'link_to_other_transaction'             => '',
+    'select_transaction_to_link'            => '',
+    'this_transaction'                      => '',
+    'transaction'                           => '',
+    'comments'                              => '',
+    'to_link_not_found'                     => '',
+    'invalid_link_data'                     => '',
+    'journals_linked'                       => '',
+    'journals_error_linked'                 => '',
+    'journal_links'                         => '',
+    'this_withdrawal'                       => '',
+    'this_deposit'                          => '',
+    'this_transfer'                         => '',
+    'overview_for_link'                     => '',
+    'delete_journal_link'                   => '',
+    'deleted_link'                          => '',
 
 
     // split a transaction:
-    'splits'                                => 'Splits',
-    'add_another_split'                     => 'Add another split',
-    'split-transactions'                    => 'Split transactions',
-    'do_split'                              => 'Do a split',
-    'split_this_withdrawal'                 => 'Split this withdrawal',
-    'split_this_deposit'                    => 'Split this deposit',
-    'split_this_transfer'                   => 'Split this transfer',
-    'cannot_edit_multiple_source'           => 'You cannot edit splitted transaction #:id with description ":description" because it contains multiple source accounts.',
-    'cannot_edit_multiple_dest'             => 'You cannot edit splitted transaction #:id with description ":description" because it contains multiple destination accounts.',
-    'cannot_edit_opening_balance'           => 'You cannot edit the opening balance of an account.',
-    'no_edit_multiple_left'                 => 'You have selected no valid transactions to edit.',
+    'splits'                                => '',
+    'add_another_split'                     => '',
+    'split-transactions'                    => '',
+    'do_split'                              => '',
+    'split_this_withdrawal'                 => '',
+    'split_this_deposit'                    => '',
+    'split_this_transfer'                   => '',
+    'cannot_edit_multiple_source'           => '',
+    'cannot_edit_multiple_dest'             => '',
+    'cannot_edit_opening_balance'           => '',
+    'no_edit_multiple_left'                 => '',
 
     // import bread crumbs and titles:
-    'import'                                => 'Import',
-    'import_data'                           => 'Import data',
+    'import'                                => '',
+    'import_data'                           => '',
 
     // import index page:
-    'import_index_title'                    => 'Import data into Firefly III',
-    'import_index_sub_title'                => 'Index',
-    'import_general_index_intro'            => 'Welcome to Firefly\'s import routine. There are a few ways of importing data into Firefly III, displayed here as buttons.',
-    'import_index_intro'                    => 'This routine will help you import files from your bank into Firefly III. Please check out the help pages in the top right corner.',
-    'import_index_file'                     => 'Select your file',
-    'import_index_config'                   => 'If you have previously imported data into Firefly III, you may have a configuration file, which will pre-set configuration values for you. For some banks, other users have kindly provided their <a href="https://github.com/firefly-iii/import-configurations/wiki">configuration file</a>.',
-    'import_index_type'                     => 'Select the type of file you will upload',
-    'import_index_start'                    => 'Start importing',
+    'import_index_title'                    => '',
+    'import_index_sub_title'                => '',
+    'import_general_index_intro'            => '',
+    'import_index_intro'                    => '',
+    'import_index_file'                     => '',
+    'import_index_config'                   => '',
+    'import_index_type'                     => '',
+    'import_index_start'                    => '',
 
     // supported file types:
-    'import_file_type_csv'                  => 'CSV (comma separated values)',
+    'import_file_type_csv'                  => '',
 
     // import configuration routine:
-    'import_config_sub_title'               => 'Set up your import file',
-    'import_config_bread_crumb'             => 'Set up your import file',
+    'import_config_sub_title'               => '',
+    'import_config_bread_crumb'             => '',
 
     // import status page:
-    'import_status_bread_crumb'             => 'Import status',
-    'import_status_sub_title'               => 'Import status',
-    'import_status_wait_title'              => 'Please hold...',
-    'import_status_wait_text'               => 'This box will disappear in a moment.',
-    'import_status_ready_title'             => 'Import is ready to start',
-    'import_status_ready_text'              => 'The import is ready to start. All the configuration you needed to do has been done. Please download the configuration file. It will help you with the import should it not go as planned. To actually run the import, you can either execute the following command in your console, or run the web-based import. Depending on your configuration, the console import will give you more feedback.',
-    'import_status_ready_config'            => 'Download configuration',
-    'import_status_ready_start'             => 'Start the import',
-    'import_status_ready_share'             => 'Please consider downloading your configuration and sharing it at the <strong><a href="https://github.com/firefly-iii/import-configurations/wiki">import configuration center</a></strong>. This will allow other users of Firefly III to import their files more easily.',
-    'import_status_running_title'           => 'The import is running',
-    'import_status_running_placeholder'     => 'Please hold for an update...',
-    'import_status_errors_title'            => 'Errors during the import',
-    'import_status_errors_single'           => 'An error has occured during the import. It does not appear to be fatal.',
-    'import_status_errors_multi'            => 'Some errors occured during the import. These do not appear to be fatal.',
-    'import_status_fatal_title'             => 'A fatal error occurred',
-    'import_status_fatal_text'              => 'A fatal error occurred, which the import-routine cannot recover from. Please see the explanation in red below.',
-    'import_status_fatal_more'              => 'If the error is a time-out, the import will have stopped half-way. For some server configurations, it is merely the server that stopped while the import keeps running in the background. To verify this, check out the log files. If the problem persists, consider importing over the command line instead.',
-    'import_status_finished_title'          => 'Import routine finished',
-    'import_status_finished_text'           => 'The import routine has imported your file.',
-    'import_status_finished_job'            => 'The transactions imported can be found in tag <a href=":link" class="label label-success" style="font-size:100%;font-weight:normal;">:tag</a>.',
-    'import_with_key'                       => 'Import with key \':key\'',
+    'import_status_bread_crumb'             => '',
+    'import_status_sub_title'               => '',
+    'import_status_wait_title'              => '',
+    'import_status_wait_text'               => '',
+    'import_status_ready_title'             => '',
+    'import_status_ready_text'              => '',
+    'import_status_ready_config'            => '',
+    'import_status_ready_start'             => '',
+    'import_status_ready_share'             => '',
+    'import_status_running_title'           => '',
+    'import_status_running_placeholder'     => '',
+    'import_status_errors_title'            => '',
+    'import_status_errors_single'           => '',
+    'import_status_errors_multi'            => '',
+    'import_status_fatal_title'             => '',
+    'import_status_fatal_text'              => '',
+    'import_status_fatal_more'              => '',
+    'import_status_finished_title'          => '',
+    'import_status_finished_text'           => '',
+    'import_status_finished_job'            => '',
+    'import_with_key'                       => '',
 
     // sandstorm.io errors and messages:
-    'sandstorm_not_available'               => 'This function is not available when you are using Firefly III within a Sandstorm.io environment.',
+    'sandstorm_not_available'               => '',
 
     // empty lists? no objects? instructions:
-    'no_transactions_in_period'             => 'There are no transactions in this period.',
-    'no_accounts_title_asset'               => 'Let\'s create an asset account!',
-    'no_accounts_intro_asset'               => 'You have no asset accounts yet. Asset accounts are your main accounts: your checking account, savings account, shared account or even your credit card.',
-    'no_accounts_imperative_asset'          => 'To start using Firefly III you must create at least one asset account. Let\'s do so now:',
-    'no_accounts_create_asset'              => 'Create an asset account',
-    'no_accounts_title_expense'             => 'Let\'s create an expense account!',
-    'no_accounts_intro_expense'             => 'You have no expense accounts yet. Expense accounts are the places where you spend money, such as shops and supermarkets.',
-    'no_accounts_imperative_expense'        => 'Expense accounts are created automatically when you create transactions, but you can create one manually too, if you want. Let\'s create one now:',
-    'no_accounts_create_expense'            => 'Create an expense account',
-    'no_accounts_title_revenue'             => 'Let\'s create a revenue account!',
-    'no_accounts_intro_revenue'             => 'You have no revenue accounts yet. Revenue accounts are the places where you receive money from, such as your employer.',
-    'no_accounts_imperative_revenue'        => 'Revenue accounts are created automatically when you create transactions, but you can create one manually too, if you want. Let\'s create one now:',
-    'no_accounts_create_revenue'            => 'Create a revenue account',
-    'no_budgets_title_default'              => 'Let\'s create a budget',
-    'no_budgets_intro_default'              => 'You have no budgets yet. Budgets are used to organise your expenses into logical groups, which you can give a soft-cap to limit your expenses.',
-    'no_budgets_imperative_default'         => 'Budgets are the basic tools of financial management. Let\'s create one now:',
-    'no_budgets_create_default'             => 'Create a budget',
-    'no_categories_title_default'           => 'Let\'s create a category!',
-    'no_categories_intro_default'           => 'You have no categories yet. Categories are used to fine tune your transactions and label them with their designated category.',
-    'no_categories_imperative_default'      => 'Categories are created automatically when you create transactions, but you can create one manually too. Let\'s create one now:',
-    'no_categories_create_default'          => 'Create a category',
-    'no_tags_title_default'                 => 'Let\'s create a tag!',
-    'no_tags_intro_default'                 => 'You have no tags yet. Tags are used to fine tune your transactions and label them with specific keywords.',
-    'no_tags_imperative_default'            => 'Tags are created automatically when you create transactions, but you can create one manually too. Let\'s create one now:',
-    'no_tags_create_default'                => 'Create a tag',
-    'no_transactions_title_withdrawal'      => 'Let\'s create an expense!',
-    'no_transactions_intro_withdrawal'      => 'You have no expenses yet. You should create expenses to start managing your finances.',
-    'no_transactions_imperative_withdrawal' => 'Have you spent some money? Then you should write it down:',
-    'no_transactions_create_withdrawal'     => 'Create an expense',
-    'no_transactions_title_deposit'         => 'Let\'s create some income!',
-    'no_transactions_intro_deposit'         => 'You have no recorded income yet. You should create income entries to start managing your finances.',
-    'no_transactions_imperative_deposit'    => 'Have you received some money? Then you should write it down:',
-    'no_transactions_create_deposit'        => 'Create a deposit',
-    'no_transactions_title_transfers'       => 'Let\'s create a transfer!',
-    'no_transactions_intro_transfers'       => 'You have no transfers yet. When you move money between asset accounts, it is recorded as a transfer.',
-    'no_transactions_imperative_transfers'  => 'Have you moved some money around? Then you should write it down:',
-    'no_transactions_create_transfers'      => 'Create a transfer',
-    'no_piggies_title_default'              => 'Let\'s create a piggy bank!',
-    'no_piggies_intro_default'              => 'You have no piggy banks yet. You can create piggy banks to divide your savings and keep track of what you\'re saving up for.',
-    'no_piggies_imperative_default'         => 'Do you have things you\'re saving money for? Create a piggy bank and keep track:',
-    'no_piggies_create_default'             => 'Create a new piggy bank',
-    'no_bills_title_default'                => 'Let\'s create a bill!',
-    'no_bills_intro_default'                => 'You have no bills yet. You can create bills to keep track of regular expenses, like your rent of insurance.',
-    'no_bills_imperative_default'           => 'Do you have such regular bills? Create a bill and keep track of your payments:',
-    'no_bills_create_default'               => 'Create a bill',
+    'no_transactions_in_period'             => '',
+    'no_accounts_title_asset'               => '',
+    'no_accounts_intro_asset'               => '',
+    'no_accounts_imperative_asset'          => '',
+    'no_accounts_create_asset'              => '',
+    'no_accounts_title_expense'             => '',
+    'no_accounts_intro_expense'             => '',
+    'no_accounts_imperative_expense'        => '',
+    'no_accounts_create_expense'            => '',
+    'no_accounts_title_revenue'             => '',
+    'no_accounts_intro_revenue'             => '',
+    'no_accounts_imperative_revenue'        => '',
+    'no_accounts_create_revenue'            => '',
+    'no_budgets_title_default'              => '',
+    'no_budgets_intro_default'              => '',
+    'no_budgets_imperative_default'         => '',
+    'no_budgets_create_default'             => '',
+    'no_categories_title_default'           => '',
+    'no_categories_intro_default'           => '',
+    'no_categories_imperative_default'      => '',
+    'no_categories_create_default'          => '',
+    'no_tags_title_default'                 => '',
+    'no_tags_intro_default'                 => '',
+    'no_tags_imperative_default'            => '',
+    'no_tags_create_default'                => '',
+    'no_transactions_title_withdrawal'      => '',
+    'no_transactions_intro_withdrawal'      => '',
+    'no_transactions_imperative_withdrawal' => '',
+    'no_transactions_create_withdrawal'     => '',
+    'no_transactions_title_deposit'         => '',
+    'no_transactions_intro_deposit'         => '',
+    'no_transactions_imperative_deposit'    => '',
+    'no_transactions_create_deposit'        => '',
+    'no_transactions_title_transfers'       => '',
+    'no_transactions_intro_transfers'       => '',
+    'no_transactions_imperative_transfers'  => '',
+    'no_transactions_create_transfers'      => '',
+    'no_piggies_title_default'              => '',
+    'no_piggies_intro_default'              => '',
+    'no_piggies_imperative_default'         => '',
+    'no_piggies_create_default'             => '',
+    'no_bills_title_default'                => '',
+    'no_bills_intro_default'                => '',
+    'no_bills_imperative_default'           => '',
+    'no_bills_create_default'               => '',
 
 
 ];
\ No newline at end of file

From 95bb8fa6ec2247ee9cb7effccd7331eef165e4d4 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Fri, 25 Aug 2017 07:07:57 +0200
Subject: [PATCH 288/668] New translations firefly.php (German)

---
 resources/lang/de_DE/firefly.php | 360 +++++++++++++++----------------
 1 file changed, 180 insertions(+), 180 deletions(-)

diff --git a/resources/lang/de_DE/firefly.php b/resources/lang/de_DE/firefly.php
index dd6a8153c1..d8585b6c2d 100644
--- a/resources/lang/de_DE/firefly.php
+++ b/resources/lang/de_DE/firefly.php
@@ -27,7 +27,7 @@ return [
     'to'                                         => 'Bis',
     'showEverything'                             => 'Alles anzeigen',
     'never'                                      => 'Nie',
-    'no_results_for_empty_search'                => 'Your search was empty, so nothing was found.',
+    'no_results_for_empty_search'                => '',
     'removed_amount'                             => ':amount enfernt',
     'added_amount'                               => ':amount hinzugefügt',
     'asset_account_role_help'                    => 'Alle zusätzlichen Optionen, welche aus ihren Entscheidung entstehen, können später eingestellt werden.',
@@ -72,14 +72,14 @@ return [
     'user_id_is'                                 => 'Ihre Benutzerkennung ist <strong>:user</strong>',
     'field_supports_markdown'                    => 'Diese Feld unterstützt <a href="https://en.support.wordpress.com/markdown-quick-reference/"> Abschlag </a>.',
     'need_more_help'                             => 'Wenn du hilfe beim bedienen von Firefly III brauchst, <a href="https://github.com/firefly-iii/firefly-iii/issues">erstelle ein Ticket auf Github</a>.',
-    'reenable_intro_text'                        => 'You can also reenable <a href="#" id="reenableGuidance">the introduction guidance</a>.',
-    'intro_boxes_after_refresh'                  => 'The introduction boxes will reappear when you refresh the page.',
+    'reenable_intro_text'                        => '',
+    'intro_boxes_after_refresh'                  => '',
     'show_all_no_filter'                         => 'Alle Transaktionen anzeigen, ohne diese nach Datum zu gruppieren.',
     'expenses_by_category'                       => 'Ausgaben nach Kategorie',
     'expenses_by_budget'                         => 'Ausgaben nach Budget',
     'income_by_category'                         => 'Einkommen nach Kategorie',
-    'expenses_by_asset_account'                  => 'Expenses by asset account',
-    'expenses_by_expense_account'                => 'Expenses by expense account',
+    'expenses_by_asset_account'                  => '',
+    'expenses_by_expense_account'                => '',
     'cannot_redirect_to_account'                 => 'Entschuldigung. Firefly III kann Sie nicht zur richtigen Seite weiterleiten.',
     'sum_of_expenses'                            => 'Summe von Ausgaben',
     'sum_of_income'                              => 'Summe von Einnahmen',
@@ -133,12 +133,12 @@ return [
 
     // search
     'search'                                     => 'Suche',
-    'search_found_transactions'                  => 'Number of transactions found:',
-    'general_search_error'                       => 'An error occured while searching. Please check the log files for more information.',
-    'search_box'                                 => 'Search',
-    'search_box_intro'                           => 'Welcome to the search function of Firefly III. Enter your search query in the box. Make sure you check out the help file because the search is pretty advanced.',
-    'search_error'                               => 'Error while searching',
-    'search_searching'                           => 'Searching ...',
+    'search_found_transactions'                  => '',
+    'general_search_error'                       => '',
+    'search_box'                                 => '',
+    'search_box_intro'                           => '',
+    'search_error'                               => '',
+    'search_searching'                           => '',
 
     // repeat frequencies:
     'repeat_freq_yearly'                         => 'Jährlich',
@@ -228,14 +228,14 @@ return [
     'warning_transaction_subset'                 => 'Aus Kapazitätgründen ist diese Liste auf :max_num_transactions Überweisungen limitiert und zeigt möglicherweise nur einen Teil dieser an',
     'warning_no_matching_transactions'           => 'Keine übereinstimmenden Überweisungen gefunden. Aus Kapazitätgründen werden nur die letzten :num_transactions Überweisungen überprüft.',
     'warning_no_valid_triggers'                  => 'Keine gültigen Trigger gefunden.',
-    'apply_rule_selection'                       => 'Apply rule ":title" to a selection of your transactions',
-    'apply_rule_selection_intro'                 => 'Rules like ":title" are normally only applied to new or updated transactions, but you can tell Firefly III to run it on a selection of your existing transactions. This can be useful when you have updated a rule and you need the changes to be applied to all of your other transactions.',
+    'apply_rule_selection'                       => '',
+    'apply_rule_selection_intro'                 => '',
     'include_transactions_from_accounts'         => 'Überweisungen von diesem Konto einbeziehen',
-    'applied_rule_selection'                     => 'Rule ":title" has been applied to your selection.',
+    'applied_rule_selection'                     => '',
     'execute'                                    => 'Ausführen',
-    'apply_rule_group_selection'                 => 'Apply rule group ":title" to a selection of your transactions',
-    'apply_rule_group_selection_intro'           => 'Rule groups like ":title" are normally only applied to new or updated transactions, but you can tell Firefly III to run all the rules in this group on a selection of your existing transactions. This can be useful when you have updated a group of rules and you need the changes to be applied to all of your other transactions.',
-    'applied_rule_group_selection'               => 'Rule group ":title" has been applied to your selection.',
+    'apply_rule_group_selection'                 => '',
+    'apply_rule_group_selection_intro'           => '',
+    'applied_rule_group_selection'               => '',
 
     // actions and triggers
     'rule_trigger_user_action'                   => 'Die Nutzeraktion ist ":trigger_value"',
@@ -389,16 +389,16 @@ Sollen zusätzlich Ihre Girokonten angezeigt werden?',
     'password_changed'                           => 'Passwort geändert!',
     'should_change'                              => 'Ziel ist es, ihr Passwort zu ändern.',
     'invalid_password'                           => 'Ungültiges Passwort!',
-    'what_is_pw_security'                        => 'What is "verify password security"?',
-    'secure_pw_title'                            => 'How to choose a secure password',
-    'secure_pw_history'                          => 'In August 2017 well known security researcher Troy Hunt released a list of 306 million stolen passwords. These passwords were stolen during breakins at companies like LinkedIn, Adobe and NeoPets (and many more).',
-    'secure_pw_check_box'                        => 'By checking the box, Firefly III will send the SHA1 hash of your password to <a href="https://www.troyhunt.com/introducing-306-million-freely-downloadable-pwned-passwords/">the website of Troy Hunt</a> to see if it is on the list. This will stop you from using unsafe passwords as is recommended in the latest <a href="https://pages.nist.gov/800-63-3/sp800-63b.html">NIST Special Publication</a> on this subject.',
-    'secure_pw_sha1'                             => 'But I thought SHA1 was broken?',
-    'secure_pw_hash_speed'                       => 'Yes, but not in this context. As you can read on <a href="https://shattered.io/">the website detailing how they broke SHA1</a>, it is now slightly easier to find a "collision": another string that results in the same SHA1-hash. It now only takes 10,000 years using a single-GPU machine.',
-    'secure_pw_hash_security'                    => 'This collision would not be equal to your password, nor would it be useful on (a site like) Firefly III. This application does not use SHA1 for password verification. So it is safe to check this box. Your password is hashed and sent over HTTPS.',
-    'secure_pw_should'                           => 'Should I check the box?',
-    'secure_pw_long_password'                    => 'If you just generated a long, single-use password for Firefly III using some kind of password generator: <strong>no</strong>.',
-    'secure_pw_short'                            => 'If you just entered the password you always use: <em>Please yes</em>.',
+    'what_is_pw_security'                        => '',
+    'secure_pw_title'                            => '',
+    'secure_pw_history'                          => '',
+    'secure_pw_check_box'                        => '',
+    'secure_pw_sha1'                             => '',
+    'secure_pw_hash_speed'                       => '',
+    'secure_pw_hash_security'                    => '',
+    'secure_pw_should'                           => '',
+    'secure_pw_long_password'                    => '',
+    'secure_pw_short'                            => '',
 
 
     // attachments
@@ -501,7 +501,7 @@ Sollen zusätzlich Ihre Girokonten angezeigt werden?',
     'update_amount'                              => 'Betrag aktualisieren',
     'update_budget'                              => 'Budget aktualisieren',
     'update_budget_amount_range'                 => 'Aktualisiere (erwarteten) verfügbaren Betrag zwischen :start und :end',
-    'budget_period_navigator'                    => 'Period navigator',
+    'budget_period_navigator'                    => '',
 
     // bills:
     'matching_on'                                => 'Reagiert auf',
@@ -526,8 +526,8 @@ Sollen zusätzlich Ihre Girokonten angezeigt werden?',
     'average_bill_amount_overall'                => 'Durchschnittliche Rechnungssumme (gesamt)',
     'not_or_not_yet'                             => '(noch) nicht',
     'not_expected_period'                        => 'Diesen Zeitraum nicht erwartet',
-    'bill_is_active'                             => 'Bill is active',
-    'bill_will_automatch'                        => 'Bill will automatically linked to matching transactions',
+    'bill_is_active'                             => '',
+    'bill_will_automatch'                        => '',
     // accounts:
     'details_for_asset'                          => 'Details für Girokonto ":name"',
     'details_for_expense'                        => 'Details für Debitor ":name"',
@@ -605,7 +605,7 @@ Sollen zusätzlich Ihre Girokonten angezeigt werden?',
     'delete_selected'                            => 'Auswahl löschen',
     'mass_delete_journals'                       => 'Löschen Sie eine Reihe von Überweisungen',
     'mass_edit_journals'                         => 'Bearbeiten Sie eine Reihe von Überweisungen',
-    'cannot_edit_other_fields'                   => 'You cannot mass-edit other fields than the ones here, because there is no room to show them. Please follow the link and edit them by one-by-one, if you need to edit these fields.',
+    'cannot_edit_other_fields'                   => '',
     'perm-delete-many'                           => 'Das Löschen von mehreren Elementen auf einmal kann sich störend auswirken. Bitte seien Sie vorsichtig.',
     'mass_deleted_transactions_success'          => ':amount Überweisung(en) gelöscht.',
     'mass_edited_transactions_success'           => ':amount Überweisung(en) aktualisiert',
@@ -615,9 +615,9 @@ Sollen zusätzlich Ihre Girokonten angezeigt werden?',
     'welcome'                                    => 'Willkommen bei Firefly!',
     'submit'                                     => 'Bestätigen',
     'getting_started'                            => 'Erste Schritte',
-    'to_get_started'                             => 'It is good to see you have successfully installed Firefly III. To get started with this tool please enter your bank\'s name and the balance of your main checking account. Do not worry yet if you have multiple accounts. You can add those later. It\'s just that Firefly III needs something to start with.',
-    'savings_balance_text'                       => 'Firefly III will automatically create a savings account for you. By default, there will be no money in your savings account, but if you tell Firefly III the balance it will be stored as such.',
-    'finish_up_new_user'                         => 'That\'s it! You can continue by pressing <strong>Submit</strong>. You will be taken to the index of Firefly III.',
+    'to_get_started'                             => '',
+    'savings_balance_text'                       => '',
+    'finish_up_new_user'                         => '',
     'stored_new_accounts_new_user'               => 'Yay! Ihre neuen Konten wurden gespeichert.',
 
     // home page:
@@ -675,11 +675,11 @@ Sollen zusätzlich Ihre Girokonten angezeigt werden?',
     'errors'                                     => 'Fehler',
 
     // reports:
-    'report_default'                             => 'Default financial report between :start and :end',
-    'report_audit'                               => 'Transaction history overview between :start and :end',
-    'report_category'                            => 'Category report between :start and :end',
-    'report_budget'                              => 'Budget report between :start and :end',
-    'report_tag'                                 => 'Tag report between :start and :end',
+    'report_default'                             => '',
+    'report_audit'                               => '',
+    'report_category'                            => '',
+    'report_budget'                              => '',
+    'report_tag'                                 => '',
     'quick_link_reports'                         => 'Schnellzugriff',
     'quick_link_default_report'                  => 'Standard Finanzbericht',
     'quick_link_audit_report'                    => 'Transaktionshistorie',
@@ -694,7 +694,7 @@ Sollen zusätzlich Ihre Girokonten angezeigt werden?',
     'balanceEnd'                                 => 'Bilanz zum Ende der Periode',
     'splitByAccount'                             => 'Nach Konto aufteilen',
     'coveredWithTags'                            => 'Abgedeckt durch Tags',
-    'leftUnbalanced'                             => 'Left unbalanced',
+    'leftUnbalanced'                             => '',
     'leftInBudget'                               => 'Übrig im Budget',
     'sumOfSums'                                  => 'Summe der Summen',
     'noCategory'                                 => '(keine Kategorie)',
@@ -712,41 +712,41 @@ Sollen zusätzlich Ihre Girokonten angezeigt werden?',
     'report_type_audit'                          => 'Übersicht der Transaktionen (Prüfung)',
     'report_type_category'                       => 'Kategorie-Bericht',
     'report_type_budget'                         => 'Budgetbericht',
-    'report_type_tag'                            => 'Tag report',
+    'report_type_tag'                            => '',
     'more_info_help'                             => 'Weitere Informationen über diese Art von Berichten finden Sie in der Hilfe. Drücken Sie hierfür das (?)-Symbol in der oberen rechten Ecke.',
     'report_included_accounts'                   => 'Eingezogene Konten',
     'report_date_range'                          => 'Zeitraum',
     'report_preset_ranges'                       => 'Voreingestellte Bereiche',
     'shared'                                     => 'Geteilt',
     'fiscal_year'                                => 'Geschäftsjahr',
-    'income_entry'                               => 'Income from account ":name" between :start and :end',
-    'expense_entry'                              => 'Expenses to account ":name" between :start and :end',
-    'category_entry'                             => 'Expenses in category ":name" between :start and :end',
-    'budget_spent_amount'                        => 'Expenses in budget ":budget" between :start and :end',
-    'balance_amount'                             => 'Expenses in budget ":budget" paid from account ":account" between :start and :end',
-    'no_audit_activity'                          => 'No activity was recorded on account <a href=":url" title=":account_name">:account_name</a> between :start and :end.',
+    'income_entry'                               => '',
+    'expense_entry'                              => '',
+    'category_entry'                             => '',
+    'budget_spent_amount'                        => '',
+    'balance_amount'                             => '',
+    'no_audit_activity'                          => '',
     'audit_end_balance'                          => 'Kontostand von <a href=":url" title=":account_name">:account_name</a> Ende war: :balance',
     'reports_extra_options'                      => 'Zusatzoptionen',
     'report_has_no_extra_options'                => 'Dieser Bericht hat keine zusätzliche Optionen',
     'reports_submit'                             => 'Zeige Bericht',
     'end_after_start_date'                       => 'Enddatum des Berichts muss nach dem Startdatum liegen.',
-    'select_category'                            => 'Select category(ies)',
-    'select_budget'                              => 'Select budget(s).',
-    'select_tag'                                 => 'Select tag(s).',
+    'select_category'                            => '',
+    'select_budget'                              => '',
+    'select_tag'                                 => '',
     'income_per_category'                        => 'Einnahmen pro Kategorie',
     'expense_per_category'                       => 'Ausgaben pro Kategorie',
     'expense_per_budget'                         => 'Ausgaben pro Budget',
     'income_per_account'                         => 'Einnahmen pro Konto',
     'expense_per_account'                        => 'Ausgaben pro Konto',
-    'expense_per_tag'                            => 'Expense per tag',
-    'income_per_tag'                             => 'Income per tag',
-    'include_expense_not_in_budget'              => 'Included expenses not in the selected budget(s)',
-    'include_expense_not_in_account'             => 'Included expenses not in the selected account(s)',
-    'include_expense_not_in_category'            => 'Included expenses not in the selected category(ies)',
-    'include_income_not_in_category'             => 'Included income not in the selected category(ies)',
-    'include_income_not_in_account'              => 'Included income not in the selected account(s)',
-    'include_income_not_in_tags'                 => 'Included income not in the selected tag(s)',
-    'include_expense_not_in_tags'                => 'Included expenses not in the selected tag(s)',
+    'expense_per_tag'                            => '',
+    'income_per_tag'                             => '',
+    'include_expense_not_in_budget'              => '',
+    'include_expense_not_in_account'             => '',
+    'include_expense_not_in_category'            => '',
+    'include_income_not_in_category'             => '',
+    'include_income_not_in_account'              => '',
+    'include_income_not_in_tags'                 => '',
+    'include_expense_not_in_tags'                => '',
     'everything_else'                            => 'Der Rest',
     'income_and_expenses'                        => 'Einkommen und Ausgaben',
     'spent_average'                              => 'Ausgaben (Durchschnitt)',
@@ -758,9 +758,9 @@ Sollen zusätzlich Ihre Girokonten angezeigt werden?',
     'description'                                => 'Beschreibung',
     'sum_of_period'                              => 'Summe des Zeitraums',
     'average_in_period'                          => 'Durchschnitt im Zeitraum',
-    'account_role_defaultAsset'                  => 'Default asset account',
-    'account_role_sharedAsset'                   => 'Shared asset account',
-    'account_role_savingAsset'                   => 'Savings account',
+    'account_role_defaultAsset'                  => '',
+    'account_role_sharedAsset'                   => '',
+    'account_role_savingAsset'                   => '',
     'account_role_ccAsset'                       => 'Kreditkarte',
 
     // charts:
@@ -800,7 +800,7 @@ Sollen zusätzlich Ihre Girokonten angezeigt werden?',
     'sum_of_piggy_banks'                         => 'Summe der Sparschweine',
     'saved_so_far'                               => 'Gespart',
     'left_to_save'                               => 'Zu Sparen',
-    'suggested_amount'                           => 'Suggested monthly amount to save',
+    'suggested_amount'                           => '',
     'add_money_to_piggy_title'                   => 'Geld dem Sparschwein ":name" hinzufügen',
     'remove_money_from_piggy_title'              => 'Geld dem Sparschwein ":name" entnehmen',
     'add'                                        => 'Hinzufügen',
@@ -820,15 +820,15 @@ Sollen zusätzlich Ihre Girokonten angezeigt werden?',
     'table'                      => 'Tabelle',
     'delete_piggy_bank'          => 'Sparschwein ":name" löschen',
     'cannot_add_amount_piggy'    => ':amount konnte nicht zu ":name" hinzugefügt werden.',
-    'cannot_remove_from_piggy'   => 'Could not remove :amount from ":name".',
+    'cannot_remove_from_piggy'   => '',
     'deleted_piggy_bank'         => 'Sparschwein ":name" gelöscht',
     'added_amount_to_piggy'      => ':amount zu ":name" hinzugefügt',
     'removed_amount_from_piggy'  => ':amount von ":name" entfernt',
 
     // tags
     'regular_tag'                => 'Nur ein normaler Tag.',
-    'balancing_act'              => 'The tag takes at most two transactions; an expense and a transfer. They\'ll balance each other out.',
-    'advance_payment'            => 'The tag accepts one expense and any number of deposits aimed to repay the original expense.',
+    'balancing_act'              => '',
+    'advance_payment'            => '',
     'delete_tag'                 => 'Tag ":tag" entfernen',
     'deleted_tag'                => 'Tag ":tag" entfernt',
     'new_tag'                    => 'Neuen Tag erstellen',
@@ -864,42 +864,42 @@ Sollen zusätzlich Ihre Girokonten angezeigt werden?',
     'configuration_updated'                 => 'Die Konfiguration wurde aktualisiert',
     'setting_is_demo_site'                  => 'Demonstrationsseite',
     'setting_is_demo_site_explain'          => 'Wenn sie diese Option auswählen, wird sich diese Installation wie eine Demonstrationsseite verhalten, was ungwollte Auswirkungen haben kann.',
-    'block_code_bounced'                    => 'Email message(s) bounced',
+    'block_code_bounced'                    => '',
     'block_code_expired'                    => 'Demo-Konto abgelaufen',
     'no_block_code'                         => 'Kein Grund für Block oder Benutzer nicht blockiert',
     // links
-    'journal_link_configuration'            => 'Transaction links configuration',
-    'create_new_link_type'                  => 'Create new link type',
-    'store_new_link_type'                   => 'Store new link type',
-    'update_link_type'                      => 'Update link type',
-    'edit_link_type'                        => 'Edit link type ":name"',
-    'updated_link_type'                     => 'Updated link type ":name"',
-    'delete_link_type'                      => 'Delete link type ":name"',
-    'deleted_link_type'                     => 'Deleted link type ":name"',
-    'stored_new_link_type'                  => 'Store new link type ":name"',
-    'cannot_edit_link_type'                 => 'Cannot edit link type ":name"',
-    'link_type_help_name'                   => 'Ie. "Duplicates"',
-    'link_type_help_inward'                 => 'Ie. "duplicates"',
-    'link_type_help_outward'                => 'Ie. "is duplicated by"',
-    'save_connections_by_moving'            => 'Save the link between these transaction(s) by moving them to another link type:',
-    'do_not_save_connection'                => '(do not save connection)',
-    'link_transaction'                      => 'Link transaction',
-    'link_to_other_transaction'             => 'Link this transaction to another transaction',
-    'select_transaction_to_link'            => 'Select a transaction to link this transaction to',
-    'this_transaction'                      => 'This transaction',
-    'transaction'                           => 'Transaction',
-    'comments'                              => 'Comments',
-    'to_link_not_found'                     => 'If the transaction you want to link to is not listed, simply enter its ID.',
-    'invalid_link_data'                     => 'Invalid link type selected. Cannot link transaction.',
-    'journals_linked'                       => 'Transactions are linked.',
-    'journals_error_linked'                 => 'These transactions are already linked.',
-    'journal_links'                         => 'Transaction links',
-    'this_withdrawal'                       => 'This withdrawal',
-    'this_deposit'                          => 'This deposit',
-    'this_transfer'                         => 'This transfer',
-    'overview_for_link'                     => 'Overview for link type ":name"',
-    'delete_journal_link'                   => 'Delete the link between <a href=":source_link">:source</a> and <a href=":destination_link">:destination</a>',
-    'deleted_link'                          => 'Deleted link',
+    'journal_link_configuration'            => '',
+    'create_new_link_type'                  => '',
+    'store_new_link_type'                   => '',
+    'update_link_type'                      => '',
+    'edit_link_type'                        => '',
+    'updated_link_type'                     => '',
+    'delete_link_type'                      => '',
+    'deleted_link_type'                     => '',
+    'stored_new_link_type'                  => '',
+    'cannot_edit_link_type'                 => '',
+    'link_type_help_name'                   => '',
+    'link_type_help_inward'                 => '',
+    'link_type_help_outward'                => '',
+    'save_connections_by_moving'            => '',
+    'do_not_save_connection'                => '',
+    'link_transaction'                      => '',
+    'link_to_other_transaction'             => '',
+    'select_transaction_to_link'            => '',
+    'this_transaction'                      => '',
+    'transaction'                           => '',
+    'comments'                              => '',
+    'to_link_not_found'                     => '',
+    'invalid_link_data'                     => '',
+    'journals_linked'                       => '',
+    'journals_error_linked'                 => '',
+    'journal_links'                         => '',
+    'this_withdrawal'                       => '',
+    'this_deposit'                          => '',
+    'this_transfer'                         => '',
+    'overview_for_link'                     => '',
+    'delete_journal_link'                   => '',
+    'deleted_link'                          => '',
 
 
     // split a transaction:
@@ -910,104 +910,104 @@ Sollen zusätzlich Ihre Girokonten angezeigt werden?',
     'split_this_withdrawal'                 => 'Diese Ausgabe aufteilen',
     'split_this_deposit'                    => 'Diese Einnahme aufteilen',
     'split_this_transfer'                   => 'Diese Überweisung aufteilen',
-    'cannot_edit_multiple_source'           => 'You cannot edit splitted transaction #:id with description ":description" because it contains multiple source accounts.',
-    'cannot_edit_multiple_dest'             => 'You cannot edit splitted transaction #:id with description ":description" because it contains multiple destination accounts.',
-    'cannot_edit_opening_balance'           => 'You cannot edit the opening balance of an account.',
-    'no_edit_multiple_left'                 => 'You have selected no valid transactions to edit.',
+    'cannot_edit_multiple_source'           => '',
+    'cannot_edit_multiple_dest'             => '',
+    'cannot_edit_opening_balance'           => '',
+    'no_edit_multiple_left'                 => '',
 
     // import bread crumbs and titles:
     'import'                                => 'Import',
     'import_data'                           => 'Daten importieren',
 
     // import index page:
-    'import_index_title'                    => 'Import data into Firefly III',
-    'import_index_sub_title'                => 'Index',
-    'import_general_index_intro'            => 'Welcome to Firefly\'s import routine. There are a few ways of importing data into Firefly III, displayed here as buttons.',
-    'import_index_intro'                    => 'This routine will help you import files from your bank into Firefly III. Please check out the help pages in the top right corner.',
-    'import_index_file'                     => 'Select your file',
-    'import_index_config'                   => 'If you have previously imported data into Firefly III, you may have a configuration file, which will pre-set configuration values for you. For some banks, other users have kindly provided their <a href="https://github.com/firefly-iii/import-configurations/wiki">configuration file</a>.',
-    'import_index_type'                     => 'Select the type of file you will upload',
-    'import_index_start'                    => 'Start importing',
+    'import_index_title'                    => '',
+    'import_index_sub_title'                => '',
+    'import_general_index_intro'            => '',
+    'import_index_intro'                    => '',
+    'import_index_file'                     => '',
+    'import_index_config'                   => '',
+    'import_index_type'                     => '',
+    'import_index_start'                    => '',
 
     // supported file types:
     'import_file_type_csv'                  => 'CSV (Kommagetrennte Werte)',
 
     // import configuration routine:
-    'import_config_sub_title'               => 'Set up your import file',
-    'import_config_bread_crumb'             => 'Set up your import file',
+    'import_config_sub_title'               => '',
+    'import_config_bread_crumb'             => '',
 
     // import status page:
-    'import_status_bread_crumb'             => 'Import status',
-    'import_status_sub_title'               => 'Import status',
-    'import_status_wait_title'              => 'Please hold...',
-    'import_status_wait_text'               => 'This box will disappear in a moment.',
-    'import_status_ready_title'             => 'Import is ready to start',
-    'import_status_ready_text'              => 'The import is ready to start. All the configuration you needed to do has been done. Please download the configuration file. It will help you with the import should it not go as planned. To actually run the import, you can either execute the following command in your console, or run the web-based import. Depending on your configuration, the console import will give you more feedback.',
-    'import_status_ready_config'            => 'Download configuration',
-    'import_status_ready_start'             => 'Start the import',
-    'import_status_ready_share'             => 'Please consider downloading your configuration and sharing it at the <strong><a href="https://github.com/firefly-iii/import-configurations/wiki">import configuration center</a></strong>. This will allow other users of Firefly III to import their files more easily.',
-    'import_status_running_title'           => 'The import is running',
-    'import_status_running_placeholder'     => 'Please hold for an update...',
-    'import_status_errors_title'            => 'Errors during the import',
-    'import_status_errors_single'           => 'An error has occured during the import. It does not appear to be fatal.',
-    'import_status_errors_multi'            => 'Some errors occured during the import. These do not appear to be fatal.',
-    'import_status_fatal_title'             => 'A fatal error occurred',
-    'import_status_fatal_text'              => 'A fatal error occurred, which the import-routine cannot recover from. Please see the explanation in red below.',
-    'import_status_fatal_more'              => 'If the error is a time-out, the import will have stopped half-way. For some server configurations, it is merely the server that stopped while the import keeps running in the background. To verify this, check out the log files. If the problem persists, consider importing over the command line instead.',
-    'import_status_finished_title'          => 'Import routine finished',
-    'import_status_finished_text'           => 'The import routine has imported your file.',
-    'import_status_finished_job'            => 'The transactions imported can be found in tag <a href=":link" class="label label-success" style="font-size:100%;font-weight:normal;">:tag</a>.',
-    'import_with_key'                       => 'Import with key \':key\'',
+    'import_status_bread_crumb'             => '',
+    'import_status_sub_title'               => '',
+    'import_status_wait_title'              => '',
+    'import_status_wait_text'               => '',
+    'import_status_ready_title'             => '',
+    'import_status_ready_text'              => '',
+    'import_status_ready_config'            => '',
+    'import_status_ready_start'             => '',
+    'import_status_ready_share'             => '',
+    'import_status_running_title'           => '',
+    'import_status_running_placeholder'     => '',
+    'import_status_errors_title'            => '',
+    'import_status_errors_single'           => '',
+    'import_status_errors_multi'            => '',
+    'import_status_fatal_title'             => '',
+    'import_status_fatal_text'              => '',
+    'import_status_fatal_more'              => '',
+    'import_status_finished_title'          => '',
+    'import_status_finished_text'           => '',
+    'import_status_finished_job'            => '',
+    'import_with_key'                       => '',
 
     // sandstorm.io errors and messages:
-    'sandstorm_not_available'               => 'This function is not available when you are using Firefly III within a Sandstorm.io environment.',
+    'sandstorm_not_available'               => '',
 
     // empty lists? no objects? instructions:
-    'no_transactions_in_period'             => 'There are no transactions in this period.',
-    'no_accounts_title_asset'               => 'Let\'s create an asset account!',
-    'no_accounts_intro_asset'               => 'You have no asset accounts yet. Asset accounts are your main accounts: your checking account, savings account, shared account or even your credit card.',
-    'no_accounts_imperative_asset'          => 'To start using Firefly III you must create at least one asset account. Let\'s do so now:',
-    'no_accounts_create_asset'              => 'Create an asset account',
-    'no_accounts_title_expense'             => 'Let\'s create an expense account!',
-    'no_accounts_intro_expense'             => 'You have no expense accounts yet. Expense accounts are the places where you spend money, such as shops and supermarkets.',
-    'no_accounts_imperative_expense'        => 'Expense accounts are created automatically when you create transactions, but you can create one manually too, if you want. Let\'s create one now:',
-    'no_accounts_create_expense'            => 'Create an expense account',
-    'no_accounts_title_revenue'             => 'Let\'s create a revenue account!',
-    'no_accounts_intro_revenue'             => 'You have no revenue accounts yet. Revenue accounts are the places where you receive money from, such as your employer.',
-    'no_accounts_imperative_revenue'        => 'Revenue accounts are created automatically when you create transactions, but you can create one manually too, if you want. Let\'s create one now:',
-    'no_accounts_create_revenue'            => 'Create a revenue account',
-    'no_budgets_title_default'              => 'Let\'s create a budget',
-    'no_budgets_intro_default'              => 'You have no budgets yet. Budgets are used to organise your expenses into logical groups, which you can give a soft-cap to limit your expenses.',
-    'no_budgets_imperative_default'         => 'Budgets are the basic tools of financial management. Let\'s create one now:',
-    'no_budgets_create_default'             => 'Create a budget',
-    'no_categories_title_default'           => 'Let\'s create a category!',
-    'no_categories_intro_default'           => 'You have no categories yet. Categories are used to fine tune your transactions and label them with their designated category.',
-    'no_categories_imperative_default'      => 'Categories are created automatically when you create transactions, but you can create one manually too. Let\'s create one now:',
-    'no_categories_create_default'          => 'Create a category',
-    'no_tags_title_default'                 => 'Let\'s create a tag!',
-    'no_tags_intro_default'                 => 'You have no tags yet. Tags are used to fine tune your transactions and label them with specific keywords.',
-    'no_tags_imperative_default'            => 'Tags are created automatically when you create transactions, but you can create one manually too. Let\'s create one now:',
-    'no_tags_create_default'                => 'Create a tag',
-    'no_transactions_title_withdrawal'      => 'Let\'s create an expense!',
-    'no_transactions_intro_withdrawal'      => 'You have no expenses yet. You should create expenses to start managing your finances.',
-    'no_transactions_imperative_withdrawal' => 'Have you spent some money? Then you should write it down:',
-    'no_transactions_create_withdrawal'     => 'Create an expense',
-    'no_transactions_title_deposit'         => 'Let\'s create some income!',
-    'no_transactions_intro_deposit'         => 'You have no recorded income yet. You should create income entries to start managing your finances.',
-    'no_transactions_imperative_deposit'    => 'Have you received some money? Then you should write it down:',
-    'no_transactions_create_deposit'        => 'Create a deposit',
-    'no_transactions_title_transfers'       => 'Let\'s create a transfer!',
-    'no_transactions_intro_transfers'       => 'You have no transfers yet. When you move money between asset accounts, it is recorded as a transfer.',
-    'no_transactions_imperative_transfers'  => 'Have you moved some money around? Then you should write it down:',
-    'no_transactions_create_transfers'      => 'Create a transfer',
-    'no_piggies_title_default'              => 'Let\'s create a piggy bank!',
-    'no_piggies_intro_default'              => 'You have no piggy banks yet. You can create piggy banks to divide your savings and keep track of what you\'re saving up for.',
-    'no_piggies_imperative_default'         => 'Do you have things you\'re saving money for? Create a piggy bank and keep track:',
-    'no_piggies_create_default'             => 'Create a new piggy bank',
-    'no_bills_title_default'                => 'Let\'s create a bill!',
-    'no_bills_intro_default'                => 'You have no bills yet. You can create bills to keep track of regular expenses, like your rent of insurance.',
-    'no_bills_imperative_default'           => 'Do you have such regular bills? Create a bill and keep track of your payments:',
-    'no_bills_create_default'               => 'Create a bill',
+    'no_transactions_in_period'             => '',
+    'no_accounts_title_asset'               => '',
+    'no_accounts_intro_asset'               => '',
+    'no_accounts_imperative_asset'          => '',
+    'no_accounts_create_asset'              => '',
+    'no_accounts_title_expense'             => '',
+    'no_accounts_intro_expense'             => '',
+    'no_accounts_imperative_expense'        => '',
+    'no_accounts_create_expense'            => '',
+    'no_accounts_title_revenue'             => '',
+    'no_accounts_intro_revenue'             => '',
+    'no_accounts_imperative_revenue'        => '',
+    'no_accounts_create_revenue'            => '',
+    'no_budgets_title_default'              => '',
+    'no_budgets_intro_default'              => '',
+    'no_budgets_imperative_default'         => '',
+    'no_budgets_create_default'             => '',
+    'no_categories_title_default'           => '',
+    'no_categories_intro_default'           => '',
+    'no_categories_imperative_default'      => '',
+    'no_categories_create_default'          => '',
+    'no_tags_title_default'                 => '',
+    'no_tags_intro_default'                 => '',
+    'no_tags_imperative_default'            => '',
+    'no_tags_create_default'                => '',
+    'no_transactions_title_withdrawal'      => '',
+    'no_transactions_intro_withdrawal'      => '',
+    'no_transactions_imperative_withdrawal' => '',
+    'no_transactions_create_withdrawal'     => '',
+    'no_transactions_title_deposit'         => '',
+    'no_transactions_intro_deposit'         => '',
+    'no_transactions_imperative_deposit'    => '',
+    'no_transactions_create_deposit'        => '',
+    'no_transactions_title_transfers'       => '',
+    'no_transactions_intro_transfers'       => '',
+    'no_transactions_imperative_transfers'  => '',
+    'no_transactions_create_transfers'      => '',
+    'no_piggies_title_default'              => '',
+    'no_piggies_intro_default'              => '',
+    'no_piggies_imperative_default'         => '',
+    'no_piggies_create_default'             => '',
+    'no_bills_title_default'                => '',
+    'no_bills_intro_default'                => '',
+    'no_bills_imperative_default'           => '',
+    'no_bills_create_default'               => '',
 
 
 ];
\ No newline at end of file

From 6c095d8efaf33d11f2ec93ee3ba32bd1c4915f5e Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Fri, 25 Aug 2017 07:08:00 +0200
Subject: [PATCH 289/668] New translations firefly.php (Chinese Traditional)

---
 resources/lang/zh_TW/firefly.php | 1482 +++++++++++++++---------------
 1 file changed, 741 insertions(+), 741 deletions(-)

diff --git a/resources/lang/zh_TW/firefly.php b/resources/lang/zh_TW/firefly.php
index 3ea696070e..3fce1988f2 100644
--- a/resources/lang/zh_TW/firefly.php
+++ b/resources/lang/zh_TW/firefly.php
@@ -21,13 +21,13 @@ return [
     'everything'                                 => '顯示所有',
     'customRange'                                => '自訂範圍',
     'apply'                                      => '套用',
-    'select_date'                                => 'Select date..',
+    'select_date'                                => '',
     'cancel'                                     => '取消',
     'from'                                       => '從',
     'to'                                         => '到',
     'showEverything'                             => '全部顯示',
     'never'                                      => '從來沒有',
-    'no_results_for_empty_search'                => 'Your search was empty, so nothing was found.',
+    'no_results_for_empty_search'                => '',
     'removed_amount'                             => '移除了 :amount',
     'added_amount'                               => '添加了 :amount',
     'asset_account_role_help'                    => '你可以稍後再設置其他選項。',
@@ -63,85 +63,85 @@ return [
     'two_factor_lost_fix_owner'                  => '否則，請電郵網站擁有者，<a href="mailto::site_owner">:site_owner</a> 並要求他們重置你的雙重身份驗證。',
     'warning_much_data'                          => ':days 天的資料需要一點時間載入。',
     'registered'                                 => '您已成功註冊 ！',
-    'Default asset account'                      => 'Default asset account',
+    'Default asset account'                      => '',
     'no_budget_pointer'                          => '你還沒有預算。你可以在<a href="/budgets">預算</a>頁來建立預算。預算可以幫助你跟蹤支出情況。',
-    'Savings account'                            => 'Savings account',
-    'Credit card'                                => 'Credit card',
+    'Savings account'                            => '',
+    'Credit card'                                => '',
     'source_accounts'                            => '來源帳戶',
     'destination_accounts'                       => '目標帳戶',
-    'user_id_is'                                 => 'Your user id is <strong>:user</strong>',
-    'field_supports_markdown'                    => 'This field supports <a href="https://en.support.wordpress.com/markdown-quick-reference/">Markdown</a>.',
-    'need_more_help'                             => 'If you need more help using Firefly III, please <a href="https://github.com/firefly-iii/firefly-iii/issues">open a ticket on Github</a>.',
-    'reenable_intro_text'                        => 'You can also reenable <a href="#" id="reenableGuidance">the introduction guidance</a>.',
-    'intro_boxes_after_refresh'                  => 'The introduction boxes will reappear when you refresh the page.',
-    'show_all_no_filter'                         => 'Show all transactions without grouping them by date.',
-    'expenses_by_category'                       => 'Expenses by category',
-    'expenses_by_budget'                         => 'Expenses by budget',
-    'income_by_category'                         => 'Income by category',
-    'expenses_by_asset_account'                  => 'Expenses by asset account',
-    'expenses_by_expense_account'                => 'Expenses by expense account',
-    'cannot_redirect_to_account'                 => 'Firefly III cannot redirect you to the correct page. Apologies.',
-    'sum_of_expenses'                            => 'Sum of expenses',
-    'sum_of_income'                              => 'Sum of income',
-    'total_sum'                                  => 'Total sum',
-    'spent_in_specific_budget'                   => 'Spent in budget ":budget"',
-    'sum_of_expenses_in_budget'                  => 'Spent total in budget ":budget"',
-    'left_in_budget_limit'                       => 'Left to spend according to budgeting',
-    'cannot_reset_demo_user'                     => 'You cannot reset the password of the demonstration account',
-    'current_period'                             => 'Current period',
-    'show_the_current_period_and_overview'       => 'Show the current period and overview',
-    'pref_languages_locale'                      => 'For a language other than English to work properly, your operating system must be equipped with the correct locale-information. If these are not present, currency data, dates and amounts may be formatted wrong.',
-    'budget_in_period'                           => 'All transactions for budget ":name" between :start and :end',
-    'chart_budget_in_period'                     => 'Chart for all transactions for budget ":name" between :start and :end',
-    'chart_account_in_period'                    => 'Chart for all transactions for account ":name" between :start and :end',
-    'chart_category_in_period'                   => 'Chart for all transactions for category ":name" between :start and :end',
-    'chart_category_all'                         => 'Chart for all transactions for category ":name"',
-    'clone_withdrawal'                           => 'Clone this withdrawal',
-    'clone_deposit'                              => 'Clone this deposit',
-    'clone_transfer'                             => 'Clone this transfer',
-    'multi_select_no_selection'                  => 'None selected',
-    'multi_select_all_selected'                  => 'All selected',
-    'multi_select_filter_placeholder'            => 'Find..',
-    'between_dates_breadcrumb'                   => 'Between :start and :end',
-    'all_journals_without_budget'                => 'All transactions without a budget',
-    'journals_without_budget'                    => 'Transactions without a budget',
-    'all_journals_without_category'              => 'All transactions without a category',
-    'journals_without_category'                  => 'Transactions without a category',
-    'all_journals_for_account'                   => 'All transactions for account :name',
-    'chart_all_journals_for_account'             => 'Chart of all transactions for account :name',
-    'journals_in_period_for_account'             => 'All transactions for account :name between :start and :end',
-    'transferred'                                => 'Transferred',
-    'all_withdrawal'                             => 'All expenses',
-    'all_transactions'                           => 'All transactions',
-    'title_withdrawal_between'                   => 'All expenses between :start and :end',
-    'all_deposit'                                => 'All revenue',
-    'title_deposit_between'                      => 'All revenue between :start and :end',
-    'all_transfers'                              => 'All transfers',
-    'title_transfers_between'                    => 'All transfers between :start and :end',
-    'all_transfer'                               => 'All transfers',
-    'all_journals_for_tag'                       => 'All transactions for tag ":tag"',
-    'title_transfer_between'                     => 'All transfers between :start and :end',
-    'all_journals_for_category'                  => 'All transactions for category :name',
-    'all_journals_for_budget'                    => 'All transactions for budget :name',
-    'chart_all_journals_for_budget'              => 'Chart of all transactions for budget :name',
-    'journals_in_period_for_category'            => 'All transactions for category :name between :start and :end',
-    'journals_in_period_for_tag'                 => 'All transactions for tag :tag between :start and :end',
-    'not_available_demo_user'                    => 'The feature you try to access is not available to demo users.',
-    'exchange_rate_instructions'                 => 'Asset account "@name" only accepts transactions in @native_currency. If you wish to use @foreign_currency instead, make sure that the amount in @native_currency is known as well:',
-    'transfer_exchange_rate_instructions'        => 'Source asset account "@source_name" only accepts transactions in @source_currency. Destination asset account "@dest_name" only accepts transactions in @dest_currency. You must provide the transferred amount correctly in both currencies.',
-    'transaction_data'                           => 'Transaction data',
+    'user_id_is'                                 => '',
+    'field_supports_markdown'                    => '',
+    'need_more_help'                             => '',
+    'reenable_intro_text'                        => '',
+    'intro_boxes_after_refresh'                  => '',
+    'show_all_no_filter'                         => '',
+    'expenses_by_category'                       => '',
+    'expenses_by_budget'                         => '',
+    'income_by_category'                         => '',
+    'expenses_by_asset_account'                  => '',
+    'expenses_by_expense_account'                => '',
+    'cannot_redirect_to_account'                 => '',
+    'sum_of_expenses'                            => '',
+    'sum_of_income'                              => '',
+    'total_sum'                                  => '',
+    'spent_in_specific_budget'                   => '',
+    'sum_of_expenses_in_budget'                  => '',
+    'left_in_budget_limit'                       => '',
+    'cannot_reset_demo_user'                     => '',
+    'current_period'                             => '',
+    'show_the_current_period_and_overview'       => '',
+    'pref_languages_locale'                      => '',
+    'budget_in_period'                           => '',
+    'chart_budget_in_period'                     => '',
+    'chart_account_in_period'                    => '',
+    'chart_category_in_period'                   => '',
+    'chart_category_all'                         => '',
+    'clone_withdrawal'                           => '',
+    'clone_deposit'                              => '',
+    'clone_transfer'                             => '',
+    'multi_select_no_selection'                  => '',
+    'multi_select_all_selected'                  => '',
+    'multi_select_filter_placeholder'            => '',
+    'between_dates_breadcrumb'                   => '',
+    'all_journals_without_budget'                => '',
+    'journals_without_budget'                    => '',
+    'all_journals_without_category'              => '',
+    'journals_without_category'                  => '',
+    'all_journals_for_account'                   => '',
+    'chart_all_journals_for_account'             => '',
+    'journals_in_period_for_account'             => '',
+    'transferred'                                => '',
+    'all_withdrawal'                             => '',
+    'all_transactions'                           => '',
+    'title_withdrawal_between'                   => '',
+    'all_deposit'                                => '',
+    'title_deposit_between'                      => '',
+    'all_transfers'                              => '',
+    'title_transfers_between'                    => '',
+    'all_transfer'                               => '',
+    'all_journals_for_tag'                       => '',
+    'title_transfer_between'                     => '',
+    'all_journals_for_category'                  => '',
+    'all_journals_for_budget'                    => '',
+    'chart_all_journals_for_budget'              => '',
+    'journals_in_period_for_category'            => '',
+    'journals_in_period_for_tag'                 => '',
+    'not_available_demo_user'                    => '',
+    'exchange_rate_instructions'                 => '',
+    'transfer_exchange_rate_instructions'        => '',
+    'transaction_data'                           => '',
 
     // search
     'search'                                     => '搜尋',
-    'search_found_transactions'                  => 'Number of transactions found:',
-    'general_search_error'                       => 'An error occured while searching. Please check the log files for more information.',
-    'search_box'                                 => 'Search',
-    'search_box_intro'                           => 'Welcome to the search function of Firefly III. Enter your search query in the box. Make sure you check out the help file because the search is pretty advanced.',
-    'search_error'                               => 'Error while searching',
-    'search_searching'                           => 'Searching ...',
+    'search_found_transactions'                  => '',
+    'general_search_error'                       => '',
+    'search_box'                                 => '',
+    'search_box_intro'                           => '',
+    'search_error'                               => '',
+    'search_searching'                           => '',
 
     // repeat frequencies:
-    'repeat_freq_yearly'                         => 'yearly',
+    'repeat_freq_yearly'                         => '',
     'repeat_freq_monthly'                        => '每月',
     'weekly'                                     => '每週',
     'quarterly'                                  => '每季',
@@ -150,108 +150,108 @@ return [
 
     // export data:
     'import_and_export'                          => '匯入與匯出',
-    'export_data'                                => 'Export data',
-    'export_data_intro'                          => 'For backup purposes, when migrating to another system or when migrating to another Firefly III installation.',
-    'export_format'                              => 'Export format',
-    'export_format_csv'                          => 'Comma separated values (CSV file)',
+    'export_data'                                => '',
+    'export_data_intro'                          => '',
+    'export_format'                              => '',
+    'export_format_csv'                          => '',
     'export_format_mt940'                        => 'MT940 相容格式',
     'export_included_accounts'                   => '從這些帳戶匯出交易記錄',
     'include_old_uploads_help'                   => 'Firefly III 不會扔掉過去已導入的原始 CSV 檔。你可以將它們包含在匯出的檔案中。',
     'do_export'                                  => '匯出',
     'export_status_never_started'                => '匯出尚未開始',
-    'export_status_make_exporter'                => 'Creating exporter thing...',
+    'export_status_make_exporter'                => '',
     'export_status_collecting_journals'          => '正在收集你的交易資料...',
     'export_status_collected_journals'           => '你的交易資料已經收集成功！',
     'export_status_converting_to_export_format'  => '正在轉換您的交易資料...',
-    'export_status_converted_to_export_format'   => 'Converted your transactions!',
-    'export_status_creating_journal_file'        => 'Creating the export file...',
-    'export_status_created_journal_file'         => 'Created the export file!',
-    'export_status_collecting_attachments'       => 'Collecting all your attachments...',
-    'export_status_collected_attachments'        => 'Collected all your attachments!',
-    'export_status_collecting_old_uploads'       => 'Collecting all your previous uploads...',
-    'export_status_collected_old_uploads'        => 'Collected all your previous uploads!',
-    'export_status_creating_config_file'         => 'Creating a configuration file...',
-    'export_status_created_config_file'          => 'Created a configuration file!',
-    'export_status_creating_zip_file'            => 'Creating a zip file...',
-    'export_status_created_zip_file'             => 'Created a zip file!',
-    'export_status_finished'                     => 'Export has succesfully finished! Yay!',
-    'export_data_please_wait'                    => 'Please wait...',
+    'export_status_converted_to_export_format'   => '',
+    'export_status_creating_journal_file'        => '',
+    'export_status_created_journal_file'         => '',
+    'export_status_collecting_attachments'       => '',
+    'export_status_collected_attachments'        => '',
+    'export_status_collecting_old_uploads'       => '',
+    'export_status_collected_old_uploads'        => '',
+    'export_status_creating_config_file'         => '',
+    'export_status_created_config_file'          => '',
+    'export_status_creating_zip_file'            => '',
+    'export_status_created_zip_file'             => '',
+    'export_status_finished'                     => '',
+    'export_data_please_wait'                    => '',
 
     // rules
-    'rules'                                      => 'Rules',
-    'rule_name'                                  => 'Name of rule',
-    'rule_triggers'                              => 'Rule triggers when',
-    'rule_actions'                               => 'Rule will',
-    'new_rule'                                   => 'New rule',
-    'new_rule_group'                             => 'New rule group',
-    'rule_priority_up'                           => 'Give rule more priority',
-    'rule_priority_down'                         => 'Give rule less priority',
-    'make_new_rule_group'                        => 'Make new rule group',
-    'store_new_rule_group'                       => 'Store new rule group',
-    'created_new_rule_group'                     => 'New rule group ":title" stored!',
-    'updated_rule_group'                         => 'Successfully updated rule group ":title".',
-    'edit_rule_group'                            => 'Edit rule group ":title"',
-    'delete_rule_group'                          => 'Delete rule group ":title"',
-    'deleted_rule_group'                         => 'Deleted rule group ":title"',
-    'update_rule_group'                          => 'Update rule group',
-    'no_rules_in_group'                          => 'There are no rules in this group',
-    'move_rule_group_up'                         => 'Move rule group up',
-    'move_rule_group_down'                       => 'Move rule group down',
-    'save_rules_by_moving'                       => 'Save these rule(s) by moving them to another rule group:',
-    'make_new_rule'                              => 'Make new rule in rule group ":title"',
-    'rule_help_stop_processing'                  => 'When you check this box, later rules in this group will not be executed.',
-    'rule_help_active'                           => 'Inactive rules will never fire.',
-    'stored_new_rule'                            => 'Stored new rule with title ":title"',
-    'deleted_rule'                               => 'Deleted rule with title ":title"',
-    'store_new_rule'                             => 'Store new rule',
-    'updated_rule'                               => 'Updated rule with title ":title"',
-    'default_rule_group_name'                    => 'Default rules',
+    'rules'                                      => '',
+    'rule_name'                                  => '',
+    'rule_triggers'                              => '',
+    'rule_actions'                               => '',
+    'new_rule'                                   => '',
+    'new_rule_group'                             => '',
+    'rule_priority_up'                           => '',
+    'rule_priority_down'                         => '',
+    'make_new_rule_group'                        => '',
+    'store_new_rule_group'                       => '',
+    'created_new_rule_group'                     => '',
+    'updated_rule_group'                         => '',
+    'edit_rule_group'                            => '',
+    'delete_rule_group'                          => '',
+    'deleted_rule_group'                         => '',
+    'update_rule_group'                          => '',
+    'no_rules_in_group'                          => '',
+    'move_rule_group_up'                         => '',
+    'move_rule_group_down'                       => '',
+    'save_rules_by_moving'                       => '',
+    'make_new_rule'                              => '',
+    'rule_help_stop_processing'                  => '',
+    'rule_help_active'                           => '',
+    'stored_new_rule'                            => '',
+    'deleted_rule'                               => '',
+    'store_new_rule'                             => '',
+    'updated_rule'                               => '',
+    'default_rule_group_name'                    => '',
     'default_rule_group_description'             => '所有不屬於任何組別的規則',
-    'default_rule_name'                          => 'Your first default rule',
+    'default_rule_name'                          => '',
     'default_rule_description'                   => '這是一個例子。你可以把這個規則刪除。',
     'default_rule_trigger_description'           => '賣世界的小男孩',
-    'default_rule_trigger_from_account'          => 'David Bowie',
+    'default_rule_trigger_from_account'          => '',
     'default_rule_action_prepend'                => '買下了整個世界。錢給了',
-    'default_rule_action_set_category'           => 'Large expenses',
-    'trigger'                                    => 'Trigger',
-    'trigger_value'                              => 'Trigger on value',
-    'stop_processing_other_triggers'             => 'Stop processing other triggers',
-    'add_rule_trigger'                           => 'Add new trigger',
-    'action'                                     => 'Action',
-    'action_value'                               => 'Action value',
-    'stop_executing_other_actions'               => 'Stop executing other actions',
-    'add_rule_action'                            => 'Add new action',
-    'edit_rule'                                  => 'Edit rule ":title"',
-    'delete_rule'                                => 'Delete rule ":title"',
-    'update_rule'                                => 'Update rule',
-    'test_rule_triggers'                         => 'See matching transactions',
-    'warning_transaction_subset'                 => 'For performance reasons this list is limited to :max_num_transactions and may only show a subset of matching transactions',
-    'warning_no_matching_transactions'           => 'No matching transactions found. Please note that for performance reasons, only the last :num_transactions transactions have been checked.',
-    'warning_no_valid_triggers'                  => 'No valid triggers provided.',
-    'apply_rule_selection'                       => 'Apply rule ":title" to a selection of your transactions',
-    'apply_rule_selection_intro'                 => 'Rules like ":title" are normally only applied to new or updated transactions, but you can tell Firefly III to run it on a selection of your existing transactions. This can be useful when you have updated a rule and you need the changes to be applied to all of your other transactions.',
-    'include_transactions_from_accounts'         => 'Include transactions from these accounts',
-    'applied_rule_selection'                     => 'Rule ":title" has been applied to your selection.',
-    'execute'                                    => 'Execute',
-    'apply_rule_group_selection'                 => 'Apply rule group ":title" to a selection of your transactions',
-    'apply_rule_group_selection_intro'           => 'Rule groups like ":title" are normally only applied to new or updated transactions, but you can tell Firefly III to run all the rules in this group on a selection of your existing transactions. This can be useful when you have updated a group of rules and you need the changes to be applied to all of your other transactions.',
-    'applied_rule_group_selection'               => 'Rule group ":title" has been applied to your selection.',
+    'default_rule_action_set_category'           => '',
+    'trigger'                                    => '',
+    'trigger_value'                              => '',
+    'stop_processing_other_triggers'             => '',
+    'add_rule_trigger'                           => '',
+    'action'                                     => '',
+    'action_value'                               => '',
+    'stop_executing_other_actions'               => '',
+    'add_rule_action'                            => '',
+    'edit_rule'                                  => '',
+    'delete_rule'                                => '',
+    'update_rule'                                => '',
+    'test_rule_triggers'                         => '',
+    'warning_transaction_subset'                 => '',
+    'warning_no_matching_transactions'           => '',
+    'warning_no_valid_triggers'                  => '',
+    'apply_rule_selection'                       => '',
+    'apply_rule_selection_intro'                 => '',
+    'include_transactions_from_accounts'         => '',
+    'applied_rule_selection'                     => '',
+    'execute'                                    => '',
+    'apply_rule_group_selection'                 => '',
+    'apply_rule_group_selection_intro'           => '',
+    'applied_rule_group_selection'               => '',
 
     // actions and triggers
-    'rule_trigger_user_action'                   => 'User action is ":trigger_value"',
+    'rule_trigger_user_action'                   => '',
     'rule_trigger_from_account_starts'           => '以 ":trigger_value" 開頭的來源帳戶',
     'rule_trigger_from_account_ends'             => '以 ":trigger_value" 為結尾的來源帳戶',
     'rule_trigger_from_account_is'               => '來源帳戶是 ":trigger_value"',
     'rule_trigger_from_account_contains'         => '含 ":trigger_value" 的來源帳戶',
-    'rule_trigger_to_account_starts'             => 'Destination account starts with ":trigger_value"',
-    'rule_trigger_to_account_ends'               => 'Destination account ends with ":trigger_value"',
-    'rule_trigger_to_account_is'                 => 'Destination account is ":trigger_value"',
-    'rule_trigger_to_account_contains'           => 'Destination account contains ":trigger_value"',
-    'rule_trigger_transaction_type'              => 'Transaction is of type ":trigger_value"',
-    'rule_trigger_category_is'                   => 'Category is ":trigger_value"',
-    'rule_trigger_amount_less'                   => 'Amount is less than :trigger_value',
-    'rule_trigger_amount_exactly'                => 'Amount is :trigger_value',
-    'rule_trigger_amount_more'                   => 'Amount is more than :trigger_value',
+    'rule_trigger_to_account_starts'             => '',
+    'rule_trigger_to_account_ends'               => '',
+    'rule_trigger_to_account_is'                 => '',
+    'rule_trigger_to_account_contains'           => '',
+    'rule_trigger_transaction_type'              => '',
+    'rule_trigger_category_is'                   => '',
+    'rule_trigger_amount_less'                   => '',
+    'rule_trigger_amount_exactly'                => '',
+    'rule_trigger_amount_more'                   => '',
     'rule_trigger_description_starts'            => '以 ":trigger_value" 開頭的描述',
     'rule_trigger_description_ends'              => '以 ":trigger_value" 為結尾的描述',
     'rule_trigger_description_contains'          => '含 ":trigger_value" 的描述',
@@ -260,39 +260,39 @@ return [
     'rule_trigger_from_account_ends_choice'      => '來源帳戶以…結尾',
     'rule_trigger_from_account_is_choice'        => '來源帳戶是…',
     'rule_trigger_from_account_contains_choice'  => '來源帳戶含有…',
-    'rule_trigger_to_account_starts_choice'      => 'Destination account starts with..',
-    'rule_trigger_to_account_ends_choice'        => 'Destination account ends with..',
-    'rule_trigger_to_account_is_choice'          => 'Destination account is..',
-    'rule_trigger_to_account_contains_choice'    => 'Destination account contains..',
-    'rule_trigger_transaction_type_choice'       => 'Transaction is of type..',
-    'rule_trigger_amount_less_choice'            => 'Amount is less than..',
-    'rule_trigger_amount_exactly_choice'         => 'Amount is..',
-    'rule_trigger_amount_more_choice'            => 'Amount is more than..',
+    'rule_trigger_to_account_starts_choice'      => '',
+    'rule_trigger_to_account_ends_choice'        => '',
+    'rule_trigger_to_account_is_choice'          => '',
+    'rule_trigger_to_account_contains_choice'    => '',
+    'rule_trigger_transaction_type_choice'       => '',
+    'rule_trigger_amount_less_choice'            => '',
+    'rule_trigger_amount_exactly_choice'         => '',
+    'rule_trigger_amount_more_choice'            => '',
     'rule_trigger_description_starts_choice'     => '描述以…開頭',
     'rule_trigger_description_ends_choice'       => '描述以…結尾',
     'rule_trigger_description_contains_choice'   => '描述包含…',
     'rule_trigger_description_is_choice'         => '描述是…',
-    'rule_trigger_category_is_choice'            => 'Category is..',
-    'rule_trigger_budget_is_choice'              => 'Budget is..',
-    'rule_trigger_tag_is_choice'                 => '(A) tag is..',
-    'rule_trigger_has_attachments_choice'        => 'Has at least this many attachments',
-    'rule_trigger_has_attachments'               => 'Has at least :trigger_value attachment(s)',
-    'rule_trigger_store_journal'                 => 'When a transaction is created',
-    'rule_trigger_update_journal'                => 'When a transaction is updated',
-    'rule_action_set_category'                   => 'Set category to ":action_value"',
-    'rule_action_clear_category'                 => 'Clear category',
-    'rule_action_set_budget'                     => 'Set budget to ":action_value"',
-    'rule_action_clear_budget'                   => 'Clear budget',
+    'rule_trigger_category_is_choice'            => '',
+    'rule_trigger_budget_is_choice'              => '',
+    'rule_trigger_tag_is_choice'                 => '',
+    'rule_trigger_has_attachments_choice'        => '',
+    'rule_trigger_has_attachments'               => '',
+    'rule_trigger_store_journal'                 => '',
+    'rule_trigger_update_journal'                => '',
+    'rule_action_set_category'                   => '',
+    'rule_action_clear_category'                 => '',
+    'rule_action_set_budget'                     => '',
+    'rule_action_clear_budget'                   => '',
     'rule_action_add_tag'                        => '新增標籤 ":action_value"',
     'rule_action_remove_tag'                     => '刪除標籤 ":action_value"',
     'rule_action_remove_all_tags'                => '移除所有標籤',
     'rule_action_set_description'                => '設置描述為 ":action_value"',
     'rule_action_append_description'             => '描述後加上 ":action_value"',
     'rule_action_prepend_description'            => '描述前加上 ":action_value"',
-    'rule_action_set_category_choice'            => 'Set category to..',
-    'rule_action_clear_category_choice'          => 'Clear any category',
-    'rule_action_set_budget_choice'              => 'Set budget to..',
-    'rule_action_clear_budget_choice'            => 'Clear any budget',
+    'rule_action_set_category_choice'            => '',
+    'rule_action_clear_category_choice'          => '',
+    'rule_action_set_budget_choice'              => '',
+    'rule_action_clear_budget_choice'            => '',
     'rule_action_add_tag_choice'                 => '新增標籤…',
     'rule_action_remove_tag_choice'              => '移除標籤…',
     'rule_action_remove_all_tags_choice'         => '移除所有標籤',
@@ -301,33 +301,33 @@ return [
     'rule_action_prepend_description_choice'     => '描述前加上…',
     'rule_action_set_source_account_choice'      => '把來源帳戶設置為...',
     'rule_action_set_source_account'             => '將來源帳戶設置為 :action_value',
-    'rule_action_set_destination_account_choice' => 'Set destination account to...',
-    'rule_action_set_destination_account'        => 'Set destination account to :action_value',
+    'rule_action_set_destination_account_choice' => '',
+    'rule_action_set_destination_account'        => '',
 
     // tags
     'store_new_tag'                              => '儲存新的標籤',
     'update_tag'                                 => '更新標籤',
-    'no_location_set'                            => 'No location set.',
-    'meta_data'                                  => 'Meta data',
-    'location'                                   => 'Location',
+    'no_location_set'                            => '',
+    'meta_data'                                  => '',
+    'location'                                   => '',
 
     // preferences
-    'pref_home_screen_accounts'                  => 'Home screen accounts',
-    'pref_home_screen_accounts_help'             => 'Which accounts should be displayed on the home page?',
-    'pref_view_range'                            => 'View range',
-    'pref_view_range_help'                       => 'Some charts are automatically grouped in periods. What period would you prefer?',
-    'pref_1D'                                    => 'One day',
-    'pref_1W'                                    => 'One week',
-    'pref_1M'                                    => 'One month',
-    'pref_3M'                                    => 'Three months (quarter)',
-    'pref_6M'                                    => 'Six months',
-    'pref_1Y'                                    => 'One year',
-    'pref_languages'                             => 'Languages',
-    'pref_languages_help'                        => 'Firefly III supports several languages. Which one do you prefer?',
-    'pref_custom_fiscal_year'                    => 'Fiscal year settings',
-    'pref_custom_fiscal_year_label'              => 'Enabled',
-    'pref_custom_fiscal_year_help'               => 'In countries that use a financial year other than January 1 to December 31, you can switch this on and specify start / end days of the fiscal year',
-    'pref_fiscal_year_start_label'               => 'Fiscal year start date',
+    'pref_home_screen_accounts'                  => '',
+    'pref_home_screen_accounts_help'             => '',
+    'pref_view_range'                            => '',
+    'pref_view_range_help'                       => '',
+    'pref_1D'                                    => '',
+    'pref_1W'                                    => '',
+    'pref_1M'                                    => '',
+    'pref_3M'                                    => '',
+    'pref_6M'                                    => '',
+    'pref_1Y'                                    => '',
+    'pref_languages'                             => '',
+    'pref_languages_help'                        => '',
+    'pref_custom_fiscal_year'                    => '',
+    'pref_custom_fiscal_year_label'              => '',
+    'pref_custom_fiscal_year_help'               => '',
+    'pref_fiscal_year_start_label'               => '',
     'pref_two_factor_auth'                       => '雙重身份驗證',
     'pref_two_factor_auth_help'                  => '當您啟用二步驗證 （也稱為雙重身份驗證） 時，你的帳戶安全性將會更上一層樓。你需要以您知道的東西（密碼）和你擁有的東西（驗證碼）來進行登錄。驗證碼是由您的手機上的應用程式生成的，如 Authy 或 Google Authenticator 。',
     'pref_enable_two_factor_auth'                => '啟用雙重身份驗證',
@@ -338,256 +338,256 @@ return [
     'pref_two_factor_auth_reset_code'            => '重置驗證代碼',
     'pref_two_factor_auth_remove_code'           => '刪除驗證代碼',
     'pref_two_factor_auth_remove_will_disable'   => '（這也會禁用雙重身份驗證）',
-    'pref_save_settings'                         => 'Save settings',
-    'saved_preferences'                          => 'Preferences saved!',
-    'preferences_general'                        => 'General',
-    'preferences_frontpage'                      => 'Home screen',
-    'preferences_security'                       => 'Security',
-    'preferences_layout'                         => 'Layout',
-    'pref_home_show_deposits'                    => 'Show deposits on the home screen',
-    'pref_home_show_deposits_info'               => 'The home screen already shows your expense accounts. Should it also show your revenue accounts?',
-    'pref_home_do_show_deposits'                 => 'Yes, show them',
-    'successful_count'                           => 'of which :count successful',
-    'transaction_page_size_title'                => 'Page size',
-    'transaction_page_size_help'                 => 'Any list of transactions shows at most this many transactions',
-    'transaction_page_size_label'                => 'Page size',
-    'between_dates'                              => '(:start and :end)',
-    'pref_optional_fields_transaction'           => 'Optional fields for transactions',
-    'pref_optional_fields_transaction_help'      => 'By default not all fields are enabled when creating a new transaction (because of the clutter). Below, you can enable these fields if you think they could be useful for you. Of course, any field that is disabled, but already filled in, will be visible regardless of the setting.',
-    'optional_tj_date_fields'                    => 'Date fields',
-    'optional_tj_business_fields'                => 'Business fields',
-    'optional_tj_attachment_fields'              => 'Attachment fields',
-    'pref_optional_tj_interest_date'             => 'Interest date',
-    'pref_optional_tj_book_date'                 => 'Book date',
-    'pref_optional_tj_process_date'              => 'Processing date',
+    'pref_save_settings'                         => '',
+    'saved_preferences'                          => '',
+    'preferences_general'                        => '',
+    'preferences_frontpage'                      => '',
+    'preferences_security'                       => '',
+    'preferences_layout'                         => '',
+    'pref_home_show_deposits'                    => '',
+    'pref_home_show_deposits_info'               => '',
+    'pref_home_do_show_deposits'                 => '',
+    'successful_count'                           => '',
+    'transaction_page_size_title'                => '',
+    'transaction_page_size_help'                 => '',
+    'transaction_page_size_label'                => '',
+    'between_dates'                              => '',
+    'pref_optional_fields_transaction'           => '',
+    'pref_optional_fields_transaction_help'      => '',
+    'optional_tj_date_fields'                    => '',
+    'optional_tj_business_fields'                => '',
+    'optional_tj_attachment_fields'              => '',
+    'pref_optional_tj_interest_date'             => '',
+    'pref_optional_tj_book_date'                 => '',
+    'pref_optional_tj_process_date'              => '',
     'pref_optional_tj_due_date'                  => '到期日',
-    'pref_optional_tj_payment_date'              => 'Payment date',
-    'pref_optional_tj_invoice_date'              => 'Invoice date',
-    'pref_optional_tj_internal_reference'        => 'Internal reference',
-    'pref_optional_tj_notes'                     => 'Notes',
-    'pref_optional_tj_attachments'               => 'Attachments',
-    'optional_field_meta_dates'                  => 'Dates',
-    'optional_field_meta_business'               => 'Business',
-    'optional_field_attachments'                 => 'Attachments',
-    'optional_field_meta_data'                   => 'Optional meta data',
+    'pref_optional_tj_payment_date'              => '',
+    'pref_optional_tj_invoice_date'              => '',
+    'pref_optional_tj_internal_reference'        => '',
+    'pref_optional_tj_notes'                     => '',
+    'pref_optional_tj_attachments'               => '',
+    'optional_field_meta_dates'                  => '',
+    'optional_field_meta_business'               => '',
+    'optional_field_attachments'                 => '',
+    'optional_field_meta_data'                   => '',
 
 
     // profile:
-    'change_your_password'                       => 'Change your password',
-    'delete_account'                             => 'Delete account',
-    'current_password'                           => 'Current password',
-    'new_password'                               => 'New password',
-    'new_password_again'                         => 'New password (again)',
-    'delete_your_account'                        => 'Delete your account',
-    'delete_your_account_help'                   => 'Deleting your account will also delete any accounts, transactions, <em>anything</em> you might have saved into Firefly III. It\'ll be GONE.',
-    'delete_your_account_password'               => 'Enter your password to continue.',
-    'password'                                   => 'Password',
-    'are_you_sure'                               => 'Are you sure? You cannot undo this.',
-    'delete_account_button'                      => 'DELETE your account',
-    'invalid_current_password'                   => 'Invalid current password!',
-    'password_changed'                           => 'Password changed!',
-    'should_change'                              => 'The idea is to change your password.',
-    'invalid_password'                           => 'Invalid password!',
-    'what_is_pw_security'                        => 'What is "verify password security"?',
-    'secure_pw_title'                            => 'How to choose a secure password',
-    'secure_pw_history'                          => 'In August 2017 well known security researcher Troy Hunt released a list of 306 million stolen passwords. These passwords were stolen during breakins at companies like LinkedIn, Adobe and NeoPets (and many more).',
-    'secure_pw_check_box'                        => 'By checking the box, Firefly III will send the SHA1 hash of your password to <a href="https://www.troyhunt.com/introducing-306-million-freely-downloadable-pwned-passwords/">the website of Troy Hunt</a> to see if it is on the list. This will stop you from using unsafe passwords as is recommended in the latest <a href="https://pages.nist.gov/800-63-3/sp800-63b.html">NIST Special Publication</a> on this subject.',
-    'secure_pw_sha1'                             => 'But I thought SHA1 was broken?',
-    'secure_pw_hash_speed'                       => 'Yes, but not in this context. As you can read on <a href="https://shattered.io/">the website detailing how they broke SHA1</a>, it is now slightly easier to find a "collision": another string that results in the same SHA1-hash. It now only takes 10,000 years using a single-GPU machine.',
-    'secure_pw_hash_security'                    => 'This collision would not be equal to your password, nor would it be useful on (a site like) Firefly III. This application does not use SHA1 for password verification. So it is safe to check this box. Your password is hashed and sent over HTTPS.',
-    'secure_pw_should'                           => 'Should I check the box?',
-    'secure_pw_long_password'                    => 'If you just generated a long, single-use password for Firefly III using some kind of password generator: <strong>no</strong>.',
-    'secure_pw_short'                            => 'If you just entered the password you always use: <em>Please yes</em>.',
+    'change_your_password'                       => '',
+    'delete_account'                             => '',
+    'current_password'                           => '',
+    'new_password'                               => '',
+    'new_password_again'                         => '',
+    'delete_your_account'                        => '',
+    'delete_your_account_help'                   => '',
+    'delete_your_account_password'               => '',
+    'password'                                   => '',
+    'are_you_sure'                               => '',
+    'delete_account_button'                      => '',
+    'invalid_current_password'                   => '',
+    'password_changed'                           => '',
+    'should_change'                              => '',
+    'invalid_password'                           => '',
+    'what_is_pw_security'                        => '',
+    'secure_pw_title'                            => '',
+    'secure_pw_history'                          => '',
+    'secure_pw_check_box'                        => '',
+    'secure_pw_sha1'                             => '',
+    'secure_pw_hash_speed'                       => '',
+    'secure_pw_hash_security'                    => '',
+    'secure_pw_should'                           => '',
+    'secure_pw_long_password'                    => '',
+    'secure_pw_short'                            => '',
 
 
     // attachments
-    'nr_of_attachments'                          => 'One attachment|:count attachments',
-    'attachments'                                => 'Attachments',
-    'edit_attachment'                            => 'Edit attachment ":name"',
-    'update_attachment'                          => 'Update attachment',
-    'delete_attachment'                          => 'Delete attachment ":name"',
-    'attachment_deleted'                         => 'Deleted attachment ":name"',
-    'attachment_updated'                         => 'Updated attachment ":name"',
-    'upload_max_file_size'                       => 'Maximum file size: :size',
+    'nr_of_attachments'                          => '',
+    'attachments'                                => '',
+    'edit_attachment'                            => '',
+    'update_attachment'                          => '',
+    'delete_attachment'                          => '',
+    'attachment_deleted'                         => '',
+    'attachment_updated'                         => '',
+    'upload_max_file_size'                       => '',
 
     // transaction index
-    'title_expenses'                             => 'Expenses',
-    'title_withdrawal'                           => 'Expenses',
-    'title_revenue'                              => 'Revenue / income',
-    'title_deposit'                              => 'Revenue / income',
-    'title_transfer'                             => 'Transfers',
-    'title_transfers'                            => 'Transfers',
+    'title_expenses'                             => '',
+    'title_withdrawal'                           => '',
+    'title_revenue'                              => '',
+    'title_deposit'                              => '',
+    'title_transfer'                             => '',
+    'title_transfers'                            => '',
 
     // convert stuff:
-    'convert_is_already_type_Withdrawal'         => 'This transaction is already a withdrawal',
-    'convert_is_already_type_Deposit'            => 'This transaction is already a deposit',
-    'convert_is_already_type_Transfer'           => 'This transaction is already a transfer',
-    'convert_to_Withdrawal'                      => 'Convert ":description" to a withdrawal',
-    'convert_to_Deposit'                         => 'Convert ":description" to a deposit',
-    'convert_to_Transfer'                        => 'Convert ":description" to a transfer',
-    'convert_options_WithdrawalDeposit'          => 'Convert a withdrawal into a deposit',
-    'convert_options_WithdrawalTransfer'         => 'Convert a withdrawal into a transfer',
-    'convert_options_DepositTransfer'            => 'Convert a deposit into a transfer',
-    'convert_options_DepositWithdrawal'          => 'Convert a deposit into a withdrawal',
-    'convert_options_TransferWithdrawal'         => 'Convert a transfer into a withdrawal',
-    'convert_options_TransferDeposit'            => 'Convert a transfer into a deposit',
-    'transaction_journal_convert_options'        => 'Convert this transaction',
-    'convert_Withdrawal_to_deposit'              => 'Convert this withdrawal to a deposit',
-    'convert_Withdrawal_to_transfer'             => 'Convert this withdrawal to a transfer',
-    'convert_Deposit_to_withdrawal'              => 'Convert this deposit to a withdrawal',
-    'convert_Deposit_to_transfer'                => 'Convert this deposit to a transfer',
-    'convert_Transfer_to_deposit'                => 'Convert this transfer to a deposit',
-    'convert_Transfer_to_withdrawal'             => 'Convert this transfer to a withdrawal',
-    'convert_please_set_revenue_source'          => 'Please pick the revenue account where the money will come from.',
-    'convert_please_set_asset_destination'       => 'Please pick the asset account where the money will go to.',
-    'convert_please_set_expense_destination'     => 'Please pick the expense account where the money will go to.',
-    'convert_please_set_asset_source'            => 'Please pick the asset account where the money will come from.',
-    'convert_explanation_withdrawal_deposit'     => 'If you convert this withdrawal into a deposit, :amount will be deposited into <a href=":sourceRoute">:sourceName</a> instead of taken from it.',
+    'convert_is_already_type_Withdrawal'         => '',
+    'convert_is_already_type_Deposit'            => '',
+    'convert_is_already_type_Transfer'           => '',
+    'convert_to_Withdrawal'                      => '',
+    'convert_to_Deposit'                         => '',
+    'convert_to_Transfer'                        => '',
+    'convert_options_WithdrawalDeposit'          => '',
+    'convert_options_WithdrawalTransfer'         => '',
+    'convert_options_DepositTransfer'            => '',
+    'convert_options_DepositWithdrawal'          => '',
+    'convert_options_TransferWithdrawal'         => '',
+    'convert_options_TransferDeposit'            => '',
+    'transaction_journal_convert_options'        => '',
+    'convert_Withdrawal_to_deposit'              => '',
+    'convert_Withdrawal_to_transfer'             => '',
+    'convert_Deposit_to_withdrawal'              => '',
+    'convert_Deposit_to_transfer'                => '',
+    'convert_Transfer_to_deposit'                => '',
+    'convert_Transfer_to_withdrawal'             => '',
+    'convert_please_set_revenue_source'          => '',
+    'convert_please_set_asset_destination'       => '',
+    'convert_please_set_expense_destination'     => '',
+    'convert_please_set_asset_source'            => '',
+    'convert_explanation_withdrawal_deposit'     => '',
     'convert_explanation_withdrawal_transfer'    => '如果你把這個提款（支出）轉換為轉帳， :amount 會從 <a href=":sourceRoute">:sourceName</a> 轉帳到新的資產帳戶，而不會付款到 <a href=":destinationRoute">:destinationName</a> 。',
-    'convert_explanation_deposit_withdrawal'     => 'If you convert this deposit into a withdrawal, :amount will be removed from <a href=":destinationRoute">:destinationName</a> instead of added to it.',
-    'convert_explanation_deposit_transfer'       => 'If you convert this deposit into a transfer, :amount will be transferred from an asset account of your choice into <a href=":destinationRoute">:destinationName</a>.',
-    'convert_explanation_transfer_withdrawal'    => 'If you convert this transfer into a withdrawal, :amount will go from <a href=":sourceRoute">:sourceName</a> to a new destination as an expense, instead of to <a href=":destinationRoute">:destinationName</a> as a transfer.',
-    'convert_explanation_transfer_deposit'       => 'If you convert this transfer into a deposit, :amount will be deposited into account <a href=":destinationRoute">:destinationName</a> instead of being transferred there.',
-    'converted_to_Withdrawal'                    => 'The transaction has been converted to a withdrawal',
-    'converted_to_Deposit'                       => 'The transaction has been converted to a deposit',
-    'converted_to_Transfer'                      => 'The transaction has been converted to a transfer',
+    'convert_explanation_deposit_withdrawal'     => '',
+    'convert_explanation_deposit_transfer'       => '',
+    'convert_explanation_transfer_withdrawal'    => '',
+    'convert_explanation_transfer_deposit'       => '',
+    'converted_to_Withdrawal'                    => '',
+    'converted_to_Deposit'                       => '',
+    'converted_to_Transfer'                      => '',
 
 
     // create new stuff:
-    'create_new_withdrawal'                      => 'Create new withdrawal',
-    'create_new_deposit'                         => 'Create new deposit',
-    'create_new_transfer'                        => 'Create new transfer',
+    'create_new_withdrawal'                      => '',
+    'create_new_deposit'                         => '',
+    'create_new_transfer'                        => '',
     'create_new_asset'                           => '建立新的資產帳戶',
-    'create_new_expense'                         => 'Create new expense account',
-    'create_new_revenue'                         => 'Create new revenue account',
-    'create_new_piggy_bank'                      => 'Create new piggy bank',
+    'create_new_expense'                         => '',
+    'create_new_revenue'                         => '',
+    'create_new_piggy_bank'                      => '',
     'create_new_bill'                            => '建立新賬單',
 
     // currencies:
-    'create_currency'                            => 'Create a new currency',
-    'store_currency'                             => 'Store new currency',
-    'update_currency'                            => 'Update currency',
-    'new_default_currency'                       => ':name is now the default currency.',
-    'cannot_delete_currency'                     => 'Cannot delete :name because it is still in use.',
-    'deleted_currency'                           => 'Currency :name deleted',
-    'created_currency'                           => 'Currency :name created',
-    'updated_currency'                           => 'Currency :name updated',
-    'ask_site_owner'                             => 'Please ask :owner to add, remove or edit currencies.',
-    'currencies_intro'                           => 'Firefly III supports various currencies which you can set and enable here.',
-    'make_default_currency'                      => 'make default',
-    'default_currency'                           => 'default',
+    'create_currency'                            => '',
+    'store_currency'                             => '',
+    'update_currency'                            => '',
+    'new_default_currency'                       => '',
+    'cannot_delete_currency'                     => '',
+    'deleted_currency'                           => '',
+    'created_currency'                           => '',
+    'updated_currency'                           => '',
+    'ask_site_owner'                             => '',
+    'currencies_intro'                           => '',
+    'make_default_currency'                      => '',
+    'default_currency'                           => '',
 
     // forms:
-    'mandatoryFields'                            => 'Mandatory fields',
-    'optionalFields'                             => 'Optional fields',
-    'options'                                    => 'Options',
+    'mandatoryFields'                            => '',
+    'optionalFields'                             => '',
+    'options'                                    => '',
 
     // budgets:
-    'create_new_budget'                          => 'Create a new budget',
-    'store_new_budget'                           => 'Store new budget',
-    'stored_new_budget'                          => 'Stored new budget ":name"',
-    'available_between'                          => 'Available between :start and :end',
-    'transactionsWithoutBudget'                  => 'Expenses without budget',
-    'transactions_no_budget'                     => 'Expenses without budget between :start and :end',
-    'spent_between'                              => 'Spent between :start and :end',
-    'createBudget'                               => 'New budget',
-    'inactiveBudgets'                            => 'Inactive budgets',
-    'without_budget_between'                     => 'Transactions without a budget between :start and :end',
-    'delete_budget'                              => 'Delete budget ":name"',
-    'deleted_budget'                             => 'Deleted budget ":name"',
-    'edit_budget'                                => 'Edit budget ":name"',
-    'updated_budget'                             => 'Updated budget ":name"',
-    'update_amount'                              => 'Update amount',
-    'update_budget'                              => 'Update budget',
-    'update_budget_amount_range'                 => 'Update (expected) available amount between :start and :end',
-    'budget_period_navigator'                    => 'Period navigator',
+    'create_new_budget'                          => '',
+    'store_new_budget'                           => '',
+    'stored_new_budget'                          => '',
+    'available_between'                          => '',
+    'transactionsWithoutBudget'                  => '',
+    'transactions_no_budget'                     => '',
+    'spent_between'                              => '',
+    'createBudget'                               => '',
+    'inactiveBudgets'                            => '',
+    'without_budget_between'                     => '',
+    'delete_budget'                              => '',
+    'deleted_budget'                             => '',
+    'edit_budget'                                => '',
+    'updated_budget'                             => '',
+    'update_amount'                              => '',
+    'update_budget'                              => '',
+    'update_budget_amount_range'                 => '',
+    'budget_period_navigator'                    => '',
 
     // bills:
-    'matching_on'                                => 'Matching on',
-    'between_amounts'                            => 'between :low and :high.',
-    'repeats'                                    => 'Repeats',
-    'connected_journals'                         => 'Connected transactions',
-    'auto_match_on'                              => 'Automatically matched by Firefly',
-    'auto_match_off'                             => 'Not automatically matched by Firefly',
-    'next_expected_match'                        => 'Next expected match',
+    'matching_on'                                => '',
+    'between_amounts'                            => '',
+    'repeats'                                    => '',
+    'connected_journals'                         => '',
+    'auto_match_on'                              => '',
+    'auto_match_off'                             => '',
+    'next_expected_match'                        => '',
     'delete_bill'                                => '刪除賬單 ":name"',
     'deleted_bill'                               => '成功刪除賬單 ":name"',
     'edit_bill'                                  => '編輯賬單 ":name"',
-    'more'                                       => 'More',
-    'rescan_old'                                 => 'Rescan old transactions',
+    'more'                                       => '',
+    'rescan_old'                                 => '',
     'update_bill'                                => '更新賬單',
     'updated_bill'                               => '更新了帳單 ":name"',
     'store_new_bill'                             => '儲存新的賬單',
     'stored_new_bill'                            => '儲存了新的賬單 ":name"',
-    'cannot_scan_inactive_bill'                  => 'Inactive bills cannot be scanned.',
-    'rescanned_bill'                             => 'Rescanned everything.',
+    'cannot_scan_inactive_bill'                  => '',
+    'rescanned_bill'                             => '',
     'average_bill_amount_year'                   => '平均賬單金額 （:year）',
     'average_bill_amount_overall'                => '平均賬單金額 （總計）',
-    'not_or_not_yet'                             => 'Not (yet)',
-    'not_expected_period'                        => 'Not expected this period',
-    'bill_is_active'                             => 'Bill is active',
-    'bill_will_automatch'                        => 'Bill will automatically linked to matching transactions',
+    'not_or_not_yet'                             => '',
+    'not_expected_period'                        => '',
+    'bill_is_active'                             => '',
+    'bill_will_automatch'                        => '',
     // accounts:
     'details_for_asset'                          => '資產帳戶的詳細資訊 ":name"',
-    'details_for_expense'                        => 'Details for expense account ":name"',
-    'details_for_revenue'                        => 'Details for revenue account ":name"',
-    'details_for_cash'                           => 'Details for cash account ":name"',
+    'details_for_expense'                        => '',
+    'details_for_revenue'                        => '',
+    'details_for_cash'                           => '',
     'store_new_asset_account'                    => '儲存新的資產帳戶',
-    'store_new_expense_account'                  => 'Store new expense account',
-    'store_new_revenue_account'                  => 'Store new revenue account',
+    'store_new_expense_account'                  => '',
+    'store_new_revenue_account'                  => '',
     'edit_asset_account'                         => '編輯資產帳戶 ":name"',
-    'edit_expense_account'                       => 'Edit expense account ":name"',
-    'edit_revenue_account'                       => 'Edit revenue account ":name"',
+    'edit_expense_account'                       => '',
+    'edit_revenue_account'                       => '',
     'delete_asset_account'                       => '刪除資產帳戶 ":name"',
-    'delete_expense_account'                     => 'Delete expense account ":name"',
-    'delete_revenue_account'                     => 'Delete revenue account ":name"',
+    'delete_expense_account'                     => '',
+    'delete_revenue_account'                     => '',
     'asset_deleted'                              => '成功刪除資產帳戶 ":name"',
-    'expense_deleted'                            => 'Successfully deleted expense account ":name"',
-    'revenue_deleted'                            => 'Successfully deleted revenue account ":name"',
+    'expense_deleted'                            => '',
+    'revenue_deleted'                            => '',
     'update_asset_account'                       => '更新資產帳戶資訊',
-    'update_expense_account'                     => 'Update expense account',
-    'update_revenue_account'                     => 'Update revenue account',
+    'update_expense_account'                     => '',
+    'update_revenue_account'                     => '',
     'make_new_asset_account'                     => '建立新的資產帳戶',
-    'make_new_expense_account'                   => 'Create a new expense account',
-    'make_new_revenue_account'                   => 'Create a new revenue account',
+    'make_new_expense_account'                   => '',
+    'make_new_revenue_account'                   => '',
     'asset_accounts'                             => '資產帳戶',
-    'expense_accounts'                           => 'Expense accounts',
-    'revenue_accounts'                           => 'Revenue accounts',
-    'cash_accounts'                              => 'Cash accounts',
-    'Cash account'                               => 'Cash account',
-    'account_type'                               => 'Account type',
-    'save_transactions_by_moving'                => 'Save these transaction(s) by moving them to another account:',
-    'stored_new_account'                         => 'New account ":name" stored!',
-    'updated_account'                            => 'Updated account ":name"',
-    'credit_card_options'                        => 'Credit card options',
-    'no_transactions_account'                    => 'There are no transactions (in this period) for asset account ":name".',
-    'no_data_for_chart'                          => 'There is not enough information (yet) to generate this chart.',
-    'select_more_than_one_account'               => 'Please select more than one account',
-    'select_more_than_one_category'              => 'Please select more than one category',
-    'select_more_than_one_budget'                => 'Please select more than one budget',
-    'select_more_than_one_tag'                   => 'Please select more than one tag',
-    'account_default_currency'                   => 'If you select another currency, new transactions from this account will have this currency pre-selected.',
+    'expense_accounts'                           => '',
+    'revenue_accounts'                           => '',
+    'cash_accounts'                              => '',
+    'Cash account'                               => '',
+    'account_type'                               => '',
+    'save_transactions_by_moving'                => '',
+    'stored_new_account'                         => '',
+    'updated_account'                            => '',
+    'credit_card_options'                        => '',
+    'no_transactions_account'                    => '',
+    'no_data_for_chart'                          => '',
+    'select_more_than_one_account'               => '',
+    'select_more_than_one_category'              => '',
+    'select_more_than_one_budget'                => '',
+    'select_more_than_one_tag'                   => '',
+    'account_default_currency'                   => '',
 
     // categories:
-    'new_category'                               => 'New category',
-    'create_new_category'                        => 'Create a new category',
-    'without_category'                           => 'Without a category',
-    'update_category'                            => 'Update category',
-    'updated_category'                           => 'Updated category ":name"',
-    'categories'                                 => 'Categories',
-    'edit_category'                              => 'Edit category ":name"',
-    'no_category'                                => '(no category)',
-    'category'                                   => 'Category',
-    'delete_category'                            => 'Delete category ":name"',
-    'deleted_category'                           => 'Deleted category ":name"',
-    'store_category'                             => 'Store new category',
-    'stored_category'                            => 'Stored new category ":name"',
-    'without_category_between'                   => 'Without category between :start and :end',
+    'new_category'                               => '',
+    'create_new_category'                        => '',
+    'without_category'                           => '',
+    'update_category'                            => '',
+    'updated_category'                           => '',
+    'categories'                                 => '',
+    'edit_category'                              => '',
+    'no_category'                                => '',
+    'category'                                   => '',
+    'delete_category'                            => '',
+    'deleted_category'                           => '',
+    'store_category'                             => '',
+    'stored_category'                            => '',
+    'without_category_between'                   => '',
 
     // transactions:
-    'update_withdrawal'                          => 'Update withdrawal',
-    'update_deposit'                             => 'Update deposit',
-    'update_transfer'                            => 'Update transfer',
+    'update_withdrawal'                          => '',
+    'update_deposit'                             => '',
+    'update_transfer'                            => '',
     'updated_withdrawal'                         => '成功更新提款 ":description"',
     'updated_deposit'                            => '成功更新存款 ":description"',
     'updated_transfer'                           => '成功更新轉帳 ":description"',
@@ -598,231 +598,231 @@ return [
     'deleted_deposit'                            => '成功刪除存款 ":description"',
     'deleted_transfer'                           => '成功刪除轉帳 ":description"',
     'stored_journal'                             => '成功建立交易 ":description"',
-    'select_transactions'                        => 'Select transactions',
-    'stop_selection'                             => 'Stop selecting transactions',
-    'edit_selected'                              => 'Edit selected',
-    'delete_selected'                            => 'Delete selected',
-    'mass_delete_journals'                       => 'Delete a number of transactions',
-    'mass_edit_journals'                         => 'Edit a number of transactions',
-    'cannot_edit_other_fields'                   => 'You cannot mass-edit other fields than the ones here, because there is no room to show them. Please follow the link and edit them by one-by-one, if you need to edit these fields.',
-    'perm-delete-many'                           => 'Deleting many items in one go can be very disruptive. Please be cautious.',
-    'mass_deleted_transactions_success'          => 'Deleted :amount transaction(s).',
-    'mass_edited_transactions_success'           => 'Updated :amount transaction(s)',
+    'select_transactions'                        => '',
+    'stop_selection'                             => '',
+    'edit_selected'                              => '',
+    'delete_selected'                            => '',
+    'mass_delete_journals'                       => '',
+    'mass_edit_journals'                         => '',
+    'cannot_edit_other_fields'                   => '',
+    'perm-delete-many'                           => '',
+    'mass_deleted_transactions_success'          => '',
+    'mass_edited_transactions_success'           => '',
 
 
     // new user:
-    'welcome'                                    => 'Welcome to Firefly!',
-    'submit'                                     => 'Submit',
-    'getting_started'                            => 'Getting started',
-    'to_get_started'                             => 'It is good to see you have successfully installed Firefly III. To get started with this tool please enter your bank\'s name and the balance of your main checking account. Do not worry yet if you have multiple accounts. You can add those later. It\'s just that Firefly III needs something to start with.',
-    'savings_balance_text'                       => 'Firefly III will automatically create a savings account for you. By default, there will be no money in your savings account, but if you tell Firefly III the balance it will be stored as such.',
-    'finish_up_new_user'                         => 'That\'s it! You can continue by pressing <strong>Submit</strong>. You will be taken to the index of Firefly III.',
-    'stored_new_accounts_new_user'               => 'Yay! Your new accounts have been stored.',
+    'welcome'                                    => '',
+    'submit'                                     => '',
+    'getting_started'                            => '',
+    'to_get_started'                             => '',
+    'savings_balance_text'                       => '',
+    'finish_up_new_user'                         => '',
+    'stored_new_accounts_new_user'               => '',
 
     // home page:
-    'yourAccounts'                               => 'Your accounts',
-    'budgetsAndSpending'                         => 'Budgets and spending',
-    'savings'                                    => 'Savings',
-    'newWithdrawal'                              => 'New expense',
-    'newDeposit'                                 => 'New deposit',
-    'newTransfer'                                => 'New transfer',
-    'moneyIn'                                    => 'Money in',
-    'moneyOut'                                   => 'Money out',
+    'yourAccounts'                               => '',
+    'budgetsAndSpending'                         => '',
+    'savings'                                    => '',
+    'newWithdrawal'                              => '',
+    'newDeposit'                                 => '',
+    'newTransfer'                                => '',
+    'moneyIn'                                    => '',
+    'moneyOut'                                   => '',
     'billsToPay'                                 => '待付賬單',
     'billsPaid'                                  => '已付賬單',
 
     // menu and titles, should be recycled as often as possible:
-    'currency'                                   => 'Currency',
-    'preferences'                                => 'Preferences',
-    'logout'                                     => 'Logout',
-    'searchPlaceholder'                          => 'Search...',
-    'dashboard'                                  => 'Dashboard',
-    'currencies'                                 => 'Currencies',
-    'accounts'                                   => 'Accounts',
+    'currency'                                   => '',
+    'preferences'                                => '',
+    'logout'                                     => '',
+    'searchPlaceholder'                          => '',
+    'dashboard'                                  => '',
+    'currencies'                                 => '',
+    'accounts'                                   => '',
     'Asset account'                              => '資產帳戶',
     'Default account'                            => '資產帳戶',
-    'Expense account'                            => 'Expense account',
-    'Revenue account'                            => 'Revenue account',
+    'Expense account'                            => '',
+    'Revenue account'                            => '',
     'Initial balance account'                    => '初始帳戶',
-    'budgets'                                    => 'Budgets',
+    'budgets'                                    => '',
     'tags'                                       => '標籤',
-    'reports'                                    => 'Reports',
-    'transactions'                               => 'Transactions',
-    'expenses'                                   => 'Expenses',
-    'income'                                     => 'Revenue / income',
-    'transfers'                                  => 'Transfers',
-    'moneyManagement'                            => 'Money management',
-    'piggyBanks'                                 => 'Piggy banks',
+    'reports'                                    => '',
+    'transactions'                               => '',
+    'expenses'                                   => '',
+    'income'                                     => '',
+    'transfers'                                  => '',
+    'moneyManagement'                            => '',
+    'piggyBanks'                                 => '',
     'bills'                                      => '賬單',
-    'withdrawal'                                 => 'Withdrawal',
-    'deposit'                                    => 'Deposit',
-    'account'                                    => 'Account',
-    'transfer'                                   => 'Transfer',
-    'Withdrawal'                                 => 'Withdrawal',
-    'Deposit'                                    => 'Deposit',
-    'Transfer'                                   => 'Transfer',
+    'withdrawal'                                 => '',
+    'deposit'                                    => '',
+    'account'                                    => '',
+    'transfer'                                   => '',
+    'Withdrawal'                                 => '',
+    'Deposit'                                    => '',
+    'Transfer'                                   => '',
     'bill'                                       => '賬單',
-    'yes'                                        => 'Yes',
-    'no'                                         => 'No',
-    'amount'                                     => 'Amount',
-    'overview'                                   => 'Overview',
-    'saveOnAccount'                              => 'Save on account',
-    'unknown'                                    => 'Unknown',
-    'daily'                                      => 'Daily',
-    'monthly'                                    => 'Monthly',
-    'profile'                                    => 'Profile',
-    'errors'                                     => 'Errors',
+    'yes'                                        => '',
+    'no'                                         => '',
+    'amount'                                     => '',
+    'overview'                                   => '',
+    'saveOnAccount'                              => '',
+    'unknown'                                    => '',
+    'daily'                                      => '',
+    'monthly'                                    => '',
+    'profile'                                    => '',
+    'errors'                                     => '',
 
     // reports:
-    'report_default'                             => 'Default financial report between :start and :end',
-    'report_audit'                               => 'Transaction history overview between :start and :end',
-    'report_category'                            => 'Category report between :start and :end',
-    'report_budget'                              => 'Budget report between :start and :end',
-    'report_tag'                                 => 'Tag report between :start and :end',
-    'quick_link_reports'                         => 'Quick links',
-    'quick_link_default_report'                  => 'Default financial report',
-    'quick_link_audit_report'                    => 'Transaction history overview',
-    'report_this_month_quick'                    => 'Current month, all accounts',
-    'report_this_year_quick'                     => 'Current year, all accounts',
-    'report_this_fiscal_year_quick'              => 'Current fiscal year, all accounts',
-    'report_all_time_quick'                      => 'All-time, all accounts',
-    'reports_can_bookmark'                       => 'Remember that reports can be bookmarked.',
-    'incomeVsExpenses'                           => 'Income vs. expenses',
+    'report_default'                             => '',
+    'report_audit'                               => '',
+    'report_category'                            => '',
+    'report_budget'                              => '',
+    'report_tag'                                 => '',
+    'quick_link_reports'                         => '',
+    'quick_link_default_report'                  => '',
+    'quick_link_audit_report'                    => '',
+    'report_this_month_quick'                    => '',
+    'report_this_year_quick'                     => '',
+    'report_this_fiscal_year_quick'              => '',
+    'report_all_time_quick'                      => '',
+    'reports_can_bookmark'                       => '',
+    'incomeVsExpenses'                           => '',
     'accountBalances'                            => '帳戶餘額',
     'balanceStart'                               => '期間之初的結餘',
     'balanceEnd'                                 => '期間之未的結餘',
     'splitByAccount'                             => '以帳號來分割',
-    'coveredWithTags'                            => 'Covered with tags',
-    'leftUnbalanced'                             => 'Left unbalanced',
-    'leftInBudget'                               => 'Left in budget',
-    'sumOfSums'                                  => 'Sum of sums',
-    'noCategory'                                 => '(no category)',
-    'notCharged'                                 => 'Not charged (yet)',
-    'inactive'                                   => 'Inactive',
-    'active'                                     => 'Active',
-    'difference'                                 => 'Difference',
-    'in'                                         => 'In',
-    'out'                                        => 'Out',
-    'topX'                                       => 'top :number',
-    'show_full_list'                             => 'Show entire list',
-    'show_only_top'                              => 'Show only top :number',
-    'report_type'                                => 'Report type',
-    'report_type_default'                        => 'Default financial report',
-    'report_type_audit'                          => 'Transaction history overview (audit)',
-    'report_type_category'                       => 'Category report',
-    'report_type_budget'                         => 'Budget report',
-    'report_type_tag'                            => 'Tag report',
-    'more_info_help'                             => 'More information about these types of reports can be found in the help pages. Press the (?) icon in the top right corner.',
-    'report_included_accounts'                   => 'Included accounts',
-    'report_date_range'                          => 'Date range',
-    'report_preset_ranges'                       => 'Pre-set ranges',
-    'shared'                                     => 'Shared',
-    'fiscal_year'                                => 'Fiscal year',
-    'income_entry'                               => 'Income from account ":name" between :start and :end',
-    'expense_entry'                              => 'Expenses to account ":name" between :start and :end',
-    'category_entry'                             => 'Expenses in category ":name" between :start and :end',
-    'budget_spent_amount'                        => 'Expenses in budget ":budget" between :start and :end',
+    'coveredWithTags'                            => '',
+    'leftUnbalanced'                             => '',
+    'leftInBudget'                               => '',
+    'sumOfSums'                                  => '',
+    'noCategory'                                 => '',
+    'notCharged'                                 => '',
+    'inactive'                                   => '',
+    'active'                                     => '',
+    'difference'                                 => '',
+    'in'                                         => '',
+    'out'                                        => '',
+    'topX'                                       => '',
+    'show_full_list'                             => '',
+    'show_only_top'                              => '',
+    'report_type'                                => '',
+    'report_type_default'                        => '',
+    'report_type_audit'                          => '',
+    'report_type_category'                       => '',
+    'report_type_budget'                         => '',
+    'report_type_tag'                            => '',
+    'more_info_help'                             => '',
+    'report_included_accounts'                   => '',
+    'report_date_range'                          => '',
+    'report_preset_ranges'                       => '',
+    'shared'                                     => '',
+    'fiscal_year'                                => '',
+    'income_entry'                               => '',
+    'expense_entry'                              => '',
+    'category_entry'                             => '',
+    'budget_spent_amount'                        => '',
     'balance_amount'                             => '與 :start 和 :end 之間由帳號 ":account" 支付的預算 ":budget" 的支出',
-    'no_audit_activity'                          => 'No activity was recorded on account <a href=":url" title=":account_name">:account_name</a> between :start and :end.',
+    'no_audit_activity'                          => '',
     'audit_end_balance'                          => '<a href=":url" title=":account_name">:account_name</a> 在 :end 後的餘額是: :balance',
-    'reports_extra_options'                      => 'Extra options',
-    'report_has_no_extra_options'                => 'This report has no extra options',
-    'reports_submit'                             => 'View report',
-    'end_after_start_date'                       => 'End date of report must be after start date.',
-    'select_category'                            => 'Select category(ies)',
-    'select_budget'                              => 'Select budget(s).',
-    'select_tag'                                 => 'Select tag(s).',
-    'income_per_category'                        => 'Income per category',
-    'expense_per_category'                       => 'Expense per category',
-    'expense_per_budget'                         => 'Expense per budget',
-    'income_per_account'                         => 'Income per account',
-    'expense_per_account'                        => 'Expense per account',
-    'expense_per_tag'                            => 'Expense per tag',
-    'income_per_tag'                             => 'Income per tag',
-    'include_expense_not_in_budget'              => 'Included expenses not in the selected budget(s)',
-    'include_expense_not_in_account'             => 'Included expenses not in the selected account(s)',
-    'include_expense_not_in_category'            => 'Included expenses not in the selected category(ies)',
-    'include_income_not_in_category'             => 'Included income not in the selected category(ies)',
-    'include_income_not_in_account'              => 'Included income not in the selected account(s)',
-    'include_income_not_in_tags'                 => 'Included income not in the selected tag(s)',
-    'include_expense_not_in_tags'                => 'Included expenses not in the selected tag(s)',
-    'everything_else'                            => 'Everything else',
-    'income_and_expenses'                        => 'Income and expenses',
-    'spent_average'                              => 'Spent (average)',
-    'income_average'                             => 'Income (average)',
-    'transaction_count'                          => 'Transaction count',
-    'average_spending_per_account'               => 'Average spending per account',
-    'average_income_per_account'                 => 'Average income per account',
-    'total'                                      => 'Total',
-    'description'                                => 'Description',
-    'sum_of_period'                              => 'Sum of period',
-    'average_in_period'                          => 'Average in period',
-    'account_role_defaultAsset'                  => 'Default asset account',
-    'account_role_sharedAsset'                   => 'Shared asset account',
-    'account_role_savingAsset'                   => 'Savings account',
-    'account_role_ccAsset'                       => 'Credit card',
+    'reports_extra_options'                      => '',
+    'report_has_no_extra_options'                => '',
+    'reports_submit'                             => '',
+    'end_after_start_date'                       => '',
+    'select_category'                            => '',
+    'select_budget'                              => '',
+    'select_tag'                                 => '',
+    'income_per_category'                        => '',
+    'expense_per_category'                       => '',
+    'expense_per_budget'                         => '',
+    'income_per_account'                         => '',
+    'expense_per_account'                        => '',
+    'expense_per_tag'                            => '',
+    'income_per_tag'                             => '',
+    'include_expense_not_in_budget'              => '',
+    'include_expense_not_in_account'             => '',
+    'include_expense_not_in_category'            => '',
+    'include_income_not_in_category'             => '',
+    'include_income_not_in_account'              => '',
+    'include_income_not_in_tags'                 => '',
+    'include_expense_not_in_tags'                => '',
+    'everything_else'                            => '',
+    'income_and_expenses'                        => '',
+    'spent_average'                              => '',
+    'income_average'                             => '',
+    'transaction_count'                          => '',
+    'average_spending_per_account'               => '',
+    'average_income_per_account'                 => '',
+    'total'                                      => '',
+    'description'                                => '',
+    'sum_of_period'                              => '',
+    'average_in_period'                          => '',
+    'account_role_defaultAsset'                  => '',
+    'account_role_sharedAsset'                   => '',
+    'account_role_savingAsset'                   => '',
+    'account_role_ccAsset'                       => '',
 
     // charts:
-    'chart'                                      => 'Chart',
-    'month'                                      => 'Month',
-    'budget'                                     => 'Budget',
-    'spent'                                      => 'Spent',
-    'spent_in_budget'                            => 'Spent in budget',
-    'left_to_spend'                              => 'Left to spend',
-    'earned'                                     => 'Earned',
-    'overspent'                                  => 'Overspent',
-    'left'                                       => 'Left',
-    'no_budget'                                  => '(no budget)',
-    'max-amount'                                 => 'Maximum amount',
-    'min-amount'                                 => 'Minumum amount',
-    'journal-amount'                             => 'Current bill entry',
-    'name'                                       => 'Name',
-    'date'                                       => 'Date',
-    'paid'                                       => 'Paid',
-    'unpaid'                                     => 'Unpaid',
-    'day'                                        => 'Day',
-    'budgeted'                                   => 'Budgeted',
-    'period'                                     => 'Period',
+    'chart'                                      => '',
+    'month'                                      => '',
+    'budget'                                     => '',
+    'spent'                                      => '',
+    'spent_in_budget'                            => '',
+    'left_to_spend'                              => '',
+    'earned'                                     => '',
+    'overspent'                                  => '',
+    'left'                                       => '',
+    'no_budget'                                  => '',
+    'max-amount'                                 => '',
+    'min-amount'                                 => '',
+    'journal-amount'                             => '',
+    'name'                                       => '',
+    'date'                                       => '',
+    'paid'                                       => '',
+    'unpaid'                                     => '',
+    'day'                                        => '',
+    'budgeted'                                   => '',
+    'period'                                     => '',
     'balance'                                    => '餘額',
-    'sum'                                        => 'Sum',
-    'average'                                    => 'Average',
+    'sum'                                        => '',
+    'average'                                    => '',
     'balanceFor'                                 => ':name 的餘額',
 
     // piggy banks:
-    'add_money_to_piggy'                         => 'Add money to piggy bank ":name"',
-    'piggy_bank'                                 => 'Piggy bank',
-    'new_piggy_bank'                             => 'New piggy bank',
-    'store_piggy_bank'                           => 'Store new piggy bank',
-    'stored_piggy_bank'                          => 'Store new piggy bank ":name"',
-    'account_status'                             => 'Account status',
-    'left_for_piggy_banks'                       => 'Left for piggy banks',
-    'sum_of_piggy_banks'                         => 'Sum of piggy banks',
-    'saved_so_far'                               => 'Saved so far',
-    'left_to_save'                               => 'Left to save',
-    'suggested_amount'                           => 'Suggested monthly amount to save',
-    'add_money_to_piggy_title'                   => 'Add money to piggy bank ":name"',
-    'remove_money_from_piggy_title'              => 'Remove money from piggy bank ":name"',
-    'add'                                        => 'Add',
+    'add_money_to_piggy'                         => '',
+    'piggy_bank'                                 => '',
+    'new_piggy_bank'                             => '',
+    'store_piggy_bank'                           => '',
+    'stored_piggy_bank'                          => '',
+    'account_status'                             => '',
+    'left_for_piggy_banks'                       => '',
+    'sum_of_piggy_banks'                         => '',
+    'saved_so_far'                               => '',
+    'left_to_save'                               => '',
+    'suggested_amount'                           => '',
+    'add_money_to_piggy_title'                   => '',
+    'remove_money_from_piggy_title'              => '',
+    'add'                                        => '',
 
-    'remove'                     => 'Remove',
-    'max_amount_add'             => 'The maximum amount you can add is',
-    'max_amount_remove'          => 'The maximum amount you can remove is',
-    'update_piggy_button'        => 'Update piggy bank',
-    'update_piggy_title'         => 'Update piggy bank ":name"',
-    'updated_piggy_bank'         => 'Updated piggy bank ":name"',
-    'details'                    => 'Details',
-    'events'                     => 'Events',
-    'target_amount'              => 'Target amount',
-    'start_date'                 => 'Start date',
+    'remove'                     => '',
+    'max_amount_add'             => '',
+    'max_amount_remove'          => '',
+    'update_piggy_button'        => '',
+    'update_piggy_title'         => '',
+    'updated_piggy_bank'         => '',
+    'details'                    => '',
+    'events'                     => '',
+    'target_amount'              => '',
+    'start_date'                 => '',
     'target_date'                => '儲蓄目標日期',
     'no_target_date'             => '沒有儲蓄目標日期',
-    'table'                      => 'Table',
-    'delete_piggy_bank'          => 'Delete piggy bank ":name"',
-    'cannot_add_amount_piggy'    => 'Could not add :amount to ":name".',
-    'cannot_remove_from_piggy'   => 'Could not remove :amount from ":name".',
-    'deleted_piggy_bank'         => 'Deleted piggy bank ":name"',
-    'added_amount_to_piggy'      => 'Added :amount to ":name"',
-    'removed_amount_from_piggy'  => 'Removed :amount from ":name"',
+    'table'                      => '',
+    'delete_piggy_bank'          => '',
+    'cannot_add_amount_piggy'    => '',
+    'cannot_remove_from_piggy'   => '',
+    'deleted_piggy_bank'         => '',
+    'added_amount_to_piggy'      => '',
+    'removed_amount_from_piggy'  => '',
 
     // tags
     'regular_tag'                => '只是一個普通的標籤。',
@@ -835,178 +835,178 @@ return [
     'updated_tag'                => '更新了標籤 ":tag"',
     'created_tag'                => '成功創建標籤 ":tag" ！',
 
-    'transaction_journal_information'       => 'Transaction information',
-    'transaction_journal_meta'              => 'Meta information',
-    'total_amount'                          => 'Total amount',
-    'number_of_decimals'                    => 'Number of decimals',
+    'transaction_journal_information'       => '',
+    'transaction_journal_meta'              => '',
+    'total_amount'                          => '',
+    'number_of_decimals'                    => '',
 
     // administration
-    'administration'                        => 'Administration',
-    'user_administration'                   => 'User administration',
-    'list_all_users'                        => 'All users',
-    'all_users'                             => 'All users',
-    'instance_configuration'                => 'Configuration',
-    'firefly_instance_configuration'        => 'Configuration options for Firefly III',
-    'setting_single_user_mode'              => 'Single user mode',
-    'setting_single_user_mode_explain'      => 'By default, Firefly III only accepts one (1) registration: you. This is a security measure, preventing others from using your instance unless you allow them to. Future registrations are blocked. When you uncheck this box, others can use your instance as wel, assuming they can reach it (when it is connected to the internet).',
-    'store_configuration'                   => 'Store configuration',
-    'single_user_administration'            => 'User administration for :email',
-    'edit_user'                             => 'Edit user :email',
-    'hidden_fields_preferences'             => 'Not all fields are visible right now. You must enable them in your <a href=":link">settings</a>.',
-    'user_data_information'                 => 'User data',
-    'user_information'                      => 'User information',
-    'total_size'                            => 'total size',
-    'budget_or_budgets'                     => 'budget(s)',
-    'budgets_with_limits'                   => 'budget(s) with configured amount',
-    'rule_or_rules'                         => 'rule(s)',
-    'rulegroup_or_groups'                   => 'rule group(s)',
-    'configuration_updated'                 => 'The configuration has been updated',
-    'setting_is_demo_site'                  => 'Demo site',
-    'setting_is_demo_site_explain'          => 'If you check this box, this installation will behave as if it is the demo site, which can have weird side effects.',
-    'block_code_bounced'                    => 'Email message(s) bounced',
-    'block_code_expired'                    => 'Demo account expired',
-    'no_block_code'                         => 'No reason for block or user not blocked',
+    'administration'                        => '',
+    'user_administration'                   => '',
+    'list_all_users'                        => '',
+    'all_users'                             => '',
+    'instance_configuration'                => '',
+    'firefly_instance_configuration'        => '',
+    'setting_single_user_mode'              => '',
+    'setting_single_user_mode_explain'      => '',
+    'store_configuration'                   => '',
+    'single_user_administration'            => '',
+    'edit_user'                             => '',
+    'hidden_fields_preferences'             => '',
+    'user_data_information'                 => '',
+    'user_information'                      => '',
+    'total_size'                            => '',
+    'budget_or_budgets'                     => '',
+    'budgets_with_limits'                   => '',
+    'rule_or_rules'                         => '',
+    'rulegroup_or_groups'                   => '',
+    'configuration_updated'                 => '',
+    'setting_is_demo_site'                  => '',
+    'setting_is_demo_site_explain'          => '',
+    'block_code_bounced'                    => '',
+    'block_code_expired'                    => '',
+    'no_block_code'                         => '',
     // links
-    'journal_link_configuration'            => 'Transaction links configuration',
-    'create_new_link_type'                  => 'Create new link type',
-    'store_new_link_type'                   => 'Store new link type',
-    'update_link_type'                      => 'Update link type',
-    'edit_link_type'                        => 'Edit link type ":name"',
-    'updated_link_type'                     => 'Updated link type ":name"',
-    'delete_link_type'                      => 'Delete link type ":name"',
-    'deleted_link_type'                     => 'Deleted link type ":name"',
-    'stored_new_link_type'                  => 'Store new link type ":name"',
-    'cannot_edit_link_type'                 => 'Cannot edit link type ":name"',
-    'link_type_help_name'                   => 'Ie. "Duplicates"',
-    'link_type_help_inward'                 => 'Ie. "duplicates"',
-    'link_type_help_outward'                => 'Ie. "is duplicated by"',
-    'save_connections_by_moving'            => 'Save the link between these transaction(s) by moving them to another link type:',
-    'do_not_save_connection'                => '(do not save connection)',
-    'link_transaction'                      => 'Link transaction',
-    'link_to_other_transaction'             => 'Link this transaction to another transaction',
-    'select_transaction_to_link'            => 'Select a transaction to link this transaction to',
-    'this_transaction'                      => 'This transaction',
-    'transaction'                           => 'Transaction',
-    'comments'                              => 'Comments',
-    'to_link_not_found'                     => 'If the transaction you want to link to is not listed, simply enter its ID.',
-    'invalid_link_data'                     => 'Invalid link type selected. Cannot link transaction.',
-    'journals_linked'                       => 'Transactions are linked.',
-    'journals_error_linked'                 => 'These transactions are already linked.',
-    'journal_links'                         => 'Transaction links',
-    'this_withdrawal'                       => 'This withdrawal',
-    'this_deposit'                          => 'This deposit',
-    'this_transfer'                         => 'This transfer',
-    'overview_for_link'                     => 'Overview for link type ":name"',
-    'delete_journal_link'                   => 'Delete the link between <a href=":source_link">:source</a> and <a href=":destination_link">:destination</a>',
-    'deleted_link'                          => 'Deleted link',
+    'journal_link_configuration'            => '',
+    'create_new_link_type'                  => '',
+    'store_new_link_type'                   => '',
+    'update_link_type'                      => '',
+    'edit_link_type'                        => '',
+    'updated_link_type'                     => '',
+    'delete_link_type'                      => '',
+    'deleted_link_type'                     => '',
+    'stored_new_link_type'                  => '',
+    'cannot_edit_link_type'                 => '',
+    'link_type_help_name'                   => '',
+    'link_type_help_inward'                 => '',
+    'link_type_help_outward'                => '',
+    'save_connections_by_moving'            => '',
+    'do_not_save_connection'                => '',
+    'link_transaction'                      => '',
+    'link_to_other_transaction'             => '',
+    'select_transaction_to_link'            => '',
+    'this_transaction'                      => '',
+    'transaction'                           => '',
+    'comments'                              => '',
+    'to_link_not_found'                     => '',
+    'invalid_link_data'                     => '',
+    'journals_linked'                       => '',
+    'journals_error_linked'                 => '',
+    'journal_links'                         => '',
+    'this_withdrawal'                       => '',
+    'this_deposit'                          => '',
+    'this_transfer'                         => '',
+    'overview_for_link'                     => '',
+    'delete_journal_link'                   => '',
+    'deleted_link'                          => '',
 
 
     // split a transaction:
     'splits'                                => '分割',
-    'add_another_split'                     => 'Add another split',
-    'split-transactions'                    => 'Split transactions',
-    'do_split'                              => 'Do a split',
-    'split_this_withdrawal'                 => 'Split this withdrawal',
-    'split_this_deposit'                    => 'Split this deposit',
-    'split_this_transfer'                   => 'Split this transfer',
+    'add_another_split'                     => '',
+    'split-transactions'                    => '',
+    'do_split'                              => '',
+    'split_this_withdrawal'                 => '',
+    'split_this_deposit'                    => '',
+    'split_this_transfer'                   => '',
     'cannot_edit_multiple_source'           => '你不能修改描述為 ":description" 的分割交易 #:id 因為他有多個來源帳號。',
     'cannot_edit_multiple_dest'             => '你不能修改描述為 ":description" 的分割交易 #:id 因為他有多個目標帳號。',
-    'cannot_edit_opening_balance'           => 'You cannot edit the opening balance of an account.',
-    'no_edit_multiple_left'                 => 'You have selected no valid transactions to edit.',
+    'cannot_edit_opening_balance'           => '',
+    'no_edit_multiple_left'                 => '',
 
     // import bread crumbs and titles:
     'import'                                => '匯入',
     'import_data'                           => '匯入資料',
 
     // import index page:
-    'import_index_title'                    => 'Import data into Firefly III',
-    'import_index_sub_title'                => 'Index',
-    'import_general_index_intro'            => 'Welcome to Firefly\'s import routine. There are a few ways of importing data into Firefly III, displayed here as buttons.',
-    'import_index_intro'                    => 'This routine will help you import files from your bank into Firefly III. Please check out the help pages in the top right corner.',
-    'import_index_file'                     => 'Select your file',
-    'import_index_config'                   => 'If you have previously imported data into Firefly III, you may have a configuration file, which will pre-set configuration values for you. For some banks, other users have kindly provided their <a href="https://github.com/firefly-iii/import-configurations/wiki">configuration file</a>.',
-    'import_index_type'                     => 'Select the type of file you will upload',
-    'import_index_start'                    => 'Start importing',
+    'import_index_title'                    => '',
+    'import_index_sub_title'                => '',
+    'import_general_index_intro'            => '',
+    'import_index_intro'                    => '',
+    'import_index_file'                     => '',
+    'import_index_config'                   => '',
+    'import_index_type'                     => '',
+    'import_index_start'                    => '',
 
     // supported file types:
-    'import_file_type_csv'                  => 'CSV (comma separated values)',
+    'import_file_type_csv'                  => '',
 
     // import configuration routine:
-    'import_config_sub_title'               => 'Set up your import file',
-    'import_config_bread_crumb'             => 'Set up your import file',
+    'import_config_sub_title'               => '',
+    'import_config_bread_crumb'             => '',
 
     // import status page:
-    'import_status_bread_crumb'             => 'Import status',
-    'import_status_sub_title'               => 'Import status',
-    'import_status_wait_title'              => 'Please hold...',
-    'import_status_wait_text'               => 'This box will disappear in a moment.',
-    'import_status_ready_title'             => 'Import is ready to start',
-    'import_status_ready_text'              => 'The import is ready to start. All the configuration you needed to do has been done. Please download the configuration file. It will help you with the import should it not go as planned. To actually run the import, you can either execute the following command in your console, or run the web-based import. Depending on your configuration, the console import will give you more feedback.',
-    'import_status_ready_config'            => 'Download configuration',
-    'import_status_ready_start'             => 'Start the import',
-    'import_status_ready_share'             => 'Please consider downloading your configuration and sharing it at the <strong><a href="https://github.com/firefly-iii/import-configurations/wiki">import configuration center</a></strong>. This will allow other users of Firefly III to import their files more easily.',
-    'import_status_running_title'           => 'The import is running',
-    'import_status_running_placeholder'     => 'Please hold for an update...',
-    'import_status_errors_title'            => 'Errors during the import',
-    'import_status_errors_single'           => 'An error has occured during the import. It does not appear to be fatal.',
-    'import_status_errors_multi'            => 'Some errors occured during the import. These do not appear to be fatal.',
-    'import_status_fatal_title'             => 'A fatal error occurred',
-    'import_status_fatal_text'              => 'A fatal error occurred, which the import-routine cannot recover from. Please see the explanation in red below.',
-    'import_status_fatal_more'              => 'If the error is a time-out, the import will have stopped half-way. For some server configurations, it is merely the server that stopped while the import keeps running in the background. To verify this, check out the log files. If the problem persists, consider importing over the command line instead.',
-    'import_status_finished_title'          => 'Import routine finished',
-    'import_status_finished_text'           => 'The import routine has imported your file.',
-    'import_status_finished_job'            => 'The transactions imported can be found in tag <a href=":link" class="label label-success" style="font-size:100%;font-weight:normal;">:tag</a>.',
+    'import_status_bread_crumb'             => '',
+    'import_status_sub_title'               => '',
+    'import_status_wait_title'              => '',
+    'import_status_wait_text'               => '',
+    'import_status_ready_title'             => '',
+    'import_status_ready_text'              => '',
+    'import_status_ready_config'            => '',
+    'import_status_ready_start'             => '',
+    'import_status_ready_share'             => '',
+    'import_status_running_title'           => '',
+    'import_status_running_placeholder'     => '',
+    'import_status_errors_title'            => '',
+    'import_status_errors_single'           => '',
+    'import_status_errors_multi'            => '',
+    'import_status_fatal_title'             => '',
+    'import_status_fatal_text'              => '',
+    'import_status_fatal_more'              => '',
+    'import_status_finished_title'          => '',
+    'import_status_finished_text'           => '',
+    'import_status_finished_job'            => '',
     'import_with_key'                       => '以鍵 \':key\' 作匯入',
 
     // sandstorm.io errors and messages:
-    'sandstorm_not_available'               => 'This function is not available when you are using Firefly III within a Sandstorm.io environment.',
+    'sandstorm_not_available'               => '',
 
     // empty lists? no objects? instructions:
-    'no_transactions_in_period'             => 'There are no transactions in this period.',
-    'no_accounts_title_asset'               => 'Let\'s create an asset account!',
-    'no_accounts_intro_asset'               => 'You have no asset accounts yet. Asset accounts are your main accounts: your checking account, savings account, shared account or even your credit card.',
-    'no_accounts_imperative_asset'          => 'To start using Firefly III you must create at least one asset account. Let\'s do so now:',
-    'no_accounts_create_asset'              => 'Create an asset account',
-    'no_accounts_title_expense'             => 'Let\'s create an expense account!',
-    'no_accounts_intro_expense'             => 'You have no expense accounts yet. Expense accounts are the places where you spend money, such as shops and supermarkets.',
-    'no_accounts_imperative_expense'        => 'Expense accounts are created automatically when you create transactions, but you can create one manually too, if you want. Let\'s create one now:',
-    'no_accounts_create_expense'            => 'Create an expense account',
-    'no_accounts_title_revenue'             => 'Let\'s create a revenue account!',
-    'no_accounts_intro_revenue'             => 'You have no revenue accounts yet. Revenue accounts are the places where you receive money from, such as your employer.',
-    'no_accounts_imperative_revenue'        => 'Revenue accounts are created automatically when you create transactions, but you can create one manually too, if you want. Let\'s create one now:',
-    'no_accounts_create_revenue'            => 'Create a revenue account',
-    'no_budgets_title_default'              => 'Let\'s create a budget',
-    'no_budgets_intro_default'              => 'You have no budgets yet. Budgets are used to organise your expenses into logical groups, which you can give a soft-cap to limit your expenses.',
-    'no_budgets_imperative_default'         => 'Budgets are the basic tools of financial management. Let\'s create one now:',
-    'no_budgets_create_default'             => 'Create a budget',
-    'no_categories_title_default'           => 'Let\'s create a category!',
-    'no_categories_intro_default'           => 'You have no categories yet. Categories are used to fine tune your transactions and label them with their designated category.',
-    'no_categories_imperative_default'      => 'Categories are created automatically when you create transactions, but you can create one manually too. Let\'s create one now:',
-    'no_categories_create_default'          => 'Create a category',
-    'no_tags_title_default'                 => 'Let\'s create a tag!',
-    'no_tags_intro_default'                 => 'You have no tags yet. Tags are used to fine tune your transactions and label them with specific keywords.',
-    'no_tags_imperative_default'            => 'Tags are created automatically when you create transactions, but you can create one manually too. Let\'s create one now:',
-    'no_tags_create_default'                => 'Create a tag',
-    'no_transactions_title_withdrawal'      => 'Let\'s create an expense!',
-    'no_transactions_intro_withdrawal'      => 'You have no expenses yet. You should create expenses to start managing your finances.',
-    'no_transactions_imperative_withdrawal' => 'Have you spent some money? Then you should write it down:',
-    'no_transactions_create_withdrawal'     => 'Create an expense',
-    'no_transactions_title_deposit'         => 'Let\'s create some income!',
-    'no_transactions_intro_deposit'         => 'You have no recorded income yet. You should create income entries to start managing your finances.',
-    'no_transactions_imperative_deposit'    => 'Have you received some money? Then you should write it down:',
-    'no_transactions_create_deposit'        => 'Create a deposit',
-    'no_transactions_title_transfers'       => 'Let\'s create a transfer!',
-    'no_transactions_intro_transfers'       => 'You have no transfers yet. When you move money between asset accounts, it is recorded as a transfer.',
-    'no_transactions_imperative_transfers'  => 'Have you moved some money around? Then you should write it down:',
-    'no_transactions_create_transfers'      => 'Create a transfer',
-    'no_piggies_title_default'              => 'Let\'s create a piggy bank!',
-    'no_piggies_intro_default'              => 'You have no piggy banks yet. You can create piggy banks to divide your savings and keep track of what you\'re saving up for.',
-    'no_piggies_imperative_default'         => 'Do you have things you\'re saving money for? Create a piggy bank and keep track:',
-    'no_piggies_create_default'             => 'Create a new piggy bank',
-    'no_bills_title_default'                => 'Let\'s create a bill!',
-    'no_bills_intro_default'                => 'You have no bills yet. You can create bills to keep track of regular expenses, like your rent of insurance.',
-    'no_bills_imperative_default'           => 'Do you have such regular bills? Create a bill and keep track of your payments:',
-    'no_bills_create_default'               => 'Create a bill',
+    'no_transactions_in_period'             => '',
+    'no_accounts_title_asset'               => '',
+    'no_accounts_intro_asset'               => '',
+    'no_accounts_imperative_asset'          => '',
+    'no_accounts_create_asset'              => '',
+    'no_accounts_title_expense'             => '',
+    'no_accounts_intro_expense'             => '',
+    'no_accounts_imperative_expense'        => '',
+    'no_accounts_create_expense'            => '',
+    'no_accounts_title_revenue'             => '',
+    'no_accounts_intro_revenue'             => '',
+    'no_accounts_imperative_revenue'        => '',
+    'no_accounts_create_revenue'            => '',
+    'no_budgets_title_default'              => '',
+    'no_budgets_intro_default'              => '',
+    'no_budgets_imperative_default'         => '',
+    'no_budgets_create_default'             => '',
+    'no_categories_title_default'           => '',
+    'no_categories_intro_default'           => '',
+    'no_categories_imperative_default'      => '',
+    'no_categories_create_default'          => '',
+    'no_tags_title_default'                 => '',
+    'no_tags_intro_default'                 => '',
+    'no_tags_imperative_default'            => '',
+    'no_tags_create_default'                => '',
+    'no_transactions_title_withdrawal'      => '',
+    'no_transactions_intro_withdrawal'      => '',
+    'no_transactions_imperative_withdrawal' => '',
+    'no_transactions_create_withdrawal'     => '',
+    'no_transactions_title_deposit'         => '',
+    'no_transactions_intro_deposit'         => '',
+    'no_transactions_imperative_deposit'    => '',
+    'no_transactions_create_deposit'        => '',
+    'no_transactions_title_transfers'       => '',
+    'no_transactions_intro_transfers'       => '',
+    'no_transactions_imperative_transfers'  => '',
+    'no_transactions_create_transfers'      => '',
+    'no_piggies_title_default'              => '',
+    'no_piggies_intro_default'              => '',
+    'no_piggies_imperative_default'         => '',
+    'no_piggies_create_default'             => '',
+    'no_bills_title_default'                => '',
+    'no_bills_intro_default'                => '',
+    'no_bills_imperative_default'           => '',
+    'no_bills_create_default'               => '',
 
 
 ];
\ No newline at end of file

From ede7b1b35cf28912ecb791a093b47bfe4f1286bf Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Fri, 25 Aug 2017 07:08:02 +0200
Subject: [PATCH 290/668] New translations csv.php (Spanish)

---
 resources/lang/es_ES/csv.php | 46 ++++++++++++++++++------------------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/resources/lang/es_ES/csv.php b/resources/lang/es_ES/csv.php
index ffdf32c5eb..5377c2cecb 100644
--- a/resources/lang/es_ES/csv.php
+++ b/resources/lang/es_ES/csv.php
@@ -14,36 +14,36 @@ declare(strict_types=1);
 return [
 
     // initial config
-    'initial_title'                 => 'Import setup (1/3) - Basic CSV import setup',
+    'initial_title'                 => '',
     'initial_text'                  => 'Para poder importar correctamente el archivo, por favor comprueba las opciones a continuación.',
-    'initial_box'                   => 'Basic CSV import setup',
-    'initial_box_title'             => 'Basic CSV import setup options',
+    'initial_box'                   => '',
+    'initial_box_title'             => '',
     'initial_header_help'           => 'Marque aquí si el CSV contiene títulos de columna en la primera fila.',
-    'initial_date_help'             => 'Date time format in your CSV. Follow the format like <a href="https://secure.php.net/manual/en/datetime.createfromformat.php#refsect1-datetime.createfromformat-parameters">this page</a> indicates. The default value will parse dates that look like this: :dateExample.',
-    'initial_delimiter_help'        => 'Choose the field delimiter that is used in your input file. If not sure, comma is the safest option.',
-    'initial_import_account_help'   => 'If your CSV file does NOT contain information about your asset account(s), use this dropdown to select to which account the transactions in the CSV belong to.',
-    'initial_submit'                => 'Continue with step 2/3',
+    'initial_date_help'             => '',
+    'initial_delimiter_help'        => '',
+    'initial_import_account_help'   => '',
+    'initial_submit'                => '',
 
     // roles config
-    'roles_title'                   => 'Import setup (2/3) - Define each column\'s role',
-    'roles_text'                    => 'Each column in your CSV file contains certain data. Please indicate what kind of data the importer should expect. The option to "map" data means that you will link each entry found in the column to a value in your database. An often mapped column is the column that contains the IBAN of the opposing account. That can be easily matched to IBAN\'s present in your database already.',
-    'roles_table'                   => 'Table',
-    'roles_column_name'             => 'Name of column',
-    'roles_column_example'          => 'Column example data',
-    'roles_column_role'             => 'Column data meaning',
-    'roles_do_map_value'            => 'Map these values',
-    'roles_column'                  => 'Column',
-    'roles_no_example_data'         => 'No example data available',
-    'roles_submit'                  => 'Continue with step 3/3',
-    'roles_warning'                 => 'At the very least, mark one column as the amount-column. It is advisable to also select a column for the description, date and the opposing account.',
+    'roles_title'                   => '',
+    'roles_text'                    => '',
+    'roles_table'                   => '',
+    'roles_column_name'             => '',
+    'roles_column_example'          => '',
+    'roles_column_role'             => '',
+    'roles_do_map_value'            => '',
+    'roles_column'                  => '',
+    'roles_no_example_data'         => '',
+    'roles_submit'                  => '',
+    'roles_warning'                 => '',
 
     // map data
-    'map_title'                     => 'Import setup (3/3) - Connect import data to Firefly III data',
+    'map_title'                     => '',
     'map_text'                      => 'En las siguientes tablas el valor de la izquierda muestra información encontrada en el CSV cargado. Es su tarea mapear este valor, si es posible, a un valor ya presente en su base de datos. Firefly respeterá este mapeo. Si no hay un valor hacia el cual mapear o no desea mapear un valor específico, no seleccione ninguno.',
-    'map_field_value'               => 'Field value',
-    'map_field_mapped_to'           => 'Mapped to',
-    'map_do_not_map'                => '(do not map)',
-    'map_submit'                    => 'Start the import',
+    'map_field_value'               => '',
+    'map_field_mapped_to'           => '',
+    'map_do_not_map'                => '',
+    'map_submit'                    => '',
 
     // map things.
     'column__ignore'                => '(ignorar esta columna)',

From e6bf9faa3e7e51cc81f498855f29e98eb5fb1274 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Fri, 25 Aug 2017 07:08:05 +0200
Subject: [PATCH 291/668] New translations firefly.php (Polish)

---
 resources/lang/pl_PL/firefly.php | 346 +++++++++++++++----------------
 1 file changed, 173 insertions(+), 173 deletions(-)

diff --git a/resources/lang/pl_PL/firefly.php b/resources/lang/pl_PL/firefly.php
index 2352179e23..e54328956b 100644
--- a/resources/lang/pl_PL/firefly.php
+++ b/resources/lang/pl_PL/firefly.php
@@ -71,31 +71,31 @@ return [
     'destination_accounts'                       => 'Konto(a) docelowe',
     'user_id_is'                                 => 'Twój id użytkownika to <strong>:user</strong>',
     'field_supports_markdown'                    => 'To pole obsługuje <a href="https://en.support.wordpress.com/markdown-quick-reference/"> Markdown</a>.',
-    'need_more_help'                             => 'If you need more help using Firefly III, please <a href="https://github.com/firefly-iii/firefly-iii/issues">open a ticket on Github</a>.',
-    'reenable_intro_text'                        => 'You can also reenable <a href="#" id="reenableGuidance">the introduction guidance</a>.',
-    'intro_boxes_after_refresh'                  => 'The introduction boxes will reappear when you refresh the page.',
+    'need_more_help'                             => '',
+    'reenable_intro_text'                        => '',
+    'intro_boxes_after_refresh'                  => '',
     'show_all_no_filter'                         => 'Pokaż wszystkie transakcje bez grupowania ich według daty.',
     'expenses_by_category'                       => 'Wydatki wg kategorii',
     'expenses_by_budget'                         => 'Wydatki wg budżetu',
     'income_by_category'                         => 'Dochody wg kategorii',
-    'expenses_by_asset_account'                  => 'Expenses by asset account',
-    'expenses_by_expense_account'                => 'Expenses by expense account',
-    'cannot_redirect_to_account'                 => 'Firefly III cannot redirect you to the correct page. Apologies.',
+    'expenses_by_asset_account'                  => '',
+    'expenses_by_expense_account'                => '',
+    'cannot_redirect_to_account'                 => '',
     'sum_of_expenses'                            => 'Suma wydatków',
     'sum_of_income'                              => 'Suma dochodów',
-    'total_sum'                                  => 'Total sum',
+    'total_sum'                                  => '',
     'spent_in_specific_budget'                   => 'Wydatki w budżecie ":budget"',
     'sum_of_expenses_in_budget'                  => 'Wydano łącznie w budżecie ":budget"',
-    'left_in_budget_limit'                       => 'Left to spend according to budgeting',
+    'left_in_budget_limit'                       => '',
     'cannot_reset_demo_user'                     => 'Nie można zresetować hasła do konta demonstracyjnego',
     'current_period'                             => 'Bieżący okres',
     'show_the_current_period_and_overview'       => 'Pokaż bieżący okres oraz przegląd',
-    'pref_languages_locale'                      => 'For a language other than English to work properly, your operating system must be equipped with the correct locale-information. If these are not present, currency data, dates and amounts may be formatted wrong.',
-    'budget_in_period'                           => 'All transactions for budget ":name" between :start and :end',
-    'chart_budget_in_period'                     => 'Chart for all transactions for budget ":name" between :start and :end',
-    'chart_account_in_period'                    => 'Chart for all transactions for account ":name" between :start and :end',
-    'chart_category_in_period'                   => 'Chart for all transactions for category ":name" between :start and :end',
-    'chart_category_all'                         => 'Chart for all transactions for category ":name"',
+    'pref_languages_locale'                      => '',
+    'budget_in_period'                           => '',
+    'chart_budget_in_period'                     => '',
+    'chart_account_in_period'                    => '',
+    'chart_category_in_period'                   => '',
+    'chart_category_all'                         => '',
     'clone_withdrawal'                           => 'Zduplikuj tę wypłatę',
     'clone_deposit'                              => 'Zduplikuj tą wpłatę',
     'clone_transfer'                             => 'Zduplikuj ten transfer',
@@ -110,7 +110,7 @@ return [
     'all_journals_for_account'                   => 'Wszystkie transakcje dla konta :name',
     'chart_all_journals_for_account'             => 'Wykres wszystkich transakcji dla konta :name',
     'journals_in_period_for_account'             => 'Wszystkie transakcje dla konta :name od :start do :end',
-    'transferred'                                => 'Transferred',
+    'transferred'                                => '',
     'all_withdrawal'                             => 'Wszystkie wydatki',
     'all_transactions'                           => 'Wszystkie transakcje',
     'title_withdrawal_between'                   => 'Wszystkie wydatki między :start a :koniec',
@@ -127,14 +127,14 @@ return [
     'journals_in_period_for_category'            => 'Wszystkie transakcje dla kategorii :name od :start do :end',
     'journals_in_period_for_tag'                 => 'Wszystkie transakcje dla tagu :name od :start do :end',
     'not_available_demo_user'                    => 'Funkcja, do której próbujesz uzyskać dostęp nie jest dostępna dla użytkowników demo.',
-    'exchange_rate_instructions'                 => 'Asset account "@name" only accepts transactions in @native_currency. If you wish to use @foreign_currency instead, make sure that the amount in @native_currency is known as well:',
-    'transfer_exchange_rate_instructions'        => 'Source asset account "@source_name" only accepts transactions in @source_currency. Destination asset account "@dest_name" only accepts transactions in @dest_currency. You must provide the transferred amount correctly in both currencies.',
+    'exchange_rate_instructions'                 => '',
+    'transfer_exchange_rate_instructions'        => '',
     'transaction_data'                           => 'Dane transakcji',
 
     // search
     'search'                                     => 'Szukaj',
-    'search_found_transactions'                  => 'Number of transactions found:',
-    'general_search_error'                       => 'An error occured while searching. Please check the log files for more information.',
+    'search_found_transactions'                  => '',
+    'general_search_error'                       => '',
     'search_box'                                 => 'Szukaj',
     'search_box_intro'                           => 'Witamy w funkcji wyszukiwania Firefly III. Wpisz zapytanie w polu. Upewnij się, że sprawdziłeś plik pomocy, ponieważ wyszukiwanie jest dość zaawansowane.',
     'search_error'                               => 'Błąd podczas wyszukiwania',
@@ -151,25 +151,25 @@ return [
     // export data:
     'import_and_export'                          => 'Import / eksport',
     'export_data'                                => 'Eksportuj dane',
-    'export_data_intro'                          => 'For backup purposes, when migrating to another system or when migrating to another Firefly III installation.',
+    'export_data_intro'                          => '',
     'export_format'                              => 'Format eksportu',
     'export_format_csv'                          => 'Wartości oddzielone przecinkami (plik CSV)',
     'export_format_mt940'                        => 'Format kompatybilny z MT940',
     'export_included_accounts'                   => 'Eksportuj transakcje z tych kont',
-    'include_old_uploads_help'                   => 'Firefly III does not throw away the original CSV files you have imported in the past. You can include them in your export.',
+    'include_old_uploads_help'                   => '',
     'do_export'                                  => 'Eksportuj',
     'export_status_never_started'                => 'Eksport nie został jeszcze rozpoczęty',
-    'export_status_make_exporter'                => 'Creating exporter thing...',
-    'export_status_collecting_journals'          => 'Collecting your transactions...',
-    'export_status_collected_journals'           => 'Collected your transactions!',
-    'export_status_converting_to_export_format'  => 'Converting your transactions...',
+    'export_status_make_exporter'                => '',
+    'export_status_collecting_journals'          => '',
+    'export_status_collected_journals'           => '',
+    'export_status_converting_to_export_format'  => '',
     'export_status_converted_to_export_format'   => 'Przekonwertowano twoje transakcje!',
     'export_status_creating_journal_file'        => 'Tworzenie pliku eksportu...',
     'export_status_created_journal_file'         => 'Utworzono plik eksportu!',
-    'export_status_collecting_attachments'       => 'Collecting all your attachments...',
+    'export_status_collecting_attachments'       => '',
     'export_status_collected_attachments'        => 'Zebrano wszystkie twoje załączniki!',
-    'export_status_collecting_old_uploads'       => 'Collecting all your previous uploads...',
-    'export_status_collected_old_uploads'        => 'Collected all your previous uploads!',
+    'export_status_collecting_old_uploads'       => '',
+    'export_status_collected_old_uploads'        => '',
     'export_status_creating_config_file'         => 'Tworzenie pliku konfiguracji...',
     'export_status_created_config_file'          => 'Utworzono plik konfiguracyjny!',
     'export_status_creating_zip_file'            => 'Tworzenie pliku zip...',
@@ -214,28 +214,28 @@ return [
     'default_rule_action_prepend'                => 'Kupił świat od ',
     'default_rule_action_set_category'           => 'Duże wydatki',
     'trigger'                                    => 'Wyzwalacz',
-    'trigger_value'                              => 'Trigger on value',
+    'trigger_value'                              => '',
     'stop_processing_other_triggers'             => 'Zatrzymaj przetwarzanie innych wyzwalaczy',
     'add_rule_trigger'                           => 'Dodaj nowy wyzwalacz',
     'action'                                     => 'Akcja',
-    'action_value'                               => 'Action value',
+    'action_value'                               => '',
     'stop_executing_other_actions'               => 'Zatrzymaj wykonywanie innych akcji',
     'add_rule_action'                            => 'Dodaj nową akcję',
     'edit_rule'                                  => 'Modyfikuj regułę ":title"',
     'delete_rule'                                => 'Usuń regułę ":title"',
     'update_rule'                                => 'Modyfikuj regułę',
     'test_rule_triggers'                         => 'Zobacz dopasowane transakcje',
-    'warning_transaction_subset'                 => 'For performance reasons this list is limited to :max_num_transactions and may only show a subset of matching transactions',
-    'warning_no_matching_transactions'           => 'No matching transactions found. Please note that for performance reasons, only the last :num_transactions transactions have been checked.',
+    'warning_transaction_subset'                 => '',
+    'warning_no_matching_transactions'           => '',
     'warning_no_valid_triggers'                  => 'Nie dostarczono prawidłowych wyzwalaczy.',
-    'apply_rule_selection'                       => 'Apply rule ":title" to a selection of your transactions',
-    'apply_rule_selection_intro'                 => 'Rules like ":title" are normally only applied to new or updated transactions, but you can tell Firefly III to run it on a selection of your existing transactions. This can be useful when you have updated a rule and you need the changes to be applied to all of your other transactions.',
+    'apply_rule_selection'                       => '',
+    'apply_rule_selection_intro'                 => '',
     'include_transactions_from_accounts'         => 'Uwzględnij transakcje z tych kont',
-    'applied_rule_selection'                     => 'Rule ":title" has been applied to your selection.',
+    'applied_rule_selection'                     => '',
     'execute'                                    => 'Wykonaj',
-    'apply_rule_group_selection'                 => 'Apply rule group ":title" to a selection of your transactions',
-    'apply_rule_group_selection_intro'           => 'Rule groups like ":title" are normally only applied to new or updated transactions, but you can tell Firefly III to run all the rules in this group on a selection of your existing transactions. This can be useful when you have updated a group of rules and you need the changes to be applied to all of your other transactions.',
-    'applied_rule_group_selection'               => 'Rule group ":title" has been applied to your selection.',
+    'apply_rule_group_selection'                 => '',
+    'apply_rule_group_selection_intro'           => '',
+    'applied_rule_group_selection'               => '',
 
     // actions and triggers
     'rule_trigger_user_action'                   => 'Akcją użytkownika jest ":trigger_value"',
@@ -248,7 +248,7 @@ return [
     'rule_trigger_to_account_is'                 => 'Kontem docelowym jest ":trigger_value"',
     'rule_trigger_to_account_contains'           => 'Konto docelowe zawiera ":trigger_value"',
     'rule_trigger_transaction_type'              => 'Transakcja jest typu ":trigger_value"',
-    'rule_trigger_category_is'                   => 'Category is ":trigger_value"',
+    'rule_trigger_category_is'                   => '',
     'rule_trigger_amount_less'                   => 'Kwota jest mniejsza niż :trigger_value',
     'rule_trigger_amount_exactly'                => 'Kwota jest równa :trigger_value',
     'rule_trigger_amount_more'                   => 'Kwota jest większa niż :trigger_value',
@@ -275,8 +275,8 @@ return [
     'rule_trigger_category_is_choice'            => 'Kategoria jest..',
     'rule_trigger_budget_is_choice'              => 'Budżet jest..',
     'rule_trigger_tag_is_choice'                 => 'Tag jest..',
-    'rule_trigger_has_attachments_choice'        => 'Has at least this many attachments',
-    'rule_trigger_has_attachments'               => 'Has at least :trigger_value attachment(s)',
+    'rule_trigger_has_attachments_choice'        => '',
+    'rule_trigger_has_attachments'               => '',
     'rule_trigger_store_journal'                 => 'Po utworzeniu transakcji',
     'rule_trigger_update_journal'                => 'Po zmodyfikowaniu transakcji',
     'rule_action_set_category'                   => 'Ustaw kategorię na ":action_value"',
@@ -329,12 +329,12 @@ return [
     'pref_custom_fiscal_year_help'               => 'W krajach, w których rok podatkowy nie zaczyna się 1 stycznia i nie kończy 31 grudnia, możesz włączyć tą opcję oraz podać początek / koniec roku podatkowego',
     'pref_fiscal_year_start_label'               => 'Początek roku podatkowego',
     'pref_two_factor_auth'                       => 'Weryfikacja dwuetapowa',
-    'pref_two_factor_auth_help'                  => 'When you enable 2-step verification (also known as two-factor authentication), you add an extra layer of security to your account. You sign in with something you know (your password) and something you have (a verification code). Verification codes are generated by an application on your phone, such as Authy or Google Authenticator.',
+    'pref_two_factor_auth_help'                  => '',
     'pref_enable_two_factor_auth'                => 'Włącz weryfikację dwuetapową',
     'pref_two_factor_auth_disabled'              => 'Kod weryfikacji dwuetapowej został usunięty i wyłączony',
     'pref_two_factor_auth_remove_it'             => 'Nie zapomnij usunąć konta z aplikacji uwierzytelniajcej!',
     'pref_two_factor_auth_code'                  => 'Zweryfikuj kod',
-    'pref_two_factor_auth_code_help'             => 'Scan the QR code with an application on your phone such as Authy or Google Authenticator and enter the generated code.',
+    'pref_two_factor_auth_code_help'             => '',
     'pref_two_factor_auth_reset_code'            => 'Zresetuj kod weryfikacyjny',
     'pref_two_factor_auth_remove_code'           => 'Usuń kod weryfikacyjny',
     'pref_two_factor_auth_remove_will_disable'   => '(to również wyłączy uwierzytelnianie dwuskładnikowe)',
@@ -347,27 +347,27 @@ return [
     'pref_home_show_deposits'                    => 'Pokaż przychody na stronie domowej',
     'pref_home_show_deposits_info'               => 'Ekran główny pokazuje już konta wydatków. Czy chcesz wyświetlać również konta przychodów?',
     'pref_home_do_show_deposits'                 => 'Tak, pokaż je',
-    'successful_count'                           => 'of which :count successful',
+    'successful_count'                           => '',
     'transaction_page_size_title'                => 'Rozmiar strony',
     'transaction_page_size_help'                 => 'Dowolna lista transakcji będzie pokazywać maksymalnie tyle transakcji',
     'transaction_page_size_label'                => 'Rozmiar strony',
     'between_dates'                              => '(:start i :end)',
     'pref_optional_fields_transaction'           => 'Opcjonalne pola dla transakcji',
-    'pref_optional_fields_transaction_help'      => 'By default not all fields are enabled when creating a new transaction (because of the clutter). Below, you can enable these fields if you think they could be useful for you. Of course, any field that is disabled, but already filled in, will be visible regardless of the setting.',
+    'pref_optional_fields_transaction_help'      => '',
     'optional_tj_date_fields'                    => 'Pola dat',
     'optional_tj_business_fields'                => 'Pola biznesowe',
     'optional_tj_attachment_fields'              => 'Pola załączników',
-    'pref_optional_tj_interest_date'             => 'Interest date',
+    'pref_optional_tj_interest_date'             => '',
     'pref_optional_tj_book_date'                 => 'Data księgowania',
-    'pref_optional_tj_process_date'              => 'Processing date',
+    'pref_optional_tj_process_date'              => '',
     'pref_optional_tj_due_date'                  => 'Termin realizacji',
     'pref_optional_tj_payment_date'              => 'Data płatności',
     'pref_optional_tj_invoice_date'              => 'Data faktury',
-    'pref_optional_tj_internal_reference'        => 'Internal reference',
+    'pref_optional_tj_internal_reference'        => '',
     'pref_optional_tj_notes'                     => 'Notatki',
     'pref_optional_tj_attachments'               => 'Załączniki',
     'optional_field_meta_dates'                  => 'Daty',
-    'optional_field_meta_business'               => 'Business',
+    'optional_field_meta_business'               => '',
     'optional_field_attachments'                 => 'Załączniki',
     'optional_field_meta_data'                   => 'Opcjonalne metadane',
 
@@ -388,16 +388,16 @@ return [
     'password_changed'                           => 'Hasło zostało zmienione!',
     'should_change'                              => 'Chodzi o to, aby zmienić swoje hasło.',
     'invalid_password'                           => 'Nieprawidłowe hasło!',
-    'what_is_pw_security'                        => 'What is "verify password security"?',
-    'secure_pw_title'                            => 'How to choose a secure password',
-    'secure_pw_history'                          => 'In August 2017 well known security researcher Troy Hunt released a list of 306 million stolen passwords. These passwords were stolen during breakins at companies like LinkedIn, Adobe and NeoPets (and many more).',
-    'secure_pw_check_box'                        => 'By checking the box, Firefly III will send the SHA1 hash of your password to <a href="https://www.troyhunt.com/introducing-306-million-freely-downloadable-pwned-passwords/">the website of Troy Hunt</a> to see if it is on the list. This will stop you from using unsafe passwords as is recommended in the latest <a href="https://pages.nist.gov/800-63-3/sp800-63b.html">NIST Special Publication</a> on this subject.',
-    'secure_pw_sha1'                             => 'But I thought SHA1 was broken?',
-    'secure_pw_hash_speed'                       => 'Yes, but not in this context. As you can read on <a href="https://shattered.io/">the website detailing how they broke SHA1</a>, it is now slightly easier to find a "collision": another string that results in the same SHA1-hash. It now only takes 10,000 years using a single-GPU machine.',
-    'secure_pw_hash_security'                    => 'This collision would not be equal to your password, nor would it be useful on (a site like) Firefly III. This application does not use SHA1 for password verification. So it is safe to check this box. Your password is hashed and sent over HTTPS.',
-    'secure_pw_should'                           => 'Should I check the box?',
-    'secure_pw_long_password'                    => 'If you just generated a long, single-use password for Firefly III using some kind of password generator: <strong>no</strong>.',
-    'secure_pw_short'                            => 'If you just entered the password you always use: <em>Please yes</em>.',
+    'what_is_pw_security'                        => '',
+    'secure_pw_title'                            => '',
+    'secure_pw_history'                          => '',
+    'secure_pw_check_box'                        => '',
+    'secure_pw_sha1'                             => '',
+    'secure_pw_hash_speed'                       => '',
+    'secure_pw_hash_security'                    => '',
+    'secure_pw_should'                           => '',
+    'secure_pw_long_password'                    => '',
+    'secure_pw_short'                            => '',
 
 
     // attachments
@@ -442,12 +442,12 @@ return [
     'convert_please_set_asset_destination'       => 'Proszę wybierz konto aktywów, do którego będą wychodzić pieniądze.',
     'convert_please_set_expense_destination'     => 'Proszę wybierz konto wydatków, do którego będą wychodzić pieniądze.',
     'convert_please_set_asset_source'            => 'Proszę wybierz konto aktywów, z którego będą przychodzić pieniądze.',
-    'convert_explanation_withdrawal_deposit'     => 'If you convert this withdrawal into a deposit, :amount will be deposited into <a href=":sourceRoute">:sourceName</a> instead of taken from it.',
-    'convert_explanation_withdrawal_transfer'    => 'If you convert this withdrawal into a transfer, :amount will be transferred from <a href=":sourceRoute">:sourceName</a> to a new asset account, instead of being paid to <a href=":destinationRoute">:destinationName</a>.',
-    'convert_explanation_deposit_withdrawal'     => 'If you convert this deposit into a withdrawal, :amount will be removed from <a href=":destinationRoute">:destinationName</a> instead of added to it.',
-    'convert_explanation_deposit_transfer'       => 'If you convert this deposit into a transfer, :amount will be transferred from an asset account of your choice into <a href=":destinationRoute">:destinationName</a>.',
-    'convert_explanation_transfer_withdrawal'    => 'If you convert this transfer into a withdrawal, :amount will go from <a href=":sourceRoute">:sourceName</a> to a new destination as an expense, instead of to <a href=":destinationRoute">:destinationName</a> as a transfer.',
-    'convert_explanation_transfer_deposit'       => 'If you convert this transfer into a deposit, :amount will be deposited into account <a href=":destinationRoute">:destinationName</a> instead of being transferred there.',
+    'convert_explanation_withdrawal_deposit'     => '',
+    'convert_explanation_withdrawal_transfer'    => '',
+    'convert_explanation_deposit_withdrawal'     => '',
+    'convert_explanation_deposit_transfer'       => '',
+    'convert_explanation_transfer_withdrawal'    => '',
+    'convert_explanation_transfer_deposit'       => '',
     'converted_to_Withdrawal'                    => 'Transakcja została przekonwertowana do wypłaty',
     'converted_to_Deposit'                       => 'Transakcja została przekonwertowana do wpłaty',
     'converted_to_Transfer'                      => 'Transakcja została przekonwertowana do transferu',
@@ -499,22 +499,22 @@ return [
     'updated_budget'                             => 'Zmodyfikowano budżet ":name"',
     'update_amount'                              => 'Aktualizuj kwotę',
     'update_budget'                              => 'Aktualizuj budżet',
-    'update_budget_amount_range'                 => 'Update (expected) available amount between :start and :end',
-    'budget_period_navigator'                    => 'Period navigator',
+    'update_budget_amount_range'                 => '',
+    'budget_period_navigator'                    => '',
 
     // bills:
-    'matching_on'                                => 'Matching on',
+    'matching_on'                                => '',
     'between_amounts'                            => 'między :low i :high.',
     'repeats'                                    => 'Powtarza się',
     'connected_journals'                         => 'Powiązane transakcje',
     'auto_match_on'                              => 'Automatycznie dopasowane przez Firefly',
-    'auto_match_off'                             => 'Not automatically matched by Firefly',
+    'auto_match_off'                             => '',
     'next_expected_match'                        => 'Następne oczekiwane dopasowanie',
     'delete_bill'                                => 'Usuń rachunek ":name"',
     'deleted_bill'                               => 'Usunięto rachunek ":name"',
     'edit_bill'                                  => 'Modyfikuj rachunek ":name"',
     'more'                                       => 'Więcej',
-    'rescan_old'                                 => 'Rescan old transactions',
+    'rescan_old'                                 => '',
     'update_bill'                                => 'Aktualizuj rachunek',
     'updated_bill'                               => 'Zaktualizowano rachunek ":name"',
     'store_new_bill'                             => 'Zapisz nowy rachunek',
@@ -523,10 +523,10 @@ return [
     'rescanned_bill'                             => 'Zeskanowano wszystko.',
     'average_bill_amount_year'                   => 'Średnia kwota rachunku (:year)',
     'average_bill_amount_overall'                => 'Średnia kwota rachunku (ogólnie)',
-    'not_or_not_yet'                             => 'Not (yet)',
-    'not_expected_period'                        => 'Not expected this period',
-    'bill_is_active'                             => 'Bill is active',
-    'bill_will_automatch'                        => 'Bill will automatically linked to matching transactions',
+    'not_or_not_yet'                             => '',
+    'not_expected_period'                        => '',
+    'bill_is_active'                             => '',
+    'bill_will_automatch'                        => '',
     // accounts:
     'details_for_asset'                          => 'Szczegóły konta aktywów ":name"',
     'details_for_expense'                        => 'Szczegóły konta wydatków ":name"',
@@ -566,7 +566,7 @@ return [
     'select_more_than_one_category'              => 'Proszę wybierz więcej niż jedną kategorię',
     'select_more_than_one_budget'                => 'Proszę wybierz więcej niż jeden budżet',
     'select_more_than_one_tag'                   => 'Proszę wybierz więcej niż jeden tag',
-    'account_default_currency'                   => 'If you select another currency, new transactions from this account will have this currency pre-selected.',
+    'account_default_currency'                   => '',
 
     // categories:
     'new_category'                               => 'Nowa kategoria',
@@ -599,13 +599,13 @@ return [
     'deleted_transfer'                           => 'Pomyślnie usunięto transfer ":description"',
     'stored_journal'                             => 'Pomyślnie utworzono nową transakcję ":description"',
     'select_transactions'                        => 'Wybierz transakcje',
-    'stop_selection'                             => 'Stop selecting transactions',
+    'stop_selection'                             => '',
     'edit_selected'                              => 'Modyfikuj zaznaczone',
     'delete_selected'                            => 'Usuń zaznaczone',
     'mass_delete_journals'                       => 'Usuń wiele transakcji',
     'mass_edit_journals'                         => 'Modyfikuj wiele transakcji',
-    'cannot_edit_other_fields'                   => 'You cannot mass-edit other fields than the ones here, because there is no room to show them. Please follow the link and edit them by one-by-one, if you need to edit these fields.',
-    'perm-delete-many'                           => 'Deleting many items in one go can be very disruptive. Please be cautious.',
+    'cannot_edit_other_fields'                   => '',
+    'perm-delete-many'                           => '',
     'mass_deleted_transactions_success'          => 'Usunięto :amount transakcję(i).',
     'mass_edited_transactions_success'           => 'Zaktualizowano :amount transakcję(i)',
 
@@ -614,9 +614,9 @@ return [
     'welcome'                                    => 'Witaj w Firefly!',
     'submit'                                     => 'Prześlij',
     'getting_started'                            => 'Pierwsze kroki',
-    'to_get_started'                             => 'It is good to see you have successfully installed Firefly III. To get started with this tool please enter your bank\'s name and the balance of your main checking account. Do not worry yet if you have multiple accounts. You can add those later. It\'s just that Firefly III needs something to start with.',
-    'savings_balance_text'                       => 'Firefly III will automatically create a savings account for you. By default, there will be no money in your savings account, but if you tell Firefly III the balance it will be stored as such.',
-    'finish_up_new_user'                         => 'That\'s it! You can continue by pressing <strong>Submit</strong>. You will be taken to the index of Firefly III.',
+    'to_get_started'                             => '',
+    'savings_balance_text'                       => '',
+    'finish_up_new_user'                         => '',
     'stored_new_accounts_new_user'               => 'Yay! Twoje nowe konta zostały zapisane.',
 
     // home page:
@@ -666,7 +666,7 @@ return [
     'no'                                         => 'Nie',
     'amount'                                     => 'Kwota',
     'overview'                                   => 'Przegląd',
-    'saveOnAccount'                              => 'Save on account',
+    'saveOnAccount'                              => '',
     'unknown'                                    => 'Nieznane',
     'daily'                                      => 'Dziennie',
     'monthly'                                    => 'Miesięcznie',
@@ -678,53 +678,53 @@ return [
     'report_audit'                               => 'Przegląd historii transakcji między :start i :end',
     'report_category'                            => 'Raport kategorii między :start i :end',
     'report_budget'                              => 'Raport budżetów między :start i :end',
-    'report_tag'                                 => 'Tag report between :start and :end',
+    'report_tag'                                 => '',
     'quick_link_reports'                         => 'Szybkie linki',
     'quick_link_default_report'                  => 'Domyślny raport finansowy',
     'quick_link_audit_report'                    => 'Przegląd historii transakcji',
     'report_this_month_quick'                    => 'Bieżący miesiąc, wszystkie konta',
     'report_this_year_quick'                     => 'Bieżący rok, wszystkie konta',
     'report_this_fiscal_year_quick'              => 'Bieżący rok podatkowy, wszystkie konta',
-    'report_all_time_quick'                      => 'All-time, all accounts',
-    'reports_can_bookmark'                       => 'Remember that reports can be bookmarked.',
+    'report_all_time_quick'                      => '',
+    'reports_can_bookmark'                       => '',
     'incomeVsExpenses'                           => 'Dochody a wydatki',
     'accountBalances'                            => 'Salda kont',
     'balanceStart'                               => 'Saldo na początku okresu',
     'balanceEnd'                                 => 'Saldo na końcu okresu',
-    'splitByAccount'                             => 'Split by account',
-    'coveredWithTags'                            => 'Covered with tags',
-    'leftUnbalanced'                             => 'Left unbalanced',
+    'splitByAccount'                             => '',
+    'coveredWithTags'                            => '',
+    'leftUnbalanced'                             => '',
     'leftInBudget'                               => 'Pozostało w budżecie',
     'sumOfSums'                                  => 'Suma sum',
     'noCategory'                                 => '(bez kategorii)',
-    'notCharged'                                 => 'Not charged (yet)',
+    'notCharged'                                 => '',
     'inactive'                                   => 'Nieaktywne',
     'active'                                     => 'Aktywne',
     'difference'                                 => 'Różnica',
-    'in'                                         => 'In',
-    'out'                                        => 'Out',
-    'topX'                                       => 'top :number',
+    'in'                                         => '',
+    'out'                                        => '',
+    'topX'                                       => '',
     'show_full_list'                             => 'Pokaż całą listę',
-    'show_only_top'                              => 'Show only top :number',
+    'show_only_top'                              => '',
     'report_type'                                => 'Typ raportu',
     'report_type_default'                        => 'Domyślny raport finansowy',
     'report_type_audit'                          => 'Przegląd historii transakcji (audyt)',
     'report_type_category'                       => 'Raport kategorii',
     'report_type_budget'                         => 'Raport budżetów',
     'report_type_tag'                            => 'Raport tagów',
-    'more_info_help'                             => 'More information about these types of reports can be found in the help pages. Press the (?) icon in the top right corner.',
+    'more_info_help'                             => '',
     'report_included_accounts'                   => 'Uwzględnione konta',
     'report_date_range'                          => 'Zakres dat',
     'report_preset_ranges'                       => 'Predefiniowane zakresy',
     'shared'                                     => 'Udostępnione',
     'fiscal_year'                                => 'Rok podatkowy',
-    'income_entry'                               => 'Income from account ":name" between :start and :end',
-    'expense_entry'                              => 'Expenses to account ":name" between :start and :end',
+    'income_entry'                               => '',
+    'expense_entry'                              => '',
     'category_entry'                             => 'Wydatki w kategorii ":name" między :start i :end',
     'budget_spent_amount'                        => 'Wydatki w budżecie ":budget" między :start i :end',
-    'balance_amount'                             => 'Expenses in budget ":budget" paid from account ":account" between :start and :end',
-    'no_audit_activity'                          => 'No activity was recorded on account <a href=":url" title=":account_name">:account_name</a> between :start and :end.',
-    'audit_end_balance'                          => 'Account balance of <a href=":url" title=":account_name">:account_name</a> at the end of :end was: :balance',
+    'balance_amount'                             => '',
+    'no_audit_activity'                          => '',
+    'audit_end_balance'                          => '',
     'reports_extra_options'                      => 'Dodatkowe opcje',
     'report_has_no_extra_options'                => 'Ten raport nie ma dodatkowych opcji',
     'reports_submit'                             => 'Zobacz raport',
@@ -739,13 +739,13 @@ return [
     'expense_per_account'                        => 'Wydatek wg konta',
     'expense_per_tag'                            => 'Wydatek wg tagu',
     'income_per_tag'                             => 'Przychód wg tagu',
-    'include_expense_not_in_budget'              => 'Included expenses not in the selected budget(s)',
-    'include_expense_not_in_account'             => 'Included expenses not in the selected account(s)',
-    'include_expense_not_in_category'            => 'Included expenses not in the selected category(ies)',
-    'include_income_not_in_category'             => 'Included income not in the selected category(ies)',
-    'include_income_not_in_account'              => 'Included income not in the selected account(s)',
-    'include_income_not_in_tags'                 => 'Included income not in the selected tag(s)',
-    'include_expense_not_in_tags'                => 'Included expenses not in the selected tag(s)',
+    'include_expense_not_in_budget'              => '',
+    'include_expense_not_in_account'             => '',
+    'include_expense_not_in_category'            => '',
+    'include_income_not_in_category'             => '',
+    'include_income_not_in_account'              => '',
+    'include_income_not_in_tags'                 => '',
+    'include_expense_not_in_tags'                => '',
     'everything_else'                            => 'Wszystko inne',
     'income_and_expenses'                        => 'Dochody i wydatki',
     'spent_average'                              => 'Wydano (średnia)',
@@ -775,7 +775,7 @@ return [
     'no_budget'                                  => '(bez budżetu)',
     'max-amount'                                 => 'Maksymalna kwota',
     'min-amount'                                 => 'Minimalna kwota',
-    'journal-amount'                             => 'Current bill entry',
+    'journal-amount'                             => '',
     'name'                                       => 'Nazwa',
     'date'                                       => 'Data',
     'paid'                                       => 'Zpłacone',
@@ -791,15 +791,15 @@ return [
     // piggy banks:
     'add_money_to_piggy'                         => 'Dodaj pieniądze do skarbonki ":name"',
     'piggy_bank'                                 => 'Skarbonka',
-    'new_piggy_bank'                             => 'New piggy bank',
+    'new_piggy_bank'                             => '',
     'store_piggy_bank'                           => 'Zapisz nową skarbonkę',
     'stored_piggy_bank'                          => 'Zapisz nową skarbonkę ":name"',
     'account_status'                             => 'Status konta',
-    'left_for_piggy_banks'                       => 'Left for piggy banks',
-    'sum_of_piggy_banks'                         => 'Sum of piggy banks',
+    'left_for_piggy_banks'                       => '',
+    'sum_of_piggy_banks'                         => '',
     'saved_so_far'                               => 'Zaoszczędzono do tej pory',
     'left_to_save'                               => 'Pozostało do zaoszczędzenia',
-    'suggested_amount'                           => 'Suggested monthly amount to save',
+    'suggested_amount'                           => '',
     'add_money_to_piggy_title'                   => 'Dodaj pieniądze do skarbonki ":name"',
     'remove_money_from_piggy_title'              => 'Usuń pieniądze ze skarbonki ":name"',
     'add'                                        => 'Dodaj',
@@ -815,19 +815,19 @@ return [
     'target_amount'              => 'Kwota docelowa',
     'start_date'                 => 'Data rozpoczęcia',
     'target_date'                => 'Data docelowa',
-    'no_target_date'             => 'No target date',
+    'no_target_date'             => '',
     'table'                      => 'Tabela',
     'delete_piggy_bank'          => 'Usuń skarbonkę ":name"',
     'cannot_add_amount_piggy'    => 'Nie można dodać :amount do ":name".',
-    'cannot_remove_from_piggy'   => 'Could not remove :amount from ":name".',
+    'cannot_remove_from_piggy'   => '',
     'deleted_piggy_bank'         => 'Usunięto skarbonkę ":name"',
-    'added_amount_to_piggy'      => 'Added :amount to ":name"',
-    'removed_amount_from_piggy'  => 'Removed :amount from ":name"',
+    'added_amount_to_piggy'      => '',
+    'removed_amount_from_piggy'  => '',
 
     // tags
     'regular_tag'                => 'Po prostu zwykły tag.',
-    'balancing_act'              => 'The tag takes at most two transactions; an expense and a transfer. They\'ll balance each other out.',
-    'advance_payment'            => 'The tag accepts one expense and any number of deposits aimed to repay the original expense.',
+    'balancing_act'              => '',
+    'advance_payment'            => '',
     'delete_tag'                 => 'Usuń tag ":tag"',
     'deleted_tag'                => 'Usunięto tag ":tag"',
     'new_tag'                    => 'Utwórz nowy tag',
@@ -850,55 +850,55 @@ return [
     'setting_single_user_mode'              => 'Tryb pojedynczego użytkownika',
     'setting_single_user_mode_explain'      => 'Domyślnie, Firefly III pozwala na jednego (1) użytkownika: Ciebie. Jest to środek bezpieczeństwa uniemożliwiający innym używanie Twojej instalacji, chyba że im pozwolisz. Kolejne rejestracje są zablokowane. Jeżeli odznaczysz to pole, inne osoby będą mogły używać Twojej instalacji Firefly III (zakładając, że jest ona dostępna w Internecie).',
     'store_configuration'                   => 'Zapisz konfigurację',
-    'single_user_administration'            => 'User administration for :email',
+    'single_user_administration'            => '',
     'edit_user'                             => 'Modyfikuj użytkownika :email',
-    'hidden_fields_preferences'             => 'Not all fields are visible right now. You must enable them in your <a href=":link">settings</a>.',
+    'hidden_fields_preferences'             => '',
     'user_data_information'                 => 'Dane użytkownika',
     'user_information'                      => 'Informacja o użytkowniku',
     'total_size'                            => 'łączny rozmiar',
     'budget_or_budgets'                     => 'budżet(y)',
-    'budgets_with_limits'                   => 'budget(s) with configured amount',
+    'budgets_with_limits'                   => '',
     'rule_or_rules'                         => 'reguła(y)',
     'rulegroup_or_groups'                   => 'grupa(y) reguł',
     'configuration_updated'                 => 'Konfiguracja została zaktualizowana',
     'setting_is_demo_site'                  => 'Strona demonstracyjna',
-    'setting_is_demo_site_explain'          => 'If you check this box, this installation will behave as if it is the demo site, which can have weird side effects.',
+    'setting_is_demo_site_explain'          => '',
     'block_code_bounced'                    => 'Odrzucony e-mail potwierdzający',
     'block_code_expired'                    => 'Demonstracyjne konto wygasło',
     'no_block_code'                         => 'Brak powody blokady lub użytkownik niezablokowany',
     // links
-    'journal_link_configuration'            => 'Transaction links configuration',
-    'create_new_link_type'                  => 'Create new link type',
-    'store_new_link_type'                   => 'Store new link type',
-    'update_link_type'                      => 'Update link type',
-    'edit_link_type'                        => 'Edit link type ":name"',
-    'updated_link_type'                     => 'Updated link type ":name"',
-    'delete_link_type'                      => 'Delete link type ":name"',
-    'deleted_link_type'                     => 'Deleted link type ":name"',
-    'stored_new_link_type'                  => 'Store new link type ":name"',
-    'cannot_edit_link_type'                 => 'Cannot edit link type ":name"',
-    'link_type_help_name'                   => 'Ie. "Duplicates"',
-    'link_type_help_inward'                 => 'Ie. "duplicates"',
-    'link_type_help_outward'                => 'Ie. "is duplicated by"',
-    'save_connections_by_moving'            => 'Save the link between these transaction(s) by moving them to another link type:',
-    'do_not_save_connection'                => '(do not save connection)',
-    'link_transaction'                      => 'Link transaction',
-    'link_to_other_transaction'             => 'Link this transaction to another transaction',
-    'select_transaction_to_link'            => 'Select a transaction to link this transaction to',
-    'this_transaction'                      => 'This transaction',
-    'transaction'                           => 'Transaction',
+    'journal_link_configuration'            => '',
+    'create_new_link_type'                  => '',
+    'store_new_link_type'                   => '',
+    'update_link_type'                      => '',
+    'edit_link_type'                        => '',
+    'updated_link_type'                     => '',
+    'delete_link_type'                      => '',
+    'deleted_link_type'                     => '',
+    'stored_new_link_type'                  => '',
+    'cannot_edit_link_type'                 => '',
+    'link_type_help_name'                   => '',
+    'link_type_help_inward'                 => '',
+    'link_type_help_outward'                => '',
+    'save_connections_by_moving'            => '',
+    'do_not_save_connection'                => '',
+    'link_transaction'                      => '',
+    'link_to_other_transaction'             => '',
+    'select_transaction_to_link'            => '',
+    'this_transaction'                      => '',
+    'transaction'                           => '',
     'comments'                              => 'Komentarze',
-    'to_link_not_found'                     => 'If the transaction you want to link to is not listed, simply enter its ID.',
-    'invalid_link_data'                     => 'Invalid link type selected. Cannot link transaction.',
-    'journals_linked'                       => 'Transactions are linked.',
-    'journals_error_linked'                 => 'These transactions are already linked.',
-    'journal_links'                         => 'Transaction links',
-    'this_withdrawal'                       => 'This withdrawal',
-    'this_deposit'                          => 'This deposit',
-    'this_transfer'                         => 'This transfer',
-    'overview_for_link'                     => 'Overview for link type ":name"',
-    'delete_journal_link'                   => 'Delete the link between <a href=":source_link">:source</a> and <a href=":destination_link">:destination</a>',
-    'deleted_link'                          => 'Deleted link',
+    'to_link_not_found'                     => '',
+    'invalid_link_data'                     => '',
+    'journals_linked'                       => '',
+    'journals_error_linked'                 => '',
+    'journal_links'                         => '',
+    'this_withdrawal'                       => '',
+    'this_deposit'                          => '',
+    'this_transfer'                         => '',
+    'overview_for_link'                     => '',
+    'delete_journal_link'                   => '',
+    'deleted_link'                          => '',
 
 
     // split a transaction:
@@ -909,9 +909,9 @@ return [
     'split_this_withdrawal'                 => 'Podziel tą wypłatę',
     'split_this_deposit'                    => 'Podziel tą wpłatę',
     'split_this_transfer'                   => 'Podziel ten transfer',
-    'cannot_edit_multiple_source'           => 'You cannot edit splitted transaction #:id with description ":description" because it contains multiple source accounts.',
-    'cannot_edit_multiple_dest'             => 'You cannot edit splitted transaction #:id with description ":description" because it contains multiple destination accounts.',
-    'cannot_edit_opening_balance'           => 'You cannot edit the opening balance of an account.',
+    'cannot_edit_multiple_source'           => '',
+    'cannot_edit_multiple_dest'             => '',
+    'cannot_edit_opening_balance'           => '',
     'no_edit_multiple_left'                 => 'Nie wybrałeś żadnych poprawnych transakcji do edycji.',
 
     // import bread crumbs and titles:
@@ -968,24 +968,24 @@ return [
     'no_accounts_imperative_asset'          => 'Aby rozpocząć korzystanie z Firefly III należy utworzyć co najmniej jedno konto aktywów. Zróbmy je więc teraz:',
     'no_accounts_create_asset'              => 'Utwórz konto aktywów',
     'no_accounts_title_expense'             => 'Stwórzmy konto wydatków!',
-    'no_accounts_intro_expense'             => 'You have no expense accounts yet. Expense accounts are the places where you spend money, such as shops and supermarkets.',
-    'no_accounts_imperative_expense'        => 'Expense accounts are created automatically when you create transactions, but you can create one manually too, if you want. Let\'s create one now:',
+    'no_accounts_intro_expense'             => '',
+    'no_accounts_imperative_expense'        => '',
     'no_accounts_create_expense'            => 'Utwórz konto wydatków',
     'no_accounts_title_revenue'             => 'Stwórzmy konto przychodów!',
-    'no_accounts_intro_revenue'             => 'You have no revenue accounts yet. Revenue accounts are the places where you receive money from, such as your employer.',
-    'no_accounts_imperative_revenue'        => 'Revenue accounts are created automatically when you create transactions, but you can create one manually too, if you want. Let\'s create one now:',
+    'no_accounts_intro_revenue'             => '',
+    'no_accounts_imperative_revenue'        => '',
     'no_accounts_create_revenue'            => 'Utwórz konto przychodów',
     'no_budgets_title_default'              => 'Stwórzmy budżet',
-    'no_budgets_intro_default'              => 'You have no budgets yet. Budgets are used to organise your expenses into logical groups, which you can give a soft-cap to limit your expenses.',
-    'no_budgets_imperative_default'         => 'Budgets are the basic tools of financial management. Let\'s create one now:',
+    'no_budgets_intro_default'              => '',
+    'no_budgets_imperative_default'         => '',
     'no_budgets_create_default'             => 'Stwórz budżet',
     'no_categories_title_default'           => 'Stwórzmy kategorię!',
-    'no_categories_intro_default'           => 'You have no categories yet. Categories are used to fine tune your transactions and label them with their designated category.',
-    'no_categories_imperative_default'      => 'Categories are created automatically when you create transactions, but you can create one manually too. Let\'s create one now:',
-    'no_categories_create_default'          => 'Create a category',
+    'no_categories_intro_default'           => '',
+    'no_categories_imperative_default'      => '',
+    'no_categories_create_default'          => '',
     'no_tags_title_default'                 => 'Stwórzmy tag!',
-    'no_tags_intro_default'                 => 'You have no tags yet. Tags are used to fine tune your transactions and label them with specific keywords.',
-    'no_tags_imperative_default'            => 'Tags are created automatically when you create transactions, but you can create one manually too. Let\'s create one now:',
+    'no_tags_intro_default'                 => '',
+    'no_tags_imperative_default'            => '',
     'no_tags_create_default'                => 'Utwórz tag',
     'no_transactions_title_withdrawal'      => 'Stwórzmy wydatek!',
     'no_transactions_intro_withdrawal'      => 'Jeszcze nie masz wydatków. Powinieneś utworzyć wydatki aby rozpocząć zarządzanie swoimi finansami.',
@@ -994,18 +994,18 @@ return [
     'no_transactions_title_deposit'         => 'Stwórzmy przychód!',
     'no_transactions_intro_deposit'         => 'Jeszcze nie masz przychodów. Powinieneś utworzyć przychody aby rozpocząć zarządzanie swoimi finansami.',
     'no_transactions_imperative_deposit'    => 'Otrzymałeś trochę pieniędzy? Zatem powinieneś je zapisać:',
-    'no_transactions_create_deposit'        => 'Create a deposit',
+    'no_transactions_create_deposit'        => '',
     'no_transactions_title_transfers'       => 'Stwórzmy transfer!',
-    'no_transactions_intro_transfers'       => 'You have no transfers yet. When you move money between asset accounts, it is recorded as a transfer.',
-    'no_transactions_imperative_transfers'  => 'Have you moved some money around? Then you should write it down:',
+    'no_transactions_intro_transfers'       => '',
+    'no_transactions_imperative_transfers'  => '',
     'no_transactions_create_transfers'      => 'Utwórz transfer',
     'no_piggies_title_default'              => 'Stwórzmy skarbonkę!',
-    'no_piggies_intro_default'              => 'You have no piggy banks yet. You can create piggy banks to divide your savings and keep track of what you\'re saving up for.',
-    'no_piggies_imperative_default'         => 'Do you have things you\'re saving money for? Create a piggy bank and keep track:',
+    'no_piggies_intro_default'              => '',
+    'no_piggies_imperative_default'         => '',
     'no_piggies_create_default'             => 'Utwórz nową skarbonkę',
     'no_bills_title_default'                => 'Stwórzmy rachunek!',
-    'no_bills_intro_default'                => 'You have no bills yet. You can create bills to keep track of regular expenses, like your rent of insurance.',
-    'no_bills_imperative_default'           => 'Do you have such regular bills? Create a bill and keep track of your payments:',
+    'no_bills_intro_default'                => '',
+    'no_bills_imperative_default'           => '',
     'no_bills_create_default'               => 'Utwórz rachunek',
 
 

From 7a70b8234cc1cc8c2a7e82783e6b9885739d97fe Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Fri, 25 Aug 2017 07:08:08 +0200
Subject: [PATCH 292/668] New translations firefly.php (Portuguese, Brazilian)

---
 resources/lang/pt_BR/firefly.php | 526 +++++++++++++++----------------
 1 file changed, 263 insertions(+), 263 deletions(-)

diff --git a/resources/lang/pt_BR/firefly.php b/resources/lang/pt_BR/firefly.php
index 4b99a70477..483753013b 100644
--- a/resources/lang/pt_BR/firefly.php
+++ b/resources/lang/pt_BR/firefly.php
@@ -27,7 +27,7 @@ return [
     'to'                                         => 'Até',
     'showEverything'                             => 'Mostrar tudo',
     'never'                                      => 'Nunca',
-    'no_results_for_empty_search'                => 'Your search was empty, so nothing was found.',
+    'no_results_for_empty_search'                => '',
     'removed_amount'                             => ':amount removido',
     'added_amount'                               => ':amount adicionada',
     'asset_account_role_help'                    => 'Quaisquer opções extras resultantes da sua escolha pode ser definido mais tarde.',
@@ -70,75 +70,75 @@ return [
     'source_accounts'                            => 'Conta(s) de origem',
     'destination_accounts'                       => 'Conta(s) de destino',
     'user_id_is'                                 => 'Seu id de usuário é <strong>:user</strong>',
-    'field_supports_markdown'                    => 'This field supports <a href="https://en.support.wordpress.com/markdown-quick-reference/">Markdown</a>.',
-    'need_more_help'                             => 'If you need more help using Firefly III, please <a href="https://github.com/firefly-iii/firefly-iii/issues">open a ticket on Github</a>.',
-    'reenable_intro_text'                        => 'You can also reenable <a href="#" id="reenableGuidance">the introduction guidance</a>.',
-    'intro_boxes_after_refresh'                  => 'The introduction boxes will reappear when you refresh the page.',
-    'show_all_no_filter'                         => 'Show all transactions without grouping them by date.',
+    'field_supports_markdown'                    => '',
+    'need_more_help'                             => '',
+    'reenable_intro_text'                        => '',
+    'intro_boxes_after_refresh'                  => '',
+    'show_all_no_filter'                         => '',
     'expenses_by_category'                       => 'Despesa por categoria',
     'expenses_by_budget'                         => 'Despesas pelo orçamento',
     'income_by_category'                         => 'Receitas por categoria',
-    'expenses_by_asset_account'                  => 'Expenses by asset account',
-    'expenses_by_expense_account'                => 'Expenses by expense account',
+    'expenses_by_asset_account'                  => '',
+    'expenses_by_expense_account'                => '',
     'cannot_redirect_to_account'                 => 'Firefly III não pode redirecioná-lo para a página correta. Minhas desculpas.',
-    'sum_of_expenses'                            => 'Sum of expenses',
-    'sum_of_income'                              => 'Sum of income',
-    'total_sum'                                  => 'Total sum',
-    'spent_in_specific_budget'                   => 'Spent in budget ":budget"',
-    'sum_of_expenses_in_budget'                  => 'Spent total in budget ":budget"',
-    'left_in_budget_limit'                       => 'Left to spend according to budgeting',
-    'cannot_reset_demo_user'                     => 'You cannot reset the password of the demonstration account',
-    'current_period'                             => 'Current period',
-    'show_the_current_period_and_overview'       => 'Show the current period and overview',
-    'pref_languages_locale'                      => 'For a language other than English to work properly, your operating system must be equipped with the correct locale-information. If these are not present, currency data, dates and amounts may be formatted wrong.',
-    'budget_in_period'                           => 'All transactions for budget ":name" between :start and :end',
-    'chart_budget_in_period'                     => 'Chart for all transactions for budget ":name" between :start and :end',
-    'chart_account_in_period'                    => 'Chart for all transactions for account ":name" between :start and :end',
-    'chart_category_in_period'                   => 'Chart for all transactions for category ":name" between :start and :end',
-    'chart_category_all'                         => 'Chart for all transactions for category ":name"',
-    'clone_withdrawal'                           => 'Clone this withdrawal',
-    'clone_deposit'                              => 'Clone this deposit',
-    'clone_transfer'                             => 'Clone this transfer',
-    'multi_select_no_selection'                  => 'None selected',
-    'multi_select_all_selected'                  => 'All selected',
-    'multi_select_filter_placeholder'            => 'Find..',
-    'between_dates_breadcrumb'                   => 'Between :start and :end',
-    'all_journals_without_budget'                => 'All transactions without a budget',
-    'journals_without_budget'                    => 'Transactions without a budget',
-    'all_journals_without_category'              => 'All transactions without a category',
-    'journals_without_category'                  => 'Transactions without a category',
-    'all_journals_for_account'                   => 'All transactions for account :name',
-    'chart_all_journals_for_account'             => 'Chart of all transactions for account :name',
-    'journals_in_period_for_account'             => 'All transactions for account :name between :start and :end',
-    'transferred'                                => 'Transferred',
-    'all_withdrawal'                             => 'All expenses',
-    'all_transactions'                           => 'All transactions',
-    'title_withdrawal_between'                   => 'All expenses between :start and :end',
-    'all_deposit'                                => 'All revenue',
-    'title_deposit_between'                      => 'All revenue between :start and :end',
-    'all_transfers'                              => 'All transfers',
-    'title_transfers_between'                    => 'All transfers between :start and :end',
-    'all_transfer'                               => 'All transfers',
-    'all_journals_for_tag'                       => 'All transactions for tag ":tag"',
-    'title_transfer_between'                     => 'All transfers between :start and :end',
-    'all_journals_for_category'                  => 'All transactions for category :name',
-    'all_journals_for_budget'                    => 'All transactions for budget :name',
-    'chart_all_journals_for_budget'              => 'Chart of all transactions for budget :name',
-    'journals_in_period_for_category'            => 'All transactions for category :name between :start and :end',
-    'journals_in_period_for_tag'                 => 'All transactions for tag :tag between :start and :end',
-    'not_available_demo_user'                    => 'The feature you try to access is not available to demo users.',
-    'exchange_rate_instructions'                 => 'Asset account "@name" only accepts transactions in @native_currency. If you wish to use @foreign_currency instead, make sure that the amount in @native_currency is known as well:',
-    'transfer_exchange_rate_instructions'        => 'Source asset account "@source_name" only accepts transactions in @source_currency. Destination asset account "@dest_name" only accepts transactions in @dest_currency. You must provide the transferred amount correctly in both currencies.',
-    'transaction_data'                           => 'Transaction data',
+    'sum_of_expenses'                            => '',
+    'sum_of_income'                              => '',
+    'total_sum'                                  => '',
+    'spent_in_specific_budget'                   => '',
+    'sum_of_expenses_in_budget'                  => '',
+    'left_in_budget_limit'                       => '',
+    'cannot_reset_demo_user'                     => '',
+    'current_period'                             => '',
+    'show_the_current_period_and_overview'       => '',
+    'pref_languages_locale'                      => '',
+    'budget_in_period'                           => '',
+    'chart_budget_in_period'                     => '',
+    'chart_account_in_period'                    => '',
+    'chart_category_in_period'                   => '',
+    'chart_category_all'                         => '',
+    'clone_withdrawal'                           => '',
+    'clone_deposit'                              => '',
+    'clone_transfer'                             => '',
+    'multi_select_no_selection'                  => '',
+    'multi_select_all_selected'                  => '',
+    'multi_select_filter_placeholder'            => '',
+    'between_dates_breadcrumb'                   => '',
+    'all_journals_without_budget'                => '',
+    'journals_without_budget'                    => '',
+    'all_journals_without_category'              => '',
+    'journals_without_category'                  => '',
+    'all_journals_for_account'                   => '',
+    'chart_all_journals_for_account'             => '',
+    'journals_in_period_for_account'             => '',
+    'transferred'                                => '',
+    'all_withdrawal'                             => '',
+    'all_transactions'                           => '',
+    'title_withdrawal_between'                   => '',
+    'all_deposit'                                => '',
+    'title_deposit_between'                      => '',
+    'all_transfers'                              => '',
+    'title_transfers_between'                    => '',
+    'all_transfer'                               => '',
+    'all_journals_for_tag'                       => '',
+    'title_transfer_between'                     => '',
+    'all_journals_for_category'                  => '',
+    'all_journals_for_budget'                    => '',
+    'chart_all_journals_for_budget'              => '',
+    'journals_in_period_for_category'            => '',
+    'journals_in_period_for_tag'                 => '',
+    'not_available_demo_user'                    => '',
+    'exchange_rate_instructions'                 => '',
+    'transfer_exchange_rate_instructions'        => '',
+    'transaction_data'                           => '',
 
     // search
     'search'                                     => 'Pesquisa',
-    'search_found_transactions'                  => 'Number of transactions found:',
-    'general_search_error'                       => 'An error occured while searching. Please check the log files for more information.',
-    'search_box'                                 => 'Search',
-    'search_box_intro'                           => 'Welcome to the search function of Firefly III. Enter your search query in the box. Make sure you check out the help file because the search is pretty advanced.',
-    'search_error'                               => 'Error while searching',
-    'search_searching'                           => 'Searching ...',
+    'search_found_transactions'                  => '',
+    'general_search_error'                       => '',
+    'search_box'                                 => '',
+    'search_box_intro'                           => '',
+    'search_error'                               => '',
+    'search_searching'                           => '',
 
     // repeat frequencies:
     'repeat_freq_yearly'                         => 'anual',
@@ -228,14 +228,14 @@ return [
     'warning_transaction_subset'                 => 'Por razões de desempenho esta lista está limitado a :max_num_transactions e só pode mostrar um subconjunto das transações correspondentes',
     'warning_no_matching_transactions'           => 'Nenhuma transação correspondente encontrada. Por favor note que por motivos de desempenho, apenas as últimas :num_transactions transações tenham sido verificadas.',
     'warning_no_valid_triggers'                  => 'Sem gatilhos válidos fornecidos.',
-    'apply_rule_selection'                       => 'Apply rule ":title" to a selection of your transactions',
-    'apply_rule_selection_intro'                 => 'Rules like ":title" are normally only applied to new or updated transactions, but you can tell Firefly III to run it on a selection of your existing transactions. This can be useful when you have updated a rule and you need the changes to be applied to all of your other transactions.',
+    'apply_rule_selection'                       => '',
+    'apply_rule_selection_intro'                 => '',
     'include_transactions_from_accounts'         => 'Incluir as transações destas contas',
-    'applied_rule_selection'                     => 'Rule ":title" has been applied to your selection.',
+    'applied_rule_selection'                     => '',
     'execute'                                    => 'Executar',
-    'apply_rule_group_selection'                 => 'Apply rule group ":title" to a selection of your transactions',
-    'apply_rule_group_selection_intro'           => 'Rule groups like ":title" are normally only applied to new or updated transactions, but you can tell Firefly III to run all the rules in this group on a selection of your existing transactions. This can be useful when you have updated a group of rules and you need the changes to be applied to all of your other transactions.',
-    'applied_rule_group_selection'               => 'Rule group ":title" has been applied to your selection.',
+    'apply_rule_group_selection'                 => '',
+    'apply_rule_group_selection_intro'           => '',
+    'applied_rule_group_selection'               => '',
 
     // actions and triggers
     'rule_trigger_user_action'                   => 'Ação do usuário é ":trigger_value"',
@@ -248,7 +248,7 @@ return [
     'rule_trigger_to_account_is'                 => 'Conta de destino é ":trigger_value"',
     'rule_trigger_to_account_contains'           => 'Conta de destino contém ":trigger_value"',
     'rule_trigger_transaction_type'              => 'Transação é do tipo ":trigger_value"',
-    'rule_trigger_category_is'                   => 'Category is ":trigger_value"',
+    'rule_trigger_category_is'                   => '',
     'rule_trigger_amount_less'                   => 'Quantia é inferior :trigger_value',
     'rule_trigger_amount_exactly'                => 'Quantia é: trigger_value',
     'rule_trigger_amount_more'                   => 'Quantia é mais de :trigger_value',
@@ -272,13 +272,13 @@ return [
     'rule_trigger_description_ends_choice'       => 'Descrição termina com..',
     'rule_trigger_description_contains_choice'   => 'Descrição contém..',
     'rule_trigger_description_is_choice'         => 'Descrição é..',
-    'rule_trigger_category_is_choice'            => 'Category is..',
-    'rule_trigger_budget_is_choice'              => 'Budget is..',
-    'rule_trigger_tag_is_choice'                 => '(A) tag is..',
-    'rule_trigger_has_attachments_choice'        => 'Has at least this many attachments',
-    'rule_trigger_has_attachments'               => 'Has at least :trigger_value attachment(s)',
-    'rule_trigger_store_journal'                 => 'When a transaction is created',
-    'rule_trigger_update_journal'                => 'When a transaction is updated',
+    'rule_trigger_category_is_choice'            => '',
+    'rule_trigger_budget_is_choice'              => '',
+    'rule_trigger_tag_is_choice'                 => '',
+    'rule_trigger_has_attachments_choice'        => '',
+    'rule_trigger_has_attachments'               => '',
+    'rule_trigger_store_journal'                 => '',
+    'rule_trigger_update_journal'                => '',
     'rule_action_set_category'                   => 'Definir categoria para ":action_value"',
     'rule_action_clear_category'                 => 'Limpar categoria',
     'rule_action_set_budget'                     => 'Definir orçamento para ":action_value"',
@@ -345,7 +345,7 @@ return [
     'preferences_security'                       => 'Segurança',
     'preferences_layout'                         => 'Layout',
     'pref_home_show_deposits'                    => 'Depósitos de mostrar na tela inicial',
-    'pref_home_show_deposits_info'               => 'The home screen already shows your expense accounts. Should it also show your revenue accounts?',
+    'pref_home_show_deposits_info'               => '',
     'pref_home_do_show_deposits'                 => 'Sim, mostrar-lhes',
     'successful_count'                           => 'dos quais :count bem sucedida',
     'transaction_page_size_title'                => 'Tamanho da página',
@@ -353,7 +353,7 @@ return [
     'transaction_page_size_label'                => 'Tamanho da página',
     'between_dates'                              => '(:start e :end)',
     'pref_optional_fields_transaction'           => 'Campos opcionais para transações',
-    'pref_optional_fields_transaction_help'      => 'By default not all fields are enabled when creating a new transaction (because of the clutter). Below, you can enable these fields if you think they could be useful for you. Of course, any field that is disabled, but already filled in, will be visible regardless of the setting.',
+    'pref_optional_fields_transaction_help'      => '',
     'optional_tj_date_fields'                    => 'Campos de data',
     'optional_tj_business_fields'                => 'Campos de negócios',
     'optional_tj_attachment_fields'              => 'Campos de anexo',
@@ -388,16 +388,16 @@ return [
     'password_changed'                           => 'Senha alterada!',
     'should_change'                              => 'A idéia é alterar sua senha.',
     'invalid_password'                           => 'Senha inválida!',
-    'what_is_pw_security'                        => 'What is "verify password security"?',
-    'secure_pw_title'                            => 'How to choose a secure password',
-    'secure_pw_history'                          => 'In August 2017 well known security researcher Troy Hunt released a list of 306 million stolen passwords. These passwords were stolen during breakins at companies like LinkedIn, Adobe and NeoPets (and many more).',
-    'secure_pw_check_box'                        => 'By checking the box, Firefly III will send the SHA1 hash of your password to <a href="https://www.troyhunt.com/introducing-306-million-freely-downloadable-pwned-passwords/">the website of Troy Hunt</a> to see if it is on the list. This will stop you from using unsafe passwords as is recommended in the latest <a href="https://pages.nist.gov/800-63-3/sp800-63b.html">NIST Special Publication</a> on this subject.',
-    'secure_pw_sha1'                             => 'But I thought SHA1 was broken?',
-    'secure_pw_hash_speed'                       => 'Yes, but not in this context. As you can read on <a href="https://shattered.io/">the website detailing how they broke SHA1</a>, it is now slightly easier to find a "collision": another string that results in the same SHA1-hash. It now only takes 10,000 years using a single-GPU machine.',
-    'secure_pw_hash_security'                    => 'This collision would not be equal to your password, nor would it be useful on (a site like) Firefly III. This application does not use SHA1 for password verification. So it is safe to check this box. Your password is hashed and sent over HTTPS.',
-    'secure_pw_should'                           => 'Should I check the box?',
-    'secure_pw_long_password'                    => 'If you just generated a long, single-use password for Firefly III using some kind of password generator: <strong>no</strong>.',
-    'secure_pw_short'                            => 'If you just entered the password you always use: <em>Please yes</em>.',
+    'what_is_pw_security'                        => '',
+    'secure_pw_title'                            => '',
+    'secure_pw_history'                          => '',
+    'secure_pw_check_box'                        => '',
+    'secure_pw_sha1'                             => '',
+    'secure_pw_hash_speed'                       => '',
+    'secure_pw_hash_security'                    => '',
+    'secure_pw_should'                           => '',
+    'secure_pw_long_password'                    => '',
+    'secure_pw_short'                            => '',
 
 
     // attachments
@@ -442,15 +442,15 @@ return [
     'convert_please_set_asset_destination'       => 'Por favor, escolha a conta de ativo para onde vai o dinheiro.',
     'convert_please_set_expense_destination'     => 'Por favor, escolha a conta de despesas para onde o dinheiro vai.',
     'convert_please_set_asset_source'            => 'Por favor, escolha a conta de ativo, de onde virá o dinheiro.',
-    'convert_explanation_withdrawal_deposit'     => 'If you convert this withdrawal into a deposit, :amount will be deposited into <a href=":sourceRoute">:sourceName</a> instead of taken from it.',
-    'convert_explanation_withdrawal_transfer'    => 'If you convert this withdrawal into a transfer, :amount will be transferred from <a href=":sourceRoute">:sourceName</a> to a new asset account, instead of being paid to <a href=":destinationRoute">:destinationName</a>.',
-    'convert_explanation_deposit_withdrawal'     => 'If you convert this deposit into a withdrawal, :amount will be removed from <a href=":destinationRoute">:destinationName</a> instead of added to it.',
-    'convert_explanation_deposit_transfer'       => 'If you convert this deposit into a transfer, :amount will be transferred from an asset account of your choice into <a href=":destinationRoute">:destinationName</a>.',
-    'convert_explanation_transfer_withdrawal'    => 'If you convert this transfer into a withdrawal, :amount will go from <a href=":sourceRoute">:sourceName</a> to a new destination as an expense, instead of to <a href=":destinationRoute">:destinationName</a> as a transfer.',
-    'convert_explanation_transfer_deposit'       => 'If you convert this transfer into a deposit, :amount will be deposited into account <a href=":destinationRoute">:destinationName</a> instead of being transferred there.',
-    'converted_to_Withdrawal'                    => 'The transaction has been converted to a withdrawal',
-    'converted_to_Deposit'                       => 'The transaction has been converted to a deposit',
-    'converted_to_Transfer'                      => 'The transaction has been converted to a transfer',
+    'convert_explanation_withdrawal_deposit'     => '',
+    'convert_explanation_withdrawal_transfer'    => '',
+    'convert_explanation_deposit_withdrawal'     => '',
+    'convert_explanation_deposit_transfer'       => '',
+    'convert_explanation_transfer_withdrawal'    => '',
+    'convert_explanation_transfer_deposit'       => '',
+    'converted_to_Withdrawal'                    => '',
+    'converted_to_Deposit'                       => '',
+    'converted_to_Transfer'                      => '',
 
 
     // create new stuff:
@@ -468,7 +468,7 @@ return [
     'store_currency'                             => 'Armazenar nova moeda',
     'update_currency'                            => 'Atualizar moeda',
     'new_default_currency'                       => 'Agora :name é a moeda padrão.',
-    'cannot_delete_currency'                     => 'Cannot delete :name because it is still in use.',
+    'cannot_delete_currency'                     => '',
     'deleted_currency'                           => 'Moeda :name excluída',
     'created_currency'                           => 'Moeda :name criada',
     'updated_currency'                           => 'Moeda :name atualizada',
@@ -500,7 +500,7 @@ return [
     'update_amount'                              => 'Atualizar quantia',
     'update_budget'                              => 'Atualizar Orçamento',
     'update_budget_amount_range'                 => 'Atualizar quantia disponível (esperada) entre :start e :end',
-    'budget_period_navigator'                    => 'Period navigator',
+    'budget_period_navigator'                    => '',
 
     // bills:
     'matching_on'                                => 'Corresponde em',
@@ -525,8 +525,8 @@ return [
     'average_bill_amount_overall'                => 'Média de fatura (geral)',
     'not_or_not_yet'                             => 'Não (ainda)',
     'not_expected_period'                        => 'Não esperado neste período',
-    'bill_is_active'                             => 'Bill is active',
-    'bill_will_automatch'                        => 'Bill will automatically linked to matching transactions',
+    'bill_is_active'                             => '',
+    'bill_will_automatch'                        => '',
     // accounts:
     'details_for_asset'                          => 'Detalhes para a conta de ativo ":name"',
     'details_for_expense'                        => 'Detalhes para a conta de despesas ":name"',
@@ -560,13 +560,13 @@ return [
     'stored_new_account'                         => 'Nova conta ":name" armazenado!',
     'updated_account'                            => 'Conta ":name" atualizada',
     'credit_card_options'                        => 'Opções de cartão de crédito',
-    'no_transactions_account'                    => 'There are no transactions (in this period) for asset account ":name".',
-    'no_data_for_chart'                          => 'There is not enough information (yet) to generate this chart.',
+    'no_transactions_account'                    => '',
+    'no_data_for_chart'                          => '',
     'select_more_than_one_account'               => 'Por favor, selecione mais de uma conta',
     'select_more_than_one_category'              => 'Por favor, selecione mais de uma categoria',
-    'select_more_than_one_budget'                => 'Please select more than one budget',
-    'select_more_than_one_tag'                   => 'Please select more than one tag',
-    'account_default_currency'                   => 'If you select another currency, new transactions from this account will have this currency pre-selected.',
+    'select_more_than_one_budget'                => '',
+    'select_more_than_one_tag'                   => '',
+    'account_default_currency'                   => '',
 
     // categories:
     'new_category'                               => 'Nova categoria',
@@ -614,9 +614,9 @@ return [
     'welcome'                                    => 'Bem Vindo ao Firefly!',
     'submit'                                     => 'Enviar',
     'getting_started'                            => 'Iniciar',
-    'to_get_started'                             => 'It is good to see you have successfully installed Firefly III. To get started with this tool please enter your bank\'s name and the balance of your main checking account. Do not worry yet if you have multiple accounts. You can add those later. It\'s just that Firefly III needs something to start with.',
-    'savings_balance_text'                       => 'Firefly III will automatically create a savings account for you. By default, there will be no money in your savings account, but if you tell Firefly III the balance it will be stored as such.',
-    'finish_up_new_user'                         => 'That\'s it! You can continue by pressing <strong>Submit</strong>. You will be taken to the index of Firefly III.',
+    'to_get_started'                             => '',
+    'savings_balance_text'                       => '',
+    'finish_up_new_user'                         => '',
     'stored_new_accounts_new_user'               => 'Yay! Suas novas contas foram armazenadas.',
 
     // home page:
@@ -674,11 +674,11 @@ return [
     'errors'                                     => 'Erros',
 
     // reports:
-    'report_default'                             => 'Default financial report between :start and :end',
-    'report_audit'                               => 'Transaction history overview between :start and :end',
-    'report_category'                            => 'Category report between :start and :end',
-    'report_budget'                              => 'Budget report between :start and :end',
-    'report_tag'                                 => 'Tag report between :start and :end',
+    'report_default'                             => '',
+    'report_audit'                               => '',
+    'report_category'                            => '',
+    'report_budget'                              => '',
+    'report_tag'                                 => '',
     'quick_link_reports'                         => 'Ligações rápidas',
     'quick_link_default_report'                  => 'Relatório financeiro padrão',
     'quick_link_audit_report'                    => 'Visão geral do histórico de transação',
@@ -705,13 +705,13 @@ return [
     'out'                                        => 'Saída',
     'topX'                                       => 'topo :number',
     'show_full_list'                             => 'Mostrar a lista inteira',
-    'show_only_top'                              => 'Show only top :number',
+    'show_only_top'                              => '',
     'report_type'                                => 'Tipo de relatório',
     'report_type_default'                        => 'Relatório financeiro padrão',
     'report_type_audit'                          => 'Visão geral do histórico de transação (auditoria)',
     'report_type_category'                       => 'Relatório por Categorias',
-    'report_type_budget'                         => 'Budget report',
-    'report_type_tag'                            => 'Tag report',
+    'report_type_budget'                         => '',
+    'report_type_tag'                            => '',
     'more_info_help'                             => 'Mais informações sobre esses tipos de relatórios podem ser encontradas nas páginas de ajuda. Pressione o ícone (?) no canto superior direito.',
     'report_included_accounts'                   => 'Contas incluídas',
     'report_date_range'                          => 'Período',
@@ -729,23 +729,23 @@ return [
     'report_has_no_extra_options'                => 'Este relatório não tem mais opções',
     'reports_submit'                             => 'Visualizar relatório',
     'end_after_start_date'                       => 'Data de término do relatório deve ser depois da data de início.',
-    'select_category'                            => 'Select category(ies)',
-    'select_budget'                              => 'Select budget(s).',
-    'select_tag'                                 => 'Select tag(s).',
+    'select_category'                            => '',
+    'select_budget'                              => '',
+    'select_tag'                                 => '',
     'income_per_category'                        => 'Receitas por categoria',
     'expense_per_category'                       => 'Despesa por categoria',
-    'expense_per_budget'                         => 'Expense per budget',
+    'expense_per_budget'                         => '',
     'income_per_account'                         => 'Rendimento por conta',
     'expense_per_account'                        => 'Por conta de despesas',
-    'expense_per_tag'                            => 'Expense per tag',
-    'income_per_tag'                             => 'Income per tag',
-    'include_expense_not_in_budget'              => 'Included expenses not in the selected budget(s)',
-    'include_expense_not_in_account'             => 'Included expenses not in the selected account(s)',
-    'include_expense_not_in_category'            => 'Included expenses not in the selected category(ies)',
-    'include_income_not_in_category'             => 'Included income not in the selected category(ies)',
-    'include_income_not_in_account'              => 'Included income not in the selected account(s)',
-    'include_income_not_in_tags'                 => 'Included income not in the selected tag(s)',
-    'include_expense_not_in_tags'                => 'Included expenses not in the selected tag(s)',
+    'expense_per_tag'                            => '',
+    'income_per_tag'                             => '',
+    'include_expense_not_in_budget'              => '',
+    'include_expense_not_in_account'             => '',
+    'include_expense_not_in_category'            => '',
+    'include_income_not_in_category'             => '',
+    'include_income_not_in_account'              => '',
+    'include_income_not_in_tags'                 => '',
+    'include_expense_not_in_tags'                => '',
     'everything_else'                            => 'Todo o resto',
     'income_and_expenses'                        => 'Receitas e despesas',
     'spent_average'                              => 'Gastos (média)',
@@ -755,27 +755,27 @@ return [
     'average_income_per_account'                 => 'Rendimento médio por conta',
     'total'                                      => 'Total',
     'description'                                => 'Descrição',
-    'sum_of_period'                              => 'Sum of period',
-    'average_in_period'                          => 'Average in period',
-    'account_role_defaultAsset'                  => 'Default asset account',
-    'account_role_sharedAsset'                   => 'Shared asset account',
-    'account_role_savingAsset'                   => 'Savings account',
-    'account_role_ccAsset'                       => 'Credit card',
+    'sum_of_period'                              => '',
+    'average_in_period'                          => '',
+    'account_role_defaultAsset'                  => '',
+    'account_role_sharedAsset'                   => '',
+    'account_role_savingAsset'                   => '',
+    'account_role_ccAsset'                       => '',
 
     // charts:
     'chart'                                      => 'Gráfico',
     'month'                                      => 'Mês',
     'budget'                                     => 'Orçamento',
     'spent'                                      => 'Gasto',
-    'spent_in_budget'                            => 'Spent in budget',
-    'left_to_spend'                              => 'Left to spend',
+    'spent_in_budget'                            => '',
+    'left_to_spend'                              => '',
     'earned'                                     => 'Ganho',
     'overspent'                                  => 'Gasto excedido',
     'left'                                       => 'Esquerda',
     'no_budget'                                  => '(sem orçamento)',
-    'max-amount'                                 => 'Maximum amount',
-    'min-amount'                                 => 'Minumum amount',
-    'journal-amount'                             => 'Current bill entry',
+    'max-amount'                                 => '',
+    'min-amount'                                 => '',
+    'journal-amount'                             => '',
     'name'                                       => 'Nome',
     'date'                                       => 'Data',
     'paid'                                       => 'Pago',
@@ -791,7 +791,7 @@ return [
     // piggy banks:
     'add_money_to_piggy'                         => 'Adicionar dinheiro ao cofrinho ":name"',
     'piggy_bank'                                 => 'Cofrinho',
-    'new_piggy_bank'                             => 'New piggy bank',
+    'new_piggy_bank'                             => '',
     'store_piggy_bank'                           => 'Armazenar novo cofrinho',
     'stored_piggy_bank'                          => 'Armazenar novo cofrinho ":name"',
     'account_status'                             => 'Status da Conta',
@@ -799,7 +799,7 @@ return [
     'sum_of_piggy_banks'                         => 'Soma dos cofrinhos',
     'saved_so_far'                               => 'Salvo até agora',
     'left_to_save'                               => 'Esquerda para salvar',
-    'suggested_amount'                           => 'Suggested monthly amount to save',
+    'suggested_amount'                           => '',
     'add_money_to_piggy_title'                   => 'Adicionar dinheiro ao cofrinho ":name"',
     'remove_money_from_piggy_title'              => 'Retire o dinheiro do cofrinho ":name"',
     'add'                                        => 'Adicionar',
@@ -819,7 +819,7 @@ return [
     'table'                      => 'Tabela',
     'delete_piggy_bank'          => 'Apagar cofrinho ":name"',
     'cannot_add_amount_piggy'    => 'Não foi possível adicionar :amount a ":name".',
-    'cannot_remove_from_piggy'   => 'Could not remove :amount from ":name".',
+    'cannot_remove_from_piggy'   => '',
     'deleted_piggy_bank'         => 'Apagar cofrinho ":name"',
     'added_amount_to_piggy'      => 'Adicionado :amount de ":name"',
     'removed_amount_from_piggy'  => 'Removido :amount de ":name"',
@@ -838,7 +838,7 @@ return [
     'transaction_journal_information'       => 'Informação da transação',
     'transaction_journal_meta'              => 'Meta-informação',
     'total_amount'                          => 'Valor total',
-    'number_of_decimals'                    => 'Number of decimals',
+    'number_of_decimals'                    => '',
 
     // administration
     'administration'                        => 'Administração',
@@ -848,11 +848,11 @@ return [
     'instance_configuration'                => 'Configuração',
     'firefly_instance_configuration'        => 'Opções de configuração para Firefly III',
     'setting_single_user_mode'              => 'Modo de usuário único',
-    'setting_single_user_mode_explain'      => 'By default, Firefly III only accepts one (1) registration: you. This is a security measure, preventing others from using your instance unless you allow them to. Future registrations are blocked. When you uncheck this box, others can use your instance as wel, assuming they can reach it (when it is connected to the internet).',
+    'setting_single_user_mode_explain'      => '',
     'store_configuration'                   => 'Configuração da Loja',
-    'single_user_administration'            => 'User administration for :email',
-    'edit_user'                             => 'Edit user :email',
-    'hidden_fields_preferences'             => 'Not all fields are visible right now. You must enable them in your <a href=":link">settings</a>.',
+    'single_user_administration'            => '',
+    'edit_user'                             => '',
+    'hidden_fields_preferences'             => '',
     'user_data_information'                 => 'Dados de usuário',
     'user_information'                      => 'Informações do usuário',
     'total_size'                            => 'tamanho total',
@@ -862,43 +862,43 @@ return [
     'rulegroup_or_groups'                   => 'grupo(s) de regra',
     'configuration_updated'                 => 'A configuração foi atualizada',
     'setting_is_demo_site'                  => 'Site demo',
-    'setting_is_demo_site_explain'          => 'If you check this box, this installation will behave as if it is the demo site, which can have weird side effects.',
-    'block_code_bounced'                    => 'Email message(s) bounced',
-    'block_code_expired'                    => 'Demo account expired',
-    'no_block_code'                         => 'No reason for block or user not blocked',
+    'setting_is_demo_site_explain'          => '',
+    'block_code_bounced'                    => '',
+    'block_code_expired'                    => '',
+    'no_block_code'                         => '',
     // links
-    'journal_link_configuration'            => 'Transaction links configuration',
-    'create_new_link_type'                  => 'Create new link type',
-    'store_new_link_type'                   => 'Store new link type',
-    'update_link_type'                      => 'Update link type',
-    'edit_link_type'                        => 'Edit link type ":name"',
-    'updated_link_type'                     => 'Updated link type ":name"',
-    'delete_link_type'                      => 'Delete link type ":name"',
-    'deleted_link_type'                     => 'Deleted link type ":name"',
-    'stored_new_link_type'                  => 'Store new link type ":name"',
-    'cannot_edit_link_type'                 => 'Cannot edit link type ":name"',
-    'link_type_help_name'                   => 'Ie. "Duplicates"',
-    'link_type_help_inward'                 => 'Ie. "duplicates"',
-    'link_type_help_outward'                => 'Ie. "is duplicated by"',
-    'save_connections_by_moving'            => 'Save the link between these transaction(s) by moving them to another link type:',
-    'do_not_save_connection'                => '(do not save connection)',
-    'link_transaction'                      => 'Link transaction',
-    'link_to_other_transaction'             => 'Link this transaction to another transaction',
-    'select_transaction_to_link'            => 'Select a transaction to link this transaction to',
-    'this_transaction'                      => 'This transaction',
-    'transaction'                           => 'Transaction',
-    'comments'                              => 'Comments',
-    'to_link_not_found'                     => 'If the transaction you want to link to is not listed, simply enter its ID.',
-    'invalid_link_data'                     => 'Invalid link type selected. Cannot link transaction.',
-    'journals_linked'                       => 'Transactions are linked.',
-    'journals_error_linked'                 => 'These transactions are already linked.',
-    'journal_links'                         => 'Transaction links',
-    'this_withdrawal'                       => 'This withdrawal',
-    'this_deposit'                          => 'This deposit',
-    'this_transfer'                         => 'This transfer',
-    'overview_for_link'                     => 'Overview for link type ":name"',
-    'delete_journal_link'                   => 'Delete the link between <a href=":source_link">:source</a> and <a href=":destination_link">:destination</a>',
-    'deleted_link'                          => 'Deleted link',
+    'journal_link_configuration'            => '',
+    'create_new_link_type'                  => '',
+    'store_new_link_type'                   => '',
+    'update_link_type'                      => '',
+    'edit_link_type'                        => '',
+    'updated_link_type'                     => '',
+    'delete_link_type'                      => '',
+    'deleted_link_type'                     => '',
+    'stored_new_link_type'                  => '',
+    'cannot_edit_link_type'                 => '',
+    'link_type_help_name'                   => '',
+    'link_type_help_inward'                 => '',
+    'link_type_help_outward'                => '',
+    'save_connections_by_moving'            => '',
+    'do_not_save_connection'                => '',
+    'link_transaction'                      => '',
+    'link_to_other_transaction'             => '',
+    'select_transaction_to_link'            => '',
+    'this_transaction'                      => '',
+    'transaction'                           => '',
+    'comments'                              => '',
+    'to_link_not_found'                     => '',
+    'invalid_link_data'                     => '',
+    'journals_linked'                       => '',
+    'journals_error_linked'                 => '',
+    'journal_links'                         => '',
+    'this_withdrawal'                       => '',
+    'this_deposit'                          => '',
+    'this_transfer'                         => '',
+    'overview_for_link'                     => '',
+    'delete_journal_link'                   => '',
+    'deleted_link'                          => '',
 
 
     // split a transaction:
@@ -911,7 +911,7 @@ return [
     'split_this_transfer'                   => 'Dividir essa transferência',
     'cannot_edit_multiple_source'           => 'Você não pode editar transações parceladas #:id com a descrição ":description" porque ele contém várias contas de origem.',
     'cannot_edit_multiple_dest'             => 'Você não pode editar transações parceladas #:id com a descrição ":description" porque ele contém várias contas de destino.',
-    'cannot_edit_opening_balance'           => 'You cannot edit the opening balance of an account.',
+    'cannot_edit_opening_balance'           => '',
     'no_edit_multiple_left'                 => 'Você não selecionou nenhuma transação válida para editar.',
 
     // import bread crumbs and titles:
@@ -919,94 +919,94 @@ return [
     'import_data'                           => 'Importar dados',
 
     // import index page:
-    'import_index_title'                    => 'Import data into Firefly III',
-    'import_index_sub_title'                => 'Index',
-    'import_general_index_intro'            => 'Welcome to Firefly\'s import routine. There are a few ways of importing data into Firefly III, displayed here as buttons.',
-    'import_index_intro'                    => 'This routine will help you import files from your bank into Firefly III. Please check out the help pages in the top right corner.',
-    'import_index_file'                     => 'Select your file',
-    'import_index_config'                   => 'If you have previously imported data into Firefly III, you may have a configuration file, which will pre-set configuration values for you. For some banks, other users have kindly provided their <a href="https://github.com/firefly-iii/import-configurations/wiki">configuration file</a>.',
-    'import_index_type'                     => 'Select the type of file you will upload',
-    'import_index_start'                    => 'Start importing',
+    'import_index_title'                    => '',
+    'import_index_sub_title'                => '',
+    'import_general_index_intro'            => '',
+    'import_index_intro'                    => '',
+    'import_index_file'                     => '',
+    'import_index_config'                   => '',
+    'import_index_type'                     => '',
+    'import_index_start'                    => '',
 
     // supported file types:
     'import_file_type_csv'                  => 'CSV (valores separados por vírgula)',
 
     // import configuration routine:
-    'import_config_sub_title'               => 'Set up your import file',
-    'import_config_bread_crumb'             => 'Set up your import file',
+    'import_config_sub_title'               => '',
+    'import_config_bread_crumb'             => '',
 
     // import status page:
-    'import_status_bread_crumb'             => 'Import status',
-    'import_status_sub_title'               => 'Import status',
-    'import_status_wait_title'              => 'Please hold...',
-    'import_status_wait_text'               => 'This box will disappear in a moment.',
-    'import_status_ready_title'             => 'Import is ready to start',
-    'import_status_ready_text'              => 'The import is ready to start. All the configuration you needed to do has been done. Please download the configuration file. It will help you with the import should it not go as planned. To actually run the import, you can either execute the following command in your console, or run the web-based import. Depending on your configuration, the console import will give you more feedback.',
-    'import_status_ready_config'            => 'Download configuration',
-    'import_status_ready_start'             => 'Start the import',
-    'import_status_ready_share'             => 'Please consider downloading your configuration and sharing it at the <strong><a href="https://github.com/firefly-iii/import-configurations/wiki">import configuration center</a></strong>. This will allow other users of Firefly III to import their files more easily.',
-    'import_status_running_title'           => 'The import is running',
-    'import_status_running_placeholder'     => 'Please hold for an update...',
-    'import_status_errors_title'            => 'Errors during the import',
-    'import_status_errors_single'           => 'An error has occured during the import. It does not appear to be fatal.',
-    'import_status_errors_multi'            => 'Some errors occured during the import. These do not appear to be fatal.',
-    'import_status_fatal_title'             => 'A fatal error occurred',
-    'import_status_fatal_text'              => 'A fatal error occurred, which the import-routine cannot recover from. Please see the explanation in red below.',
-    'import_status_fatal_more'              => 'If the error is a time-out, the import will have stopped half-way. For some server configurations, it is merely the server that stopped while the import keeps running in the background. To verify this, check out the log files. If the problem persists, consider importing over the command line instead.',
-    'import_status_finished_title'          => 'Import routine finished',
-    'import_status_finished_text'           => 'The import routine has imported your file.',
-    'import_status_finished_job'            => 'The transactions imported can be found in tag <a href=":link" class="label label-success" style="font-size:100%;font-weight:normal;">:tag</a>.',
+    'import_status_bread_crumb'             => '',
+    'import_status_sub_title'               => '',
+    'import_status_wait_title'              => '',
+    'import_status_wait_text'               => '',
+    'import_status_ready_title'             => '',
+    'import_status_ready_text'              => '',
+    'import_status_ready_config'            => '',
+    'import_status_ready_start'             => '',
+    'import_status_ready_share'             => '',
+    'import_status_running_title'           => '',
+    'import_status_running_placeholder'     => '',
+    'import_status_errors_title'            => '',
+    'import_status_errors_single'           => '',
+    'import_status_errors_multi'            => '',
+    'import_status_fatal_title'             => '',
+    'import_status_fatal_text'              => '',
+    'import_status_fatal_more'              => '',
+    'import_status_finished_title'          => '',
+    'import_status_finished_text'           => '',
+    'import_status_finished_job'            => '',
     'import_with_key'                       => 'Importação com chave \':key\'',
 
     // sandstorm.io errors and messages:
-    'sandstorm_not_available'               => 'This function is not available when you are using Firefly III within a Sandstorm.io environment.',
+    'sandstorm_not_available'               => '',
 
     // empty lists? no objects? instructions:
-    'no_transactions_in_period'             => 'There are no transactions in this period.',
-    'no_accounts_title_asset'               => 'Let\'s create an asset account!',
-    'no_accounts_intro_asset'               => 'You have no asset accounts yet. Asset accounts are your main accounts: your checking account, savings account, shared account or even your credit card.',
-    'no_accounts_imperative_asset'          => 'To start using Firefly III you must create at least one asset account. Let\'s do so now:',
-    'no_accounts_create_asset'              => 'Create an asset account',
-    'no_accounts_title_expense'             => 'Let\'s create an expense account!',
-    'no_accounts_intro_expense'             => 'You have no expense accounts yet. Expense accounts are the places where you spend money, such as shops and supermarkets.',
-    'no_accounts_imperative_expense'        => 'Expense accounts are created automatically when you create transactions, but you can create one manually too, if you want. Let\'s create one now:',
-    'no_accounts_create_expense'            => 'Create an expense account',
-    'no_accounts_title_revenue'             => 'Let\'s create a revenue account!',
-    'no_accounts_intro_revenue'             => 'You have no revenue accounts yet. Revenue accounts are the places where you receive money from, such as your employer.',
-    'no_accounts_imperative_revenue'        => 'Revenue accounts are created automatically when you create transactions, but you can create one manually too, if you want. Let\'s create one now:',
-    'no_accounts_create_revenue'            => 'Create a revenue account',
-    'no_budgets_title_default'              => 'Let\'s create a budget',
-    'no_budgets_intro_default'              => 'You have no budgets yet. Budgets are used to organise your expenses into logical groups, which you can give a soft-cap to limit your expenses.',
-    'no_budgets_imperative_default'         => 'Budgets are the basic tools of financial management. Let\'s create one now:',
-    'no_budgets_create_default'             => 'Create a budget',
-    'no_categories_title_default'           => 'Let\'s create a category!',
-    'no_categories_intro_default'           => 'You have no categories yet. Categories are used to fine tune your transactions and label them with their designated category.',
-    'no_categories_imperative_default'      => 'Categories are created automatically when you create transactions, but you can create one manually too. Let\'s create one now:',
-    'no_categories_create_default'          => 'Create a category',
-    'no_tags_title_default'                 => 'Let\'s create a tag!',
-    'no_tags_intro_default'                 => 'You have no tags yet. Tags are used to fine tune your transactions and label them with specific keywords.',
-    'no_tags_imperative_default'            => 'Tags are created automatically when you create transactions, but you can create one manually too. Let\'s create one now:',
-    'no_tags_create_default'                => 'Create a tag',
-    'no_transactions_title_withdrawal'      => 'Let\'s create an expense!',
-    'no_transactions_intro_withdrawal'      => 'You have no expenses yet. You should create expenses to start managing your finances.',
-    'no_transactions_imperative_withdrawal' => 'Have you spent some money? Then you should write it down:',
-    'no_transactions_create_withdrawal'     => 'Create an expense',
-    'no_transactions_title_deposit'         => 'Let\'s create some income!',
-    'no_transactions_intro_deposit'         => 'You have no recorded income yet. You should create income entries to start managing your finances.',
-    'no_transactions_imperative_deposit'    => 'Have you received some money? Then you should write it down:',
-    'no_transactions_create_deposit'        => 'Create a deposit',
-    'no_transactions_title_transfers'       => 'Let\'s create a transfer!',
-    'no_transactions_intro_transfers'       => 'You have no transfers yet. When you move money between asset accounts, it is recorded as a transfer.',
-    'no_transactions_imperative_transfers'  => 'Have you moved some money around? Then you should write it down:',
-    'no_transactions_create_transfers'      => 'Create a transfer',
-    'no_piggies_title_default'              => 'Let\'s create a piggy bank!',
-    'no_piggies_intro_default'              => 'You have no piggy banks yet. You can create piggy banks to divide your savings and keep track of what you\'re saving up for.',
-    'no_piggies_imperative_default'         => 'Do you have things you\'re saving money for? Create a piggy bank and keep track:',
-    'no_piggies_create_default'             => 'Create a new piggy bank',
-    'no_bills_title_default'                => 'Let\'s create a bill!',
-    'no_bills_intro_default'                => 'You have no bills yet. You can create bills to keep track of regular expenses, like your rent of insurance.',
-    'no_bills_imperative_default'           => 'Do you have such regular bills? Create a bill and keep track of your payments:',
-    'no_bills_create_default'               => 'Create a bill',
+    'no_transactions_in_period'             => '',
+    'no_accounts_title_asset'               => '',
+    'no_accounts_intro_asset'               => '',
+    'no_accounts_imperative_asset'          => '',
+    'no_accounts_create_asset'              => '',
+    'no_accounts_title_expense'             => '',
+    'no_accounts_intro_expense'             => '',
+    'no_accounts_imperative_expense'        => '',
+    'no_accounts_create_expense'            => '',
+    'no_accounts_title_revenue'             => '',
+    'no_accounts_intro_revenue'             => '',
+    'no_accounts_imperative_revenue'        => '',
+    'no_accounts_create_revenue'            => '',
+    'no_budgets_title_default'              => '',
+    'no_budgets_intro_default'              => '',
+    'no_budgets_imperative_default'         => '',
+    'no_budgets_create_default'             => '',
+    'no_categories_title_default'           => '',
+    'no_categories_intro_default'           => '',
+    'no_categories_imperative_default'      => '',
+    'no_categories_create_default'          => '',
+    'no_tags_title_default'                 => '',
+    'no_tags_intro_default'                 => '',
+    'no_tags_imperative_default'            => '',
+    'no_tags_create_default'                => '',
+    'no_transactions_title_withdrawal'      => '',
+    'no_transactions_intro_withdrawal'      => '',
+    'no_transactions_imperative_withdrawal' => '',
+    'no_transactions_create_withdrawal'     => '',
+    'no_transactions_title_deposit'         => '',
+    'no_transactions_intro_deposit'         => '',
+    'no_transactions_imperative_deposit'    => '',
+    'no_transactions_create_deposit'        => '',
+    'no_transactions_title_transfers'       => '',
+    'no_transactions_intro_transfers'       => '',
+    'no_transactions_imperative_transfers'  => '',
+    'no_transactions_create_transfers'      => '',
+    'no_piggies_title_default'              => '',
+    'no_piggies_intro_default'              => '',
+    'no_piggies_imperative_default'         => '',
+    'no_piggies_create_default'             => '',
+    'no_bills_title_default'                => '',
+    'no_bills_intro_default'                => '',
+    'no_bills_imperative_default'           => '',
+    'no_bills_create_default'               => '',
 
 
 ];
\ No newline at end of file

From b9bbd2872efd0e108f5576d45e00369838177adf Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Fri, 25 Aug 2017 07:08:10 +0200
Subject: [PATCH 293/668] New translations form.php (Chinese Traditional)

---
 resources/lang/zh_TW/form.php | 158 +++++++++++++++++-----------------
 1 file changed, 79 insertions(+), 79 deletions(-)

diff --git a/resources/lang/zh_TW/form.php b/resources/lang/zh_TW/form.php
index 2889759d75..260702cf88 100644
--- a/resources/lang/zh_TW/form.php
+++ b/resources/lang/zh_TW/form.php
@@ -27,14 +27,14 @@ return [
     'match'                          => '匹配於',
     'repeat_freq'                    => '循環週期',
     'journal_currency_id'            => '貨幣',
-    'currency_id'                    => 'Currency',
-    'attachments'                    => 'Attachments',
+    'currency_id'                    => '',
+    'attachments'                    => '',
     'journal_amount'                 => '金額',
     'journal_asset_source_account'   => '資產帳戶 （源頭）',
     'journal_source_account_name'    => '收入帳戶 （源頭）',
     'journal_source_account_id'      => '資產帳戶 （源頭）',
-    'BIC'                            => 'BIC',
-    'verify_password'                => 'Verify password security',
+    'BIC'                            => '',
+    'verify_password'                => '',
     'account_from_id'                => '從帳戶',
     'account_to_id'                  => '到帳戶',
     'source_account'                 => '來源帳戶',
@@ -66,28 +66,28 @@ return [
     'description'                    => '描述',
     'expense_account'                => '支出帳戶',
     'revenue_account'                => '收入帳戶',
-    'decimal_places'                 => 'Decimal places',
-    'exchange_rate_instruction'      => 'Foreign currencies',
-    'exchanged_amount'               => 'Exchanged amount',
-    'source_amount'                  => 'Amount (source)',
-    'destination_amount'             => 'Amount (destination)',
-    'native_amount'                  => 'Native amount',
+    'decimal_places'                 => '',
+    'exchange_rate_instruction'      => '',
+    'exchanged_amount'               => '',
+    'source_amount'                  => '',
+    'destination_amount'             => '',
+    'native_amount'                  => '',
 
     'revenue_account_source'      => '收入帳戶 （源頭）',
     'source_account_asset'        => '來源帳戶 （資產帳戶）',
-    'destination_account_expense' => 'Destination account (expense account)',
-    'destination_account_asset'   => 'Destination account (asset account)',
+    'destination_account_expense' => '',
+    'destination_account_asset'   => '',
     'source_account_revenue'      => '來源帳戶 （收入帳戶）',
-    'type'                        => 'Type',
-    'convert_Withdrawal'          => 'Convert withdrawal',
-    'convert_Deposit'             => 'Convert deposit',
-    'convert_Transfer'            => 'Convert transfer',
+    'type'                        => '',
+    'convert_Withdrawal'          => '',
+    'convert_Deposit'             => '',
+    'convert_Transfer'            => '',
 
 
     'amount'                     => '金額',
     'date'                       => '日期',
     'interest_date'              => '付息日',
-    'book_date'                  => 'Book date',
+    'book_date'                  => '',
     'process_date'               => '處理日期',
     'category'                   => '類別',
     'tags'                       => '標籤',
@@ -96,32 +96,32 @@ return [
     'targetdate'                 => '儲蓄目標日期',
     'tag'                        => '標籤',
     'under'                      => '低於',
-    'symbol'                     => 'Symbol',
-    'code'                       => 'Code',
-    'iban'                       => 'IBAN',
+    'symbol'                     => '',
+    'code'                       => '',
+    'iban'                       => '',
     'accountNumber'              => '帳戶號碼',
     'has_headers'                => '標頭',
     'date_format'                => '日期格式',
-    'specifix'                   => 'Bank- or file specific fixes',
+    'specifix'                   => '',
     'attachments[]'              => '附檔',
     'store_new_withdrawal'       => '存儲新提款',
     'store_new_deposit'          => '存儲新存款',
     'store_new_transfer'         => '存儲新轉帳',
     'add_new_withdrawal'         => '新增提款',
     'add_new_deposit'            => '新增新存款',
-    'add_new_transfer'           => 'Add a new transfer',
-    'noPiggybank'                => '(no piggy bank)',
+    'add_new_transfer'           => '',
+    'noPiggybank'                => '',
     'title'                      => '標題',
     'notes'                      => '備註',
     'filename'                   => '檔案名稱',
-    'mime'                       => 'Mime type',
-    'size'                       => 'Size',
-    'trigger'                    => 'Trigger',
-    'stop_processing'            => 'Stop processing',
-    'start_date'                 => 'Start of range',
-    'end_date'                   => 'End of range',
-    'export_start_range'         => 'Start of export range',
-    'export_end_range'           => 'End of export range',
+    'mime'                       => '',
+    'size'                       => '',
+    'trigger'                    => '',
+    'stop_processing'            => '',
+    'start_date'                 => '',
+    'end_date'                   => '',
+    'export_start_range'         => '',
+    'export_end_range'           => '',
     'export_format'              => '檔案格式',
     'include_attachments'        => '包括上傳的附件',
     'include_old_uploads'        => '包含導入的資料',
@@ -132,68 +132,68 @@ return [
     'delete_category'            => '刪除類別 ":name"',
     'delete_currency'            => '刪除貨幣 ":name"',
     'delete_journal'             => '刪除包含描述 ":description" 的交易',
-    'delete_attachment'          => 'Delete attachment ":name"',
-    'delete_rule'                => 'Delete rule ":title"',
-    'delete_rule_group'          => 'Delete rule group ":title"',
-    'delete_link_type'           => 'Delete link type ":name"',
-    'attachment_areYouSure'      => 'Are you sure you want to delete the attachment named ":name"?',
-    'account_areYouSure'         => 'Are you sure you want to delete the account named ":name"?',
+    'delete_attachment'          => '',
+    'delete_rule'                => '',
+    'delete_rule_group'          => '',
+    'delete_link_type'           => '',
+    'attachment_areYouSure'      => '',
+    'account_areYouSure'         => '',
     'bill_areYouSure'            => '你確定要刪除賬單 ":name" 嗎？',
-    'rule_areYouSure'            => 'Are you sure you want to delete the rule titled ":title"?',
-    'ruleGroup_areYouSure'       => 'Are you sure you want to delete the rule group titled ":title"?',
-    'budget_areYouSure'          => 'Are you sure you want to delete the budget named ":name"?',
-    'category_areYouSure'        => 'Are you sure you want to delete the category named ":name"?',
-    'currency_areYouSure'        => 'Are you sure you want to delete the currency named ":name"?',
-    'piggyBank_areYouSure'       => 'Are you sure you want to delete the piggy bank named ":name"?',
+    'rule_areYouSure'            => '',
+    'ruleGroup_areYouSure'       => '',
+    'budget_areYouSure'          => '',
+    'category_areYouSure'        => '',
+    'currency_areYouSure'        => '',
+    'piggyBank_areYouSure'       => '',
     'journal_areYouSure'         => '你真的要刪除這個描述為 ":description" 的交易嗎？',
-    'mass_journal_are_you_sure'  => 'Are you sure you want to delete these transactions?',
+    'mass_journal_are_you_sure'  => '',
     'tag_areYouSure'             => '你真的要要刪除標籤 ":tag" 嗎？',
-    'journal_link_areYouSure'    => 'Are you sure you want to delete the link between <a href=":source_link">:source</a> and <a href=":destination_link">:destination</a>?',
-    'linkType_areYouSure'        => 'Are you sure you want to delete the link type ":name" (":inward" / ":outward")?',
-    'permDeleteWarning'          => 'Deleting stuff from Firely is permanent and cannot be undone.',
-    'mass_make_selection'        => 'You can still prevent items from being deleted by removing the checkbox.',
-    'delete_all_permanently'     => 'Delete selected permanently',
-    'update_all_journals'        => 'Update these transactions',
-    'also_delete_transactions'   => 'The only transaction connected to this account will be deleted as well.|All :count transactions connected to this account will be deleted as well.',
-    'also_delete_connections'    => 'The only transaction linked with this link type will lose this connection.|All :count transactions linked with this link type will lose their connection.',
-    'also_delete_rules'          => 'The only rule connected to this rule group will be deleted as well.|All :count rules connected to this rule group will be deleted as well.',
-    'also_delete_piggyBanks'     => 'The only piggy bank connected to this account will be deleted as well.|All :count piggy bank connected to this account will be deleted as well.',
-    'bill_keep_transactions'     => 'The only transaction connected to this bill will not be deleted.|All :count transactions connected to this bill will spared deletion.',
-    'budget_keep_transactions'   => 'The only transaction connected to this budget will not be deleted.|All :count transactions connected to this budget will spared deletion.',
-    'category_keep_transactions' => 'The only transaction connected to this category will not be deleted.|All :count transactions connected to this category will spared deletion.',
-    'tag_keep_transactions'      => 'The only transaction connected to this tag will not be deleted.|All :count transactions connected to this tag will spared deletion.',
+    'journal_link_areYouSure'    => '',
+    'linkType_areYouSure'        => '',
+    'permDeleteWarning'          => '',
+    'mass_make_selection'        => '',
+    'delete_all_permanently'     => '',
+    'update_all_journals'        => '',
+    'also_delete_transactions'   => '',
+    'also_delete_connections'    => '',
+    'also_delete_rules'          => '',
+    'also_delete_piggyBanks'     => '',
+    'bill_keep_transactions'     => '',
+    'budget_keep_transactions'   => '',
+    'category_keep_transactions' => '',
+    'tag_keep_transactions'      => '',
 
-    'email'                 => 'Email address',
-    'password'              => 'Password',
-    'password_confirmation' => 'Password (again)',
-    'blocked'               => 'Is blocked?',
-    'blocked_code'          => 'Reason for block',
+    'email'                 => '',
+    'password'              => '',
+    'password_confirmation' => '',
+    'blocked'               => '',
+    'blocked_code'          => '',
 
 
     // admin
-    'domain'                => 'Domain',
-    'single_user_mode'      => 'Single user mode',
-    'must_confirm_account'  => 'New users must activate account',
-    'is_demo_site'          => 'Is demo site',
+    'domain'                => '',
+    'single_user_mode'      => '',
+    'must_confirm_account'  => '',
+    'is_demo_site'          => '',
 
 
     // import
     'import_file'           => '匯入檔案',
-    'configuration_file'    => 'Configuration file',
+    'configuration_file'    => '',
     'import_file_type'      => '匯入檔案類型',
-    'csv_comma'             => 'A comma (,)',
-    'csv_semicolon'         => 'A semicolon (;)',
-    'csv_tab'               => 'A tab (invisible)',
-    'csv_delimiter'         => 'CSV field delimiter',
-    'csv_import_account'    => 'Default import account',
-    'csv_config'            => 'CSV import configuration',
+    'csv_comma'             => '',
+    'csv_semicolon'         => '',
+    'csv_tab'               => '',
+    'csv_delimiter'         => '',
+    'csv_import_account'    => '',
+    'csv_config'            => '',
 
 
     'due_date'           => '到期日',
-    'payment_date'       => 'Payment date',
-    'invoice_date'       => 'Invoice date',
-    'internal_reference' => 'Internal reference',
+    'payment_date'       => '',
+    'invoice_date'       => '',
+    'internal_reference' => '',
 
-    'inward'  => 'Inward description',
-    'outward' => 'Outward description',
+    'inward'  => '',
+    'outward' => '',
 ];
\ No newline at end of file

From 464f86eb1d5bec50f78f0ad309dc7b210fca7d47 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Fri, 25 Aug 2017 07:08:13 +0200
Subject: [PATCH 294/668] New translations firefly.php (Spanish)

---
 resources/lang/es_ES/firefly.php | 1744 +++++++++++++++---------------
 1 file changed, 872 insertions(+), 872 deletions(-)

diff --git a/resources/lang/es_ES/firefly.php b/resources/lang/es_ES/firefly.php
index b427e5317f..c3db80f888 100644
--- a/resources/lang/es_ES/firefly.php
+++ b/resources/lang/es_ES/firefly.php
@@ -56,957 +56,957 @@ return [
     'two_factor_title'                           => 'Autenticación en dos pasos',
     'authenticate'                               => 'Autentificar',
     'two_factor_forgot_title'                    => 'Autenticación en dos pasos perdida',
-    'two_factor_forgot'                          => 'I forgot my two-factor thing.',
-    'two_factor_lost_header'                     => 'Lost your two factor authentication?',
+    'two_factor_forgot'                          => '',
+    'two_factor_lost_header'                     => '',
     'two_factor_lost_intro'                      => 'Por desgracia, esto no es algo que se pueda restablecer desde la interfaz web. Tienes dos opciones.',
-    'two_factor_lost_fix_self'                   => 'If you run your own instance of Firefly III, check the logs in <code>storage/logs</code> for instructions.',
-    'two_factor_lost_fix_owner'                  => 'Otherwise, email the site owner, <a href="mailto::site_owner">:site_owner</a> and ask them to reset your two factor authentication.',
-    'warning_much_data'                          => ':days days of data may take a while to load.',
+    'two_factor_lost_fix_self'                   => '',
+    'two_factor_lost_fix_owner'                  => '',
+    'warning_much_data'                          => '',
     'registered'                                 => '¡Te has registrado con éxito!',
-    'Default asset account'                      => '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.',
-    'Savings account'                            => 'Savings account',
-    'Credit card'                                => 'Credit card',
-    'source_accounts'                            => 'Source account(s)',
-    'destination_accounts'                       => 'Destination account(s)',
-    'user_id_is'                                 => 'Your user id is <strong>:user</strong>',
-    'field_supports_markdown'                    => 'This field supports <a href="https://en.support.wordpress.com/markdown-quick-reference/">Markdown</a>.',
-    'need_more_help'                             => 'If you need more help using Firefly III, please <a href="https://github.com/firefly-iii/firefly-iii/issues">open a ticket on Github</a>.',
-    'reenable_intro_text'                        => 'You can also reenable <a href="#" id="reenableGuidance">the introduction guidance</a>.',
-    'intro_boxes_after_refresh'                  => 'The introduction boxes will reappear when you refresh the page.',
-    'show_all_no_filter'                         => 'Show all transactions without grouping them by date.',
-    'expenses_by_category'                       => 'Expenses by category',
-    'expenses_by_budget'                         => 'Expenses by budget',
-    'income_by_category'                         => 'Income by category',
-    'expenses_by_asset_account'                  => 'Expenses by asset account',
-    'expenses_by_expense_account'                => 'Expenses by expense account',
-    'cannot_redirect_to_account'                 => 'Firefly III cannot redirect you to the correct page. Apologies.',
-    'sum_of_expenses'                            => 'Sum of expenses',
-    'sum_of_income'                              => 'Sum of income',
-    'total_sum'                                  => 'Total sum',
-    'spent_in_specific_budget'                   => 'Spent in budget ":budget"',
-    'sum_of_expenses_in_budget'                  => 'Spent total in budget ":budget"',
-    'left_in_budget_limit'                       => 'Left to spend according to budgeting',
-    'cannot_reset_demo_user'                     => 'You cannot reset the password of the demonstration account',
-    'current_period'                             => 'Current period',
-    'show_the_current_period_and_overview'       => 'Show the current period and overview',
-    'pref_languages_locale'                      => 'For a language other than English to work properly, your operating system must be equipped with the correct locale-information. If these are not present, currency data, dates and amounts may be formatted wrong.',
-    'budget_in_period'                           => 'All transactions for budget ":name" between :start and :end',
-    'chart_budget_in_period'                     => 'Chart for all transactions for budget ":name" between :start and :end',
-    'chart_account_in_period'                    => 'Chart for all transactions for account ":name" between :start and :end',
-    'chart_category_in_period'                   => 'Chart for all transactions for category ":name" between :start and :end',
-    'chart_category_all'                         => 'Chart for all transactions for category ":name"',
-    'clone_withdrawal'                           => 'Clone this withdrawal',
-    'clone_deposit'                              => 'Clone this deposit',
-    'clone_transfer'                             => 'Clone this transfer',
-    'multi_select_no_selection'                  => 'None selected',
-    'multi_select_all_selected'                  => 'All selected',
-    'multi_select_filter_placeholder'            => 'Find..',
-    'between_dates_breadcrumb'                   => 'Between :start and :end',
-    'all_journals_without_budget'                => 'All transactions without a budget',
-    'journals_without_budget'                    => 'Transactions without a budget',
-    'all_journals_without_category'              => 'All transactions without a category',
-    'journals_without_category'                  => 'Transactions without a category',
-    'all_journals_for_account'                   => 'All transactions for account :name',
-    'chart_all_journals_for_account'             => 'Chart of all transactions for account :name',
-    'journals_in_period_for_account'             => 'All transactions for account :name between :start and :end',
-    'transferred'                                => 'Transferred',
-    'all_withdrawal'                             => 'All expenses',
-    'all_transactions'                           => 'All transactions',
-    'title_withdrawal_between'                   => 'All expenses between :start and :end',
-    'all_deposit'                                => 'All revenue',
-    'title_deposit_between'                      => 'All revenue between :start and :end',
-    'all_transfers'                              => 'All transfers',
-    'title_transfers_between'                    => 'All transfers between :start and :end',
-    'all_transfer'                               => 'All transfers',
-    'all_journals_for_tag'                       => 'All transactions for tag ":tag"',
-    'title_transfer_between'                     => 'All transfers between :start and :end',
-    'all_journals_for_category'                  => 'All transactions for category :name',
-    'all_journals_for_budget'                    => 'All transactions for budget :name',
-    'chart_all_journals_for_budget'              => 'Chart of all transactions for budget :name',
-    'journals_in_period_for_category'            => 'All transactions for category :name between :start and :end',
-    'journals_in_period_for_tag'                 => 'All transactions for tag :tag between :start and :end',
-    'not_available_demo_user'                    => 'The feature you try to access is not available to demo users.',
-    'exchange_rate_instructions'                 => 'Asset account "@name" only accepts transactions in @native_currency. If you wish to use @foreign_currency instead, make sure that the amount in @native_currency is known as well:',
-    'transfer_exchange_rate_instructions'        => 'Source asset account "@source_name" only accepts transactions in @source_currency. Destination asset account "@dest_name" only accepts transactions in @dest_currency. You must provide the transferred amount correctly in both currencies.',
-    'transaction_data'                           => 'Transaction data',
+    'Default asset account'                      => '',
+    'no_budget_pointer'                          => '',
+    'Savings account'                            => '',
+    'Credit card'                                => '',
+    'source_accounts'                            => '',
+    'destination_accounts'                       => '',
+    'user_id_is'                                 => '',
+    'field_supports_markdown'                    => '',
+    'need_more_help'                             => '',
+    'reenable_intro_text'                        => '',
+    'intro_boxes_after_refresh'                  => '',
+    'show_all_no_filter'                         => '',
+    'expenses_by_category'                       => '',
+    'expenses_by_budget'                         => '',
+    'income_by_category'                         => '',
+    'expenses_by_asset_account'                  => '',
+    'expenses_by_expense_account'                => '',
+    'cannot_redirect_to_account'                 => '',
+    'sum_of_expenses'                            => '',
+    'sum_of_income'                              => '',
+    'total_sum'                                  => '',
+    'spent_in_specific_budget'                   => '',
+    'sum_of_expenses_in_budget'                  => '',
+    'left_in_budget_limit'                       => '',
+    'cannot_reset_demo_user'                     => '',
+    'current_period'                             => '',
+    'show_the_current_period_and_overview'       => '',
+    'pref_languages_locale'                      => '',
+    'budget_in_period'                           => '',
+    'chart_budget_in_period'                     => '',
+    'chart_account_in_period'                    => '',
+    'chart_category_in_period'                   => '',
+    'chart_category_all'                         => '',
+    'clone_withdrawal'                           => '',
+    'clone_deposit'                              => '',
+    'clone_transfer'                             => '',
+    'multi_select_no_selection'                  => '',
+    'multi_select_all_selected'                  => '',
+    'multi_select_filter_placeholder'            => '',
+    'between_dates_breadcrumb'                   => '',
+    'all_journals_without_budget'                => '',
+    'journals_without_budget'                    => '',
+    'all_journals_without_category'              => '',
+    'journals_without_category'                  => '',
+    'all_journals_for_account'                   => '',
+    'chart_all_journals_for_account'             => '',
+    'journals_in_period_for_account'             => '',
+    'transferred'                                => '',
+    'all_withdrawal'                             => '',
+    'all_transactions'                           => '',
+    'title_withdrawal_between'                   => '',
+    'all_deposit'                                => '',
+    'title_deposit_between'                      => '',
+    'all_transfers'                              => '',
+    'title_transfers_between'                    => '',
+    'all_transfer'                               => '',
+    'all_journals_for_tag'                       => '',
+    'title_transfer_between'                     => '',
+    'all_journals_for_category'                  => '',
+    'all_journals_for_budget'                    => '',
+    'chart_all_journals_for_budget'              => '',
+    'journals_in_period_for_category'            => '',
+    'journals_in_period_for_tag'                 => '',
+    'not_available_demo_user'                    => '',
+    'exchange_rate_instructions'                 => '',
+    'transfer_exchange_rate_instructions'        => '',
+    'transaction_data'                           => '',
 
     // search
-    'search'                                     => 'Search',
-    'search_found_transactions'                  => 'Number of transactions found:',
-    'general_search_error'                       => 'An error occured while searching. Please check the log files for more information.',
-    'search_box'                                 => 'Search',
-    'search_box_intro'                           => 'Welcome to the search function of Firefly III. Enter your search query in the box. Make sure you check out the help file because the search is pretty advanced.',
-    'search_error'                               => 'Error while searching',
-    'search_searching'                           => 'Searching ...',
+    'search'                                     => '',
+    'search_found_transactions'                  => '',
+    'general_search_error'                       => '',
+    'search_box'                                 => '',
+    'search_box_intro'                           => '',
+    'search_error'                               => '',
+    'search_searching'                           => '',
 
     // repeat frequencies:
-    'repeat_freq_yearly'                         => 'yearly',
-    'repeat_freq_monthly'                        => 'monthly',
-    'weekly'                                     => 'weekly',
-    'quarterly'                                  => 'quarterly',
-    'half-year'                                  => 'every half year',
-    'yearly'                                     => 'yearly',
+    'repeat_freq_yearly'                         => '',
+    'repeat_freq_monthly'                        => '',
+    'weekly'                                     => '',
+    'quarterly'                                  => '',
+    'half-year'                                  => '',
+    'yearly'                                     => '',
 
     // export data:
-    'import_and_export'                          => 'Import and export',
-    'export_data'                                => 'Export data',
-    'export_data_intro'                          => 'For backup purposes, when migrating to another system or when migrating to another Firefly III installation.',
-    'export_format'                              => 'Export format',
-    'export_format_csv'                          => 'Comma separated values (CSV file)',
-    'export_format_mt940'                        => 'MT940 compatible format',
-    'export_included_accounts'                   => 'Export transactions from these accounts',
-    'include_old_uploads_help'                   => 'Firefly III does not throw away the original CSV files you have imported in the past. You can include them in your export.',
-    'do_export'                                  => 'Export',
-    'export_status_never_started'                => 'The export has not started yet',
-    'export_status_make_exporter'                => 'Creating exporter thing...',
-    'export_status_collecting_journals'          => 'Collecting your transactions...',
-    'export_status_collected_journals'           => 'Collected your transactions!',
-    'export_status_converting_to_export_format'  => 'Converting your transactions...',
-    'export_status_converted_to_export_format'   => 'Converted your transactions!',
-    'export_status_creating_journal_file'        => 'Creating the export file...',
-    'export_status_created_journal_file'         => 'Created the export file!',
-    'export_status_collecting_attachments'       => 'Collecting all your attachments...',
-    'export_status_collected_attachments'        => 'Collected all your attachments!',
-    'export_status_collecting_old_uploads'       => 'Collecting all your previous uploads...',
-    'export_status_collected_old_uploads'        => 'Collected all your previous uploads!',
-    'export_status_creating_config_file'         => 'Creating a configuration file...',
-    'export_status_created_config_file'          => 'Created a configuration file!',
-    'export_status_creating_zip_file'            => 'Creating a zip file...',
-    'export_status_created_zip_file'             => 'Created a zip file!',
-    'export_status_finished'                     => 'Export has succesfully finished! Yay!',
-    'export_data_please_wait'                    => 'Please wait...',
+    'import_and_export'                          => '',
+    'export_data'                                => '',
+    'export_data_intro'                          => '',
+    'export_format'                              => '',
+    'export_format_csv'                          => '',
+    'export_format_mt940'                        => '',
+    'export_included_accounts'                   => '',
+    'include_old_uploads_help'                   => '',
+    'do_export'                                  => '',
+    'export_status_never_started'                => '',
+    'export_status_make_exporter'                => '',
+    'export_status_collecting_journals'          => '',
+    'export_status_collected_journals'           => '',
+    'export_status_converting_to_export_format'  => '',
+    'export_status_converted_to_export_format'   => '',
+    'export_status_creating_journal_file'        => '',
+    'export_status_created_journal_file'         => '',
+    'export_status_collecting_attachments'       => '',
+    'export_status_collected_attachments'        => '',
+    'export_status_collecting_old_uploads'       => '',
+    'export_status_collected_old_uploads'        => '',
+    'export_status_creating_config_file'         => '',
+    'export_status_created_config_file'          => '',
+    'export_status_creating_zip_file'            => '',
+    'export_status_created_zip_file'             => '',
+    'export_status_finished'                     => '',
+    'export_data_please_wait'                    => '',
 
     // rules
-    'rules'                                      => 'Rules',
-    'rule_name'                                  => 'Name of rule',
-    'rule_triggers'                              => 'Rule triggers when',
-    'rule_actions'                               => 'Rule will',
-    'new_rule'                                   => 'New rule',
-    'new_rule_group'                             => 'New rule group',
-    'rule_priority_up'                           => 'Give rule more priority',
-    'rule_priority_down'                         => 'Give rule less priority',
-    'make_new_rule_group'                        => 'Make new rule group',
-    'store_new_rule_group'                       => 'Store new rule group',
-    'created_new_rule_group'                     => 'New rule group ":title" stored!',
-    'updated_rule_group'                         => 'Successfully updated rule group ":title".',
-    'edit_rule_group'                            => 'Edit rule group ":title"',
-    'delete_rule_group'                          => 'Delete rule group ":title"',
-    'deleted_rule_group'                         => 'Deleted rule group ":title"',
-    'update_rule_group'                          => 'Update rule group',
-    'no_rules_in_group'                          => 'There are no rules in this group',
-    'move_rule_group_up'                         => 'Move rule group up',
-    'move_rule_group_down'                       => 'Move rule group down',
-    'save_rules_by_moving'                       => 'Save these rule(s) by moving them to another rule group:',
-    'make_new_rule'                              => 'Make new rule in rule group ":title"',
-    'rule_help_stop_processing'                  => 'When you check this box, later rules in this group will not be executed.',
-    'rule_help_active'                           => 'Inactive rules will never fire.',
-    'stored_new_rule'                            => 'Stored new rule with title ":title"',
-    'deleted_rule'                               => 'Deleted rule with title ":title"',
-    'store_new_rule'                             => 'Store new rule',
-    'updated_rule'                               => 'Updated rule with title ":title"',
-    'default_rule_group_name'                    => 'Default rules',
-    'default_rule_group_description'             => 'All your rules not in a particular group.',
-    'default_rule_name'                          => 'Your first default rule',
-    'default_rule_description'                   => 'This rule is an example. You can safely delete it.',
-    'default_rule_trigger_description'           => 'The Man Who Sold the World',
-    'default_rule_trigger_from_account'          => 'David Bowie',
-    'default_rule_action_prepend'                => 'Bought the world from ',
-    'default_rule_action_set_category'           => 'Large expenses',
-    'trigger'                                    => 'Trigger',
-    'trigger_value'                              => 'Trigger on value',
-    'stop_processing_other_triggers'             => 'Stop processing other triggers',
-    'add_rule_trigger'                           => 'Add new trigger',
-    'action'                                     => 'Action',
-    'action_value'                               => 'Action value',
-    'stop_executing_other_actions'               => 'Stop executing other actions',
-    'add_rule_action'                            => 'Add new action',
-    'edit_rule'                                  => 'Edit rule ":title"',
-    'delete_rule'                                => 'Delete rule ":title"',
-    'update_rule'                                => 'Update rule',
-    'test_rule_triggers'                         => 'See matching transactions',
-    'warning_transaction_subset'                 => 'For performance reasons this list is limited to :max_num_transactions and may only show a subset of matching transactions',
-    'warning_no_matching_transactions'           => 'No matching transactions found. Please note that for performance reasons, only the last :num_transactions transactions have been checked.',
-    'warning_no_valid_triggers'                  => 'No valid triggers provided.',
-    'apply_rule_selection'                       => 'Apply rule ":title" to a selection of your transactions',
-    'apply_rule_selection_intro'                 => 'Rules like ":title" are normally only applied to new or updated transactions, but you can tell Firefly III to run it on a selection of your existing transactions. This can be useful when you have updated a rule and you need the changes to be applied to all of your other transactions.',
-    'include_transactions_from_accounts'         => 'Include transactions from these accounts',
-    'applied_rule_selection'                     => 'Rule ":title" has been applied to your selection.',
-    'execute'                                    => 'Execute',
-    'apply_rule_group_selection'                 => 'Apply rule group ":title" to a selection of your transactions',
-    'apply_rule_group_selection_intro'           => 'Rule groups like ":title" are normally only applied to new or updated transactions, but you can tell Firefly III to run all the rules in this group on a selection of your existing transactions. This can be useful when you have updated a group of rules and you need the changes to be applied to all of your other transactions.',
-    'applied_rule_group_selection'               => 'Rule group ":title" has been applied to your selection.',
+    'rules'                                      => '',
+    'rule_name'                                  => '',
+    'rule_triggers'                              => '',
+    'rule_actions'                               => '',
+    'new_rule'                                   => '',
+    'new_rule_group'                             => '',
+    'rule_priority_up'                           => '',
+    'rule_priority_down'                         => '',
+    'make_new_rule_group'                        => '',
+    'store_new_rule_group'                       => '',
+    'created_new_rule_group'                     => '',
+    'updated_rule_group'                         => '',
+    'edit_rule_group'                            => '',
+    'delete_rule_group'                          => '',
+    'deleted_rule_group'                         => '',
+    'update_rule_group'                          => '',
+    'no_rules_in_group'                          => '',
+    'move_rule_group_up'                         => '',
+    'move_rule_group_down'                       => '',
+    'save_rules_by_moving'                       => '',
+    'make_new_rule'                              => '',
+    'rule_help_stop_processing'                  => '',
+    'rule_help_active'                           => '',
+    'stored_new_rule'                            => '',
+    'deleted_rule'                               => '',
+    'store_new_rule'                             => '',
+    'updated_rule'                               => '',
+    'default_rule_group_name'                    => '',
+    'default_rule_group_description'             => '',
+    'default_rule_name'                          => '',
+    'default_rule_description'                   => '',
+    'default_rule_trigger_description'           => '',
+    'default_rule_trigger_from_account'          => '',
+    'default_rule_action_prepend'                => '',
+    'default_rule_action_set_category'           => '',
+    'trigger'                                    => '',
+    'trigger_value'                              => '',
+    'stop_processing_other_triggers'             => '',
+    'add_rule_trigger'                           => '',
+    'action'                                     => '',
+    'action_value'                               => '',
+    'stop_executing_other_actions'               => '',
+    'add_rule_action'                            => '',
+    'edit_rule'                                  => '',
+    'delete_rule'                                => '',
+    'update_rule'                                => '',
+    'test_rule_triggers'                         => '',
+    'warning_transaction_subset'                 => '',
+    'warning_no_matching_transactions'           => '',
+    'warning_no_valid_triggers'                  => '',
+    'apply_rule_selection'                       => '',
+    'apply_rule_selection_intro'                 => '',
+    'include_transactions_from_accounts'         => '',
+    'applied_rule_selection'                     => '',
+    'execute'                                    => '',
+    'apply_rule_group_selection'                 => '',
+    'apply_rule_group_selection_intro'           => '',
+    'applied_rule_group_selection'               => '',
 
     // actions and triggers
-    'rule_trigger_user_action'                   => 'User action is ":trigger_value"',
-    'rule_trigger_from_account_starts'           => 'Source account starts with ":trigger_value"',
-    'rule_trigger_from_account_ends'             => 'Source account ends with ":trigger_value"',
-    'rule_trigger_from_account_is'               => 'Source account is ":trigger_value"',
-    'rule_trigger_from_account_contains'         => 'Source account contains ":trigger_value"',
-    'rule_trigger_to_account_starts'             => 'Destination account starts with ":trigger_value"',
-    'rule_trigger_to_account_ends'               => 'Destination account ends with ":trigger_value"',
-    'rule_trigger_to_account_is'                 => 'Destination account is ":trigger_value"',
-    'rule_trigger_to_account_contains'           => 'Destination account contains ":trigger_value"',
-    'rule_trigger_transaction_type'              => 'Transaction is of type ":trigger_value"',
-    'rule_trigger_category_is'                   => 'Category is ":trigger_value"',
-    'rule_trigger_amount_less'                   => 'Amount is less than :trigger_value',
-    'rule_trigger_amount_exactly'                => 'Amount is :trigger_value',
-    'rule_trigger_amount_more'                   => 'Amount is more than :trigger_value',
-    'rule_trigger_description_starts'            => 'Description starts with ":trigger_value"',
-    'rule_trigger_description_ends'              => 'Description ends with ":trigger_value"',
-    'rule_trigger_description_contains'          => 'Description contains ":trigger_value"',
-    'rule_trigger_description_is'                => 'Description is ":trigger_value"',
-    'rule_trigger_from_account_starts_choice'    => 'Source account starts with..',
-    'rule_trigger_from_account_ends_choice'      => 'Source account ends with..',
-    'rule_trigger_from_account_is_choice'        => 'Source account is..',
-    'rule_trigger_from_account_contains_choice'  => 'Source account contains..',
-    'rule_trigger_to_account_starts_choice'      => 'Destination account starts with..',
-    'rule_trigger_to_account_ends_choice'        => 'Destination account ends with..',
-    'rule_trigger_to_account_is_choice'          => 'Destination account is..',
-    'rule_trigger_to_account_contains_choice'    => 'Destination account contains..',
-    'rule_trigger_transaction_type_choice'       => 'Transaction is of type..',
-    'rule_trigger_amount_less_choice'            => 'Amount is less than..',
-    'rule_trigger_amount_exactly_choice'         => 'Amount is..',
-    'rule_trigger_amount_more_choice'            => 'Amount is more than..',
-    'rule_trigger_description_starts_choice'     => 'Description starts with..',
-    'rule_trigger_description_ends_choice'       => 'Description ends with..',
-    'rule_trigger_description_contains_choice'   => 'Description contains..',
-    'rule_trigger_description_is_choice'         => 'Description is..',
-    'rule_trigger_category_is_choice'            => 'Category is..',
-    'rule_trigger_budget_is_choice'              => 'Budget is..',
-    'rule_trigger_tag_is_choice'                 => '(A) tag is..',
-    'rule_trigger_has_attachments_choice'        => 'Has at least this many attachments',
-    'rule_trigger_has_attachments'               => 'Has at least :trigger_value attachment(s)',
-    'rule_trigger_store_journal'                 => 'When a transaction is created',
-    'rule_trigger_update_journal'                => 'When a transaction is updated',
-    'rule_action_set_category'                   => 'Set category to ":action_value"',
-    'rule_action_clear_category'                 => 'Clear category',
-    'rule_action_set_budget'                     => 'Set budget to ":action_value"',
-    'rule_action_clear_budget'                   => 'Clear budget',
-    'rule_action_add_tag'                        => 'Add tag ":action_value"',
-    'rule_action_remove_tag'                     => 'Remove tag ":action_value"',
-    'rule_action_remove_all_tags'                => 'Remove all tags',
-    'rule_action_set_description'                => 'Set description to ":action_value"',
-    'rule_action_append_description'             => 'Append description with ":action_value"',
-    'rule_action_prepend_description'            => 'Prepend description with ":action_value"',
-    'rule_action_set_category_choice'            => 'Set category to..',
-    'rule_action_clear_category_choice'          => 'Clear any category',
-    'rule_action_set_budget_choice'              => 'Set budget to..',
-    'rule_action_clear_budget_choice'            => 'Clear any budget',
-    'rule_action_add_tag_choice'                 => 'Add tag..',
-    'rule_action_remove_tag_choice'              => 'Remove tag..',
-    'rule_action_remove_all_tags_choice'         => 'Remove all tags',
-    'rule_action_set_description_choice'         => 'Set description to..',
-    'rule_action_append_description_choice'      => 'Append description with..',
-    'rule_action_prepend_description_choice'     => 'Prepend description with..',
-    'rule_action_set_source_account_choice'      => 'Set source account to...',
-    'rule_action_set_source_account'             => 'Set source account to :action_value',
-    'rule_action_set_destination_account_choice' => 'Set destination account to...',
-    'rule_action_set_destination_account'        => 'Set destination account to :action_value',
+    'rule_trigger_user_action'                   => '',
+    'rule_trigger_from_account_starts'           => '',
+    'rule_trigger_from_account_ends'             => '',
+    'rule_trigger_from_account_is'               => '',
+    'rule_trigger_from_account_contains'         => '',
+    'rule_trigger_to_account_starts'             => '',
+    'rule_trigger_to_account_ends'               => '',
+    'rule_trigger_to_account_is'                 => '',
+    'rule_trigger_to_account_contains'           => '',
+    'rule_trigger_transaction_type'              => '',
+    'rule_trigger_category_is'                   => '',
+    'rule_trigger_amount_less'                   => '',
+    'rule_trigger_amount_exactly'                => '',
+    'rule_trigger_amount_more'                   => '',
+    'rule_trigger_description_starts'            => '',
+    'rule_trigger_description_ends'              => '',
+    'rule_trigger_description_contains'          => '',
+    'rule_trigger_description_is'                => '',
+    'rule_trigger_from_account_starts_choice'    => '',
+    'rule_trigger_from_account_ends_choice'      => '',
+    'rule_trigger_from_account_is_choice'        => '',
+    'rule_trigger_from_account_contains_choice'  => '',
+    'rule_trigger_to_account_starts_choice'      => '',
+    'rule_trigger_to_account_ends_choice'        => '',
+    'rule_trigger_to_account_is_choice'          => '',
+    'rule_trigger_to_account_contains_choice'    => '',
+    'rule_trigger_transaction_type_choice'       => '',
+    'rule_trigger_amount_less_choice'            => '',
+    'rule_trigger_amount_exactly_choice'         => '',
+    'rule_trigger_amount_more_choice'            => '',
+    'rule_trigger_description_starts_choice'     => '',
+    'rule_trigger_description_ends_choice'       => '',
+    'rule_trigger_description_contains_choice'   => '',
+    'rule_trigger_description_is_choice'         => '',
+    'rule_trigger_category_is_choice'            => '',
+    'rule_trigger_budget_is_choice'              => '',
+    'rule_trigger_tag_is_choice'                 => '',
+    'rule_trigger_has_attachments_choice'        => '',
+    'rule_trigger_has_attachments'               => '',
+    'rule_trigger_store_journal'                 => '',
+    'rule_trigger_update_journal'                => '',
+    'rule_action_set_category'                   => '',
+    'rule_action_clear_category'                 => '',
+    'rule_action_set_budget'                     => '',
+    'rule_action_clear_budget'                   => '',
+    'rule_action_add_tag'                        => '',
+    'rule_action_remove_tag'                     => '',
+    'rule_action_remove_all_tags'                => '',
+    'rule_action_set_description'                => '',
+    'rule_action_append_description'             => '',
+    'rule_action_prepend_description'            => '',
+    'rule_action_set_category_choice'            => '',
+    'rule_action_clear_category_choice'          => '',
+    'rule_action_set_budget_choice'              => '',
+    'rule_action_clear_budget_choice'            => '',
+    'rule_action_add_tag_choice'                 => '',
+    'rule_action_remove_tag_choice'              => '',
+    'rule_action_remove_all_tags_choice'         => '',
+    'rule_action_set_description_choice'         => '',
+    'rule_action_append_description_choice'      => '',
+    'rule_action_prepend_description_choice'     => '',
+    'rule_action_set_source_account_choice'      => '',
+    'rule_action_set_source_account'             => '',
+    'rule_action_set_destination_account_choice' => '',
+    'rule_action_set_destination_account'        => '',
 
     // tags
-    'store_new_tag'                              => 'Store new tag',
-    'update_tag'                                 => 'Update tag',
-    'no_location_set'                            => 'No location set.',
-    'meta_data'                                  => 'Meta data',
-    'location'                                   => 'Location',
+    'store_new_tag'                              => '',
+    'update_tag'                                 => '',
+    'no_location_set'                            => '',
+    'meta_data'                                  => '',
+    'location'                                   => '',
 
     // preferences
-    'pref_home_screen_accounts'                  => 'Home screen accounts',
-    'pref_home_screen_accounts_help'             => 'Which accounts should be displayed on the home page?',
-    'pref_view_range'                            => 'View range',
-    'pref_view_range_help'                       => 'Some charts are automatically grouped in periods. What period would you prefer?',
-    'pref_1D'                                    => 'One day',
-    'pref_1W'                                    => 'One week',
-    'pref_1M'                                    => 'One month',
-    'pref_3M'                                    => 'Three months (quarter)',
-    'pref_6M'                                    => 'Six months',
-    'pref_1Y'                                    => 'One year',
-    'pref_languages'                             => 'Languages',
-    'pref_languages_help'                        => 'Firefly III supports several languages. Which one do you prefer?',
-    'pref_custom_fiscal_year'                    => 'Fiscal year settings',
-    'pref_custom_fiscal_year_label'              => 'Enabled',
-    'pref_custom_fiscal_year_help'               => 'In countries that use a financial year other than January 1 to December 31, you can switch this on and specify start / end days of the fiscal year',
-    'pref_fiscal_year_start_label'               => 'Fiscal year start date',
-    'pref_two_factor_auth'                       => '2-step verification',
-    'pref_two_factor_auth_help'                  => 'When you enable 2-step verification (also known as two-factor authentication), you add an extra layer of security to your account. You sign in with something you know (your password) and something you have (a verification code). Verification codes are generated by an application on your phone, such as Authy or Google Authenticator.',
-    'pref_enable_two_factor_auth'                => 'Enable 2-step verification',
-    'pref_two_factor_auth_disabled'              => '2-step verification code removed and disabled',
-    'pref_two_factor_auth_remove_it'             => 'Don\'t forget to remove the account from your authentication app!',
-    'pref_two_factor_auth_code'                  => 'Verify code',
-    'pref_two_factor_auth_code_help'             => 'Scan the QR code with an application on your phone such as Authy or Google Authenticator and enter the generated code.',
-    'pref_two_factor_auth_reset_code'            => 'Reset verification code',
-    'pref_two_factor_auth_remove_code'           => 'Remove verification code',
-    'pref_two_factor_auth_remove_will_disable'   => '(this will also disable two-factor authentication)',
-    'pref_save_settings'                         => 'Save settings',
-    'saved_preferences'                          => 'Preferences saved!',
-    'preferences_general'                        => 'General',
-    'preferences_frontpage'                      => 'Home screen',
-    'preferences_security'                       => 'Security',
-    'preferences_layout'                         => 'Layout',
-    'pref_home_show_deposits'                    => 'Show deposits on the home screen',
-    'pref_home_show_deposits_info'               => 'The home screen already shows your expense accounts. Should it also show your revenue accounts?',
-    'pref_home_do_show_deposits'                 => 'Yes, show them',
-    'successful_count'                           => 'of which :count successful',
-    'transaction_page_size_title'                => 'Page size',
-    'transaction_page_size_help'                 => 'Any list of transactions shows at most this many transactions',
-    'transaction_page_size_label'                => 'Page size',
-    'between_dates'                              => '(:start and :end)',
-    'pref_optional_fields_transaction'           => 'Optional fields for transactions',
-    'pref_optional_fields_transaction_help'      => 'By default not all fields are enabled when creating a new transaction (because of the clutter). Below, you can enable these fields if you think they could be useful for you. Of course, any field that is disabled, but already filled in, will be visible regardless of the setting.',
-    'optional_tj_date_fields'                    => 'Date fields',
-    'optional_tj_business_fields'                => 'Business fields',
-    'optional_tj_attachment_fields'              => 'Attachment fields',
-    'pref_optional_tj_interest_date'             => 'Interest date',
-    'pref_optional_tj_book_date'                 => 'Book date',
-    'pref_optional_tj_process_date'              => 'Processing date',
-    'pref_optional_tj_due_date'                  => 'Due date',
-    'pref_optional_tj_payment_date'              => 'Payment date',
-    'pref_optional_tj_invoice_date'              => 'Invoice date',
-    'pref_optional_tj_internal_reference'        => 'Internal reference',
-    'pref_optional_tj_notes'                     => 'Notes',
-    'pref_optional_tj_attachments'               => 'Attachments',
-    'optional_field_meta_dates'                  => 'Dates',
-    'optional_field_meta_business'               => 'Business',
-    'optional_field_attachments'                 => 'Attachments',
-    'optional_field_meta_data'                   => 'Optional meta data',
+    'pref_home_screen_accounts'                  => '',
+    'pref_home_screen_accounts_help'             => '',
+    'pref_view_range'                            => '',
+    'pref_view_range_help'                       => '',
+    'pref_1D'                                    => '',
+    'pref_1W'                                    => '',
+    'pref_1M'                                    => '',
+    'pref_3M'                                    => '',
+    'pref_6M'                                    => '',
+    'pref_1Y'                                    => '',
+    'pref_languages'                             => '',
+    'pref_languages_help'                        => '',
+    'pref_custom_fiscal_year'                    => '',
+    'pref_custom_fiscal_year_label'              => '',
+    'pref_custom_fiscal_year_help'               => '',
+    'pref_fiscal_year_start_label'               => '',
+    'pref_two_factor_auth'                       => '',
+    'pref_two_factor_auth_help'                  => '',
+    'pref_enable_two_factor_auth'                => '',
+    'pref_two_factor_auth_disabled'              => '',
+    'pref_two_factor_auth_remove_it'             => '',
+    'pref_two_factor_auth_code'                  => '',
+    'pref_two_factor_auth_code_help'             => '',
+    'pref_two_factor_auth_reset_code'            => '',
+    'pref_two_factor_auth_remove_code'           => '',
+    'pref_two_factor_auth_remove_will_disable'   => '',
+    'pref_save_settings'                         => '',
+    'saved_preferences'                          => '',
+    'preferences_general'                        => '',
+    'preferences_frontpage'                      => '',
+    'preferences_security'                       => '',
+    'preferences_layout'                         => '',
+    'pref_home_show_deposits'                    => '',
+    'pref_home_show_deposits_info'               => '',
+    'pref_home_do_show_deposits'                 => '',
+    'successful_count'                           => '',
+    'transaction_page_size_title'                => '',
+    'transaction_page_size_help'                 => '',
+    'transaction_page_size_label'                => '',
+    'between_dates'                              => '',
+    'pref_optional_fields_transaction'           => '',
+    'pref_optional_fields_transaction_help'      => '',
+    'optional_tj_date_fields'                    => '',
+    'optional_tj_business_fields'                => '',
+    'optional_tj_attachment_fields'              => '',
+    'pref_optional_tj_interest_date'             => '',
+    'pref_optional_tj_book_date'                 => '',
+    'pref_optional_tj_process_date'              => '',
+    'pref_optional_tj_due_date'                  => '',
+    'pref_optional_tj_payment_date'              => '',
+    'pref_optional_tj_invoice_date'              => '',
+    'pref_optional_tj_internal_reference'        => '',
+    'pref_optional_tj_notes'                     => '',
+    'pref_optional_tj_attachments'               => '',
+    'optional_field_meta_dates'                  => '',
+    'optional_field_meta_business'               => '',
+    'optional_field_attachments'                 => '',
+    'optional_field_meta_data'                   => '',
 
 
     // profile:
-    'change_your_password'                       => 'Change your password',
-    'delete_account'                             => 'Delete account',
-    'current_password'                           => 'Current password',
-    'new_password'                               => 'New password',
-    'new_password_again'                         => 'New password (again)',
-    'delete_your_account'                        => 'Delete your account',
-    'delete_your_account_help'                   => 'Deleting your account will also delete any accounts, transactions, <em>anything</em> you might have saved into Firefly III. It\'ll be GONE.',
-    'delete_your_account_password'               => 'Enter your password to continue.',
-    'password'                                   => 'Password',
-    'are_you_sure'                               => 'Are you sure? You cannot undo this.',
-    'delete_account_button'                      => 'DELETE your account',
-    'invalid_current_password'                   => 'Invalid current password!',
-    'password_changed'                           => 'Password changed!',
-    'should_change'                              => 'The idea is to change your password.',
-    'invalid_password'                           => 'Invalid password!',
-    'what_is_pw_security'                        => 'What is "verify password security"?',
-    'secure_pw_title'                            => 'How to choose a secure password',
-    'secure_pw_history'                          => 'In August 2017 well known security researcher Troy Hunt released a list of 306 million stolen passwords. These passwords were stolen during breakins at companies like LinkedIn, Adobe and NeoPets (and many more).',
-    'secure_pw_check_box'                        => 'By checking the box, Firefly III will send the SHA1 hash of your password to <a href="https://www.troyhunt.com/introducing-306-million-freely-downloadable-pwned-passwords/">the website of Troy Hunt</a> to see if it is on the list. This will stop you from using unsafe passwords as is recommended in the latest <a href="https://pages.nist.gov/800-63-3/sp800-63b.html">NIST Special Publication</a> on this subject.',
-    'secure_pw_sha1'                             => 'But I thought SHA1 was broken?',
-    'secure_pw_hash_speed'                       => 'Yes, but not in this context. As you can read on <a href="https://shattered.io/">the website detailing how they broke SHA1</a>, it is now slightly easier to find a "collision": another string that results in the same SHA1-hash. It now only takes 10,000 years using a single-GPU machine.',
-    'secure_pw_hash_security'                    => 'This collision would not be equal to your password, nor would it be useful on (a site like) Firefly III. This application does not use SHA1 for password verification. So it is safe to check this box. Your password is hashed and sent over HTTPS.',
-    'secure_pw_should'                           => 'Should I check the box?',
-    'secure_pw_long_password'                    => 'If you just generated a long, single-use password for Firefly III using some kind of password generator: <strong>no</strong>.',
-    'secure_pw_short'                            => 'If you just entered the password you always use: <em>Please yes</em>.',
+    'change_your_password'                       => '',
+    'delete_account'                             => '',
+    'current_password'                           => '',
+    'new_password'                               => '',
+    'new_password_again'                         => '',
+    'delete_your_account'                        => '',
+    'delete_your_account_help'                   => '',
+    'delete_your_account_password'               => '',
+    'password'                                   => '',
+    'are_you_sure'                               => '',
+    'delete_account_button'                      => '',
+    'invalid_current_password'                   => '',
+    'password_changed'                           => '',
+    'should_change'                              => '',
+    'invalid_password'                           => '',
+    'what_is_pw_security'                        => '',
+    'secure_pw_title'                            => '',
+    'secure_pw_history'                          => '',
+    'secure_pw_check_box'                        => '',
+    'secure_pw_sha1'                             => '',
+    'secure_pw_hash_speed'                       => '',
+    'secure_pw_hash_security'                    => '',
+    'secure_pw_should'                           => '',
+    'secure_pw_long_password'                    => '',
+    'secure_pw_short'                            => '',
 
 
     // attachments
-    'nr_of_attachments'                          => 'One attachment|:count attachments',
-    'attachments'                                => 'Attachments',
-    'edit_attachment'                            => 'Edit attachment ":name"',
-    'update_attachment'                          => 'Update attachment',
-    'delete_attachment'                          => 'Delete attachment ":name"',
-    'attachment_deleted'                         => 'Deleted attachment ":name"',
-    'attachment_updated'                         => 'Updated attachment ":name"',
-    'upload_max_file_size'                       => 'Maximum file size: :size',
+    'nr_of_attachments'                          => '',
+    'attachments'                                => '',
+    'edit_attachment'                            => '',
+    'update_attachment'                          => '',
+    'delete_attachment'                          => '',
+    'attachment_deleted'                         => '',
+    'attachment_updated'                         => '',
+    'upload_max_file_size'                       => '',
 
     // transaction index
-    'title_expenses'                             => 'Expenses',
-    'title_withdrawal'                           => 'Expenses',
-    'title_revenue'                              => 'Revenue / income',
-    'title_deposit'                              => 'Revenue / income',
-    'title_transfer'                             => 'Transfers',
-    'title_transfers'                            => 'Transfers',
+    'title_expenses'                             => '',
+    'title_withdrawal'                           => '',
+    'title_revenue'                              => '',
+    'title_deposit'                              => '',
+    'title_transfer'                             => '',
+    'title_transfers'                            => '',
 
     // convert stuff:
-    'convert_is_already_type_Withdrawal'         => 'This transaction is already a withdrawal',
-    'convert_is_already_type_Deposit'            => 'This transaction is already a deposit',
-    'convert_is_already_type_Transfer'           => 'This transaction is already a transfer',
-    'convert_to_Withdrawal'                      => 'Convert ":description" to a withdrawal',
-    'convert_to_Deposit'                         => 'Convert ":description" to a deposit',
-    'convert_to_Transfer'                        => 'Convert ":description" to a transfer',
-    'convert_options_WithdrawalDeposit'          => 'Convert a withdrawal into a deposit',
-    'convert_options_WithdrawalTransfer'         => 'Convert a withdrawal into a transfer',
-    'convert_options_DepositTransfer'            => 'Convert a deposit into a transfer',
-    'convert_options_DepositWithdrawal'          => 'Convert a deposit into a withdrawal',
-    'convert_options_TransferWithdrawal'         => 'Convert a transfer into a withdrawal',
-    'convert_options_TransferDeposit'            => 'Convert a transfer into a deposit',
-    'transaction_journal_convert_options'        => 'Convert this transaction',
-    'convert_Withdrawal_to_deposit'              => 'Convert this withdrawal to a deposit',
-    'convert_Withdrawal_to_transfer'             => 'Convert this withdrawal to a transfer',
-    'convert_Deposit_to_withdrawal'              => 'Convert this deposit to a withdrawal',
-    'convert_Deposit_to_transfer'                => 'Convert this deposit to a transfer',
-    'convert_Transfer_to_deposit'                => 'Convert this transfer to a deposit',
-    'convert_Transfer_to_withdrawal'             => 'Convert this transfer to a withdrawal',
-    'convert_please_set_revenue_source'          => 'Please pick the revenue account where the money will come from.',
-    'convert_please_set_asset_destination'       => 'Please pick the asset account where the money will go to.',
-    'convert_please_set_expense_destination'     => 'Please pick the expense account where the money will go to.',
-    'convert_please_set_asset_source'            => 'Please pick the asset account where the money will come from.',
-    'convert_explanation_withdrawal_deposit'     => 'If you convert this withdrawal into a deposit, :amount will be deposited into <a href=":sourceRoute">:sourceName</a> instead of taken from it.',
-    'convert_explanation_withdrawal_transfer'    => 'If you convert this withdrawal into a transfer, :amount will be transferred from <a href=":sourceRoute">:sourceName</a> to a new asset account, instead of being paid to <a href=":destinationRoute">:destinationName</a>.',
-    'convert_explanation_deposit_withdrawal'     => 'If you convert this deposit into a withdrawal, :amount will be removed from <a href=":destinationRoute">:destinationName</a> instead of added to it.',
-    'convert_explanation_deposit_transfer'       => 'If you convert this deposit into a transfer, :amount will be transferred from an asset account of your choice into <a href=":destinationRoute">:destinationName</a>.',
-    'convert_explanation_transfer_withdrawal'    => 'If you convert this transfer into a withdrawal, :amount will go from <a href=":sourceRoute">:sourceName</a> to a new destination as an expense, instead of to <a href=":destinationRoute">:destinationName</a> as a transfer.',
-    'convert_explanation_transfer_deposit'       => 'If you convert this transfer into a deposit, :amount will be deposited into account <a href=":destinationRoute">:destinationName</a> instead of being transferred there.',
-    'converted_to_Withdrawal'                    => 'The transaction has been converted to a withdrawal',
-    'converted_to_Deposit'                       => 'The transaction has been converted to a deposit',
-    'converted_to_Transfer'                      => 'The transaction has been converted to a transfer',
+    'convert_is_already_type_Withdrawal'         => '',
+    'convert_is_already_type_Deposit'            => '',
+    'convert_is_already_type_Transfer'           => '',
+    'convert_to_Withdrawal'                      => '',
+    'convert_to_Deposit'                         => '',
+    'convert_to_Transfer'                        => '',
+    'convert_options_WithdrawalDeposit'          => '',
+    'convert_options_WithdrawalTransfer'         => '',
+    'convert_options_DepositTransfer'            => '',
+    'convert_options_DepositWithdrawal'          => '',
+    'convert_options_TransferWithdrawal'         => '',
+    'convert_options_TransferDeposit'            => '',
+    'transaction_journal_convert_options'        => '',
+    'convert_Withdrawal_to_deposit'              => '',
+    'convert_Withdrawal_to_transfer'             => '',
+    'convert_Deposit_to_withdrawal'              => '',
+    'convert_Deposit_to_transfer'                => '',
+    'convert_Transfer_to_deposit'                => '',
+    'convert_Transfer_to_withdrawal'             => '',
+    'convert_please_set_revenue_source'          => '',
+    'convert_please_set_asset_destination'       => '',
+    'convert_please_set_expense_destination'     => '',
+    'convert_please_set_asset_source'            => '',
+    'convert_explanation_withdrawal_deposit'     => '',
+    'convert_explanation_withdrawal_transfer'    => '',
+    'convert_explanation_deposit_withdrawal'     => '',
+    'convert_explanation_deposit_transfer'       => '',
+    'convert_explanation_transfer_withdrawal'    => '',
+    'convert_explanation_transfer_deposit'       => '',
+    'converted_to_Withdrawal'                    => '',
+    'converted_to_Deposit'                       => '',
+    'converted_to_Transfer'                      => '',
 
 
     // create new stuff:
-    'create_new_withdrawal'                      => 'Create new withdrawal',
-    'create_new_deposit'                         => 'Create new deposit',
-    'create_new_transfer'                        => 'Create new transfer',
-    'create_new_asset'                           => 'Create new asset account',
-    'create_new_expense'                         => 'Create new expense account',
-    'create_new_revenue'                         => 'Create new revenue account',
-    'create_new_piggy_bank'                      => 'Create new piggy bank',
-    'create_new_bill'                            => 'Create new bill',
+    'create_new_withdrawal'                      => '',
+    'create_new_deposit'                         => '',
+    'create_new_transfer'                        => '',
+    'create_new_asset'                           => '',
+    'create_new_expense'                         => '',
+    'create_new_revenue'                         => '',
+    'create_new_piggy_bank'                      => '',
+    'create_new_bill'                            => '',
 
     // currencies:
-    'create_currency'                            => 'Create a new currency',
-    'store_currency'                             => 'Store new currency',
-    'update_currency'                            => 'Update currency',
-    'new_default_currency'                       => ':name is now the default currency.',
-    'cannot_delete_currency'                     => 'Cannot delete :name because it is still in use.',
-    'deleted_currency'                           => 'Currency :name deleted',
-    'created_currency'                           => 'Currency :name created',
-    'updated_currency'                           => 'Currency :name updated',
-    'ask_site_owner'                             => 'Please ask :owner to add, remove or edit currencies.',
-    'currencies_intro'                           => 'Firefly III supports various currencies which you can set and enable here.',
-    'make_default_currency'                      => 'make default',
-    'default_currency'                           => 'default',
+    'create_currency'                            => '',
+    'store_currency'                             => '',
+    'update_currency'                            => '',
+    'new_default_currency'                       => '',
+    'cannot_delete_currency'                     => '',
+    'deleted_currency'                           => '',
+    'created_currency'                           => '',
+    'updated_currency'                           => '',
+    'ask_site_owner'                             => '',
+    'currencies_intro'                           => '',
+    'make_default_currency'                      => '',
+    'default_currency'                           => '',
 
     // forms:
-    'mandatoryFields'                            => 'Mandatory fields',
-    'optionalFields'                             => 'Optional fields',
-    'options'                                    => 'Options',
+    'mandatoryFields'                            => '',
+    'optionalFields'                             => '',
+    'options'                                    => '',
 
     // budgets:
-    'create_new_budget'                          => 'Create a new budget',
-    'store_new_budget'                           => 'Store new budget',
-    'stored_new_budget'                          => 'Stored new budget ":name"',
-    'available_between'                          => 'Available between :start and :end',
-    'transactionsWithoutBudget'                  => 'Expenses without budget',
-    'transactions_no_budget'                     => 'Expenses without budget between :start and :end',
-    'spent_between'                              => 'Spent between :start and :end',
-    'createBudget'                               => 'New budget',
-    'inactiveBudgets'                            => 'Inactive budgets',
-    'without_budget_between'                     => 'Transactions without a budget between :start and :end',
-    'delete_budget'                              => 'Delete budget ":name"',
-    'deleted_budget'                             => 'Deleted budget ":name"',
-    'edit_budget'                                => 'Edit budget ":name"',
-    'updated_budget'                             => 'Updated budget ":name"',
-    'update_amount'                              => 'Update amount',
-    'update_budget'                              => 'Update budget',
-    'update_budget_amount_range'                 => 'Update (expected) available amount between :start and :end',
-    'budget_period_navigator'                    => 'Period navigator',
+    'create_new_budget'                          => '',
+    'store_new_budget'                           => '',
+    'stored_new_budget'                          => '',
+    'available_between'                          => '',
+    'transactionsWithoutBudget'                  => '',
+    'transactions_no_budget'                     => '',
+    'spent_between'                              => '',
+    'createBudget'                               => '',
+    'inactiveBudgets'                            => '',
+    'without_budget_between'                     => '',
+    'delete_budget'                              => '',
+    'deleted_budget'                             => '',
+    'edit_budget'                                => '',
+    'updated_budget'                             => '',
+    'update_amount'                              => '',
+    'update_budget'                              => '',
+    'update_budget_amount_range'                 => '',
+    'budget_period_navigator'                    => '',
 
     // bills:
-    'matching_on'                                => 'Matching on',
-    'between_amounts'                            => 'between :low and :high.',
-    'repeats'                                    => 'Repeats',
-    'connected_journals'                         => 'Connected transactions',
-    'auto_match_on'                              => 'Automatically matched by Firefly',
-    'auto_match_off'                             => 'Not automatically matched by Firefly',
-    'next_expected_match'                        => 'Next expected match',
-    'delete_bill'                                => 'Delete bill ":name"',
-    'deleted_bill'                               => 'Deleted bill ":name"',
-    'edit_bill'                                  => 'Edit bill ":name"',
-    'more'                                       => 'More',
-    'rescan_old'                                 => 'Rescan old transactions',
-    'update_bill'                                => 'Update bill',
-    'updated_bill'                               => 'Updated bill ":name"',
-    'store_new_bill'                             => 'Store new bill',
-    'stored_new_bill'                            => 'Stored new bill ":name"',
-    'cannot_scan_inactive_bill'                  => 'Inactive bills cannot be scanned.',
-    'rescanned_bill'                             => 'Rescanned everything.',
-    'average_bill_amount_year'                   => 'Average bill amount (:year)',
-    'average_bill_amount_overall'                => 'Average bill amount (overall)',
-    'not_or_not_yet'                             => 'Not (yet)',
-    'not_expected_period'                        => 'Not expected this period',
-    'bill_is_active'                             => 'Bill is active',
-    'bill_will_automatch'                        => 'Bill will automatically linked to matching transactions',
+    'matching_on'                                => '',
+    'between_amounts'                            => '',
+    'repeats'                                    => '',
+    'connected_journals'                         => '',
+    'auto_match_on'                              => '',
+    'auto_match_off'                             => '',
+    'next_expected_match'                        => '',
+    'delete_bill'                                => '',
+    'deleted_bill'                               => '',
+    'edit_bill'                                  => '',
+    'more'                                       => '',
+    'rescan_old'                                 => '',
+    'update_bill'                                => '',
+    'updated_bill'                               => '',
+    'store_new_bill'                             => '',
+    'stored_new_bill'                            => '',
+    'cannot_scan_inactive_bill'                  => '',
+    'rescanned_bill'                             => '',
+    'average_bill_amount_year'                   => '',
+    'average_bill_amount_overall'                => '',
+    'not_or_not_yet'                             => '',
+    'not_expected_period'                        => '',
+    'bill_is_active'                             => '',
+    'bill_will_automatch'                        => '',
     // accounts:
-    'details_for_asset'                          => 'Details for asset account ":name"',
-    'details_for_expense'                        => 'Details for expense account ":name"',
-    'details_for_revenue'                        => 'Details for revenue account ":name"',
-    'details_for_cash'                           => 'Details for cash account ":name"',
-    'store_new_asset_account'                    => 'Store new asset account',
-    'store_new_expense_account'                  => 'Store new expense account',
-    'store_new_revenue_account'                  => 'Store new revenue account',
-    'edit_asset_account'                         => 'Edit asset account ":name"',
-    'edit_expense_account'                       => 'Edit expense account ":name"',
-    'edit_revenue_account'                       => 'Edit revenue account ":name"',
-    'delete_asset_account'                       => 'Delete asset account ":name"',
-    'delete_expense_account'                     => 'Delete expense account ":name"',
-    'delete_revenue_account'                     => 'Delete revenue account ":name"',
-    'asset_deleted'                              => 'Successfully deleted asset account ":name"',
-    'expense_deleted'                            => 'Successfully deleted expense account ":name"',
-    'revenue_deleted'                            => 'Successfully deleted revenue account ":name"',
-    'update_asset_account'                       => 'Update asset account',
-    'update_expense_account'                     => 'Update expense account',
-    'update_revenue_account'                     => 'Update revenue account',
-    'make_new_asset_account'                     => 'Create a new asset account',
-    'make_new_expense_account'                   => 'Create a new expense account',
-    'make_new_revenue_account'                   => 'Create a new revenue account',
-    'asset_accounts'                             => 'Asset accounts',
-    'expense_accounts'                           => 'Expense accounts',
-    'revenue_accounts'                           => 'Revenue accounts',
-    'cash_accounts'                              => 'Cash accounts',
-    'Cash account'                               => 'Cash account',
-    'account_type'                               => 'Account type',
-    'save_transactions_by_moving'                => 'Save these transaction(s) by moving them to another account:',
-    'stored_new_account'                         => 'New account ":name" stored!',
-    'updated_account'                            => 'Updated account ":name"',
-    'credit_card_options'                        => 'Credit card options',
-    'no_transactions_account'                    => 'There are no transactions (in this period) for asset account ":name".',
-    'no_data_for_chart'                          => 'There is not enough information (yet) to generate this chart.',
-    'select_more_than_one_account'               => 'Please select more than one account',
-    'select_more_than_one_category'              => 'Please select more than one category',
-    'select_more_than_one_budget'                => 'Please select more than one budget',
-    'select_more_than_one_tag'                   => 'Please select more than one tag',
-    'account_default_currency'                   => 'If you select another currency, new transactions from this account will have this currency pre-selected.',
+    'details_for_asset'                          => '',
+    'details_for_expense'                        => '',
+    'details_for_revenue'                        => '',
+    'details_for_cash'                           => '',
+    'store_new_asset_account'                    => '',
+    'store_new_expense_account'                  => '',
+    'store_new_revenue_account'                  => '',
+    'edit_asset_account'                         => '',
+    'edit_expense_account'                       => '',
+    'edit_revenue_account'                       => '',
+    'delete_asset_account'                       => '',
+    'delete_expense_account'                     => '',
+    'delete_revenue_account'                     => '',
+    'asset_deleted'                              => '',
+    'expense_deleted'                            => '',
+    'revenue_deleted'                            => '',
+    'update_asset_account'                       => '',
+    'update_expense_account'                     => '',
+    'update_revenue_account'                     => '',
+    'make_new_asset_account'                     => '',
+    'make_new_expense_account'                   => '',
+    'make_new_revenue_account'                   => '',
+    'asset_accounts'                             => '',
+    'expense_accounts'                           => '',
+    'revenue_accounts'                           => '',
+    'cash_accounts'                              => '',
+    'Cash account'                               => '',
+    'account_type'                               => '',
+    'save_transactions_by_moving'                => '',
+    'stored_new_account'                         => '',
+    'updated_account'                            => '',
+    'credit_card_options'                        => '',
+    'no_transactions_account'                    => '',
+    'no_data_for_chart'                          => '',
+    'select_more_than_one_account'               => '',
+    'select_more_than_one_category'              => '',
+    'select_more_than_one_budget'                => '',
+    'select_more_than_one_tag'                   => '',
+    'account_default_currency'                   => '',
 
     // categories:
-    'new_category'                               => 'New category',
-    'create_new_category'                        => 'Create a new category',
-    'without_category'                           => 'Without a category',
-    'update_category'                            => 'Update category',
-    'updated_category'                           => 'Updated category ":name"',
-    'categories'                                 => 'Categories',
-    'edit_category'                              => 'Edit category ":name"',
-    'no_category'                                => '(no category)',
-    'category'                                   => 'Category',
-    'delete_category'                            => 'Delete category ":name"',
-    'deleted_category'                           => 'Deleted category ":name"',
-    'store_category'                             => 'Store new category',
-    'stored_category'                            => 'Stored new category ":name"',
-    'without_category_between'                   => 'Without category between :start and :end',
+    'new_category'                               => '',
+    'create_new_category'                        => '',
+    'without_category'                           => '',
+    'update_category'                            => '',
+    'updated_category'                           => '',
+    'categories'                                 => '',
+    'edit_category'                              => '',
+    'no_category'                                => '',
+    'category'                                   => '',
+    'delete_category'                            => '',
+    'deleted_category'                           => '',
+    'store_category'                             => '',
+    'stored_category'                            => '',
+    'without_category_between'                   => '',
 
     // transactions:
-    'update_withdrawal'                          => 'Update withdrawal',
-    'update_deposit'                             => 'Update deposit',
-    'update_transfer'                            => 'Update transfer',
-    'updated_withdrawal'                         => 'Updated withdrawal ":description"',
-    'updated_deposit'                            => 'Updated deposit ":description"',
-    'updated_transfer'                           => 'Updated transfer ":description"',
-    'delete_withdrawal'                          => 'Delete withdrawal ":description"',
-    'delete_deposit'                             => 'Delete deposit ":description"',
-    'delete_transfer'                            => 'Delete transfer ":description"',
-    'deleted_withdrawal'                         => 'Successfully deleted withdrawal ":description"',
-    'deleted_deposit'                            => 'Successfully deleted deposit ":description"',
-    'deleted_transfer'                           => 'Successfully deleted transfer ":description"',
-    'stored_journal'                             => 'Successfully created new transaction ":description"',
-    'select_transactions'                        => 'Select transactions',
-    'stop_selection'                             => 'Stop selecting transactions',
-    'edit_selected'                              => 'Edit selected',
-    'delete_selected'                            => 'Delete selected',
-    'mass_delete_journals'                       => 'Delete a number of transactions',
-    'mass_edit_journals'                         => 'Edit a number of transactions',
-    'cannot_edit_other_fields'                   => 'You cannot mass-edit other fields than the ones here, because there is no room to show them. Please follow the link and edit them by one-by-one, if you need to edit these fields.',
-    'perm-delete-many'                           => 'Deleting many items in one go can be very disruptive. Please be cautious.',
-    'mass_deleted_transactions_success'          => 'Deleted :amount transaction(s).',
-    'mass_edited_transactions_success'           => 'Updated :amount transaction(s)',
+    'update_withdrawal'                          => '',
+    'update_deposit'                             => '',
+    'update_transfer'                            => '',
+    'updated_withdrawal'                         => '',
+    'updated_deposit'                            => '',
+    'updated_transfer'                           => '',
+    'delete_withdrawal'                          => '',
+    'delete_deposit'                             => '',
+    'delete_transfer'                            => '',
+    'deleted_withdrawal'                         => '',
+    'deleted_deposit'                            => '',
+    'deleted_transfer'                           => '',
+    'stored_journal'                             => '',
+    'select_transactions'                        => '',
+    'stop_selection'                             => '',
+    'edit_selected'                              => '',
+    'delete_selected'                            => '',
+    'mass_delete_journals'                       => '',
+    'mass_edit_journals'                         => '',
+    'cannot_edit_other_fields'                   => '',
+    'perm-delete-many'                           => '',
+    'mass_deleted_transactions_success'          => '',
+    'mass_edited_transactions_success'           => '',
 
 
     // new user:
-    'welcome'                                    => 'Welcome to Firefly!',
-    'submit'                                     => 'Submit',
-    'getting_started'                            => 'Getting started',
-    'to_get_started'                             => 'It is good to see you have successfully installed Firefly III. To get started with this tool please enter your bank\'s name and the balance of your main checking account. Do not worry yet if you have multiple accounts. You can add those later. It\'s just that Firefly III needs something to start with.',
-    'savings_balance_text'                       => 'Firefly III will automatically create a savings account for you. By default, there will be no money in your savings account, but if you tell Firefly III the balance it will be stored as such.',
-    'finish_up_new_user'                         => 'That\'s it! You can continue by pressing <strong>Submit</strong>. You will be taken to the index of Firefly III.',
-    'stored_new_accounts_new_user'               => 'Yay! Your new accounts have been stored.',
+    'welcome'                                    => '',
+    'submit'                                     => '',
+    'getting_started'                            => '',
+    'to_get_started'                             => '',
+    'savings_balance_text'                       => '',
+    'finish_up_new_user'                         => '',
+    'stored_new_accounts_new_user'               => '',
 
     // home page:
-    'yourAccounts'                               => 'Your accounts',
-    'budgetsAndSpending'                         => 'Budgets and spending',
-    'savings'                                    => 'Savings',
-    'newWithdrawal'                              => 'New expense',
-    'newDeposit'                                 => 'New deposit',
-    'newTransfer'                                => 'New transfer',
-    'moneyIn'                                    => 'Money in',
-    'moneyOut'                                   => 'Money out',
-    'billsToPay'                                 => 'Bills to pay',
-    'billsPaid'                                  => 'Bills paid',
+    'yourAccounts'                               => '',
+    'budgetsAndSpending'                         => '',
+    'savings'                                    => '',
+    'newWithdrawal'                              => '',
+    'newDeposit'                                 => '',
+    'newTransfer'                                => '',
+    'moneyIn'                                    => '',
+    'moneyOut'                                   => '',
+    'billsToPay'                                 => '',
+    'billsPaid'                                  => '',
 
     // menu and titles, should be recycled as often as possible:
-    'currency'                                   => 'Currency',
-    'preferences'                                => 'Preferences',
-    'logout'                                     => 'Logout',
-    'searchPlaceholder'                          => 'Search...',
-    'dashboard'                                  => 'Dashboard',
-    'currencies'                                 => 'Currencies',
-    'accounts'                                   => 'Accounts',
-    'Asset account'                              => 'Asset account',
-    'Default account'                            => 'Asset account',
-    'Expense account'                            => 'Expense account',
-    'Revenue account'                            => 'Revenue account',
-    'Initial balance account'                    => 'Initial balance account',
-    'budgets'                                    => 'Budgets',
-    'tags'                                       => 'Tags',
-    'reports'                                    => 'Reports',
-    'transactions'                               => 'Transactions',
-    'expenses'                                   => 'Expenses',
-    'income'                                     => 'Revenue / income',
-    'transfers'                                  => 'Transfers',
-    'moneyManagement'                            => 'Money management',
-    'piggyBanks'                                 => 'Piggy banks',
-    'bills'                                      => 'Bills',
-    'withdrawal'                                 => 'Withdrawal',
-    'deposit'                                    => 'Deposit',
-    'account'                                    => 'Account',
-    'transfer'                                   => 'Transfer',
-    'Withdrawal'                                 => 'Withdrawal',
-    'Deposit'                                    => 'Deposit',
-    'Transfer'                                   => 'Transfer',
-    'bill'                                       => 'Bill',
-    'yes'                                        => 'Yes',
-    'no'                                         => 'No',
-    'amount'                                     => 'Amount',
-    'overview'                                   => 'Overview',
-    'saveOnAccount'                              => 'Save on account',
-    'unknown'                                    => 'Unknown',
-    'daily'                                      => 'Daily',
-    'monthly'                                    => 'Monthly',
-    'profile'                                    => 'Profile',
-    'errors'                                     => 'Errors',
+    'currency'                                   => '',
+    'preferences'                                => '',
+    'logout'                                     => '',
+    'searchPlaceholder'                          => '',
+    'dashboard'                                  => '',
+    'currencies'                                 => '',
+    'accounts'                                   => '',
+    'Asset account'                              => '',
+    'Default account'                            => '',
+    'Expense account'                            => '',
+    'Revenue account'                            => '',
+    'Initial balance account'                    => '',
+    'budgets'                                    => '',
+    'tags'                                       => '',
+    'reports'                                    => '',
+    'transactions'                               => '',
+    'expenses'                                   => '',
+    'income'                                     => '',
+    'transfers'                                  => '',
+    'moneyManagement'                            => '',
+    'piggyBanks'                                 => '',
+    'bills'                                      => '',
+    'withdrawal'                                 => '',
+    'deposit'                                    => '',
+    'account'                                    => '',
+    'transfer'                                   => '',
+    'Withdrawal'                                 => '',
+    'Deposit'                                    => '',
+    'Transfer'                                   => '',
+    'bill'                                       => '',
+    'yes'                                        => '',
+    'no'                                         => '',
+    'amount'                                     => '',
+    'overview'                                   => '',
+    'saveOnAccount'                              => '',
+    'unknown'                                    => '',
+    'daily'                                      => '',
+    'monthly'                                    => '',
+    'profile'                                    => '',
+    'errors'                                     => '',
 
     // reports:
-    'report_default'                             => 'Default financial report between :start and :end',
-    'report_audit'                               => 'Transaction history overview between :start and :end',
-    'report_category'                            => 'Category report between :start and :end',
-    'report_budget'                              => 'Budget report between :start and :end',
-    'report_tag'                                 => 'Tag report between :start and :end',
-    'quick_link_reports'                         => 'Quick links',
-    'quick_link_default_report'                  => 'Default financial report',
-    'quick_link_audit_report'                    => 'Transaction history overview',
-    'report_this_month_quick'                    => 'Current month, all accounts',
-    'report_this_year_quick'                     => 'Current year, all accounts',
-    'report_this_fiscal_year_quick'              => 'Current fiscal year, all accounts',
-    'report_all_time_quick'                      => 'All-time, all accounts',
-    'reports_can_bookmark'                       => 'Remember that reports can be bookmarked.',
-    'incomeVsExpenses'                           => 'Income vs. expenses',
-    'accountBalances'                            => 'Account balances',
-    'balanceStart'                               => 'Balance at start of period',
-    'balanceEnd'                                 => 'Balance at end of period',
-    'splitByAccount'                             => 'Split by account',
-    'coveredWithTags'                            => 'Covered with tags',
-    'leftUnbalanced'                             => 'Left unbalanced',
-    'leftInBudget'                               => 'Left in budget',
-    'sumOfSums'                                  => 'Sum of sums',
-    'noCategory'                                 => '(no category)',
-    'notCharged'                                 => 'Not charged (yet)',
-    'inactive'                                   => 'Inactive',
-    'active'                                     => 'Active',
-    'difference'                                 => 'Difference',
-    'in'                                         => 'In',
-    'out'                                        => 'Out',
-    'topX'                                       => 'top :number',
-    'show_full_list'                             => 'Show entire list',
-    'show_only_top'                              => 'Show only top :number',
-    'report_type'                                => 'Report type',
-    'report_type_default'                        => 'Default financial report',
-    'report_type_audit'                          => 'Transaction history overview (audit)',
-    'report_type_category'                       => 'Category report',
-    'report_type_budget'                         => 'Budget report',
-    'report_type_tag'                            => 'Tag report',
-    'more_info_help'                             => 'More information about these types of reports can be found in the help pages. Press the (?) icon in the top right corner.',
-    'report_included_accounts'                   => 'Included accounts',
-    'report_date_range'                          => 'Date range',
-    'report_preset_ranges'                       => 'Pre-set ranges',
-    'shared'                                     => 'Shared',
-    'fiscal_year'                                => 'Fiscal year',
-    'income_entry'                               => 'Income from account ":name" between :start and :end',
-    'expense_entry'                              => 'Expenses to account ":name" between :start and :end',
-    'category_entry'                             => 'Expenses in category ":name" between :start and :end',
-    'budget_spent_amount'                        => 'Expenses in budget ":budget" between :start and :end',
-    'balance_amount'                             => 'Expenses in budget ":budget" paid from account ":account" between :start and :end',
-    'no_audit_activity'                          => 'No activity was recorded on account <a href=":url" title=":account_name">:account_name</a> between :start and :end.',
-    'audit_end_balance'                          => 'Account balance of <a href=":url" title=":account_name">:account_name</a> at the end of :end was: :balance',
-    'reports_extra_options'                      => 'Extra options',
-    'report_has_no_extra_options'                => 'This report has no extra options',
-    'reports_submit'                             => 'View report',
-    'end_after_start_date'                       => 'End date of report must be after start date.',
-    'select_category'                            => 'Select category(ies)',
-    'select_budget'                              => 'Select budget(s).',
-    'select_tag'                                 => 'Select tag(s).',
-    'income_per_category'                        => 'Income per category',
-    'expense_per_category'                       => 'Expense per category',
-    'expense_per_budget'                         => 'Expense per budget',
-    'income_per_account'                         => 'Income per account',
-    'expense_per_account'                        => 'Expense per account',
-    'expense_per_tag'                            => 'Expense per tag',
-    'income_per_tag'                             => 'Income per tag',
-    'include_expense_not_in_budget'              => 'Included expenses not in the selected budget(s)',
-    'include_expense_not_in_account'             => 'Included expenses not in the selected account(s)',
-    'include_expense_not_in_category'            => 'Included expenses not in the selected category(ies)',
-    'include_income_not_in_category'             => 'Included income not in the selected category(ies)',
-    'include_income_not_in_account'              => 'Included income not in the selected account(s)',
-    'include_income_not_in_tags'                 => 'Included income not in the selected tag(s)',
-    'include_expense_not_in_tags'                => 'Included expenses not in the selected tag(s)',
-    'everything_else'                            => 'Everything else',
-    'income_and_expenses'                        => 'Income and expenses',
-    'spent_average'                              => 'Spent (average)',
-    'income_average'                             => 'Income (average)',
-    'transaction_count'                          => 'Transaction count',
-    'average_spending_per_account'               => 'Average spending per account',
-    'average_income_per_account'                 => 'Average income per account',
-    'total'                                      => 'Total',
-    'description'                                => 'Description',
-    'sum_of_period'                              => 'Sum of period',
-    'average_in_period'                          => 'Average in period',
-    'account_role_defaultAsset'                  => 'Default asset account',
-    'account_role_sharedAsset'                   => 'Shared asset account',
-    'account_role_savingAsset'                   => 'Savings account',
-    'account_role_ccAsset'                       => 'Credit card',
+    'report_default'                             => '',
+    'report_audit'                               => '',
+    'report_category'                            => '',
+    'report_budget'                              => '',
+    'report_tag'                                 => '',
+    'quick_link_reports'                         => '',
+    'quick_link_default_report'                  => '',
+    'quick_link_audit_report'                    => '',
+    'report_this_month_quick'                    => '',
+    'report_this_year_quick'                     => '',
+    'report_this_fiscal_year_quick'              => '',
+    'report_all_time_quick'                      => '',
+    'reports_can_bookmark'                       => '',
+    'incomeVsExpenses'                           => '',
+    'accountBalances'                            => '',
+    'balanceStart'                               => '',
+    'balanceEnd'                                 => '',
+    'splitByAccount'                             => '',
+    'coveredWithTags'                            => '',
+    'leftUnbalanced'                             => '',
+    'leftInBudget'                               => '',
+    'sumOfSums'                                  => '',
+    'noCategory'                                 => '',
+    'notCharged'                                 => '',
+    'inactive'                                   => '',
+    'active'                                     => '',
+    'difference'                                 => '',
+    'in'                                         => '',
+    'out'                                        => '',
+    'topX'                                       => '',
+    'show_full_list'                             => '',
+    'show_only_top'                              => '',
+    'report_type'                                => '',
+    'report_type_default'                        => '',
+    'report_type_audit'                          => '',
+    'report_type_category'                       => '',
+    'report_type_budget'                         => '',
+    'report_type_tag'                            => '',
+    'more_info_help'                             => '',
+    'report_included_accounts'                   => '',
+    'report_date_range'                          => '',
+    'report_preset_ranges'                       => '',
+    'shared'                                     => '',
+    'fiscal_year'                                => '',
+    'income_entry'                               => '',
+    'expense_entry'                              => '',
+    'category_entry'                             => '',
+    'budget_spent_amount'                        => '',
+    'balance_amount'                             => '',
+    'no_audit_activity'                          => '',
+    'audit_end_balance'                          => '',
+    'reports_extra_options'                      => '',
+    'report_has_no_extra_options'                => '',
+    'reports_submit'                             => '',
+    'end_after_start_date'                       => '',
+    'select_category'                            => '',
+    'select_budget'                              => '',
+    'select_tag'                                 => '',
+    'income_per_category'                        => '',
+    'expense_per_category'                       => '',
+    'expense_per_budget'                         => '',
+    'income_per_account'                         => '',
+    'expense_per_account'                        => '',
+    'expense_per_tag'                            => '',
+    'income_per_tag'                             => '',
+    'include_expense_not_in_budget'              => '',
+    'include_expense_not_in_account'             => '',
+    'include_expense_not_in_category'            => '',
+    'include_income_not_in_category'             => '',
+    'include_income_not_in_account'              => '',
+    'include_income_not_in_tags'                 => '',
+    'include_expense_not_in_tags'                => '',
+    'everything_else'                            => '',
+    'income_and_expenses'                        => '',
+    'spent_average'                              => '',
+    'income_average'                             => '',
+    'transaction_count'                          => '',
+    'average_spending_per_account'               => '',
+    'average_income_per_account'                 => '',
+    'total'                                      => '',
+    'description'                                => '',
+    'sum_of_period'                              => '',
+    'average_in_period'                          => '',
+    'account_role_defaultAsset'                  => '',
+    'account_role_sharedAsset'                   => '',
+    'account_role_savingAsset'                   => '',
+    'account_role_ccAsset'                       => '',
 
     // charts:
-    'chart'                                      => 'Chart',
-    'month'                                      => 'Month',
-    'budget'                                     => 'Budget',
-    'spent'                                      => 'Spent',
-    'spent_in_budget'                            => 'Spent in budget',
-    'left_to_spend'                              => 'Left to spend',
-    'earned'                                     => 'Earned',
-    'overspent'                                  => 'Overspent',
-    'left'                                       => 'Left',
-    'no_budget'                                  => '(no budget)',
-    'max-amount'                                 => 'Maximum amount',
-    'min-amount'                                 => 'Minumum amount',
-    'journal-amount'                             => 'Current bill entry',
-    'name'                                       => 'Name',
-    'date'                                       => 'Date',
-    'paid'                                       => 'Paid',
-    'unpaid'                                     => 'Unpaid',
-    'day'                                        => 'Day',
-    'budgeted'                                   => 'Budgeted',
-    'period'                                     => 'Period',
-    'balance'                                    => 'Balance',
-    'sum'                                        => 'Sum',
-    'average'                                    => 'Average',
-    'balanceFor'                                 => 'Balance for :name',
+    'chart'                                      => '',
+    'month'                                      => '',
+    'budget'                                     => '',
+    'spent'                                      => '',
+    'spent_in_budget'                            => '',
+    'left_to_spend'                              => '',
+    'earned'                                     => '',
+    'overspent'                                  => '',
+    'left'                                       => '',
+    'no_budget'                                  => '',
+    'max-amount'                                 => '',
+    'min-amount'                                 => '',
+    'journal-amount'                             => '',
+    'name'                                       => '',
+    'date'                                       => '',
+    'paid'                                       => '',
+    'unpaid'                                     => '',
+    'day'                                        => '',
+    'budgeted'                                   => '',
+    'period'                                     => '',
+    'balance'                                    => '',
+    'sum'                                        => '',
+    'average'                                    => '',
+    'balanceFor'                                 => '',
 
     // piggy banks:
-    'add_money_to_piggy'                         => 'Add money to piggy bank ":name"',
-    'piggy_bank'                                 => 'Piggy bank',
-    'new_piggy_bank'                             => 'New piggy bank',
-    'store_piggy_bank'                           => 'Store new piggy bank',
-    'stored_piggy_bank'                          => 'Store new piggy bank ":name"',
-    'account_status'                             => 'Account status',
-    'left_for_piggy_banks'                       => 'Left for piggy banks',
-    'sum_of_piggy_banks'                         => 'Sum of piggy banks',
-    'saved_so_far'                               => 'Saved so far',
-    'left_to_save'                               => 'Left to save',
-    'suggested_amount'                           => 'Suggested monthly amount to save',
-    'add_money_to_piggy_title'                   => 'Add money to piggy bank ":name"',
-    'remove_money_from_piggy_title'              => 'Remove money from piggy bank ":name"',
-    'add'                                        => 'Add',
+    'add_money_to_piggy'                         => '',
+    'piggy_bank'                                 => '',
+    'new_piggy_bank'                             => '',
+    'store_piggy_bank'                           => '',
+    'stored_piggy_bank'                          => '',
+    'account_status'                             => '',
+    'left_for_piggy_banks'                       => '',
+    'sum_of_piggy_banks'                         => '',
+    'saved_so_far'                               => '',
+    'left_to_save'                               => '',
+    'suggested_amount'                           => '',
+    'add_money_to_piggy_title'                   => '',
+    'remove_money_from_piggy_title'              => '',
+    'add'                                        => '',
 
-    'remove'                     => 'Remove',
-    'max_amount_add'             => 'The maximum amount you can add is',
-    'max_amount_remove'          => 'The maximum amount you can remove is',
-    'update_piggy_button'        => 'Update piggy bank',
-    'update_piggy_title'         => 'Update piggy bank ":name"',
-    'updated_piggy_bank'         => 'Updated piggy bank ":name"',
-    'details'                    => 'Details',
-    'events'                     => 'Events',
-    'target_amount'              => 'Target amount',
-    'start_date'                 => 'Start date',
-    'target_date'                => 'Target date',
-    'no_target_date'             => 'No target date',
-    'table'                      => 'Table',
-    'delete_piggy_bank'          => 'Delete piggy bank ":name"',
-    'cannot_add_amount_piggy'    => 'Could not add :amount to ":name".',
-    'cannot_remove_from_piggy'   => 'Could not remove :amount from ":name".',
-    'deleted_piggy_bank'         => 'Deleted piggy bank ":name"',
-    'added_amount_to_piggy'      => 'Added :amount to ":name"',
-    'removed_amount_from_piggy'  => 'Removed :amount from ":name"',
+    'remove'                     => '',
+    'max_amount_add'             => '',
+    'max_amount_remove'          => '',
+    'update_piggy_button'        => '',
+    'update_piggy_title'         => '',
+    'updated_piggy_bank'         => '',
+    'details'                    => '',
+    'events'                     => '',
+    'target_amount'              => '',
+    'start_date'                 => '',
+    'target_date'                => '',
+    'no_target_date'             => '',
+    'table'                      => '',
+    'delete_piggy_bank'          => '',
+    'cannot_add_amount_piggy'    => '',
+    'cannot_remove_from_piggy'   => '',
+    'deleted_piggy_bank'         => '',
+    'added_amount_to_piggy'      => '',
+    'removed_amount_from_piggy'  => '',
 
     // tags
-    'regular_tag'                => 'Just a regular tag.',
-    'balancing_act'              => 'The tag takes at most two transactions; an expense and a transfer. They\'ll balance each other out.',
-    'advance_payment'            => 'The tag accepts one expense and any number of deposits aimed to repay the original expense.',
-    'delete_tag'                 => 'Delete tag ":tag"',
-    'deleted_tag'                => 'Deleted tag ":tag"',
-    'new_tag'                    => 'Make new tag',
-    'edit_tag'                   => 'Edit tag ":tag"',
-    'updated_tag'                => 'Updated tag ":tag"',
-    'created_tag'                => 'Tag ":tag" has been created!',
+    'regular_tag'                => '',
+    'balancing_act'              => '',
+    'advance_payment'            => '',
+    'delete_tag'                 => '',
+    'deleted_tag'                => '',
+    'new_tag'                    => '',
+    'edit_tag'                   => '',
+    'updated_tag'                => '',
+    'created_tag'                => '',
 
-    'transaction_journal_information'       => 'Transaction information',
-    'transaction_journal_meta'              => 'Meta information',
-    'total_amount'                          => 'Total amount',
-    'number_of_decimals'                    => 'Number of decimals',
+    'transaction_journal_information'       => '',
+    'transaction_journal_meta'              => '',
+    'total_amount'                          => '',
+    'number_of_decimals'                    => '',
 
     // administration
-    'administration'                        => 'Administration',
-    'user_administration'                   => 'User administration',
-    'list_all_users'                        => 'All users',
-    'all_users'                             => 'All users',
-    'instance_configuration'                => 'Configuration',
-    'firefly_instance_configuration'        => 'Configuration options for Firefly III',
-    'setting_single_user_mode'              => 'Single user mode',
-    'setting_single_user_mode_explain'      => 'By default, Firefly III only accepts one (1) registration: you. This is a security measure, preventing others from using your instance unless you allow them to. Future registrations are blocked. When you uncheck this box, others can use your instance as wel, assuming they can reach it (when it is connected to the internet).',
-    'store_configuration'                   => 'Store configuration',
-    'single_user_administration'            => 'User administration for :email',
-    'edit_user'                             => 'Edit user :email',
-    'hidden_fields_preferences'             => 'Not all fields are visible right now. You must enable them in your <a href=":link">settings</a>.',
-    'user_data_information'                 => 'User data',
-    'user_information'                      => 'User information',
-    'total_size'                            => 'total size',
-    'budget_or_budgets'                     => 'budget(s)',
-    'budgets_with_limits'                   => 'budget(s) with configured amount',
-    'rule_or_rules'                         => 'rule(s)',
-    'rulegroup_or_groups'                   => 'rule group(s)',
-    'configuration_updated'                 => 'The configuration has been updated',
-    'setting_is_demo_site'                  => 'Demo site',
-    'setting_is_demo_site_explain'          => 'If you check this box, this installation will behave as if it is the demo site, which can have weird side effects.',
-    'block_code_bounced'                    => 'Email message(s) bounced',
-    'block_code_expired'                    => 'Demo account expired',
-    'no_block_code'                         => 'No reason for block or user not blocked',
+    'administration'                        => '',
+    'user_administration'                   => '',
+    'list_all_users'                        => '',
+    'all_users'                             => '',
+    'instance_configuration'                => '',
+    'firefly_instance_configuration'        => '',
+    'setting_single_user_mode'              => '',
+    'setting_single_user_mode_explain'      => '',
+    'store_configuration'                   => '',
+    'single_user_administration'            => '',
+    'edit_user'                             => '',
+    'hidden_fields_preferences'             => '',
+    'user_data_information'                 => '',
+    'user_information'                      => '',
+    'total_size'                            => '',
+    'budget_or_budgets'                     => '',
+    'budgets_with_limits'                   => '',
+    'rule_or_rules'                         => '',
+    'rulegroup_or_groups'                   => '',
+    'configuration_updated'                 => '',
+    'setting_is_demo_site'                  => '',
+    'setting_is_demo_site_explain'          => '',
+    'block_code_bounced'                    => '',
+    'block_code_expired'                    => '',
+    'no_block_code'                         => '',
     // links
-    'journal_link_configuration'            => 'Transaction links configuration',
-    'create_new_link_type'                  => 'Create new link type',
-    'store_new_link_type'                   => 'Store new link type',
-    'update_link_type'                      => 'Update link type',
-    'edit_link_type'                        => 'Edit link type ":name"',
-    'updated_link_type'                     => 'Updated link type ":name"',
-    'delete_link_type'                      => 'Delete link type ":name"',
-    'deleted_link_type'                     => 'Deleted link type ":name"',
-    'stored_new_link_type'                  => 'Store new link type ":name"',
-    'cannot_edit_link_type'                 => 'Cannot edit link type ":name"',
-    'link_type_help_name'                   => 'Ie. "Duplicates"',
-    'link_type_help_inward'                 => 'Ie. "duplicates"',
-    'link_type_help_outward'                => 'Ie. "is duplicated by"',
-    'save_connections_by_moving'            => 'Save the link between these transaction(s) by moving them to another link type:',
-    'do_not_save_connection'                => '(do not save connection)',
-    'link_transaction'                      => 'Link transaction',
-    'link_to_other_transaction'             => 'Link this transaction to another transaction',
-    'select_transaction_to_link'            => 'Select a transaction to link this transaction to',
-    'this_transaction'                      => 'This transaction',
-    'transaction'                           => 'Transaction',
-    'comments'                              => 'Comments',
-    'to_link_not_found'                     => 'If the transaction you want to link to is not listed, simply enter its ID.',
-    'invalid_link_data'                     => 'Invalid link type selected. Cannot link transaction.',
-    'journals_linked'                       => 'Transactions are linked.',
-    'journals_error_linked'                 => 'These transactions are already linked.',
-    'journal_links'                         => 'Transaction links',
-    'this_withdrawal'                       => 'This withdrawal',
-    'this_deposit'                          => 'This deposit',
-    'this_transfer'                         => 'This transfer',
-    'overview_for_link'                     => 'Overview for link type ":name"',
-    'delete_journal_link'                   => 'Delete the link between <a href=":source_link">:source</a> and <a href=":destination_link">:destination</a>',
-    'deleted_link'                          => 'Deleted link',
+    'journal_link_configuration'            => '',
+    'create_new_link_type'                  => '',
+    'store_new_link_type'                   => '',
+    'update_link_type'                      => '',
+    'edit_link_type'                        => '',
+    'updated_link_type'                     => '',
+    'delete_link_type'                      => '',
+    'deleted_link_type'                     => '',
+    'stored_new_link_type'                  => '',
+    'cannot_edit_link_type'                 => '',
+    'link_type_help_name'                   => '',
+    'link_type_help_inward'                 => '',
+    'link_type_help_outward'                => '',
+    'save_connections_by_moving'            => '',
+    'do_not_save_connection'                => '',
+    'link_transaction'                      => '',
+    'link_to_other_transaction'             => '',
+    'select_transaction_to_link'            => '',
+    'this_transaction'                      => '',
+    'transaction'                           => '',
+    'comments'                              => '',
+    'to_link_not_found'                     => '',
+    'invalid_link_data'                     => '',
+    'journals_linked'                       => '',
+    'journals_error_linked'                 => '',
+    'journal_links'                         => '',
+    'this_withdrawal'                       => '',
+    'this_deposit'                          => '',
+    'this_transfer'                         => '',
+    'overview_for_link'                     => '',
+    'delete_journal_link'                   => '',
+    'deleted_link'                          => '',
 
 
     // split a transaction:
-    'splits'                                => 'Splits',
-    'add_another_split'                     => 'Add another split',
-    'split-transactions'                    => 'Split transactions',
-    'do_split'                              => 'Do a split',
-    'split_this_withdrawal'                 => 'Split this withdrawal',
-    'split_this_deposit'                    => 'Split this deposit',
-    'split_this_transfer'                   => 'Split this transfer',
-    'cannot_edit_multiple_source'           => 'You cannot edit splitted transaction #:id with description ":description" because it contains multiple source accounts.',
-    'cannot_edit_multiple_dest'             => 'You cannot edit splitted transaction #:id with description ":description" because it contains multiple destination accounts.',
-    'cannot_edit_opening_balance'           => 'You cannot edit the opening balance of an account.',
-    'no_edit_multiple_left'                 => 'You have selected no valid transactions to edit.',
+    'splits'                                => '',
+    'add_another_split'                     => '',
+    'split-transactions'                    => '',
+    'do_split'                              => '',
+    'split_this_withdrawal'                 => '',
+    'split_this_deposit'                    => '',
+    'split_this_transfer'                   => '',
+    'cannot_edit_multiple_source'           => '',
+    'cannot_edit_multiple_dest'             => '',
+    'cannot_edit_opening_balance'           => '',
+    'no_edit_multiple_left'                 => '',
 
     // import bread crumbs and titles:
-    'import'                                => 'Import',
-    'import_data'                           => 'Import data',
+    'import'                                => '',
+    'import_data'                           => '',
 
     // import index page:
-    'import_index_title'                    => 'Import data into Firefly III',
-    'import_index_sub_title'                => 'Index',
-    'import_general_index_intro'            => 'Welcome to Firefly\'s import routine. There are a few ways of importing data into Firefly III, displayed here as buttons.',
-    'import_index_intro'                    => 'This routine will help you import files from your bank into Firefly III. Please check out the help pages in the top right corner.',
-    'import_index_file'                     => 'Select your file',
-    'import_index_config'                   => 'If you have previously imported data into Firefly III, you may have a configuration file, which will pre-set configuration values for you. For some banks, other users have kindly provided their <a href="https://github.com/firefly-iii/import-configurations/wiki">configuration file</a>.',
-    'import_index_type'                     => 'Select the type of file you will upload',
-    'import_index_start'                    => 'Start importing',
+    'import_index_title'                    => '',
+    'import_index_sub_title'                => '',
+    'import_general_index_intro'            => '',
+    'import_index_intro'                    => '',
+    'import_index_file'                     => '',
+    'import_index_config'                   => '',
+    'import_index_type'                     => '',
+    'import_index_start'                    => '',
 
     // supported file types:
-    'import_file_type_csv'                  => 'CSV (comma separated values)',
+    'import_file_type_csv'                  => '',
 
     // import configuration routine:
-    'import_config_sub_title'               => 'Set up your import file',
-    'import_config_bread_crumb'             => 'Set up your import file',
+    'import_config_sub_title'               => '',
+    'import_config_bread_crumb'             => '',
 
     // import status page:
-    'import_status_bread_crumb'             => 'Import status',
-    'import_status_sub_title'               => 'Import status',
-    'import_status_wait_title'              => 'Please hold...',
-    'import_status_wait_text'               => 'This box will disappear in a moment.',
-    'import_status_ready_title'             => 'Import is ready to start',
-    'import_status_ready_text'              => 'The import is ready to start. All the configuration you needed to do has been done. Please download the configuration file. It will help you with the import should it not go as planned. To actually run the import, you can either execute the following command in your console, or run the web-based import. Depending on your configuration, the console import will give you more feedback.',
-    'import_status_ready_config'            => 'Download configuration',
-    'import_status_ready_start'             => 'Start the import',
-    'import_status_ready_share'             => 'Please consider downloading your configuration and sharing it at the <strong><a href="https://github.com/firefly-iii/import-configurations/wiki">import configuration center</a></strong>. This will allow other users of Firefly III to import their files more easily.',
-    'import_status_running_title'           => 'The import is running',
-    'import_status_running_placeholder'     => 'Please hold for an update...',
-    'import_status_errors_title'            => 'Errors during the import',
-    'import_status_errors_single'           => 'An error has occured during the import. It does not appear to be fatal.',
-    'import_status_errors_multi'            => 'Some errors occured during the import. These do not appear to be fatal.',
-    'import_status_fatal_title'             => 'A fatal error occurred',
-    'import_status_fatal_text'              => 'A fatal error occurred, which the import-routine cannot recover from. Please see the explanation in red below.',
-    'import_status_fatal_more'              => 'If the error is a time-out, the import will have stopped half-way. For some server configurations, it is merely the server that stopped while the import keeps running in the background. To verify this, check out the log files. If the problem persists, consider importing over the command line instead.',
-    'import_status_finished_title'          => 'Import routine finished',
-    'import_status_finished_text'           => 'The import routine has imported your file.',
-    'import_status_finished_job'            => 'The transactions imported can be found in tag <a href=":link" class="label label-success" style="font-size:100%;font-weight:normal;">:tag</a>.',
-    'import_with_key'                       => 'Import with key \':key\'',
+    'import_status_bread_crumb'             => '',
+    'import_status_sub_title'               => '',
+    'import_status_wait_title'              => '',
+    'import_status_wait_text'               => '',
+    'import_status_ready_title'             => '',
+    'import_status_ready_text'              => '',
+    'import_status_ready_config'            => '',
+    'import_status_ready_start'             => '',
+    'import_status_ready_share'             => '',
+    'import_status_running_title'           => '',
+    'import_status_running_placeholder'     => '',
+    'import_status_errors_title'            => '',
+    'import_status_errors_single'           => '',
+    'import_status_errors_multi'            => '',
+    'import_status_fatal_title'             => '',
+    'import_status_fatal_text'              => '',
+    'import_status_fatal_more'              => '',
+    'import_status_finished_title'          => '',
+    'import_status_finished_text'           => '',
+    'import_status_finished_job'            => '',
+    'import_with_key'                       => '',
 
     // sandstorm.io errors and messages:
-    'sandstorm_not_available'               => 'This function is not available when you are using Firefly III within a Sandstorm.io environment.',
+    'sandstorm_not_available'               => '',
 
     // empty lists? no objects? instructions:
-    'no_transactions_in_period'             => 'There are no transactions in this period.',
-    'no_accounts_title_asset'               => 'Let\'s create an asset account!',
-    'no_accounts_intro_asset'               => 'You have no asset accounts yet. Asset accounts are your main accounts: your checking account, savings account, shared account or even your credit card.',
-    'no_accounts_imperative_asset'          => 'To start using Firefly III you must create at least one asset account. Let\'s do so now:',
-    'no_accounts_create_asset'              => 'Create an asset account',
-    'no_accounts_title_expense'             => 'Let\'s create an expense account!',
-    'no_accounts_intro_expense'             => 'You have no expense accounts yet. Expense accounts are the places where you spend money, such as shops and supermarkets.',
-    'no_accounts_imperative_expense'        => 'Expense accounts are created automatically when you create transactions, but you can create one manually too, if you want. Let\'s create one now:',
-    'no_accounts_create_expense'            => 'Create an expense account',
-    'no_accounts_title_revenue'             => 'Let\'s create a revenue account!',
-    'no_accounts_intro_revenue'             => 'You have no revenue accounts yet. Revenue accounts are the places where you receive money from, such as your employer.',
-    'no_accounts_imperative_revenue'        => 'Revenue accounts are created automatically when you create transactions, but you can create one manually too, if you want. Let\'s create one now:',
-    'no_accounts_create_revenue'            => 'Create a revenue account',
-    'no_budgets_title_default'              => 'Let\'s create a budget',
-    'no_budgets_intro_default'              => 'You have no budgets yet. Budgets are used to organise your expenses into logical groups, which you can give a soft-cap to limit your expenses.',
-    'no_budgets_imperative_default'         => 'Budgets are the basic tools of financial management. Let\'s create one now:',
-    'no_budgets_create_default'             => 'Create a budget',
-    'no_categories_title_default'           => 'Let\'s create a category!',
-    'no_categories_intro_default'           => 'You have no categories yet. Categories are used to fine tune your transactions and label them with their designated category.',
-    'no_categories_imperative_default'      => 'Categories are created automatically when you create transactions, but you can create one manually too. Let\'s create one now:',
-    'no_categories_create_default'          => 'Create a category',
-    'no_tags_title_default'                 => 'Let\'s create a tag!',
-    'no_tags_intro_default'                 => 'You have no tags yet. Tags are used to fine tune your transactions and label them with specific keywords.',
-    'no_tags_imperative_default'            => 'Tags are created automatically when you create transactions, but you can create one manually too. Let\'s create one now:',
-    'no_tags_create_default'                => 'Create a tag',
-    'no_transactions_title_withdrawal'      => 'Let\'s create an expense!',
-    'no_transactions_intro_withdrawal'      => 'You have no expenses yet. You should create expenses to start managing your finances.',
-    'no_transactions_imperative_withdrawal' => 'Have you spent some money? Then you should write it down:',
-    'no_transactions_create_withdrawal'     => 'Create an expense',
-    'no_transactions_title_deposit'         => 'Let\'s create some income!',
-    'no_transactions_intro_deposit'         => 'You have no recorded income yet. You should create income entries to start managing your finances.',
-    'no_transactions_imperative_deposit'    => 'Have you received some money? Then you should write it down:',
-    'no_transactions_create_deposit'        => 'Create a deposit',
-    'no_transactions_title_transfers'       => 'Let\'s create a transfer!',
-    'no_transactions_intro_transfers'       => 'You have no transfers yet. When you move money between asset accounts, it is recorded as a transfer.',
-    'no_transactions_imperative_transfers'  => 'Have you moved some money around? Then you should write it down:',
-    'no_transactions_create_transfers'      => 'Create a transfer',
-    'no_piggies_title_default'              => 'Let\'s create a piggy bank!',
-    'no_piggies_intro_default'              => 'You have no piggy banks yet. You can create piggy banks to divide your savings and keep track of what you\'re saving up for.',
-    'no_piggies_imperative_default'         => 'Do you have things you\'re saving money for? Create a piggy bank and keep track:',
-    'no_piggies_create_default'             => 'Create a new piggy bank',
-    'no_bills_title_default'                => 'Let\'s create a bill!',
-    'no_bills_intro_default'                => 'You have no bills yet. You can create bills to keep track of regular expenses, like your rent of insurance.',
-    'no_bills_imperative_default'           => 'Do you have such regular bills? Create a bill and keep track of your payments:',
-    'no_bills_create_default'               => 'Create a bill',
+    'no_transactions_in_period'             => '',
+    'no_accounts_title_asset'               => '',
+    'no_accounts_intro_asset'               => '',
+    'no_accounts_imperative_asset'          => '',
+    'no_accounts_create_asset'              => '',
+    'no_accounts_title_expense'             => '',
+    'no_accounts_intro_expense'             => '',
+    'no_accounts_imperative_expense'        => '',
+    'no_accounts_create_expense'            => '',
+    'no_accounts_title_revenue'             => '',
+    'no_accounts_intro_revenue'             => '',
+    'no_accounts_imperative_revenue'        => '',
+    'no_accounts_create_revenue'            => '',
+    'no_budgets_title_default'              => '',
+    'no_budgets_intro_default'              => '',
+    'no_budgets_imperative_default'         => '',
+    'no_budgets_create_default'             => '',
+    'no_categories_title_default'           => '',
+    'no_categories_intro_default'           => '',
+    'no_categories_imperative_default'      => '',
+    'no_categories_create_default'          => '',
+    'no_tags_title_default'                 => '',
+    'no_tags_intro_default'                 => '',
+    'no_tags_imperative_default'            => '',
+    'no_tags_create_default'                => '',
+    'no_transactions_title_withdrawal'      => '',
+    'no_transactions_intro_withdrawal'      => '',
+    'no_transactions_imperative_withdrawal' => '',
+    'no_transactions_create_withdrawal'     => '',
+    'no_transactions_title_deposit'         => '',
+    'no_transactions_intro_deposit'         => '',
+    'no_transactions_imperative_deposit'    => '',
+    'no_transactions_create_deposit'        => '',
+    'no_transactions_title_transfers'       => '',
+    'no_transactions_intro_transfers'       => '',
+    'no_transactions_imperative_transfers'  => '',
+    'no_transactions_create_transfers'      => '',
+    'no_piggies_title_default'              => '',
+    'no_piggies_intro_default'              => '',
+    'no_piggies_imperative_default'         => '',
+    'no_piggies_create_default'             => '',
+    'no_bills_title_default'                => '',
+    'no_bills_intro_default'                => '',
+    'no_bills_imperative_default'           => '',
+    'no_bills_create_default'               => '',
 
 
 ];
\ No newline at end of file

From 77ee046b3f6ed5eb031824feef6888219799991a Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Fri, 25 Aug 2017 07:08:15 +0200
Subject: [PATCH 295/668] New translations firefly.php (Slovenian)

---
 resources/lang/sl_SI/firefly.php | 1672 +++++++++++++++---------------
 1 file changed, 836 insertions(+), 836 deletions(-)

diff --git a/resources/lang/sl_SI/firefly.php b/resources/lang/sl_SI/firefly.php
index 719fa02e72..0020120886 100644
--- a/resources/lang/sl_SI/firefly.php
+++ b/resources/lang/sl_SI/firefly.php
@@ -14,26 +14,26 @@ declare(strict_types=1);
 return [
     // general stuff:
     'close'                                      => 'zapri',
-    'actions'                                    => 'Actions',
+    'actions'                                    => '',
     'edit'                                       => 'uredi',
     'delete'                                     => 'izbriši',
     'welcomeBack'                                => 'Kaj dogaja?',
     'everything'                                 => 'vse',
     'customRange'                                => 'obseg po meri',
     'apply'                                      => 'uporabi',
-    'select_date'                                => 'Select date..',
+    'select_date'                                => '',
     'cancel'                                     => 'prekliči',
-    'from'                                       => 'From',
-    'to'                                         => 'To',
+    'from'                                       => '',
+    'to'                                         => '',
     'showEverything'                             => 'pokaži vse',
     'never'                                      => 'nikoli',
-    'no_results_for_empty_search'                => 'Your search was empty, so nothing was found.',
-    'removed_amount'                             => 'Removed :amount',
-    'added_amount'                               => 'Added :amount',
+    'no_results_for_empty_search'                => '',
+    'removed_amount'                             => '',
+    'added_amount'                               => '',
     'asset_account_role_help'                    => 'Dodatne možnosti se lahko nastavljajo tudi kasneje.',
-    'Opening balance'                            => 'Opening balance',
-    'create_new_stuff'                           => 'Create new stuff',
-    'new_withdrawal'                             => 'New withdrawal',
+    'Opening balance'                            => '',
+    'create_new_stuff'                           => '',
+    'new_withdrawal'                             => '',
     'new_deposit'                                => 'nov depozit',
     'new_transfer'                               => 'nov prenos',
     'new_asset_account'                          => 'nov premoženjski račun',
@@ -41,928 +41,928 @@ return [
     'new_revenue_account'                        => 'nov konto za dohodke',
     'new_budget'                                 => 'nov budžet',
     'new_bill'                                   => 'nov trajnik',
-    'block_account_logout'                       => 'You have been logged out. Blocked accounts cannot use this site. Did you register with a valid email address?',
-    'flash_success'                              => 'Success!',
-    'flash_info'                                 => 'Message',
-    'flash_warning'                              => 'Warning!',
-    'flash_error'                                => 'Error!',
-    'flash_info_multiple'                        => 'There is one message|There are :count messages',
-    'flash_error_multiple'                       => 'There is one error|There are :count errors',
-    'net_worth'                                  => 'Net worth',
-    'route_has_no_help'                          => 'There is no help for this route.',
-    'two_factor_welcome'                         => 'Hello, :user!',
-    'two_factor_enter_code'                      => 'To continue, please enter your two factor authentication code. Your application can generate it for you.',
-    'two_factor_code_here'                       => 'Enter code here',
-    'two_factor_title'                           => 'Two factor authentication',
-    'authenticate'                               => 'Authenticate',
-    'two_factor_forgot_title'                    => 'Lost two factor authentication',
-    'two_factor_forgot'                          => 'I forgot my two-factor thing.',
-    'two_factor_lost_header'                     => 'Lost your two factor authentication?',
-    'two_factor_lost_intro'                      => 'Unfortunately, this is not something you can reset from the web interface. You have two choices.',
-    'two_factor_lost_fix_self'                   => 'If you run your own instance of Firefly III, check the logs in <code>storage/logs</code> for instructions.',
-    'two_factor_lost_fix_owner'                  => 'Otherwise, email the site owner, <a href="mailto::site_owner">:site_owner</a> and ask them to reset your two factor authentication.',
-    'warning_much_data'                          => ':days days of data may take a while to load.',
-    'registered'                                 => 'You have registered successfully!',
+    'block_account_logout'                       => '',
+    'flash_success'                              => '',
+    'flash_info'                                 => '',
+    'flash_warning'                              => '',
+    'flash_error'                                => '',
+    'flash_info_multiple'                        => '',
+    'flash_error_multiple'                       => '',
+    'net_worth'                                  => '',
+    'route_has_no_help'                          => '',
+    'two_factor_welcome'                         => '',
+    'two_factor_enter_code'                      => '',
+    'two_factor_code_here'                       => '',
+    'two_factor_title'                           => '',
+    'authenticate'                               => '',
+    'two_factor_forgot_title'                    => '',
+    'two_factor_forgot'                          => '',
+    'two_factor_lost_header'                     => '',
+    'two_factor_lost_intro'                      => '',
+    'two_factor_lost_fix_self'                   => '',
+    'two_factor_lost_fix_owner'                  => '',
+    'warning_much_data'                          => '',
+    'registered'                                 => '',
     'Default asset account'                      => 'privzeti premoženjski račun',
     'no_budget_pointer'                          => 'Kot kaže niste definirali še nobenega budžeta. Budžete lahko ustvarite na strani  <a href="/budgets">budžeti></a>. Budžeti vam pomagajo držati pregled nad vašimi stroški.',
-    'Savings account'                            => 'Savings account',
-    'Credit card'                                => 'Credit card',
-    'source_accounts'                            => 'Source account(s)',
-    'destination_accounts'                       => 'Destination account(s)',
-    'user_id_is'                                 => 'Your user id is <strong>:user</strong>',
-    'field_supports_markdown'                    => 'This field supports <a href="https://en.support.wordpress.com/markdown-quick-reference/">Markdown</a>.',
-    'need_more_help'                             => 'If you need more help using Firefly III, please <a href="https://github.com/firefly-iii/firefly-iii/issues">open a ticket on Github</a>.',
-    'reenable_intro_text'                        => 'You can also reenable <a href="#" id="reenableGuidance">the introduction guidance</a>.',
-    'intro_boxes_after_refresh'                  => 'The introduction boxes will reappear when you refresh the page.',
-    'show_all_no_filter'                         => 'Show all transactions without grouping them by date.',
+    'Savings account'                            => '',
+    'Credit card'                                => '',
+    'source_accounts'                            => '',
+    'destination_accounts'                       => '',
+    'user_id_is'                                 => '',
+    'field_supports_markdown'                    => '',
+    'need_more_help'                             => '',
+    'reenable_intro_text'                        => '',
+    'intro_boxes_after_refresh'                  => '',
+    'show_all_no_filter'                         => '',
     'expenses_by_category'                       => 'stroški po kategorijah',
     'expenses_by_budget'                         => 'stroški po budžetih',
-    'income_by_category'                         => 'Income by category',
+    'income_by_category'                         => '',
     'expenses_by_asset_account'                  => 'stroški po premoženjskih računih',
     'expenses_by_expense_account'                => 'stroški po stroškovnih kontih',
-    'cannot_redirect_to_account'                 => 'Firefly III cannot redirect you to the correct page. Apologies.',
+    'cannot_redirect_to_account'                 => '',
     'sum_of_expenses'                            => 'vsota stroškov',
-    'sum_of_income'                              => 'Sum of income',
-    'total_sum'                                  => 'Total sum',
-    'spent_in_specific_budget'                   => 'Spent in budget ":budget"',
-    'sum_of_expenses_in_budget'                  => 'Spent total in budget ":budget"',
-    'left_in_budget_limit'                       => 'Left to spend according to budgeting',
-    'cannot_reset_demo_user'                     => 'You cannot reset the password of the demonstration account',
-    'current_period'                             => 'Current period',
-    'show_the_current_period_and_overview'       => 'Show the current period and overview',
-    'pref_languages_locale'                      => 'For a language other than English to work properly, your operating system must be equipped with the correct locale-information. If these are not present, currency data, dates and amounts may be formatted wrong.',
-    'budget_in_period'                           => 'All transactions for budget ":name" between :start and :end',
-    'chart_budget_in_period'                     => 'Chart for all transactions for budget ":name" between :start and :end',
-    'chart_account_in_period'                    => 'Chart for all transactions for account ":name" between :start and :end',
-    'chart_category_in_period'                   => 'Chart for all transactions for category ":name" between :start and :end',
-    'chart_category_all'                         => 'Chart for all transactions for category ":name"',
-    'clone_withdrawal'                           => 'Clone this withdrawal',
-    'clone_deposit'                              => 'Clone this deposit',
-    'clone_transfer'                             => 'Clone this transfer',
-    'multi_select_no_selection'                  => 'None selected',
-    'multi_select_all_selected'                  => 'All selected',
-    'multi_select_filter_placeholder'            => 'Find..',
-    'between_dates_breadcrumb'                   => 'Between :start and :end',
-    'all_journals_without_budget'                => 'All transactions without a budget',
-    'journals_without_budget'                    => 'Transactions without a budget',
-    'all_journals_without_category'              => 'All transactions without a category',
-    'journals_without_category'                  => 'Transactions without a category',
-    'all_journals_for_account'                   => 'All transactions for account :name',
-    'chart_all_journals_for_account'             => 'Chart of all transactions for account :name',
-    'journals_in_period_for_account'             => 'All transactions for account :name between :start and :end',
-    'transferred'                                => 'Transferred',
+    'sum_of_income'                              => '',
+    'total_sum'                                  => '',
+    'spent_in_specific_budget'                   => '',
+    'sum_of_expenses_in_budget'                  => '',
+    'left_in_budget_limit'                       => '',
+    'cannot_reset_demo_user'                     => '',
+    'current_period'                             => '',
+    'show_the_current_period_and_overview'       => '',
+    'pref_languages_locale'                      => '',
+    'budget_in_period'                           => '',
+    'chart_budget_in_period'                     => '',
+    'chart_account_in_period'                    => '',
+    'chart_category_in_period'                   => '',
+    'chart_category_all'                         => '',
+    'clone_withdrawal'                           => '',
+    'clone_deposit'                              => '',
+    'clone_transfer'                             => '',
+    'multi_select_no_selection'                  => '',
+    'multi_select_all_selected'                  => '',
+    'multi_select_filter_placeholder'            => '',
+    'between_dates_breadcrumb'                   => '',
+    'all_journals_without_budget'                => '',
+    'journals_without_budget'                    => '',
+    'all_journals_without_category'              => '',
+    'journals_without_category'                  => '',
+    'all_journals_for_account'                   => '',
+    'chart_all_journals_for_account'             => '',
+    'journals_in_period_for_account'             => '',
+    'transferred'                                => '',
     'all_withdrawal'                             => 'vsi stroški',
-    'all_transactions'                           => 'All transactions',
+    'all_transactions'                           => '',
     'title_withdrawal_between'                   => 'vsi stroški med :start in :end',
-    'all_deposit'                                => 'All revenue',
-    'title_deposit_between'                      => 'All revenue between :start and :end',
-    'all_transfers'                              => 'All transfers',
-    'title_transfers_between'                    => 'All transfers between :start and :end',
-    'all_transfer'                               => 'All transfers',
-    'all_journals_for_tag'                       => 'All transactions for tag ":tag"',
-    'title_transfer_between'                     => 'All transfers between :start and :end',
-    'all_journals_for_category'                  => 'All transactions for category :name',
-    'all_journals_for_budget'                    => 'All transactions for budget :name',
-    'chart_all_journals_for_budget'              => 'Chart of all transactions for budget :name',
-    'journals_in_period_for_category'            => 'All transactions for category :name between :start and :end',
-    'journals_in_period_for_tag'                 => 'All transactions for tag :tag between :start and :end',
-    'not_available_demo_user'                    => 'The feature you try to access is not available to demo users.',
+    'all_deposit'                                => '',
+    'title_deposit_between'                      => '',
+    'all_transfers'                              => '',
+    'title_transfers_between'                    => '',
+    'all_transfer'                               => '',
+    'all_journals_for_tag'                       => '',
+    'title_transfer_between'                     => '',
+    'all_journals_for_category'                  => '',
+    'all_journals_for_budget'                    => '',
+    'chart_all_journals_for_budget'              => '',
+    'journals_in_period_for_category'            => '',
+    'journals_in_period_for_tag'                 => '',
+    'not_available_demo_user'                    => '',
     'exchange_rate_instructions'                 => 'Premoženjski račun "@name" sprejema samo transakcije v @native_currency. Če želite namesto tega uporabiti @foreign_currency, morate podati tudi znesek v @native_currency:',
     'transfer_exchange_rate_instructions'        => 'Izvorni premoženjski račun "@source_name" sprejema samo transakcije v @source_currency. Ciljni premoženjski račun "@dest_name" sprejema samo transakcije v @dest_currency. Podati morate znesek v obeh valutah.',
-    'transaction_data'                           => 'Transaction data',
+    'transaction_data'                           => '',
 
     // search
-    'search'                                     => 'Search',
-    'search_found_transactions'                  => 'Number of transactions found:',
-    'general_search_error'                       => 'An error occured while searching. Please check the log files for more information.',
-    'search_box'                                 => 'Search',
-    'search_box_intro'                           => 'Welcome to the search function of Firefly III. Enter your search query in the box. Make sure you check out the help file because the search is pretty advanced.',
-    'search_error'                               => 'Error while searching',
-    'search_searching'                           => 'Searching ...',
+    'search'                                     => '',
+    'search_found_transactions'                  => '',
+    'general_search_error'                       => '',
+    'search_box'                                 => '',
+    'search_box_intro'                           => '',
+    'search_error'                               => '',
+    'search_searching'                           => '',
 
     // repeat frequencies:
-    'repeat_freq_yearly'                         => 'yearly',
-    'repeat_freq_monthly'                        => 'monthly',
-    'weekly'                                     => 'weekly',
-    'quarterly'                                  => 'quarterly',
-    'half-year'                                  => 'every half year',
-    'yearly'                                     => 'yearly',
+    'repeat_freq_yearly'                         => '',
+    'repeat_freq_monthly'                        => '',
+    'weekly'                                     => '',
+    'quarterly'                                  => '',
+    'half-year'                                  => '',
+    'yearly'                                     => '',
 
     // export data:
-    'import_and_export'                          => 'Import and export',
-    'export_data'                                => 'Export data',
-    'export_data_intro'                          => 'For backup purposes, when migrating to another system or when migrating to another Firefly III installation.',
-    'export_format'                              => 'Export format',
-    'export_format_csv'                          => 'Comma separated values (CSV file)',
-    'export_format_mt940'                        => 'MT940 compatible format',
-    'export_included_accounts'                   => 'Export transactions from these accounts',
-    'include_old_uploads_help'                   => 'Firefly III does not throw away the original CSV files you have imported in the past. You can include them in your export.',
-    'do_export'                                  => 'Export',
-    'export_status_never_started'                => 'The export has not started yet',
-    'export_status_make_exporter'                => 'Creating exporter thing...',
-    'export_status_collecting_journals'          => 'Collecting your transactions...',
-    'export_status_collected_journals'           => 'Collected your transactions!',
-    'export_status_converting_to_export_format'  => 'Converting your transactions...',
-    'export_status_converted_to_export_format'   => 'Converted your transactions!',
-    'export_status_creating_journal_file'        => 'Creating the export file...',
-    'export_status_created_journal_file'         => 'Created the export file!',
-    'export_status_collecting_attachments'       => 'Collecting all your attachments...',
-    'export_status_collected_attachments'        => 'Collected all your attachments!',
-    'export_status_collecting_old_uploads'       => 'Collecting all your previous uploads...',
-    'export_status_collected_old_uploads'        => 'Collected all your previous uploads!',
-    'export_status_creating_config_file'         => 'Creating a configuration file...',
-    'export_status_created_config_file'          => 'Created a configuration file!',
-    'export_status_creating_zip_file'            => 'Creating a zip file...',
-    'export_status_created_zip_file'             => 'Created a zip file!',
-    'export_status_finished'                     => 'Export has succesfully finished! Yay!',
-    'export_data_please_wait'                    => 'Please wait...',
+    'import_and_export'                          => '',
+    'export_data'                                => '',
+    'export_data_intro'                          => '',
+    'export_format'                              => '',
+    'export_format_csv'                          => '',
+    'export_format_mt940'                        => '',
+    'export_included_accounts'                   => '',
+    'include_old_uploads_help'                   => '',
+    'do_export'                                  => '',
+    'export_status_never_started'                => '',
+    'export_status_make_exporter'                => '',
+    'export_status_collecting_journals'          => '',
+    'export_status_collected_journals'           => '',
+    'export_status_converting_to_export_format'  => '',
+    'export_status_converted_to_export_format'   => '',
+    'export_status_creating_journal_file'        => '',
+    'export_status_created_journal_file'         => '',
+    'export_status_collecting_attachments'       => '',
+    'export_status_collected_attachments'        => '',
+    'export_status_collecting_old_uploads'       => '',
+    'export_status_collected_old_uploads'        => '',
+    'export_status_creating_config_file'         => '',
+    'export_status_created_config_file'          => '',
+    'export_status_creating_zip_file'            => '',
+    'export_status_created_zip_file'             => '',
+    'export_status_finished'                     => '',
+    'export_data_please_wait'                    => '',
 
     // rules
-    'rules'                                      => 'Rules',
-    'rule_name'                                  => 'Name of rule',
-    'rule_triggers'                              => 'Rule triggers when',
-    'rule_actions'                               => 'Rule will',
-    'new_rule'                                   => 'New rule',
-    'new_rule_group'                             => 'New rule group',
-    'rule_priority_up'                           => 'Give rule more priority',
-    'rule_priority_down'                         => 'Give rule less priority',
-    'make_new_rule_group'                        => 'Make new rule group',
-    'store_new_rule_group'                       => 'Store new rule group',
-    'created_new_rule_group'                     => 'New rule group ":title" stored!',
-    'updated_rule_group'                         => 'Successfully updated rule group ":title".',
-    'edit_rule_group'                            => 'Edit rule group ":title"',
-    'delete_rule_group'                          => 'Delete rule group ":title"',
-    'deleted_rule_group'                         => 'Deleted rule group ":title"',
-    'update_rule_group'                          => 'Update rule group',
-    'no_rules_in_group'                          => 'There are no rules in this group',
-    'move_rule_group_up'                         => 'Move rule group up',
-    'move_rule_group_down'                       => 'Move rule group down',
-    'save_rules_by_moving'                       => 'Save these rule(s) by moving them to another rule group:',
-    'make_new_rule'                              => 'Make new rule in rule group ":title"',
-    'rule_help_stop_processing'                  => 'When you check this box, later rules in this group will not be executed.',
-    'rule_help_active'                           => 'Inactive rules will never fire.',
-    'stored_new_rule'                            => 'Stored new rule with title ":title"',
-    'deleted_rule'                               => 'Deleted rule with title ":title"',
-    'store_new_rule'                             => 'Store new rule',
-    'updated_rule'                               => 'Updated rule with title ":title"',
-    'default_rule_group_name'                    => 'Default rules',
-    'default_rule_group_description'             => 'All your rules not in a particular group.',
-    'default_rule_name'                          => 'Your first default rule',
-    'default_rule_description'                   => 'This rule is an example. You can safely delete it.',
-    'default_rule_trigger_description'           => 'The Man Who Sold the World',
-    'default_rule_trigger_from_account'          => 'David Bowie',
-    'default_rule_action_prepend'                => 'Bought the world from ',
+    'rules'                                      => '',
+    'rule_name'                                  => '',
+    'rule_triggers'                              => '',
+    'rule_actions'                               => '',
+    'new_rule'                                   => '',
+    'new_rule_group'                             => '',
+    'rule_priority_up'                           => '',
+    'rule_priority_down'                         => '',
+    'make_new_rule_group'                        => '',
+    'store_new_rule_group'                       => '',
+    'created_new_rule_group'                     => '',
+    'updated_rule_group'                         => '',
+    'edit_rule_group'                            => '',
+    'delete_rule_group'                          => '',
+    'deleted_rule_group'                         => '',
+    'update_rule_group'                          => '',
+    'no_rules_in_group'                          => '',
+    'move_rule_group_up'                         => '',
+    'move_rule_group_down'                       => '',
+    'save_rules_by_moving'                       => '',
+    'make_new_rule'                              => '',
+    'rule_help_stop_processing'                  => '',
+    'rule_help_active'                           => '',
+    'stored_new_rule'                            => '',
+    'deleted_rule'                               => '',
+    'store_new_rule'                             => '',
+    'updated_rule'                               => '',
+    'default_rule_group_name'                    => '',
+    'default_rule_group_description'             => '',
+    'default_rule_name'                          => '',
+    'default_rule_description'                   => '',
+    'default_rule_trigger_description'           => '',
+    'default_rule_trigger_from_account'          => '',
+    'default_rule_action_prepend'                => '',
     'default_rule_action_set_category'           => 'veliki izdatki',
-    'trigger'                                    => 'Trigger',
-    'trigger_value'                              => 'Trigger on value',
-    'stop_processing_other_triggers'             => 'Stop processing other triggers',
-    'add_rule_trigger'                           => 'Add new trigger',
-    'action'                                     => 'Action',
-    'action_value'                               => 'Action value',
-    'stop_executing_other_actions'               => 'Stop executing other actions',
-    'add_rule_action'                            => 'Add new action',
-    'edit_rule'                                  => 'Edit rule ":title"',
-    'delete_rule'                                => 'Delete rule ":title"',
-    'update_rule'                                => 'Update rule',
-    'test_rule_triggers'                         => 'See matching transactions',
-    'warning_transaction_subset'                 => 'For performance reasons this list is limited to :max_num_transactions and may only show a subset of matching transactions',
-    'warning_no_matching_transactions'           => 'No matching transactions found. Please note that for performance reasons, only the last :num_transactions transactions have been checked.',
-    'warning_no_valid_triggers'                  => 'No valid triggers provided.',
-    'apply_rule_selection'                       => 'Apply rule ":title" to a selection of your transactions',
-    'apply_rule_selection_intro'                 => 'Rules like ":title" are normally only applied to new or updated transactions, but you can tell Firefly III to run it on a selection of your existing transactions. This can be useful when you have updated a rule and you need the changes to be applied to all of your other transactions.',
-    'include_transactions_from_accounts'         => 'Include transactions from these accounts',
-    'applied_rule_selection'                     => 'Rule ":title" has been applied to your selection.',
-    'execute'                                    => 'Execute',
-    'apply_rule_group_selection'                 => 'Apply rule group ":title" to a selection of your transactions',
-    'apply_rule_group_selection_intro'           => 'Rule groups like ":title" are normally only applied to new or updated transactions, but you can tell Firefly III to run all the rules in this group on a selection of your existing transactions. This can be useful when you have updated a group of rules and you need the changes to be applied to all of your other transactions.',
-    'applied_rule_group_selection'               => 'Rule group ":title" has been applied to your selection.',
+    'trigger'                                    => '',
+    'trigger_value'                              => '',
+    'stop_processing_other_triggers'             => '',
+    'add_rule_trigger'                           => '',
+    'action'                                     => '',
+    'action_value'                               => '',
+    'stop_executing_other_actions'               => '',
+    'add_rule_action'                            => '',
+    'edit_rule'                                  => '',
+    'delete_rule'                                => '',
+    'update_rule'                                => '',
+    'test_rule_triggers'                         => '',
+    'warning_transaction_subset'                 => '',
+    'warning_no_matching_transactions'           => '',
+    'warning_no_valid_triggers'                  => '',
+    'apply_rule_selection'                       => '',
+    'apply_rule_selection_intro'                 => '',
+    'include_transactions_from_accounts'         => '',
+    'applied_rule_selection'                     => '',
+    'execute'                                    => '',
+    'apply_rule_group_selection'                 => '',
+    'apply_rule_group_selection_intro'           => '',
+    'applied_rule_group_selection'               => '',
 
     // actions and triggers
-    'rule_trigger_user_action'                   => 'User action is ":trigger_value"',
-    'rule_trigger_from_account_starts'           => 'Source account starts with ":trigger_value"',
-    'rule_trigger_from_account_ends'             => 'Source account ends with ":trigger_value"',
-    'rule_trigger_from_account_is'               => 'Source account is ":trigger_value"',
-    'rule_trigger_from_account_contains'         => 'Source account contains ":trigger_value"',
-    'rule_trigger_to_account_starts'             => 'Destination account starts with ":trigger_value"',
-    'rule_trigger_to_account_ends'               => 'Destination account ends with ":trigger_value"',
-    'rule_trigger_to_account_is'                 => 'Destination account is ":trigger_value"',
-    'rule_trigger_to_account_contains'           => 'Destination account contains ":trigger_value"',
-    'rule_trigger_transaction_type'              => 'Transaction is of type ":trigger_value"',
-    'rule_trigger_category_is'                   => 'Category is ":trigger_value"',
-    'rule_trigger_amount_less'                   => 'Amount is less than :trigger_value',
-    'rule_trigger_amount_exactly'                => 'Amount is :trigger_value',
-    'rule_trigger_amount_more'                   => 'Amount is more than :trigger_value',
-    'rule_trigger_description_starts'            => 'Description starts with ":trigger_value"',
-    'rule_trigger_description_ends'              => 'Description ends with ":trigger_value"',
-    'rule_trigger_description_contains'          => 'Description contains ":trigger_value"',
-    'rule_trigger_description_is'                => 'Description is ":trigger_value"',
-    'rule_trigger_from_account_starts_choice'    => 'Source account starts with..',
-    'rule_trigger_from_account_ends_choice'      => 'Source account ends with..',
-    'rule_trigger_from_account_is_choice'        => 'Source account is..',
-    'rule_trigger_from_account_contains_choice'  => 'Source account contains..',
-    'rule_trigger_to_account_starts_choice'      => 'Destination account starts with..',
-    'rule_trigger_to_account_ends_choice'        => 'Destination account ends with..',
-    'rule_trigger_to_account_is_choice'          => 'Destination account is..',
-    'rule_trigger_to_account_contains_choice'    => 'Destination account contains..',
-    'rule_trigger_transaction_type_choice'       => 'Transaction is of type..',
-    'rule_trigger_amount_less_choice'            => 'Amount is less than..',
-    'rule_trigger_amount_exactly_choice'         => 'Amount is..',
-    'rule_trigger_amount_more_choice'            => 'Amount is more than..',
-    'rule_trigger_description_starts_choice'     => 'Description starts with..',
-    'rule_trigger_description_ends_choice'       => 'Description ends with..',
-    'rule_trigger_description_contains_choice'   => 'Description contains..',
-    'rule_trigger_description_is_choice'         => 'Description is..',
-    'rule_trigger_category_is_choice'            => 'Category is..',
-    'rule_trigger_budget_is_choice'              => 'Budget is..',
-    'rule_trigger_tag_is_choice'                 => '(A) tag is..',
-    'rule_trigger_has_attachments_choice'        => 'Has at least this many attachments',
-    'rule_trigger_has_attachments'               => 'Has at least :trigger_value attachment(s)',
-    'rule_trigger_store_journal'                 => 'When a transaction is created',
-    'rule_trigger_update_journal'                => 'When a transaction is updated',
-    'rule_action_set_category'                   => 'Set category to ":action_value"',
-    'rule_action_clear_category'                 => 'Clear category',
-    'rule_action_set_budget'                     => 'Set budget to ":action_value"',
-    'rule_action_clear_budget'                   => 'Clear budget',
-    'rule_action_add_tag'                        => 'Add tag ":action_value"',
-    'rule_action_remove_tag'                     => 'Remove tag ":action_value"',
-    'rule_action_remove_all_tags'                => 'Remove all tags',
-    'rule_action_set_description'                => 'Set description to ":action_value"',
-    'rule_action_append_description'             => 'Append description with ":action_value"',
-    'rule_action_prepend_description'            => 'Prepend description with ":action_value"',
-    'rule_action_set_category_choice'            => 'Set category to..',
-    'rule_action_clear_category_choice'          => 'Clear any category',
-    'rule_action_set_budget_choice'              => 'Set budget to..',
-    'rule_action_clear_budget_choice'            => 'Clear any budget',
-    'rule_action_add_tag_choice'                 => 'Add tag..',
-    'rule_action_remove_tag_choice'              => 'Remove tag..',
-    'rule_action_remove_all_tags_choice'         => 'Remove all tags',
-    'rule_action_set_description_choice'         => 'Set description to..',
-    'rule_action_append_description_choice'      => 'Append description with..',
-    'rule_action_prepend_description_choice'     => 'Prepend description with..',
-    'rule_action_set_source_account_choice'      => 'Set source account to...',
-    'rule_action_set_source_account'             => 'Set source account to :action_value',
-    'rule_action_set_destination_account_choice' => 'Set destination account to...',
-    'rule_action_set_destination_account'        => 'Set destination account to :action_value',
+    'rule_trigger_user_action'                   => '',
+    'rule_trigger_from_account_starts'           => '',
+    'rule_trigger_from_account_ends'             => '',
+    'rule_trigger_from_account_is'               => '',
+    'rule_trigger_from_account_contains'         => '',
+    'rule_trigger_to_account_starts'             => '',
+    'rule_trigger_to_account_ends'               => '',
+    'rule_trigger_to_account_is'                 => '',
+    'rule_trigger_to_account_contains'           => '',
+    'rule_trigger_transaction_type'              => '',
+    'rule_trigger_category_is'                   => '',
+    'rule_trigger_amount_less'                   => '',
+    'rule_trigger_amount_exactly'                => '',
+    'rule_trigger_amount_more'                   => '',
+    'rule_trigger_description_starts'            => '',
+    'rule_trigger_description_ends'              => '',
+    'rule_trigger_description_contains'          => '',
+    'rule_trigger_description_is'                => '',
+    'rule_trigger_from_account_starts_choice'    => '',
+    'rule_trigger_from_account_ends_choice'      => '',
+    'rule_trigger_from_account_is_choice'        => '',
+    'rule_trigger_from_account_contains_choice'  => '',
+    'rule_trigger_to_account_starts_choice'      => '',
+    'rule_trigger_to_account_ends_choice'        => '',
+    'rule_trigger_to_account_is_choice'          => '',
+    'rule_trigger_to_account_contains_choice'    => '',
+    'rule_trigger_transaction_type_choice'       => '',
+    'rule_trigger_amount_less_choice'            => '',
+    'rule_trigger_amount_exactly_choice'         => '',
+    'rule_trigger_amount_more_choice'            => '',
+    'rule_trigger_description_starts_choice'     => '',
+    'rule_trigger_description_ends_choice'       => '',
+    'rule_trigger_description_contains_choice'   => '',
+    'rule_trigger_description_is_choice'         => '',
+    'rule_trigger_category_is_choice'            => '',
+    'rule_trigger_budget_is_choice'              => '',
+    'rule_trigger_tag_is_choice'                 => '',
+    'rule_trigger_has_attachments_choice'        => '',
+    'rule_trigger_has_attachments'               => '',
+    'rule_trigger_store_journal'                 => '',
+    'rule_trigger_update_journal'                => '',
+    'rule_action_set_category'                   => '',
+    'rule_action_clear_category'                 => '',
+    'rule_action_set_budget'                     => '',
+    'rule_action_clear_budget'                   => '',
+    'rule_action_add_tag'                        => '',
+    'rule_action_remove_tag'                     => '',
+    'rule_action_remove_all_tags'                => '',
+    'rule_action_set_description'                => '',
+    'rule_action_append_description'             => '',
+    'rule_action_prepend_description'            => '',
+    'rule_action_set_category_choice'            => '',
+    'rule_action_clear_category_choice'          => '',
+    'rule_action_set_budget_choice'              => '',
+    'rule_action_clear_budget_choice'            => '',
+    'rule_action_add_tag_choice'                 => '',
+    'rule_action_remove_tag_choice'              => '',
+    'rule_action_remove_all_tags_choice'         => '',
+    'rule_action_set_description_choice'         => '',
+    'rule_action_append_description_choice'      => '',
+    'rule_action_prepend_description_choice'     => '',
+    'rule_action_set_source_account_choice'      => '',
+    'rule_action_set_source_account'             => '',
+    'rule_action_set_destination_account_choice' => '',
+    'rule_action_set_destination_account'        => '',
 
     // tags
-    'store_new_tag'                              => 'Store new tag',
-    'update_tag'                                 => 'Update tag',
-    'no_location_set'                            => 'No location set.',
-    'meta_data'                                  => 'Meta data',
-    'location'                                   => 'Location',
+    'store_new_tag'                              => '',
+    'update_tag'                                 => '',
+    'no_location_set'                            => '',
+    'meta_data'                                  => '',
+    'location'                                   => '',
 
     // preferences
-    'pref_home_screen_accounts'                  => 'Home screen accounts',
-    'pref_home_screen_accounts_help'             => 'Which accounts should be displayed on the home page?',
-    'pref_view_range'                            => 'View range',
-    'pref_view_range_help'                       => 'Some charts are automatically grouped in periods. What period would you prefer?',
-    'pref_1D'                                    => 'One day',
-    'pref_1W'                                    => 'One week',
-    'pref_1M'                                    => 'One month',
-    'pref_3M'                                    => 'Three months (quarter)',
-    'pref_6M'                                    => 'Six months',
-    'pref_1Y'                                    => 'One year',
-    'pref_languages'                             => 'Languages',
-    'pref_languages_help'                        => 'Firefly III supports several languages. Which one do you prefer?',
-    'pref_custom_fiscal_year'                    => 'Fiscal year settings',
-    'pref_custom_fiscal_year_label'              => 'Enabled',
-    'pref_custom_fiscal_year_help'               => 'In countries that use a financial year other than January 1 to December 31, you can switch this on and specify start / end days of the fiscal year',
-    'pref_fiscal_year_start_label'               => 'Fiscal year start date',
-    'pref_two_factor_auth'                       => '2-step verification',
-    'pref_two_factor_auth_help'                  => 'When you enable 2-step verification (also known as two-factor authentication), you add an extra layer of security to your account. You sign in with something you know (your password) and something you have (a verification code). Verification codes are generated by an application on your phone, such as Authy or Google Authenticator.',
-    'pref_enable_two_factor_auth'                => 'Enable 2-step verification',
-    'pref_two_factor_auth_disabled'              => '2-step verification code removed and disabled',
-    'pref_two_factor_auth_remove_it'             => 'Don\'t forget to remove the account from your authentication app!',
-    'pref_two_factor_auth_code'                  => 'Verify code',
-    'pref_two_factor_auth_code_help'             => 'Scan the QR code with an application on your phone such as Authy or Google Authenticator and enter the generated code.',
-    'pref_two_factor_auth_reset_code'            => 'Reset verification code',
-    'pref_two_factor_auth_remove_code'           => 'Remove verification code',
-    'pref_two_factor_auth_remove_will_disable'   => '(this will also disable two-factor authentication)',
-    'pref_save_settings'                         => 'Save settings',
-    'saved_preferences'                          => 'Preferences saved!',
-    'preferences_general'                        => 'General',
-    'preferences_frontpage'                      => 'Home screen',
-    'preferences_security'                       => 'Security',
-    'preferences_layout'                         => 'Layout',
-    'pref_home_show_deposits'                    => 'Show deposits on the home screen',
+    'pref_home_screen_accounts'                  => '',
+    'pref_home_screen_accounts_help'             => '',
+    'pref_view_range'                            => '',
+    'pref_view_range_help'                       => '',
+    'pref_1D'                                    => '',
+    'pref_1W'                                    => '',
+    'pref_1M'                                    => '',
+    'pref_3M'                                    => '',
+    'pref_6M'                                    => '',
+    'pref_1Y'                                    => '',
+    'pref_languages'                             => '',
+    'pref_languages_help'                        => '',
+    'pref_custom_fiscal_year'                    => '',
+    'pref_custom_fiscal_year_label'              => '',
+    'pref_custom_fiscal_year_help'               => '',
+    'pref_fiscal_year_start_label'               => '',
+    'pref_two_factor_auth'                       => '',
+    'pref_two_factor_auth_help'                  => '',
+    'pref_enable_two_factor_auth'                => '',
+    'pref_two_factor_auth_disabled'              => '',
+    'pref_two_factor_auth_remove_it'             => '',
+    'pref_two_factor_auth_code'                  => '',
+    'pref_two_factor_auth_code_help'             => '',
+    'pref_two_factor_auth_reset_code'            => '',
+    'pref_two_factor_auth_remove_code'           => '',
+    'pref_two_factor_auth_remove_will_disable'   => '',
+    'pref_save_settings'                         => '',
+    'saved_preferences'                          => '',
+    'preferences_general'                        => '',
+    'preferences_frontpage'                      => '',
+    'preferences_security'                       => '',
+    'preferences_layout'                         => '',
+    'pref_home_show_deposits'                    => '',
     'pref_home_show_deposits_info'               => 'Prva stran že prikazuje vaše stroškovne konte. Ali naj tudi prikazuje prihodkovne konte?',
-    'pref_home_do_show_deposits'                 => 'Yes, show them',
-    'successful_count'                           => 'of which :count successful',
-    'transaction_page_size_title'                => 'Page size',
-    'transaction_page_size_help'                 => 'Any list of transactions shows at most this many transactions',
-    'transaction_page_size_label'                => 'Page size',
-    'between_dates'                              => '(:start and :end)',
-    'pref_optional_fields_transaction'           => 'Optional fields for transactions',
-    'pref_optional_fields_transaction_help'      => 'By default not all fields are enabled when creating a new transaction (because of the clutter). Below, you can enable these fields if you think they could be useful for you. Of course, any field that is disabled, but already filled in, will be visible regardless of the setting.',
-    'optional_tj_date_fields'                    => 'Date fields',
-    'optional_tj_business_fields'                => 'Business fields',
-    'optional_tj_attachment_fields'              => 'Attachment fields',
-    'pref_optional_tj_interest_date'             => 'Interest date',
-    'pref_optional_tj_book_date'                 => 'Book date',
-    'pref_optional_tj_process_date'              => 'Processing date',
-    'pref_optional_tj_due_date'                  => 'Due date',
-    'pref_optional_tj_payment_date'              => 'Payment date',
-    'pref_optional_tj_invoice_date'              => 'Invoice date',
-    'pref_optional_tj_internal_reference'        => 'Internal reference',
-    'pref_optional_tj_notes'                     => 'Notes',
-    'pref_optional_tj_attachments'               => 'Attachments',
-    'optional_field_meta_dates'                  => 'Dates',
-    'optional_field_meta_business'               => 'Business',
-    'optional_field_attachments'                 => 'Attachments',
-    'optional_field_meta_data'                   => 'Optional meta data',
+    'pref_home_do_show_deposits'                 => '',
+    'successful_count'                           => '',
+    'transaction_page_size_title'                => '',
+    'transaction_page_size_help'                 => '',
+    'transaction_page_size_label'                => '',
+    'between_dates'                              => '',
+    'pref_optional_fields_transaction'           => '',
+    'pref_optional_fields_transaction_help'      => '',
+    'optional_tj_date_fields'                    => '',
+    'optional_tj_business_fields'                => '',
+    'optional_tj_attachment_fields'              => '',
+    'pref_optional_tj_interest_date'             => '',
+    'pref_optional_tj_book_date'                 => '',
+    'pref_optional_tj_process_date'              => '',
+    'pref_optional_tj_due_date'                  => '',
+    'pref_optional_tj_payment_date'              => '',
+    'pref_optional_tj_invoice_date'              => '',
+    'pref_optional_tj_internal_reference'        => '',
+    'pref_optional_tj_notes'                     => '',
+    'pref_optional_tj_attachments'               => '',
+    'optional_field_meta_dates'                  => '',
+    'optional_field_meta_business'               => '',
+    'optional_field_attachments'                 => '',
+    'optional_field_meta_data'                   => '',
 
 
     // profile:
-    'change_your_password'                       => 'Change your password',
-    'delete_account'                             => 'Delete account',
-    'current_password'                           => 'Current password',
-    'new_password'                               => 'New password',
-    'new_password_again'                         => 'New password (again)',
-    'delete_your_account'                        => 'Delete your account',
-    'delete_your_account_help'                   => 'Deleting your account will also delete any accounts, transactions, <em>anything</em> you might have saved into Firefly III. It\'ll be GONE.',
-    'delete_your_account_password'               => 'Enter your password to continue.',
-    'password'                                   => 'Password',
-    'are_you_sure'                               => 'Are you sure? You cannot undo this.',
-    'delete_account_button'                      => 'DELETE your account',
-    'invalid_current_password'                   => 'Invalid current password!',
-    'password_changed'                           => 'Password changed!',
-    'should_change'                              => 'The idea is to change your password.',
-    'invalid_password'                           => 'Invalid password!',
-    'what_is_pw_security'                        => 'What is "verify password security"?',
-    'secure_pw_title'                            => 'How to choose a secure password',
-    'secure_pw_history'                          => 'In August 2017 well known security researcher Troy Hunt released a list of 306 million stolen passwords. These passwords were stolen during breakins at companies like LinkedIn, Adobe and NeoPets (and many more).',
-    'secure_pw_check_box'                        => 'By checking the box, Firefly III will send the SHA1 hash of your password to <a href="https://www.troyhunt.com/introducing-306-million-freely-downloadable-pwned-passwords/">the website of Troy Hunt</a> to see if it is on the list. This will stop you from using unsafe passwords as is recommended in the latest <a href="https://pages.nist.gov/800-63-3/sp800-63b.html">NIST Special Publication</a> on this subject.',
-    'secure_pw_sha1'                             => 'But I thought SHA1 was broken?',
-    'secure_pw_hash_speed'                       => 'Yes, but not in this context. As you can read on <a href="https://shattered.io/">the website detailing how they broke SHA1</a>, it is now slightly easier to find a "collision": another string that results in the same SHA1-hash. It now only takes 10,000 years using a single-GPU machine.',
-    'secure_pw_hash_security'                    => 'This collision would not be equal to your password, nor would it be useful on (a site like) Firefly III. This application does not use SHA1 for password verification. So it is safe to check this box. Your password is hashed and sent over HTTPS.',
-    'secure_pw_should'                           => 'Should I check the box?',
-    'secure_pw_long_password'                    => 'If you just generated a long, single-use password for Firefly III using some kind of password generator: <strong>no</strong>.',
-    'secure_pw_short'                            => 'If you just entered the password you always use: <em>Please yes</em>.',
+    'change_your_password'                       => '',
+    'delete_account'                             => '',
+    'current_password'                           => '',
+    'new_password'                               => '',
+    'new_password_again'                         => '',
+    'delete_your_account'                        => '',
+    'delete_your_account_help'                   => '',
+    'delete_your_account_password'               => '',
+    'password'                                   => '',
+    'are_you_sure'                               => '',
+    'delete_account_button'                      => '',
+    'invalid_current_password'                   => '',
+    'password_changed'                           => '',
+    'should_change'                              => '',
+    'invalid_password'                           => '',
+    'what_is_pw_security'                        => '',
+    'secure_pw_title'                            => '',
+    'secure_pw_history'                          => '',
+    'secure_pw_check_box'                        => '',
+    'secure_pw_sha1'                             => '',
+    'secure_pw_hash_speed'                       => '',
+    'secure_pw_hash_security'                    => '',
+    'secure_pw_should'                           => '',
+    'secure_pw_long_password'                    => '',
+    'secure_pw_short'                            => '',
 
 
     // attachments
-    'nr_of_attachments'                          => 'One attachment|:count attachments',
-    'attachments'                                => 'Attachments',
-    'edit_attachment'                            => 'Edit attachment ":name"',
-    'update_attachment'                          => 'Update attachment',
-    'delete_attachment'                          => 'Delete attachment ":name"',
-    'attachment_deleted'                         => 'Deleted attachment ":name"',
-    'attachment_updated'                         => 'Updated attachment ":name"',
-    'upload_max_file_size'                       => 'Maximum file size: :size',
+    'nr_of_attachments'                          => '',
+    'attachments'                                => '',
+    'edit_attachment'                            => '',
+    'update_attachment'                          => '',
+    'delete_attachment'                          => '',
+    'attachment_deleted'                         => '',
+    'attachment_updated'                         => '',
+    'upload_max_file_size'                       => '',
 
     // transaction index
     'title_expenses'                             => 'stroški',
     'title_withdrawal'                           => 'stroški',
-    'title_revenue'                              => 'Revenue / income',
-    'title_deposit'                              => 'Revenue / income',
-    'title_transfer'                             => 'Transfers',
-    'title_transfers'                            => 'Transfers',
+    'title_revenue'                              => '',
+    'title_deposit'                              => '',
+    'title_transfer'                             => '',
+    'title_transfers'                            => '',
 
     // convert stuff:
-    'convert_is_already_type_Withdrawal'         => 'This transaction is already a withdrawal',
-    'convert_is_already_type_Deposit'            => 'This transaction is already a deposit',
-    'convert_is_already_type_Transfer'           => 'This transaction is already a transfer',
-    'convert_to_Withdrawal'                      => 'Convert ":description" to a withdrawal',
-    'convert_to_Deposit'                         => 'Convert ":description" to a deposit',
-    'convert_to_Transfer'                        => 'Convert ":description" to a transfer',
-    'convert_options_WithdrawalDeposit'          => 'Convert a withdrawal into a deposit',
-    'convert_options_WithdrawalTransfer'         => 'Convert a withdrawal into a transfer',
-    'convert_options_DepositTransfer'            => 'Convert a deposit into a transfer',
-    'convert_options_DepositWithdrawal'          => 'Convert a deposit into a withdrawal',
-    'convert_options_TransferWithdrawal'         => 'Convert a transfer into a withdrawal',
-    'convert_options_TransferDeposit'            => 'Convert a transfer into a deposit',
-    'transaction_journal_convert_options'        => 'Convert this transaction',
-    'convert_Withdrawal_to_deposit'              => 'Convert this withdrawal to a deposit',
-    'convert_Withdrawal_to_transfer'             => 'Convert this withdrawal to a transfer',
-    'convert_Deposit_to_withdrawal'              => 'Convert this deposit to a withdrawal',
-    'convert_Deposit_to_transfer'                => 'Convert this deposit to a transfer',
-    'convert_Transfer_to_deposit'                => 'Convert this transfer to a deposit',
-    'convert_Transfer_to_withdrawal'             => 'Convert this transfer to a withdrawal',
-    'convert_please_set_revenue_source'          => 'Please pick the revenue account where the money will come from.',
+    'convert_is_already_type_Withdrawal'         => '',
+    'convert_is_already_type_Deposit'            => '',
+    'convert_is_already_type_Transfer'           => '',
+    'convert_to_Withdrawal'                      => '',
+    'convert_to_Deposit'                         => '',
+    'convert_to_Transfer'                        => '',
+    'convert_options_WithdrawalDeposit'          => '',
+    'convert_options_WithdrawalTransfer'         => '',
+    'convert_options_DepositTransfer'            => '',
+    'convert_options_DepositWithdrawal'          => '',
+    'convert_options_TransferWithdrawal'         => '',
+    'convert_options_TransferDeposit'            => '',
+    'transaction_journal_convert_options'        => '',
+    'convert_Withdrawal_to_deposit'              => '',
+    'convert_Withdrawal_to_transfer'             => '',
+    'convert_Deposit_to_withdrawal'              => '',
+    'convert_Deposit_to_transfer'                => '',
+    'convert_Transfer_to_deposit'                => '',
+    'convert_Transfer_to_withdrawal'             => '',
+    'convert_please_set_revenue_source'          => '',
     'convert_please_set_asset_destination'       => 'Izberite premoženjski račun na katerega boste prenesli denar.',
     'convert_please_set_expense_destination'     => 'Izberite na kateri stroškovni konto bo denar šel.',
     'convert_please_set_asset_source'            => 'Izberite premoženjski račun iz katerega boste prenesli denar.',
-    'convert_explanation_withdrawal_deposit'     => 'If you convert this withdrawal into a deposit, :amount will be deposited into <a href=":sourceRoute">:sourceName</a> instead of taken from it.',
+    'convert_explanation_withdrawal_deposit'     => '',
     'convert_explanation_withdrawal_transfer'    => 'Če pretvorite ta izdatek v prenos, bo znesek v vrednosti :amount prenesen iz <a href=":sourceRoute">:sourceName</a> na drug premoženjski račun, namesto da bi bil plačan na <a href=":destinationRoute">:destinationName</a>.',
-    'convert_explanation_deposit_withdrawal'     => 'If you convert this deposit into a withdrawal, :amount will be removed from <a href=":destinationRoute">:destinationName</a> instead of added to it.',
+    'convert_explanation_deposit_withdrawal'     => '',
     'convert_explanation_deposit_transfer'       => 'Če pretvorite ta prihodek v prenos, bo znesek v vrednosti :amount prenesen iz izbranega premoženjskega računa na račun <a href=":destinationRoute">:destinationName</a>.',
-    'convert_explanation_transfer_withdrawal'    => 'If you convert this transfer into a withdrawal, :amount will go from <a href=":sourceRoute">:sourceName</a> to a new destination as an expense, instead of to <a href=":destinationRoute">:destinationName</a> as a transfer.',
-    'convert_explanation_transfer_deposit'       => 'If you convert this transfer into a deposit, :amount will be deposited into account <a href=":destinationRoute">:destinationName</a> instead of being transferred there.',
-    'converted_to_Withdrawal'                    => 'The transaction has been converted to a withdrawal',
-    'converted_to_Deposit'                       => 'The transaction has been converted to a deposit',
-    'converted_to_Transfer'                      => 'The transaction has been converted to a transfer',
+    'convert_explanation_transfer_withdrawal'    => '',
+    'convert_explanation_transfer_deposit'       => '',
+    'converted_to_Withdrawal'                    => '',
+    'converted_to_Deposit'                       => '',
+    'converted_to_Transfer'                      => '',
 
 
     // create new stuff:
-    'create_new_withdrawal'                      => 'Create new withdrawal',
-    'create_new_deposit'                         => 'Create new deposit',
-    'create_new_transfer'                        => 'Create new transfer',
+    'create_new_withdrawal'                      => '',
+    'create_new_deposit'                         => '',
+    'create_new_transfer'                        => '',
     'create_new_asset'                           => 'ustvari nov premoženjski račun',
     'create_new_expense'                         => 'ustvari nov konto za stroške',
-    'create_new_revenue'                         => 'Create new revenue account',
-    'create_new_piggy_bank'                      => 'Create new piggy bank',
-    'create_new_bill'                            => 'Create new bill',
+    'create_new_revenue'                         => '',
+    'create_new_piggy_bank'                      => '',
+    'create_new_bill'                            => '',
 
     // currencies:
-    'create_currency'                            => 'Create a new currency',
-    'store_currency'                             => 'Store new currency',
-    'update_currency'                            => 'Update currency',
-    'new_default_currency'                       => ':name is now the default currency.',
-    'cannot_delete_currency'                     => 'Cannot delete :name because it is still in use.',
-    'deleted_currency'                           => 'Currency :name deleted',
-    'created_currency'                           => 'Currency :name created',
-    'updated_currency'                           => 'Currency :name updated',
-    'ask_site_owner'                             => 'Please ask :owner to add, remove or edit currencies.',
-    'currencies_intro'                           => 'Firefly III supports various currencies which you can set and enable here.',
-    'make_default_currency'                      => 'make default',
-    'default_currency'                           => 'default',
+    'create_currency'                            => '',
+    'store_currency'                             => '',
+    'update_currency'                            => '',
+    'new_default_currency'                       => '',
+    'cannot_delete_currency'                     => '',
+    'deleted_currency'                           => '',
+    'created_currency'                           => '',
+    'updated_currency'                           => '',
+    'ask_site_owner'                             => '',
+    'currencies_intro'                           => '',
+    'make_default_currency'                      => '',
+    'default_currency'                           => '',
 
     // forms:
-    'mandatoryFields'                            => 'Mandatory fields',
-    'optionalFields'                             => 'Optional fields',
-    'options'                                    => 'Options',
+    'mandatoryFields'                            => '',
+    'optionalFields'                             => '',
+    'options'                                    => '',
 
     // budgets:
-    'create_new_budget'                          => 'Create a new budget',
-    'store_new_budget'                           => 'Store new budget',
-    'stored_new_budget'                          => 'Stored new budget ":name"',
-    'available_between'                          => 'Available between :start and :end',
-    'transactionsWithoutBudget'                  => 'Expenses without budget',
-    'transactions_no_budget'                     => 'Expenses without budget between :start and :end',
-    'spent_between'                              => 'Spent between :start and :end',
-    'createBudget'                               => 'New budget',
-    'inactiveBudgets'                            => 'Inactive budgets',
-    'without_budget_between'                     => 'Transactions without a budget between :start and :end',
-    'delete_budget'                              => 'Delete budget ":name"',
-    'deleted_budget'                             => 'Deleted budget ":name"',
-    'edit_budget'                                => 'Edit budget ":name"',
-    'updated_budget'                             => 'Updated budget ":name"',
-    'update_amount'                              => 'Update amount',
-    'update_budget'                              => 'Update budget',
-    'update_budget_amount_range'                 => 'Update (expected) available amount between :start and :end',
-    'budget_period_navigator'                    => 'Period navigator',
+    'create_new_budget'                          => '',
+    'store_new_budget'                           => '',
+    'stored_new_budget'                          => '',
+    'available_between'                          => '',
+    'transactionsWithoutBudget'                  => '',
+    'transactions_no_budget'                     => '',
+    'spent_between'                              => '',
+    'createBudget'                               => '',
+    'inactiveBudgets'                            => '',
+    'without_budget_between'                     => '',
+    'delete_budget'                              => '',
+    'deleted_budget'                             => '',
+    'edit_budget'                                => '',
+    'updated_budget'                             => '',
+    'update_amount'                              => '',
+    'update_budget'                              => '',
+    'update_budget_amount_range'                 => '',
+    'budget_period_navigator'                    => '',
 
     // bills:
-    'matching_on'                                => 'Matching on',
-    'between_amounts'                            => 'between :low and :high.',
-    'repeats'                                    => 'Repeats',
-    'connected_journals'                         => 'Connected transactions',
-    'auto_match_on'                              => 'Automatically matched by Firefly',
-    'auto_match_off'                             => 'Not automatically matched by Firefly',
-    'next_expected_match'                        => 'Next expected match',
-    'delete_bill'                                => 'Delete bill ":name"',
-    'deleted_bill'                               => 'Deleted bill ":name"',
-    'edit_bill'                                  => 'Edit bill ":name"',
-    'more'                                       => 'More',
-    'rescan_old'                                 => 'Rescan old transactions',
-    'update_bill'                                => 'Update bill',
-    'updated_bill'                               => 'Updated bill ":name"',
-    'store_new_bill'                             => 'Store new bill',
-    'stored_new_bill'                            => 'Stored new bill ":name"',
-    'cannot_scan_inactive_bill'                  => 'Inactive bills cannot be scanned.',
-    'rescanned_bill'                             => 'Rescanned everything.',
-    'average_bill_amount_year'                   => 'Average bill amount (:year)',
-    'average_bill_amount_overall'                => 'Average bill amount (overall)',
-    'not_or_not_yet'                             => 'Not (yet)',
-    'not_expected_period'                        => 'Not expected this period',
-    'bill_is_active'                             => 'Bill is active',
-    'bill_will_automatch'                        => 'Bill will automatically linked to matching transactions',
+    'matching_on'                                => '',
+    'between_amounts'                            => '',
+    'repeats'                                    => '',
+    'connected_journals'                         => '',
+    'auto_match_on'                              => '',
+    'auto_match_off'                             => '',
+    'next_expected_match'                        => '',
+    'delete_bill'                                => '',
+    'deleted_bill'                               => '',
+    'edit_bill'                                  => '',
+    'more'                                       => '',
+    'rescan_old'                                 => '',
+    'update_bill'                                => '',
+    'updated_bill'                               => '',
+    'store_new_bill'                             => '',
+    'stored_new_bill'                            => '',
+    'cannot_scan_inactive_bill'                  => '',
+    'rescanned_bill'                             => '',
+    'average_bill_amount_year'                   => '',
+    'average_bill_amount_overall'                => '',
+    'not_or_not_yet'                             => '',
+    'not_expected_period'                        => '',
+    'bill_is_active'                             => '',
+    'bill_will_automatch'                        => '',
     // accounts:
     'details_for_asset'                          => 'podrobnosti za premoženjski račun ":name"',
     'details_for_expense'                        => 'podrobnosti stroškovnega konta ":name"',
-    'details_for_revenue'                        => 'Details for revenue account ":name"',
-    'details_for_cash'                           => 'Details for cash account ":name"',
+    'details_for_revenue'                        => '',
+    'details_for_cash'                           => '',
     'store_new_asset_account'                    => 'shrani nov premoženjski račun',
     'store_new_expense_account'                  => 'shrani nov konto za stroške',
-    'store_new_revenue_account'                  => 'Store new revenue account',
+    'store_new_revenue_account'                  => '',
     'edit_asset_account'                         => 'uredi premoženjski račun ":name"',
     'edit_expense_account'                       => 'uredi stroškovni konto ":name"',
-    'edit_revenue_account'                       => 'Edit revenue account ":name"',
+    'edit_revenue_account'                       => '',
     'delete_asset_account'                       => 'izbriši premoženjski račun ":name"',
     'delete_expense_account'                     => 'izbriši stroškovni konto ":name"',
-    'delete_revenue_account'                     => 'Delete revenue account ":name"',
+    'delete_revenue_account'                     => '',
     'asset_deleted'                              => 'Premoženjski račun ":name" je bil uspešno izbrisan.',
     'expense_deleted'                            => 'stroškovni konto ":name" je bil uspešno izbrisan',
-    'revenue_deleted'                            => 'Successfully deleted revenue account ":name"',
+    'revenue_deleted'                            => '',
     'update_asset_account'                       => 'posodobi premoženjski račun',
     'update_expense_account'                     => 'posodobi stroškovni konto',
-    'update_revenue_account'                     => 'Update revenue account',
+    'update_revenue_account'                     => '',
     'make_new_asset_account'                     => 'ustvari nov premoženjski račun',
     'make_new_expense_account'                   => 'ustvari nov konto za stroške',
-    'make_new_revenue_account'                   => 'Create a new revenue account',
+    'make_new_revenue_account'                   => '',
     'asset_accounts'                             => 'premoženjski računi',
     'expense_accounts'                           => 'konti za stroške',
-    'revenue_accounts'                           => 'Revenue accounts',
-    'cash_accounts'                              => 'Cash accounts',
-    'Cash account'                               => 'Cash account',
-    'account_type'                               => 'Account type',
-    'save_transactions_by_moving'                => 'Save these transaction(s) by moving them to another account:',
-    'stored_new_account'                         => 'New account ":name" stored!',
-    'updated_account'                            => 'Updated account ":name"',
-    'credit_card_options'                        => 'Credit card options',
+    'revenue_accounts'                           => '',
+    'cash_accounts'                              => '',
+    'Cash account'                               => '',
+    'account_type'                               => '',
+    'save_transactions_by_moving'                => '',
+    'stored_new_account'                         => '',
+    'updated_account'                            => '',
+    'credit_card_options'                        => '',
     'no_transactions_account'                    => 'Ni transakcij (za to obdobje) za premoženjski račun ":name".',
-    'no_data_for_chart'                          => 'There is not enough information (yet) to generate this chart.',
-    'select_more_than_one_account'               => 'Please select more than one account',
-    'select_more_than_one_category'              => 'Please select more than one category',
-    'select_more_than_one_budget'                => 'Please select more than one budget',
-    'select_more_than_one_tag'                   => 'Please select more than one tag',
-    'account_default_currency'                   => 'If you select another currency, new transactions from this account will have this currency pre-selected.',
+    'no_data_for_chart'                          => '',
+    'select_more_than_one_account'               => '',
+    'select_more_than_one_category'              => '',
+    'select_more_than_one_budget'                => '',
+    'select_more_than_one_tag'                   => '',
+    'account_default_currency'                   => '',
 
     // categories:
-    'new_category'                               => 'New category',
-    'create_new_category'                        => 'Create a new category',
-    'without_category'                           => 'Without a category',
-    'update_category'                            => 'Update category',
-    'updated_category'                           => 'Updated category ":name"',
-    'categories'                                 => 'Categories',
-    'edit_category'                              => 'Edit category ":name"',
-    'no_category'                                => '(no category)',
-    'category'                                   => 'Category',
-    'delete_category'                            => 'Delete category ":name"',
-    'deleted_category'                           => 'Deleted category ":name"',
-    'store_category'                             => 'Store new category',
-    'stored_category'                            => 'Stored new category ":name"',
-    'without_category_between'                   => 'Without category between :start and :end',
+    'new_category'                               => '',
+    'create_new_category'                        => '',
+    'without_category'                           => '',
+    'update_category'                            => '',
+    'updated_category'                           => '',
+    'categories'                                 => '',
+    'edit_category'                              => '',
+    'no_category'                                => '',
+    'category'                                   => '',
+    'delete_category'                            => '',
+    'deleted_category'                           => '',
+    'store_category'                             => '',
+    'stored_category'                            => '',
+    'without_category_between'                   => '',
 
     // transactions:
-    'update_withdrawal'                          => 'Update withdrawal',
-    'update_deposit'                             => 'Update deposit',
-    'update_transfer'                            => 'Update transfer',
-    'updated_withdrawal'                         => 'Updated withdrawal ":description"',
-    'updated_deposit'                            => 'Updated deposit ":description"',
-    'updated_transfer'                           => 'Updated transfer ":description"',
-    'delete_withdrawal'                          => 'Delete withdrawal ":description"',
-    'delete_deposit'                             => 'Delete deposit ":description"',
-    'delete_transfer'                            => 'Delete transfer ":description"',
-    'deleted_withdrawal'                         => 'Successfully deleted withdrawal ":description"',
-    'deleted_deposit'                            => 'Successfully deleted deposit ":description"',
-    'deleted_transfer'                           => 'Successfully deleted transfer ":description"',
-    'stored_journal'                             => 'Successfully created new transaction ":description"',
-    'select_transactions'                        => 'Select transactions',
-    'stop_selection'                             => 'Stop selecting transactions',
-    'edit_selected'                              => 'Edit selected',
-    'delete_selected'                            => 'Delete selected',
-    'mass_delete_journals'                       => 'Delete a number of transactions',
-    'mass_edit_journals'                         => 'Edit a number of transactions',
-    'cannot_edit_other_fields'                   => 'You cannot mass-edit other fields than the ones here, because there is no room to show them. Please follow the link and edit them by one-by-one, if you need to edit these fields.',
-    'perm-delete-many'                           => 'Deleting many items in one go can be very disruptive. Please be cautious.',
-    'mass_deleted_transactions_success'          => 'Deleted :amount transaction(s).',
-    'mass_edited_transactions_success'           => 'Updated :amount transaction(s)',
+    'update_withdrawal'                          => '',
+    'update_deposit'                             => '',
+    'update_transfer'                            => '',
+    'updated_withdrawal'                         => '',
+    'updated_deposit'                            => '',
+    'updated_transfer'                           => '',
+    'delete_withdrawal'                          => '',
+    'delete_deposit'                             => '',
+    'delete_transfer'                            => '',
+    'deleted_withdrawal'                         => '',
+    'deleted_deposit'                            => '',
+    'deleted_transfer'                           => '',
+    'stored_journal'                             => '',
+    'select_transactions'                        => '',
+    'stop_selection'                             => '',
+    'edit_selected'                              => '',
+    'delete_selected'                            => '',
+    'mass_delete_journals'                       => '',
+    'mass_edit_journals'                         => '',
+    'cannot_edit_other_fields'                   => '',
+    'perm-delete-many'                           => '',
+    'mass_deleted_transactions_success'          => '',
+    'mass_edited_transactions_success'           => '',
 
 
     // new user:
-    'welcome'                                    => 'Welcome to Firefly!',
-    'submit'                                     => 'Submit',
-    'getting_started'                            => 'Getting started',
-    'to_get_started'                             => 'It is good to see you have successfully installed Firefly III. To get started with this tool please enter your bank\'s name and the balance of your main checking account. Do not worry yet if you have multiple accounts. You can add those later. It\'s just that Firefly III needs something to start with.',
-    'savings_balance_text'                       => 'Firefly III will automatically create a savings account for you. By default, there will be no money in your savings account, but if you tell Firefly III the balance it will be stored as such.',
-    'finish_up_new_user'                         => 'That\'s it! You can continue by pressing <strong>Submit</strong>. You will be taken to the index of Firefly III.',
-    'stored_new_accounts_new_user'               => 'Yay! Your new accounts have been stored.',
+    'welcome'                                    => '',
+    'submit'                                     => '',
+    'getting_started'                            => '',
+    'to_get_started'                             => '',
+    'savings_balance_text'                       => '',
+    'finish_up_new_user'                         => '',
+    'stored_new_accounts_new_user'               => '',
 
     // home page:
-    'yourAccounts'                               => 'Your accounts',
-    'budgetsAndSpending'                         => 'Budgets and spending',
-    'savings'                                    => 'Savings',
-    'newWithdrawal'                              => 'New expense',
-    'newDeposit'                                 => 'New deposit',
-    'newTransfer'                                => 'New transfer',
-    'moneyIn'                                    => 'Money in',
-    'moneyOut'                                   => 'Money out',
-    'billsToPay'                                 => 'Bills to pay',
-    'billsPaid'                                  => 'Bills paid',
+    'yourAccounts'                               => '',
+    'budgetsAndSpending'                         => '',
+    'savings'                                    => '',
+    'newWithdrawal'                              => '',
+    'newDeposit'                                 => '',
+    'newTransfer'                                => '',
+    'moneyIn'                                    => '',
+    'moneyOut'                                   => '',
+    'billsToPay'                                 => '',
+    'billsPaid'                                  => '',
 
     // menu and titles, should be recycled as often as possible:
-    'currency'                                   => 'Currency',
-    'preferences'                                => 'Preferences',
-    'logout'                                     => 'Logout',
-    'searchPlaceholder'                          => 'Search...',
-    'dashboard'                                  => 'Dashboard',
-    'currencies'                                 => 'Currencies',
-    'accounts'                                   => 'Accounts',
+    'currency'                                   => '',
+    'preferences'                                => '',
+    'logout'                                     => '',
+    'searchPlaceholder'                          => '',
+    'dashboard'                                  => '',
+    'currencies'                                 => '',
+    'accounts'                                   => '',
     'Asset account'                              => 'premoženjski računi',
     'Default account'                            => 'premoženjski račun',
     'Expense account'                            => 'konto stroškov',
-    'Revenue account'                            => 'Revenue account',
-    'Initial balance account'                    => 'Initial balance account',
-    'budgets'                                    => 'Budgets',
-    'tags'                                       => 'Tags',
-    'reports'                                    => 'Reports',
-    'transactions'                               => 'Transactions',
+    'Revenue account'                            => '',
+    'Initial balance account'                    => '',
+    'budgets'                                    => '',
+    'tags'                                       => '',
+    'reports'                                    => '',
+    'transactions'                               => '',
     'expenses'                                   => 'stroški',
-    'income'                                     => 'Revenue / income',
-    'transfers'                                  => 'Transfers',
-    'moneyManagement'                            => 'Money management',
-    'piggyBanks'                                 => 'Piggy banks',
-    'bills'                                      => 'Bills',
-    'withdrawal'                                 => 'Withdrawal',
-    'deposit'                                    => 'Deposit',
-    'account'                                    => 'Account',
-    'transfer'                                   => 'Transfer',
-    'Withdrawal'                                 => 'Withdrawal',
-    'Deposit'                                    => 'Deposit',
-    'Transfer'                                   => 'Transfer',
-    'bill'                                       => 'Bill',
-    'yes'                                        => 'Yes',
-    'no'                                         => 'No',
-    'amount'                                     => 'Amount',
-    'overview'                                   => 'Overview',
-    'saveOnAccount'                              => 'Save on account',
-    'unknown'                                    => 'Unknown',
-    'daily'                                      => 'Daily',
-    'monthly'                                    => 'Monthly',
-    'profile'                                    => 'Profile',
-    'errors'                                     => 'Errors',
+    'income'                                     => '',
+    'transfers'                                  => '',
+    'moneyManagement'                            => '',
+    'piggyBanks'                                 => '',
+    'bills'                                      => '',
+    'withdrawal'                                 => '',
+    'deposit'                                    => '',
+    'account'                                    => '',
+    'transfer'                                   => '',
+    'Withdrawal'                                 => '',
+    'Deposit'                                    => '',
+    'Transfer'                                   => '',
+    'bill'                                       => '',
+    'yes'                                        => '',
+    'no'                                         => '',
+    'amount'                                     => '',
+    'overview'                                   => '',
+    'saveOnAccount'                              => '',
+    'unknown'                                    => '',
+    'daily'                                      => '',
+    'monthly'                                    => '',
+    'profile'                                    => '',
+    'errors'                                     => '',
 
     // reports:
-    'report_default'                             => 'Default financial report between :start and :end',
-    'report_audit'                               => 'Transaction history overview between :start and :end',
-    'report_category'                            => 'Category report between :start and :end',
-    'report_budget'                              => 'Budget report between :start and :end',
-    'report_tag'                                 => 'Tag report between :start and :end',
-    'quick_link_reports'                         => 'Quick links',
-    'quick_link_default_report'                  => 'Default financial report',
-    'quick_link_audit_report'                    => 'Transaction history overview',
-    'report_this_month_quick'                    => 'Current month, all accounts',
-    'report_this_year_quick'                     => 'Current year, all accounts',
-    'report_this_fiscal_year_quick'              => 'Current fiscal year, all accounts',
-    'report_all_time_quick'                      => 'All-time, all accounts',
-    'reports_can_bookmark'                       => 'Remember that reports can be bookmarked.',
+    'report_default'                             => '',
+    'report_audit'                               => '',
+    'report_category'                            => '',
+    'report_budget'                              => '',
+    'report_tag'                                 => '',
+    'quick_link_reports'                         => '',
+    'quick_link_default_report'                  => '',
+    'quick_link_audit_report'                    => '',
+    'report_this_month_quick'                    => '',
+    'report_this_year_quick'                     => '',
+    'report_this_fiscal_year_quick'              => '',
+    'report_all_time_quick'                      => '',
+    'reports_can_bookmark'                       => '',
     'incomeVsExpenses'                           => 'prihodki napram odhodkom',
-    'accountBalances'                            => 'Account balances',
-    'balanceStart'                               => 'Balance at start of period',
-    'balanceEnd'                                 => 'Balance at end of period',
-    'splitByAccount'                             => 'Split by account',
-    'coveredWithTags'                            => 'Covered with tags',
-    'leftUnbalanced'                             => 'Left unbalanced',
-    'leftInBudget'                               => 'Left in budget',
-    'sumOfSums'                                  => 'Sum of sums',
-    'noCategory'                                 => '(no category)',
-    'notCharged'                                 => 'Not charged (yet)',
-    'inactive'                                   => 'Inactive',
-    'active'                                     => 'Active',
-    'difference'                                 => 'Difference',
-    'in'                                         => 'In',
-    'out'                                        => 'Out',
-    'topX'                                       => 'top :number',
-    'show_full_list'                             => 'Show entire list',
-    'show_only_top'                              => 'Show only top :number',
-    'report_type'                                => 'Report type',
-    'report_type_default'                        => 'Default financial report',
-    'report_type_audit'                          => 'Transaction history overview (audit)',
-    'report_type_category'                       => 'Category report',
-    'report_type_budget'                         => 'Budget report',
-    'report_type_tag'                            => 'Tag report',
-    'more_info_help'                             => 'More information about these types of reports can be found in the help pages. Press the (?) icon in the top right corner.',
-    'report_included_accounts'                   => 'Included accounts',
-    'report_date_range'                          => 'Date range',
-    'report_preset_ranges'                       => 'Pre-set ranges',
-    'shared'                                     => 'Shared',
-    'fiscal_year'                                => 'Fiscal year',
-    'income_entry'                               => 'Income from account ":name" between :start and :end',
+    'accountBalances'                            => '',
+    'balanceStart'                               => '',
+    'balanceEnd'                                 => '',
+    'splitByAccount'                             => '',
+    'coveredWithTags'                            => '',
+    'leftUnbalanced'                             => '',
+    'leftInBudget'                               => '',
+    'sumOfSums'                                  => '',
+    'noCategory'                                 => '',
+    'notCharged'                                 => '',
+    'inactive'                                   => '',
+    'active'                                     => '',
+    'difference'                                 => '',
+    'in'                                         => '',
+    'out'                                        => '',
+    'topX'                                       => '',
+    'show_full_list'                             => '',
+    'show_only_top'                              => '',
+    'report_type'                                => '',
+    'report_type_default'                        => '',
+    'report_type_audit'                          => '',
+    'report_type_category'                       => '',
+    'report_type_budget'                         => '',
+    'report_type_tag'                            => '',
+    'more_info_help'                             => '',
+    'report_included_accounts'                   => '',
+    'report_date_range'                          => '',
+    'report_preset_ranges'                       => '',
+    'shared'                                     => '',
+    'fiscal_year'                                => '',
+    'income_entry'                               => '',
     'expense_entry'                              => 'stroški na kontu ":name" med :start in :end',
-    'category_entry'                             => 'Expenses in category ":name" between :start and :end',
-    'budget_spent_amount'                        => 'Expenses in budget ":budget" between :start and :end',
-    'balance_amount'                             => 'Expenses in budget ":budget" paid from account ":account" between :start and :end',
-    'no_audit_activity'                          => 'No activity was recorded on account <a href=":url" title=":account_name">:account_name</a> between :start and :end.',
-    'audit_end_balance'                          => 'Account balance of <a href=":url" title=":account_name">:account_name</a> at the end of :end was: :balance',
-    'reports_extra_options'                      => 'Extra options',
-    'report_has_no_extra_options'                => 'This report has no extra options',
-    'reports_submit'                             => 'View report',
-    'end_after_start_date'                       => 'End date of report must be after start date.',
-    'select_category'                            => 'Select category(ies)',
-    'select_budget'                              => 'Select budget(s).',
-    'select_tag'                                 => 'Select tag(s).',
-    'income_per_category'                        => 'Income per category',
+    'category_entry'                             => '',
+    'budget_spent_amount'                        => '',
+    'balance_amount'                             => '',
+    'no_audit_activity'                          => '',
+    'audit_end_balance'                          => '',
+    'reports_extra_options'                      => '',
+    'report_has_no_extra_options'                => '',
+    'reports_submit'                             => '',
+    'end_after_start_date'                       => '',
+    'select_category'                            => '',
+    'select_budget'                              => '',
+    'select_tag'                                 => '',
+    'income_per_category'                        => '',
     'expense_per_category'                       => 'stroški po kategorijah',
     'expense_per_budget'                         => 'stroški po budžetih',
-    'income_per_account'                         => 'Income per account',
+    'income_per_account'                         => '',
     'expense_per_account'                        => 'stroški po kontih',
     'expense_per_tag'                            => 'stroški po značkah',
-    'income_per_tag'                             => 'Income per tag',
-    'include_expense_not_in_budget'              => 'Included expenses not in the selected budget(s)',
-    'include_expense_not_in_account'             => 'Included expenses not in the selected account(s)',
-    'include_expense_not_in_category'            => 'Included expenses not in the selected category(ies)',
-    'include_income_not_in_category'             => 'Included income not in the selected category(ies)',
-    'include_income_not_in_account'              => 'Included income not in the selected account(s)',
-    'include_income_not_in_tags'                 => 'Included income not in the selected tag(s)',
-    'include_expense_not_in_tags'                => 'Included expenses not in the selected tag(s)',
-    'everything_else'                            => 'Everything else',
+    'income_per_tag'                             => '',
+    'include_expense_not_in_budget'              => '',
+    'include_expense_not_in_account'             => '',
+    'include_expense_not_in_category'            => '',
+    'include_income_not_in_category'             => '',
+    'include_income_not_in_account'              => '',
+    'include_income_not_in_tags'                 => '',
+    'include_expense_not_in_tags'                => '',
+    'everything_else'                            => '',
     'income_and_expenses'                        => 'prihodki in odhodki',
-    'spent_average'                              => 'Spent (average)',
-    'income_average'                             => 'Income (average)',
-    'transaction_count'                          => 'Transaction count',
-    'average_spending_per_account'               => 'Average spending per account',
-    'average_income_per_account'                 => 'Average income per account',
-    'total'                                      => 'Total',
-    'description'                                => 'Description',
-    'sum_of_period'                              => 'Sum of period',
-    'average_in_period'                          => 'Average in period',
+    'spent_average'                              => '',
+    'income_average'                             => '',
+    'transaction_count'                          => '',
+    'average_spending_per_account'               => '',
+    'average_income_per_account'                 => '',
+    'total'                                      => '',
+    'description'                                => '',
+    'sum_of_period'                              => '',
+    'average_in_period'                          => '',
     'account_role_defaultAsset'                  => 'privzeti premoženjski račun',
     'account_role_sharedAsset'                   => 'deljen premoženjski račun',
     'account_role_savingAsset'                   => 'varčevalni račun',
     'account_role_ccAsset'                       => 'kreditna kartica',
 
     // charts:
-    'chart'                                      => 'Chart',
-    'month'                                      => 'Month',
-    'budget'                                     => 'Budget',
-    'spent'                                      => 'Spent',
-    'spent_in_budget'                            => 'Spent in budget',
-    'left_to_spend'                              => 'Left to spend',
-    'earned'                                     => 'Earned',
-    'overspent'                                  => 'Overspent',
-    'left'                                       => 'Left',
-    'no_budget'                                  => '(no budget)',
-    'max-amount'                                 => 'Maximum amount',
-    'min-amount'                                 => 'Minumum amount',
-    'journal-amount'                             => 'Current bill entry',
-    'name'                                       => 'Name',
-    'date'                                       => 'Date',
-    'paid'                                       => 'Paid',
-    'unpaid'                                     => 'Unpaid',
-    'day'                                        => 'Day',
-    'budgeted'                                   => 'Budgeted',
-    'period'                                     => 'Period',
-    'balance'                                    => 'Balance',
-    'sum'                                        => 'Sum',
-    'average'                                    => 'Average',
-    'balanceFor'                                 => 'Balance for :name',
+    'chart'                                      => '',
+    'month'                                      => '',
+    'budget'                                     => '',
+    'spent'                                      => '',
+    'spent_in_budget'                            => '',
+    'left_to_spend'                              => '',
+    'earned'                                     => '',
+    'overspent'                                  => '',
+    'left'                                       => '',
+    'no_budget'                                  => '',
+    'max-amount'                                 => '',
+    'min-amount'                                 => '',
+    'journal-amount'                             => '',
+    'name'                                       => '',
+    'date'                                       => '',
+    'paid'                                       => '',
+    'unpaid'                                     => '',
+    'day'                                        => '',
+    'budgeted'                                   => '',
+    'period'                                     => '',
+    'balance'                                    => '',
+    'sum'                                        => '',
+    'average'                                    => '',
+    'balanceFor'                                 => '',
 
     // piggy banks:
-    'add_money_to_piggy'                         => 'Add money to piggy bank ":name"',
-    'piggy_bank'                                 => 'Piggy bank',
-    'new_piggy_bank'                             => 'New piggy bank',
-    'store_piggy_bank'                           => 'Store new piggy bank',
-    'stored_piggy_bank'                          => 'Store new piggy bank ":name"',
-    'account_status'                             => 'Account status',
-    'left_for_piggy_banks'                       => 'Left for piggy banks',
-    'sum_of_piggy_banks'                         => 'Sum of piggy banks',
-    'saved_so_far'                               => 'Saved so far',
-    'left_to_save'                               => 'Left to save',
-    'suggested_amount'                           => 'Suggested monthly amount to save',
-    'add_money_to_piggy_title'                   => 'Add money to piggy bank ":name"',
-    'remove_money_from_piggy_title'              => 'Remove money from piggy bank ":name"',
-    'add'                                        => 'Add',
+    'add_money_to_piggy'                         => '',
+    'piggy_bank'                                 => '',
+    'new_piggy_bank'                             => '',
+    'store_piggy_bank'                           => '',
+    'stored_piggy_bank'                          => '',
+    'account_status'                             => '',
+    'left_for_piggy_banks'                       => '',
+    'sum_of_piggy_banks'                         => '',
+    'saved_so_far'                               => '',
+    'left_to_save'                               => '',
+    'suggested_amount'                           => '',
+    'add_money_to_piggy_title'                   => '',
+    'remove_money_from_piggy_title'              => '',
+    'add'                                        => '',
 
-    'remove'                     => 'Remove',
-    'max_amount_add'             => 'The maximum amount you can add is',
-    'max_amount_remove'          => 'The maximum amount you can remove is',
-    'update_piggy_button'        => 'Update piggy bank',
-    'update_piggy_title'         => 'Update piggy bank ":name"',
-    'updated_piggy_bank'         => 'Updated piggy bank ":name"',
-    'details'                    => 'Details',
-    'events'                     => 'Events',
-    'target_amount'              => 'Target amount',
-    'start_date'                 => 'Start date',
-    'target_date'                => 'Target date',
-    'no_target_date'             => 'No target date',
-    'table'                      => 'Table',
-    'delete_piggy_bank'          => 'Delete piggy bank ":name"',
-    'cannot_add_amount_piggy'    => 'Could not add :amount to ":name".',
-    'cannot_remove_from_piggy'   => 'Could not remove :amount from ":name".',
-    'deleted_piggy_bank'         => 'Deleted piggy bank ":name"',
-    'added_amount_to_piggy'      => 'Added :amount to ":name"',
-    'removed_amount_from_piggy'  => 'Removed :amount from ":name"',
+    'remove'                     => '',
+    'max_amount_add'             => '',
+    'max_amount_remove'          => '',
+    'update_piggy_button'        => '',
+    'update_piggy_title'         => '',
+    'updated_piggy_bank'         => '',
+    'details'                    => '',
+    'events'                     => '',
+    'target_amount'              => '',
+    'start_date'                 => '',
+    'target_date'                => '',
+    'no_target_date'             => '',
+    'table'                      => '',
+    'delete_piggy_bank'          => '',
+    'cannot_add_amount_piggy'    => '',
+    'cannot_remove_from_piggy'   => '',
+    'deleted_piggy_bank'         => '',
+    'added_amount_to_piggy'      => '',
+    'removed_amount_from_piggy'  => '',
 
     // tags
-    'regular_tag'                => 'Just a regular tag.',
-    'balancing_act'              => 'The tag takes at most two transactions; an expense and a transfer. They\'ll balance each other out.',
-    'advance_payment'            => 'The tag accepts one expense and any number of deposits aimed to repay the original expense.',
-    'delete_tag'                 => 'Delete tag ":tag"',
-    'deleted_tag'                => 'Deleted tag ":tag"',
-    'new_tag'                    => 'Make new tag',
-    'edit_tag'                   => 'Edit tag ":tag"',
-    'updated_tag'                => 'Updated tag ":tag"',
-    'created_tag'                => 'Tag ":tag" has been created!',
+    'regular_tag'                => '',
+    'balancing_act'              => '',
+    'advance_payment'            => '',
+    'delete_tag'                 => '',
+    'deleted_tag'                => '',
+    'new_tag'                    => '',
+    'edit_tag'                   => '',
+    'updated_tag'                => '',
+    'created_tag'                => '',
 
-    'transaction_journal_information'       => 'Transaction information',
-    'transaction_journal_meta'              => 'Meta information',
-    'total_amount'                          => 'Total amount',
-    'number_of_decimals'                    => 'Number of decimals',
+    'transaction_journal_information'       => '',
+    'transaction_journal_meta'              => '',
+    'total_amount'                          => '',
+    'number_of_decimals'                    => '',
 
     // administration
-    'administration'                        => 'Administration',
-    'user_administration'                   => 'User administration',
-    'list_all_users'                        => 'All users',
-    'all_users'                             => 'All users',
-    'instance_configuration'                => 'Configuration',
-    'firefly_instance_configuration'        => 'Configuration options for Firefly III',
-    'setting_single_user_mode'              => 'Single user mode',
-    'setting_single_user_mode_explain'      => 'By default, Firefly III only accepts one (1) registration: you. This is a security measure, preventing others from using your instance unless you allow them to. Future registrations are blocked. When you uncheck this box, others can use your instance as wel, assuming they can reach it (when it is connected to the internet).',
-    'store_configuration'                   => 'Store configuration',
-    'single_user_administration'            => 'User administration for :email',
-    'edit_user'                             => 'Edit user :email',
-    'hidden_fields_preferences'             => 'Not all fields are visible right now. You must enable them in your <a href=":link">settings</a>.',
-    'user_data_information'                 => 'User data',
-    'user_information'                      => 'User information',
-    'total_size'                            => 'total size',
-    'budget_or_budgets'                     => 'budget(s)',
-    'budgets_with_limits'                   => 'budget(s) with configured amount',
-    'rule_or_rules'                         => 'rule(s)',
-    'rulegroup_or_groups'                   => 'rule group(s)',
-    'configuration_updated'                 => 'The configuration has been updated',
-    'setting_is_demo_site'                  => 'Demo site',
-    'setting_is_demo_site_explain'          => 'If you check this box, this installation will behave as if it is the demo site, which can have weird side effects.',
-    'block_code_bounced'                    => 'Email message(s) bounced',
-    'block_code_expired'                    => 'Demo account expired',
-    'no_block_code'                         => 'No reason for block or user not blocked',
+    'administration'                        => '',
+    'user_administration'                   => '',
+    'list_all_users'                        => '',
+    'all_users'                             => '',
+    'instance_configuration'                => '',
+    'firefly_instance_configuration'        => '',
+    'setting_single_user_mode'              => '',
+    'setting_single_user_mode_explain'      => '',
+    'store_configuration'                   => '',
+    'single_user_administration'            => '',
+    'edit_user'                             => '',
+    'hidden_fields_preferences'             => '',
+    'user_data_information'                 => '',
+    'user_information'                      => '',
+    'total_size'                            => '',
+    'budget_or_budgets'                     => '',
+    'budgets_with_limits'                   => '',
+    'rule_or_rules'                         => '',
+    'rulegroup_or_groups'                   => '',
+    'configuration_updated'                 => '',
+    'setting_is_demo_site'                  => '',
+    'setting_is_demo_site_explain'          => '',
+    'block_code_bounced'                    => '',
+    'block_code_expired'                    => '',
+    'no_block_code'                         => '',
     // links
-    'journal_link_configuration'            => 'Transaction links configuration',
-    'create_new_link_type'                  => 'Create new link type',
-    'store_new_link_type'                   => 'Store new link type',
-    'update_link_type'                      => 'Update link type',
-    'edit_link_type'                        => 'Edit link type ":name"',
-    'updated_link_type'                     => 'Updated link type ":name"',
-    'delete_link_type'                      => 'Delete link type ":name"',
-    'deleted_link_type'                     => 'Deleted link type ":name"',
-    'stored_new_link_type'                  => 'Store new link type ":name"',
-    'cannot_edit_link_type'                 => 'Cannot edit link type ":name"',
-    'link_type_help_name'                   => 'Ie. "Duplicates"',
-    'link_type_help_inward'                 => 'Ie. "duplicates"',
-    'link_type_help_outward'                => 'Ie. "is duplicated by"',
-    'save_connections_by_moving'            => 'Save the link between these transaction(s) by moving them to another link type:',
-    'do_not_save_connection'                => '(do not save connection)',
-    'link_transaction'                      => 'Link transaction',
-    'link_to_other_transaction'             => 'Link this transaction to another transaction',
-    'select_transaction_to_link'            => 'Select a transaction to link this transaction to',
-    'this_transaction'                      => 'This transaction',
-    'transaction'                           => 'Transaction',
-    'comments'                              => 'Comments',
-    'to_link_not_found'                     => 'If the transaction you want to link to is not listed, simply enter its ID.',
-    'invalid_link_data'                     => 'Invalid link type selected. Cannot link transaction.',
-    'journals_linked'                       => 'Transactions are linked.',
-    'journals_error_linked'                 => 'These transactions are already linked.',
-    'journal_links'                         => 'Transaction links',
-    'this_withdrawal'                       => 'This withdrawal',
-    'this_deposit'                          => 'This deposit',
-    'this_transfer'                         => 'This transfer',
-    'overview_for_link'                     => 'Overview for link type ":name"',
-    'delete_journal_link'                   => 'Delete the link between <a href=":source_link">:source</a> and <a href=":destination_link">:destination</a>',
-    'deleted_link'                          => 'Deleted link',
+    'journal_link_configuration'            => '',
+    'create_new_link_type'                  => '',
+    'store_new_link_type'                   => '',
+    'update_link_type'                      => '',
+    'edit_link_type'                        => '',
+    'updated_link_type'                     => '',
+    'delete_link_type'                      => '',
+    'deleted_link_type'                     => '',
+    'stored_new_link_type'                  => '',
+    'cannot_edit_link_type'                 => '',
+    'link_type_help_name'                   => '',
+    'link_type_help_inward'                 => '',
+    'link_type_help_outward'                => '',
+    'save_connections_by_moving'            => '',
+    'do_not_save_connection'                => '',
+    'link_transaction'                      => '',
+    'link_to_other_transaction'             => '',
+    'select_transaction_to_link'            => '',
+    'this_transaction'                      => '',
+    'transaction'                           => '',
+    'comments'                              => '',
+    'to_link_not_found'                     => '',
+    'invalid_link_data'                     => '',
+    'journals_linked'                       => '',
+    'journals_error_linked'                 => '',
+    'journal_links'                         => '',
+    'this_withdrawal'                       => '',
+    'this_deposit'                          => '',
+    'this_transfer'                         => '',
+    'overview_for_link'                     => '',
+    'delete_journal_link'                   => '',
+    'deleted_link'                          => '',
 
 
     // split a transaction:
-    'splits'                                => 'Splits',
-    'add_another_split'                     => 'Add another split',
-    'split-transactions'                    => 'Split transactions',
-    'do_split'                              => 'Do a split',
-    'split_this_withdrawal'                 => 'Split this withdrawal',
-    'split_this_deposit'                    => 'Split this deposit',
-    'split_this_transfer'                   => 'Split this transfer',
-    'cannot_edit_multiple_source'           => 'You cannot edit splitted transaction #:id with description ":description" because it contains multiple source accounts.',
-    'cannot_edit_multiple_dest'             => 'You cannot edit splitted transaction #:id with description ":description" because it contains multiple destination accounts.',
-    'cannot_edit_opening_balance'           => 'You cannot edit the opening balance of an account.',
-    'no_edit_multiple_left'                 => 'You have selected no valid transactions to edit.',
+    'splits'                                => '',
+    'add_another_split'                     => '',
+    'split-transactions'                    => '',
+    'do_split'                              => '',
+    'split_this_withdrawal'                 => '',
+    'split_this_deposit'                    => '',
+    'split_this_transfer'                   => '',
+    'cannot_edit_multiple_source'           => '',
+    'cannot_edit_multiple_dest'             => '',
+    'cannot_edit_opening_balance'           => '',
+    'no_edit_multiple_left'                 => '',
 
     // import bread crumbs and titles:
-    'import'                                => 'Import',
-    'import_data'                           => 'Import data',
+    'import'                                => '',
+    'import_data'                           => '',
 
     // import index page:
-    'import_index_title'                    => 'Import data into Firefly III',
-    'import_index_sub_title'                => 'Index',
-    'import_general_index_intro'            => 'Welcome to Firefly\'s import routine. There are a few ways of importing data into Firefly III, displayed here as buttons.',
-    'import_index_intro'                    => 'This routine will help you import files from your bank into Firefly III. Please check out the help pages in the top right corner.',
-    'import_index_file'                     => 'Select your file',
-    'import_index_config'                   => 'If you have previously imported data into Firefly III, you may have a configuration file, which will pre-set configuration values for you. For some banks, other users have kindly provided their <a href="https://github.com/firefly-iii/import-configurations/wiki">configuration file</a>.',
-    'import_index_type'                     => 'Select the type of file you will upload',
-    'import_index_start'                    => 'Start importing',
+    'import_index_title'                    => '',
+    'import_index_sub_title'                => '',
+    'import_general_index_intro'            => '',
+    'import_index_intro'                    => '',
+    'import_index_file'                     => '',
+    'import_index_config'                   => '',
+    'import_index_type'                     => '',
+    'import_index_start'                    => '',
 
     // supported file types:
-    'import_file_type_csv'                  => 'CSV (comma separated values)',
+    'import_file_type_csv'                  => '',
 
     // import configuration routine:
-    'import_config_sub_title'               => 'Set up your import file',
-    'import_config_bread_crumb'             => 'Set up your import file',
+    'import_config_sub_title'               => '',
+    'import_config_bread_crumb'             => '',
 
     // import status page:
-    'import_status_bread_crumb'             => 'Import status',
-    'import_status_sub_title'               => 'Import status',
-    'import_status_wait_title'              => 'Please hold...',
-    'import_status_wait_text'               => 'This box will disappear in a moment.',
-    'import_status_ready_title'             => 'Import is ready to start',
-    'import_status_ready_text'              => 'The import is ready to start. All the configuration you needed to do has been done. Please download the configuration file. It will help you with the import should it not go as planned. To actually run the import, you can either execute the following command in your console, or run the web-based import. Depending on your configuration, the console import will give you more feedback.',
-    'import_status_ready_config'            => 'Download configuration',
-    'import_status_ready_start'             => 'Start the import',
-    'import_status_ready_share'             => 'Please consider downloading your configuration and sharing it at the <strong><a href="https://github.com/firefly-iii/import-configurations/wiki">import configuration center</a></strong>. This will allow other users of Firefly III to import their files more easily.',
-    'import_status_running_title'           => 'The import is running',
-    'import_status_running_placeholder'     => 'Please hold for an update...',
-    'import_status_errors_title'            => 'Errors during the import',
-    'import_status_errors_single'           => 'An error has occured during the import. It does not appear to be fatal.',
-    'import_status_errors_multi'            => 'Some errors occured during the import. These do not appear to be fatal.',
-    'import_status_fatal_title'             => 'A fatal error occurred',
-    'import_status_fatal_text'              => 'A fatal error occurred, which the import-routine cannot recover from. Please see the explanation in red below.',
-    'import_status_fatal_more'              => 'If the error is a time-out, the import will have stopped half-way. For some server configurations, it is merely the server that stopped while the import keeps running in the background. To verify this, check out the log files. If the problem persists, consider importing over the command line instead.',
-    'import_status_finished_title'          => 'Import routine finished',
-    'import_status_finished_text'           => 'The import routine has imported your file.',
-    'import_status_finished_job'            => 'The transactions imported can be found in tag <a href=":link" class="label label-success" style="font-size:100%;font-weight:normal;">:tag</a>.',
-    'import_with_key'                       => 'Import with key \':key\'',
+    'import_status_bread_crumb'             => '',
+    'import_status_sub_title'               => '',
+    'import_status_wait_title'              => '',
+    'import_status_wait_text'               => '',
+    'import_status_ready_title'             => '',
+    'import_status_ready_text'              => '',
+    'import_status_ready_config'            => '',
+    'import_status_ready_start'             => '',
+    'import_status_ready_share'             => '',
+    'import_status_running_title'           => '',
+    'import_status_running_placeholder'     => '',
+    'import_status_errors_title'            => '',
+    'import_status_errors_single'           => '',
+    'import_status_errors_multi'            => '',
+    'import_status_fatal_title'             => '',
+    'import_status_fatal_text'              => '',
+    'import_status_fatal_more'              => '',
+    'import_status_finished_title'          => '',
+    'import_status_finished_text'           => '',
+    'import_status_finished_job'            => '',
+    'import_with_key'                       => '',
 
     // sandstorm.io errors and messages:
-    'sandstorm_not_available'               => 'This function is not available when you are using Firefly III within a Sandstorm.io environment.',
+    'sandstorm_not_available'               => '',
 
     // empty lists? no objects? instructions:
-    'no_transactions_in_period'             => 'There are no transactions in this period.',
+    'no_transactions_in_period'             => '',
     'no_accounts_title_asset'               => 'Ustvarite premoženjski račun!',
     'no_accounts_intro_asset'               => 'Še nobenega premoženjskega računa nimate. Premoženjski računi so vaši glavni računi sredstev: tekoči računi, skupni računi, varčevalni računi in celo računi kreditnih kartic.',
     'no_accounts_imperative_asset'          => 'Da začnete uporabljati Firefly III, morate ustvariti vsaj en premoženjski račun:',
@@ -971,42 +971,42 @@ return [
     'no_accounts_intro_expense'             => 'Nimate še nobenega konta za stroške. Stroškovni konti so konti kamor knjižite denar, ki ste ga zapravili kot npr. trgovine in supermarketi.',
     'no_accounts_imperative_expense'        => 'Stroškovni konti se ustvarijo avtomatično ko ustvarite transakcije, lahko pa jih ustvarite tudi na roke, če želite:',
     'no_accounts_create_expense'            => 'ustvari konto za stroške',
-    'no_accounts_title_revenue'             => 'Let\'s create a revenue account!',
-    'no_accounts_intro_revenue'             => 'You have no revenue accounts yet. Revenue accounts are the places where you receive money from, such as your employer.',
-    'no_accounts_imperative_revenue'        => 'Revenue accounts are created automatically when you create transactions, but you can create one manually too, if you want. Let\'s create one now:',
-    'no_accounts_create_revenue'            => 'Create a revenue account',
-    'no_budgets_title_default'              => 'Let\'s create a budget',
-    'no_budgets_intro_default'              => 'You have no budgets yet. Budgets are used to organise your expenses into logical groups, which you can give a soft-cap to limit your expenses.',
-    'no_budgets_imperative_default'         => 'Budgets are the basic tools of financial management. Let\'s create one now:',
-    'no_budgets_create_default'             => 'Create a budget',
-    'no_categories_title_default'           => 'Let\'s create a category!',
-    'no_categories_intro_default'           => 'You have no categories yet. Categories are used to fine tune your transactions and label them with their designated category.',
-    'no_categories_imperative_default'      => 'Categories are created automatically when you create transactions, but you can create one manually too. Let\'s create one now:',
-    'no_categories_create_default'          => 'Create a category',
-    'no_tags_title_default'                 => 'Let\'s create a tag!',
-    'no_tags_intro_default'                 => 'You have no tags yet. Tags are used to fine tune your transactions and label them with specific keywords.',
-    'no_tags_imperative_default'            => 'Tags are created automatically when you create transactions, but you can create one manually too. Let\'s create one now:',
-    'no_tags_create_default'                => 'Create a tag',
-    'no_transactions_title_withdrawal'      => 'Let\'s create an expense!',
-    'no_transactions_intro_withdrawal'      => 'You have no expenses yet. You should create expenses to start managing your finances.',
-    'no_transactions_imperative_withdrawal' => 'Have you spent some money? Then you should write it down:',
-    'no_transactions_create_withdrawal'     => 'Create an expense',
-    'no_transactions_title_deposit'         => 'Let\'s create some income!',
-    'no_transactions_intro_deposit'         => 'You have no recorded income yet. You should create income entries to start managing your finances.',
-    'no_transactions_imperative_deposit'    => 'Have you received some money? Then you should write it down:',
-    'no_transactions_create_deposit'        => 'Create a deposit',
-    'no_transactions_title_transfers'       => 'Let\'s create a transfer!',
+    'no_accounts_title_revenue'             => '',
+    'no_accounts_intro_revenue'             => '',
+    'no_accounts_imperative_revenue'        => '',
+    'no_accounts_create_revenue'            => '',
+    'no_budgets_title_default'              => '',
+    'no_budgets_intro_default'              => '',
+    'no_budgets_imperative_default'         => '',
+    'no_budgets_create_default'             => '',
+    'no_categories_title_default'           => '',
+    'no_categories_intro_default'           => '',
+    'no_categories_imperative_default'      => '',
+    'no_categories_create_default'          => '',
+    'no_tags_title_default'                 => '',
+    'no_tags_intro_default'                 => '',
+    'no_tags_imperative_default'            => '',
+    'no_tags_create_default'                => '',
+    'no_transactions_title_withdrawal'      => '',
+    'no_transactions_intro_withdrawal'      => '',
+    'no_transactions_imperative_withdrawal' => '',
+    'no_transactions_create_withdrawal'     => '',
+    'no_transactions_title_deposit'         => '',
+    'no_transactions_intro_deposit'         => '',
+    'no_transactions_imperative_deposit'    => '',
+    'no_transactions_create_deposit'        => '',
+    'no_transactions_title_transfers'       => '',
     'no_transactions_intro_transfers'       => 'Nimate še nobenih prenosov. Če prenašate denar med svojimi premoženjskimi računi, se to zabeleži kot prenos.',
-    'no_transactions_imperative_transfers'  => 'Have you moved some money around? Then you should write it down:',
-    'no_transactions_create_transfers'      => 'Create a transfer',
-    'no_piggies_title_default'              => 'Let\'s create a piggy bank!',
-    'no_piggies_intro_default'              => 'You have no piggy banks yet. You can create piggy banks to divide your savings and keep track of what you\'re saving up for.',
-    'no_piggies_imperative_default'         => 'Do you have things you\'re saving money for? Create a piggy bank and keep track:',
-    'no_piggies_create_default'             => 'Create a new piggy bank',
-    'no_bills_title_default'                => 'Let\'s create a bill!',
-    'no_bills_intro_default'                => 'You have no bills yet. You can create bills to keep track of regular expenses, like your rent of insurance.',
-    'no_bills_imperative_default'           => 'Do you have such regular bills? Create a bill and keep track of your payments:',
-    'no_bills_create_default'               => 'Create a bill',
+    'no_transactions_imperative_transfers'  => '',
+    'no_transactions_create_transfers'      => '',
+    'no_piggies_title_default'              => '',
+    'no_piggies_intro_default'              => '',
+    'no_piggies_imperative_default'         => '',
+    'no_piggies_create_default'             => '',
+    'no_bills_title_default'                => '',
+    'no_bills_intro_default'                => '',
+    'no_bills_imperative_default'           => '',
+    'no_bills_create_default'               => '',
 
 
 ];
\ No newline at end of file

From e76a6dc00fdddff61c2dea61948c40c7d4aa0ee3 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Fri, 25 Aug 2017 07:35:52 +0200
Subject: [PATCH 296/668] New translations validation.php (Chinese Traditional)

---
 resources/lang/zh_TW/validation.php | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/resources/lang/zh_TW/validation.php b/resources/lang/zh_TW/validation.php
index c94797b2a2..0c42f0ff72 100644
--- a/resources/lang/zh_TW/validation.php
+++ b/resources/lang/zh_TW/validation.php
@@ -14,7 +14,7 @@ declare(strict_types=1);
 return [
     'iban'                           => '這不是有效的 IBAN。',
     'unique_account_number_for_user' => '此帳號號碼已經存在。',
-    'deleted_user'                   => '',
+    'deleted_user'                   => 'Due to security constraints, you cannot register using this email address.',
     'rule_trigger_value'             => '此值不能用於所選擇的事件。',
     'rule_action_value'              => '此值不能用於所選擇的動作。',
     'invalid_domain'                 => '基於安全理由，你無法使用此域名註冊。',
@@ -24,8 +24,8 @@ return [
     'file_too_large'                 => '檔案 ":name" 過大。',
     'belongs_to_user'                => ':attribute 的值是未知的。',
     'accepted'                       => ':attribute 必須被接受。',
-    'bic'                            => '',
-    'more'                           => '',
+    'bic'                            => 'This is not a valid BIC.',
+    'more'                           => ':attribute must be larger than zero.',
     'active_url'                     => ':attribute 不是有效的URL。',
     'after'                          => ':attribute 必須是一個在 :date 之後的日期。',
     'alpha'                          => ':attribute 只允許包含字母。',
@@ -84,11 +84,11 @@ return [
     'url'                            => ':attribute 格式無效。',
     'timezone'                       => ':attribute 必須是有效的區域。',
     '2fa_code'                       => ':attribute 格式無效。',
-    'dimensions'                     => '',
-    'distinct'                       => '',
-    'file'                           => '',
-    'in_array'                       => '',
-    'present'                        => '',
-    'amount_zero'                    => '',
-    'secure_password'                => '',
+    'dimensions'                     => 'The :attribute has invalid image dimensions.',
+    'distinct'                       => 'The :attribute field has a duplicate value.',
+    'file'                           => 'The :attribute must be a file.',
+    'in_array'                       => 'The :attribute field does not exist in :other.',
+    'present'                        => 'The :attribute field must be present.',
+    'amount_zero'                    => 'The total amount cannot be zero',
+    'secure_password'                => 'This is not a secure password. Please try again. For more information, visit https://goo.gl/NCh2tN',
 ];
\ No newline at end of file

From a6d8b985b2813c0e71a9f5a6520fadae1d8f430f Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Fri, 25 Aug 2017 07:35:54 +0200
Subject: [PATCH 297/668] New translations validation.php (Slovenian)

---
 resources/lang/sl_SI/validation.php | 150 ++++++++++++++--------------
 1 file changed, 75 insertions(+), 75 deletions(-)

diff --git a/resources/lang/sl_SI/validation.php b/resources/lang/sl_SI/validation.php
index 860669162b..fff91fb426 100644
--- a/resources/lang/sl_SI/validation.php
+++ b/resources/lang/sl_SI/validation.php
@@ -16,79 +16,79 @@ return [
     'unique_account_number_for_user' => 'Kaže, da je ta številka računa že v uporabi.',
     'deleted_user'                   => 'Iz varnostnih razlogov ne morete ustvariti uporabnika s takim e-poštnim naslovom.',
     'rule_trigger_value'             => 'Ta vrednost je neveljavna za izbrani sprožilec.',
-    'rule_action_value'              => '',
-    'invalid_domain'                 => '',
-    'file_already_attached'          => '',
-    'file_attached'                  => '',
-    'file_invalid_mime'              => '',
-    'file_too_large'                 => '',
-    'belongs_to_user'                => '',
-    'accepted'                       => '',
-    'bic'                            => '',
-    'more'                           => '',
-    'active_url'                     => '',
-    'after'                          => '',
-    'alpha'                          => '',
-    'alpha_dash'                     => '',
-    'alpha_num'                      => '',
-    'array'                          => '',
-    'unique_for_user'                => '',
-    'before'                         => '',
-    'unique_object_for_user'         => '',
-    'unique_account_for_user'        => '',
-    'between.numeric'                => '',
-    'between.file'                   => '',
-    'between.string'                 => '',
-    'between.array'                  => '',
-    'boolean'                        => '',
-    'confirmed'                      => '',
-    'date'                           => '',
-    'date_format'                    => '',
-    'different'                      => '',
-    'digits'                         => '',
-    'digits_between'                 => '',
-    'email'                          => '',
-    'filled'                         => '',
-    'exists'                         => '',
-    'image'                          => '',
-    'in'                             => '',
-    'integer'                        => '',
-    'ip'                             => '',
-    'json'                           => '',
-    'max.numeric'                    => '',
-    'max.file'                       => '',
-    'max.string'                     => '',
-    'max.array'                      => '',
-    'mimes'                          => '',
-    'min.numeric'                    => '',
-    'min.file'                       => '',
-    'min.string'                     => '',
-    'min.array'                      => '',
-    'not_in'                         => '',
-    'numeric'                        => '',
-    'regex'                          => '',
-    'required'                       => '',
-    'required_if'                    => '',
-    'required_unless'                => '',
-    'required_with'                  => '',
-    'required_with_all'              => '',
-    'required_without'               => '',
-    'required_without_all'           => '',
-    'same'                           => '',
-    'size.numeric'                   => '',
-    'size.file'                      => '',
-    'size.string'                    => '',
-    'size.array'                     => '',
-    'unique'                         => '',
-    'string'                         => '',
-    'url'                            => '',
-    'timezone'                       => '',
-    '2fa_code'                       => '',
-    'dimensions'                     => '',
-    'distinct'                       => '',
-    'file'                           => '',
-    'in_array'                       => '',
-    'present'                        => '',
-    'amount_zero'                    => '',
-    'secure_password'                => '',
+    'rule_action_value'              => 'This value is invalid for the selected action.',
+    'invalid_domain'                 => 'Due to security constraints, you cannot register from this domain.',
+    'file_already_attached'          => 'Uploaded file ":name" is already attached to this object.',
+    'file_attached'                  => 'Succesfully uploaded file ":name".',
+    'file_invalid_mime'              => 'File ":name" is of type ":mime" which is not accepted as a new upload.',
+    'file_too_large'                 => 'File ":name" is too large.',
+    'belongs_to_user'                => 'The value of :attribute is unknown',
+    'accepted'                       => 'The :attribute must be accepted.',
+    'bic'                            => 'This is not a valid BIC.',
+    'more'                           => ':attribute must be larger than zero.',
+    'active_url'                     => 'The :attribute is not a valid URL.',
+    'after'                          => 'The :attribute must be a date after :date.',
+    'alpha'                          => 'The :attribute may only contain letters.',
+    'alpha_dash'                     => 'The :attribute may only contain letters, numbers, and dashes.',
+    'alpha_num'                      => 'The :attribute may only contain letters and numbers.',
+    'array'                          => 'The :attribute must be an array.',
+    'unique_for_user'                => 'There already is an entry with this :attribute.',
+    'before'                         => 'The :attribute must be a date before :date.',
+    'unique_object_for_user'         => 'This name is already in use',
+    'unique_account_for_user'        => 'This account name is already in use',
+    'between.numeric'                => 'The :attribute must be between :min and :max.',
+    'between.file'                   => 'The :attribute must be between :min and :max kilobytes.',
+    'between.string'                 => 'The :attribute must be between :min and :max characters.',
+    'between.array'                  => 'The :attribute must have between :min and :max items.',
+    'boolean'                        => 'The :attribute field must be true or false.',
+    'confirmed'                      => 'The :attribute confirmation does not match.',
+    'date'                           => 'The :attribute is not a valid date.',
+    'date_format'                    => 'The :attribute does not match the format :format.',
+    'different'                      => 'The :attribute and :other must be different.',
+    'digits'                         => 'The :attribute must be :digits digits.',
+    'digits_between'                 => 'The :attribute must be between :min and :max digits.',
+    'email'                          => 'The :attribute must be a valid email address.',
+    'filled'                         => 'The :attribute field is required.',
+    'exists'                         => 'The selected :attribute is invalid.',
+    'image'                          => 'The :attribute must be an image.',
+    'in'                             => 'The selected :attribute is invalid.',
+    'integer'                        => 'The :attribute must be an integer.',
+    'ip'                             => 'The :attribute must be a valid IP address.',
+    'json'                           => 'The :attribute must be a valid JSON string.',
+    'max.numeric'                    => 'The :attribute may not be greater than :max.',
+    'max.file'                       => 'The :attribute may not be greater than :max kilobytes.',
+    'max.string'                     => 'The :attribute may not be greater than :max characters.',
+    'max.array'                      => 'The :attribute may not have more than :max items.',
+    'mimes'                          => 'The :attribute must be a file of type: :values.',
+    'min.numeric'                    => 'The :attribute must be at least :min.',
+    'min.file'                       => 'The :attribute must be at least :min kilobytes.',
+    'min.string'                     => 'The :attribute must be at least :min characters.',
+    'min.array'                      => 'The :attribute must have at least :min items.',
+    'not_in'                         => 'The selected :attribute is invalid.',
+    'numeric'                        => 'The :attribute must be a number.',
+    'regex'                          => 'The :attribute format is invalid.',
+    'required'                       => 'The :attribute field is required.',
+    'required_if'                    => 'The :attribute field is required when :other is :value.',
+    'required_unless'                => 'The :attribute field is required unless :other is in :values.',
+    'required_with'                  => 'The :attribute field is required when :values is present.',
+    'required_with_all'              => 'The :attribute field is required when :values is present.',
+    'required_without'               => 'The :attribute field is required when :values is not present.',
+    'required_without_all'           => 'The :attribute field is required when none of :values are present.',
+    'same'                           => 'The :attribute and :other must match.',
+    'size.numeric'                   => 'The :attribute must be :size.',
+    'size.file'                      => 'The :attribute must be :size kilobytes.',
+    'size.string'                    => 'The :attribute must be :size characters.',
+    'size.array'                     => 'The :attribute must contain :size items.',
+    'unique'                         => 'The :attribute has already been taken.',
+    'string'                         => 'The :attribute must be a string.',
+    'url'                            => 'The :attribute format is invalid.',
+    'timezone'                       => 'The :attribute must be a valid zone.',
+    '2fa_code'                       => 'The :attribute field is invalid.',
+    'dimensions'                     => 'The :attribute has invalid image dimensions.',
+    'distinct'                       => 'The :attribute field has a duplicate value.',
+    'file'                           => 'The :attribute must be a file.',
+    'in_array'                       => 'The :attribute field does not exist in :other.',
+    'present'                        => 'The :attribute field must be present.',
+    'amount_zero'                    => 'The total amount cannot be zero',
+    'secure_password'                => 'This is not a secure password. Please try again. For more information, visit https://goo.gl/NCh2tN',
 ];
\ No newline at end of file

From df5830b5f91890d826b863f59667b874a7252632 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Fri, 25 Aug 2017 07:35:56 +0200
Subject: [PATCH 298/668] New translations validation.php (Portuguese,
 Brazilian)

---
 resources/lang/pt_BR/validation.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/lang/pt_BR/validation.php b/resources/lang/pt_BR/validation.php
index e0c432ddaa..ecf55dc8e6 100644
--- a/resources/lang/pt_BR/validation.php
+++ b/resources/lang/pt_BR/validation.php
@@ -25,7 +25,7 @@ return [
     'belongs_to_user'                => 'O valor de :attribute é desconhecido',
     'accepted'                       => 'O campo :attribute deve ser aceito.',
     'bic'                            => 'Este não é um BIC válido.',
-    'more'                           => '',
+    'more'                           => ':attribute must be larger than zero.',
     'active_url'                     => 'O campo :attribute não contém um URL válido.',
     'after'                          => 'O campo :attribute deverá conter uma data posterior a :date.',
     'alpha'                          => 'O campo :attribute deverá conter apenas letras.',
@@ -90,5 +90,5 @@ return [
     'in_array'                       => 'O campo :attribute não existe em :other.',
     'present'                        => 'O campo :attribute deve estar presente.',
     'amount_zero'                    => 'A quantidade total não pode ser zero',
-    'secure_password'                => '',
+    'secure_password'                => 'This is not a secure password. Please try again. For more information, visit https://goo.gl/NCh2tN',
 ];
\ No newline at end of file

From 3efd112d8b4084e02af324b0d4d761fc1a30314d Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Fri, 25 Aug 2017 07:35:58 +0200
Subject: [PATCH 299/668] New translations validation.php (German)

---
 resources/lang/de_DE/validation.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/de_DE/validation.php b/resources/lang/de_DE/validation.php
index 43e00ea9b4..583ebb4302 100644
--- a/resources/lang/de_DE/validation.php
+++ b/resources/lang/de_DE/validation.php
@@ -90,5 +90,5 @@ return [
     'in_array'                       => ':attribute existiert nicht in :other.',
     'present'                        => 'Das :attribute Feld muss vorhanden sein.',
     'amount_zero'                    => 'Der Gesamtbetrag darf nicht Null sein',
-    'secure_password'                => '',
+    'secure_password'                => 'This is not a secure password. Please try again. For more information, visit https://goo.gl/NCh2tN',
 ];
\ No newline at end of file

From 67b7f90c2657c0412da943c2a7e3e7c22fe817e5 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Fri, 25 Aug 2017 07:35:59 +0200
Subject: [PATCH 300/668] New translations list.php (Spanish)

---
 resources/lang/es_ES/list.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/resources/lang/es_ES/list.php b/resources/lang/es_ES/list.php
index 4a961d2b88..b26fb4f2ad 100644
--- a/resources/lang/es_ES/list.php
+++ b/resources/lang/es_ES/list.php
@@ -88,7 +88,7 @@ return [
     'budget_count'           => 'Número de presupuestos',
     'rule_and_groups_count'  => 'Número de reglas y grupos de reglas',
     'tags_count'             => 'Número de etiquetas',
-    'inward'                 => '',
-    'outward'                => '',
-    'number_of_transactions' => '',
+    'inward'                 => 'Inward description',
+    'outward'                => 'Outward description',
+    'number_of_transactions' => 'Number of transactions',
 ];
\ No newline at end of file

From 4d55dbea6c9885c771ae0ad62af4eeb39158dd25 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Fri, 25 Aug 2017 07:36:01 +0200
Subject: [PATCH 301/668] New translations list.php (Slovenian)

---
 resources/lang/sl_SI/list.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/resources/lang/sl_SI/list.php b/resources/lang/sl_SI/list.php
index 5856af081d..e2cb94be16 100644
--- a/resources/lang/sl_SI/list.php
+++ b/resources/lang/sl_SI/list.php
@@ -88,7 +88,7 @@ return [
     'budget_count'           => 'Število budžetov',
     'rule_and_groups_count'  => 'Število pravil in skupin pravil',
     'tags_count'             => 'Število značk',
-    'inward'                 => '',
-    'outward'                => '',
-    'number_of_transactions' => '',
+    'inward'                 => 'Inward description',
+    'outward'                => 'Outward description',
+    'number_of_transactions' => 'Number of transactions',
 ];
\ No newline at end of file

From 75671dc9827eef5cc47f1017ca497a997a9ec33c Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Fri, 25 Aug 2017 07:36:02 +0200
Subject: [PATCH 302/668] New translations list.php (Polish)

---
 resources/lang/pl_PL/list.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/resources/lang/pl_PL/list.php b/resources/lang/pl_PL/list.php
index 50228a783f..552981dcf6 100644
--- a/resources/lang/pl_PL/list.php
+++ b/resources/lang/pl_PL/list.php
@@ -41,7 +41,7 @@ return [
     'repeat_freq'           => 'Powtarza się',
     'description'           => 'Opis',
     'amount'                => 'Kwota',
-    'internal_reference'    => '',
+    'internal_reference'    => 'Internal reference',
     'date'                  => 'Data',
     'interest_date'         => 'Stopa procentowa',
     'book_date'             => 'Data księgowania',
@@ -49,7 +49,7 @@ return [
     'due_date'              => 'Termin realizacji',
     'payment_date'          => 'Data płatności',
     'invoice_date'          => 'Data faktury',
-    'interal_reference'     => '',
+    'interal_reference'     => 'Internal reference',
     'notes'                 => 'Notatki',
     'from'                  => 'Z',
     'piggy_bank'            => 'Skarbonka',
@@ -71,7 +71,7 @@ return [
     'is_admin'              => 'Jest administratorem',
     'has_two_factor'        => 'Ma dwustopniową autoryzację',
     'confirmed_from'        => 'Potwierdzone z',
-    'registered_from'       => '',
+    'registered_from'       => 'Registered from',
     'blocked_code'          => 'Kod blokady',
     'domain'                => 'Domena',
     'registration_attempts' => 'Próby rejestracji',
@@ -88,7 +88,7 @@ return [
     'budget_count'           => 'Liczba budżetów',
     'rule_and_groups_count'  => 'Liczba reguł i grup reguł',
     'tags_count'             => 'Liczba tagów',
-    'inward'                 => '',
-    'outward'                => '',
+    'inward'                 => 'Inward description',
+    'outward'                => 'Outward description',
     'number_of_transactions' => 'Liczba transakcji',
 ];
\ No newline at end of file

From 568ef92f7965843d1c328b2b824f97a13564d3f1 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Fri, 25 Aug 2017 07:36:09 +0200
Subject: [PATCH 303/668] New translations list.php (Portuguese, Brazilian)

---
 resources/lang/pt_BR/list.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/resources/lang/pt_BR/list.php b/resources/lang/pt_BR/list.php
index 1211d3e377..cf8d04a2f8 100644
--- a/resources/lang/pt_BR/list.php
+++ b/resources/lang/pt_BR/list.php
@@ -14,7 +14,7 @@ declare(strict_types=1);
 return [
     'buttons'               => 'Botões',
     'icon'                  => 'Ícone',
-    'id'                    => '',
+    'id'                    => 'ID',
     'create_date'           => 'Criado em',
     'update_date'           => 'Atualizado em',
     'balance_before'        => 'Saldo Antes',
@@ -79,7 +79,7 @@ return [
     'destination_account'   => 'Conta de destino',
 
     'accounts_count'         => 'Número de Contas',
-    'journals_count'         => '',
+    'journals_count'         => 'Number of transactions',
     'attachments_count'      => 'Número de anexos',
     'bills_count'            => 'Número de contas',
     'categories_count'       => 'Número de categorias',
@@ -88,7 +88,7 @@ return [
     'budget_count'           => 'Número de orçamentos',
     'rule_and_groups_count'  => 'Número de regras e grupos de regras',
     'tags_count'             => 'Número de tags',
-    'inward'                 => '',
-    'outward'                => '',
-    'number_of_transactions' => '',
+    'inward'                 => 'Inward description',
+    'outward'                => 'Outward description',
+    'number_of_transactions' => 'Number of transactions',
 ];
\ No newline at end of file

From 129dacbfe22d29736c2da8445dbbb21d6c563002 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Fri, 25 Aug 2017 07:36:12 +0200
Subject: [PATCH 304/668] New translations demo.php (Chinese Traditional)

---
 resources/lang/zh_TW/demo.php | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/resources/lang/zh_TW/demo.php b/resources/lang/zh_TW/demo.php
index f06ac94ae9..8b442add2d 100644
--- a/resources/lang/zh_TW/demo.php
+++ b/resources/lang/zh_TW/demo.php
@@ -10,17 +10,17 @@ declare(strict_types=1);
  */
 
 return [
-    'no_demo_text'                   => '',
-    'see_help_icon'                  => '',
-    'index'                          => '',
-    'accounts-index'                 => '',
-    'budgets-index'                  => '',
-    'reports-index-start'            => '',
-    'reports-index-examples'         => '',
-    'currencies-index'               => '',
-    'transactions-index'             => '',
-    'piggy-banks-index'              => '',
-    'import-index'                   => '',
-    'import-configure-security'      => '',
-    'import-configure-configuration' => '',
+    'no_demo_text'                   => 'Sorry, there is no extra demo-explanation text for <abbr title=":route">this page</abbr>.',
+    'see_help_icon'                  => 'However, the <i class="fa fa-question-circle"></i>-icon in the top right corner may tell you more.',
+    'index'                          => 'Welcome to <strong>Firefly III</strong>! On this page you get a quick overview of your finances. For more information, check out Accounts &rarr; <a href=":asset">Asset Accounts</a> and of course the <a href=":budgets">Budgets</a> and <a href=":reports">Reports</a> pages. Or just take a look around and see where you end up.',
+    'accounts-index'                 => 'Asset accounts are your personal bank accounts. Expense accounts are the accounts you spend money at, such as stores and friends. Revenue accounts are accounts you receive money from, such as your job, the government or other sources of income. On this page you can edit or remove them.',
+    'budgets-index'                  => 'This page shows you an overview of your budgets. The top bar shows the amount that is available to be budgeted. This can be customized for any period by clicking the amount on the right. The amount you\'ve actually spent is shown in the bar below. Below that are the expenses per budget and what you\'ve budgeted for them.',
+    'reports-index-start'            => 'Firefly III supports four types of reports. Read about them by clicking on the <i class="fa fa-question-circle"></i>-icon in the top right corner.',
+    'reports-index-examples'         => 'Be sure to check out these examples: <a href=":one">a monthly financial overview</a>, <a href=":two">a yearly financial overview</a> and <a href=":three">a budget overview</a>.',
+    'currencies-index'               => 'Firefly III supports multiple currencies. Although it defaults to the Euro it can be set to the US Dollar and many other currencies. As you can see a small selection of currencies has been included but you can add your own if you wish to. Changing the default currency will not change the currency of existing transactions however: Firefly III supports the use of multiple currencies at the same time.',
+    'transactions-index'             => 'These expenses, deposits and transfers are not particularly imaginative. They have been generated automatically.',
+    'piggy-banks-index'              => 'As you can see, there are three piggy banks. Use the plus and minus buttons to influence the amount of money in each piggy bank. Click the name of the piggy bank to see the administration for each piggy bank.',
+    'import-index'                   => 'Of course, any CSV file can be imported into Firefly III ',
+    'import-configure-security'      => 'Because of security concerns, your upload has been replaced with a local file.',
+    'import-configure-configuration' => 'The configuration you see below is correct for the local file.',
 ];
\ No newline at end of file

From c7b6688250e2edcbfb817bd9fe4842479c017bae Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Fri, 25 Aug 2017 07:36:13 +0200
Subject: [PATCH 305/668] New translations intro.php (Chinese Traditional)

---
 resources/lang/zh_TW/intro.php | 144 ++++++++++++++++-----------------
 1 file changed, 72 insertions(+), 72 deletions(-)

diff --git a/resources/lang/zh_TW/intro.php b/resources/lang/zh_TW/intro.php
index cca2854e02..c161cef362 100644
--- a/resources/lang/zh_TW/intro.php
+++ b/resources/lang/zh_TW/intro.php
@@ -11,111 +11,111 @@ declare(strict_types=1);
 
 return [
     // index
-    'index_intro'                           => '',
-    'index_accounts-chart'                  => '',
-    'index_box_out_holder'                  => '',
-    'index_help'                            => '',
-    'index_outro'                           => '',
-    'index_sidebar-toggle'                  => '',
+    'index_intro'                           => 'Welcome to the index page of Firefly III. Please take the time to walk through this intro to get a feeling of how Firefly III works.',
+    'index_accounts-chart'                  => 'This chart shows the current balance of your asset accounts. You can select the accounts visible here in your preferences.',
+    'index_box_out_holder'                  => 'This little box and the boxes next to this one will give you a quick overview of your financial situation.',
+    'index_help'                            => 'If you ever need help with a page or a form, press this button.',
+    'index_outro'                           => 'Most pages of Firefly III will start with a little tour like this one. Please contact me when you have questions or comments. Enjoy!',
+    'index_sidebar-toggle'                  => 'To create new transactions, accounts or other things, use the menu under this icon.',
 
     // create account:
-    'accounts_create_iban'                  => '',
-    'accounts_create_asset_opening_balance' => '',
-    'accounts_create_asset_currency'        => '',
-    'accounts_create_asset_virtual'         => '',
+    'accounts_create_iban'                  => 'Give your accounts a valid IBAN. This could make a data import very easy in the future.',
+    'accounts_create_asset_opening_balance' => 'Assets accounts may have an "opening balance", indicating the start of this account\'s history in Firefly.',
+    'accounts_create_asset_currency'        => 'Firefly III supports multiple currencies. Asset accounts have one main currency, which you must set here.',
+    'accounts_create_asset_virtual'         => 'It can sometimes help to give your account a virtual balance: an extra amount always added to or removed from the actual balance.',
 
     // budgets index
-    'budgets_index_intro'                   => '',
-    'budgets_index_set_budget'              => '',
-    'budgets_index_see_expenses_bar'        => '',
-    'budgets_index_navigate_periods'        => '',
-    'budgets_index_new_budget'              => '',
-    'budgets_index_list_of_budgets'         => '',
+    'budgets_index_intro'                   => 'Budgets are used to manage your finances and form one of the core functions of Firefly III.',
+    'budgets_index_set_budget'              => 'Set your total budget for every period so Firefly can tell you if you have budgeted all available money.',
+    'budgets_index_see_expenses_bar'        => 'Spending money will slowly fill this bar.',
+    'budgets_index_navigate_periods'        => 'Navigate through periods to easily set budgets ahead of time.',
+    'budgets_index_new_budget'              => 'Create new budgets as you see fit.',
+    'budgets_index_list_of_budgets'         => 'Use this table to set the amounts for each budget and see how you are doing.',
 
     // reports (index)
-    'reports_index_intro'                   => '',
-    'reports_index_inputReportType'         => '',
-    'reports_index_inputAccountsSelect'     => '',
-    'reports_index_inputDateRange'          => '',
-    'reports_index_extra-options-box'       => '',
+    'reports_index_intro'                   => 'Use these reports to get detailed insights in your finances.',
+    'reports_index_inputReportType'         => 'Pick a report type. Check out the help pages to see what each report shows you.',
+    'reports_index_inputAccountsSelect'     => 'You can exclude or include asset accounts as you see fit.',
+    'reports_index_inputDateRange'          => 'The selected date range is entirely up to you: from one day to 10 years.',
+    'reports_index_extra-options-box'       => 'Depending on the report you have selected, you can select extra filters and options here. Watch this box when you change report types.',
 
     // reports (reports)
-    'reports_report_default_intro'          => '',
-    'reports_report_audit_intro'            => '',
-    'reports_report_audit_optionsBox'       => '',
+    'reports_report_default_intro'          => 'This report will give you a quick and comprehensive overview of your finances. If you wish to see anything else, please don\'t hestitate to contact me!',
+    'reports_report_audit_intro'            => 'This report will give you detailed insights in your asset accounts.',
+    'reports_report_audit_optionsBox'       => 'Use these check boxes to show or hide the columns you are interested in.',
 
-    'reports_report_category_intro'                  => '',
-    'reports_report_category_pieCharts'              => '',
-    'reports_report_category_incomeAndExpensesChart' => '',
+    'reports_report_category_intro'                  => 'This report will give you insight in one or multiple categories.',
+    'reports_report_category_pieCharts'              => 'These charts will give you insight in expenses and income per category or per account.',
+    'reports_report_category_incomeAndExpensesChart' => 'This chart shows your expenses and income per category.',
 
-    'reports_report_tag_intro'                  => '',
-    'reports_report_tag_pieCharts'              => '',
-    'reports_report_tag_incomeAndExpensesChart' => '',
+    'reports_report_tag_intro'                  => 'This report will give you insight in one or multiple tags.',
+    'reports_report_tag_pieCharts'              => 'These charts will give you insight in expenses and income per tag, account, category or budget.',
+    'reports_report_tag_incomeAndExpensesChart' => 'This chart shows your expenses and income per tag.',
 
-    'reports_report_budget_intro'                             => '',
-    'reports_report_budget_pieCharts'                         => '',
-    'reports_report_budget_incomeAndExpensesChart'            => '',
+    'reports_report_budget_intro'                             => 'This report will give you insight in one or multiple budgets.',
+    'reports_report_budget_pieCharts'                         => 'These charts will give you insight in expenses per budget or per account.',
+    'reports_report_budget_incomeAndExpensesChart'            => 'This chart shows your expenses per budget.',
 
     // create transaction
-    'transactions_create_switch_box'                          => '',
-    'transactions_create_ffInput_category'                    => '',
-    'transactions_create_withdrawal_ffInput_budget'           => '',
-    'transactions_create_withdrawal_currency_dropdown_amount' => '',
-    'transactions_create_deposit_currency_dropdown_amount'    => '',
-    'transactions_create_transfer_ffInput_piggy_bank_id'      => '',
+    'transactions_create_switch_box'                          => 'Use these buttons to quickly switch the type of transaction you wish to save.',
+    'transactions_create_ffInput_category'                    => 'You can freely type in this field. Previously created categories will be suggested.',
+    'transactions_create_withdrawal_ffInput_budget'           => 'Link your withdrawal to a budget for better financial control.',
+    'transactions_create_withdrawal_currency_dropdown_amount' => 'Use this dropdown when your withdrawal is in another currency.',
+    'transactions_create_deposit_currency_dropdown_amount'    => 'Use this dropdown when your deposit is in another currency.',
+    'transactions_create_transfer_ffInput_piggy_bank_id'      => 'Select a piggy bank and link this transfer to your savings.',
 
     // piggy banks index:
-    'piggy-banks_index_saved'                                 => '',
-    'piggy-banks_index_button'                                => '',
-    'piggy-banks_index_accountStatus'                         => '',
+    'piggy-banks_index_saved'                                 => 'This field shows you how much you\'ve saved in each piggy bank.',
+    'piggy-banks_index_button'                                => 'Next to this progress bar are two buttons (+ and -) to add or remove money from each piggy bank.',
+    'piggy-banks_index_accountStatus'                         => 'For each asset account with at least one piggy bank the status is listed in this table.',
 
     // create piggy
-    'piggy-banks_create_name'                                 => '',
-    'piggy-banks_create_date'                                 => '',
+    'piggy-banks_create_name'                                 => 'What is your goal? A new couch, a camera, money for emergencies?',
+    'piggy-banks_create_date'                                 => 'You can set a target date or a deadline for your piggy bank.',
 
     // show piggy
-    'piggy-banks_show_piggyChart'                             => '',
-    'piggy-banks_show_piggyDetails'                           => '',
-    'piggy-banks_show_piggyEvents'                            => '',
+    'piggy-banks_show_piggyChart'                             => 'This chart will show the history of this piggy bank.',
+    'piggy-banks_show_piggyDetails'                           => 'Some details about your piggy bank',
+    'piggy-banks_show_piggyEvents'                            => 'Any additions or removals are also listed here.',
 
     // bill index
-    'bills_index_paid_in_period'                              => '',
-    'bills_index_expected_in_period'                          => '',
+    'bills_index_paid_in_period'                              => 'This field indicates when the bill was last paid.',
+    'bills_index_expected_in_period'                          => 'This field indicates for each bill if and when the next bill is expected to hit.',
 
     // show bill
-    'bills_show_billInfo'                                     => '',
-    'bills_show_billButtons'                                  => '',
-    'bills_show_billChart'                                    => '',
+    'bills_show_billInfo'                                     => 'This table shows some general information about this bill.',
+    'bills_show_billButtons'                                  => 'Use this button to re-scan old transactions so they will be matched to this bill.',
+    'bills_show_billChart'                                    => 'This chart shows the transactions linked to this bill.',
 
     // create bill
-    'bills_create_name'                                       => '',
-    'bills_create_match'                                      => '',
-    'bills_create_amount_min_holder'                          => '',
-    'bills_create_repeat_freq_holder'                         => '',
-    'bills_create_skip_holder'                                => '',
+    'bills_create_name'                                       => 'Use a descriptive name such as "Rent" or "Health insurance".',
+    'bills_create_match'                                      => 'To match transactions, use terms from those transactions or the expense account involved. All words must match.',
+    'bills_create_amount_min_holder'                          => 'Select a minimum and maximum amount for this bill.',
+    'bills_create_repeat_freq_holder'                         => 'Most bills repeat monthly, but you can set another frequency here.',
+    'bills_create_skip_holder'                                => 'If a bill repeats every 2 weeks for example, the "skip"-field should be set to "1" to skip every other week.',
 
     // rules index
-    'rules_index_intro'                                       => '',
-    'rules_index_new_rule_group'                              => '',
-    'rules_index_new_rule'                                    => '',
-    'rules_index_prio_buttons'                                => '',
-    'rules_index_test_buttons'                                => '',
-    'rules_index_rule-triggers'                               => '',
-    'rules_index_outro'                                       => '',
+    'rules_index_intro'                                       => 'Firefly III allows you to manage rules, that will automagically be applied to any transaction you create or edit.',
+    'rules_index_new_rule_group'                              => 'You can combine rules in groups for easier management.',
+    'rules_index_new_rule'                                    => 'Create as many rules as you like.',
+    'rules_index_prio_buttons'                                => 'Order them any way you see fit.',
+    'rules_index_test_buttons'                                => 'You can test your rules or apply them to existing transactions.',
+    'rules_index_rule-triggers'                               => 'Rules have "triggers" and "actions" that you can order by drag-and-drop.',
+    'rules_index_outro'                                       => 'Be sure to check out the help pages using the (?) icon in the top right!',
 
     // create rule:
-    'rules_create_mandatory'                                  => '',
-    'rules_create_ruletriggerholder'                          => '',
-    'rules_create_test_rule_triggers'                         => '',
-    'rules_create_actions'                                    => '',
+    'rules_create_mandatory'                                  => 'Choose a descriptive title, and set when the rule should be fired.',
+    'rules_create_ruletriggerholder'                          => 'Add as many triggers as you like, but remember that ALL triggers must match before any actions are fired.',
+    'rules_create_test_rule_triggers'                         => 'Use this button to see which transactions would match your rule.',
+    'rules_create_actions'                                    => 'Set as many actions as you like.',
 
     // preferences
-    'preferences_index_tabs'                                  => '',
+    'preferences_index_tabs'                                  => 'More options are available behind these tabs.',
 
     // currencies
-    'currencies_index_intro'                                  => '',
-    'currencies_index_default'                                => '',
+    'currencies_index_intro'                                  => 'Firefly III supports multiple currencies, which you can change on this page.',
+    'currencies_index_default'                                => 'Firefly III has one default currency. You can always switch of course using these buttons.',
 
     // create currency
-    'currencies_create_code'                                  => '',
+    'currencies_create_code'                                  => 'This code should be ISO compliant (Google it for your new currency).',
 ];
\ No newline at end of file

From cb66925f226790fd7342c266bf37a474ca2df497 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Fri, 25 Aug 2017 07:36:14 +0200
Subject: [PATCH 306/668] New translations demo.php (Russian)

---
 resources/lang/ru_RU/demo.php | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/resources/lang/ru_RU/demo.php b/resources/lang/ru_RU/demo.php
index bebb1ab57d..91b0d75915 100644
--- a/resources/lang/ru_RU/demo.php
+++ b/resources/lang/ru_RU/demo.php
@@ -10,17 +10,17 @@ declare(strict_types=1);
  */
 
 return [
-    'no_demo_text'                   => '',
-    'see_help_icon'                  => '',
+    'no_demo_text'                   => 'Sorry, there is no extra demo-explanation text for <abbr title=":route">this page</abbr>.',
+    'see_help_icon'                  => 'However, the <i class="fa fa-question-circle"></i>-icon in the top right corner may tell you more.',
     'index'                          => 'Добро пожаловать в <strong>Firefly III</strong>! На этой странице вы видите вашу финансовую ситуацию в общих чертах. Более подробная информация доступна на страницах &rarr; <a href=":asset">Активные счета</a> <a href=":budgets">Бюджет</a> и <a href=":reports">Отчёты</a>. Или просто внимательно оглядитесь и изучите всё вокруг.',
-    'accounts-index'                 => '',
-    'budgets-index'                  => '',
-    'reports-index-start'            => '',
-    'reports-index-examples'         => '',
-    'currencies-index'               => '',
-    'transactions-index'             => '',
-    'piggy-banks-index'              => '',
-    'import-index'                   => '',
-    'import-configure-security'      => '',
-    'import-configure-configuration' => '',
+    'accounts-index'                 => 'Asset accounts are your personal bank accounts. Expense accounts are the accounts you spend money at, such as stores and friends. Revenue accounts are accounts you receive money from, such as your job, the government or other sources of income. On this page you can edit or remove them.',
+    'budgets-index'                  => 'This page shows you an overview of your budgets. The top bar shows the amount that is available to be budgeted. This can be customized for any period by clicking the amount on the right. The amount you\'ve actually spent is shown in the bar below. Below that are the expenses per budget and what you\'ve budgeted for them.',
+    'reports-index-start'            => 'Firefly III supports four types of reports. Read about them by clicking on the <i class="fa fa-question-circle"></i>-icon in the top right corner.',
+    'reports-index-examples'         => 'Be sure to check out these examples: <a href=":one">a monthly financial overview</a>, <a href=":two">a yearly financial overview</a> and <a href=":three">a budget overview</a>.',
+    'currencies-index'               => 'Firefly III supports multiple currencies. Although it defaults to the Euro it can be set to the US Dollar and many other currencies. As you can see a small selection of currencies has been included but you can add your own if you wish to. Changing the default currency will not change the currency of existing transactions however: Firefly III supports the use of multiple currencies at the same time.',
+    'transactions-index'             => 'These expenses, deposits and transfers are not particularly imaginative. They have been generated automatically.',
+    'piggy-banks-index'              => 'As you can see, there are three piggy banks. Use the plus and minus buttons to influence the amount of money in each piggy bank. Click the name of the piggy bank to see the administration for each piggy bank.',
+    'import-index'                   => 'Of course, any CSV file can be imported into Firefly III ',
+    'import-configure-security'      => 'Because of security concerns, your upload has been replaced with a local file.',
+    'import-configure-configuration' => 'The configuration you see below is correct for the local file.',
 ];
\ No newline at end of file

From 9a2d87eb421ab19ee4e500cc8acf790b165cfdbb Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Fri, 25 Aug 2017 07:36:15 +0200
Subject: [PATCH 307/668] New translations validation.php (Russian)

---
 resources/lang/ru_RU/validation.php | 136 ++++++++++++++--------------
 1 file changed, 68 insertions(+), 68 deletions(-)

diff --git a/resources/lang/ru_RU/validation.php b/resources/lang/ru_RU/validation.php
index bc7760d66b..5a8fa83725 100644
--- a/resources/lang/ru_RU/validation.php
+++ b/resources/lang/ru_RU/validation.php
@@ -23,72 +23,72 @@ return [
     'file_invalid_mime'              => 'Файл ":name" имеет тип ":mime". Загрузка файлов такого типа невозможна.',
     'file_too_large'                 => 'Файл ":name" слишком большой.',
     'belongs_to_user'                => 'Значение :attribute неизвестно',
-    'accepted'                       => '',
-    'bic'                            => '',
-    'more'                           => '',
-    'active_url'                     => '',
-    'after'                          => '',
-    'alpha'                          => '',
-    'alpha_dash'                     => '',
-    'alpha_num'                      => '',
-    'array'                          => '',
-    'unique_for_user'                => '',
-    'before'                         => '',
-    'unique_object_for_user'         => '',
-    'unique_account_for_user'        => '',
-    'between.numeric'                => '',
-    'between.file'                   => '',
-    'between.string'                 => '',
-    'between.array'                  => '',
-    'boolean'                        => '',
-    'confirmed'                      => '',
-    'date'                           => '',
-    'date_format'                    => '',
-    'different'                      => '',
-    'digits'                         => '',
-    'digits_between'                 => '',
-    'email'                          => '',
-    'filled'                         => '',
-    'exists'                         => '',
-    'image'                          => '',
-    'in'                             => '',
-    'integer'                        => '',
-    'ip'                             => '',
-    'json'                           => '',
-    'max.numeric'                    => '',
-    'max.file'                       => '',
-    'max.string'                     => '',
-    'max.array'                      => '',
-    'mimes'                          => '',
-    'min.numeric'                    => '',
-    'min.file'                       => '',
-    'min.string'                     => '',
-    'min.array'                      => '',
-    'not_in'                         => '',
-    'numeric'                        => '',
-    'regex'                          => '',
-    'required'                       => '',
-    'required_if'                    => '',
-    'required_unless'                => '',
-    'required_with'                  => '',
-    'required_with_all'              => '',
-    'required_without'               => '',
-    'required_without_all'           => '',
-    'same'                           => '',
-    'size.numeric'                   => '',
-    'size.file'                      => '',
-    'size.string'                    => '',
-    'size.array'                     => '',
-    'unique'                         => '',
-    'string'                         => '',
-    'url'                            => '',
-    'timezone'                       => '',
-    '2fa_code'                       => '',
-    'dimensions'                     => '',
-    'distinct'                       => '',
-    'file'                           => '',
-    'in_array'                       => '',
-    'present'                        => '',
-    'amount_zero'                    => '',
-    'secure_password'                => '',
+    'accepted'                       => 'The :attribute must be accepted.',
+    'bic'                            => 'This is not a valid BIC.',
+    'more'                           => ':attribute must be larger than zero.',
+    'active_url'                     => 'The :attribute is not a valid URL.',
+    'after'                          => 'The :attribute must be a date after :date.',
+    'alpha'                          => 'The :attribute may only contain letters.',
+    'alpha_dash'                     => 'The :attribute may only contain letters, numbers, and dashes.',
+    'alpha_num'                      => 'The :attribute may only contain letters and numbers.',
+    'array'                          => 'The :attribute must be an array.',
+    'unique_for_user'                => 'There already is an entry with this :attribute.',
+    'before'                         => 'The :attribute must be a date before :date.',
+    'unique_object_for_user'         => 'This name is already in use',
+    'unique_account_for_user'        => 'This account name is already in use',
+    'between.numeric'                => 'The :attribute must be between :min and :max.',
+    'between.file'                   => 'The :attribute must be between :min and :max kilobytes.',
+    'between.string'                 => 'The :attribute must be between :min and :max characters.',
+    'between.array'                  => 'The :attribute must have between :min and :max items.',
+    'boolean'                        => 'The :attribute field must be true or false.',
+    'confirmed'                      => 'The :attribute confirmation does not match.',
+    'date'                           => 'The :attribute is not a valid date.',
+    'date_format'                    => 'The :attribute does not match the format :format.',
+    'different'                      => 'The :attribute and :other must be different.',
+    'digits'                         => 'The :attribute must be :digits digits.',
+    'digits_between'                 => 'The :attribute must be between :min and :max digits.',
+    'email'                          => 'The :attribute must be a valid email address.',
+    'filled'                         => 'The :attribute field is required.',
+    'exists'                         => 'The selected :attribute is invalid.',
+    'image'                          => 'The :attribute must be an image.',
+    'in'                             => 'The selected :attribute is invalid.',
+    'integer'                        => 'The :attribute must be an integer.',
+    'ip'                             => 'The :attribute must be a valid IP address.',
+    'json'                           => 'The :attribute must be a valid JSON string.',
+    'max.numeric'                    => 'The :attribute may not be greater than :max.',
+    'max.file'                       => 'The :attribute may not be greater than :max kilobytes.',
+    'max.string'                     => 'The :attribute may not be greater than :max characters.',
+    'max.array'                      => 'The :attribute may not have more than :max items.',
+    'mimes'                          => 'The :attribute must be a file of type: :values.',
+    'min.numeric'                    => 'The :attribute must be at least :min.',
+    'min.file'                       => 'The :attribute must be at least :min kilobytes.',
+    'min.string'                     => 'The :attribute must be at least :min characters.',
+    'min.array'                      => 'The :attribute must have at least :min items.',
+    'not_in'                         => 'The selected :attribute is invalid.',
+    'numeric'                        => 'The :attribute must be a number.',
+    'regex'                          => 'The :attribute format is invalid.',
+    'required'                       => 'The :attribute field is required.',
+    'required_if'                    => 'The :attribute field is required when :other is :value.',
+    'required_unless'                => 'The :attribute field is required unless :other is in :values.',
+    'required_with'                  => 'The :attribute field is required when :values is present.',
+    'required_with_all'              => 'The :attribute field is required when :values is present.',
+    'required_without'               => 'The :attribute field is required when :values is not present.',
+    'required_without_all'           => 'The :attribute field is required when none of :values are present.',
+    'same'                           => 'The :attribute and :other must match.',
+    'size.numeric'                   => 'The :attribute must be :size.',
+    'size.file'                      => 'The :attribute must be :size kilobytes.',
+    'size.string'                    => 'The :attribute must be :size characters.',
+    'size.array'                     => 'The :attribute must contain :size items.',
+    'unique'                         => 'The :attribute has already been taken.',
+    'string'                         => 'The :attribute must be a string.',
+    'url'                            => 'The :attribute format is invalid.',
+    'timezone'                       => 'The :attribute must be a valid zone.',
+    '2fa_code'                       => 'The :attribute field is invalid.',
+    'dimensions'                     => 'The :attribute has invalid image dimensions.',
+    'distinct'                       => 'The :attribute field has a duplicate value.',
+    'file'                           => 'The :attribute must be a file.',
+    'in_array'                       => 'The :attribute field does not exist in :other.',
+    'present'                        => 'The :attribute field must be present.',
+    'amount_zero'                    => 'The total amount cannot be zero',
+    'secure_password'                => 'This is not a secure password. Please try again. For more information, visit https://goo.gl/NCh2tN',
 ];
\ No newline at end of file

From 04af43a9fa59d47a4f85be38eb97f3ea0b426592 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Fri, 25 Aug 2017 07:36:17 +0200
Subject: [PATCH 308/668] New translations intro.php (French)

---
 resources/lang/fr_FR/intro.php | 144 ++++++++++++++++-----------------
 1 file changed, 72 insertions(+), 72 deletions(-)

diff --git a/resources/lang/fr_FR/intro.php b/resources/lang/fr_FR/intro.php
index cca2854e02..c161cef362 100644
--- a/resources/lang/fr_FR/intro.php
+++ b/resources/lang/fr_FR/intro.php
@@ -11,111 +11,111 @@ declare(strict_types=1);
 
 return [
     // index
-    'index_intro'                           => '',
-    'index_accounts-chart'                  => '',
-    'index_box_out_holder'                  => '',
-    'index_help'                            => '',
-    'index_outro'                           => '',
-    'index_sidebar-toggle'                  => '',
+    'index_intro'                           => 'Welcome to the index page of Firefly III. Please take the time to walk through this intro to get a feeling of how Firefly III works.',
+    'index_accounts-chart'                  => 'This chart shows the current balance of your asset accounts. You can select the accounts visible here in your preferences.',
+    'index_box_out_holder'                  => 'This little box and the boxes next to this one will give you a quick overview of your financial situation.',
+    'index_help'                            => 'If you ever need help with a page or a form, press this button.',
+    'index_outro'                           => 'Most pages of Firefly III will start with a little tour like this one. Please contact me when you have questions or comments. Enjoy!',
+    'index_sidebar-toggle'                  => 'To create new transactions, accounts or other things, use the menu under this icon.',
 
     // create account:
-    'accounts_create_iban'                  => '',
-    'accounts_create_asset_opening_balance' => '',
-    'accounts_create_asset_currency'        => '',
-    'accounts_create_asset_virtual'         => '',
+    'accounts_create_iban'                  => 'Give your accounts a valid IBAN. This could make a data import very easy in the future.',
+    'accounts_create_asset_opening_balance' => 'Assets accounts may have an "opening balance", indicating the start of this account\'s history in Firefly.',
+    'accounts_create_asset_currency'        => 'Firefly III supports multiple currencies. Asset accounts have one main currency, which you must set here.',
+    'accounts_create_asset_virtual'         => 'It can sometimes help to give your account a virtual balance: an extra amount always added to or removed from the actual balance.',
 
     // budgets index
-    'budgets_index_intro'                   => '',
-    'budgets_index_set_budget'              => '',
-    'budgets_index_see_expenses_bar'        => '',
-    'budgets_index_navigate_periods'        => '',
-    'budgets_index_new_budget'              => '',
-    'budgets_index_list_of_budgets'         => '',
+    'budgets_index_intro'                   => 'Budgets are used to manage your finances and form one of the core functions of Firefly III.',
+    'budgets_index_set_budget'              => 'Set your total budget for every period so Firefly can tell you if you have budgeted all available money.',
+    'budgets_index_see_expenses_bar'        => 'Spending money will slowly fill this bar.',
+    'budgets_index_navigate_periods'        => 'Navigate through periods to easily set budgets ahead of time.',
+    'budgets_index_new_budget'              => 'Create new budgets as you see fit.',
+    'budgets_index_list_of_budgets'         => 'Use this table to set the amounts for each budget and see how you are doing.',
 
     // reports (index)
-    'reports_index_intro'                   => '',
-    'reports_index_inputReportType'         => '',
-    'reports_index_inputAccountsSelect'     => '',
-    'reports_index_inputDateRange'          => '',
-    'reports_index_extra-options-box'       => '',
+    'reports_index_intro'                   => 'Use these reports to get detailed insights in your finances.',
+    'reports_index_inputReportType'         => 'Pick a report type. Check out the help pages to see what each report shows you.',
+    'reports_index_inputAccountsSelect'     => 'You can exclude or include asset accounts as you see fit.',
+    'reports_index_inputDateRange'          => 'The selected date range is entirely up to you: from one day to 10 years.',
+    'reports_index_extra-options-box'       => 'Depending on the report you have selected, you can select extra filters and options here. Watch this box when you change report types.',
 
     // reports (reports)
-    'reports_report_default_intro'          => '',
-    'reports_report_audit_intro'            => '',
-    'reports_report_audit_optionsBox'       => '',
+    'reports_report_default_intro'          => 'This report will give you a quick and comprehensive overview of your finances. If you wish to see anything else, please don\'t hestitate to contact me!',
+    'reports_report_audit_intro'            => 'This report will give you detailed insights in your asset accounts.',
+    'reports_report_audit_optionsBox'       => 'Use these check boxes to show or hide the columns you are interested in.',
 
-    'reports_report_category_intro'                  => '',
-    'reports_report_category_pieCharts'              => '',
-    'reports_report_category_incomeAndExpensesChart' => '',
+    'reports_report_category_intro'                  => 'This report will give you insight in one or multiple categories.',
+    'reports_report_category_pieCharts'              => 'These charts will give you insight in expenses and income per category or per account.',
+    'reports_report_category_incomeAndExpensesChart' => 'This chart shows your expenses and income per category.',
 
-    'reports_report_tag_intro'                  => '',
-    'reports_report_tag_pieCharts'              => '',
-    'reports_report_tag_incomeAndExpensesChart' => '',
+    'reports_report_tag_intro'                  => 'This report will give you insight in one or multiple tags.',
+    'reports_report_tag_pieCharts'              => 'These charts will give you insight in expenses and income per tag, account, category or budget.',
+    'reports_report_tag_incomeAndExpensesChart' => 'This chart shows your expenses and income per tag.',
 
-    'reports_report_budget_intro'                             => '',
-    'reports_report_budget_pieCharts'                         => '',
-    'reports_report_budget_incomeAndExpensesChart'            => '',
+    'reports_report_budget_intro'                             => 'This report will give you insight in one or multiple budgets.',
+    'reports_report_budget_pieCharts'                         => 'These charts will give you insight in expenses per budget or per account.',
+    'reports_report_budget_incomeAndExpensesChart'            => 'This chart shows your expenses per budget.',
 
     // create transaction
-    'transactions_create_switch_box'                          => '',
-    'transactions_create_ffInput_category'                    => '',
-    'transactions_create_withdrawal_ffInput_budget'           => '',
-    'transactions_create_withdrawal_currency_dropdown_amount' => '',
-    'transactions_create_deposit_currency_dropdown_amount'    => '',
-    'transactions_create_transfer_ffInput_piggy_bank_id'      => '',
+    'transactions_create_switch_box'                          => 'Use these buttons to quickly switch the type of transaction you wish to save.',
+    'transactions_create_ffInput_category'                    => 'You can freely type in this field. Previously created categories will be suggested.',
+    'transactions_create_withdrawal_ffInput_budget'           => 'Link your withdrawal to a budget for better financial control.',
+    'transactions_create_withdrawal_currency_dropdown_amount' => 'Use this dropdown when your withdrawal is in another currency.',
+    'transactions_create_deposit_currency_dropdown_amount'    => 'Use this dropdown when your deposit is in another currency.',
+    'transactions_create_transfer_ffInput_piggy_bank_id'      => 'Select a piggy bank and link this transfer to your savings.',
 
     // piggy banks index:
-    'piggy-banks_index_saved'                                 => '',
-    'piggy-banks_index_button'                                => '',
-    'piggy-banks_index_accountStatus'                         => '',
+    'piggy-banks_index_saved'                                 => 'This field shows you how much you\'ve saved in each piggy bank.',
+    'piggy-banks_index_button'                                => 'Next to this progress bar are two buttons (+ and -) to add or remove money from each piggy bank.',
+    'piggy-banks_index_accountStatus'                         => 'For each asset account with at least one piggy bank the status is listed in this table.',
 
     // create piggy
-    'piggy-banks_create_name'                                 => '',
-    'piggy-banks_create_date'                                 => '',
+    'piggy-banks_create_name'                                 => 'What is your goal? A new couch, a camera, money for emergencies?',
+    'piggy-banks_create_date'                                 => 'You can set a target date or a deadline for your piggy bank.',
 
     // show piggy
-    'piggy-banks_show_piggyChart'                             => '',
-    'piggy-banks_show_piggyDetails'                           => '',
-    'piggy-banks_show_piggyEvents'                            => '',
+    'piggy-banks_show_piggyChart'                             => 'This chart will show the history of this piggy bank.',
+    'piggy-banks_show_piggyDetails'                           => 'Some details about your piggy bank',
+    'piggy-banks_show_piggyEvents'                            => 'Any additions or removals are also listed here.',
 
     // bill index
-    'bills_index_paid_in_period'                              => '',
-    'bills_index_expected_in_period'                          => '',
+    'bills_index_paid_in_period'                              => 'This field indicates when the bill was last paid.',
+    'bills_index_expected_in_period'                          => 'This field indicates for each bill if and when the next bill is expected to hit.',
 
     // show bill
-    'bills_show_billInfo'                                     => '',
-    'bills_show_billButtons'                                  => '',
-    'bills_show_billChart'                                    => '',
+    'bills_show_billInfo'                                     => 'This table shows some general information about this bill.',
+    'bills_show_billButtons'                                  => 'Use this button to re-scan old transactions so they will be matched to this bill.',
+    'bills_show_billChart'                                    => 'This chart shows the transactions linked to this bill.',
 
     // create bill
-    'bills_create_name'                                       => '',
-    'bills_create_match'                                      => '',
-    'bills_create_amount_min_holder'                          => '',
-    'bills_create_repeat_freq_holder'                         => '',
-    'bills_create_skip_holder'                                => '',
+    'bills_create_name'                                       => 'Use a descriptive name such as "Rent" or "Health insurance".',
+    'bills_create_match'                                      => 'To match transactions, use terms from those transactions or the expense account involved. All words must match.',
+    'bills_create_amount_min_holder'                          => 'Select a minimum and maximum amount for this bill.',
+    'bills_create_repeat_freq_holder'                         => 'Most bills repeat monthly, but you can set another frequency here.',
+    'bills_create_skip_holder'                                => 'If a bill repeats every 2 weeks for example, the "skip"-field should be set to "1" to skip every other week.',
 
     // rules index
-    'rules_index_intro'                                       => '',
-    'rules_index_new_rule_group'                              => '',
-    'rules_index_new_rule'                                    => '',
-    'rules_index_prio_buttons'                                => '',
-    'rules_index_test_buttons'                                => '',
-    'rules_index_rule-triggers'                               => '',
-    'rules_index_outro'                                       => '',
+    'rules_index_intro'                                       => 'Firefly III allows you to manage rules, that will automagically be applied to any transaction you create or edit.',
+    'rules_index_new_rule_group'                              => 'You can combine rules in groups for easier management.',
+    'rules_index_new_rule'                                    => 'Create as many rules as you like.',
+    'rules_index_prio_buttons'                                => 'Order them any way you see fit.',
+    'rules_index_test_buttons'                                => 'You can test your rules or apply them to existing transactions.',
+    'rules_index_rule-triggers'                               => 'Rules have "triggers" and "actions" that you can order by drag-and-drop.',
+    'rules_index_outro'                                       => 'Be sure to check out the help pages using the (?) icon in the top right!',
 
     // create rule:
-    'rules_create_mandatory'                                  => '',
-    'rules_create_ruletriggerholder'                          => '',
-    'rules_create_test_rule_triggers'                         => '',
-    'rules_create_actions'                                    => '',
+    'rules_create_mandatory'                                  => 'Choose a descriptive title, and set when the rule should be fired.',
+    'rules_create_ruletriggerholder'                          => 'Add as many triggers as you like, but remember that ALL triggers must match before any actions are fired.',
+    'rules_create_test_rule_triggers'                         => 'Use this button to see which transactions would match your rule.',
+    'rules_create_actions'                                    => 'Set as many actions as you like.',
 
     // preferences
-    'preferences_index_tabs'                                  => '',
+    'preferences_index_tabs'                                  => 'More options are available behind these tabs.',
 
     // currencies
-    'currencies_index_intro'                                  => '',
-    'currencies_index_default'                                => '',
+    'currencies_index_intro'                                  => 'Firefly III supports multiple currencies, which you can change on this page.',
+    'currencies_index_default'                                => 'Firefly III has one default currency. You can always switch of course using these buttons.',
 
     // create currency
-    'currencies_create_code'                                  => '',
+    'currencies_create_code'                                  => 'This code should be ISO compliant (Google it for your new currency).',
 ];
\ No newline at end of file

From da0436c60eec0bac33028b314168e52dc968d2b8 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Fri, 25 Aug 2017 07:36:18 +0200
Subject: [PATCH 309/668] New translations intro.php (German)

---
 resources/lang/de_DE/intro.php | 144 ++++++++++++++++-----------------
 1 file changed, 72 insertions(+), 72 deletions(-)

diff --git a/resources/lang/de_DE/intro.php b/resources/lang/de_DE/intro.php
index cca2854e02..c161cef362 100644
--- a/resources/lang/de_DE/intro.php
+++ b/resources/lang/de_DE/intro.php
@@ -11,111 +11,111 @@ declare(strict_types=1);
 
 return [
     // index
-    'index_intro'                           => '',
-    'index_accounts-chart'                  => '',
-    'index_box_out_holder'                  => '',
-    'index_help'                            => '',
-    'index_outro'                           => '',
-    'index_sidebar-toggle'                  => '',
+    'index_intro'                           => 'Welcome to the index page of Firefly III. Please take the time to walk through this intro to get a feeling of how Firefly III works.',
+    'index_accounts-chart'                  => 'This chart shows the current balance of your asset accounts. You can select the accounts visible here in your preferences.',
+    'index_box_out_holder'                  => 'This little box and the boxes next to this one will give you a quick overview of your financial situation.',
+    'index_help'                            => 'If you ever need help with a page or a form, press this button.',
+    'index_outro'                           => 'Most pages of Firefly III will start with a little tour like this one. Please contact me when you have questions or comments. Enjoy!',
+    'index_sidebar-toggle'                  => 'To create new transactions, accounts or other things, use the menu under this icon.',
 
     // create account:
-    'accounts_create_iban'                  => '',
-    'accounts_create_asset_opening_balance' => '',
-    'accounts_create_asset_currency'        => '',
-    'accounts_create_asset_virtual'         => '',
+    'accounts_create_iban'                  => 'Give your accounts a valid IBAN. This could make a data import very easy in the future.',
+    'accounts_create_asset_opening_balance' => 'Assets accounts may have an "opening balance", indicating the start of this account\'s history in Firefly.',
+    'accounts_create_asset_currency'        => 'Firefly III supports multiple currencies. Asset accounts have one main currency, which you must set here.',
+    'accounts_create_asset_virtual'         => 'It can sometimes help to give your account a virtual balance: an extra amount always added to or removed from the actual balance.',
 
     // budgets index
-    'budgets_index_intro'                   => '',
-    'budgets_index_set_budget'              => '',
-    'budgets_index_see_expenses_bar'        => '',
-    'budgets_index_navigate_periods'        => '',
-    'budgets_index_new_budget'              => '',
-    'budgets_index_list_of_budgets'         => '',
+    'budgets_index_intro'                   => 'Budgets are used to manage your finances and form one of the core functions of Firefly III.',
+    'budgets_index_set_budget'              => 'Set your total budget for every period so Firefly can tell you if you have budgeted all available money.',
+    'budgets_index_see_expenses_bar'        => 'Spending money will slowly fill this bar.',
+    'budgets_index_navigate_periods'        => 'Navigate through periods to easily set budgets ahead of time.',
+    'budgets_index_new_budget'              => 'Create new budgets as you see fit.',
+    'budgets_index_list_of_budgets'         => 'Use this table to set the amounts for each budget and see how you are doing.',
 
     // reports (index)
-    'reports_index_intro'                   => '',
-    'reports_index_inputReportType'         => '',
-    'reports_index_inputAccountsSelect'     => '',
-    'reports_index_inputDateRange'          => '',
-    'reports_index_extra-options-box'       => '',
+    'reports_index_intro'                   => 'Use these reports to get detailed insights in your finances.',
+    'reports_index_inputReportType'         => 'Pick a report type. Check out the help pages to see what each report shows you.',
+    'reports_index_inputAccountsSelect'     => 'You can exclude or include asset accounts as you see fit.',
+    'reports_index_inputDateRange'          => 'The selected date range is entirely up to you: from one day to 10 years.',
+    'reports_index_extra-options-box'       => 'Depending on the report you have selected, you can select extra filters and options here. Watch this box when you change report types.',
 
     // reports (reports)
-    'reports_report_default_intro'          => '',
-    'reports_report_audit_intro'            => '',
-    'reports_report_audit_optionsBox'       => '',
+    'reports_report_default_intro'          => 'This report will give you a quick and comprehensive overview of your finances. If you wish to see anything else, please don\'t hestitate to contact me!',
+    'reports_report_audit_intro'            => 'This report will give you detailed insights in your asset accounts.',
+    'reports_report_audit_optionsBox'       => 'Use these check boxes to show or hide the columns you are interested in.',
 
-    'reports_report_category_intro'                  => '',
-    'reports_report_category_pieCharts'              => '',
-    'reports_report_category_incomeAndExpensesChart' => '',
+    'reports_report_category_intro'                  => 'This report will give you insight in one or multiple categories.',
+    'reports_report_category_pieCharts'              => 'These charts will give you insight in expenses and income per category or per account.',
+    'reports_report_category_incomeAndExpensesChart' => 'This chart shows your expenses and income per category.',
 
-    'reports_report_tag_intro'                  => '',
-    'reports_report_tag_pieCharts'              => '',
-    'reports_report_tag_incomeAndExpensesChart' => '',
+    'reports_report_tag_intro'                  => 'This report will give you insight in one or multiple tags.',
+    'reports_report_tag_pieCharts'              => 'These charts will give you insight in expenses and income per tag, account, category or budget.',
+    'reports_report_tag_incomeAndExpensesChart' => 'This chart shows your expenses and income per tag.',
 
-    'reports_report_budget_intro'                             => '',
-    'reports_report_budget_pieCharts'                         => '',
-    'reports_report_budget_incomeAndExpensesChart'            => '',
+    'reports_report_budget_intro'                             => 'This report will give you insight in one or multiple budgets.',
+    'reports_report_budget_pieCharts'                         => 'These charts will give you insight in expenses per budget or per account.',
+    'reports_report_budget_incomeAndExpensesChart'            => 'This chart shows your expenses per budget.',
 
     // create transaction
-    'transactions_create_switch_box'                          => '',
-    'transactions_create_ffInput_category'                    => '',
-    'transactions_create_withdrawal_ffInput_budget'           => '',
-    'transactions_create_withdrawal_currency_dropdown_amount' => '',
-    'transactions_create_deposit_currency_dropdown_amount'    => '',
-    'transactions_create_transfer_ffInput_piggy_bank_id'      => '',
+    'transactions_create_switch_box'                          => 'Use these buttons to quickly switch the type of transaction you wish to save.',
+    'transactions_create_ffInput_category'                    => 'You can freely type in this field. Previously created categories will be suggested.',
+    'transactions_create_withdrawal_ffInput_budget'           => 'Link your withdrawal to a budget for better financial control.',
+    'transactions_create_withdrawal_currency_dropdown_amount' => 'Use this dropdown when your withdrawal is in another currency.',
+    'transactions_create_deposit_currency_dropdown_amount'    => 'Use this dropdown when your deposit is in another currency.',
+    'transactions_create_transfer_ffInput_piggy_bank_id'      => 'Select a piggy bank and link this transfer to your savings.',
 
     // piggy banks index:
-    'piggy-banks_index_saved'                                 => '',
-    'piggy-banks_index_button'                                => '',
-    'piggy-banks_index_accountStatus'                         => '',
+    'piggy-banks_index_saved'                                 => 'This field shows you how much you\'ve saved in each piggy bank.',
+    'piggy-banks_index_button'                                => 'Next to this progress bar are two buttons (+ and -) to add or remove money from each piggy bank.',
+    'piggy-banks_index_accountStatus'                         => 'For each asset account with at least one piggy bank the status is listed in this table.',
 
     // create piggy
-    'piggy-banks_create_name'                                 => '',
-    'piggy-banks_create_date'                                 => '',
+    'piggy-banks_create_name'                                 => 'What is your goal? A new couch, a camera, money for emergencies?',
+    'piggy-banks_create_date'                                 => 'You can set a target date or a deadline for your piggy bank.',
 
     // show piggy
-    'piggy-banks_show_piggyChart'                             => '',
-    'piggy-banks_show_piggyDetails'                           => '',
-    'piggy-banks_show_piggyEvents'                            => '',
+    'piggy-banks_show_piggyChart'                             => 'This chart will show the history of this piggy bank.',
+    'piggy-banks_show_piggyDetails'                           => 'Some details about your piggy bank',
+    'piggy-banks_show_piggyEvents'                            => 'Any additions or removals are also listed here.',
 
     // bill index
-    'bills_index_paid_in_period'                              => '',
-    'bills_index_expected_in_period'                          => '',
+    'bills_index_paid_in_period'                              => 'This field indicates when the bill was last paid.',
+    'bills_index_expected_in_period'                          => 'This field indicates for each bill if and when the next bill is expected to hit.',
 
     // show bill
-    'bills_show_billInfo'                                     => '',
-    'bills_show_billButtons'                                  => '',
-    'bills_show_billChart'                                    => '',
+    'bills_show_billInfo'                                     => 'This table shows some general information about this bill.',
+    'bills_show_billButtons'                                  => 'Use this button to re-scan old transactions so they will be matched to this bill.',
+    'bills_show_billChart'                                    => 'This chart shows the transactions linked to this bill.',
 
     // create bill
-    'bills_create_name'                                       => '',
-    'bills_create_match'                                      => '',
-    'bills_create_amount_min_holder'                          => '',
-    'bills_create_repeat_freq_holder'                         => '',
-    'bills_create_skip_holder'                                => '',
+    'bills_create_name'                                       => 'Use a descriptive name such as "Rent" or "Health insurance".',
+    'bills_create_match'                                      => 'To match transactions, use terms from those transactions or the expense account involved. All words must match.',
+    'bills_create_amount_min_holder'                          => 'Select a minimum and maximum amount for this bill.',
+    'bills_create_repeat_freq_holder'                         => 'Most bills repeat monthly, but you can set another frequency here.',
+    'bills_create_skip_holder'                                => 'If a bill repeats every 2 weeks for example, the "skip"-field should be set to "1" to skip every other week.',
 
     // rules index
-    'rules_index_intro'                                       => '',
-    'rules_index_new_rule_group'                              => '',
-    'rules_index_new_rule'                                    => '',
-    'rules_index_prio_buttons'                                => '',
-    'rules_index_test_buttons'                                => '',
-    'rules_index_rule-triggers'                               => '',
-    'rules_index_outro'                                       => '',
+    'rules_index_intro'                                       => 'Firefly III allows you to manage rules, that will automagically be applied to any transaction you create or edit.',
+    'rules_index_new_rule_group'                              => 'You can combine rules in groups for easier management.',
+    'rules_index_new_rule'                                    => 'Create as many rules as you like.',
+    'rules_index_prio_buttons'                                => 'Order them any way you see fit.',
+    'rules_index_test_buttons'                                => 'You can test your rules or apply them to existing transactions.',
+    'rules_index_rule-triggers'                               => 'Rules have "triggers" and "actions" that you can order by drag-and-drop.',
+    'rules_index_outro'                                       => 'Be sure to check out the help pages using the (?) icon in the top right!',
 
     // create rule:
-    'rules_create_mandatory'                                  => '',
-    'rules_create_ruletriggerholder'                          => '',
-    'rules_create_test_rule_triggers'                         => '',
-    'rules_create_actions'                                    => '',
+    'rules_create_mandatory'                                  => 'Choose a descriptive title, and set when the rule should be fired.',
+    'rules_create_ruletriggerholder'                          => 'Add as many triggers as you like, but remember that ALL triggers must match before any actions are fired.',
+    'rules_create_test_rule_triggers'                         => 'Use this button to see which transactions would match your rule.',
+    'rules_create_actions'                                    => 'Set as many actions as you like.',
 
     // preferences
-    'preferences_index_tabs'                                  => '',
+    'preferences_index_tabs'                                  => 'More options are available behind these tabs.',
 
     // currencies
-    'currencies_index_intro'                                  => '',
-    'currencies_index_default'                                => '',
+    'currencies_index_intro'                                  => 'Firefly III supports multiple currencies, which you can change on this page.',
+    'currencies_index_default'                                => 'Firefly III has one default currency. You can always switch of course using these buttons.',
 
     // create currency
-    'currencies_create_code'                                  => '',
+    'currencies_create_code'                                  => 'This code should be ISO compliant (Google it for your new currency).',
 ];
\ No newline at end of file

From 20947bc8c1f78213e2a029735f1ae5768d4383b4 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Fri, 25 Aug 2017 07:36:20 +0200
Subject: [PATCH 310/668] New translations intro.php (Slovenian)

---
 resources/lang/sl_SI/intro.php | 144 ++++++++++++++++-----------------
 1 file changed, 72 insertions(+), 72 deletions(-)

diff --git a/resources/lang/sl_SI/intro.php b/resources/lang/sl_SI/intro.php
index cca2854e02..c161cef362 100644
--- a/resources/lang/sl_SI/intro.php
+++ b/resources/lang/sl_SI/intro.php
@@ -11,111 +11,111 @@ declare(strict_types=1);
 
 return [
     // index
-    'index_intro'                           => '',
-    'index_accounts-chart'                  => '',
-    'index_box_out_holder'                  => '',
-    'index_help'                            => '',
-    'index_outro'                           => '',
-    'index_sidebar-toggle'                  => '',
+    'index_intro'                           => 'Welcome to the index page of Firefly III. Please take the time to walk through this intro to get a feeling of how Firefly III works.',
+    'index_accounts-chart'                  => 'This chart shows the current balance of your asset accounts. You can select the accounts visible here in your preferences.',
+    'index_box_out_holder'                  => 'This little box and the boxes next to this one will give you a quick overview of your financial situation.',
+    'index_help'                            => 'If you ever need help with a page or a form, press this button.',
+    'index_outro'                           => 'Most pages of Firefly III will start with a little tour like this one. Please contact me when you have questions or comments. Enjoy!',
+    'index_sidebar-toggle'                  => 'To create new transactions, accounts or other things, use the menu under this icon.',
 
     // create account:
-    'accounts_create_iban'                  => '',
-    'accounts_create_asset_opening_balance' => '',
-    'accounts_create_asset_currency'        => '',
-    'accounts_create_asset_virtual'         => '',
+    'accounts_create_iban'                  => 'Give your accounts a valid IBAN. This could make a data import very easy in the future.',
+    'accounts_create_asset_opening_balance' => 'Assets accounts may have an "opening balance", indicating the start of this account\'s history in Firefly.',
+    'accounts_create_asset_currency'        => 'Firefly III supports multiple currencies. Asset accounts have one main currency, which you must set here.',
+    'accounts_create_asset_virtual'         => 'It can sometimes help to give your account a virtual balance: an extra amount always added to or removed from the actual balance.',
 
     // budgets index
-    'budgets_index_intro'                   => '',
-    'budgets_index_set_budget'              => '',
-    'budgets_index_see_expenses_bar'        => '',
-    'budgets_index_navigate_periods'        => '',
-    'budgets_index_new_budget'              => '',
-    'budgets_index_list_of_budgets'         => '',
+    'budgets_index_intro'                   => 'Budgets are used to manage your finances and form one of the core functions of Firefly III.',
+    'budgets_index_set_budget'              => 'Set your total budget for every period so Firefly can tell you if you have budgeted all available money.',
+    'budgets_index_see_expenses_bar'        => 'Spending money will slowly fill this bar.',
+    'budgets_index_navigate_periods'        => 'Navigate through periods to easily set budgets ahead of time.',
+    'budgets_index_new_budget'              => 'Create new budgets as you see fit.',
+    'budgets_index_list_of_budgets'         => 'Use this table to set the amounts for each budget and see how you are doing.',
 
     // reports (index)
-    'reports_index_intro'                   => '',
-    'reports_index_inputReportType'         => '',
-    'reports_index_inputAccountsSelect'     => '',
-    'reports_index_inputDateRange'          => '',
-    'reports_index_extra-options-box'       => '',
+    'reports_index_intro'                   => 'Use these reports to get detailed insights in your finances.',
+    'reports_index_inputReportType'         => 'Pick a report type. Check out the help pages to see what each report shows you.',
+    'reports_index_inputAccountsSelect'     => 'You can exclude or include asset accounts as you see fit.',
+    'reports_index_inputDateRange'          => 'The selected date range is entirely up to you: from one day to 10 years.',
+    'reports_index_extra-options-box'       => 'Depending on the report you have selected, you can select extra filters and options here. Watch this box when you change report types.',
 
     // reports (reports)
-    'reports_report_default_intro'          => '',
-    'reports_report_audit_intro'            => '',
-    'reports_report_audit_optionsBox'       => '',
+    'reports_report_default_intro'          => 'This report will give you a quick and comprehensive overview of your finances. If you wish to see anything else, please don\'t hestitate to contact me!',
+    'reports_report_audit_intro'            => 'This report will give you detailed insights in your asset accounts.',
+    'reports_report_audit_optionsBox'       => 'Use these check boxes to show or hide the columns you are interested in.',
 
-    'reports_report_category_intro'                  => '',
-    'reports_report_category_pieCharts'              => '',
-    'reports_report_category_incomeAndExpensesChart' => '',
+    'reports_report_category_intro'                  => 'This report will give you insight in one or multiple categories.',
+    'reports_report_category_pieCharts'              => 'These charts will give you insight in expenses and income per category or per account.',
+    'reports_report_category_incomeAndExpensesChart' => 'This chart shows your expenses and income per category.',
 
-    'reports_report_tag_intro'                  => '',
-    'reports_report_tag_pieCharts'              => '',
-    'reports_report_tag_incomeAndExpensesChart' => '',
+    'reports_report_tag_intro'                  => 'This report will give you insight in one or multiple tags.',
+    'reports_report_tag_pieCharts'              => 'These charts will give you insight in expenses and income per tag, account, category or budget.',
+    'reports_report_tag_incomeAndExpensesChart' => 'This chart shows your expenses and income per tag.',
 
-    'reports_report_budget_intro'                             => '',
-    'reports_report_budget_pieCharts'                         => '',
-    'reports_report_budget_incomeAndExpensesChart'            => '',
+    'reports_report_budget_intro'                             => 'This report will give you insight in one or multiple budgets.',
+    'reports_report_budget_pieCharts'                         => 'These charts will give you insight in expenses per budget or per account.',
+    'reports_report_budget_incomeAndExpensesChart'            => 'This chart shows your expenses per budget.',
 
     // create transaction
-    'transactions_create_switch_box'                          => '',
-    'transactions_create_ffInput_category'                    => '',
-    'transactions_create_withdrawal_ffInput_budget'           => '',
-    'transactions_create_withdrawal_currency_dropdown_amount' => '',
-    'transactions_create_deposit_currency_dropdown_amount'    => '',
-    'transactions_create_transfer_ffInput_piggy_bank_id'      => '',
+    'transactions_create_switch_box'                          => 'Use these buttons to quickly switch the type of transaction you wish to save.',
+    'transactions_create_ffInput_category'                    => 'You can freely type in this field. Previously created categories will be suggested.',
+    'transactions_create_withdrawal_ffInput_budget'           => 'Link your withdrawal to a budget for better financial control.',
+    'transactions_create_withdrawal_currency_dropdown_amount' => 'Use this dropdown when your withdrawal is in another currency.',
+    'transactions_create_deposit_currency_dropdown_amount'    => 'Use this dropdown when your deposit is in another currency.',
+    'transactions_create_transfer_ffInput_piggy_bank_id'      => 'Select a piggy bank and link this transfer to your savings.',
 
     // piggy banks index:
-    'piggy-banks_index_saved'                                 => '',
-    'piggy-banks_index_button'                                => '',
-    'piggy-banks_index_accountStatus'                         => '',
+    'piggy-banks_index_saved'                                 => 'This field shows you how much you\'ve saved in each piggy bank.',
+    'piggy-banks_index_button'                                => 'Next to this progress bar are two buttons (+ and -) to add or remove money from each piggy bank.',
+    'piggy-banks_index_accountStatus'                         => 'For each asset account with at least one piggy bank the status is listed in this table.',
 
     // create piggy
-    'piggy-banks_create_name'                                 => '',
-    'piggy-banks_create_date'                                 => '',
+    'piggy-banks_create_name'                                 => 'What is your goal? A new couch, a camera, money for emergencies?',
+    'piggy-banks_create_date'                                 => 'You can set a target date or a deadline for your piggy bank.',
 
     // show piggy
-    'piggy-banks_show_piggyChart'                             => '',
-    'piggy-banks_show_piggyDetails'                           => '',
-    'piggy-banks_show_piggyEvents'                            => '',
+    'piggy-banks_show_piggyChart'                             => 'This chart will show the history of this piggy bank.',
+    'piggy-banks_show_piggyDetails'                           => 'Some details about your piggy bank',
+    'piggy-banks_show_piggyEvents'                            => 'Any additions or removals are also listed here.',
 
     // bill index
-    'bills_index_paid_in_period'                              => '',
-    'bills_index_expected_in_period'                          => '',
+    'bills_index_paid_in_period'                              => 'This field indicates when the bill was last paid.',
+    'bills_index_expected_in_period'                          => 'This field indicates for each bill if and when the next bill is expected to hit.',
 
     // show bill
-    'bills_show_billInfo'                                     => '',
-    'bills_show_billButtons'                                  => '',
-    'bills_show_billChart'                                    => '',
+    'bills_show_billInfo'                                     => 'This table shows some general information about this bill.',
+    'bills_show_billButtons'                                  => 'Use this button to re-scan old transactions so they will be matched to this bill.',
+    'bills_show_billChart'                                    => 'This chart shows the transactions linked to this bill.',
 
     // create bill
-    'bills_create_name'                                       => '',
-    'bills_create_match'                                      => '',
-    'bills_create_amount_min_holder'                          => '',
-    'bills_create_repeat_freq_holder'                         => '',
-    'bills_create_skip_holder'                                => '',
+    'bills_create_name'                                       => 'Use a descriptive name such as "Rent" or "Health insurance".',
+    'bills_create_match'                                      => 'To match transactions, use terms from those transactions or the expense account involved. All words must match.',
+    'bills_create_amount_min_holder'                          => 'Select a minimum and maximum amount for this bill.',
+    'bills_create_repeat_freq_holder'                         => 'Most bills repeat monthly, but you can set another frequency here.',
+    'bills_create_skip_holder'                                => 'If a bill repeats every 2 weeks for example, the "skip"-field should be set to "1" to skip every other week.',
 
     // rules index
-    'rules_index_intro'                                       => '',
-    'rules_index_new_rule_group'                              => '',
-    'rules_index_new_rule'                                    => '',
-    'rules_index_prio_buttons'                                => '',
-    'rules_index_test_buttons'                                => '',
-    'rules_index_rule-triggers'                               => '',
-    'rules_index_outro'                                       => '',
+    'rules_index_intro'                                       => 'Firefly III allows you to manage rules, that will automagically be applied to any transaction you create or edit.',
+    'rules_index_new_rule_group'                              => 'You can combine rules in groups for easier management.',
+    'rules_index_new_rule'                                    => 'Create as many rules as you like.',
+    'rules_index_prio_buttons'                                => 'Order them any way you see fit.',
+    'rules_index_test_buttons'                                => 'You can test your rules or apply them to existing transactions.',
+    'rules_index_rule-triggers'                               => 'Rules have "triggers" and "actions" that you can order by drag-and-drop.',
+    'rules_index_outro'                                       => 'Be sure to check out the help pages using the (?) icon in the top right!',
 
     // create rule:
-    'rules_create_mandatory'                                  => '',
-    'rules_create_ruletriggerholder'                          => '',
-    'rules_create_test_rule_triggers'                         => '',
-    'rules_create_actions'                                    => '',
+    'rules_create_mandatory'                                  => 'Choose a descriptive title, and set when the rule should be fired.',
+    'rules_create_ruletriggerholder'                          => 'Add as many triggers as you like, but remember that ALL triggers must match before any actions are fired.',
+    'rules_create_test_rule_triggers'                         => 'Use this button to see which transactions would match your rule.',
+    'rules_create_actions'                                    => 'Set as many actions as you like.',
 
     // preferences
-    'preferences_index_tabs'                                  => '',
+    'preferences_index_tabs'                                  => 'More options are available behind these tabs.',
 
     // currencies
-    'currencies_index_intro'                                  => '',
-    'currencies_index_default'                                => '',
+    'currencies_index_intro'                                  => 'Firefly III supports multiple currencies, which you can change on this page.',
+    'currencies_index_default'                                => 'Firefly III has one default currency. You can always switch of course using these buttons.',
 
     // create currency
-    'currencies_create_code'                                  => '',
+    'currencies_create_code'                                  => 'This code should be ISO compliant (Google it for your new currency).',
 ];
\ No newline at end of file

From 8a4355e786222ef56f7f5c65a332518495531bcf Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Fri, 25 Aug 2017 07:36:21 +0200
Subject: [PATCH 311/668] New translations intro.php (Spanish)

---
 resources/lang/es_ES/intro.php | 144 ++++++++++++++++-----------------
 1 file changed, 72 insertions(+), 72 deletions(-)

diff --git a/resources/lang/es_ES/intro.php b/resources/lang/es_ES/intro.php
index cca2854e02..c161cef362 100644
--- a/resources/lang/es_ES/intro.php
+++ b/resources/lang/es_ES/intro.php
@@ -11,111 +11,111 @@ declare(strict_types=1);
 
 return [
     // index
-    'index_intro'                           => '',
-    'index_accounts-chart'                  => '',
-    'index_box_out_holder'                  => '',
-    'index_help'                            => '',
-    'index_outro'                           => '',
-    'index_sidebar-toggle'                  => '',
+    'index_intro'                           => 'Welcome to the index page of Firefly III. Please take the time to walk through this intro to get a feeling of how Firefly III works.',
+    'index_accounts-chart'                  => 'This chart shows the current balance of your asset accounts. You can select the accounts visible here in your preferences.',
+    'index_box_out_holder'                  => 'This little box and the boxes next to this one will give you a quick overview of your financial situation.',
+    'index_help'                            => 'If you ever need help with a page or a form, press this button.',
+    'index_outro'                           => 'Most pages of Firefly III will start with a little tour like this one. Please contact me when you have questions or comments. Enjoy!',
+    'index_sidebar-toggle'                  => 'To create new transactions, accounts or other things, use the menu under this icon.',
 
     // create account:
-    'accounts_create_iban'                  => '',
-    'accounts_create_asset_opening_balance' => '',
-    'accounts_create_asset_currency'        => '',
-    'accounts_create_asset_virtual'         => '',
+    'accounts_create_iban'                  => 'Give your accounts a valid IBAN. This could make a data import very easy in the future.',
+    'accounts_create_asset_opening_balance' => 'Assets accounts may have an "opening balance", indicating the start of this account\'s history in Firefly.',
+    'accounts_create_asset_currency'        => 'Firefly III supports multiple currencies. Asset accounts have one main currency, which you must set here.',
+    'accounts_create_asset_virtual'         => 'It can sometimes help to give your account a virtual balance: an extra amount always added to or removed from the actual balance.',
 
     // budgets index
-    'budgets_index_intro'                   => '',
-    'budgets_index_set_budget'              => '',
-    'budgets_index_see_expenses_bar'        => '',
-    'budgets_index_navigate_periods'        => '',
-    'budgets_index_new_budget'              => '',
-    'budgets_index_list_of_budgets'         => '',
+    'budgets_index_intro'                   => 'Budgets are used to manage your finances and form one of the core functions of Firefly III.',
+    'budgets_index_set_budget'              => 'Set your total budget for every period so Firefly can tell you if you have budgeted all available money.',
+    'budgets_index_see_expenses_bar'        => 'Spending money will slowly fill this bar.',
+    'budgets_index_navigate_periods'        => 'Navigate through periods to easily set budgets ahead of time.',
+    'budgets_index_new_budget'              => 'Create new budgets as you see fit.',
+    'budgets_index_list_of_budgets'         => 'Use this table to set the amounts for each budget and see how you are doing.',
 
     // reports (index)
-    'reports_index_intro'                   => '',
-    'reports_index_inputReportType'         => '',
-    'reports_index_inputAccountsSelect'     => '',
-    'reports_index_inputDateRange'          => '',
-    'reports_index_extra-options-box'       => '',
+    'reports_index_intro'                   => 'Use these reports to get detailed insights in your finances.',
+    'reports_index_inputReportType'         => 'Pick a report type. Check out the help pages to see what each report shows you.',
+    'reports_index_inputAccountsSelect'     => 'You can exclude or include asset accounts as you see fit.',
+    'reports_index_inputDateRange'          => 'The selected date range is entirely up to you: from one day to 10 years.',
+    'reports_index_extra-options-box'       => 'Depending on the report you have selected, you can select extra filters and options here. Watch this box when you change report types.',
 
     // reports (reports)
-    'reports_report_default_intro'          => '',
-    'reports_report_audit_intro'            => '',
-    'reports_report_audit_optionsBox'       => '',
+    'reports_report_default_intro'          => 'This report will give you a quick and comprehensive overview of your finances. If you wish to see anything else, please don\'t hestitate to contact me!',
+    'reports_report_audit_intro'            => 'This report will give you detailed insights in your asset accounts.',
+    'reports_report_audit_optionsBox'       => 'Use these check boxes to show or hide the columns you are interested in.',
 
-    'reports_report_category_intro'                  => '',
-    'reports_report_category_pieCharts'              => '',
-    'reports_report_category_incomeAndExpensesChart' => '',
+    'reports_report_category_intro'                  => 'This report will give you insight in one or multiple categories.',
+    'reports_report_category_pieCharts'              => 'These charts will give you insight in expenses and income per category or per account.',
+    'reports_report_category_incomeAndExpensesChart' => 'This chart shows your expenses and income per category.',
 
-    'reports_report_tag_intro'                  => '',
-    'reports_report_tag_pieCharts'              => '',
-    'reports_report_tag_incomeAndExpensesChart' => '',
+    'reports_report_tag_intro'                  => 'This report will give you insight in one or multiple tags.',
+    'reports_report_tag_pieCharts'              => 'These charts will give you insight in expenses and income per tag, account, category or budget.',
+    'reports_report_tag_incomeAndExpensesChart' => 'This chart shows your expenses and income per tag.',
 
-    'reports_report_budget_intro'                             => '',
-    'reports_report_budget_pieCharts'                         => '',
-    'reports_report_budget_incomeAndExpensesChart'            => '',
+    'reports_report_budget_intro'                             => 'This report will give you insight in one or multiple budgets.',
+    'reports_report_budget_pieCharts'                         => 'These charts will give you insight in expenses per budget or per account.',
+    'reports_report_budget_incomeAndExpensesChart'            => 'This chart shows your expenses per budget.',
 
     // create transaction
-    'transactions_create_switch_box'                          => '',
-    'transactions_create_ffInput_category'                    => '',
-    'transactions_create_withdrawal_ffInput_budget'           => '',
-    'transactions_create_withdrawal_currency_dropdown_amount' => '',
-    'transactions_create_deposit_currency_dropdown_amount'    => '',
-    'transactions_create_transfer_ffInput_piggy_bank_id'      => '',
+    'transactions_create_switch_box'                          => 'Use these buttons to quickly switch the type of transaction you wish to save.',
+    'transactions_create_ffInput_category'                    => 'You can freely type in this field. Previously created categories will be suggested.',
+    'transactions_create_withdrawal_ffInput_budget'           => 'Link your withdrawal to a budget for better financial control.',
+    'transactions_create_withdrawal_currency_dropdown_amount' => 'Use this dropdown when your withdrawal is in another currency.',
+    'transactions_create_deposit_currency_dropdown_amount'    => 'Use this dropdown when your deposit is in another currency.',
+    'transactions_create_transfer_ffInput_piggy_bank_id'      => 'Select a piggy bank and link this transfer to your savings.',
 
     // piggy banks index:
-    'piggy-banks_index_saved'                                 => '',
-    'piggy-banks_index_button'                                => '',
-    'piggy-banks_index_accountStatus'                         => '',
+    'piggy-banks_index_saved'                                 => 'This field shows you how much you\'ve saved in each piggy bank.',
+    'piggy-banks_index_button'                                => 'Next to this progress bar are two buttons (+ and -) to add or remove money from each piggy bank.',
+    'piggy-banks_index_accountStatus'                         => 'For each asset account with at least one piggy bank the status is listed in this table.',
 
     // create piggy
-    'piggy-banks_create_name'                                 => '',
-    'piggy-banks_create_date'                                 => '',
+    'piggy-banks_create_name'                                 => 'What is your goal? A new couch, a camera, money for emergencies?',
+    'piggy-banks_create_date'                                 => 'You can set a target date or a deadline for your piggy bank.',
 
     // show piggy
-    'piggy-banks_show_piggyChart'                             => '',
-    'piggy-banks_show_piggyDetails'                           => '',
-    'piggy-banks_show_piggyEvents'                            => '',
+    'piggy-banks_show_piggyChart'                             => 'This chart will show the history of this piggy bank.',
+    'piggy-banks_show_piggyDetails'                           => 'Some details about your piggy bank',
+    'piggy-banks_show_piggyEvents'                            => 'Any additions or removals are also listed here.',
 
     // bill index
-    'bills_index_paid_in_period'                              => '',
-    'bills_index_expected_in_period'                          => '',
+    'bills_index_paid_in_period'                              => 'This field indicates when the bill was last paid.',
+    'bills_index_expected_in_period'                          => 'This field indicates for each bill if and when the next bill is expected to hit.',
 
     // show bill
-    'bills_show_billInfo'                                     => '',
-    'bills_show_billButtons'                                  => '',
-    'bills_show_billChart'                                    => '',
+    'bills_show_billInfo'                                     => 'This table shows some general information about this bill.',
+    'bills_show_billButtons'                                  => 'Use this button to re-scan old transactions so they will be matched to this bill.',
+    'bills_show_billChart'                                    => 'This chart shows the transactions linked to this bill.',
 
     // create bill
-    'bills_create_name'                                       => '',
-    'bills_create_match'                                      => '',
-    'bills_create_amount_min_holder'                          => '',
-    'bills_create_repeat_freq_holder'                         => '',
-    'bills_create_skip_holder'                                => '',
+    'bills_create_name'                                       => 'Use a descriptive name such as "Rent" or "Health insurance".',
+    'bills_create_match'                                      => 'To match transactions, use terms from those transactions or the expense account involved. All words must match.',
+    'bills_create_amount_min_holder'                          => 'Select a minimum and maximum amount for this bill.',
+    'bills_create_repeat_freq_holder'                         => 'Most bills repeat monthly, but you can set another frequency here.',
+    'bills_create_skip_holder'                                => 'If a bill repeats every 2 weeks for example, the "skip"-field should be set to "1" to skip every other week.',
 
     // rules index
-    'rules_index_intro'                                       => '',
-    'rules_index_new_rule_group'                              => '',
-    'rules_index_new_rule'                                    => '',
-    'rules_index_prio_buttons'                                => '',
-    'rules_index_test_buttons'                                => '',
-    'rules_index_rule-triggers'                               => '',
-    'rules_index_outro'                                       => '',
+    'rules_index_intro'                                       => 'Firefly III allows you to manage rules, that will automagically be applied to any transaction you create or edit.',
+    'rules_index_new_rule_group'                              => 'You can combine rules in groups for easier management.',
+    'rules_index_new_rule'                                    => 'Create as many rules as you like.',
+    'rules_index_prio_buttons'                                => 'Order them any way you see fit.',
+    'rules_index_test_buttons'                                => 'You can test your rules or apply them to existing transactions.',
+    'rules_index_rule-triggers'                               => 'Rules have "triggers" and "actions" that you can order by drag-and-drop.',
+    'rules_index_outro'                                       => 'Be sure to check out the help pages using the (?) icon in the top right!',
 
     // create rule:
-    'rules_create_mandatory'                                  => '',
-    'rules_create_ruletriggerholder'                          => '',
-    'rules_create_test_rule_triggers'                         => '',
-    'rules_create_actions'                                    => '',
+    'rules_create_mandatory'                                  => 'Choose a descriptive title, and set when the rule should be fired.',
+    'rules_create_ruletriggerholder'                          => 'Add as many triggers as you like, but remember that ALL triggers must match before any actions are fired.',
+    'rules_create_test_rule_triggers'                         => 'Use this button to see which transactions would match your rule.',
+    'rules_create_actions'                                    => 'Set as many actions as you like.',
 
     // preferences
-    'preferences_index_tabs'                                  => '',
+    'preferences_index_tabs'                                  => 'More options are available behind these tabs.',
 
     // currencies
-    'currencies_index_intro'                                  => '',
-    'currencies_index_default'                                => '',
+    'currencies_index_intro'                                  => 'Firefly III supports multiple currencies, which you can change on this page.',
+    'currencies_index_default'                                => 'Firefly III has one default currency. You can always switch of course using these buttons.',
 
     // create currency
-    'currencies_create_code'                                  => '',
+    'currencies_create_code'                                  => 'This code should be ISO compliant (Google it for your new currency).',
 ];
\ No newline at end of file

From 81089e989bfd8b93357f364b76e1af312e52cbd3 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Fri, 25 Aug 2017 07:36:22 +0200
Subject: [PATCH 312/668] New translations intro.php (Russian)

---
 resources/lang/ru_RU/intro.php | 144 ++++++++++++++++-----------------
 1 file changed, 72 insertions(+), 72 deletions(-)

diff --git a/resources/lang/ru_RU/intro.php b/resources/lang/ru_RU/intro.php
index cca2854e02..c161cef362 100644
--- a/resources/lang/ru_RU/intro.php
+++ b/resources/lang/ru_RU/intro.php
@@ -11,111 +11,111 @@ declare(strict_types=1);
 
 return [
     // index
-    'index_intro'                           => '',
-    'index_accounts-chart'                  => '',
-    'index_box_out_holder'                  => '',
-    'index_help'                            => '',
-    'index_outro'                           => '',
-    'index_sidebar-toggle'                  => '',
+    'index_intro'                           => 'Welcome to the index page of Firefly III. Please take the time to walk through this intro to get a feeling of how Firefly III works.',
+    'index_accounts-chart'                  => 'This chart shows the current balance of your asset accounts. You can select the accounts visible here in your preferences.',
+    'index_box_out_holder'                  => 'This little box and the boxes next to this one will give you a quick overview of your financial situation.',
+    'index_help'                            => 'If you ever need help with a page or a form, press this button.',
+    'index_outro'                           => 'Most pages of Firefly III will start with a little tour like this one. Please contact me when you have questions or comments. Enjoy!',
+    'index_sidebar-toggle'                  => 'To create new transactions, accounts or other things, use the menu under this icon.',
 
     // create account:
-    'accounts_create_iban'                  => '',
-    'accounts_create_asset_opening_balance' => '',
-    'accounts_create_asset_currency'        => '',
-    'accounts_create_asset_virtual'         => '',
+    'accounts_create_iban'                  => 'Give your accounts a valid IBAN. This could make a data import very easy in the future.',
+    'accounts_create_asset_opening_balance' => 'Assets accounts may have an "opening balance", indicating the start of this account\'s history in Firefly.',
+    'accounts_create_asset_currency'        => 'Firefly III supports multiple currencies. Asset accounts have one main currency, which you must set here.',
+    'accounts_create_asset_virtual'         => 'It can sometimes help to give your account a virtual balance: an extra amount always added to or removed from the actual balance.',
 
     // budgets index
-    'budgets_index_intro'                   => '',
-    'budgets_index_set_budget'              => '',
-    'budgets_index_see_expenses_bar'        => '',
-    'budgets_index_navigate_periods'        => '',
-    'budgets_index_new_budget'              => '',
-    'budgets_index_list_of_budgets'         => '',
+    'budgets_index_intro'                   => 'Budgets are used to manage your finances and form one of the core functions of Firefly III.',
+    'budgets_index_set_budget'              => 'Set your total budget for every period so Firefly can tell you if you have budgeted all available money.',
+    'budgets_index_see_expenses_bar'        => 'Spending money will slowly fill this bar.',
+    'budgets_index_navigate_periods'        => 'Navigate through periods to easily set budgets ahead of time.',
+    'budgets_index_new_budget'              => 'Create new budgets as you see fit.',
+    'budgets_index_list_of_budgets'         => 'Use this table to set the amounts for each budget and see how you are doing.',
 
     // reports (index)
-    'reports_index_intro'                   => '',
-    'reports_index_inputReportType'         => '',
-    'reports_index_inputAccountsSelect'     => '',
-    'reports_index_inputDateRange'          => '',
-    'reports_index_extra-options-box'       => '',
+    'reports_index_intro'                   => 'Use these reports to get detailed insights in your finances.',
+    'reports_index_inputReportType'         => 'Pick a report type. Check out the help pages to see what each report shows you.',
+    'reports_index_inputAccountsSelect'     => 'You can exclude or include asset accounts as you see fit.',
+    'reports_index_inputDateRange'          => 'The selected date range is entirely up to you: from one day to 10 years.',
+    'reports_index_extra-options-box'       => 'Depending on the report you have selected, you can select extra filters and options here. Watch this box when you change report types.',
 
     // reports (reports)
-    'reports_report_default_intro'          => '',
-    'reports_report_audit_intro'            => '',
-    'reports_report_audit_optionsBox'       => '',
+    'reports_report_default_intro'          => 'This report will give you a quick and comprehensive overview of your finances. If you wish to see anything else, please don\'t hestitate to contact me!',
+    'reports_report_audit_intro'            => 'This report will give you detailed insights in your asset accounts.',
+    'reports_report_audit_optionsBox'       => 'Use these check boxes to show or hide the columns you are interested in.',
 
-    'reports_report_category_intro'                  => '',
-    'reports_report_category_pieCharts'              => '',
-    'reports_report_category_incomeAndExpensesChart' => '',
+    'reports_report_category_intro'                  => 'This report will give you insight in one or multiple categories.',
+    'reports_report_category_pieCharts'              => 'These charts will give you insight in expenses and income per category or per account.',
+    'reports_report_category_incomeAndExpensesChart' => 'This chart shows your expenses and income per category.',
 
-    'reports_report_tag_intro'                  => '',
-    'reports_report_tag_pieCharts'              => '',
-    'reports_report_tag_incomeAndExpensesChart' => '',
+    'reports_report_tag_intro'                  => 'This report will give you insight in one or multiple tags.',
+    'reports_report_tag_pieCharts'              => 'These charts will give you insight in expenses and income per tag, account, category or budget.',
+    'reports_report_tag_incomeAndExpensesChart' => 'This chart shows your expenses and income per tag.',
 
-    'reports_report_budget_intro'                             => '',
-    'reports_report_budget_pieCharts'                         => '',
-    'reports_report_budget_incomeAndExpensesChart'            => '',
+    'reports_report_budget_intro'                             => 'This report will give you insight in one or multiple budgets.',
+    'reports_report_budget_pieCharts'                         => 'These charts will give you insight in expenses per budget or per account.',
+    'reports_report_budget_incomeAndExpensesChart'            => 'This chart shows your expenses per budget.',
 
     // create transaction
-    'transactions_create_switch_box'                          => '',
-    'transactions_create_ffInput_category'                    => '',
-    'transactions_create_withdrawal_ffInput_budget'           => '',
-    'transactions_create_withdrawal_currency_dropdown_amount' => '',
-    'transactions_create_deposit_currency_dropdown_amount'    => '',
-    'transactions_create_transfer_ffInput_piggy_bank_id'      => '',
+    'transactions_create_switch_box'                          => 'Use these buttons to quickly switch the type of transaction you wish to save.',
+    'transactions_create_ffInput_category'                    => 'You can freely type in this field. Previously created categories will be suggested.',
+    'transactions_create_withdrawal_ffInput_budget'           => 'Link your withdrawal to a budget for better financial control.',
+    'transactions_create_withdrawal_currency_dropdown_amount' => 'Use this dropdown when your withdrawal is in another currency.',
+    'transactions_create_deposit_currency_dropdown_amount'    => 'Use this dropdown when your deposit is in another currency.',
+    'transactions_create_transfer_ffInput_piggy_bank_id'      => 'Select a piggy bank and link this transfer to your savings.',
 
     // piggy banks index:
-    'piggy-banks_index_saved'                                 => '',
-    'piggy-banks_index_button'                                => '',
-    'piggy-banks_index_accountStatus'                         => '',
+    'piggy-banks_index_saved'                                 => 'This field shows you how much you\'ve saved in each piggy bank.',
+    'piggy-banks_index_button'                                => 'Next to this progress bar are two buttons (+ and -) to add or remove money from each piggy bank.',
+    'piggy-banks_index_accountStatus'                         => 'For each asset account with at least one piggy bank the status is listed in this table.',
 
     // create piggy
-    'piggy-banks_create_name'                                 => '',
-    'piggy-banks_create_date'                                 => '',
+    'piggy-banks_create_name'                                 => 'What is your goal? A new couch, a camera, money for emergencies?',
+    'piggy-banks_create_date'                                 => 'You can set a target date or a deadline for your piggy bank.',
 
     // show piggy
-    'piggy-banks_show_piggyChart'                             => '',
-    'piggy-banks_show_piggyDetails'                           => '',
-    'piggy-banks_show_piggyEvents'                            => '',
+    'piggy-banks_show_piggyChart'                             => 'This chart will show the history of this piggy bank.',
+    'piggy-banks_show_piggyDetails'                           => 'Some details about your piggy bank',
+    'piggy-banks_show_piggyEvents'                            => 'Any additions or removals are also listed here.',
 
     // bill index
-    'bills_index_paid_in_period'                              => '',
-    'bills_index_expected_in_period'                          => '',
+    'bills_index_paid_in_period'                              => 'This field indicates when the bill was last paid.',
+    'bills_index_expected_in_period'                          => 'This field indicates for each bill if and when the next bill is expected to hit.',
 
     // show bill
-    'bills_show_billInfo'                                     => '',
-    'bills_show_billButtons'                                  => '',
-    'bills_show_billChart'                                    => '',
+    'bills_show_billInfo'                                     => 'This table shows some general information about this bill.',
+    'bills_show_billButtons'                                  => 'Use this button to re-scan old transactions so they will be matched to this bill.',
+    'bills_show_billChart'                                    => 'This chart shows the transactions linked to this bill.',
 
     // create bill
-    'bills_create_name'                                       => '',
-    'bills_create_match'                                      => '',
-    'bills_create_amount_min_holder'                          => '',
-    'bills_create_repeat_freq_holder'                         => '',
-    'bills_create_skip_holder'                                => '',
+    'bills_create_name'                                       => 'Use a descriptive name such as "Rent" or "Health insurance".',
+    'bills_create_match'                                      => 'To match transactions, use terms from those transactions or the expense account involved. All words must match.',
+    'bills_create_amount_min_holder'                          => 'Select a minimum and maximum amount for this bill.',
+    'bills_create_repeat_freq_holder'                         => 'Most bills repeat monthly, but you can set another frequency here.',
+    'bills_create_skip_holder'                                => 'If a bill repeats every 2 weeks for example, the "skip"-field should be set to "1" to skip every other week.',
 
     // rules index
-    'rules_index_intro'                                       => '',
-    'rules_index_new_rule_group'                              => '',
-    'rules_index_new_rule'                                    => '',
-    'rules_index_prio_buttons'                                => '',
-    'rules_index_test_buttons'                                => '',
-    'rules_index_rule-triggers'                               => '',
-    'rules_index_outro'                                       => '',
+    'rules_index_intro'                                       => 'Firefly III allows you to manage rules, that will automagically be applied to any transaction you create or edit.',
+    'rules_index_new_rule_group'                              => 'You can combine rules in groups for easier management.',
+    'rules_index_new_rule'                                    => 'Create as many rules as you like.',
+    'rules_index_prio_buttons'                                => 'Order them any way you see fit.',
+    'rules_index_test_buttons'                                => 'You can test your rules or apply them to existing transactions.',
+    'rules_index_rule-triggers'                               => 'Rules have "triggers" and "actions" that you can order by drag-and-drop.',
+    'rules_index_outro'                                       => 'Be sure to check out the help pages using the (?) icon in the top right!',
 
     // create rule:
-    'rules_create_mandatory'                                  => '',
-    'rules_create_ruletriggerholder'                          => '',
-    'rules_create_test_rule_triggers'                         => '',
-    'rules_create_actions'                                    => '',
+    'rules_create_mandatory'                                  => 'Choose a descriptive title, and set when the rule should be fired.',
+    'rules_create_ruletriggerholder'                          => 'Add as many triggers as you like, but remember that ALL triggers must match before any actions are fired.',
+    'rules_create_test_rule_triggers'                         => 'Use this button to see which transactions would match your rule.',
+    'rules_create_actions'                                    => 'Set as many actions as you like.',
 
     // preferences
-    'preferences_index_tabs'                                  => '',
+    'preferences_index_tabs'                                  => 'More options are available behind these tabs.',
 
     // currencies
-    'currencies_index_intro'                                  => '',
-    'currencies_index_default'                                => '',
+    'currencies_index_intro'                                  => 'Firefly III supports multiple currencies, which you can change on this page.',
+    'currencies_index_default'                                => 'Firefly III has one default currency. You can always switch of course using these buttons.',
 
     // create currency
-    'currencies_create_code'                                  => '',
+    'currencies_create_code'                                  => 'This code should be ISO compliant (Google it for your new currency).',
 ];
\ No newline at end of file

From 6dd88d25ddcc5e04694050a5860b7f4d7d2472e8 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Fri, 25 Aug 2017 07:36:23 +0200
Subject: [PATCH 313/668] New translations intro.php (Portuguese, Brazilian)

---
 resources/lang/pt_BR/intro.php | 144 ++++++++++++++++-----------------
 1 file changed, 72 insertions(+), 72 deletions(-)

diff --git a/resources/lang/pt_BR/intro.php b/resources/lang/pt_BR/intro.php
index cca2854e02..c161cef362 100644
--- a/resources/lang/pt_BR/intro.php
+++ b/resources/lang/pt_BR/intro.php
@@ -11,111 +11,111 @@ declare(strict_types=1);
 
 return [
     // index
-    'index_intro'                           => '',
-    'index_accounts-chart'                  => '',
-    'index_box_out_holder'                  => '',
-    'index_help'                            => '',
-    'index_outro'                           => '',
-    'index_sidebar-toggle'                  => '',
+    'index_intro'                           => 'Welcome to the index page of Firefly III. Please take the time to walk through this intro to get a feeling of how Firefly III works.',
+    'index_accounts-chart'                  => 'This chart shows the current balance of your asset accounts. You can select the accounts visible here in your preferences.',
+    'index_box_out_holder'                  => 'This little box and the boxes next to this one will give you a quick overview of your financial situation.',
+    'index_help'                            => 'If you ever need help with a page or a form, press this button.',
+    'index_outro'                           => 'Most pages of Firefly III will start with a little tour like this one. Please contact me when you have questions or comments. Enjoy!',
+    'index_sidebar-toggle'                  => 'To create new transactions, accounts or other things, use the menu under this icon.',
 
     // create account:
-    'accounts_create_iban'                  => '',
-    'accounts_create_asset_opening_balance' => '',
-    'accounts_create_asset_currency'        => '',
-    'accounts_create_asset_virtual'         => '',
+    'accounts_create_iban'                  => 'Give your accounts a valid IBAN. This could make a data import very easy in the future.',
+    'accounts_create_asset_opening_balance' => 'Assets accounts may have an "opening balance", indicating the start of this account\'s history in Firefly.',
+    'accounts_create_asset_currency'        => 'Firefly III supports multiple currencies. Asset accounts have one main currency, which you must set here.',
+    'accounts_create_asset_virtual'         => 'It can sometimes help to give your account a virtual balance: an extra amount always added to or removed from the actual balance.',
 
     // budgets index
-    'budgets_index_intro'                   => '',
-    'budgets_index_set_budget'              => '',
-    'budgets_index_see_expenses_bar'        => '',
-    'budgets_index_navigate_periods'        => '',
-    'budgets_index_new_budget'              => '',
-    'budgets_index_list_of_budgets'         => '',
+    'budgets_index_intro'                   => 'Budgets are used to manage your finances and form one of the core functions of Firefly III.',
+    'budgets_index_set_budget'              => 'Set your total budget for every period so Firefly can tell you if you have budgeted all available money.',
+    'budgets_index_see_expenses_bar'        => 'Spending money will slowly fill this bar.',
+    'budgets_index_navigate_periods'        => 'Navigate through periods to easily set budgets ahead of time.',
+    'budgets_index_new_budget'              => 'Create new budgets as you see fit.',
+    'budgets_index_list_of_budgets'         => 'Use this table to set the amounts for each budget and see how you are doing.',
 
     // reports (index)
-    'reports_index_intro'                   => '',
-    'reports_index_inputReportType'         => '',
-    'reports_index_inputAccountsSelect'     => '',
-    'reports_index_inputDateRange'          => '',
-    'reports_index_extra-options-box'       => '',
+    'reports_index_intro'                   => 'Use these reports to get detailed insights in your finances.',
+    'reports_index_inputReportType'         => 'Pick a report type. Check out the help pages to see what each report shows you.',
+    'reports_index_inputAccountsSelect'     => 'You can exclude or include asset accounts as you see fit.',
+    'reports_index_inputDateRange'          => 'The selected date range is entirely up to you: from one day to 10 years.',
+    'reports_index_extra-options-box'       => 'Depending on the report you have selected, you can select extra filters and options here. Watch this box when you change report types.',
 
     // reports (reports)
-    'reports_report_default_intro'          => '',
-    'reports_report_audit_intro'            => '',
-    'reports_report_audit_optionsBox'       => '',
+    'reports_report_default_intro'          => 'This report will give you a quick and comprehensive overview of your finances. If you wish to see anything else, please don\'t hestitate to contact me!',
+    'reports_report_audit_intro'            => 'This report will give you detailed insights in your asset accounts.',
+    'reports_report_audit_optionsBox'       => 'Use these check boxes to show or hide the columns you are interested in.',
 
-    'reports_report_category_intro'                  => '',
-    'reports_report_category_pieCharts'              => '',
-    'reports_report_category_incomeAndExpensesChart' => '',
+    'reports_report_category_intro'                  => 'This report will give you insight in one or multiple categories.',
+    'reports_report_category_pieCharts'              => 'These charts will give you insight in expenses and income per category or per account.',
+    'reports_report_category_incomeAndExpensesChart' => 'This chart shows your expenses and income per category.',
 
-    'reports_report_tag_intro'                  => '',
-    'reports_report_tag_pieCharts'              => '',
-    'reports_report_tag_incomeAndExpensesChart' => '',
+    'reports_report_tag_intro'                  => 'This report will give you insight in one or multiple tags.',
+    'reports_report_tag_pieCharts'              => 'These charts will give you insight in expenses and income per tag, account, category or budget.',
+    'reports_report_tag_incomeAndExpensesChart' => 'This chart shows your expenses and income per tag.',
 
-    'reports_report_budget_intro'                             => '',
-    'reports_report_budget_pieCharts'                         => '',
-    'reports_report_budget_incomeAndExpensesChart'            => '',
+    'reports_report_budget_intro'                             => 'This report will give you insight in one or multiple budgets.',
+    'reports_report_budget_pieCharts'                         => 'These charts will give you insight in expenses per budget or per account.',
+    'reports_report_budget_incomeAndExpensesChart'            => 'This chart shows your expenses per budget.',
 
     // create transaction
-    'transactions_create_switch_box'                          => '',
-    'transactions_create_ffInput_category'                    => '',
-    'transactions_create_withdrawal_ffInput_budget'           => '',
-    'transactions_create_withdrawal_currency_dropdown_amount' => '',
-    'transactions_create_deposit_currency_dropdown_amount'    => '',
-    'transactions_create_transfer_ffInput_piggy_bank_id'      => '',
+    'transactions_create_switch_box'                          => 'Use these buttons to quickly switch the type of transaction you wish to save.',
+    'transactions_create_ffInput_category'                    => 'You can freely type in this field. Previously created categories will be suggested.',
+    'transactions_create_withdrawal_ffInput_budget'           => 'Link your withdrawal to a budget for better financial control.',
+    'transactions_create_withdrawal_currency_dropdown_amount' => 'Use this dropdown when your withdrawal is in another currency.',
+    'transactions_create_deposit_currency_dropdown_amount'    => 'Use this dropdown when your deposit is in another currency.',
+    'transactions_create_transfer_ffInput_piggy_bank_id'      => 'Select a piggy bank and link this transfer to your savings.',
 
     // piggy banks index:
-    'piggy-banks_index_saved'                                 => '',
-    'piggy-banks_index_button'                                => '',
-    'piggy-banks_index_accountStatus'                         => '',
+    'piggy-banks_index_saved'                                 => 'This field shows you how much you\'ve saved in each piggy bank.',
+    'piggy-banks_index_button'                                => 'Next to this progress bar are two buttons (+ and -) to add or remove money from each piggy bank.',
+    'piggy-banks_index_accountStatus'                         => 'For each asset account with at least one piggy bank the status is listed in this table.',
 
     // create piggy
-    'piggy-banks_create_name'                                 => '',
-    'piggy-banks_create_date'                                 => '',
+    'piggy-banks_create_name'                                 => 'What is your goal? A new couch, a camera, money for emergencies?',
+    'piggy-banks_create_date'                                 => 'You can set a target date or a deadline for your piggy bank.',
 
     // show piggy
-    'piggy-banks_show_piggyChart'                             => '',
-    'piggy-banks_show_piggyDetails'                           => '',
-    'piggy-banks_show_piggyEvents'                            => '',
+    'piggy-banks_show_piggyChart'                             => 'This chart will show the history of this piggy bank.',
+    'piggy-banks_show_piggyDetails'                           => 'Some details about your piggy bank',
+    'piggy-banks_show_piggyEvents'                            => 'Any additions or removals are also listed here.',
 
     // bill index
-    'bills_index_paid_in_period'                              => '',
-    'bills_index_expected_in_period'                          => '',
+    'bills_index_paid_in_period'                              => 'This field indicates when the bill was last paid.',
+    'bills_index_expected_in_period'                          => 'This field indicates for each bill if and when the next bill is expected to hit.',
 
     // show bill
-    'bills_show_billInfo'                                     => '',
-    'bills_show_billButtons'                                  => '',
-    'bills_show_billChart'                                    => '',
+    'bills_show_billInfo'                                     => 'This table shows some general information about this bill.',
+    'bills_show_billButtons'                                  => 'Use this button to re-scan old transactions so they will be matched to this bill.',
+    'bills_show_billChart'                                    => 'This chart shows the transactions linked to this bill.',
 
     // create bill
-    'bills_create_name'                                       => '',
-    'bills_create_match'                                      => '',
-    'bills_create_amount_min_holder'                          => '',
-    'bills_create_repeat_freq_holder'                         => '',
-    'bills_create_skip_holder'                                => '',
+    'bills_create_name'                                       => 'Use a descriptive name such as "Rent" or "Health insurance".',
+    'bills_create_match'                                      => 'To match transactions, use terms from those transactions or the expense account involved. All words must match.',
+    'bills_create_amount_min_holder'                          => 'Select a minimum and maximum amount for this bill.',
+    'bills_create_repeat_freq_holder'                         => 'Most bills repeat monthly, but you can set another frequency here.',
+    'bills_create_skip_holder'                                => 'If a bill repeats every 2 weeks for example, the "skip"-field should be set to "1" to skip every other week.',
 
     // rules index
-    'rules_index_intro'                                       => '',
-    'rules_index_new_rule_group'                              => '',
-    'rules_index_new_rule'                                    => '',
-    'rules_index_prio_buttons'                                => '',
-    'rules_index_test_buttons'                                => '',
-    'rules_index_rule-triggers'                               => '',
-    'rules_index_outro'                                       => '',
+    'rules_index_intro'                                       => 'Firefly III allows you to manage rules, that will automagically be applied to any transaction you create or edit.',
+    'rules_index_new_rule_group'                              => 'You can combine rules in groups for easier management.',
+    'rules_index_new_rule'                                    => 'Create as many rules as you like.',
+    'rules_index_prio_buttons'                                => 'Order them any way you see fit.',
+    'rules_index_test_buttons'                                => 'You can test your rules or apply them to existing transactions.',
+    'rules_index_rule-triggers'                               => 'Rules have "triggers" and "actions" that you can order by drag-and-drop.',
+    'rules_index_outro'                                       => 'Be sure to check out the help pages using the (?) icon in the top right!',
 
     // create rule:
-    'rules_create_mandatory'                                  => '',
-    'rules_create_ruletriggerholder'                          => '',
-    'rules_create_test_rule_triggers'                         => '',
-    'rules_create_actions'                                    => '',
+    'rules_create_mandatory'                                  => 'Choose a descriptive title, and set when the rule should be fired.',
+    'rules_create_ruletriggerholder'                          => 'Add as many triggers as you like, but remember that ALL triggers must match before any actions are fired.',
+    'rules_create_test_rule_triggers'                         => 'Use this button to see which transactions would match your rule.',
+    'rules_create_actions'                                    => 'Set as many actions as you like.',
 
     // preferences
-    'preferences_index_tabs'                                  => '',
+    'preferences_index_tabs'                                  => 'More options are available behind these tabs.',
 
     // currencies
-    'currencies_index_intro'                                  => '',
-    'currencies_index_default'                                => '',
+    'currencies_index_intro'                                  => 'Firefly III supports multiple currencies, which you can change on this page.',
+    'currencies_index_default'                                => 'Firefly III has one default currency. You can always switch of course using these buttons.',
 
     // create currency
-    'currencies_create_code'                                  => '',
+    'currencies_create_code'                                  => 'This code should be ISO compliant (Google it for your new currency).',
 ];
\ No newline at end of file

From 1e8551da4a0a8f6b3da0685a2a01918164da29bb Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Fri, 25 Aug 2017 07:36:24 +0200
Subject: [PATCH 314/668] New translations intro.php (Polish)

---
 resources/lang/pl_PL/intro.php | 144 ++++++++++++++++-----------------
 1 file changed, 72 insertions(+), 72 deletions(-)

diff --git a/resources/lang/pl_PL/intro.php b/resources/lang/pl_PL/intro.php
index cca2854e02..c161cef362 100644
--- a/resources/lang/pl_PL/intro.php
+++ b/resources/lang/pl_PL/intro.php
@@ -11,111 +11,111 @@ declare(strict_types=1);
 
 return [
     // index
-    'index_intro'                           => '',
-    'index_accounts-chart'                  => '',
-    'index_box_out_holder'                  => '',
-    'index_help'                            => '',
-    'index_outro'                           => '',
-    'index_sidebar-toggle'                  => '',
+    'index_intro'                           => 'Welcome to the index page of Firefly III. Please take the time to walk through this intro to get a feeling of how Firefly III works.',
+    'index_accounts-chart'                  => 'This chart shows the current balance of your asset accounts. You can select the accounts visible here in your preferences.',
+    'index_box_out_holder'                  => 'This little box and the boxes next to this one will give you a quick overview of your financial situation.',
+    'index_help'                            => 'If you ever need help with a page or a form, press this button.',
+    'index_outro'                           => 'Most pages of Firefly III will start with a little tour like this one. Please contact me when you have questions or comments. Enjoy!',
+    'index_sidebar-toggle'                  => 'To create new transactions, accounts or other things, use the menu under this icon.',
 
     // create account:
-    'accounts_create_iban'                  => '',
-    'accounts_create_asset_opening_balance' => '',
-    'accounts_create_asset_currency'        => '',
-    'accounts_create_asset_virtual'         => '',
+    'accounts_create_iban'                  => 'Give your accounts a valid IBAN. This could make a data import very easy in the future.',
+    'accounts_create_asset_opening_balance' => 'Assets accounts may have an "opening balance", indicating the start of this account\'s history in Firefly.',
+    'accounts_create_asset_currency'        => 'Firefly III supports multiple currencies. Asset accounts have one main currency, which you must set here.',
+    'accounts_create_asset_virtual'         => 'It can sometimes help to give your account a virtual balance: an extra amount always added to or removed from the actual balance.',
 
     // budgets index
-    'budgets_index_intro'                   => '',
-    'budgets_index_set_budget'              => '',
-    'budgets_index_see_expenses_bar'        => '',
-    'budgets_index_navigate_periods'        => '',
-    'budgets_index_new_budget'              => '',
-    'budgets_index_list_of_budgets'         => '',
+    'budgets_index_intro'                   => 'Budgets are used to manage your finances and form one of the core functions of Firefly III.',
+    'budgets_index_set_budget'              => 'Set your total budget for every period so Firefly can tell you if you have budgeted all available money.',
+    'budgets_index_see_expenses_bar'        => 'Spending money will slowly fill this bar.',
+    'budgets_index_navigate_periods'        => 'Navigate through periods to easily set budgets ahead of time.',
+    'budgets_index_new_budget'              => 'Create new budgets as you see fit.',
+    'budgets_index_list_of_budgets'         => 'Use this table to set the amounts for each budget and see how you are doing.',
 
     // reports (index)
-    'reports_index_intro'                   => '',
-    'reports_index_inputReportType'         => '',
-    'reports_index_inputAccountsSelect'     => '',
-    'reports_index_inputDateRange'          => '',
-    'reports_index_extra-options-box'       => '',
+    'reports_index_intro'                   => 'Use these reports to get detailed insights in your finances.',
+    'reports_index_inputReportType'         => 'Pick a report type. Check out the help pages to see what each report shows you.',
+    'reports_index_inputAccountsSelect'     => 'You can exclude or include asset accounts as you see fit.',
+    'reports_index_inputDateRange'          => 'The selected date range is entirely up to you: from one day to 10 years.',
+    'reports_index_extra-options-box'       => 'Depending on the report you have selected, you can select extra filters and options here. Watch this box when you change report types.',
 
     // reports (reports)
-    'reports_report_default_intro'          => '',
-    'reports_report_audit_intro'            => '',
-    'reports_report_audit_optionsBox'       => '',
+    'reports_report_default_intro'          => 'This report will give you a quick and comprehensive overview of your finances. If you wish to see anything else, please don\'t hestitate to contact me!',
+    'reports_report_audit_intro'            => 'This report will give you detailed insights in your asset accounts.',
+    'reports_report_audit_optionsBox'       => 'Use these check boxes to show or hide the columns you are interested in.',
 
-    'reports_report_category_intro'                  => '',
-    'reports_report_category_pieCharts'              => '',
-    'reports_report_category_incomeAndExpensesChart' => '',
+    'reports_report_category_intro'                  => 'This report will give you insight in one or multiple categories.',
+    'reports_report_category_pieCharts'              => 'These charts will give you insight in expenses and income per category or per account.',
+    'reports_report_category_incomeAndExpensesChart' => 'This chart shows your expenses and income per category.',
 
-    'reports_report_tag_intro'                  => '',
-    'reports_report_tag_pieCharts'              => '',
-    'reports_report_tag_incomeAndExpensesChart' => '',
+    'reports_report_tag_intro'                  => 'This report will give you insight in one or multiple tags.',
+    'reports_report_tag_pieCharts'              => 'These charts will give you insight in expenses and income per tag, account, category or budget.',
+    'reports_report_tag_incomeAndExpensesChart' => 'This chart shows your expenses and income per tag.',
 
-    'reports_report_budget_intro'                             => '',
-    'reports_report_budget_pieCharts'                         => '',
-    'reports_report_budget_incomeAndExpensesChart'            => '',
+    'reports_report_budget_intro'                             => 'This report will give you insight in one or multiple budgets.',
+    'reports_report_budget_pieCharts'                         => 'These charts will give you insight in expenses per budget or per account.',
+    'reports_report_budget_incomeAndExpensesChart'            => 'This chart shows your expenses per budget.',
 
     // create transaction
-    'transactions_create_switch_box'                          => '',
-    'transactions_create_ffInput_category'                    => '',
-    'transactions_create_withdrawal_ffInput_budget'           => '',
-    'transactions_create_withdrawal_currency_dropdown_amount' => '',
-    'transactions_create_deposit_currency_dropdown_amount'    => '',
-    'transactions_create_transfer_ffInput_piggy_bank_id'      => '',
+    'transactions_create_switch_box'                          => 'Use these buttons to quickly switch the type of transaction you wish to save.',
+    'transactions_create_ffInput_category'                    => 'You can freely type in this field. Previously created categories will be suggested.',
+    'transactions_create_withdrawal_ffInput_budget'           => 'Link your withdrawal to a budget for better financial control.',
+    'transactions_create_withdrawal_currency_dropdown_amount' => 'Use this dropdown when your withdrawal is in another currency.',
+    'transactions_create_deposit_currency_dropdown_amount'    => 'Use this dropdown when your deposit is in another currency.',
+    'transactions_create_transfer_ffInput_piggy_bank_id'      => 'Select a piggy bank and link this transfer to your savings.',
 
     // piggy banks index:
-    'piggy-banks_index_saved'                                 => '',
-    'piggy-banks_index_button'                                => '',
-    'piggy-banks_index_accountStatus'                         => '',
+    'piggy-banks_index_saved'                                 => 'This field shows you how much you\'ve saved in each piggy bank.',
+    'piggy-banks_index_button'                                => 'Next to this progress bar are two buttons (+ and -) to add or remove money from each piggy bank.',
+    'piggy-banks_index_accountStatus'                         => 'For each asset account with at least one piggy bank the status is listed in this table.',
 
     // create piggy
-    'piggy-banks_create_name'                                 => '',
-    'piggy-banks_create_date'                                 => '',
+    'piggy-banks_create_name'                                 => 'What is your goal? A new couch, a camera, money for emergencies?',
+    'piggy-banks_create_date'                                 => 'You can set a target date or a deadline for your piggy bank.',
 
     // show piggy
-    'piggy-banks_show_piggyChart'                             => '',
-    'piggy-banks_show_piggyDetails'                           => '',
-    'piggy-banks_show_piggyEvents'                            => '',
+    'piggy-banks_show_piggyChart'                             => 'This chart will show the history of this piggy bank.',
+    'piggy-banks_show_piggyDetails'                           => 'Some details about your piggy bank',
+    'piggy-banks_show_piggyEvents'                            => 'Any additions or removals are also listed here.',
 
     // bill index
-    'bills_index_paid_in_period'                              => '',
-    'bills_index_expected_in_period'                          => '',
+    'bills_index_paid_in_period'                              => 'This field indicates when the bill was last paid.',
+    'bills_index_expected_in_period'                          => 'This field indicates for each bill if and when the next bill is expected to hit.',
 
     // show bill
-    'bills_show_billInfo'                                     => '',
-    'bills_show_billButtons'                                  => '',
-    'bills_show_billChart'                                    => '',
+    'bills_show_billInfo'                                     => 'This table shows some general information about this bill.',
+    'bills_show_billButtons'                                  => 'Use this button to re-scan old transactions so they will be matched to this bill.',
+    'bills_show_billChart'                                    => 'This chart shows the transactions linked to this bill.',
 
     // create bill
-    'bills_create_name'                                       => '',
-    'bills_create_match'                                      => '',
-    'bills_create_amount_min_holder'                          => '',
-    'bills_create_repeat_freq_holder'                         => '',
-    'bills_create_skip_holder'                                => '',
+    'bills_create_name'                                       => 'Use a descriptive name such as "Rent" or "Health insurance".',
+    'bills_create_match'                                      => 'To match transactions, use terms from those transactions or the expense account involved. All words must match.',
+    'bills_create_amount_min_holder'                          => 'Select a minimum and maximum amount for this bill.',
+    'bills_create_repeat_freq_holder'                         => 'Most bills repeat monthly, but you can set another frequency here.',
+    'bills_create_skip_holder'                                => 'If a bill repeats every 2 weeks for example, the "skip"-field should be set to "1" to skip every other week.',
 
     // rules index
-    'rules_index_intro'                                       => '',
-    'rules_index_new_rule_group'                              => '',
-    'rules_index_new_rule'                                    => '',
-    'rules_index_prio_buttons'                                => '',
-    'rules_index_test_buttons'                                => '',
-    'rules_index_rule-triggers'                               => '',
-    'rules_index_outro'                                       => '',
+    'rules_index_intro'                                       => 'Firefly III allows you to manage rules, that will automagically be applied to any transaction you create or edit.',
+    'rules_index_new_rule_group'                              => 'You can combine rules in groups for easier management.',
+    'rules_index_new_rule'                                    => 'Create as many rules as you like.',
+    'rules_index_prio_buttons'                                => 'Order them any way you see fit.',
+    'rules_index_test_buttons'                                => 'You can test your rules or apply them to existing transactions.',
+    'rules_index_rule-triggers'                               => 'Rules have "triggers" and "actions" that you can order by drag-and-drop.',
+    'rules_index_outro'                                       => 'Be sure to check out the help pages using the (?) icon in the top right!',
 
     // create rule:
-    'rules_create_mandatory'                                  => '',
-    'rules_create_ruletriggerholder'                          => '',
-    'rules_create_test_rule_triggers'                         => '',
-    'rules_create_actions'                                    => '',
+    'rules_create_mandatory'                                  => 'Choose a descriptive title, and set when the rule should be fired.',
+    'rules_create_ruletriggerholder'                          => 'Add as many triggers as you like, but remember that ALL triggers must match before any actions are fired.',
+    'rules_create_test_rule_triggers'                         => 'Use this button to see which transactions would match your rule.',
+    'rules_create_actions'                                    => 'Set as many actions as you like.',
 
     // preferences
-    'preferences_index_tabs'                                  => '',
+    'preferences_index_tabs'                                  => 'More options are available behind these tabs.',
 
     // currencies
-    'currencies_index_intro'                                  => '',
-    'currencies_index_default'                                => '',
+    'currencies_index_intro'                                  => 'Firefly III supports multiple currencies, which you can change on this page.',
+    'currencies_index_default'                                => 'Firefly III has one default currency. You can always switch of course using these buttons.',
 
     // create currency
-    'currencies_create_code'                                  => '',
+    'currencies_create_code'                                  => 'This code should be ISO compliant (Google it for your new currency).',
 ];
\ No newline at end of file

From 206887bc718f5b6259c82d8aab674fd5d29693dd Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Fri, 25 Aug 2017 07:36:25 +0200
Subject: [PATCH 315/668] New translations list.php (Russian)

---
 resources/lang/ru_RU/list.php | 68 +++++++++++++++++------------------
 1 file changed, 34 insertions(+), 34 deletions(-)

diff --git a/resources/lang/ru_RU/list.php b/resources/lang/ru_RU/list.php
index 4e16d96f3a..95fe61c6bb 100644
--- a/resources/lang/ru_RU/list.php
+++ b/resources/lang/ru_RU/list.php
@@ -25,31 +25,31 @@ return [
     'active'                => 'Активен?',
     'lastActivity'          => 'Последняя активность',
     'balanceDiff'           => 'Разница баланса между :start и :end',
-    'matchedOn'             => '',
-    'matchesOn'             => '',
+    'matchedOn'             => 'Matched on',
+    'matchesOn'             => 'Matched on',
     'account_type'          => 'Тип профиля',
-    'created_at'            => '',
-    'new_balance'           => '',
-    'account'               => '',
-    'matchingAmount'        => '',
-    'lastMatch'             => '',
-    'split_number'          => '',
-    'destination'           => '',
-    'source'                => '',
-    'next_expected_match'   => '',
-    'automatch'             => '',
-    'repeat_freq'           => '',
+    'created_at'            => 'Created at',
+    'new_balance'           => 'New balance',
+    'account'               => 'Account',
+    'matchingAmount'        => 'Amount',
+    'lastMatch'             => 'Last match',
+    'split_number'          => 'Split #',
+    'destination'           => 'Destination',
+    'source'                => 'Source',
+    'next_expected_match'   => 'Next expected match',
+    'automatch'             => 'Auto match?',
+    'repeat_freq'           => 'Repeats',
     'description'           => 'Описание',
     'amount'                => 'Сумма',
-    'internal_reference'    => '',
+    'internal_reference'    => 'Internal reference',
     'date'                  => 'Дата',
-    'interest_date'         => '',
-    'book_date'             => '',
-    'process_date'          => '',
-    'due_date'              => '',
-    'payment_date'          => '',
-    'invoice_date'          => '',
-    'interal_reference'     => '',
+    'interest_date'         => 'Interest date',
+    'book_date'             => 'Book date',
+    'process_date'          => 'Processing date',
+    'due_date'              => 'Due date',
+    'payment_date'          => 'Payment date',
+    'invoice_date'          => 'Invoice date',
+    'interal_reference'     => 'Internal reference',
     'notes'                 => 'Заметки',
     'from'                  => 'Откуда',
     'piggy_bank'            => 'Копилка',
@@ -60,23 +60,23 @@ return [
     'withdrawal'            => 'Расход',
     'deposit'               => 'Доход',
     'transfer'              => 'Перевод',
-    'type'                  => '',
-    'completed'             => '',
-    'iban'                  => '',
-    'paid_current_period'   => '',
+    'type'                  => 'Type',
+    'completed'             => 'Completed',
+    'iban'                  => 'IBAN',
+    'paid_current_period'   => 'Paid this period',
     'email'                 => 'E-mail',
     'registered_at'         => 'Дата регистрации',
     'is_activated'          => 'Активен?',
     'is_blocked'            => 'Заблокирован?',
     'is_admin'              => 'Администратор?',
     'has_two_factor'        => 'Защита (2FA)?',
-    'confirmed_from'        => '',
-    'registered_from'       => '',
-    'blocked_code'          => '',
+    'confirmed_from'        => 'Confirmed from',
+    'registered_from'       => 'Registered from',
+    'blocked_code'          => 'Block code',
     'domain'                => 'Домен',
-    'registration_attempts' => '',
-    'source_account'        => '',
-    'destination_account'   => '',
+    'registration_attempts' => 'Registration attempts',
+    'source_account'        => 'Source account',
+    'destination_account'   => 'Destination account',
 
     'accounts_count'         => 'Всего счетов',
     'journals_count'         => 'Всего транзакций',
@@ -88,7 +88,7 @@ return [
     'budget_count'           => 'Всего категорий бюджета',
     'rule_and_groups_count'  => 'Всего правил и групп правил',
     'tags_count'             => 'Всего меток',
-    'inward'                 => '',
-    'outward'                => '',
-    'number_of_transactions' => '',
+    'inward'                 => 'Inward description',
+    'outward'                => 'Outward description',
+    'number_of_transactions' => 'Number of transactions',
 ];
\ No newline at end of file

From 37a25625de310d038c4d6d4f21c613817d8e2935 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Fri, 25 Aug 2017 07:36:27 +0200
Subject: [PATCH 316/668] New translations demo.php (Slovenian)

---
 resources/lang/sl_SI/demo.php | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/resources/lang/sl_SI/demo.php b/resources/lang/sl_SI/demo.php
index a8a4edea33..e6a07ca5c4 100644
--- a/resources/lang/sl_SI/demo.php
+++ b/resources/lang/sl_SI/demo.php
@@ -10,18 +10,18 @@ declare(strict_types=1);
  */
 
 return [
-    'no_demo_text'                   => '',
-    'see_help_icon'                  => '',
+    'no_demo_text'                   => 'Sorry, there is no extra demo-explanation text for <abbr title=":route">this page</abbr>.',
+    'see_help_icon'                  => 'However, the <i class="fa fa-question-circle"></i>-icon in the top right corner may tell you more.',
     'index'                          => 'Dobrodošli v <strong>Firefly III</strong>! Na tej strani boste dobili hiter pregled nad vašimi financami. Za več informacij preverite račune &rarr; <a href=":asset">premoženjski računi</a> in seveda <a href=":budgets">budžet</a> in <a href=":reports">poročila</a>. Ali pa se samo malo razglejte naokoli in videli boste, kje boste končali.',
     'accounts-index'                 => 'Premoženjski računi so vaši osebni bančni računi. Konti stroškov so računi na katere zapravljate vaš denar, kot npr. trgovine in prijatelji.
 Konti prihodkov so računi iz katerih dobivate denar, kot npr. vaš delodajalec, država in drugi viri vaših prihodkov. Na tej strani lahko račune urejate ali jih odstranite.',
     'budgets-index'                  => 'Na tej strani najdete pregled nad vašimi budžeti. Zgornji kazalec prikazuje vsoto ki je na razpolago za ta budžet. To lahko nastavljate za katerokoli obdobje, tako da kliknete na vsoto na desni. Vsota, ki ste jo dejansko porabili je prikazana na spodnjem kazalcu. Spodaj so prikazani vaši stroški razporejeni po budžetih.',
-    'reports-index-start'            => '',
-    'reports-index-examples'         => '',
-    'currencies-index'               => '',
-    'transactions-index'             => '',
-    'piggy-banks-index'              => '',
-    'import-index'                   => '',
-    'import-configure-security'      => '',
-    'import-configure-configuration' => '',
+    'reports-index-start'            => 'Firefly III supports four types of reports. Read about them by clicking on the <i class="fa fa-question-circle"></i>-icon in the top right corner.',
+    'reports-index-examples'         => 'Be sure to check out these examples: <a href=":one">a monthly financial overview</a>, <a href=":two">a yearly financial overview</a> and <a href=":three">a budget overview</a>.',
+    'currencies-index'               => 'Firefly III supports multiple currencies. Although it defaults to the Euro it can be set to the US Dollar and many other currencies. As you can see a small selection of currencies has been included but you can add your own if you wish to. Changing the default currency will not change the currency of existing transactions however: Firefly III supports the use of multiple currencies at the same time.',
+    'transactions-index'             => 'These expenses, deposits and transfers are not particularly imaginative. They have been generated automatically.',
+    'piggy-banks-index'              => 'As you can see, there are three piggy banks. Use the plus and minus buttons to influence the amount of money in each piggy bank. Click the name of the piggy bank to see the administration for each piggy bank.',
+    'import-index'                   => 'Of course, any CSV file can be imported into Firefly III ',
+    'import-configure-security'      => 'Because of security concerns, your upload has been replaced with a local file.',
+    'import-configure-configuration' => 'The configuration you see below is correct for the local file.',
 ];
\ No newline at end of file

From 1bf5ae2d3d5d64024cbc4d1791d53c06384d92f4 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Fri, 25 Aug 2017 07:36:28 +0200
Subject: [PATCH 317/668] New translations demo.php (Polish)

---
 resources/lang/pl_PL/demo.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/resources/lang/pl_PL/demo.php b/resources/lang/pl_PL/demo.php
index 5c0af0c796..84446f6be6 100644
--- a/resources/lang/pl_PL/demo.php
+++ b/resources/lang/pl_PL/demo.php
@@ -10,17 +10,17 @@ declare(strict_types=1);
  */
 
 return [
-    'no_demo_text'                   => '',
+    'no_demo_text'                   => 'Sorry, there is no extra demo-explanation text for <abbr title=":route">this page</abbr>.',
     'see_help_icon'                  => 'Jednakże ikona <i class="fa fa-question-circle"></i> w prawym górnym rogu może powiedzieć Ci więcej.',
     'index'                          => 'Witaj w <strong>Firefly III</strong>! Na tej stronie znajduje się szybki przegląd Twoich finansów. Aby uzyskać więcej informacji sprawdź Konta &rarr; <a href=":asset">Konta aktywów</a> oraz oczywiście strony <a href=":budgets">Budżety</a> oraz <a href=":reports">Raporty</a>. Lub po prostu się rozejrzyj i zobacz gdzie trafisz w końcu.',
     'accounts-index'                 => 'Konta aktywów są Twoimi osobistymi kontami bankowymi. Konta wydatków to konta na które wydajesz pieniądze takie jak sklepy oraz przyjaciele. Kona przychodów są kontami, z których otrzymujesz pieniądze takie jak twoja praca, zwrot podatków lub inne źródła przychodów. Na tej stronie możesz je modyfikować oraz usuwać.',
-    'budgets-index'                  => '',
-    'reports-index-start'            => '',
-    'reports-index-examples'         => '',
-    'currencies-index'               => '',
-    'transactions-index'             => '',
-    'piggy-banks-index'              => '',
-    'import-index'                   => '',
-    'import-configure-security'      => '',
+    'budgets-index'                  => 'This page shows you an overview of your budgets. The top bar shows the amount that is available to be budgeted. This can be customized for any period by clicking the amount on the right. The amount you\'ve actually spent is shown in the bar below. Below that are the expenses per budget and what you\'ve budgeted for them.',
+    'reports-index-start'            => 'Firefly III supports four types of reports. Read about them by clicking on the <i class="fa fa-question-circle"></i>-icon in the top right corner.',
+    'reports-index-examples'         => 'Be sure to check out these examples: <a href=":one">a monthly financial overview</a>, <a href=":two">a yearly financial overview</a> and <a href=":three">a budget overview</a>.',
+    'currencies-index'               => 'Firefly III supports multiple currencies. Although it defaults to the Euro it can be set to the US Dollar and many other currencies. As you can see a small selection of currencies has been included but you can add your own if you wish to. Changing the default currency will not change the currency of existing transactions however: Firefly III supports the use of multiple currencies at the same time.',
+    'transactions-index'             => 'These expenses, deposits and transfers are not particularly imaginative. They have been generated automatically.',
+    'piggy-banks-index'              => 'As you can see, there are three piggy banks. Use the plus and minus buttons to influence the amount of money in each piggy bank. Click the name of the piggy bank to see the administration for each piggy bank.',
+    'import-index'                   => 'Of course, any CSV file can be imported into Firefly III ',
+    'import-configure-security'      => 'Because of security concerns, your upload has been replaced with a local file.',
     'import-configure-configuration' => 'Konfiguracja, która widzisz poniżej jest prawidłowa dla lokalnego pliku.',
 ];
\ No newline at end of file

From 6c8da850a7b8c1280baa4b08770fbdaad63d328b Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Fri, 25 Aug 2017 07:36:31 +0200
Subject: [PATCH 318/668] New translations firefly.php (Russian)

---
 resources/lang/ru_RU/firefly.php | 1378 +++++++++++++++---------------
 1 file changed, 689 insertions(+), 689 deletions(-)

diff --git a/resources/lang/ru_RU/firefly.php b/resources/lang/ru_RU/firefly.php
index 403d0d7391..468735bab6 100644
--- a/resources/lang/ru_RU/firefly.php
+++ b/resources/lang/ru_RU/firefly.php
@@ -30,9 +30,9 @@ return [
     'no_results_for_empty_search'                => 'Результатов не найдено.',
     'removed_amount'                             => 'Снято :amount',
     'added_amount'                               => 'Добавлено :amount',
-    'asset_account_role_help'                    => '',
+    'asset_account_role_help'                    => 'Any extra options resulting from your choice can be set later.',
     'Opening balance'                            => 'Баланс на момент открытия',
-    'create_new_stuff'                           => '',
+    'create_new_stuff'                           => 'Create new stuff',
     'new_withdrawal'                             => 'Новый вывод',
     'new_deposit'                                => 'Новый доход',
     'new_transfer'                               => 'Новый перевод',
@@ -41,94 +41,94 @@ return [
     'new_revenue_account'                        => 'Новый доходный счет',
     'new_budget'                                 => 'Новый бюджет',
     'new_bill'                                   => 'Новый счет',
-    'block_account_logout'                       => '',
+    'block_account_logout'                       => 'You have been logged out. Blocked accounts cannot use this site. Did you register with a valid email address?',
     'flash_success'                              => 'Успешно!',
     'flash_info'                                 => 'Сообщение',
     'flash_warning'                              => 'Предупреждение!',
     'flash_error'                                => 'Ошибка!',
-    'flash_info_multiple'                        => '',
-    'flash_error_multiple'                       => '',
-    'net_worth'                                  => '',
-    'route_has_no_help'                          => '',
+    'flash_info_multiple'                        => 'There is one message|There are :count messages',
+    'flash_error_multiple'                       => 'There is one error|There are :count errors',
+    'net_worth'                                  => 'Net worth',
+    'route_has_no_help'                          => 'There is no help for this route.',
     'two_factor_welcome'                         => 'Привет, :user!',
-    'two_factor_enter_code'                      => '',
-    'two_factor_code_here'                       => '',
-    'two_factor_title'                           => '',
-    'authenticate'                               => '',
-    'two_factor_forgot_title'                    => '',
-    'two_factor_forgot'                          => '',
-    'two_factor_lost_header'                     => '',
-    'two_factor_lost_intro'                      => '',
-    'two_factor_lost_fix_self'                   => '',
-    'two_factor_lost_fix_owner'                  => '',
-    'warning_much_data'                          => '',
-    'registered'                                 => '',
+    'two_factor_enter_code'                      => 'To continue, please enter your two factor authentication code. Your application can generate it for you.',
+    'two_factor_code_here'                       => 'Enter code here',
+    'two_factor_title'                           => 'Two factor authentication',
+    'authenticate'                               => 'Authenticate',
+    'two_factor_forgot_title'                    => 'Lost two factor authentication',
+    'two_factor_forgot'                          => 'I forgot my two-factor thing.',
+    'two_factor_lost_header'                     => 'Lost your two factor authentication?',
+    'two_factor_lost_intro'                      => 'Unfortunately, this is not something you can reset from the web interface. You have two choices.',
+    'two_factor_lost_fix_self'                   => 'If you run your own instance of Firefly III, check the logs in <code>storage/logs</code> for instructions.',
+    'two_factor_lost_fix_owner'                  => 'Otherwise, email the site owner, <a href="mailto::site_owner">:site_owner</a> and ask them to reset your two factor authentication.',
+    'warning_much_data'                          => ':days days of data may take a while to load.',
+    'registered'                                 => 'You have registered successfully!',
     'Default asset account'                      => 'Счёт по умолчанию',
-    'no_budget_pointer'                          => '',
+    '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.',
     'Savings account'                            => 'Сберегательный счет',
     'Credit card'                                => 'Кредитная карта',
     'source_accounts'                            => 'Исходный счет(а)',
     'destination_accounts'                       => 'Счет(а) назначения',
     'user_id_is'                                 => 'Ваш id пользователя <strong>:user</strong>',
     'field_supports_markdown'                    => 'Это поле поддерживает <a href="https://en.support.wordpress.com/markdown-quick-reference/">Markdown</a>.',
-    'need_more_help'                             => '',
-    'reenable_intro_text'                        => '',
-    'intro_boxes_after_refresh'                  => '',
+    'need_more_help'                             => 'If you need more help using Firefly III, please <a href="https://github.com/firefly-iii/firefly-iii/issues">open a ticket on Github</a>.',
+    'reenable_intro_text'                        => 'You can also reenable <a href="#" id="reenableGuidance">the introduction guidance</a>.',
+    'intro_boxes_after_refresh'                  => 'The introduction boxes will reappear when you refresh the page.',
     'show_all_no_filter'                         => 'Показать все транзакции без группировки по датам.',
     'expenses_by_category'                       => 'Расходы по категориям',
     'expenses_by_budget'                         => 'Расходы по бюджетам',
     'income_by_category'                         => 'Доход по категориям',
-    'expenses_by_asset_account'                  => '',
-    'expenses_by_expense_account'                => '',
-    'cannot_redirect_to_account'                 => '',
+    'expenses_by_asset_account'                  => 'Expenses by asset account',
+    'expenses_by_expense_account'                => 'Expenses by expense account',
+    'cannot_redirect_to_account'                 => 'Firefly III cannot redirect you to the correct page. Apologies.',
     'sum_of_expenses'                            => 'Сумма расходов',
     'sum_of_income'                              => 'Сумма дохода',
     'total_sum'                                  => 'Итого',
-    'spent_in_specific_budget'                   => '',
-    'sum_of_expenses_in_budget'                  => '',
-    'left_in_budget_limit'                       => '',
+    'spent_in_specific_budget'                   => 'Spent in budget ":budget"',
+    'sum_of_expenses_in_budget'                  => 'Spent total in budget ":budget"',
+    'left_in_budget_limit'                       => 'Left to spend according to budgeting',
     'cannot_reset_demo_user'                     => 'Невозможно сбросить пароль демонстрационной учетной записи',
     'current_period'                             => 'Текущий период',
     'show_the_current_period_and_overview'       => 'Показать текущий период и обзор',
     'pref_languages_locale'                      => 'Для корректной работы с языками, отличными от английского, ваша операционная система должна отдавать корректную информацию о локали. Если это не так, валюты, даты и суммы могут отображаться некорректно.',
-    'budget_in_period'                           => '',
-    'chart_budget_in_period'                     => '',
-    'chart_account_in_period'                    => '',
-    'chart_category_in_period'                   => '',
-    'chart_category_all'                         => '',
-    'clone_withdrawal'                           => '',
-    'clone_deposit'                              => '',
+    'budget_in_period'                           => 'All transactions for budget ":name" between :start and :end',
+    'chart_budget_in_period'                     => 'Chart for all transactions for budget ":name" between :start and :end',
+    'chart_account_in_period'                    => 'Chart for all transactions for account ":name" between :start and :end',
+    'chart_category_in_period'                   => 'Chart for all transactions for category ":name" between :start and :end',
+    'chart_category_all'                         => 'Chart for all transactions for category ":name"',
+    'clone_withdrawal'                           => 'Clone this withdrawal',
+    'clone_deposit'                              => 'Clone this deposit',
     'clone_transfer'                             => 'Клонировать этот трансфер',
     'multi_select_no_selection'                  => 'Ничего не выбрано',
     'multi_select_all_selected'                  => 'Все выбранные',
     'multi_select_filter_placeholder'            => 'Поиск..',
     'between_dates_breadcrumb'                   => 'Между :start и :end',
-    'all_journals_without_budget'                => '',
-    'journals_without_budget'                    => '',
-    'all_journals_without_category'              => '',
-    'journals_without_category'                  => '',
-    'all_journals_for_account'                   => '',
-    'chart_all_journals_for_account'             => '',
-    'journals_in_period_for_account'             => '',
+    'all_journals_without_budget'                => 'All transactions without a budget',
+    'journals_without_budget'                    => 'Transactions without a budget',
+    'all_journals_without_category'              => 'All transactions without a category',
+    'journals_without_category'                  => 'Transactions without a category',
+    'all_journals_for_account'                   => 'All transactions for account :name',
+    'chart_all_journals_for_account'             => 'Chart of all transactions for account :name',
+    'journals_in_period_for_account'             => 'All transactions for account :name between :start and :end',
     'transferred'                                => 'Переведено',
-    'all_withdrawal'                             => '',
-    'all_transactions'                           => '',
-    'title_withdrawal_between'                   => '',
+    'all_withdrawal'                             => 'All expenses',
+    'all_transactions'                           => 'All transactions',
+    'title_withdrawal_between'                   => 'All expenses between :start and :end',
     'all_deposit'                                => 'Все доходы',
     'title_deposit_between'                      => 'Все доходы между :start и :end',
     'all_transfers'                              => 'Все переводы',
     'title_transfers_between'                    => 'Все переводы между :start и :end',
     'all_transfer'                               => 'Все переводы',
-    'all_journals_for_tag'                       => '',
-    'title_transfer_between'                     => '',
-    'all_journals_for_category'                  => '',
-    'all_journals_for_budget'                    => '',
-    'chart_all_journals_for_budget'              => '',
-    'journals_in_period_for_category'            => '',
-    'journals_in_period_for_tag'                 => '',
-    'not_available_demo_user'                    => '',
-    'exchange_rate_instructions'                 => '',
-    'transfer_exchange_rate_instructions'        => '',
+    'all_journals_for_tag'                       => 'All transactions for tag ":tag"',
+    'title_transfer_between'                     => 'All transfers between :start and :end',
+    'all_journals_for_category'                  => 'All transactions for category :name',
+    'all_journals_for_budget'                    => 'All transactions for budget :name',
+    'chart_all_journals_for_budget'              => 'Chart of all transactions for budget :name',
+    'journals_in_period_for_category'            => 'All transactions for category :name between :start and :end',
+    'journals_in_period_for_tag'                 => 'All transactions for tag :tag between :start and :end',
+    'not_available_demo_user'                    => 'The feature you try to access is not available to demo users.',
+    'exchange_rate_instructions'                 => 'Asset account "@name" only accepts transactions in @native_currency. If you wish to use @foreign_currency instead, make sure that the amount in @native_currency is known as well:',
+    'transfer_exchange_rate_instructions'        => 'Source asset account "@source_name" only accepts transactions in @source_currency. Destination asset account "@dest_name" only accepts transactions in @dest_currency. You must provide the transferred amount correctly in both currencies.',
     'transaction_data'                           => 'Данные транзакции',
 
     // search
@@ -136,9 +136,9 @@ return [
     'search_found_transactions'                  => 'Количество транзакций найдено:',
     'general_search_error'                       => 'Произошла ошибка при поиске. Пожалуйста, проверьте файлы журнала для получения дополнительной информации.',
     'search_box'                                 => 'Поиск',
-    'search_box_intro'                           => '',
-    'search_error'                               => '',
-    'search_searching'                           => '',
+    'search_box_intro'                           => 'Welcome to the search function of Firefly III. Enter your search query in the box. Make sure you check out the help file because the search is pretty advanced.',
+    'search_error'                               => 'Error while searching',
+    'search_searching'                           => 'Searching ...',
 
     // repeat frequencies:
     'repeat_freq_yearly'                         => 'ежегодно',
@@ -151,170 +151,170 @@ return [
     // export data:
     'import_and_export'                          => 'Импорт и экспорт',
     'export_data'                                => 'Экспорт данных',
-    'export_data_intro'                          => '',
+    'export_data_intro'                          => 'For backup purposes, when migrating to another system or when migrating to another Firefly III installation.',
     'export_format'                              => 'Формат для экспорта',
-    'export_format_csv'                          => '',
-    'export_format_mt940'                        => '',
-    'export_included_accounts'                   => '',
-    'include_old_uploads_help'                   => '',
+    'export_format_csv'                          => 'Comma separated values (CSV file)',
+    'export_format_mt940'                        => 'MT940 compatible format',
+    'export_included_accounts'                   => 'Export transactions from these accounts',
+    'include_old_uploads_help'                   => 'Firefly III does not throw away the original CSV files you have imported in the past. You can include them in your export.',
     'do_export'                                  => 'Экспорт',
-    'export_status_never_started'                => '',
-    'export_status_make_exporter'                => '',
-    'export_status_collecting_journals'          => '',
-    'export_status_collected_journals'           => '',
-    'export_status_converting_to_export_format'  => '',
-    'export_status_converted_to_export_format'   => '',
-    'export_status_creating_journal_file'        => '',
-    'export_status_created_journal_file'         => '',
-    'export_status_collecting_attachments'       => '',
-    'export_status_collected_attachments'        => '',
-    'export_status_collecting_old_uploads'       => '',
-    'export_status_collected_old_uploads'        => '',
-    'export_status_creating_config_file'         => '',
-    'export_status_created_config_file'          => '',
-    'export_status_creating_zip_file'            => '',
-    'export_status_created_zip_file'             => '',
-    'export_status_finished'                     => '',
+    'export_status_never_started'                => 'The export has not started yet',
+    'export_status_make_exporter'                => 'Creating exporter thing...',
+    'export_status_collecting_journals'          => 'Collecting your transactions...',
+    'export_status_collected_journals'           => 'Collected your transactions!',
+    'export_status_converting_to_export_format'  => 'Converting your transactions...',
+    'export_status_converted_to_export_format'   => 'Converted your transactions!',
+    'export_status_creating_journal_file'        => 'Creating the export file...',
+    'export_status_created_journal_file'         => 'Created the export file!',
+    'export_status_collecting_attachments'       => 'Collecting all your attachments...',
+    'export_status_collected_attachments'        => 'Collected all your attachments!',
+    'export_status_collecting_old_uploads'       => 'Collecting all your previous uploads...',
+    'export_status_collected_old_uploads'        => 'Collected all your previous uploads!',
+    'export_status_creating_config_file'         => 'Creating a configuration file...',
+    'export_status_created_config_file'          => 'Created a configuration file!',
+    'export_status_creating_zip_file'            => 'Creating a zip file...',
+    'export_status_created_zip_file'             => 'Created a zip file!',
+    'export_status_finished'                     => 'Export has succesfully finished! Yay!',
     'export_data_please_wait'                    => 'Подождите пожалуйста...',
 
     // rules
-    'rules'                                      => '',
-    'rule_name'                                  => '',
-    'rule_triggers'                              => '',
-    'rule_actions'                               => '',
-    'new_rule'                                   => '',
-    'new_rule_group'                             => '',
-    'rule_priority_up'                           => '',
-    'rule_priority_down'                         => '',
-    'make_new_rule_group'                        => '',
-    'store_new_rule_group'                       => '',
-    'created_new_rule_group'                     => '',
-    'updated_rule_group'                         => '',
-    'edit_rule_group'                            => '',
-    'delete_rule_group'                          => '',
-    'deleted_rule_group'                         => '',
-    'update_rule_group'                          => '',
-    'no_rules_in_group'                          => '',
-    'move_rule_group_up'                         => '',
-    'move_rule_group_down'                       => '',
-    'save_rules_by_moving'                       => '',
-    'make_new_rule'                              => '',
-    'rule_help_stop_processing'                  => '',
-    'rule_help_active'                           => '',
-    'stored_new_rule'                            => '',
-    'deleted_rule'                               => '',
-    'store_new_rule'                             => '',
-    'updated_rule'                               => '',
-    'default_rule_group_name'                    => '',
-    'default_rule_group_description'             => '',
-    'default_rule_name'                          => '',
-    'default_rule_description'                   => '',
-    'default_rule_trigger_description'           => '',
-    'default_rule_trigger_from_account'          => '',
-    'default_rule_action_prepend'                => '',
-    'default_rule_action_set_category'           => '',
-    'trigger'                                    => '',
-    'trigger_value'                              => '',
-    'stop_processing_other_triggers'             => '',
-    'add_rule_trigger'                           => '',
-    'action'                                     => '',
-    'action_value'                               => '',
-    'stop_executing_other_actions'               => '',
-    'add_rule_action'                            => '',
-    'edit_rule'                                  => '',
-    'delete_rule'                                => '',
-    'update_rule'                                => '',
-    'test_rule_triggers'                         => '',
-    'warning_transaction_subset'                 => '',
-    'warning_no_matching_transactions'           => '',
-    'warning_no_valid_triggers'                  => '',
-    'apply_rule_selection'                       => '',
-    'apply_rule_selection_intro'                 => '',
-    'include_transactions_from_accounts'         => '',
-    'applied_rule_selection'                     => '',
-    'execute'                                    => '',
-    'apply_rule_group_selection'                 => '',
-    'apply_rule_group_selection_intro'           => '',
-    'applied_rule_group_selection'               => '',
+    'rules'                                      => 'Rules',
+    'rule_name'                                  => 'Name of rule',
+    'rule_triggers'                              => 'Rule triggers when',
+    'rule_actions'                               => 'Rule will',
+    'new_rule'                                   => 'New rule',
+    'new_rule_group'                             => 'New rule group',
+    'rule_priority_up'                           => 'Give rule more priority',
+    'rule_priority_down'                         => 'Give rule less priority',
+    'make_new_rule_group'                        => 'Make new rule group',
+    'store_new_rule_group'                       => 'Store new rule group',
+    'created_new_rule_group'                     => 'New rule group ":title" stored!',
+    'updated_rule_group'                         => 'Successfully updated rule group ":title".',
+    'edit_rule_group'                            => 'Edit rule group ":title"',
+    'delete_rule_group'                          => 'Delete rule group ":title"',
+    'deleted_rule_group'                         => 'Deleted rule group ":title"',
+    'update_rule_group'                          => 'Update rule group',
+    'no_rules_in_group'                          => 'There are no rules in this group',
+    'move_rule_group_up'                         => 'Move rule group up',
+    'move_rule_group_down'                       => 'Move rule group down',
+    'save_rules_by_moving'                       => 'Save these rule(s) by moving them to another rule group:',
+    'make_new_rule'                              => 'Make new rule in rule group ":title"',
+    'rule_help_stop_processing'                  => 'When you check this box, later rules in this group will not be executed.',
+    'rule_help_active'                           => 'Inactive rules will never fire.',
+    'stored_new_rule'                            => 'Stored new rule with title ":title"',
+    'deleted_rule'                               => 'Deleted rule with title ":title"',
+    'store_new_rule'                             => 'Store new rule',
+    'updated_rule'                               => 'Updated rule with title ":title"',
+    'default_rule_group_name'                    => 'Default rules',
+    'default_rule_group_description'             => 'All your rules not in a particular group.',
+    'default_rule_name'                          => 'Your first default rule',
+    'default_rule_description'                   => 'This rule is an example. You can safely delete it.',
+    'default_rule_trigger_description'           => 'The Man Who Sold the World',
+    'default_rule_trigger_from_account'          => 'David Bowie',
+    'default_rule_action_prepend'                => 'Bought the world from ',
+    'default_rule_action_set_category'           => 'Large expenses',
+    'trigger'                                    => 'Trigger',
+    'trigger_value'                              => 'Trigger on value',
+    'stop_processing_other_triggers'             => 'Stop processing other triggers',
+    'add_rule_trigger'                           => 'Add new trigger',
+    'action'                                     => 'Action',
+    'action_value'                               => 'Action value',
+    'stop_executing_other_actions'               => 'Stop executing other actions',
+    'add_rule_action'                            => 'Add new action',
+    'edit_rule'                                  => 'Edit rule ":title"',
+    'delete_rule'                                => 'Delete rule ":title"',
+    'update_rule'                                => 'Update rule',
+    'test_rule_triggers'                         => 'See matching transactions',
+    'warning_transaction_subset'                 => 'For performance reasons this list is limited to :max_num_transactions and may only show a subset of matching transactions',
+    'warning_no_matching_transactions'           => 'No matching transactions found. Please note that for performance reasons, only the last :num_transactions transactions have been checked.',
+    'warning_no_valid_triggers'                  => 'No valid triggers provided.',
+    'apply_rule_selection'                       => 'Apply rule ":title" to a selection of your transactions',
+    'apply_rule_selection_intro'                 => 'Rules like ":title" are normally only applied to new or updated transactions, but you can tell Firefly III to run it on a selection of your existing transactions. This can be useful when you have updated a rule and you need the changes to be applied to all of your other transactions.',
+    'include_transactions_from_accounts'         => 'Include transactions from these accounts',
+    'applied_rule_selection'                     => 'Rule ":title" has been applied to your selection.',
+    'execute'                                    => 'Execute',
+    'apply_rule_group_selection'                 => 'Apply rule group ":title" to a selection of your transactions',
+    'apply_rule_group_selection_intro'           => 'Rule groups like ":title" are normally only applied to new or updated transactions, but you can tell Firefly III to run all the rules in this group on a selection of your existing transactions. This can be useful when you have updated a group of rules and you need the changes to be applied to all of your other transactions.',
+    'applied_rule_group_selection'               => 'Rule group ":title" has been applied to your selection.',
 
     // actions and triggers
-    'rule_trigger_user_action'                   => '',
-    'rule_trigger_from_account_starts'           => '',
-    'rule_trigger_from_account_ends'             => '',
-    'rule_trigger_from_account_is'               => '',
-    'rule_trigger_from_account_contains'         => '',
-    'rule_trigger_to_account_starts'             => '',
-    'rule_trigger_to_account_ends'               => '',
-    'rule_trigger_to_account_is'                 => '',
-    'rule_trigger_to_account_contains'           => '',
-    'rule_trigger_transaction_type'              => '',
-    'rule_trigger_category_is'                   => '',
-    'rule_trigger_amount_less'                   => '',
-    'rule_trigger_amount_exactly'                => '',
-    'rule_trigger_amount_more'                   => '',
-    'rule_trigger_description_starts'            => '',
-    'rule_trigger_description_ends'              => '',
-    'rule_trigger_description_contains'          => '',
-    'rule_trigger_description_is'                => '',
-    'rule_trigger_from_account_starts_choice'    => '',
-    'rule_trigger_from_account_ends_choice'      => '',
-    'rule_trigger_from_account_is_choice'        => '',
-    'rule_trigger_from_account_contains_choice'  => '',
-    'rule_trigger_to_account_starts_choice'      => '',
-    'rule_trigger_to_account_ends_choice'        => '',
-    'rule_trigger_to_account_is_choice'          => '',
-    'rule_trigger_to_account_contains_choice'    => '',
-    'rule_trigger_transaction_type_choice'       => '',
-    'rule_trigger_amount_less_choice'            => '',
-    'rule_trigger_amount_exactly_choice'         => '',
-    'rule_trigger_amount_more_choice'            => '',
-    'rule_trigger_description_starts_choice'     => '',
-    'rule_trigger_description_ends_choice'       => '',
-    'rule_trigger_description_contains_choice'   => '',
-    'rule_trigger_description_is_choice'         => '',
-    'rule_trigger_category_is_choice'            => '',
-    'rule_trigger_budget_is_choice'              => '',
-    'rule_trigger_tag_is_choice'                 => '',
-    'rule_trigger_has_attachments_choice'        => '',
-    'rule_trigger_has_attachments'               => '',
-    'rule_trigger_store_journal'                 => '',
-    'rule_trigger_update_journal'                => '',
-    'rule_action_set_category'                   => '',
-    'rule_action_clear_category'                 => '',
-    'rule_action_set_budget'                     => '',
-    'rule_action_clear_budget'                   => '',
-    'rule_action_add_tag'                        => '',
-    'rule_action_remove_tag'                     => '',
-    'rule_action_remove_all_tags'                => '',
-    'rule_action_set_description'                => '',
-    'rule_action_append_description'             => '',
-    'rule_action_prepend_description'            => '',
-    'rule_action_set_category_choice'            => '',
-    'rule_action_clear_category_choice'          => '',
-    'rule_action_set_budget_choice'              => '',
-    'rule_action_clear_budget_choice'            => '',
-    'rule_action_add_tag_choice'                 => '',
-    'rule_action_remove_tag_choice'              => '',
-    'rule_action_remove_all_tags_choice'         => '',
-    'rule_action_set_description_choice'         => '',
-    'rule_action_append_description_choice'      => '',
-    'rule_action_prepend_description_choice'     => '',
-    'rule_action_set_source_account_choice'      => '',
-    'rule_action_set_source_account'             => '',
-    'rule_action_set_destination_account_choice' => '',
-    'rule_action_set_destination_account'        => '',
+    'rule_trigger_user_action'                   => 'User action is ":trigger_value"',
+    'rule_trigger_from_account_starts'           => 'Source account starts with ":trigger_value"',
+    'rule_trigger_from_account_ends'             => 'Source account ends with ":trigger_value"',
+    'rule_trigger_from_account_is'               => 'Source account is ":trigger_value"',
+    'rule_trigger_from_account_contains'         => 'Source account contains ":trigger_value"',
+    'rule_trigger_to_account_starts'             => 'Destination account starts with ":trigger_value"',
+    'rule_trigger_to_account_ends'               => 'Destination account ends with ":trigger_value"',
+    'rule_trigger_to_account_is'                 => 'Destination account is ":trigger_value"',
+    'rule_trigger_to_account_contains'           => 'Destination account contains ":trigger_value"',
+    'rule_trigger_transaction_type'              => 'Transaction is of type ":trigger_value"',
+    'rule_trigger_category_is'                   => 'Category is ":trigger_value"',
+    'rule_trigger_amount_less'                   => 'Amount is less than :trigger_value',
+    'rule_trigger_amount_exactly'                => 'Amount is :trigger_value',
+    'rule_trigger_amount_more'                   => 'Amount is more than :trigger_value',
+    'rule_trigger_description_starts'            => 'Description starts with ":trigger_value"',
+    'rule_trigger_description_ends'              => 'Description ends with ":trigger_value"',
+    'rule_trigger_description_contains'          => 'Description contains ":trigger_value"',
+    'rule_trigger_description_is'                => 'Description is ":trigger_value"',
+    'rule_trigger_from_account_starts_choice'    => 'Source account starts with..',
+    'rule_trigger_from_account_ends_choice'      => 'Source account ends with..',
+    'rule_trigger_from_account_is_choice'        => 'Source account is..',
+    'rule_trigger_from_account_contains_choice'  => 'Source account contains..',
+    'rule_trigger_to_account_starts_choice'      => 'Destination account starts with..',
+    'rule_trigger_to_account_ends_choice'        => 'Destination account ends with..',
+    'rule_trigger_to_account_is_choice'          => 'Destination account is..',
+    'rule_trigger_to_account_contains_choice'    => 'Destination account contains..',
+    'rule_trigger_transaction_type_choice'       => 'Transaction is of type..',
+    'rule_trigger_amount_less_choice'            => 'Amount is less than..',
+    'rule_trigger_amount_exactly_choice'         => 'Amount is..',
+    'rule_trigger_amount_more_choice'            => 'Amount is more than..',
+    'rule_trigger_description_starts_choice'     => 'Description starts with..',
+    'rule_trigger_description_ends_choice'       => 'Description ends with..',
+    'rule_trigger_description_contains_choice'   => 'Description contains..',
+    'rule_trigger_description_is_choice'         => 'Description is..',
+    'rule_trigger_category_is_choice'            => 'Category is..',
+    'rule_trigger_budget_is_choice'              => 'Budget is..',
+    'rule_trigger_tag_is_choice'                 => '(A) tag is..',
+    'rule_trigger_has_attachments_choice'        => 'Has at least this many attachments',
+    'rule_trigger_has_attachments'               => 'Has at least :trigger_value attachment(s)',
+    'rule_trigger_store_journal'                 => 'When a transaction is created',
+    'rule_trigger_update_journal'                => 'When a transaction is updated',
+    'rule_action_set_category'                   => 'Set category to ":action_value"',
+    'rule_action_clear_category'                 => 'Clear category',
+    'rule_action_set_budget'                     => 'Set budget to ":action_value"',
+    'rule_action_clear_budget'                   => 'Clear budget',
+    'rule_action_add_tag'                        => 'Add tag ":action_value"',
+    'rule_action_remove_tag'                     => 'Remove tag ":action_value"',
+    'rule_action_remove_all_tags'                => 'Remove all tags',
+    'rule_action_set_description'                => 'Set description to ":action_value"',
+    'rule_action_append_description'             => 'Append description with ":action_value"',
+    'rule_action_prepend_description'            => 'Prepend description with ":action_value"',
+    'rule_action_set_category_choice'            => 'Set category to..',
+    'rule_action_clear_category_choice'          => 'Clear any category',
+    'rule_action_set_budget_choice'              => 'Set budget to..',
+    'rule_action_clear_budget_choice'            => 'Clear any budget',
+    'rule_action_add_tag_choice'                 => 'Add tag..',
+    'rule_action_remove_tag_choice'              => 'Remove tag..',
+    'rule_action_remove_all_tags_choice'         => 'Remove all tags',
+    'rule_action_set_description_choice'         => 'Set description to..',
+    'rule_action_append_description_choice'      => 'Append description with..',
+    'rule_action_prepend_description_choice'     => 'Prepend description with..',
+    'rule_action_set_source_account_choice'      => 'Set source account to...',
+    'rule_action_set_source_account'             => 'Set source account to :action_value',
+    'rule_action_set_destination_account_choice' => 'Set destination account to...',
+    'rule_action_set_destination_account'        => 'Set destination account to :action_value',
 
     // tags
-    'store_new_tag'                              => '',
-    'update_tag'                                 => '',
-    'no_location_set'                            => '',
-    'meta_data'                                  => '',
-    'location'                                   => '',
+    'store_new_tag'                              => 'Store new tag',
+    'update_tag'                                 => 'Update tag',
+    'no_location_set'                            => 'No location set.',
+    'meta_data'                                  => 'Meta data',
+    'location'                                   => 'Location',
 
     // preferences
     'pref_home_screen_accounts'                  => 'Счета, отображаемые в сводке',
     'pref_home_screen_accounts_help'             => 'Какие счета нужно отображать в сводке на главной странице?',
-    'pref_view_range'                            => '',
+    'pref_view_range'                            => 'View range',
     'pref_view_range_help'                       => 'Некоторые диаграммы автоматически группируются по периодам. Какой период вы предпочитаете?',
     'pref_1D'                                    => 'Один день',
     'pref_1W'                                    => 'Одна неделя',
@@ -328,48 +328,48 @@ return [
     'pref_custom_fiscal_year_label'              => 'Включить',
     'pref_custom_fiscal_year_help'               => 'Для стран, в которых финансовый год начинается не 1 января, а заканчивается не 31 декабря, вы должны указать даты начала и окончания финансового года',
     'pref_fiscal_year_start_label'               => 'Дата начала финансового года',
-    'pref_two_factor_auth'                       => '',
-    'pref_two_factor_auth_help'                  => '',
-    'pref_enable_two_factor_auth'                => '',
-    'pref_two_factor_auth_disabled'              => '',
-    'pref_two_factor_auth_remove_it'             => '',
-    'pref_two_factor_auth_code'                  => '',
-    'pref_two_factor_auth_code_help'             => '',
-    'pref_two_factor_auth_reset_code'            => '',
-    'pref_two_factor_auth_remove_code'           => '',
-    'pref_two_factor_auth_remove_will_disable'   => '',
+    'pref_two_factor_auth'                       => '2-step verification',
+    'pref_two_factor_auth_help'                  => 'When you enable 2-step verification (also known as two-factor authentication), you add an extra layer of security to your account. You sign in with something you know (your password) and something you have (a verification code). Verification codes are generated by an application on your phone, such as Authy or Google Authenticator.',
+    'pref_enable_two_factor_auth'                => 'Enable 2-step verification',
+    'pref_two_factor_auth_disabled'              => '2-step verification code removed and disabled',
+    'pref_two_factor_auth_remove_it'             => 'Don\'t forget to remove the account from your authentication app!',
+    'pref_two_factor_auth_code'                  => 'Verify code',
+    'pref_two_factor_auth_code_help'             => 'Scan the QR code with an application on your phone such as Authy or Google Authenticator and enter the generated code.',
+    'pref_two_factor_auth_reset_code'            => 'Reset verification code',
+    'pref_two_factor_auth_remove_code'           => 'Remove verification code',
+    'pref_two_factor_auth_remove_will_disable'   => '(this will also disable two-factor authentication)',
     'pref_save_settings'                         => 'Сохранить настройки',
     'saved_preferences'                          => 'Настройки сохранены!',
     'preferences_general'                        => 'Основные',
     'preferences_frontpage'                      => 'Сводка',
     'preferences_security'                       => 'Безопасность',
     'preferences_layout'                         => 'Отображение',
-    'pref_home_show_deposits'                    => '',
-    'pref_home_show_deposits_info'               => '',
-    'pref_home_do_show_deposits'                 => '',
-    'successful_count'                           => '',
-    'transaction_page_size_title'                => '',
-    'transaction_page_size_help'                 => '',
-    'transaction_page_size_label'                => '',
-    'between_dates'                              => '',
+    'pref_home_show_deposits'                    => 'Show deposits on the home screen',
+    'pref_home_show_deposits_info'               => 'The home screen already shows your expense accounts. Should it also show your revenue accounts?',
+    'pref_home_do_show_deposits'                 => 'Yes, show them',
+    'successful_count'                           => 'of which :count successful',
+    'transaction_page_size_title'                => 'Page size',
+    'transaction_page_size_help'                 => 'Any list of transactions shows at most this many transactions',
+    'transaction_page_size_label'                => 'Page size',
+    'between_dates'                              => '(:start and :end)',
     'pref_optional_fields_transaction'           => 'Дополнительные поля для транзакций',
     'pref_optional_fields_transaction_help'      => 'По умолчанию при создании новой транзакции включены не все поля (чтобы не создавать беспорядок). Но вы можете включить эти поля, если лично вам они могут быть полезны. Любое поле, которое в последствии будет отключено, будет по-прежнему отображаться, если оно уже заполнено (независимо от данный настроек).',
     'optional_tj_date_fields'                    => 'Поля с датами',
     'optional_tj_business_fields'                => 'Бизнес-поля',
     'optional_tj_attachment_fields'              => 'Поля вложений',
-    'pref_optional_tj_interest_date'             => '',
-    'pref_optional_tj_book_date'                 => '',
-    'pref_optional_tj_process_date'              => '',
-    'pref_optional_tj_due_date'                  => '',
-    'pref_optional_tj_payment_date'              => '',
-    'pref_optional_tj_invoice_date'              => '',
-    'pref_optional_tj_internal_reference'        => '',
+    'pref_optional_tj_interest_date'             => 'Interest date',
+    'pref_optional_tj_book_date'                 => 'Book date',
+    'pref_optional_tj_process_date'              => 'Processing date',
+    'pref_optional_tj_due_date'                  => 'Due date',
+    'pref_optional_tj_payment_date'              => 'Payment date',
+    'pref_optional_tj_invoice_date'              => 'Invoice date',
+    'pref_optional_tj_internal_reference'        => 'Internal reference',
     'pref_optional_tj_notes'                     => 'Заметки',
     'pref_optional_tj_attachments'               => 'Вложения',
     'optional_field_meta_dates'                  => 'Даты',
     'optional_field_meta_business'               => 'Бизнес',
     'optional_field_attachments'                 => 'Вложения',
-    'optional_field_meta_data'                   => '',
+    'optional_field_meta_data'                   => 'Optional meta data',
 
 
     // profile:
@@ -388,69 +388,69 @@ return [
     'password_changed'                           => 'Пароль изменён!',
     'should_change'                              => 'Кажется, нужно изменить пароль.',
     'invalid_password'                           => 'Неверный пароль!',
-    'what_is_pw_security'                        => '',
-    'secure_pw_title'                            => '',
-    'secure_pw_history'                          => '',
-    'secure_pw_check_box'                        => '',
-    'secure_pw_sha1'                             => '',
-    'secure_pw_hash_speed'                       => '',
-    'secure_pw_hash_security'                    => '',
-    'secure_pw_should'                           => '',
-    'secure_pw_long_password'                    => '',
-    'secure_pw_short'                            => '',
+    'what_is_pw_security'                        => 'What is "verify password security"?',
+    'secure_pw_title'                            => 'How to choose a secure password',
+    'secure_pw_history'                          => 'In August 2017 well known security researcher Troy Hunt released a list of 306 million stolen passwords. These passwords were stolen during breakins at companies like LinkedIn, Adobe and NeoPets (and many more).',
+    'secure_pw_check_box'                        => 'By checking the box, Firefly III will send the SHA1 hash of your password to <a href="https://www.troyhunt.com/introducing-306-million-freely-downloadable-pwned-passwords/">the website of Troy Hunt</a> to see if it is on the list. This will stop you from using unsafe passwords as is recommended in the latest <a href="https://pages.nist.gov/800-63-3/sp800-63b.html">NIST Special Publication</a> on this subject.',
+    'secure_pw_sha1'                             => 'But I thought SHA1 was broken?',
+    'secure_pw_hash_speed'                       => 'Yes, but not in this context. As you can read on <a href="https://shattered.io/">the website detailing how they broke SHA1</a>, it is now slightly easier to find a "collision": another string that results in the same SHA1-hash. It now only takes 10,000 years using a single-GPU machine.',
+    'secure_pw_hash_security'                    => 'This collision would not be equal to your password, nor would it be useful on (a site like) Firefly III. This application does not use SHA1 for password verification. So it is safe to check this box. Your password is hashed and sent over HTTPS.',
+    'secure_pw_should'                           => 'Should I check the box?',
+    'secure_pw_long_password'                    => 'If you just generated a long, single-use password for Firefly III using some kind of password generator: <strong>no</strong>.',
+    'secure_pw_short'                            => 'If you just entered the password you always use: <em>Please yes</em>.',
 
 
     // attachments
-    'nr_of_attachments'                          => '',
-    'attachments'                                => '',
-    'edit_attachment'                            => '',
-    'update_attachment'                          => '',
-    'delete_attachment'                          => '',
-    'attachment_deleted'                         => '',
-    'attachment_updated'                         => '',
-    'upload_max_file_size'                       => '',
+    'nr_of_attachments'                          => 'One attachment|:count attachments',
+    'attachments'                                => 'Attachments',
+    'edit_attachment'                            => 'Edit attachment ":name"',
+    'update_attachment'                          => 'Update attachment',
+    'delete_attachment'                          => 'Delete attachment ":name"',
+    'attachment_deleted'                         => 'Deleted attachment ":name"',
+    'attachment_updated'                         => 'Updated attachment ":name"',
+    'upload_max_file_size'                       => 'Maximum file size: :size',
 
     // transaction index
-    'title_expenses'                             => '',
-    'title_withdrawal'                           => '',
-    'title_revenue'                              => '',
-    'title_deposit'                              => '',
-    'title_transfer'                             => '',
-    'title_transfers'                            => '',
+    'title_expenses'                             => 'Expenses',
+    'title_withdrawal'                           => 'Expenses',
+    'title_revenue'                              => 'Revenue / income',
+    'title_deposit'                              => 'Revenue / income',
+    'title_transfer'                             => 'Transfers',
+    'title_transfers'                            => 'Transfers',
 
     // convert stuff:
-    'convert_is_already_type_Withdrawal'         => '',
-    'convert_is_already_type_Deposit'            => '',
-    'convert_is_already_type_Transfer'           => '',
-    'convert_to_Withdrawal'                      => '',
-    'convert_to_Deposit'                         => '',
-    'convert_to_Transfer'                        => '',
-    'convert_options_WithdrawalDeposit'          => '',
-    'convert_options_WithdrawalTransfer'         => '',
-    'convert_options_DepositTransfer'            => '',
-    'convert_options_DepositWithdrawal'          => '',
-    'convert_options_TransferWithdrawal'         => '',
-    'convert_options_TransferDeposit'            => '',
-    'transaction_journal_convert_options'        => '',
-    'convert_Withdrawal_to_deposit'              => '',
-    'convert_Withdrawal_to_transfer'             => '',
-    'convert_Deposit_to_withdrawal'              => '',
-    'convert_Deposit_to_transfer'                => '',
-    'convert_Transfer_to_deposit'                => '',
-    'convert_Transfer_to_withdrawal'             => '',
-    'convert_please_set_revenue_source'          => '',
-    'convert_please_set_asset_destination'       => '',
-    'convert_please_set_expense_destination'     => '',
-    'convert_please_set_asset_source'            => '',
-    'convert_explanation_withdrawal_deposit'     => '',
-    'convert_explanation_withdrawal_transfer'    => '',
-    'convert_explanation_deposit_withdrawal'     => '',
-    'convert_explanation_deposit_transfer'       => '',
-    'convert_explanation_transfer_withdrawal'    => '',
-    'convert_explanation_transfer_deposit'       => '',
-    'converted_to_Withdrawal'                    => '',
-    'converted_to_Deposit'                       => '',
-    'converted_to_Transfer'                      => '',
+    'convert_is_already_type_Withdrawal'         => 'This transaction is already a withdrawal',
+    'convert_is_already_type_Deposit'            => 'This transaction is already a deposit',
+    'convert_is_already_type_Transfer'           => 'This transaction is already a transfer',
+    'convert_to_Withdrawal'                      => 'Convert ":description" to a withdrawal',
+    'convert_to_Deposit'                         => 'Convert ":description" to a deposit',
+    'convert_to_Transfer'                        => 'Convert ":description" to a transfer',
+    'convert_options_WithdrawalDeposit'          => 'Convert a withdrawal into a deposit',
+    'convert_options_WithdrawalTransfer'         => 'Convert a withdrawal into a transfer',
+    'convert_options_DepositTransfer'            => 'Convert a deposit into a transfer',
+    'convert_options_DepositWithdrawal'          => 'Convert a deposit into a withdrawal',
+    'convert_options_TransferWithdrawal'         => 'Convert a transfer into a withdrawal',
+    'convert_options_TransferDeposit'            => 'Convert a transfer into a deposit',
+    'transaction_journal_convert_options'        => 'Convert this transaction',
+    'convert_Withdrawal_to_deposit'              => 'Convert this withdrawal to a deposit',
+    'convert_Withdrawal_to_transfer'             => 'Convert this withdrawal to a transfer',
+    'convert_Deposit_to_withdrawal'              => 'Convert this deposit to a withdrawal',
+    'convert_Deposit_to_transfer'                => 'Convert this deposit to a transfer',
+    'convert_Transfer_to_deposit'                => 'Convert this transfer to a deposit',
+    'convert_Transfer_to_withdrawal'             => 'Convert this transfer to a withdrawal',
+    'convert_please_set_revenue_source'          => 'Please pick the revenue account where the money will come from.',
+    'convert_please_set_asset_destination'       => 'Please pick the asset account where the money will go to.',
+    'convert_please_set_expense_destination'     => 'Please pick the expense account where the money will go to.',
+    'convert_please_set_asset_source'            => 'Please pick the asset account where the money will come from.',
+    'convert_explanation_withdrawal_deposit'     => 'If you convert this withdrawal into a deposit, :amount will be deposited into <a href=":sourceRoute">:sourceName</a> instead of taken from it.',
+    'convert_explanation_withdrawal_transfer'    => 'If you convert this withdrawal into a transfer, :amount will be transferred from <a href=":sourceRoute">:sourceName</a> to a new asset account, instead of being paid to <a href=":destinationRoute">:destinationName</a>.',
+    'convert_explanation_deposit_withdrawal'     => 'If you convert this deposit into a withdrawal, :amount will be removed from <a href=":destinationRoute">:destinationName</a> instead of added to it.',
+    'convert_explanation_deposit_transfer'       => 'If you convert this deposit into a transfer, :amount will be transferred from an asset account of your choice into <a href=":destinationRoute">:destinationName</a>.',
+    'convert_explanation_transfer_withdrawal'    => 'If you convert this transfer into a withdrawal, :amount will go from <a href=":sourceRoute">:sourceName</a> to a new destination as an expense, instead of to <a href=":destinationRoute">:destinationName</a> as a transfer.',
+    'convert_explanation_transfer_deposit'       => 'If you convert this transfer into a deposit, :amount will be deposited into account <a href=":destinationRoute">:destinationName</a> instead of being transferred there.',
+    'converted_to_Withdrawal'                    => 'The transaction has been converted to a withdrawal',
+    'converted_to_Deposit'                       => 'The transaction has been converted to a deposit',
+    'converted_to_Transfer'                      => 'The transaction has been converted to a transfer',
 
 
     // create new stuff:
@@ -458,10 +458,10 @@ return [
     'create_new_deposit'                         => 'Создать новый доход',
     'create_new_transfer'                        => 'Создать новый перевод',
     'create_new_asset'                           => 'Создать новый активный счёт',
-    'create_new_expense'                         => '',
-    'create_new_revenue'                         => '',
+    'create_new_expense'                         => 'Create new expense account',
+    'create_new_revenue'                         => 'Create new revenue account',
     'create_new_piggy_bank'                      => 'Создать новую копилку',
-    'create_new_bill'                            => '',
+    'create_new_bill'                            => 'Create new bill',
 
     // currencies:
     'create_currency'                            => 'Создать новую валюту',
@@ -478,95 +478,95 @@ return [
     'default_currency'                           => 'основная',
 
     // forms:
-    'mandatoryFields'                            => '',
-    'optionalFields'                             => '',
+    'mandatoryFields'                            => 'Mandatory fields',
+    'optionalFields'                             => 'Optional fields',
     'options'                                    => 'Параметры',
 
     // budgets:
-    'create_new_budget'                          => '',
-    'store_new_budget'                           => '',
-    'stored_new_budget'                          => '',
-    'available_between'                          => '',
-    'transactionsWithoutBudget'                  => '',
-    'transactions_no_budget'                     => '',
-    'spent_between'                              => '',
-    'createBudget'                               => '',
-    'inactiveBudgets'                            => '',
-    'without_budget_between'                     => '',
-    'delete_budget'                              => '',
-    'deleted_budget'                             => '',
-    'edit_budget'                                => '',
-    'updated_budget'                             => '',
-    'update_amount'                              => '',
-    'update_budget'                              => '',
-    'update_budget_amount_range'                 => '',
-    'budget_period_navigator'                    => '',
+    'create_new_budget'                          => 'Create a new budget',
+    'store_new_budget'                           => 'Store new budget',
+    'stored_new_budget'                          => 'Stored new budget ":name"',
+    'available_between'                          => 'Available between :start and :end',
+    'transactionsWithoutBudget'                  => 'Expenses without budget',
+    'transactions_no_budget'                     => 'Expenses without budget between :start and :end',
+    'spent_between'                              => 'Spent between :start and :end',
+    'createBudget'                               => 'New budget',
+    'inactiveBudgets'                            => 'Inactive budgets',
+    'without_budget_between'                     => 'Transactions without a budget between :start and :end',
+    'delete_budget'                              => 'Delete budget ":name"',
+    'deleted_budget'                             => 'Deleted budget ":name"',
+    'edit_budget'                                => 'Edit budget ":name"',
+    'updated_budget'                             => 'Updated budget ":name"',
+    'update_amount'                              => 'Update amount',
+    'update_budget'                              => 'Update budget',
+    'update_budget_amount_range'                 => 'Update (expected) available amount between :start and :end',
+    'budget_period_navigator'                    => 'Period navigator',
 
     // bills:
-    'matching_on'                                => '',
-    'between_amounts'                            => '',
-    'repeats'                                    => '',
-    'connected_journals'                         => '',
-    'auto_match_on'                              => '',
-    'auto_match_off'                             => '',
-    'next_expected_match'                        => '',
-    'delete_bill'                                => '',
-    'deleted_bill'                               => '',
-    'edit_bill'                                  => '',
-    'more'                                       => '',
-    'rescan_old'                                 => '',
-    'update_bill'                                => '',
-    'updated_bill'                               => '',
-    'store_new_bill'                             => '',
-    'stored_new_bill'                            => '',
-    'cannot_scan_inactive_bill'                  => '',
-    'rescanned_bill'                             => '',
-    'average_bill_amount_year'                   => '',
-    'average_bill_amount_overall'                => '',
-    'not_or_not_yet'                             => '',
-    'not_expected_period'                        => '',
-    'bill_is_active'                             => '',
-    'bill_will_automatch'                        => '',
+    'matching_on'                                => 'Matching on',
+    'between_amounts'                            => 'between :low and :high.',
+    'repeats'                                    => 'Repeats',
+    'connected_journals'                         => 'Connected transactions',
+    'auto_match_on'                              => 'Automatically matched by Firefly',
+    'auto_match_off'                             => 'Not automatically matched by Firefly',
+    'next_expected_match'                        => 'Next expected match',
+    'delete_bill'                                => 'Delete bill ":name"',
+    'deleted_bill'                               => 'Deleted bill ":name"',
+    'edit_bill'                                  => 'Edit bill ":name"',
+    'more'                                       => 'More',
+    'rescan_old'                                 => 'Rescan old transactions',
+    'update_bill'                                => 'Update bill',
+    'updated_bill'                               => 'Updated bill ":name"',
+    'store_new_bill'                             => 'Store new bill',
+    'stored_new_bill'                            => 'Stored new bill ":name"',
+    'cannot_scan_inactive_bill'                  => 'Inactive bills cannot be scanned.',
+    'rescanned_bill'                             => 'Rescanned everything.',
+    'average_bill_amount_year'                   => 'Average bill amount (:year)',
+    'average_bill_amount_overall'                => 'Average bill amount (overall)',
+    'not_or_not_yet'                             => 'Not (yet)',
+    'not_expected_period'                        => 'Not expected this period',
+    'bill_is_active'                             => 'Bill is active',
+    'bill_will_automatch'                        => 'Bill will automatically linked to matching transactions',
     // accounts:
-    'details_for_asset'                          => '',
-    'details_for_expense'                        => '',
-    'details_for_revenue'                        => '',
-    'details_for_cash'                           => '',
-    'store_new_asset_account'                    => '',
-    'store_new_expense_account'                  => '',
-    'store_new_revenue_account'                  => '',
-    'edit_asset_account'                         => '',
-    'edit_expense_account'                       => '',
-    'edit_revenue_account'                       => '',
-    'delete_asset_account'                       => '',
-    'delete_expense_account'                     => '',
-    'delete_revenue_account'                     => '',
-    'asset_deleted'                              => '',
-    'expense_deleted'                            => '',
-    'revenue_deleted'                            => '',
-    'update_asset_account'                       => '',
-    'update_expense_account'                     => '',
-    'update_revenue_account'                     => '',
-    'make_new_asset_account'                     => '',
-    'make_new_expense_account'                   => '',
-    'make_new_revenue_account'                   => '',
-    'asset_accounts'                             => '',
-    'expense_accounts'                           => '',
-    'revenue_accounts'                           => '',
-    'cash_accounts'                              => '',
-    'Cash account'                               => '',
-    'account_type'                               => '',
-    'save_transactions_by_moving'                => '',
-    'stored_new_account'                         => '',
-    'updated_account'                            => '',
-    'credit_card_options'                        => '',
-    'no_transactions_account'                    => '',
+    'details_for_asset'                          => 'Details for asset account ":name"',
+    'details_for_expense'                        => 'Details for expense account ":name"',
+    'details_for_revenue'                        => 'Details for revenue account ":name"',
+    'details_for_cash'                           => 'Details for cash account ":name"',
+    'store_new_asset_account'                    => 'Store new asset account',
+    'store_new_expense_account'                  => 'Store new expense account',
+    'store_new_revenue_account'                  => 'Store new revenue account',
+    'edit_asset_account'                         => 'Edit asset account ":name"',
+    'edit_expense_account'                       => 'Edit expense account ":name"',
+    'edit_revenue_account'                       => 'Edit revenue account ":name"',
+    'delete_asset_account'                       => 'Delete asset account ":name"',
+    'delete_expense_account'                     => 'Delete expense account ":name"',
+    'delete_revenue_account'                     => 'Delete revenue account ":name"',
+    'asset_deleted'                              => 'Successfully deleted asset account ":name"',
+    'expense_deleted'                            => 'Successfully deleted expense account ":name"',
+    'revenue_deleted'                            => 'Successfully deleted revenue account ":name"',
+    'update_asset_account'                       => 'Update asset account',
+    'update_expense_account'                     => 'Update expense account',
+    'update_revenue_account'                     => 'Update revenue account',
+    'make_new_asset_account'                     => 'Create a new asset account',
+    'make_new_expense_account'                   => 'Create a new expense account',
+    'make_new_revenue_account'                   => 'Create a new revenue account',
+    'asset_accounts'                             => 'Asset accounts',
+    'expense_accounts'                           => 'Expense accounts',
+    'revenue_accounts'                           => 'Revenue accounts',
+    'cash_accounts'                              => 'Cash accounts',
+    'Cash account'                               => 'Cash account',
+    'account_type'                               => 'Account type',
+    'save_transactions_by_moving'                => 'Save these transaction(s) by moving them to another account:',
+    'stored_new_account'                         => 'New account ":name" stored!',
+    'updated_account'                            => 'Updated account ":name"',
+    'credit_card_options'                        => 'Credit card options',
+    'no_transactions_account'                    => 'There are no transactions (in this period) for asset account ":name".',
     'no_data_for_chart'                          => 'Недостаточно информации (пока) для построения этой диаграммы.',
-    'select_more_than_one_account'               => '',
-    'select_more_than_one_category'              => '',
-    'select_more_than_one_budget'                => '',
-    'select_more_than_one_tag'                   => '',
-    'account_default_currency'                   => '',
+    'select_more_than_one_account'               => 'Please select more than one account',
+    'select_more_than_one_category'              => 'Please select more than one category',
+    'select_more_than_one_budget'                => 'Please select more than one budget',
+    'select_more_than_one_tag'                   => 'Please select more than one tag',
+    'account_default_currency'                   => 'If you select another currency, new transactions from this account will have this currency pre-selected.',
 
     // categories:
     'new_category'                               => 'Новая категория',
@@ -582,47 +582,47 @@ return [
     'deleted_category'                           => 'Удалить категорию ":name"',
     'store_category'                             => 'Сохранить новую категорию',
     'stored_category'                            => 'Новая категория ":name" успешно сохранена!',
-    'without_category_between'                   => '',
+    'without_category_between'                   => 'Without category between :start and :end',
 
     // transactions:
-    'update_withdrawal'                          => '',
-    'update_deposit'                             => '',
-    'update_transfer'                            => '',
-    'updated_withdrawal'                         => '',
-    'updated_deposit'                            => '',
-    'updated_transfer'                           => '',
-    'delete_withdrawal'                          => '',
-    'delete_deposit'                             => '',
-    'delete_transfer'                            => '',
-    'deleted_withdrawal'                         => '',
-    'deleted_deposit'                            => '',
-    'deleted_transfer'                           => '',
-    'stored_journal'                             => '',
+    'update_withdrawal'                          => 'Update withdrawal',
+    'update_deposit'                             => 'Update deposit',
+    'update_transfer'                            => 'Update transfer',
+    'updated_withdrawal'                         => 'Updated withdrawal ":description"',
+    'updated_deposit'                            => 'Updated deposit ":description"',
+    'updated_transfer'                           => 'Updated transfer ":description"',
+    'delete_withdrawal'                          => 'Delete withdrawal ":description"',
+    'delete_deposit'                             => 'Delete deposit ":description"',
+    'delete_transfer'                            => 'Delete transfer ":description"',
+    'deleted_withdrawal'                         => 'Successfully deleted withdrawal ":description"',
+    'deleted_deposit'                            => 'Successfully deleted deposit ":description"',
+    'deleted_transfer'                           => 'Successfully deleted transfer ":description"',
+    'stored_journal'                             => 'Successfully created new transaction ":description"',
     'select_transactions'                        => 'Выбрать транзакции',
     'stop_selection'                             => 'Завершить выбор транзакций',
-    'edit_selected'                              => '',
-    'delete_selected'                            => '',
-    'mass_delete_journals'                       => '',
-    'mass_edit_journals'                         => '',
-    'cannot_edit_other_fields'                   => '',
-    'perm-delete-many'                           => '',
-    'mass_deleted_transactions_success'          => '',
-    'mass_edited_transactions_success'           => '',
+    'edit_selected'                              => 'Edit selected',
+    'delete_selected'                            => 'Delete selected',
+    'mass_delete_journals'                       => 'Delete a number of transactions',
+    'mass_edit_journals'                         => 'Edit a number of transactions',
+    'cannot_edit_other_fields'                   => 'You cannot mass-edit other fields than the ones here, because there is no room to show them. Please follow the link and edit them by one-by-one, if you need to edit these fields.',
+    'perm-delete-many'                           => 'Deleting many items in one go can be very disruptive. Please be cautious.',
+    'mass_deleted_transactions_success'          => 'Deleted :amount transaction(s).',
+    'mass_edited_transactions_success'           => 'Updated :amount transaction(s)',
 
 
     // new user:
     'welcome'                                    => 'Добро пожаловать в Firefly!',
     'submit'                                     => 'Подтвердить',
     'getting_started'                            => 'Начало работы',
-    'to_get_started'                             => '',
-    'savings_balance_text'                       => '',
-    'finish_up_new_user'                         => '',
-    'stored_new_accounts_new_user'               => '',
+    'to_get_started'                             => 'It is good to see you have successfully installed Firefly III. To get started with this tool please enter your bank\'s name and the balance of your main checking account. Do not worry yet if you have multiple accounts. You can add those later. It\'s just that Firefly III needs something to start with.',
+    'savings_balance_text'                       => 'Firefly III will automatically create a savings account for you. By default, there will be no money in your savings account, but if you tell Firefly III the balance it will be stored as such.',
+    'finish_up_new_user'                         => 'That\'s it! You can continue by pressing <strong>Submit</strong>. You will be taken to the index of Firefly III.',
+    'stored_new_accounts_new_user'               => 'Yay! Your new accounts have been stored.',
 
     // home page:
     'yourAccounts'                               => 'Ваши счета',
     'budgetsAndSpending'                         => 'Бюджеты и расходы',
-    'savings'                                    => '',
+    'savings'                                    => 'Savings',
     'newWithdrawal'                              => 'Новый расход',
     'newDeposit'                                 => 'Новый доход',
     'newTransfer'                                => 'Новый перевод',
@@ -666,179 +666,179 @@ return [
     'no'                                         => 'Нет',
     'amount'                                     => 'Сумма',
     'overview'                                   => 'Обзор',
-    'saveOnAccount'                              => '',
-    'unknown'                                    => '',
-    'daily'                                      => '',
-    'monthly'                                    => '',
+    'saveOnAccount'                              => 'Save on account',
+    'unknown'                                    => 'Unknown',
+    'daily'                                      => 'Daily',
+    'monthly'                                    => 'Monthly',
     'profile'                                    => 'Профиль',
     'errors'                                     => 'Ошибки',
 
     // reports:
-    'report_default'                             => '',
-    'report_audit'                               => '',
-    'report_category'                            => '',
-    'report_budget'                              => '',
-    'report_tag'                                 => '',
-    'quick_link_reports'                         => '',
-    'quick_link_default_report'                  => '',
-    'quick_link_audit_report'                    => '',
-    'report_this_month_quick'                    => '',
-    'report_this_year_quick'                     => '',
-    'report_this_fiscal_year_quick'              => '',
-    'report_all_time_quick'                      => '',
-    'reports_can_bookmark'                       => '',
-    'incomeVsExpenses'                           => '',
-    'accountBalances'                            => '',
-    'balanceStart'                               => '',
-    'balanceEnd'                                 => '',
-    'splitByAccount'                             => '',
-    'coveredWithTags'                            => '',
-    'leftUnbalanced'                             => '',
-    'leftInBudget'                               => '',
-    'sumOfSums'                                  => '',
-    'noCategory'                                 => '',
-    'notCharged'                                 => '',
-    'inactive'                                   => '',
-    'active'                                     => '',
-    'difference'                                 => '',
-    'in'                                         => '',
-    'out'                                        => '',
-    'topX'                                       => '',
-    'show_full_list'                             => '',
-    'show_only_top'                              => '',
-    'report_type'                                => '',
-    'report_type_default'                        => '',
-    'report_type_audit'                          => '',
-    'report_type_category'                       => '',
-    'report_type_budget'                         => '',
-    'report_type_tag'                            => '',
-    'more_info_help'                             => '',
-    'report_included_accounts'                   => '',
-    'report_date_range'                          => '',
-    'report_preset_ranges'                       => '',
+    'report_default'                             => 'Default financial report between :start and :end',
+    'report_audit'                               => 'Transaction history overview between :start and :end',
+    'report_category'                            => 'Category report between :start and :end',
+    'report_budget'                              => 'Budget report between :start and :end',
+    'report_tag'                                 => 'Tag report between :start and :end',
+    'quick_link_reports'                         => 'Quick links',
+    'quick_link_default_report'                  => 'Default financial report',
+    'quick_link_audit_report'                    => 'Transaction history overview',
+    'report_this_month_quick'                    => 'Current month, all accounts',
+    'report_this_year_quick'                     => 'Current year, all accounts',
+    'report_this_fiscal_year_quick'              => 'Current fiscal year, all accounts',
+    'report_all_time_quick'                      => 'All-time, all accounts',
+    'reports_can_bookmark'                       => 'Remember that reports can be bookmarked.',
+    'incomeVsExpenses'                           => 'Income vs. expenses',
+    'accountBalances'                            => 'Account balances',
+    'balanceStart'                               => 'Balance at start of period',
+    'balanceEnd'                                 => 'Balance at end of period',
+    'splitByAccount'                             => 'Split by account',
+    'coveredWithTags'                            => 'Covered with tags',
+    'leftUnbalanced'                             => 'Left unbalanced',
+    'leftInBudget'                               => 'Left in budget',
+    'sumOfSums'                                  => 'Sum of sums',
+    'noCategory'                                 => '(no category)',
+    'notCharged'                                 => 'Not charged (yet)',
+    'inactive'                                   => 'Inactive',
+    'active'                                     => 'Active',
+    'difference'                                 => 'Difference',
+    'in'                                         => 'In',
+    'out'                                        => 'Out',
+    'topX'                                       => 'top :number',
+    'show_full_list'                             => 'Show entire list',
+    'show_only_top'                              => 'Show only top :number',
+    'report_type'                                => 'Report type',
+    'report_type_default'                        => 'Default financial report',
+    'report_type_audit'                          => 'Transaction history overview (audit)',
+    'report_type_category'                       => 'Category report',
+    'report_type_budget'                         => 'Budget report',
+    'report_type_tag'                            => 'Tag report',
+    'more_info_help'                             => 'More information about these types of reports can be found in the help pages. Press the (?) icon in the top right corner.',
+    'report_included_accounts'                   => 'Included accounts',
+    'report_date_range'                          => 'Date range',
+    'report_preset_ranges'                       => 'Pre-set ranges',
     'shared'                                     => 'Общие',
     'fiscal_year'                                => 'Фискальный год',
-    'income_entry'                               => '',
-    'expense_entry'                              => '',
-    'category_entry'                             => '',
-    'budget_spent_amount'                        => '',
-    'balance_amount'                             => '',
-    'no_audit_activity'                          => '',
-    'audit_end_balance'                          => '',
+    'income_entry'                               => 'Income from account ":name" between :start and :end',
+    'expense_entry'                              => 'Expenses to account ":name" between :start and :end',
+    'category_entry'                             => 'Expenses in category ":name" between :start and :end',
+    'budget_spent_amount'                        => 'Expenses in budget ":budget" between :start and :end',
+    'balance_amount'                             => 'Expenses in budget ":budget" paid from account ":account" between :start and :end',
+    'no_audit_activity'                          => 'No activity was recorded on account <a href=":url" title=":account_name">:account_name</a> between :start and :end.',
+    'audit_end_balance'                          => 'Account balance of <a href=":url" title=":account_name">:account_name</a> at the end of :end was: :balance',
     'reports_extra_options'                      => 'Дополнительные опции',
-    'report_has_no_extra_options'                => '',
+    'report_has_no_extra_options'                => 'This report has no extra options',
     'reports_submit'                             => 'Просмотреть отчет',
-    'end_after_start_date'                       => '',
-    'select_category'                            => '',
-    'select_budget'                              => '',
-    'select_tag'                                 => '',
-    'income_per_category'                        => '',
-    'expense_per_category'                       => '',
-    'expense_per_budget'                         => '',
-    'income_per_account'                         => '',
-    'expense_per_account'                        => '',
-    'expense_per_tag'                            => '',
-    'income_per_tag'                             => '',
-    'include_expense_not_in_budget'              => '',
-    'include_expense_not_in_account'             => '',
-    'include_expense_not_in_category'            => '',
-    'include_income_not_in_category'             => '',
-    'include_income_not_in_account'              => '',
-    'include_income_not_in_tags'                 => '',
-    'include_expense_not_in_tags'                => '',
-    'everything_else'                            => '',
-    'income_and_expenses'                        => '',
-    'spent_average'                              => '',
-    'income_average'                             => '',
-    'transaction_count'                          => '',
-    'average_spending_per_account'               => '',
-    'average_income_per_account'                 => '',
+    'end_after_start_date'                       => 'End date of report must be after start date.',
+    'select_category'                            => 'Select category(ies)',
+    'select_budget'                              => 'Select budget(s).',
+    'select_tag'                                 => 'Select tag(s).',
+    'income_per_category'                        => 'Income per category',
+    'expense_per_category'                       => 'Expense per category',
+    'expense_per_budget'                         => 'Expense per budget',
+    'income_per_account'                         => 'Income per account',
+    'expense_per_account'                        => 'Expense per account',
+    'expense_per_tag'                            => 'Expense per tag',
+    'income_per_tag'                             => 'Income per tag',
+    'include_expense_not_in_budget'              => 'Included expenses not in the selected budget(s)',
+    'include_expense_not_in_account'             => 'Included expenses not in the selected account(s)',
+    'include_expense_not_in_category'            => 'Included expenses not in the selected category(ies)',
+    'include_income_not_in_category'             => 'Included income not in the selected category(ies)',
+    'include_income_not_in_account'              => 'Included income not in the selected account(s)',
+    'include_income_not_in_tags'                 => 'Included income not in the selected tag(s)',
+    'include_expense_not_in_tags'                => 'Included expenses not in the selected tag(s)',
+    'everything_else'                            => 'Everything else',
+    'income_and_expenses'                        => 'Income and expenses',
+    'spent_average'                              => 'Spent (average)',
+    'income_average'                             => 'Income (average)',
+    'transaction_count'                          => 'Transaction count',
+    'average_spending_per_account'               => 'Average spending per account',
+    'average_income_per_account'                 => 'Average income per account',
     'total'                                      => 'Итого',
     'description'                                => 'Описание',
-    'sum_of_period'                              => '',
-    'average_in_period'                          => '',
+    'sum_of_period'                              => 'Sum of period',
+    'average_in_period'                          => 'Average in period',
     'account_role_defaultAsset'                  => 'Счёт по умолчанию',
-    'account_role_sharedAsset'                   => '',
-    'account_role_savingAsset'                   => '',
-    'account_role_ccAsset'                       => '',
+    'account_role_sharedAsset'                   => 'Shared asset account',
+    'account_role_savingAsset'                   => 'Savings account',
+    'account_role_ccAsset'                       => 'Credit card',
 
     // charts:
     'chart'                                      => 'Диаграмма',
-    'month'                                      => '',
-    'budget'                                     => '',
-    'spent'                                      => '',
-    'spent_in_budget'                            => '',
-    'left_to_spend'                              => '',
+    'month'                                      => 'Month',
+    'budget'                                     => 'Budget',
+    'spent'                                      => 'Spent',
+    'spent_in_budget'                            => 'Spent in budget',
+    'left_to_spend'                              => 'Left to spend',
     'earned'                                     => 'Заработано',
-    'overspent'                                  => '',
-    'left'                                       => '',
-    'no_budget'                                  => '',
-    'max-amount'                                 => '',
-    'min-amount'                                 => '',
-    'journal-amount'                             => '',
-    'name'                                       => '',
-    'date'                                       => '',
-    'paid'                                       => '',
-    'unpaid'                                     => '',
-    'day'                                        => '',
-    'budgeted'                                   => '',
-    'period'                                     => '',
-    'balance'                                    => '',
-    'sum'                                        => '',
-    'average'                                    => '',
-    'balanceFor'                                 => '',
+    'overspent'                                  => 'Overspent',
+    'left'                                       => 'Left',
+    'no_budget'                                  => '(no budget)',
+    'max-amount'                                 => 'Maximum amount',
+    'min-amount'                                 => 'Minumum amount',
+    'journal-amount'                             => 'Current bill entry',
+    'name'                                       => 'Name',
+    'date'                                       => 'Date',
+    'paid'                                       => 'Paid',
+    'unpaid'                                     => 'Unpaid',
+    'day'                                        => 'Day',
+    'budgeted'                                   => 'Budgeted',
+    'period'                                     => 'Period',
+    'balance'                                    => 'Balance',
+    'sum'                                        => 'Sum',
+    'average'                                    => 'Average',
+    'balanceFor'                                 => 'Balance for :name',
 
     // piggy banks:
-    'add_money_to_piggy'                         => '',
-    'piggy_bank'                                 => '',
-    'new_piggy_bank'                             => '',
-    'store_piggy_bank'                           => '',
-    'stored_piggy_bank'                          => '',
-    'account_status'                             => '',
-    'left_for_piggy_banks'                       => '',
-    'sum_of_piggy_banks'                         => '',
-    'saved_so_far'                               => '',
-    'left_to_save'                               => '',
-    'suggested_amount'                           => '',
-    'add_money_to_piggy_title'                   => '',
-    'remove_money_from_piggy_title'              => '',
-    'add'                                        => '',
+    'add_money_to_piggy'                         => 'Add money to piggy bank ":name"',
+    'piggy_bank'                                 => 'Piggy bank',
+    'new_piggy_bank'                             => 'New piggy bank',
+    'store_piggy_bank'                           => 'Store new piggy bank',
+    'stored_piggy_bank'                          => 'Store new piggy bank ":name"',
+    'account_status'                             => 'Account status',
+    'left_for_piggy_banks'                       => 'Left for piggy banks',
+    'sum_of_piggy_banks'                         => 'Sum of piggy banks',
+    'saved_so_far'                               => 'Saved so far',
+    'left_to_save'                               => 'Left to save',
+    'suggested_amount'                           => 'Suggested monthly amount to save',
+    'add_money_to_piggy_title'                   => 'Add money to piggy bank ":name"',
+    'remove_money_from_piggy_title'              => 'Remove money from piggy bank ":name"',
+    'add'                                        => 'Add',
 
-    'remove'                     => '',
-    'max_amount_add'             => '',
-    'max_amount_remove'          => '',
-    'update_piggy_button'        => '',
-    'update_piggy_title'         => '',
-    'updated_piggy_bank'         => '',
-    'details'                    => '',
-    'events'                     => '',
-    'target_amount'              => '',
-    'start_date'                 => '',
-    'target_date'                => '',
-    'no_target_date'             => '',
-    'table'                      => '',
-    'delete_piggy_bank'          => '',
-    'cannot_add_amount_piggy'    => '',
-    'cannot_remove_from_piggy'   => '',
-    'deleted_piggy_bank'         => '',
-    'added_amount_to_piggy'      => '',
-    'removed_amount_from_piggy'  => '',
+    'remove'                     => 'Remove',
+    'max_amount_add'             => 'The maximum amount you can add is',
+    'max_amount_remove'          => 'The maximum amount you can remove is',
+    'update_piggy_button'        => 'Update piggy bank',
+    'update_piggy_title'         => 'Update piggy bank ":name"',
+    'updated_piggy_bank'         => 'Updated piggy bank ":name"',
+    'details'                    => 'Details',
+    'events'                     => 'Events',
+    'target_amount'              => 'Target amount',
+    'start_date'                 => 'Start date',
+    'target_date'                => 'Target date',
+    'no_target_date'             => 'No target date',
+    'table'                      => 'Table',
+    'delete_piggy_bank'          => 'Delete piggy bank ":name"',
+    'cannot_add_amount_piggy'    => 'Could not add :amount to ":name".',
+    'cannot_remove_from_piggy'   => 'Could not remove :amount from ":name".',
+    'deleted_piggy_bank'         => 'Deleted piggy bank ":name"',
+    'added_amount_to_piggy'      => 'Added :amount to ":name"',
+    'removed_amount_from_piggy'  => 'Removed :amount from ":name"',
 
     // tags
-    'regular_tag'                => '',
-    'balancing_act'              => '',
-    'advance_payment'            => '',
-    'delete_tag'                 => '',
-    'deleted_tag'                => '',
-    'new_tag'                    => '',
-    'edit_tag'                   => '',
-    'updated_tag'                => '',
-    'created_tag'                => '',
+    'regular_tag'                => 'Just a regular tag.',
+    'balancing_act'              => 'The tag takes at most two transactions; an expense and a transfer. They\'ll balance each other out.',
+    'advance_payment'            => 'The tag accepts one expense and any number of deposits aimed to repay the original expense.',
+    'delete_tag'                 => 'Delete tag ":tag"',
+    'deleted_tag'                => 'Deleted tag ":tag"',
+    'new_tag'                    => 'Make new tag',
+    'edit_tag'                   => 'Edit tag ":tag"',
+    'updated_tag'                => 'Updated tag ":tag"',
+    'created_tag'                => 'Tag ":tag" has been created!',
 
-    'transaction_journal_information'       => '',
-    'transaction_journal_meta'              => '',
-    'total_amount'                          => '',
-    'number_of_decimals'                    => '',
+    'transaction_journal_information'       => 'Transaction information',
+    'transaction_journal_meta'              => 'Meta information',
+    'total_amount'                          => 'Total amount',
+    'number_of_decimals'                    => 'Number of decimals',
 
     // administration
     'administration'                        => 'Администрирование',
@@ -847,72 +847,72 @@ return [
     'all_users'                             => 'Все пользователи',
     'instance_configuration'                => 'Конфигурация',
     'firefly_instance_configuration'        => 'Базовая конфигурация Firefly III',
-    'setting_single_user_mode'              => '',
-    'setting_single_user_mode_explain'      => '',
-    'store_configuration'                   => '',
-    'single_user_administration'            => '',
-    'edit_user'                             => '',
-    'hidden_fields_preferences'             => '',
-    'user_data_information'                 => '',
-    'user_information'                      => '',
+    'setting_single_user_mode'              => 'Single user mode',
+    'setting_single_user_mode_explain'      => 'By default, Firefly III only accepts one (1) registration: you. This is a security measure, preventing others from using your instance unless you allow them to. Future registrations are blocked. When you uncheck this box, others can use your instance as wel, assuming they can reach it (when it is connected to the internet).',
+    'store_configuration'                   => 'Store configuration',
+    'single_user_administration'            => 'User administration for :email',
+    'edit_user'                             => 'Edit user :email',
+    'hidden_fields_preferences'             => 'Not all fields are visible right now. You must enable them in your <a href=":link">settings</a>.',
+    'user_data_information'                 => 'User data',
+    'user_information'                      => 'User information',
     'total_size'                            => 'общий размер',
-    'budget_or_budgets'                     => '',
-    'budgets_with_limits'                   => '',
-    'rule_or_rules'                         => '',
-    'rulegroup_or_groups'                   => '',
-    'configuration_updated'                 => '',
-    'setting_is_demo_site'                  => '',
-    'setting_is_demo_site_explain'          => '',
-    'block_code_bounced'                    => '',
-    'block_code_expired'                    => '',
-    'no_block_code'                         => '',
+    'budget_or_budgets'                     => 'budget(s)',
+    'budgets_with_limits'                   => 'budget(s) with configured amount',
+    'rule_or_rules'                         => 'rule(s)',
+    'rulegroup_or_groups'                   => 'rule group(s)',
+    'configuration_updated'                 => 'The configuration has been updated',
+    'setting_is_demo_site'                  => 'Demo site',
+    'setting_is_demo_site_explain'          => 'If you check this box, this installation will behave as if it is the demo site, which can have weird side effects.',
+    'block_code_bounced'                    => 'Email message(s) bounced',
+    'block_code_expired'                    => 'Demo account expired',
+    'no_block_code'                         => 'No reason for block or user not blocked',
     // links
-    'journal_link_configuration'            => '',
-    'create_new_link_type'                  => '',
-    'store_new_link_type'                   => '',
-    'update_link_type'                      => '',
-    'edit_link_type'                        => '',
-    'updated_link_type'                     => '',
-    'delete_link_type'                      => '',
-    'deleted_link_type'                     => '',
-    'stored_new_link_type'                  => '',
-    'cannot_edit_link_type'                 => '',
-    'link_type_help_name'                   => '',
-    'link_type_help_inward'                 => '',
-    'link_type_help_outward'                => '',
-    'save_connections_by_moving'            => '',
-    'do_not_save_connection'                => '',
-    'link_transaction'                      => '',
-    'link_to_other_transaction'             => '',
-    'select_transaction_to_link'            => '',
-    'this_transaction'                      => '',
-    'transaction'                           => '',
-    'comments'                              => '',
-    'to_link_not_found'                     => '',
-    'invalid_link_data'                     => '',
-    'journals_linked'                       => '',
-    'journals_error_linked'                 => '',
-    'journal_links'                         => '',
-    'this_withdrawal'                       => '',
-    'this_deposit'                          => '',
-    'this_transfer'                         => '',
-    'overview_for_link'                     => '',
-    'delete_journal_link'                   => '',
-    'deleted_link'                          => '',
+    'journal_link_configuration'            => 'Transaction links configuration',
+    'create_new_link_type'                  => 'Create new link type',
+    'store_new_link_type'                   => 'Store new link type',
+    'update_link_type'                      => 'Update link type',
+    'edit_link_type'                        => 'Edit link type ":name"',
+    'updated_link_type'                     => 'Updated link type ":name"',
+    'delete_link_type'                      => 'Delete link type ":name"',
+    'deleted_link_type'                     => 'Deleted link type ":name"',
+    'stored_new_link_type'                  => 'Store new link type ":name"',
+    'cannot_edit_link_type'                 => 'Cannot edit link type ":name"',
+    'link_type_help_name'                   => 'Ie. "Duplicates"',
+    'link_type_help_inward'                 => 'Ie. "duplicates"',
+    'link_type_help_outward'                => 'Ie. "is duplicated by"',
+    'save_connections_by_moving'            => 'Save the link between these transaction(s) by moving them to another link type:',
+    'do_not_save_connection'                => '(do not save connection)',
+    'link_transaction'                      => 'Link transaction',
+    'link_to_other_transaction'             => 'Link this transaction to another transaction',
+    'select_transaction_to_link'            => 'Select a transaction to link this transaction to',
+    'this_transaction'                      => 'This transaction',
+    'transaction'                           => 'Transaction',
+    'comments'                              => 'Comments',
+    'to_link_not_found'                     => 'If the transaction you want to link to is not listed, simply enter its ID.',
+    'invalid_link_data'                     => 'Invalid link type selected. Cannot link transaction.',
+    'journals_linked'                       => 'Transactions are linked.',
+    'journals_error_linked'                 => 'These transactions are already linked.',
+    'journal_links'                         => 'Transaction links',
+    'this_withdrawal'                       => 'This withdrawal',
+    'this_deposit'                          => 'This deposit',
+    'this_transfer'                         => 'This transfer',
+    'overview_for_link'                     => 'Overview for link type ":name"',
+    'delete_journal_link'                   => 'Delete the link between <a href=":source_link">:source</a> and <a href=":destination_link">:destination</a>',
+    'deleted_link'                          => 'Deleted link',
 
 
     // split a transaction:
-    'splits'                                => '',
-    'add_another_split'                     => '',
-    'split-transactions'                    => '',
-    'do_split'                              => '',
-    'split_this_withdrawal'                 => '',
-    'split_this_deposit'                    => '',
-    'split_this_transfer'                   => '',
-    'cannot_edit_multiple_source'           => '',
-    'cannot_edit_multiple_dest'             => '',
-    'cannot_edit_opening_balance'           => '',
-    'no_edit_multiple_left'                 => '',
+    'splits'                                => 'Splits',
+    'add_another_split'                     => 'Add another split',
+    'split-transactions'                    => 'Split transactions',
+    'do_split'                              => 'Do a split',
+    'split_this_withdrawal'                 => 'Split this withdrawal',
+    'split_this_deposit'                    => 'Split this deposit',
+    'split_this_transfer'                   => 'Split this transfer',
+    'cannot_edit_multiple_source'           => 'You cannot edit splitted transaction #:id with description ":description" because it contains multiple source accounts.',
+    'cannot_edit_multiple_dest'             => 'You cannot edit splitted transaction #:id with description ":description" because it contains multiple destination accounts.',
+    'cannot_edit_opening_balance'           => 'You cannot edit the opening balance of an account.',
+    'no_edit_multiple_left'                 => 'You have selected no valid transactions to edit.',
 
     // import bread crumbs and titles:
     'import'                                => 'Импорт',
@@ -920,93 +920,93 @@ return [
 
     // import index page:
     'import_index_title'                    => 'Импорт данных в Firefly III',
-    'import_index_sub_title'                => '',
-    'import_general_index_intro'            => '',
-    'import_index_intro'                    => '',
-    'import_index_file'                     => '',
-    'import_index_config'                   => '',
-    'import_index_type'                     => '',
-    'import_index_start'                    => '',
+    'import_index_sub_title'                => 'Index',
+    'import_general_index_intro'            => 'Welcome to Firefly\'s import routine. There are a few ways of importing data into Firefly III, displayed here as buttons.',
+    'import_index_intro'                    => 'This routine will help you import files from your bank into Firefly III. Please check out the help pages in the top right corner.',
+    'import_index_file'                     => 'Select your file',
+    'import_index_config'                   => 'If you have previously imported data into Firefly III, you may have a configuration file, which will pre-set configuration values for you. For some banks, other users have kindly provided their <a href="https://github.com/firefly-iii/import-configurations/wiki">configuration file</a>.',
+    'import_index_type'                     => 'Select the type of file you will upload',
+    'import_index_start'                    => 'Start importing',
 
     // supported file types:
-    'import_file_type_csv'                  => '',
+    'import_file_type_csv'                  => 'CSV (comma separated values)',
 
     // import configuration routine:
-    'import_config_sub_title'               => '',
-    'import_config_bread_crumb'             => '',
+    'import_config_sub_title'               => 'Set up your import file',
+    'import_config_bread_crumb'             => 'Set up your import file',
 
     // import status page:
-    'import_status_bread_crumb'             => '',
-    'import_status_sub_title'               => '',
-    'import_status_wait_title'              => '',
-    'import_status_wait_text'               => '',
-    'import_status_ready_title'             => '',
-    'import_status_ready_text'              => '',
-    'import_status_ready_config'            => '',
-    'import_status_ready_start'             => '',
-    'import_status_ready_share'             => '',
-    'import_status_running_title'           => '',
-    'import_status_running_placeholder'     => '',
-    'import_status_errors_title'            => '',
-    'import_status_errors_single'           => '',
-    'import_status_errors_multi'            => '',
-    'import_status_fatal_title'             => '',
-    'import_status_fatal_text'              => '',
-    'import_status_fatal_more'              => '',
-    'import_status_finished_title'          => '',
-    'import_status_finished_text'           => '',
-    'import_status_finished_job'            => '',
-    'import_with_key'                       => '',
+    'import_status_bread_crumb'             => 'Import status',
+    'import_status_sub_title'               => 'Import status',
+    'import_status_wait_title'              => 'Please hold...',
+    'import_status_wait_text'               => 'This box will disappear in a moment.',
+    'import_status_ready_title'             => 'Import is ready to start',
+    'import_status_ready_text'              => 'The import is ready to start. All the configuration you needed to do has been done. Please download the configuration file. It will help you with the import should it not go as planned. To actually run the import, you can either execute the following command in your console, or run the web-based import. Depending on your configuration, the console import will give you more feedback.',
+    'import_status_ready_config'            => 'Download configuration',
+    'import_status_ready_start'             => 'Start the import',
+    'import_status_ready_share'             => 'Please consider downloading your configuration and sharing it at the <strong><a href="https://github.com/firefly-iii/import-configurations/wiki">import configuration center</a></strong>. This will allow other users of Firefly III to import their files more easily.',
+    'import_status_running_title'           => 'The import is running',
+    'import_status_running_placeholder'     => 'Please hold for an update...',
+    'import_status_errors_title'            => 'Errors during the import',
+    'import_status_errors_single'           => 'An error has occured during the import. It does not appear to be fatal.',
+    'import_status_errors_multi'            => 'Some errors occured during the import. These do not appear to be fatal.',
+    'import_status_fatal_title'             => 'A fatal error occurred',
+    'import_status_fatal_text'              => 'A fatal error occurred, which the import-routine cannot recover from. Please see the explanation in red below.',
+    'import_status_fatal_more'              => 'If the error is a time-out, the import will have stopped half-way. For some server configurations, it is merely the server that stopped while the import keeps running in the background. To verify this, check out the log files. If the problem persists, consider importing over the command line instead.',
+    'import_status_finished_title'          => 'Import routine finished',
+    'import_status_finished_text'           => 'The import routine has imported your file.',
+    'import_status_finished_job'            => 'The transactions imported can be found in tag <a href=":link" class="label label-success" style="font-size:100%;font-weight:normal;">:tag</a>.',
+    'import_with_key'                       => 'Import with key \':key\'',
 
     // sandstorm.io errors and messages:
-    'sandstorm_not_available'               => '',
+    'sandstorm_not_available'               => 'This function is not available when you are using Firefly III within a Sandstorm.io environment.',
 
     // empty lists? no objects? instructions:
-    'no_transactions_in_period'             => '',
-    'no_accounts_title_asset'               => '',
-    'no_accounts_intro_asset'               => '',
-    'no_accounts_imperative_asset'          => '',
+    'no_transactions_in_period'             => 'There are no transactions in this period.',
+    'no_accounts_title_asset'               => 'Let\'s create an asset account!',
+    'no_accounts_intro_asset'               => 'You have no asset accounts yet. Asset accounts are your main accounts: your checking account, savings account, shared account or even your credit card.',
+    'no_accounts_imperative_asset'          => 'To start using Firefly III you must create at least one asset account. Let\'s do so now:',
     'no_accounts_create_asset'              => 'Создание расходного счёта',
     'no_accounts_title_expense'             => 'Давайте создадим расходный счёт!',
     'no_accounts_intro_expense'             => 'Пока у вас нет ни одного расходного счёта. Расходные счета используются для контроля за тем, где именно вы расходуете свои финансы. Например, в магазинах или на оплату коммунальных счетов.',
     'no_accounts_imperative_expense'        => 'Расходные счета создаются автоматически, когда вы создаёте транзакции (расходы), но вы можете также создать их вручную, если хотите. Давайте создадим один прямо сейчас:',
     'no_accounts_create_expense'            => 'Создать расходный счёт',
-    'no_accounts_title_revenue'             => '',
-    'no_accounts_intro_revenue'             => '',
-    'no_accounts_imperative_revenue'        => '',
-    'no_accounts_create_revenue'            => '',
-    'no_budgets_title_default'              => '',
-    'no_budgets_intro_default'              => '',
-    'no_budgets_imperative_default'         => '',
-    'no_budgets_create_default'             => '',
-    'no_categories_title_default'           => '',
-    'no_categories_intro_default'           => '',
-    'no_categories_imperative_default'      => '',
-    'no_categories_create_default'          => '',
-    'no_tags_title_default'                 => '',
-    'no_tags_intro_default'                 => '',
-    'no_tags_imperative_default'            => '',
-    'no_tags_create_default'                => '',
-    'no_transactions_title_withdrawal'      => '',
-    'no_transactions_intro_withdrawal'      => '',
-    'no_transactions_imperative_withdrawal' => '',
-    'no_transactions_create_withdrawal'     => '',
-    'no_transactions_title_deposit'         => '',
-    'no_transactions_intro_deposit'         => '',
-    'no_transactions_imperative_deposit'    => '',
-    'no_transactions_create_deposit'        => '',
-    'no_transactions_title_transfers'       => '',
-    'no_transactions_intro_transfers'       => '',
-    'no_transactions_imperative_transfers'  => '',
-    'no_transactions_create_transfers'      => '',
-    'no_piggies_title_default'              => '',
-    'no_piggies_intro_default'              => '',
-    'no_piggies_imperative_default'         => '',
-    'no_piggies_create_default'             => '',
-    'no_bills_title_default'                => '',
-    'no_bills_intro_default'                => '',
-    'no_bills_imperative_default'           => '',
-    'no_bills_create_default'               => '',
+    'no_accounts_title_revenue'             => 'Let\'s create a revenue account!',
+    'no_accounts_intro_revenue'             => 'You have no revenue accounts yet. Revenue accounts are the places where you receive money from, such as your employer.',
+    'no_accounts_imperative_revenue'        => 'Revenue accounts are created automatically when you create transactions, but you can create one manually too, if you want. Let\'s create one now:',
+    'no_accounts_create_revenue'            => 'Create a revenue account',
+    'no_budgets_title_default'              => 'Let\'s create a budget',
+    'no_budgets_intro_default'              => 'You have no budgets yet. Budgets are used to organise your expenses into logical groups, which you can give a soft-cap to limit your expenses.',
+    'no_budgets_imperative_default'         => 'Budgets are the basic tools of financial management. Let\'s create one now:',
+    'no_budgets_create_default'             => 'Create a budget',
+    'no_categories_title_default'           => 'Let\'s create a category!',
+    'no_categories_intro_default'           => 'You have no categories yet. Categories are used to fine tune your transactions and label them with their designated category.',
+    'no_categories_imperative_default'      => 'Categories are created automatically when you create transactions, but you can create one manually too. Let\'s create one now:',
+    'no_categories_create_default'          => 'Create a category',
+    'no_tags_title_default'                 => 'Let\'s create a tag!',
+    'no_tags_intro_default'                 => 'You have no tags yet. Tags are used to fine tune your transactions and label them with specific keywords.',
+    'no_tags_imperative_default'            => 'Tags are created automatically when you create transactions, but you can create one manually too. Let\'s create one now:',
+    'no_tags_create_default'                => 'Create a tag',
+    'no_transactions_title_withdrawal'      => 'Let\'s create an expense!',
+    'no_transactions_intro_withdrawal'      => 'You have no expenses yet. You should create expenses to start managing your finances.',
+    'no_transactions_imperative_withdrawal' => 'Have you spent some money? Then you should write it down:',
+    'no_transactions_create_withdrawal'     => 'Create an expense',
+    'no_transactions_title_deposit'         => 'Let\'s create some income!',
+    'no_transactions_intro_deposit'         => 'You have no recorded income yet. You should create income entries to start managing your finances.',
+    'no_transactions_imperative_deposit'    => 'Have you received some money? Then you should write it down:',
+    'no_transactions_create_deposit'        => 'Create a deposit',
+    'no_transactions_title_transfers'       => 'Let\'s create a transfer!',
+    'no_transactions_intro_transfers'       => 'You have no transfers yet. When you move money between asset accounts, it is recorded as a transfer.',
+    'no_transactions_imperative_transfers'  => 'Have you moved some money around? Then you should write it down:',
+    'no_transactions_create_transfers'      => 'Create a transfer',
+    'no_piggies_title_default'              => 'Let\'s create a piggy bank!',
+    'no_piggies_intro_default'              => 'You have no piggy banks yet. You can create piggy banks to divide your savings and keep track of what you\'re saving up for.',
+    'no_piggies_imperative_default'         => 'Do you have things you\'re saving money for? Create a piggy bank and keep track:',
+    'no_piggies_create_default'             => 'Create a new piggy bank',
+    'no_bills_title_default'                => 'Let\'s create a bill!',
+    'no_bills_intro_default'                => 'You have no bills yet. You can create bills to keep track of regular expenses, like your rent of insurance.',
+    'no_bills_imperative_default'           => 'Do you have such regular bills? Create a bill and keep track of your payments:',
+    'no_bills_create_default'               => 'Create a bill',
 
 
 ];
\ No newline at end of file

From 23a028f011f81db1851e099703dba791af216243 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Fri, 25 Aug 2017 07:36:33 +0200
Subject: [PATCH 319/668] New translations form.php (Russian)

---
 resources/lang/ru_RU/form.php | 270 +++++++++++++++++-----------------
 1 file changed, 135 insertions(+), 135 deletions(-)

diff --git a/resources/lang/ru_RU/form.php b/resources/lang/ru_RU/form.php
index e7e1245724..26228ed515 100644
--- a/resources/lang/ru_RU/form.php
+++ b/resources/lang/ru_RU/form.php
@@ -14,103 +14,103 @@ declare(strict_types=1);
 return [
 
     // new user:
-    'bank_name'                      => '',
-    'bank_balance'                   => '',
-    'savings_balance'                => '',
-    'credit_card_limit'              => '',
-    'automatch'                      => '',
-    'skip'                           => '',
-    'name'                           => '',
-    'active'                         => '',
-    'amount_min'                     => '',
-    'amount_max'                     => '',
-    'match'                          => '',
-    'repeat_freq'                    => '',
-    'journal_currency_id'            => '',
-    'currency_id'                    => '',
-    'attachments'                    => '',
-    'journal_amount'                 => '',
-    'journal_asset_source_account'   => '',
-    'journal_source_account_name'    => '',
-    'journal_source_account_id'      => '',
-    'BIC'                            => '',
-    'verify_password'                => '',
-    'account_from_id'                => '',
-    'account_to_id'                  => '',
-    'source_account'                 => '',
-    'destination_account'            => '',
-    'journal_destination_account_id' => '',
-    'asset_destination_account'      => '',
-    'asset_source_account'           => '',
-    'journal_description'            => '',
-    'note'                           => '',
-    'split_journal'                  => '',
-    'split_journal_explanation'      => '',
-    'currency'                       => '',
-    'account_id'                     => '',
-    'budget_id'                      => '',
-    'openingBalance'                 => '',
-    'tagMode'                        => '',
-    'tagPosition'                    => '',
-    'virtualBalance'                 => '',
-    'longitude_latitude'             => '',
-    'targetamount'                   => '',
-    'accountRole'                    => '',
-    'openingBalanceDate'             => '',
-    'ccType'                         => '',
-    'ccMonthlyPaymentDate'           => '',
-    'piggy_bank_id'                  => '',
-    'returnHere'                     => '',
-    'returnHereExplanation'          => '',
-    'returnHereUpdateExplanation'    => '',
-    'description'                    => '',
-    'expense_account'                => '',
+    'bank_name'                      => 'Bank name',
+    'bank_balance'                   => 'Balance',
+    'savings_balance'                => 'Savings balance',
+    'credit_card_limit'              => 'Credit card limit',
+    'automatch'                      => 'Match automatically',
+    'skip'                           => 'Skip',
+    'name'                           => 'Name',
+    'active'                         => 'Active',
+    'amount_min'                     => 'Minimum amount',
+    'amount_max'                     => 'Maximum amount',
+    'match'                          => 'Matches on',
+    'repeat_freq'                    => 'Repeats',
+    'journal_currency_id'            => 'Currency',
+    'currency_id'                    => 'Currency',
+    'attachments'                    => 'Attachments',
+    'journal_amount'                 => 'Amount',
+    'journal_asset_source_account'   => 'Asset account (source)',
+    'journal_source_account_name'    => 'Revenue account (source)',
+    'journal_source_account_id'      => 'Asset account (source)',
+    'BIC'                            => 'BIC',
+    'verify_password'                => 'Verify password security',
+    'account_from_id'                => 'From account',
+    'account_to_id'                  => 'To account',
+    'source_account'                 => 'Source account',
+    'destination_account'            => 'Destination account',
+    'journal_destination_account_id' => 'Asset account (destination)',
+    'asset_destination_account'      => 'Asset account (destination)',
+    'asset_source_account'           => 'Asset account (source)',
+    'journal_description'            => 'Description',
+    'note'                           => 'Notes',
+    'split_journal'                  => 'Split this transaction',
+    'split_journal_explanation'      => 'Split this transaction in multiple parts',
+    'currency'                       => 'Currency',
+    'account_id'                     => 'Asset account',
+    'budget_id'                      => 'Budget',
+    'openingBalance'                 => 'Opening balance',
+    'tagMode'                        => 'Tag mode',
+    'tagPosition'                    => 'Tag location',
+    'virtualBalance'                 => 'Virtual balance',
+    'longitude_latitude'             => 'Location',
+    'targetamount'                   => 'Target amount',
+    'accountRole'                    => 'Account role',
+    'openingBalanceDate'             => 'Opening balance date',
+    'ccType'                         => 'Credit card payment plan',
+    'ccMonthlyPaymentDate'           => 'Credit card monthly payment date',
+    'piggy_bank_id'                  => 'Piggy bank',
+    'returnHere'                     => 'Return here',
+    'returnHereExplanation'          => 'After storing, return here to create another one.',
+    'returnHereUpdateExplanation'    => 'After updating, return here.',
+    'description'                    => 'Description',
+    'expense_account'                => 'Expense account',
     'revenue_account'                => 'Доходный счет',
     'decimal_places'                 => 'Количество цифр после точки',
     'exchange_rate_instruction'      => 'Иностранные валюты',
     'exchanged_amount'               => 'Сумма обмена',
     'source_amount'                  => 'Сумма (источник)',
     'destination_amount'             => 'Сумма (назначение)',
-    'native_amount'                  => '',
+    'native_amount'                  => 'Native amount',
 
     'revenue_account_source'      => 'Доходный счет (источник)',
-    'source_account_asset'        => '',
-    'destination_account_expense' => '',
-    'destination_account_asset'   => '',
-    'source_account_revenue'      => '',
+    'source_account_asset'        => 'Source account (asset account)',
+    'destination_account_expense' => 'Destination account (expense account)',
+    'destination_account_asset'   => 'Destination account (asset account)',
+    'source_account_revenue'      => 'Source account (revenue account)',
     'type'                        => 'Тип',
-    'convert_Withdrawal'          => '',
-    'convert_Deposit'             => '',
-    'convert_Transfer'            => '',
+    'convert_Withdrawal'          => 'Convert withdrawal',
+    'convert_Deposit'             => 'Convert deposit',
+    'convert_Transfer'            => 'Convert transfer',
 
 
     'amount'                     => 'Сумма',
     'date'                       => 'Дата',
-    'interest_date'              => '',
-    'book_date'                  => '',
-    'process_date'               => '',
-    'category'                   => '',
-    'tags'                       => '',
-    'deletePermanently'          => '',
+    'interest_date'              => 'Interest date',
+    'book_date'                  => 'Book date',
+    'process_date'               => 'Processing date',
+    'category'                   => 'Category',
+    'tags'                       => 'Tags',
+    'deletePermanently'          => 'Delete permanently',
     'cancel'                     => 'Отмена',
     'targetdate'                 => 'Намеченная дата',
     'tag'                        => 'Тег',
-    'under'                      => '',
+    'under'                      => 'Under',
     'symbol'                     => 'Символ',
     'code'                       => 'Код',
-    'iban'                       => '',
+    'iban'                       => 'IBAN',
     'accountNumber'              => 'Номер счета',
     'has_headers'                => 'Заголовки',
     'date_format'                => 'Формат даты',
-    'specifix'                   => '',
-    'attachments[]'              => '',
-    'store_new_withdrawal'       => '',
-    'store_new_deposit'          => '',
-    'store_new_transfer'         => '',
-    'add_new_withdrawal'         => '',
-    'add_new_deposit'            => '',
-    'add_new_transfer'           => '',
-    'noPiggybank'                => '',
+    'specifix'                   => 'Bank- or file specific fixes',
+    'attachments[]'              => 'Attachments',
+    'store_new_withdrawal'       => 'Store new withdrawal',
+    'store_new_deposit'          => 'Store new deposit',
+    'store_new_transfer'         => 'Store new transfer',
+    'add_new_withdrawal'         => 'Add a new withdrawal',
+    'add_new_deposit'            => 'Add a new deposit',
+    'add_new_transfer'           => 'Add a new transfer',
+    'noPiggybank'                => '(no piggy bank)',
     'title'                      => 'Заголовок',
     'notes'                      => 'Заметки',
     'filename'                   => 'Имя файла',
@@ -118,63 +118,63 @@ return [
     'size'                       => 'Размер',
     'trigger'                    => 'Триггер',
     'stop_processing'            => 'Остановить обработку',
-    'start_date'                 => '',
-    'end_date'                   => '',
-    'export_start_range'         => '',
-    'export_end_range'           => '',
-    'export_format'              => '',
-    'include_attachments'        => '',
-    'include_old_uploads'        => '',
-    'accounts'                   => '',
-    'delete_account'             => '',
-    'delete_bill'                => '',
-    'delete_budget'              => '',
-    'delete_category'            => '',
-    'delete_currency'            => '',
-    'delete_journal'             => '',
-    'delete_attachment'          => '',
-    'delete_rule'                => '',
-    'delete_rule_group'          => '',
-    'delete_link_type'           => '',
-    'attachment_areYouSure'      => '',
-    'account_areYouSure'         => '',
-    'bill_areYouSure'            => '',
-    'rule_areYouSure'            => '',
-    'ruleGroup_areYouSure'       => '',
-    'budget_areYouSure'          => '',
-    'category_areYouSure'        => '',
-    'currency_areYouSure'        => '',
-    'piggyBank_areYouSure'       => '',
-    'journal_areYouSure'         => '',
-    'mass_journal_are_you_sure'  => '',
-    'tag_areYouSure'             => '',
-    'journal_link_areYouSure'    => '',
-    'linkType_areYouSure'        => '',
-    'permDeleteWarning'          => '',
-    'mass_make_selection'        => '',
-    'delete_all_permanently'     => '',
-    'update_all_journals'        => '',
-    'also_delete_transactions'   => '',
-    'also_delete_connections'    => '',
-    'also_delete_rules'          => '',
-    'also_delete_piggyBanks'     => '',
-    'bill_keep_transactions'     => '',
-    'budget_keep_transactions'   => '',
-    'category_keep_transactions' => '',
-    'tag_keep_transactions'      => '',
+    'start_date'                 => 'Start of range',
+    'end_date'                   => 'End of range',
+    'export_start_range'         => 'Start of export range',
+    'export_end_range'           => 'End of export range',
+    'export_format'              => 'File format',
+    'include_attachments'        => 'Include uploaded attachments',
+    'include_old_uploads'        => 'Include imported data',
+    'accounts'                   => 'Export transactions from these accounts',
+    'delete_account'             => 'Delete account ":name"',
+    'delete_bill'                => 'Delete bill ":name"',
+    'delete_budget'              => 'Delete budget ":name"',
+    'delete_category'            => 'Delete category ":name"',
+    'delete_currency'            => 'Delete currency ":name"',
+    'delete_journal'             => 'Delete transaction with description ":description"',
+    'delete_attachment'          => 'Delete attachment ":name"',
+    'delete_rule'                => 'Delete rule ":title"',
+    'delete_rule_group'          => 'Delete rule group ":title"',
+    'delete_link_type'           => 'Delete link type ":name"',
+    'attachment_areYouSure'      => 'Are you sure you want to delete the attachment named ":name"?',
+    'account_areYouSure'         => 'Are you sure you want to delete the account named ":name"?',
+    'bill_areYouSure'            => 'Are you sure you want to delete the bill named ":name"?',
+    'rule_areYouSure'            => 'Are you sure you want to delete the rule titled ":title"?',
+    'ruleGroup_areYouSure'       => 'Are you sure you want to delete the rule group titled ":title"?',
+    'budget_areYouSure'          => 'Are you sure you want to delete the budget named ":name"?',
+    'category_areYouSure'        => 'Are you sure you want to delete the category named ":name"?',
+    'currency_areYouSure'        => 'Are you sure you want to delete the currency named ":name"?',
+    'piggyBank_areYouSure'       => 'Are you sure you want to delete the piggy bank named ":name"?',
+    'journal_areYouSure'         => 'Are you sure you want to delete the transaction described ":description"?',
+    'mass_journal_are_you_sure'  => 'Are you sure you want to delete these transactions?',
+    'tag_areYouSure'             => 'Are you sure you want to delete the tag ":tag"?',
+    'journal_link_areYouSure'    => 'Are you sure you want to delete the link between <a href=":source_link">:source</a> and <a href=":destination_link">:destination</a>?',
+    'linkType_areYouSure'        => 'Are you sure you want to delete the link type ":name" (":inward" / ":outward")?',
+    'permDeleteWarning'          => 'Deleting stuff from Firely is permanent and cannot be undone.',
+    'mass_make_selection'        => 'You can still prevent items from being deleted by removing the checkbox.',
+    'delete_all_permanently'     => 'Delete selected permanently',
+    'update_all_journals'        => 'Update these transactions',
+    'also_delete_transactions'   => 'The only transaction connected to this account will be deleted as well.|All :count transactions connected to this account will be deleted as well.',
+    'also_delete_connections'    => 'The only transaction linked with this link type will lose this connection.|All :count transactions linked with this link type will lose their connection.',
+    'also_delete_rules'          => 'The only rule connected to this rule group will be deleted as well.|All :count rules connected to this rule group will be deleted as well.',
+    'also_delete_piggyBanks'     => 'The only piggy bank connected to this account will be deleted as well.|All :count piggy bank connected to this account will be deleted as well.',
+    'bill_keep_transactions'     => 'The only transaction connected to this bill will not be deleted.|All :count transactions connected to this bill will spared deletion.',
+    'budget_keep_transactions'   => 'The only transaction connected to this budget will not be deleted.|All :count transactions connected to this budget will spared deletion.',
+    'category_keep_transactions' => 'The only transaction connected to this category will not be deleted.|All :count transactions connected to this category will spared deletion.',
+    'tag_keep_transactions'      => 'The only transaction connected to this tag will not be deleted.|All :count transactions connected to this tag will spared deletion.',
 
-    'email'                 => '',
-    'password'              => '',
-    'password_confirmation' => '',
-    'blocked'               => '',
-    'blocked_code'          => '',
+    'email'                 => 'Email address',
+    'password'              => 'Password',
+    'password_confirmation' => 'Password (again)',
+    'blocked'               => 'Is blocked?',
+    'blocked_code'          => 'Reason for block',
 
 
     // admin
-    'domain'                => '',
-    'single_user_mode'      => '',
-    'must_confirm_account'  => '',
-    'is_demo_site'          => '',
+    'domain'                => 'Domain',
+    'single_user_mode'      => 'Single user mode',
+    'must_confirm_account'  => 'New users must activate account',
+    'is_demo_site'          => 'Is demo site',
 
 
     // import
@@ -189,11 +189,11 @@ return [
     'csv_config'            => 'Параметры импорта CSV',
 
 
-    'due_date'           => '',
-    'payment_date'       => '',
-    'invoice_date'       => '',
-    'internal_reference' => '',
+    'due_date'           => 'Due date',
+    'payment_date'       => 'Payment date',
+    'invoice_date'       => 'Invoice date',
+    'internal_reference' => 'Internal reference',
 
-    'inward'  => '',
-    'outward' => '',
+    'inward'  => 'Inward description',
+    'outward' => 'Outward description',
 ];
\ No newline at end of file

From 0f2bd34a62b84d41afc097bc0da2eb6013eba626 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Fri, 25 Aug 2017 07:36:34 +0200
Subject: [PATCH 320/668] New translations csv.php (Russian)

---
 resources/lang/ru_RU/csv.php | 104 +++++++++++++++++------------------
 1 file changed, 52 insertions(+), 52 deletions(-)

diff --git a/resources/lang/ru_RU/csv.php b/resources/lang/ru_RU/csv.php
index 7bb197ef80..599cb9171f 100644
--- a/resources/lang/ru_RU/csv.php
+++ b/resources/lang/ru_RU/csv.php
@@ -17,7 +17,7 @@ return [
     'initial_title'                 => 'Импорт данных (1/3) - Подготовка к импорту CSV',
     'initial_text'                  => 'Чтобы импорт данных прошёл успешно, пожалуйста проверьте несколько параметров.',
     'initial_box'                   => 'Основные параметры импорта CSV',
-    'initial_box_title'             => '',
+    'initial_box_title'             => 'Basic CSV import setup options',
     'initial_header_help'           => 'Установите этот флажок, если первая строка CSV-файла содержит заголовки столбцов.',
     'initial_date_help'             => 'Формат даты и времени в вашем CSV-файле. Придерживайтесь формата, описанного <a href="https://secure.php.net/manual/en/datetime.createfromformat.php#refsect1-datetime.createfromformat-parameters">на этой</a> странице. По умолчанию дату будут анализироваться на соответствие такому формату: :dateExample.',
     'initial_delimiter_help'        => 'Выберите разделитель полей, который используется в вашем файле. Если вы не уверены, помните, что запятая - это самый безопасный вариант.',
@@ -25,59 +25,59 @@ return [
     'initial_submit'                => 'Перейти к шагу 2/3',
 
     // roles config
-    'roles_title'                   => '',
-    'roles_text'                    => '',
-    'roles_table'                   => '',
-    'roles_column_name'             => '',
-    'roles_column_example'          => '',
-    'roles_column_role'             => '',
-    'roles_do_map_value'            => '',
-    'roles_column'                  => '',
-    'roles_no_example_data'         => '',
-    'roles_submit'                  => '',
-    'roles_warning'                 => '',
+    'roles_title'                   => 'Import setup (2/3) - Define each column\'s role',
+    'roles_text'                    => 'Each column in your CSV file contains certain data. Please indicate what kind of data the importer should expect. The option to "map" data means that you will link each entry found in the column to a value in your database. An often mapped column is the column that contains the IBAN of the opposing account. That can be easily matched to IBAN\'s present in your database already.',
+    'roles_table'                   => 'Table',
+    'roles_column_name'             => 'Name of column',
+    'roles_column_example'          => 'Column example data',
+    'roles_column_role'             => 'Column data meaning',
+    'roles_do_map_value'            => 'Map these values',
+    'roles_column'                  => 'Column',
+    'roles_no_example_data'         => 'No example data available',
+    'roles_submit'                  => 'Continue with step 3/3',
+    'roles_warning'                 => 'At the very least, mark one column as the amount-column. It is advisable to also select a column for the description, date and the opposing account.',
 
     // map data
-    'map_title'                     => '',
-    'map_text'                      => '',
-    'map_field_value'               => '',
-    'map_field_mapped_to'           => '',
-    'map_do_not_map'                => '',
-    'map_submit'                    => '',
+    'map_title'                     => 'Import setup (3/3) - Connect import data to Firefly III data',
+    'map_text'                      => 'In the following tables, the left value shows you information found in your uploaded CSV file. It is your task to map this value, if possible, to a value already present in your database. Firefly will stick to this mapping. If there is no value to map to, or you do not wish to map the specific value, select nothing.',
+    'map_field_value'               => 'Field value',
+    'map_field_mapped_to'           => 'Mapped to',
+    'map_do_not_map'                => '(do not map)',
+    'map_submit'                    => 'Start the import',
 
     // map things.
-    'column__ignore'                => '',
-    'column_account-iban'           => '',
-    'column_account-id'             => '',
-    'column_account-name'           => '',
-    'column_amount'                 => '',
-    'column_amount-comma-separated' => '',
-    'column_bill-id'                => '',
-    'column_bill-name'              => '',
-    'column_budget-id'              => '',
-    'column_budget-name'            => '',
-    'column_category-id'            => '',
-    'column_category-name'          => '',
-    'column_currency-code'          => '',
-    'column_currency-id'            => '',
-    'column_currency-name'          => '',
-    'column_currency-symbol'        => '',
-    'column_date-interest'          => '',
-    'column_date-book'              => '',
-    'column_date-process'           => '',
-    'column_date-transaction'       => '',
-    'column_description'            => '',
-    'column_opposing-iban'          => '',
-    'column_opposing-id'            => '',
-    'column_external-id'            => '',
-    'column_opposing-name'          => '',
-    'column_rabo-debet-credit'      => '',
-    'column_ing-debet-credit'       => '',
-    'column_sepa-ct-id'             => '',
-    'column_sepa-ct-op'             => '',
-    'column_sepa-db'                => '',
-    'column_tags-comma'             => '',
-    'column_tags-space'             => '',
-    'column_account-number'         => '',
-    'column_opposing-number'        => '',
+    'column__ignore'                => '(ignore this column)',
+    'column_account-iban'           => 'Asset account (IBAN)',
+    'column_account-id'             => 'Asset account  ID (matching Firefly)',
+    'column_account-name'           => 'Asset account (name)',
+    'column_amount'                 => 'Amount',
+    'column_amount-comma-separated' => 'Amount (comma as decimal separator)',
+    'column_bill-id'                => 'Bill ID (matching Firefly)',
+    'column_bill-name'              => 'Bill name',
+    'column_budget-id'              => 'Budget ID (matching Firefly)',
+    'column_budget-name'            => 'Budget name',
+    'column_category-id'            => 'Category ID (matching Firefly)',
+    'column_category-name'          => 'Category name',
+    'column_currency-code'          => 'Currency code (ISO 4217)',
+    'column_currency-id'            => 'Currency ID (matching Firefly)',
+    'column_currency-name'          => 'Currency name (matching Firefly)',
+    'column_currency-symbol'        => 'Currency symbol (matching Firefly)',
+    'column_date-interest'          => 'Interest calculation date',
+    'column_date-book'              => 'Transaction booking date',
+    'column_date-process'           => 'Transaction process date',
+    'column_date-transaction'       => 'Date',
+    'column_description'            => 'Description',
+    'column_opposing-iban'          => 'Opposing account (IBAN)',
+    'column_opposing-id'            => 'Opposing account ID (matching Firefly)',
+    'column_external-id'            => 'External ID',
+    'column_opposing-name'          => 'Opposing account (name)',
+    'column_rabo-debet-credit'      => 'Rabobank specific debet/credit indicator',
+    'column_ing-debet-credit'       => 'ING specific debet/credit indicator',
+    'column_sepa-ct-id'             => 'SEPA Credit Transfer end-to-end ID',
+    'column_sepa-ct-op'             => 'SEPA Credit Transfer opposing account',
+    'column_sepa-db'                => 'SEPA Direct Debet',
+    'column_tags-comma'             => 'Tags (comma separated)',
+    'column_tags-space'             => 'Tags (space separated)',
+    'column_account-number'         => 'Asset account (account number)',
+    'column_opposing-number'        => 'Opposing account (account number)',
 ];
\ No newline at end of file

From 617360c631c0c22cde34fa6a4a2c42865f12c92d Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Fri, 25 Aug 2017 07:36:35 +0200
Subject: [PATCH 321/668] New translations breadcrumbs.php (Russian)

---
 resources/lang/ru_RU/breadcrumbs.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/ru_RU/breadcrumbs.php b/resources/lang/ru_RU/breadcrumbs.php
index 0aef5ba012..4b9bfd8f1d 100644
--- a/resources/lang/ru_RU/breadcrumbs.php
+++ b/resources/lang/ru_RU/breadcrumbs.php
@@ -40,5 +40,5 @@ return [
     'createTag'           => 'Создать новую метку',
     'edit_tag'            => 'Редактирование метки ":tag"',
     'delete_tag'          => 'Удаление метки ":tag"',
-    'delete_journal_link' => '',
+    'delete_journal_link' => 'Delete link between transactions',
 ];
\ No newline at end of file

From 8e2f78226adc27bc9850a3ecc88120879ce9e0a0 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Fri, 25 Aug 2017 07:36:36 +0200
Subject: [PATCH 322/668] New translations list.php (German)

---
 resources/lang/de_DE/list.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/resources/lang/de_DE/list.php b/resources/lang/de_DE/list.php
index b281e29a43..d18f01a6d5 100644
--- a/resources/lang/de_DE/list.php
+++ b/resources/lang/de_DE/list.php
@@ -88,7 +88,7 @@ return [
     'budget_count'           => 'Anzahl Budgets',
     'rule_and_groups_count'  => 'Anzahl Regeln und Regelgruppen',
     'tags_count'             => 'Anzahl Tags',
-    'inward'                 => '',
-    'outward'                => '',
-    'number_of_transactions' => '',
+    'inward'                 => 'Inward description',
+    'outward'                => 'Outward description',
+    'number_of_transactions' => 'Number of transactions',
 ];
\ No newline at end of file

From 3c3a32b1fa68f787ba93b018ef0c9d48a451a2ce Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Fri, 25 Aug 2017 07:36:39 +0200
Subject: [PATCH 323/668] New translations config.php (Chinese Traditional)

---
 resources/lang/zh_TW/config.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/resources/lang/zh_TW/config.php b/resources/lang/zh_TW/config.php
index 199240c436..a0f1890833 100644
--- a/resources/lang/zh_TW/config.php
+++ b/resources/lang/zh_TW/config.php
@@ -12,14 +12,14 @@ declare(strict_types=1);
  */
 
 return [
-    'locale'          => '',
-    'month'           => '',
-    'month_and_day'   => '',
-    'date_time'       => '',
-    'specific_day'    => '',
-    'week_in_year'    => '',
-    'quarter_of_year' => '',
-    'year'            => '',
-    'half_year'       => '',
+    'locale'          => 'en, English, en_US, en_US.utf8, en_US.UTF-8',
+    'month'           => '%B %Y',
+    'month_and_day'   => '%B %e, %Y',
+    'date_time'       => '%B %e, %Y, @ %T',
+    'specific_day'    => '%e %B %Y',
+    'week_in_year'    => 'Week %W, %Y',
+    'quarter_of_year' => '%B %Y',
+    'year'            => '%Y',
+    'half_year'       => '%B %Y',
 
 ];
\ No newline at end of file

From d82c38640268a577073c19684b5f32ba6a57ea6e Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Fri, 25 Aug 2017 07:36:40 +0200
Subject: [PATCH 324/668] New translations csv.php (German)

---
 resources/lang/de_DE/csv.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/lang/de_DE/csv.php b/resources/lang/de_DE/csv.php
index df847e619a..c110606470 100644
--- a/resources/lang/de_DE/csv.php
+++ b/resources/lang/de_DE/csv.php
@@ -17,7 +17,7 @@ return [
     'initial_title'                 => 'Import Einrichten (1/3) - Grundlegende Einstellungen',
     'initial_text'                  => 'Um Ihre Datei korrekt importieren zu können, überprüfen Sie die folgenden Optionen.',
     'initial_box'                   => 'Standard CSV Importeinstellungen',
-    'initial_box_title'             => '',
+    'initial_box_title'             => 'Basic CSV import setup options',
     'initial_header_help'           => 'Hier auswählen, wenn die ersten Zeilen der CSV-Datei die Spaltenüberschriften sind.',
     'initial_date_help'             => 'Datumsformat in ihrer CSV-Datei. Geben Sie das Format so an, wie es <a href="https://secure.php.net/manual/en/datetime.createfromformat.php#refsect1-datetime.createfromformat-parameters">diese Seite</a> zeigt. Die Standardeinstellung ergibt Daten die so aussehen: :dateExample.',
     'initial_delimiter_help'        => 'Wählen Sie das Trennzeichen, welches in ihrer Datei genutzt wird. Wenn Sie nicht sicher sind ist Komma die sicherste Option.',
@@ -35,7 +35,7 @@ return [
     'roles_column'                  => 'Spalte',
     'roles_no_example_data'         => 'Keine Beispieldaten vorhanden',
     'roles_submit'                  => 'Fortfahren mit Schritt 3/3',
-    'roles_warning'                 => '',
+    'roles_warning'                 => 'At the very least, mark one column as the amount-column. It is advisable to also select a column for the description, date and the opposing account.',
 
     // map data
     'map_title'                     => 'Import Einrichten (3/3) - Import mit bereits vorhandenen Daten verknüpfen',

From 0dfcfbb97e623796092766c0f0a8d7960d1c3683 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Fri, 25 Aug 2017 07:36:41 +0200
Subject: [PATCH 325/668] New translations csv.php (Polish)

---
 resources/lang/pl_PL/csv.php | 38 ++++++++++++++++++------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/resources/lang/pl_PL/csv.php b/resources/lang/pl_PL/csv.php
index b99196d4c2..b6cea58e05 100644
--- a/resources/lang/pl_PL/csv.php
+++ b/resources/lang/pl_PL/csv.php
@@ -17,16 +17,16 @@ return [
     'initial_title'                 => 'Konfiguracja importu (1/3) - Podstawowa konfiguracja importu CSV',
     'initial_text'                  => 'Abyś mógł poprawnie zaimportować plik, sprawdź poprawność poniższych opcji.',
     'initial_box'                   => 'Podstawowa konfiguracja importu CSV',
-    'initial_box_title'             => '',
-    'initial_header_help'           => '',
-    'initial_date_help'             => '',
-    'initial_delimiter_help'        => '',
-    'initial_import_account_help'   => '',
+    'initial_box_title'             => 'Basic CSV import setup options',
+    'initial_header_help'           => 'Check this box if the first row of your CSV file are the column titles.',
+    'initial_date_help'             => 'Date time format in your CSV. Follow the format like <a href="https://secure.php.net/manual/en/datetime.createfromformat.php#refsect1-datetime.createfromformat-parameters">this page</a> indicates. The default value will parse dates that look like this: :dateExample.',
+    'initial_delimiter_help'        => 'Choose the field delimiter that is used in your input file. If not sure, comma is the safest option.',
+    'initial_import_account_help'   => 'If your CSV file does NOT contain information about your asset account(s), use this dropdown to select to which account the transactions in the CSV belong to.',
     'initial_submit'                => 'Przejdź do kroku 2/3',
 
     // roles config
     'roles_title'                   => 'Konfiguracja importu (2/3) - Określ rolę każdej z kolumn',
-    'roles_text'                    => '',
+    'roles_text'                    => 'Each column in your CSV file contains certain data. Please indicate what kind of data the importer should expect. The option to "map" data means that you will link each entry found in the column to a value in your database. An often mapped column is the column that contains the IBAN of the opposing account. That can be easily matched to IBAN\'s present in your database already.',
     'roles_table'                   => 'Tabela',
     'roles_column_name'             => 'Nazwa kolumny',
     'roles_column_example'          => 'Przykładowe dane w kolumnie',
@@ -35,11 +35,11 @@ return [
     'roles_column'                  => 'Kolumna',
     'roles_no_example_data'         => 'Brak dostępnych danych przykładowych',
     'roles_submit'                  => 'Przejdź do kroku 3/3',
-    'roles_warning'                 => '',
+    'roles_warning'                 => 'At the very least, mark one column as the amount-column. It is advisable to also select a column for the description, date and the opposing account.',
 
     // map data
     'map_title'                     => 'Konfiguracja importu (3/3) - Połącz importowane dane z danymi w Firefly III',
-    'map_text'                      => '',
+    'map_text'                      => 'In the following tables, the left value shows you information found in your uploaded CSV file. It is your task to map this value, if possible, to a value already present in your database. Firefly will stick to this mapping. If there is no value to map to, or you do not wish to map the specific value, select nothing.',
     'map_field_value'               => 'Wartość pola',
     'map_field_mapped_to'           => 'Zmapowane na',
     'map_do_not_map'                => '(nie mapuj)',
@@ -62,22 +62,22 @@ return [
     'column_currency-id'            => 'ID waluty (taki sam jak w Firefly)',
     'column_currency-name'          => 'Nazwa waluty (taka sama jak w Firefly)',
     'column_currency-symbol'        => 'Symbol waluty (taki sam jak w Firefly)',
-    'column_date-interest'          => '',
+    'column_date-interest'          => 'Interest calculation date',
     'column_date-book'              => 'Data księgowania transakcji',
-    'column_date-process'           => '',
+    'column_date-process'           => 'Transaction process date',
     'column_date-transaction'       => 'Data',
     'column_description'            => 'Opis',
-    'column_opposing-iban'          => '',
-    'column_opposing-id'            => '',
+    'column_opposing-iban'          => 'Opposing account (IBAN)',
+    'column_opposing-id'            => 'Opposing account ID (matching Firefly)',
     'column_external-id'            => 'Zewnętrzne ID',
-    'column_opposing-name'          => '',
-    'column_rabo-debet-credit'      => '',
-    'column_ing-debet-credit'       => '',
-    'column_sepa-ct-id'             => '',
-    'column_sepa-ct-op'             => '',
-    'column_sepa-db'                => '',
+    'column_opposing-name'          => 'Opposing account (name)',
+    'column_rabo-debet-credit'      => 'Rabobank specific debet/credit indicator',
+    'column_ing-debet-credit'       => 'ING specific debet/credit indicator',
+    'column_sepa-ct-id'             => 'SEPA Credit Transfer end-to-end ID',
+    'column_sepa-ct-op'             => 'SEPA Credit Transfer opposing account',
+    'column_sepa-db'                => 'SEPA Direct Debet',
     'column_tags-comma'             => 'Tagi (oddzielone przecinkami)',
     'column_tags-space'             => 'Tagi (oddzielone spacjami)',
     'column_account-number'         => 'Konto aktywów (numer konta)',
-    'column_opposing-number'        => '',
+    'column_opposing-number'        => 'Opposing account (account number)',
 ];
\ No newline at end of file

From 0287416aa58ed5cef6cad16f7560589c9cd49394 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Fri, 25 Aug 2017 07:36:43 +0200
Subject: [PATCH 326/668] New translations csv.php (Chinese Traditional)

---
 resources/lang/zh_TW/csv.php | 54 ++++++++++++++++++------------------
 1 file changed, 27 insertions(+), 27 deletions(-)

diff --git a/resources/lang/zh_TW/csv.php b/resources/lang/zh_TW/csv.php
index cf781c5b74..7d9cc46f46 100644
--- a/resources/lang/zh_TW/csv.php
+++ b/resources/lang/zh_TW/csv.php
@@ -14,36 +14,36 @@ declare(strict_types=1);
 return [
 
     // initial config
-    'initial_title'                 => '',
-    'initial_text'                  => '',
-    'initial_box'                   => '',
-    'initial_box_title'             => '',
-    'initial_header_help'           => '',
-    'initial_date_help'             => '',
-    'initial_delimiter_help'        => '',
-    'initial_import_account_help'   => '',
-    'initial_submit'                => '',
+    'initial_title'                 => 'Import setup (1/3) - Basic CSV import setup',
+    'initial_text'                  => 'To be able to import your file correctly, please validate the options below.',
+    'initial_box'                   => 'Basic CSV import setup',
+    'initial_box_title'             => 'Basic CSV import setup options',
+    'initial_header_help'           => 'Check this box if the first row of your CSV file are the column titles.',
+    'initial_date_help'             => 'Date time format in your CSV. Follow the format like <a href="https://secure.php.net/manual/en/datetime.createfromformat.php#refsect1-datetime.createfromformat-parameters">this page</a> indicates. The default value will parse dates that look like this: :dateExample.',
+    'initial_delimiter_help'        => 'Choose the field delimiter that is used in your input file. If not sure, comma is the safest option.',
+    'initial_import_account_help'   => 'If your CSV file does NOT contain information about your asset account(s), use this dropdown to select to which account the transactions in the CSV belong to.',
+    'initial_submit'                => 'Continue with step 2/3',
 
     // roles config
-    'roles_title'                   => '',
-    'roles_text'                    => '',
-    'roles_table'                   => '',
-    'roles_column_name'             => '',
-    'roles_column_example'          => '',
-    'roles_column_role'             => '',
-    'roles_do_map_value'            => '',
-    'roles_column'                  => '',
-    'roles_no_example_data'         => '',
-    'roles_submit'                  => '',
-    'roles_warning'                 => '',
+    'roles_title'                   => 'Import setup (2/3) - Define each column\'s role',
+    'roles_text'                    => 'Each column in your CSV file contains certain data. Please indicate what kind of data the importer should expect. The option to "map" data means that you will link each entry found in the column to a value in your database. An often mapped column is the column that contains the IBAN of the opposing account. That can be easily matched to IBAN\'s present in your database already.',
+    'roles_table'                   => 'Table',
+    'roles_column_name'             => 'Name of column',
+    'roles_column_example'          => 'Column example data',
+    'roles_column_role'             => 'Column data meaning',
+    'roles_do_map_value'            => 'Map these values',
+    'roles_column'                  => 'Column',
+    'roles_no_example_data'         => 'No example data available',
+    'roles_submit'                  => 'Continue with step 3/3',
+    'roles_warning'                 => 'At the very least, mark one column as the amount-column. It is advisable to also select a column for the description, date and the opposing account.',
 
     // map data
-    'map_title'                     => '',
+    'map_title'                     => 'Import setup (3/3) - Connect import data to Firefly III data',
     'map_text'                      => '在下表中，左邊的是在你的CSV 檔中的資料。而你現在要把這些資料配對到資料庫中的資料（如有的話）。如果沒有資料能夠進行配對，或者你不想進行配對，請選擇不進行配對。',
-    'map_field_value'               => '',
-    'map_field_mapped_to'           => '',
-    'map_do_not_map'                => '',
-    'map_submit'                    => '',
+    'map_field_value'               => 'Field value',
+    'map_field_mapped_to'           => 'Mapped to',
+    'map_do_not_map'                => '(do not map)',
+    'map_submit'                    => 'Start the import',
 
     // map things.
     'column__ignore'                => '（忽略此欄）',
@@ -63,7 +63,7 @@ return [
     'column_currency-name'          => '貨幣名稱（與 Firefly 匹配）',
     'column_currency-symbol'        => '貨幣符號 （與 Firefly 匹配）',
     'column_date-interest'          => '利息計算日',
-    'column_date-book'              => '',
+    'column_date-book'              => 'Transaction booking date',
     'column_date-process'           => '交易處理日期',
     'column_date-transaction'       => '日期',
     'column_description'            => '描述',
@@ -73,7 +73,7 @@ return [
     'column_opposing-name'          => '抵銷的帳戶 （名稱）',
     'column_rabo-debet-credit'      => '荷蘭合作銀行獨有的借記/貸記指標',
     'column_ing-debet-credit'       => 'ING 集團獨有的借記/貸記指標',
-    'column_sepa-ct-id'             => '',
+    'column_sepa-ct-id'             => 'SEPA Credit Transfer end-to-end ID',
     'column_sepa-ct-op'             => 'SEPA 貸記劃撥抵銷的帳戶',
     'column_sepa-db'                => 'SEPA 直接付款',
     'column_tags-comma'             => '標籤 （逗號分隔）',

From f7ea140018de2a18128f6a7e152ed7bb7ef152f3 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Fri, 25 Aug 2017 07:36:44 +0200
Subject: [PATCH 327/668] New translations breadcrumbs.php (Spanish)

---
 resources/lang/es_ES/breadcrumbs.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/es_ES/breadcrumbs.php b/resources/lang/es_ES/breadcrumbs.php
index eda8a063ac..6f94cb1792 100644
--- a/resources/lang/es_ES/breadcrumbs.php
+++ b/resources/lang/es_ES/breadcrumbs.php
@@ -40,5 +40,5 @@ return [
     'createTag'           => 'Crear nueva etiqueta',
     'edit_tag'            => 'Editar etiqueta ":tag"',
     'delete_tag'          => 'Eliminar etiqueta ":tag"',
-    'delete_journal_link' => '',
+    'delete_journal_link' => 'Delete link between transactions',
 ];
\ No newline at end of file

From f9b60fef8511c2ba1d102d2263a4def4aeda7736 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Fri, 25 Aug 2017 07:36:46 +0200
Subject: [PATCH 328/668] New translations breadcrumbs.php (Slovenian)

---
 resources/lang/sl_SI/breadcrumbs.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/lang/sl_SI/breadcrumbs.php b/resources/lang/sl_SI/breadcrumbs.php
index 45d398b6fc..70672da530 100644
--- a/resources/lang/sl_SI/breadcrumbs.php
+++ b/resources/lang/sl_SI/breadcrumbs.php
@@ -26,7 +26,7 @@ return [
     'edit_bill'           => 'uredi trajnik ":name"',
     'delete_bill'         => 'izbriši trajnik ":name"',
     'reports'             => 'Poročila',
-    'search_result'       => '',
+    'search_result'       => 'Search results for ":query"',
     'withdrawal_list'     => 'stroški',
     'deposit_list'        => 'prihodki',
     'transfer_list'       => 'prenosi',
@@ -40,5 +40,5 @@ return [
     'createTag'           => 'ustvari novo značko',
     'edit_tag'            => 'uredi značko ":tag"',
     'delete_tag'          => 'izbriši značko ":tag"',
-    'delete_journal_link' => '',
+    'delete_journal_link' => 'Delete link between transactions',
 ];
\ No newline at end of file

From 473c6aad84b22bd8c34c40920903b18b9f8eceef Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Fri, 25 Aug 2017 07:36:48 +0200
Subject: [PATCH 329/668] New translations breadcrumbs.php (Chinese
 Traditional)

---
 resources/lang/zh_TW/breadcrumbs.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/lang/zh_TW/breadcrumbs.php b/resources/lang/zh_TW/breadcrumbs.php
index 66aa9b325b..a99899ab8a 100644
--- a/resources/lang/zh_TW/breadcrumbs.php
+++ b/resources/lang/zh_TW/breadcrumbs.php
@@ -26,7 +26,7 @@ return [
     'edit_bill'           => '編輯賬單 ":name"',
     'delete_bill'         => '刪除賬單 ":name"',
     'reports'             => '報表',
-    'search_result'       => '',
+    'search_result'       => 'Search results for ":query"',
     'withdrawal_list'     => '支出',
     'deposit_list'        => '收入、薪金與存款',
     'transfer_list'       => '轉帳',
@@ -40,5 +40,5 @@ return [
     'createTag'           => '建立新標籤',
     'edit_tag'            => '編輯標籤 ":tag"',
     'delete_tag'          => '刪除標籤 ":tag"',
-    'delete_journal_link' => '',
+    'delete_journal_link' => 'Delete link between transactions',
 ];
\ No newline at end of file

From 0f276f10ee2460d926dec462d64ee2523b9c0527 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Fri, 25 Aug 2017 07:36:49 +0200
Subject: [PATCH 330/668] New translations breadcrumbs.php (Polish)

---
 resources/lang/pl_PL/breadcrumbs.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/pl_PL/breadcrumbs.php b/resources/lang/pl_PL/breadcrumbs.php
index 5f4ed1aed5..924f6a1787 100644
--- a/resources/lang/pl_PL/breadcrumbs.php
+++ b/resources/lang/pl_PL/breadcrumbs.php
@@ -40,5 +40,5 @@ return [
     'createTag'           => 'Utwórz nowy tag',
     'edit_tag'            => 'Modyfikuj tag ":tag"',
     'delete_tag'          => 'Usuń tag ":tag"',
-    'delete_journal_link' => '',
+    'delete_journal_link' => 'Delete link between transactions',
 ];
\ No newline at end of file

From a0d800bbb92dc8003e2a10068d3f65b7131b5710 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Fri, 25 Aug 2017 07:36:50 +0200
Subject: [PATCH 331/668] New translations breadcrumbs.php (Portuguese,
 Brazilian)

---
 resources/lang/pt_BR/breadcrumbs.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/lang/pt_BR/breadcrumbs.php b/resources/lang/pt_BR/breadcrumbs.php
index 0ab94a1743..6a62264463 100644
--- a/resources/lang/pt_BR/breadcrumbs.php
+++ b/resources/lang/pt_BR/breadcrumbs.php
@@ -26,7 +26,7 @@ return [
     'edit_bill'           => 'Editar fatura ":name"',
     'delete_bill'         => 'Apagar fatura ":name"',
     'reports'             => 'Relatórios',
-    'search_result'       => '',
+    'search_result'       => 'Search results for ":query"',
     'withdrawal_list'     => 'Despesas',
     'deposit_list'        => 'Receitas, renda e depósitos',
     'transfer_list'       => 'Transferências',
@@ -40,5 +40,5 @@ return [
     'createTag'           => 'Criar nova etiqueta',
     'edit_tag'            => 'Editar etiqueta ":tag"',
     'delete_tag'          => 'Apagar etiqueta ":tag"',
-    'delete_journal_link' => '',
+    'delete_journal_link' => 'Delete link between transactions',
 ];
\ No newline at end of file

From 8c32e619cbfce6f5db8845b4cce6c5d16e1eaeda Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Fri, 25 Aug 2017 07:36:51 +0200
Subject: [PATCH 332/668] New translations breadcrumbs.php (German)

---
 resources/lang/de_DE/breadcrumbs.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/lang/de_DE/breadcrumbs.php b/resources/lang/de_DE/breadcrumbs.php
index 07625cbf42..1666561f85 100644
--- a/resources/lang/de_DE/breadcrumbs.php
+++ b/resources/lang/de_DE/breadcrumbs.php
@@ -26,7 +26,7 @@ return [
     'edit_bill'           => 'Bearbeite Rechnung ":name"',
     'delete_bill'         => 'Lösche Rechnung ":name"',
     'reports'             => 'Berichte',
-    'search_result'       => '',
+    'search_result'       => 'Search results for ":query"',
     'withdrawal_list'     => 'Ausgaben',
     'deposit_list'        => 'Umsatz, Einkommen und Einlagen',
     'transfer_list'       => 'Überweisungen',
@@ -40,5 +40,5 @@ return [
     'createTag'           => 'Neuen Tag erstellen',
     'edit_tag'            => 'Bearbeite Tag ":tag"',
     'delete_tag'          => 'Lösche Tag ":tag"',
-    'delete_journal_link' => '',
+    'delete_journal_link' => 'Delete link between transactions',
 ];
\ No newline at end of file

From 1797bf8108a2349183fed88fb84e11d6dca73a84 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Fri, 25 Aug 2017 07:36:52 +0200
Subject: [PATCH 333/668] New translations breadcrumbs.php (French)

---
 resources/lang/fr_FR/breadcrumbs.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/fr_FR/breadcrumbs.php b/resources/lang/fr_FR/breadcrumbs.php
index 4ef0b8d701..a6d4c56e06 100644
--- a/resources/lang/fr_FR/breadcrumbs.php
+++ b/resources/lang/fr_FR/breadcrumbs.php
@@ -40,5 +40,5 @@ return [
     'createTag'           => 'Créer un nouveau tag',
     'edit_tag'            => 'Éditer le tag ":tag"',
     'delete_tag'          => 'Supprimer le tag ":tag"',
-    'delete_journal_link' => '',
+    'delete_journal_link' => 'Delete link between transactions',
 ];
\ No newline at end of file

From 7ac4cd4665ec7e4186f693c81f6fe969555fc5b2 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Fri, 25 Aug 2017 07:36:54 +0200
Subject: [PATCH 334/668] New translations csv.php (Portuguese, Brazilian)

---
 resources/lang/pt_BR/csv.php | 46 ++++++++++++++++++------------------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/resources/lang/pt_BR/csv.php b/resources/lang/pt_BR/csv.php
index 1b61320763..2853590877 100644
--- a/resources/lang/pt_BR/csv.php
+++ b/resources/lang/pt_BR/csv.php
@@ -14,36 +14,36 @@ declare(strict_types=1);
 return [
 
     // initial config
-    'initial_title'                 => '',
-    'initial_text'                  => '',
-    'initial_box'                   => '',
-    'initial_box_title'             => '',
-    'initial_header_help'           => '',
-    'initial_date_help'             => '',
-    'initial_delimiter_help'        => '',
-    'initial_import_account_help'   => '',
-    'initial_submit'                => '',
+    'initial_title'                 => 'Import setup (1/3) - Basic CSV import setup',
+    'initial_text'                  => 'To be able to import your file correctly, please validate the options below.',
+    'initial_box'                   => 'Basic CSV import setup',
+    'initial_box_title'             => 'Basic CSV import setup options',
+    'initial_header_help'           => 'Check this box if the first row of your CSV file are the column titles.',
+    'initial_date_help'             => 'Date time format in your CSV. Follow the format like <a href="https://secure.php.net/manual/en/datetime.createfromformat.php#refsect1-datetime.createfromformat-parameters">this page</a> indicates. The default value will parse dates that look like this: :dateExample.',
+    'initial_delimiter_help'        => 'Choose the field delimiter that is used in your input file. If not sure, comma is the safest option.',
+    'initial_import_account_help'   => 'If your CSV file does NOT contain information about your asset account(s), use this dropdown to select to which account the transactions in the CSV belong to.',
+    'initial_submit'                => 'Continue with step 2/3',
 
     // roles config
-    'roles_title'                   => '',
-    'roles_text'                    => '',
-    'roles_table'                   => '',
-    'roles_column_name'             => '',
-    'roles_column_example'          => '',
-    'roles_column_role'             => '',
-    'roles_do_map_value'            => '',
-    'roles_column'                  => '',
-    'roles_no_example_data'         => '',
-    'roles_submit'                  => '',
-    'roles_warning'                 => '',
+    'roles_title'                   => 'Import setup (2/3) - Define each column\'s role',
+    'roles_text'                    => 'Each column in your CSV file contains certain data. Please indicate what kind of data the importer should expect. The option to "map" data means that you will link each entry found in the column to a value in your database. An often mapped column is the column that contains the IBAN of the opposing account. That can be easily matched to IBAN\'s present in your database already.',
+    'roles_table'                   => 'Table',
+    'roles_column_name'             => 'Name of column',
+    'roles_column_example'          => 'Column example data',
+    'roles_column_role'             => 'Column data meaning',
+    'roles_do_map_value'            => 'Map these values',
+    'roles_column'                  => 'Column',
+    'roles_no_example_data'         => 'No example data available',
+    'roles_submit'                  => 'Continue with step 3/3',
+    'roles_warning'                 => 'At the very least, mark one column as the amount-column. It is advisable to also select a column for the description, date and the opposing account.',
 
     // map data
-    'map_title'                     => '',
+    'map_title'                     => 'Import setup (3/3) - Connect import data to Firefly III data',
     'map_text'                      => 'Nas tabelas a seguir, o valor à esquerda mostra informações encontradas no seu arquivo CSV carregado. É sua tarefa mapear esse valor, se possível, para um valor já presente em seu banco de dados. O Firefly vai se ater a esse mapeamento. Se não há nenhum valor para mapear, ou não quer mapear o valor específico, não selecione nada.',
-    'map_field_value'               => '',
+    'map_field_value'               => 'Field value',
     'map_field_mapped_to'           => 'Mapeado para',
     'map_do_not_map'                => '(não mapear)',
-    'map_submit'                    => '',
+    'map_submit'                    => 'Start the import',
 
     // map things.
     'column__ignore'                => '(ignorar esta coluna)',

From c1276e789abe8b2f476b18c116ef17a4bc163657 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Fri, 25 Aug 2017 07:36:54 +0200
Subject: [PATCH 335/668] New translations csv.php (Slovenian)

---
 resources/lang/sl_SI/csv.php | 50 ++++++++++++++++++------------------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/resources/lang/sl_SI/csv.php b/resources/lang/sl_SI/csv.php
index 5a5049c3cd..dc35628e17 100644
--- a/resources/lang/sl_SI/csv.php
+++ b/resources/lang/sl_SI/csv.php
@@ -14,36 +14,36 @@ declare(strict_types=1);
 return [
 
     // initial config
-    'initial_title'                 => '',
-    'initial_text'                  => '',
-    'initial_box'                   => '',
-    'initial_box_title'             => '',
-    'initial_header_help'           => '',
-    'initial_date_help'             => '',
-    'initial_delimiter_help'        => '',
-    'initial_import_account_help'   => '',
-    'initial_submit'                => '',
+    'initial_title'                 => 'Import setup (1/3) - Basic CSV import setup',
+    'initial_text'                  => 'To be able to import your file correctly, please validate the options below.',
+    'initial_box'                   => 'Basic CSV import setup',
+    'initial_box_title'             => 'Basic CSV import setup options',
+    'initial_header_help'           => 'Check this box if the first row of your CSV file are the column titles.',
+    'initial_date_help'             => 'Date time format in your CSV. Follow the format like <a href="https://secure.php.net/manual/en/datetime.createfromformat.php#refsect1-datetime.createfromformat-parameters">this page</a> indicates. The default value will parse dates that look like this: :dateExample.',
+    'initial_delimiter_help'        => 'Choose the field delimiter that is used in your input file. If not sure, comma is the safest option.',
+    'initial_import_account_help'   => 'If your CSV file does NOT contain information about your asset account(s), use this dropdown to select to which account the transactions in the CSV belong to.',
+    'initial_submit'                => 'Continue with step 2/3',
 
     // roles config
-    'roles_title'                   => '',
-    'roles_text'                    => '',
-    'roles_table'                   => '',
-    'roles_column_name'             => '',
-    'roles_column_example'          => '',
-    'roles_column_role'             => '',
-    'roles_do_map_value'            => '',
-    'roles_column'                  => '',
-    'roles_no_example_data'         => '',
-    'roles_submit'                  => '',
-    'roles_warning'                 => '',
+    'roles_title'                   => 'Import setup (2/3) - Define each column\'s role',
+    'roles_text'                    => 'Each column in your CSV file contains certain data. Please indicate what kind of data the importer should expect. The option to "map" data means that you will link each entry found in the column to a value in your database. An often mapped column is the column that contains the IBAN of the opposing account. That can be easily matched to IBAN\'s present in your database already.',
+    'roles_table'                   => 'Table',
+    'roles_column_name'             => 'Name of column',
+    'roles_column_example'          => 'Column example data',
+    'roles_column_role'             => 'Column data meaning',
+    'roles_do_map_value'            => 'Map these values',
+    'roles_column'                  => 'Column',
+    'roles_no_example_data'         => 'No example data available',
+    'roles_submit'                  => 'Continue with step 3/3',
+    'roles_warning'                 => 'At the very least, mark one column as the amount-column. It is advisable to also select a column for the description, date and the opposing account.',
 
     // map data
-    'map_title'                     => '',
+    'map_title'                     => 'Import setup (3/3) - Connect import data to Firefly III data',
     'map_text'                      => 'Vrednosti na levi v spodnji tabeli prikazujejo podatke iz naložene CSV datoteke. Vaša naloga je, da jim, če je možno, določite obtoječio vrednost iz podatkovne baze. Firefly bo to upošteval pri uvozu. Če v podatkovni bazi ni ustrezne vrednosti, ali vrednosti ne želite določiti ničesar, potem pustite prazno.',
-    'map_field_value'               => '',
-    'map_field_mapped_to'           => '',
-    'map_do_not_map'                => '',
-    'map_submit'                    => '',
+    'map_field_value'               => 'Field value',
+    'map_field_mapped_to'           => 'Mapped to',
+    'map_do_not_map'                => '(do not map)',
+    'map_submit'                    => 'Start the import',
 
     // map things.
     'column__ignore'                => '(ignoriraj ta stolpec)',

From d0cefd70055412f981168ee2e4fe1a3aeb182263 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Fri, 25 Aug 2017 07:36:57 +0200
Subject: [PATCH 336/668] New translations form.php (Spanish)

---
 resources/lang/es_ES/form.php | 258 +++++++++++++++++-----------------
 1 file changed, 129 insertions(+), 129 deletions(-)

diff --git a/resources/lang/es_ES/form.php b/resources/lang/es_ES/form.php
index 6b4c18ad81..2121358fdc 100644
--- a/resources/lang/es_ES/form.php
+++ b/resources/lang/es_ES/form.php
@@ -24,176 +24,176 @@ return [
     'active'                         => 'Activo',
     'amount_min'                     => 'Importe mínimo',
     'amount_max'                     => 'Importe máximo',
-    'match'                          => '',
+    'match'                          => 'Matches on',
     'repeat_freq'                    => 'Repetición',
     'journal_currency_id'            => 'Divisa',
     'currency_id'                    => 'Divisa',
     'attachments'                    => 'Adjuntos',
     'journal_amount'                 => 'Importe',
-    'journal_asset_source_account'   => '',
-    'journal_source_account_name'    => '',
-    'journal_source_account_id'      => '',
+    'journal_asset_source_account'   => 'Asset account (source)',
+    'journal_source_account_name'    => 'Revenue account (source)',
+    'journal_source_account_id'      => 'Asset account (source)',
     'BIC'                            => 'BIC',
     'verify_password'                => 'Verificar la seguridad de contraseña',
     'account_from_id'                => 'Cuenta origen',
     'account_to_id'                  => 'Cuenta destino',
     'source_account'                 => 'Cuenta origen',
     'destination_account'            => 'Cuenta destino',
-    'journal_destination_account_id' => '',
-    'asset_destination_account'      => '',
-    'asset_source_account'           => '',
+    'journal_destination_account_id' => 'Asset account (destination)',
+    'asset_destination_account'      => 'Asset account (destination)',
+    'asset_source_account'           => 'Asset account (source)',
     'journal_description'            => 'Descripción',
     'note'                           => 'Notas',
-    'split_journal'                  => '',
-    'split_journal_explanation'      => '',
-    'currency'                       => '',
-    'account_id'                     => '',
-    'budget_id'                      => '',
-    'openingBalance'                 => '',
-    'tagMode'                        => '',
-    'tagPosition'                    => '',
-    'virtualBalance'                 => '',
-    'longitude_latitude'             => '',
-    'targetamount'                   => '',
-    'accountRole'                    => '',
-    'openingBalanceDate'             => '',
-    'ccType'                         => '',
-    'ccMonthlyPaymentDate'           => '',
-    'piggy_bank_id'                  => '',
-    'returnHere'                     => '',
-    'returnHereExplanation'          => '',
-    'returnHereUpdateExplanation'    => '',
-    'description'                    => '',
-    'expense_account'                => '',
-    'revenue_account'                => '',
-    'decimal_places'                 => '',
-    'exchange_rate_instruction'      => '',
-    'exchanged_amount'               => '',
-    'source_amount'                  => '',
-    'destination_amount'             => '',
-    'native_amount'                  => '',
+    'split_journal'                  => 'Split this transaction',
+    'split_journal_explanation'      => 'Split this transaction in multiple parts',
+    'currency'                       => 'Currency',
+    'account_id'                     => 'Asset account',
+    'budget_id'                      => 'Budget',
+    'openingBalance'                 => 'Opening balance',
+    'tagMode'                        => 'Tag mode',
+    'tagPosition'                    => 'Tag location',
+    'virtualBalance'                 => 'Virtual balance',
+    'longitude_latitude'             => 'Location',
+    'targetamount'                   => 'Target amount',
+    'accountRole'                    => 'Account role',
+    'openingBalanceDate'             => 'Opening balance date',
+    'ccType'                         => 'Credit card payment plan',
+    'ccMonthlyPaymentDate'           => 'Credit card monthly payment date',
+    'piggy_bank_id'                  => 'Piggy bank',
+    'returnHere'                     => 'Return here',
+    'returnHereExplanation'          => 'After storing, return here to create another one.',
+    'returnHereUpdateExplanation'    => 'After updating, return here.',
+    'description'                    => 'Description',
+    'expense_account'                => 'Expense account',
+    'revenue_account'                => 'Revenue account',
+    'decimal_places'                 => 'Decimal places',
+    'exchange_rate_instruction'      => 'Foreign currencies',
+    'exchanged_amount'               => 'Exchanged amount',
+    'source_amount'                  => 'Amount (source)',
+    'destination_amount'             => 'Amount (destination)',
+    'native_amount'                  => 'Native amount',
 
-    'revenue_account_source'      => '',
-    'source_account_asset'        => '',
-    'destination_account_expense' => '',
-    'destination_account_asset'   => '',
-    'source_account_revenue'      => '',
+    'revenue_account_source'      => 'Revenue account (source)',
+    'source_account_asset'        => 'Source account (asset account)',
+    'destination_account_expense' => 'Destination account (expense account)',
+    'destination_account_asset'   => 'Destination account (asset account)',
+    'source_account_revenue'      => 'Source account (revenue account)',
     'type'                        => 'Tipo',
-    'convert_Withdrawal'          => '',
-    'convert_Deposit'             => '',
-    'convert_Transfer'            => '',
+    'convert_Withdrawal'          => 'Convert withdrawal',
+    'convert_Deposit'             => 'Convert deposit',
+    'convert_Transfer'            => 'Convert transfer',
 
 
     'amount'                     => 'Importe',
     'date'                       => 'Fecha',
-    'interest_date'              => '',
-    'book_date'                  => '',
-    'process_date'               => '',
-    'category'                   => '',
-    'tags'                       => '',
-    'deletePermanently'          => '',
-    'cancel'                     => '',
-    'targetdate'                 => '',
+    'interest_date'              => 'Interest date',
+    'book_date'                  => 'Book date',
+    'process_date'               => 'Processing date',
+    'category'                   => 'Category',
+    'tags'                       => 'Tags',
+    'deletePermanently'          => 'Delete permanently',
+    'cancel'                     => 'Cancel',
+    'targetdate'                 => 'Target date',
     'tag'                        => 'Etiqueta',
-    'under'                      => '',
+    'under'                      => 'Under',
     'symbol'                     => 'Símbolo',
     'code'                       => 'Código',
     'iban'                       => 'IBAN',
     'accountNumber'              => 'Número de cuenta',
     'has_headers'                => 'Encabezados',
     'date_format'                => 'Formato de fecha',
-    'specifix'                   => '',
+    'specifix'                   => 'Bank- or file specific fixes',
     'attachments[]'              => 'Adjuntos',
-    'store_new_withdrawal'       => '',
-    'store_new_deposit'          => '',
-    'store_new_transfer'         => '',
-    'add_new_withdrawal'         => '',
-    'add_new_deposit'            => '',
-    'add_new_transfer'           => '',
-    'noPiggybank'                => '',
+    'store_new_withdrawal'       => 'Store new withdrawal',
+    'store_new_deposit'          => 'Store new deposit',
+    'store_new_transfer'         => 'Store new transfer',
+    'add_new_withdrawal'         => 'Add a new withdrawal',
+    'add_new_deposit'            => 'Add a new deposit',
+    'add_new_transfer'           => 'Add a new transfer',
+    'noPiggybank'                => '(no piggy bank)',
     'title'                      => 'Título',
     'notes'                      => 'Notas',
     'filename'                   => 'Nombre de fichero',
     'mime'                       => 'Tipo Mime',
     'size'                       => 'Tamaño',
     'trigger'                    => 'Disparador',
-    'stop_processing'            => '',
-    'start_date'                 => '',
-    'end_date'                   => '',
-    'export_start_range'         => '',
-    'export_end_range'           => '',
-    'export_format'              => '',
-    'include_attachments'        => '',
-    'include_old_uploads'        => '',
-    'accounts'                   => '',
-    'delete_account'             => '',
-    'delete_bill'                => '',
-    'delete_budget'              => '',
-    'delete_category'            => '',
-    'delete_currency'            => '',
-    'delete_journal'             => '',
-    'delete_attachment'          => '',
-    'delete_rule'                => '',
-    'delete_rule_group'          => '',
-    'delete_link_type'           => '',
-    'attachment_areYouSure'      => '',
-    'account_areYouSure'         => '',
-    'bill_areYouSure'            => '',
-    'rule_areYouSure'            => '',
-    'ruleGroup_areYouSure'       => '',
-    'budget_areYouSure'          => '',
-    'category_areYouSure'        => '',
-    'currency_areYouSure'        => '',
-    'piggyBank_areYouSure'       => '',
-    'journal_areYouSure'         => '',
-    'mass_journal_are_you_sure'  => '',
-    'tag_areYouSure'             => '',
-    'journal_link_areYouSure'    => '',
-    'linkType_areYouSure'        => '',
-    'permDeleteWarning'          => '',
-    'mass_make_selection'        => '',
-    'delete_all_permanently'     => '',
-    'update_all_journals'        => '',
-    'also_delete_transactions'   => '',
-    'also_delete_connections'    => '',
-    'also_delete_rules'          => '',
-    'also_delete_piggyBanks'     => '',
-    'bill_keep_transactions'     => '',
-    'budget_keep_transactions'   => '',
-    'category_keep_transactions' => '',
-    'tag_keep_transactions'      => '',
+    'stop_processing'            => 'Stop processing',
+    'start_date'                 => 'Start of range',
+    'end_date'                   => 'End of range',
+    'export_start_range'         => 'Start of export range',
+    'export_end_range'           => 'End of export range',
+    'export_format'              => 'File format',
+    'include_attachments'        => 'Include uploaded attachments',
+    'include_old_uploads'        => 'Include imported data',
+    'accounts'                   => 'Export transactions from these accounts',
+    'delete_account'             => 'Delete account ":name"',
+    'delete_bill'                => 'Delete bill ":name"',
+    'delete_budget'              => 'Delete budget ":name"',
+    'delete_category'            => 'Delete category ":name"',
+    'delete_currency'            => 'Delete currency ":name"',
+    'delete_journal'             => 'Delete transaction with description ":description"',
+    'delete_attachment'          => 'Delete attachment ":name"',
+    'delete_rule'                => 'Delete rule ":title"',
+    'delete_rule_group'          => 'Delete rule group ":title"',
+    'delete_link_type'           => 'Delete link type ":name"',
+    'attachment_areYouSure'      => 'Are you sure you want to delete the attachment named ":name"?',
+    'account_areYouSure'         => 'Are you sure you want to delete the account named ":name"?',
+    'bill_areYouSure'            => 'Are you sure you want to delete the bill named ":name"?',
+    'rule_areYouSure'            => 'Are you sure you want to delete the rule titled ":title"?',
+    'ruleGroup_areYouSure'       => 'Are you sure you want to delete the rule group titled ":title"?',
+    'budget_areYouSure'          => 'Are you sure you want to delete the budget named ":name"?',
+    'category_areYouSure'        => 'Are you sure you want to delete the category named ":name"?',
+    'currency_areYouSure'        => 'Are you sure you want to delete the currency named ":name"?',
+    'piggyBank_areYouSure'       => 'Are you sure you want to delete the piggy bank named ":name"?',
+    'journal_areYouSure'         => 'Are you sure you want to delete the transaction described ":description"?',
+    'mass_journal_are_you_sure'  => 'Are you sure you want to delete these transactions?',
+    'tag_areYouSure'             => 'Are you sure you want to delete the tag ":tag"?',
+    'journal_link_areYouSure'    => 'Are you sure you want to delete the link between <a href=":source_link">:source</a> and <a href=":destination_link">:destination</a>?',
+    'linkType_areYouSure'        => 'Are you sure you want to delete the link type ":name" (":inward" / ":outward")?',
+    'permDeleteWarning'          => 'Deleting stuff from Firely is permanent and cannot be undone.',
+    'mass_make_selection'        => 'You can still prevent items from being deleted by removing the checkbox.',
+    'delete_all_permanently'     => 'Delete selected permanently',
+    'update_all_journals'        => 'Update these transactions',
+    'also_delete_transactions'   => 'The only transaction connected to this account will be deleted as well.|All :count transactions connected to this account will be deleted as well.',
+    'also_delete_connections'    => 'The only transaction linked with this link type will lose this connection.|All :count transactions linked with this link type will lose their connection.',
+    'also_delete_rules'          => 'The only rule connected to this rule group will be deleted as well.|All :count rules connected to this rule group will be deleted as well.',
+    'also_delete_piggyBanks'     => 'The only piggy bank connected to this account will be deleted as well.|All :count piggy bank connected to this account will be deleted as well.',
+    'bill_keep_transactions'     => 'The only transaction connected to this bill will not be deleted.|All :count transactions connected to this bill will spared deletion.',
+    'budget_keep_transactions'   => 'The only transaction connected to this budget will not be deleted.|All :count transactions connected to this budget will spared deletion.',
+    'category_keep_transactions' => 'The only transaction connected to this category will not be deleted.|All :count transactions connected to this category will spared deletion.',
+    'tag_keep_transactions'      => 'The only transaction connected to this tag will not be deleted.|All :count transactions connected to this tag will spared deletion.',
 
-    'email'                 => '',
-    'password'              => '',
-    'password_confirmation' => '',
-    'blocked'               => '',
-    'blocked_code'          => '',
+    'email'                 => 'Email address',
+    'password'              => 'Password',
+    'password_confirmation' => 'Password (again)',
+    'blocked'               => 'Is blocked?',
+    'blocked_code'          => 'Reason for block',
 
 
     // admin
-    'domain'                => '',
-    'single_user_mode'      => '',
-    'must_confirm_account'  => '',
-    'is_demo_site'          => '',
+    'domain'                => 'Domain',
+    'single_user_mode'      => 'Single user mode',
+    'must_confirm_account'  => 'New users must activate account',
+    'is_demo_site'          => 'Is demo site',
 
 
     // import
-    'import_file'           => '',
-    'configuration_file'    => '',
-    'import_file_type'      => '',
-    'csv_comma'             => '',
-    'csv_semicolon'         => '',
-    'csv_tab'               => '',
-    'csv_delimiter'         => '',
-    'csv_import_account'    => '',
-    'csv_config'            => '',
+    'import_file'           => 'Import file',
+    'configuration_file'    => 'Configuration file',
+    'import_file_type'      => 'Import file type',
+    'csv_comma'             => 'A comma (,)',
+    'csv_semicolon'         => 'A semicolon (;)',
+    'csv_tab'               => 'A tab (invisible)',
+    'csv_delimiter'         => 'CSV field delimiter',
+    'csv_import_account'    => 'Default import account',
+    'csv_config'            => 'CSV import configuration',
 
 
-    'due_date'           => '',
-    'payment_date'       => '',
-    'invoice_date'       => '',
-    'internal_reference' => '',
+    'due_date'           => 'Due date',
+    'payment_date'       => 'Payment date',
+    'invoice_date'       => 'Invoice date',
+    'internal_reference' => 'Internal reference',
 
-    'inward'  => '',
-    'outward' => '',
+    'inward'  => 'Inward description',
+    'outward' => 'Outward description',
 ];
\ No newline at end of file

From 5e062908a56eea75aaf4ccb48476f571920e526b Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Fri, 25 Aug 2017 07:36:58 +0200
Subject: [PATCH 337/668] New translations form.php (Portuguese, Brazilian)

---
 resources/lang/pt_BR/form.php | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/resources/lang/pt_BR/form.php b/resources/lang/pt_BR/form.php
index 7b5b88d021..f8d02b2be5 100644
--- a/resources/lang/pt_BR/form.php
+++ b/resources/lang/pt_BR/form.php
@@ -34,7 +34,7 @@ return [
     'journal_source_account_name'    => 'Conta de receita (fonte)',
     'journal_source_account_id'      => 'Conta de ativo (fonte)',
     'BIC'                            => 'BIC',
-    'verify_password'                => '',
+    'verify_password'                => 'Verify password security',
     'account_from_id'                => 'da conta',
     'account_to_id'                  => 'para conta',
     'source_account'                 => 'Conta de origem',
@@ -68,10 +68,10 @@ return [
     'revenue_account'                => 'Conta de Receita',
     'decimal_places'                 => 'Casas décimais',
     'exchange_rate_instruction'      => 'Moedas estrangeiras',
-    'exchanged_amount'               => '',
-    'source_amount'                  => '',
-    'destination_amount'             => '',
-    'native_amount'                  => '',
+    'exchanged_amount'               => 'Exchanged amount',
+    'source_amount'                  => 'Amount (source)',
+    'destination_amount'             => 'Amount (destination)',
+    'native_amount'                  => 'Native amount',
 
     'revenue_account_source'      => 'Conta de receita (fonte)',
     'source_account_asset'        => 'Conta de origem (conta de ativo)',
@@ -135,7 +135,7 @@ return [
     'delete_attachment'          => 'Apagar anexo ":name"',
     'delete_rule'                => 'Excluir regra ":title"',
     'delete_rule_group'          => 'Exclua o grupo de regras ":title"',
-    'delete_link_type'           => '',
+    'delete_link_type'           => 'Delete link type ":name"',
     'attachment_areYouSure'      => 'Tem certeza que deseja excluir o anexo denominado ":name"?',
     'account_areYouSure'         => 'Tem certeza que deseja excluir a conta denominada ":name"?',
     'bill_areYouSure'            => 'Você tem certeza que quer apagar a fatura ":name"?',
@@ -148,14 +148,14 @@ return [
     'journal_areYouSure'         => 'Tem certeza que deseja excluir a transação descrita ":description"?',
     'mass_journal_are_you_sure'  => 'Tem a certeza que pretende apagar estas transações?',
     'tag_areYouSure'             => 'Você tem certeza que quer apagar a tag ":tag"?',
-    'journal_link_areYouSure'    => '',
-    'linkType_areYouSure'        => '',
+    'journal_link_areYouSure'    => 'Are you sure you want to delete the link between <a href=":source_link">:source</a> and <a href=":destination_link">:destination</a>?',
+    'linkType_areYouSure'        => 'Are you sure you want to delete the link type ":name" (":inward" / ":outward")?',
     'permDeleteWarning'          => 'Exclusão de dados do Firely são permanentes e não podem ser desfeitos.',
     'mass_make_selection'        => 'Você ainda pode evitar que itens sejam excluídos, removendo a caixa de seleção.',
     'delete_all_permanently'     => 'Exclua os selecionados permanentemente',
     'update_all_journals'        => 'Atualizar essas transações',
     'also_delete_transactions'   => 'A única transação ligada a essa conta será excluída também.|Todas as :count transações ligadas a esta conta serão excluídas também.',
-    'also_delete_connections'    => '',
+    'also_delete_connections'    => 'The only transaction linked with this link type will lose this connection.|All :count transactions linked with this link type will lose their connection.',
     'also_delete_rules'          => 'A única regra que ligado a este grupo de regras será excluída também.|Todos as :count regras ligadas a este grupo de regras serão excluídas também.',
     'also_delete_piggyBanks'     => 'O único cofrinho conectado a essa conta será excluído também.|Todos os :count cofrinhos conectados a esta conta serão excluídos também.',
     'bill_keep_transactions'     => 'A única transação a esta conta não será excluída.|Todos as :count transações conectadas a esta fatura não serão excluídos.',
@@ -167,7 +167,7 @@ return [
     'password'              => 'Senha',
     'password_confirmation' => 'Senha(Confirmar)',
     'blocked'               => 'Está bloqueado?',
-    'blocked_code'          => '',
+    'blocked_code'          => 'Reason for block',
 
 
     // admin
@@ -194,6 +194,6 @@ return [
     'invoice_date'       => 'Data da Fatura',
     'internal_reference' => 'Referência interna',
 
-    'inward'  => '',
-    'outward' => '',
+    'inward'  => 'Inward description',
+    'outward' => 'Outward description',
 ];
\ No newline at end of file

From ec47c9cd00bb0576eebe2591aea171f24f477ba3 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Fri, 25 Aug 2017 07:36:59 +0200
Subject: [PATCH 338/668] New translations form.php (Slovenian)

---
 resources/lang/sl_SI/form.php | 316 +++++++++++++++++-----------------
 1 file changed, 158 insertions(+), 158 deletions(-)

diff --git a/resources/lang/sl_SI/form.php b/resources/lang/sl_SI/form.php
index d469f0bbe5..1166ab5444 100644
--- a/resources/lang/sl_SI/form.php
+++ b/resources/lang/sl_SI/form.php
@@ -15,185 +15,185 @@ return [
 
     // new user:
     'bank_name'                      => 'Naziv banke',
-    'bank_balance'                   => '',
-    'savings_balance'                => '',
-    'credit_card_limit'              => '',
-    'automatch'                      => '',
-    'skip'                           => '',
-    'name'                           => '',
-    'active'                         => '',
-    'amount_min'                     => '',
-    'amount_max'                     => '',
-    'match'                          => '',
-    'repeat_freq'                    => '',
-    'journal_currency_id'            => '',
-    'currency_id'                    => '',
-    'attachments'                    => '',
-    'journal_amount'                 => '',
+    'bank_balance'                   => 'Balance',
+    'savings_balance'                => 'Savings balance',
+    'credit_card_limit'              => 'Credit card limit',
+    'automatch'                      => 'Match automatically',
+    'skip'                           => 'Skip',
+    'name'                           => 'Name',
+    'active'                         => 'Active',
+    'amount_min'                     => 'Minimum amount',
+    'amount_max'                     => 'Maximum amount',
+    'match'                          => 'Matches on',
+    'repeat_freq'                    => 'Repeats',
+    'journal_currency_id'            => 'Currency',
+    'currency_id'                    => 'Currency',
+    'attachments'                    => 'Attachments',
+    'journal_amount'                 => 'Amount',
     'journal_asset_source_account'   => 'premoženjski račun (vir)',
-    'journal_source_account_name'    => '',
+    'journal_source_account_name'    => 'Revenue account (source)',
     'journal_source_account_id'      => 'premoženjski račun (vir)',
-    'BIC'                            => '',
-    'verify_password'                => '',
-    'account_from_id'                => '',
-    'account_to_id'                  => '',
-    'source_account'                 => '',
-    'destination_account'            => '',
+    'BIC'                            => 'BIC',
+    'verify_password'                => 'Verify password security',
+    'account_from_id'                => 'From account',
+    'account_to_id'                  => 'To account',
+    'source_account'                 => 'Source account',
+    'destination_account'            => 'Destination account',
     'journal_destination_account_id' => 'premoženjski račun (cilj)',
     'asset_destination_account'      => 'premoženjski račun (cilj)',
     'asset_source_account'           => 'premoženjski račun (vir)',
-    'journal_description'            => '',
-    'note'                           => '',
-    'split_journal'                  => '',
-    'split_journal_explanation'      => '',
-    'currency'                       => '',
+    'journal_description'            => 'Description',
+    'note'                           => 'Notes',
+    'split_journal'                  => 'Split this transaction',
+    'split_journal_explanation'      => 'Split this transaction in multiple parts',
+    'currency'                       => 'Currency',
     'account_id'                     => 'premoženjski račun',
-    'budget_id'                      => '',
-    'openingBalance'                 => '',
-    'tagMode'                        => '',
-    'tagPosition'                    => '',
-    'virtualBalance'                 => '',
-    'longitude_latitude'             => '',
-    'targetamount'                   => '',
-    'accountRole'                    => '',
-    'openingBalanceDate'             => '',
-    'ccType'                         => '',
-    'ccMonthlyPaymentDate'           => '',
-    'piggy_bank_id'                  => '',
-    'returnHere'                     => '',
-    'returnHereExplanation'          => '',
-    'returnHereUpdateExplanation'    => '',
-    'description'                    => '',
+    'budget_id'                      => 'Budget',
+    'openingBalance'                 => 'Opening balance',
+    'tagMode'                        => 'Tag mode',
+    'tagPosition'                    => 'Tag location',
+    'virtualBalance'                 => 'Virtual balance',
+    'longitude_latitude'             => 'Location',
+    'targetamount'                   => 'Target amount',
+    'accountRole'                    => 'Account role',
+    'openingBalanceDate'             => 'Opening balance date',
+    'ccType'                         => 'Credit card payment plan',
+    'ccMonthlyPaymentDate'           => 'Credit card monthly payment date',
+    'piggy_bank_id'                  => 'Piggy bank',
+    'returnHere'                     => 'Return here',
+    'returnHereExplanation'          => 'After storing, return here to create another one.',
+    'returnHereUpdateExplanation'    => 'After updating, return here.',
+    'description'                    => 'Description',
     'expense_account'                => 'konto stroškov',
-    'revenue_account'                => '',
-    'decimal_places'                 => '',
-    'exchange_rate_instruction'      => '',
-    'exchanged_amount'               => '',
-    'source_amount'                  => '',
-    'destination_amount'             => '',
-    'native_amount'                  => '',
+    'revenue_account'                => 'Revenue account',
+    'decimal_places'                 => 'Decimal places',
+    'exchange_rate_instruction'      => 'Foreign currencies',
+    'exchanged_amount'               => 'Exchanged amount',
+    'source_amount'                  => 'Amount (source)',
+    'destination_amount'             => 'Amount (destination)',
+    'native_amount'                  => 'Native amount',
 
-    'revenue_account_source'      => '',
+    'revenue_account_source'      => 'Revenue account (source)',
     'source_account_asset'        => 'vir (premoženjski račun)',
     'destination_account_expense' => 'ciljni konto (stroški)',
     'destination_account_asset'   => 'ciljni račun (premoženjski račun)',
-    'source_account_revenue'      => '',
-    'type'                        => '',
-    'convert_Withdrawal'          => '',
-    'convert_Deposit'             => '',
-    'convert_Transfer'            => '',
+    'source_account_revenue'      => 'Source account (revenue account)',
+    'type'                        => 'Type',
+    'convert_Withdrawal'          => 'Convert withdrawal',
+    'convert_Deposit'             => 'Convert deposit',
+    'convert_Transfer'            => 'Convert transfer',
 
 
-    'amount'                     => '',
-    'date'                       => '',
-    'interest_date'              => '',
-    'book_date'                  => '',
-    'process_date'               => '',
-    'category'                   => '',
-    'tags'                       => '',
-    'deletePermanently'          => '',
-    'cancel'                     => '',
-    'targetdate'                 => '',
-    'tag'                        => '',
-    'under'                      => '',
-    'symbol'                     => '',
-    'code'                       => '',
-    'iban'                       => '',
-    'accountNumber'              => '',
-    'has_headers'                => '',
-    'date_format'                => '',
-    'specifix'                   => '',
-    'attachments[]'              => '',
-    'store_new_withdrawal'       => '',
-    'store_new_deposit'          => '',
-    'store_new_transfer'         => '',
-    'add_new_withdrawal'         => '',
-    'add_new_deposit'            => '',
-    'add_new_transfer'           => '',
-    'noPiggybank'                => '',
-    'title'                      => '',
-    'notes'                      => '',
-    'filename'                   => '',
-    'mime'                       => '',
-    'size'                       => '',
-    'trigger'                    => '',
-    'stop_processing'            => '',
-    'start_date'                 => '',
-    'end_date'                   => '',
-    'export_start_range'         => '',
-    'export_end_range'           => '',
-    'export_format'              => '',
-    'include_attachments'        => '',
-    'include_old_uploads'        => '',
-    'accounts'                   => '',
-    'delete_account'             => '',
-    'delete_bill'                => '',
-    'delete_budget'              => '',
-    'delete_category'            => '',
-    'delete_currency'            => '',
-    'delete_journal'             => '',
-    'delete_attachment'          => '',
-    'delete_rule'                => '',
-    'delete_rule_group'          => '',
-    'delete_link_type'           => '',
-    'attachment_areYouSure'      => '',
-    'account_areYouSure'         => '',
-    'bill_areYouSure'            => '',
-    'rule_areYouSure'            => '',
-    'ruleGroup_areYouSure'       => '',
-    'budget_areYouSure'          => '',
-    'category_areYouSure'        => '',
-    'currency_areYouSure'        => '',
-    'piggyBank_areYouSure'       => '',
-    'journal_areYouSure'         => '',
-    'mass_journal_are_you_sure'  => '',
-    'tag_areYouSure'             => '',
-    'journal_link_areYouSure'    => '',
-    'linkType_areYouSure'        => '',
-    'permDeleteWarning'          => '',
-    'mass_make_selection'        => '',
-    'delete_all_permanently'     => '',
-    'update_all_journals'        => '',
-    'also_delete_transactions'   => '',
-    'also_delete_connections'    => '',
-    'also_delete_rules'          => '',
-    'also_delete_piggyBanks'     => '',
-    'bill_keep_transactions'     => '',
-    'budget_keep_transactions'   => '',
-    'category_keep_transactions' => '',
-    'tag_keep_transactions'      => '',
+    'amount'                     => 'Amount',
+    'date'                       => 'Date',
+    'interest_date'              => 'Interest date',
+    'book_date'                  => 'Book date',
+    'process_date'               => 'Processing date',
+    'category'                   => 'Category',
+    'tags'                       => 'Tags',
+    'deletePermanently'          => 'Delete permanently',
+    'cancel'                     => 'Cancel',
+    'targetdate'                 => 'Target date',
+    'tag'                        => 'Tag',
+    'under'                      => 'Under',
+    'symbol'                     => 'Symbol',
+    'code'                       => 'Code',
+    'iban'                       => 'IBAN',
+    'accountNumber'              => 'Account number',
+    'has_headers'                => 'Headers',
+    'date_format'                => 'Date format',
+    'specifix'                   => 'Bank- or file specific fixes',
+    'attachments[]'              => 'Attachments',
+    'store_new_withdrawal'       => 'Store new withdrawal',
+    'store_new_deposit'          => 'Store new deposit',
+    'store_new_transfer'         => 'Store new transfer',
+    'add_new_withdrawal'         => 'Add a new withdrawal',
+    'add_new_deposit'            => 'Add a new deposit',
+    'add_new_transfer'           => 'Add a new transfer',
+    'noPiggybank'                => '(no piggy bank)',
+    'title'                      => 'Title',
+    'notes'                      => 'Notes',
+    'filename'                   => 'File name',
+    'mime'                       => 'Mime type',
+    'size'                       => 'Size',
+    'trigger'                    => 'Trigger',
+    'stop_processing'            => 'Stop processing',
+    'start_date'                 => 'Start of range',
+    'end_date'                   => 'End of range',
+    'export_start_range'         => 'Start of export range',
+    'export_end_range'           => 'End of export range',
+    'export_format'              => 'File format',
+    'include_attachments'        => 'Include uploaded attachments',
+    'include_old_uploads'        => 'Include imported data',
+    'accounts'                   => 'Export transactions from these accounts',
+    'delete_account'             => 'Delete account ":name"',
+    'delete_bill'                => 'Delete bill ":name"',
+    'delete_budget'              => 'Delete budget ":name"',
+    'delete_category'            => 'Delete category ":name"',
+    'delete_currency'            => 'Delete currency ":name"',
+    'delete_journal'             => 'Delete transaction with description ":description"',
+    'delete_attachment'          => 'Delete attachment ":name"',
+    'delete_rule'                => 'Delete rule ":title"',
+    'delete_rule_group'          => 'Delete rule group ":title"',
+    'delete_link_type'           => 'Delete link type ":name"',
+    'attachment_areYouSure'      => 'Are you sure you want to delete the attachment named ":name"?',
+    'account_areYouSure'         => 'Are you sure you want to delete the account named ":name"?',
+    'bill_areYouSure'            => 'Are you sure you want to delete the bill named ":name"?',
+    'rule_areYouSure'            => 'Are you sure you want to delete the rule titled ":title"?',
+    'ruleGroup_areYouSure'       => 'Are you sure you want to delete the rule group titled ":title"?',
+    'budget_areYouSure'          => 'Are you sure you want to delete the budget named ":name"?',
+    'category_areYouSure'        => 'Are you sure you want to delete the category named ":name"?',
+    'currency_areYouSure'        => 'Are you sure you want to delete the currency named ":name"?',
+    'piggyBank_areYouSure'       => 'Are you sure you want to delete the piggy bank named ":name"?',
+    'journal_areYouSure'         => 'Are you sure you want to delete the transaction described ":description"?',
+    'mass_journal_are_you_sure'  => 'Are you sure you want to delete these transactions?',
+    'tag_areYouSure'             => 'Are you sure you want to delete the tag ":tag"?',
+    'journal_link_areYouSure'    => 'Are you sure you want to delete the link between <a href=":source_link">:source</a> and <a href=":destination_link">:destination</a>?',
+    'linkType_areYouSure'        => 'Are you sure you want to delete the link type ":name" (":inward" / ":outward")?',
+    'permDeleteWarning'          => 'Deleting stuff from Firely is permanent and cannot be undone.',
+    'mass_make_selection'        => 'You can still prevent items from being deleted by removing the checkbox.',
+    'delete_all_permanently'     => 'Delete selected permanently',
+    'update_all_journals'        => 'Update these transactions',
+    'also_delete_transactions'   => 'The only transaction connected to this account will be deleted as well.|All :count transactions connected to this account will be deleted as well.',
+    'also_delete_connections'    => 'The only transaction linked with this link type will lose this connection.|All :count transactions linked with this link type will lose their connection.',
+    'also_delete_rules'          => 'The only rule connected to this rule group will be deleted as well.|All :count rules connected to this rule group will be deleted as well.',
+    'also_delete_piggyBanks'     => 'The only piggy bank connected to this account will be deleted as well.|All :count piggy bank connected to this account will be deleted as well.',
+    'bill_keep_transactions'     => 'The only transaction connected to this bill will not be deleted.|All :count transactions connected to this bill will spared deletion.',
+    'budget_keep_transactions'   => 'The only transaction connected to this budget will not be deleted.|All :count transactions connected to this budget will spared deletion.',
+    'category_keep_transactions' => 'The only transaction connected to this category will not be deleted.|All :count transactions connected to this category will spared deletion.',
+    'tag_keep_transactions'      => 'The only transaction connected to this tag will not be deleted.|All :count transactions connected to this tag will spared deletion.',
 
-    'email'                 => '',
-    'password'              => '',
-    'password_confirmation' => '',
-    'blocked'               => '',
-    'blocked_code'          => '',
+    'email'                 => 'Email address',
+    'password'              => 'Password',
+    'password_confirmation' => 'Password (again)',
+    'blocked'               => 'Is blocked?',
+    'blocked_code'          => 'Reason for block',
 
 
     // admin
-    'domain'                => '',
-    'single_user_mode'      => '',
-    'must_confirm_account'  => '',
-    'is_demo_site'          => '',
+    'domain'                => 'Domain',
+    'single_user_mode'      => 'Single user mode',
+    'must_confirm_account'  => 'New users must activate account',
+    'is_demo_site'          => 'Is demo site',
 
 
     // import
-    'import_file'           => '',
-    'configuration_file'    => '',
-    'import_file_type'      => '',
-    'csv_comma'             => '',
-    'csv_semicolon'         => '',
-    'csv_tab'               => '',
-    'csv_delimiter'         => '',
-    'csv_import_account'    => '',
-    'csv_config'            => '',
+    'import_file'           => 'Import file',
+    'configuration_file'    => 'Configuration file',
+    'import_file_type'      => 'Import file type',
+    'csv_comma'             => 'A comma (,)',
+    'csv_semicolon'         => 'A semicolon (;)',
+    'csv_tab'               => 'A tab (invisible)',
+    'csv_delimiter'         => 'CSV field delimiter',
+    'csv_import_account'    => 'Default import account',
+    'csv_config'            => 'CSV import configuration',
 
 
-    'due_date'           => '',
-    'payment_date'       => '',
-    'invoice_date'       => '',
-    'internal_reference' => '',
+    'due_date'           => 'Due date',
+    'payment_date'       => 'Payment date',
+    'invoice_date'       => 'Invoice date',
+    'internal_reference' => 'Internal reference',
 
-    'inward'  => '',
-    'outward' => '',
+    'inward'  => 'Inward description',
+    'outward' => 'Outward description',
 ];
\ No newline at end of file

From 28b3134ae2f3ade79fa0e652db63ba94c909f9ce Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Fri, 25 Aug 2017 07:37:01 +0200
Subject: [PATCH 339/668] New translations list.php (Chinese Traditional)

---
 resources/lang/zh_TW/list.php | 44 +++++++++++++++++------------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/resources/lang/zh_TW/list.php b/resources/lang/zh_TW/list.php
index 9c30cbd4df..60c67ed53a 100644
--- a/resources/lang/zh_TW/list.php
+++ b/resources/lang/zh_TW/list.php
@@ -14,7 +14,7 @@ declare(strict_types=1);
 return [
     'buttons'               => '按鈕',
     'icon'                  => '圖標',
-    'id'                    => '',
+    'id'                    => 'ID',
     'create_date'           => '建立於',
     'update_date'           => '更新於',
     'balance_before'        => '交易前餘額',
@@ -36,7 +36,7 @@ return [
     'split_number'          => '分割編號 #',
     'destination'           => '到',
     'source'                => '來源',
-    'next_expected_match'   => '',
+    'next_expected_match'   => 'Next expected match',
     'automatch'             => '自動匹配？',
     'repeat_freq'           => '重複',
     'description'           => '描述',
@@ -44,7 +44,7 @@ return [
     'internal_reference'    => '內部參考',
     'date'                  => '日期',
     'interest_date'         => '付息日',
-    'book_date'             => '',
+    'book_date'             => 'Book date',
     'process_date'          => '處理日期',
     'due_date'              => '到期日',
     'payment_date'          => '付款日期',
@@ -70,25 +70,25 @@ return [
     'is_blocked'            => '被阻止',
     'is_admin'              => '是管理員',
     'has_two_factor'        => '有雙重身份驗證 （2FA）',
-    'confirmed_from'        => '',
-    'registered_from'       => '',
-    'blocked_code'          => '',
-    'domain'                => '',
-    'registration_attempts' => '',
+    'confirmed_from'        => 'Confirmed from',
+    'registered_from'       => 'Registered from',
+    'blocked_code'          => 'Block code',
+    'domain'                => 'Domain',
+    'registration_attempts' => 'Registration attempts',
     'source_account'        => '來源帳戶',
-    'destination_account'   => '',
+    'destination_account'   => 'Destination account',
 
-    'accounts_count'         => '',
-    'journals_count'         => '',
-    'attachments_count'      => '',
-    'bills_count'            => '',
-    'categories_count'       => '',
-    'export_jobs_count'      => '',
-    'import_jobs_count'      => '',
-    'budget_count'           => '',
-    'rule_and_groups_count'  => '',
-    'tags_count'             => '',
-    'inward'                 => '',
-    'outward'                => '',
-    'number_of_transactions' => '',
+    'accounts_count'         => 'Number of accounts',
+    'journals_count'         => 'Number of transactions',
+    'attachments_count'      => 'Number of attachments',
+    'bills_count'            => 'Number of bills',
+    'categories_count'       => 'Number of categories',
+    'export_jobs_count'      => 'Number of export jobs',
+    'import_jobs_count'      => 'Number of import jobs',
+    'budget_count'           => 'Number of budgets',
+    'rule_and_groups_count'  => 'Number of rules and rule groups',
+    'tags_count'             => 'Number of tags',
+    'inward'                 => 'Inward description',
+    'outward'                => 'Outward description',
+    'number_of_transactions' => 'Number of transactions',
 ];
\ No newline at end of file

From ab95698181f117dd9d3bdf1d37c398f1914d9f4b Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Fri, 25 Aug 2017 07:37:02 +0200
Subject: [PATCH 340/668] New translations help.php (Spanish)

---
 resources/lang/es_ES/help.php | 36 +++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/resources/lang/es_ES/help.php b/resources/lang/es_ES/help.php
index 62c5695f3b..0f77f62304 100644
--- a/resources/lang/es_ES/help.php
+++ b/resources/lang/es_ES/help.php
@@ -14,22 +14,22 @@ declare(strict_types=1);
 return [
 
     // tour!
-    'main-content-title'     => '',
-    'main-content-text'      => '',
-    'sidebar-toggle-title'   => '',
-    'sidebar-toggle-text'    => '',
-    'account-menu-title'     => '',
-    'account-menu-text'      => '',
-    'budget-menu-title'      => '',
-    'budget-menu-text'       => '',
-    'report-menu-title'      => '',
-    'report-menu-text'       => '',
-    'transaction-menu-title' => '',
-    'transaction-menu-text'  => '',
-    'option-menu-title'      => '',
-    'option-menu-text'       => '',
-    'main-content-end-title' => '',
-    'main-content-end-text'  => '',
-    'index'                  => '',
-    'home'                   => '',
+    'main-content-title'     => 'Welcome to Firefly III',
+    'main-content-text'      => 'Do yourself a favor and follow this short guide to make sure you know your way around.',
+    'sidebar-toggle-title'   => 'Sidebar to create stuff',
+    'sidebar-toggle-text'    => 'Hidden under the plus icon are all the buttons to create new stuff. Accounts, transactions, everything!',
+    'account-menu-title'     => 'All your accounts',
+    'account-menu-text'      => 'Here you can find all the accounts you\'ve made.',
+    'budget-menu-title'      => 'Budgets',
+    'budget-menu-text'       => 'Use this page to organise your finances and limit spending.',
+    'report-menu-title'      => 'Reports',
+    'report-menu-text'       => 'Check this out when you want a solid overview of your finances.',
+    'transaction-menu-title' => 'Transactions',
+    'transaction-menu-text'  => 'All transactions you\'ve created can be found here.',
+    'option-menu-title'      => 'Options',
+    'option-menu-text'       => 'This is pretty self-explanatory.',
+    'main-content-end-title' => 'The end!',
+    'main-content-end-text'  => 'Remember that every page has a small question mark at the right top. Click it to get help about the page you\'re on.',
+    'index'                  => 'index',
+    'home'                   => 'home',
 ];
\ No newline at end of file

From fb09843e5aed61644e8fa21d049070c2693220b1 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Fri, 25 Aug 2017 07:37:03 +0200
Subject: [PATCH 341/668] New translations help.php (Slovenian)

---
 resources/lang/sl_SI/help.php | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/resources/lang/sl_SI/help.php b/resources/lang/sl_SI/help.php
index 5d58c5a936..d9b1d8d381 100644
--- a/resources/lang/sl_SI/help.php
+++ b/resources/lang/sl_SI/help.php
@@ -15,21 +15,21 @@ return [
 
     // tour!
     'main-content-title'     => 'Dobrodošli na Firefly III',
-    'main-content-text'      => '',
-    'sidebar-toggle-title'   => '',
-    'sidebar-toggle-text'    => '',
-    'account-menu-title'     => '',
-    'account-menu-text'      => '',
-    'budget-menu-title'      => '',
-    'budget-menu-text'       => '',
-    'report-menu-title'      => '',
-    'report-menu-text'       => '',
-    'transaction-menu-title' => '',
-    'transaction-menu-text'  => '',
-    'option-menu-title'      => '',
-    'option-menu-text'       => '',
-    'main-content-end-title' => '',
-    'main-content-end-text'  => '',
-    'index'                  => '',
-    'home'                   => '',
+    'main-content-text'      => 'Do yourself a favor and follow this short guide to make sure you know your way around.',
+    'sidebar-toggle-title'   => 'Sidebar to create stuff',
+    'sidebar-toggle-text'    => 'Hidden under the plus icon are all the buttons to create new stuff. Accounts, transactions, everything!',
+    'account-menu-title'     => 'All your accounts',
+    'account-menu-text'      => 'Here you can find all the accounts you\'ve made.',
+    'budget-menu-title'      => 'Budgets',
+    'budget-menu-text'       => 'Use this page to organise your finances and limit spending.',
+    'report-menu-title'      => 'Reports',
+    'report-menu-text'       => 'Check this out when you want a solid overview of your finances.',
+    'transaction-menu-title' => 'Transactions',
+    'transaction-menu-text'  => 'All transactions you\'ve created can be found here.',
+    'option-menu-title'      => 'Options',
+    'option-menu-text'       => 'This is pretty self-explanatory.',
+    'main-content-end-title' => 'The end!',
+    'main-content-end-text'  => 'Remember that every page has a small question mark at the right top. Click it to get help about the page you\'re on.',
+    'index'                  => 'index',
+    'home'                   => 'home',
 ];
\ No newline at end of file

From f490d9ebe802a899c4a35b96ee79c4c138da78f2 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Fri, 25 Aug 2017 07:37:04 +0200
Subject: [PATCH 342/668] New translations form.php (Polish)

---
 resources/lang/pl_PL/form.php | 58 +++++++++++++++++------------------
 1 file changed, 29 insertions(+), 29 deletions(-)

diff --git a/resources/lang/pl_PL/form.php b/resources/lang/pl_PL/form.php
index e21e225a02..1061d0bc49 100644
--- a/resources/lang/pl_PL/form.php
+++ b/resources/lang/pl_PL/form.php
@@ -34,7 +34,7 @@ return [
     'journal_source_account_name'    => 'Konto przychodów (źródło)',
     'journal_source_account_id'      => 'Konto aktywów (źródło)',
     'BIC'                            => 'BIC',
-    'verify_password'                => '',
+    'verify_password'                => 'Verify password security',
     'account_from_id'                => 'Z konta',
     'account_to_id'                  => 'Na konto',
     'source_account'                 => 'Konto źródłowe',
@@ -50,7 +50,7 @@ return [
     'account_id'                     => 'Konto aktywów',
     'budget_id'                      => 'Budżet',
     'openingBalance'                 => 'Bilans otwarcia',
-    'tagMode'                        => '',
+    'tagMode'                        => 'Tag mode',
     'tagPosition'                    => 'Lokalizacja taga',
     'virtualBalance'                 => 'Wirtualne saldo',
     'longitude_latitude'             => 'Lokalizacja',
@@ -58,20 +58,20 @@ return [
     'accountRole'                    => 'Rola konta',
     'openingBalanceDate'             => 'Data salda otwarcia',
     'ccType'                         => 'Plan płatności kartą kredytową',
-    'ccMonthlyPaymentDate'           => '',
+    'ccMonthlyPaymentDate'           => 'Credit card monthly payment date',
     'piggy_bank_id'                  => 'Skarbonka',
     'returnHere'                     => 'Wróć tutaj',
-    'returnHereExplanation'          => '',
+    'returnHereExplanation'          => 'After storing, return here to create another one.',
     'returnHereUpdateExplanation'    => 'Po aktualizacji, wróć tutaj.',
     'description'                    => 'Opis',
     'expense_account'                => 'Konto wydatków',
     'revenue_account'                => 'Konto przychodów',
     'decimal_places'                 => 'Miejsca dziesiętne',
-    'exchange_rate_instruction'      => '',
-    'exchanged_amount'               => '',
-    'source_amount'                  => '',
-    'destination_amount'             => '',
-    'native_amount'                  => '',
+    'exchange_rate_instruction'      => 'Foreign currencies',
+    'exchanged_amount'               => 'Exchanged amount',
+    'source_amount'                  => 'Amount (source)',
+    'destination_amount'             => 'Amount (destination)',
+    'native_amount'                  => 'Native amount',
 
     'revenue_account_source'      => 'Konto przychodów (źródło)',
     'source_account_asset'        => 'Konto źródłowe (konto aktywów)',
@@ -86,9 +86,9 @@ return [
 
     'amount'                     => 'Kwota',
     'date'                       => 'Data',
-    'interest_date'              => '',
+    'interest_date'              => 'Interest date',
     'book_date'                  => 'Data księgowania',
-    'process_date'               => '',
+    'process_date'               => 'Processing date',
     'category'                   => 'Kategoria',
     'tags'                       => 'Tagi',
     'deletePermanently'          => 'Usuń trwale',
@@ -102,7 +102,7 @@ return [
     'accountNumber'              => 'Numer konta',
     'has_headers'                => 'Nagłówki',
     'date_format'                => 'Format daty',
-    'specifix'                   => '',
+    'specifix'                   => 'Bank- or file specific fixes',
     'attachments[]'              => 'Załączniki',
     'store_new_withdrawal'       => 'Zapisz nową wypłatę',
     'store_new_deposit'          => 'Zapisz nową wpłatę',
@@ -135,7 +135,7 @@ return [
     'delete_attachment'          => 'Usuń załącznik ":name"',
     'delete_rule'                => 'Usuń regułę ":title"',
     'delete_rule_group'          => 'Usuń grupę reguł ":title"',
-    'delete_link_type'           => '',
+    'delete_link_type'           => 'Delete link type ":name"',
     'attachment_areYouSure'      => 'Czy na pewno chcesz usunąć załącznik o nazwie ":name"?',
     'account_areYouSure'         => 'Czy na pewno chcesz usunąć konto o nazwie ":name"?',
     'bill_areYouSure'            => 'Czy na pewno chcesz usunąć rachunek o nazwie ":name"?',
@@ -148,20 +148,20 @@ return [
     'journal_areYouSure'         => 'Czy na pewno chcesz usunąć transakcję opisaną ":description"?',
     'mass_journal_are_you_sure'  => 'Czy na pewno chcesz usunąć te transakcje?',
     'tag_areYouSure'             => 'Czy na pewno chcesz usunąć tag ":tag"?',
-    'journal_link_areYouSure'    => '',
-    'linkType_areYouSure'        => '',
+    'journal_link_areYouSure'    => 'Are you sure you want to delete the link between <a href=":source_link">:source</a> and <a href=":destination_link">:destination</a>?',
+    'linkType_areYouSure'        => 'Are you sure you want to delete the link type ":name" (":inward" / ":outward")?',
     'permDeleteWarning'          => 'Usuwanie rzeczy z Firefly jest trwałe i nie można tego cofnąć.',
-    'mass_make_selection'        => '',
+    'mass_make_selection'        => 'You can still prevent items from being deleted by removing the checkbox.',
     'delete_all_permanently'     => 'Trwale usuń zaznaczone',
     'update_all_journals'        => 'Zmodyfikuj te transakcje',
-    'also_delete_transactions'   => '',
-    'also_delete_connections'    => '',
-    'also_delete_rules'          => '',
-    'also_delete_piggyBanks'     => '',
-    'bill_keep_transactions'     => '',
-    'budget_keep_transactions'   => '',
-    'category_keep_transactions' => '',
-    'tag_keep_transactions'      => '',
+    'also_delete_transactions'   => 'The only transaction connected to this account will be deleted as well.|All :count transactions connected to this account will be deleted as well.',
+    'also_delete_connections'    => 'The only transaction linked with this link type will lose this connection.|All :count transactions linked with this link type will lose their connection.',
+    'also_delete_rules'          => 'The only rule connected to this rule group will be deleted as well.|All :count rules connected to this rule group will be deleted as well.',
+    'also_delete_piggyBanks'     => 'The only piggy bank connected to this account will be deleted as well.|All :count piggy bank connected to this account will be deleted as well.',
+    'bill_keep_transactions'     => 'The only transaction connected to this bill will not be deleted.|All :count transactions connected to this bill will spared deletion.',
+    'budget_keep_transactions'   => 'The only transaction connected to this budget will not be deleted.|All :count transactions connected to this budget will spared deletion.',
+    'category_keep_transactions' => 'The only transaction connected to this category will not be deleted.|All :count transactions connected to this category will spared deletion.',
+    'tag_keep_transactions'      => 'The only transaction connected to this tag will not be deleted.|All :count transactions connected to this tag will spared deletion.',
 
     'email'                 => 'Adres email',
     'password'              => 'Hasło',
@@ -174,7 +174,7 @@ return [
     'domain'                => 'Domena',
     'single_user_mode'      => 'Tryb pojedynczego użytkownika',
     'must_confirm_account'  => 'Nowi użytkownicy muszą aktywować konto',
-    'is_demo_site'          => '',
+    'is_demo_site'          => 'Is demo site',
 
 
     // import
@@ -184,7 +184,7 @@ return [
     'csv_comma'             => 'Przecinek (,)',
     'csv_semicolon'         => 'Średnik (;)',
     'csv_tab'               => 'Tabulator (niewidoczny)',
-    'csv_delimiter'         => '',
+    'csv_delimiter'         => 'CSV field delimiter',
     'csv_import_account'    => 'Domyślne konto importu',
     'csv_config'            => 'Konfiguracja importu CSV',
 
@@ -192,8 +192,8 @@ return [
     'due_date'           => 'Termin realizacji',
     'payment_date'       => 'Data płatności',
     'invoice_date'       => 'Data faktury',
-    'internal_reference' => '',
+    'internal_reference' => 'Internal reference',
 
-    'inward'  => '',
-    'outward' => '',
+    'inward'  => 'Inward description',
+    'outward' => 'Outward description',
 ];
\ No newline at end of file

From 241bcce6c1c0a2e7a53239e0f3351703856e32e8 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Fri, 25 Aug 2017 07:37:06 +0200
Subject: [PATCH 343/668] New translations form.php (German)

---
 resources/lang/de_DE/form.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/resources/lang/de_DE/form.php b/resources/lang/de_DE/form.php
index 41d976d77a..b890cee4ff 100644
--- a/resources/lang/de_DE/form.php
+++ b/resources/lang/de_DE/form.php
@@ -34,7 +34,7 @@ return [
     'journal_source_account_name'    => 'Kreditor (Quelle)',
     'journal_source_account_id'      => 'Girokonto (Quelle)',
     'BIC'                            => 'BIC',
-    'verify_password'                => '',
+    'verify_password'                => 'Verify password security',
     'account_from_id'                => 'Vom Konto',
     'account_to_id'                  => 'Auf Konto',
     'source_account'                 => 'Quellkonto',
@@ -135,7 +135,7 @@ return [
     'delete_attachment'          => 'Lösche Anhang ":name"',
     'delete_rule'                => 'Lösche Regel ":title"',
     'delete_rule_group'          => 'Lösche Regelgruppe ":title"',
-    'delete_link_type'           => '',
+    'delete_link_type'           => 'Delete link type ":name"',
     'attachment_areYouSure'      => 'Sind Sie sicher, dass Sie den Anhang ":name" löschen möchten?',
     'account_areYouSure'         => 'Sind Sie sicher, dass Sie das Konto ":name" löschen möchten?',
     'bill_areYouSure'            => 'Sind Sie sicher, dass Sie die Rechnung ":name" löschen möchten?',
@@ -148,14 +148,14 @@ return [
     'journal_areYouSure'         => 'Sind Sie sicher, dass Sie die Überweisung mit dem Namen ":description" löschen möchten?',
     'mass_journal_are_you_sure'  => 'Sind Sie sicher, dass Sie diese Überweisung löschen möchten?',
     'tag_areYouSure'             => 'Sind Sie sicher, dass Sie den Tag ":name" löschen möchten?',
-    'journal_link_areYouSure'    => '',
-    'linkType_areYouSure'        => '',
+    'journal_link_areYouSure'    => 'Are you sure you want to delete the link between <a href=":source_link">:source</a> and <a href=":destination_link">:destination</a>?',
+    'linkType_areYouSure'        => 'Are you sure you want to delete the link type ":name" (":inward" / ":outward")?',
     'permDeleteWarning'          => 'Das Löschen von Dingen in Firefly ist dauerhaft und kann nicht rückgängig gemacht werden.',
     'mass_make_selection'        => 'Sie können das Löschen von Elementen verhinden, indem Sie die Checkbox entfernen.',
     'delete_all_permanently'     => 'Ausgewähltes dauerhaft löschen',
     'update_all_journals'        => 'Diese Transaktionen aktualisieren',
     'also_delete_transactions'   => 'Die einzige Überweisung, die mit diesem Konto verknüpft ist, wird ebenfalls gelöscht. | Alle :count Überweisungen, die mit diesem Konto verknüpft sind, werden ebenfalls gelöscht.',
-    'also_delete_connections'    => '',
+    'also_delete_connections'    => 'The only transaction linked with this link type will lose this connection.|All :count transactions linked with this link type will lose their connection.',
     'also_delete_rules'          => 'Die einzige Regel, die mit diesem Konto verknüpft ist, wird ebenfalls gelöscht. | Alle :count Regeln, die mit diesem Konto verknüpft sind, werden ebenfalls gelöscht.',
     'also_delete_piggyBanks'     => 'Das einzige Sparschwein, das mit diesem Konto verknüpft ist, wird ebenfalls gelöscht. | Alle :count Sparschweine, die mit diesem Konto verknüpft sind, werden ebenfalls gelöscht.',
     'bill_keep_transactions'     => 'Die einzige Überweisung, die mit dieser Rechnung verknüpft ist, wird nicht gelöscht. | Keine der :count Überweisungen, die mit dieser Rechnung verknüpft sind, werden gelöscht.',
@@ -194,6 +194,6 @@ return [
     'invoice_date'       => 'Rechnungsdatum',
     'internal_reference' => 'Interner Verweis',
 
-    'inward'  => '',
-    'outward' => '',
+    'inward'  => 'Inward description',
+    'outward' => 'Outward description',
 ];
\ No newline at end of file

From 6b6b9ae24237bde1db84bb7a45b3d29497964f29 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Fri, 25 Aug 2017 07:37:08 +0200
Subject: [PATCH 344/668] New translations firefly.php (French)

---
 resources/lang/fr_FR/firefly.php | 252 +++++++++++++++----------------
 1 file changed, 126 insertions(+), 126 deletions(-)

diff --git a/resources/lang/fr_FR/firefly.php b/resources/lang/fr_FR/firefly.php
index 534d205cb0..607bb2dd50 100644
--- a/resources/lang/fr_FR/firefly.php
+++ b/resources/lang/fr_FR/firefly.php
@@ -863,150 +863,150 @@ return [
     'configuration_updated'                 => 'La configuration a été mise à jour',
     'setting_is_demo_site'                  => 'Site de démonstration',
     'setting_is_demo_site_explain'          => 'Si vous cochez cette case, cette installation se comportera comme si c\'était le site de démonstration, ce qui peut engendrer des effets secondaires étranges.',
-    'block_code_bounced'                    => '',
-    'block_code_expired'                    => '',
-    'no_block_code'                         => '',
+    'block_code_bounced'                    => 'Email message(s) bounced',
+    'block_code_expired'                    => 'Demo account expired',
+    'no_block_code'                         => 'No reason for block or user not blocked',
     // links
-    'journal_link_configuration'            => '',
-    'create_new_link_type'                  => '',
-    'store_new_link_type'                   => '',
-    'update_link_type'                      => '',
-    'edit_link_type'                        => '',
-    'updated_link_type'                     => '',
-    'delete_link_type'                      => '',
-    'deleted_link_type'                     => '',
-    'stored_new_link_type'                  => '',
-    'cannot_edit_link_type'                 => '',
-    'link_type_help_name'                   => '',
-    'link_type_help_inward'                 => '',
-    'link_type_help_outward'                => '',
-    'save_connections_by_moving'            => '',
-    'do_not_save_connection'                => '',
-    'link_transaction'                      => '',
-    'link_to_other_transaction'             => '',
-    'select_transaction_to_link'            => '',
-    'this_transaction'                      => '',
-    'transaction'                           => '',
-    'comments'                              => '',
-    'to_link_not_found'                     => '',
-    'invalid_link_data'                     => '',
-    'journals_linked'                       => '',
-    'journals_error_linked'                 => '',
-    'journal_links'                         => '',
-    'this_withdrawal'                       => '',
-    'this_deposit'                          => '',
-    'this_transfer'                         => '',
-    'overview_for_link'                     => '',
-    'delete_journal_link'                   => '',
-    'deleted_link'                          => '',
+    'journal_link_configuration'            => 'Transaction links configuration',
+    'create_new_link_type'                  => 'Create new link type',
+    'store_new_link_type'                   => 'Store new link type',
+    'update_link_type'                      => 'Update link type',
+    'edit_link_type'                        => 'Edit link type ":name"',
+    'updated_link_type'                     => 'Updated link type ":name"',
+    'delete_link_type'                      => 'Delete link type ":name"',
+    'deleted_link_type'                     => 'Deleted link type ":name"',
+    'stored_new_link_type'                  => 'Store new link type ":name"',
+    'cannot_edit_link_type'                 => 'Cannot edit link type ":name"',
+    'link_type_help_name'                   => 'Ie. "Duplicates"',
+    'link_type_help_inward'                 => 'Ie. "duplicates"',
+    'link_type_help_outward'                => 'Ie. "is duplicated by"',
+    'save_connections_by_moving'            => 'Save the link between these transaction(s) by moving them to another link type:',
+    'do_not_save_connection'                => '(do not save connection)',
+    'link_transaction'                      => 'Link transaction',
+    'link_to_other_transaction'             => 'Link this transaction to another transaction',
+    'select_transaction_to_link'            => 'Select a transaction to link this transaction to',
+    'this_transaction'                      => 'This transaction',
+    'transaction'                           => 'Transaction',
+    'comments'                              => 'Comments',
+    'to_link_not_found'                     => 'If the transaction you want to link to is not listed, simply enter its ID.',
+    'invalid_link_data'                     => 'Invalid link type selected. Cannot link transaction.',
+    'journals_linked'                       => 'Transactions are linked.',
+    'journals_error_linked'                 => 'These transactions are already linked.',
+    'journal_links'                         => 'Transaction links',
+    'this_withdrawal'                       => 'This withdrawal',
+    'this_deposit'                          => 'This deposit',
+    'this_transfer'                         => 'This transfer',
+    'overview_for_link'                     => 'Overview for link type ":name"',
+    'delete_journal_link'                   => 'Delete the link between <a href=":source_link">:source</a> and <a href=":destination_link">:destination</a>',
+    'deleted_link'                          => 'Deleted link',
 
 
     // split a transaction:
-    'splits'                                => '',
-    'add_another_split'                     => '',
-    'split-transactions'                    => '',
-    'do_split'                              => '',
-    'split_this_withdrawal'                 => '',
-    'split_this_deposit'                    => '',
-    'split_this_transfer'                   => '',
-    'cannot_edit_multiple_source'           => '',
-    'cannot_edit_multiple_dest'             => '',
-    'cannot_edit_opening_balance'           => '',
-    'no_edit_multiple_left'                 => '',
+    'splits'                                => 'Splits',
+    'add_another_split'                     => 'Add another split',
+    'split-transactions'                    => 'Split transactions',
+    'do_split'                              => 'Do a split',
+    'split_this_withdrawal'                 => 'Split this withdrawal',
+    'split_this_deposit'                    => 'Split this deposit',
+    'split_this_transfer'                   => 'Split this transfer',
+    'cannot_edit_multiple_source'           => 'You cannot edit splitted transaction #:id with description ":description" because it contains multiple source accounts.',
+    'cannot_edit_multiple_dest'             => 'You cannot edit splitted transaction #:id with description ":description" because it contains multiple destination accounts.',
+    'cannot_edit_opening_balance'           => 'You cannot edit the opening balance of an account.',
+    'no_edit_multiple_left'                 => 'You have selected no valid transactions to edit.',
 
     // import bread crumbs and titles:
-    'import'                                => '',
-    'import_data'                           => '',
+    'import'                                => 'Import',
+    'import_data'                           => 'Import data',
 
     // import index page:
-    'import_index_title'                    => '',
-    'import_index_sub_title'                => '',
-    'import_general_index_intro'            => '',
-    'import_index_intro'                    => '',
-    'import_index_file'                     => '',
-    'import_index_config'                   => '',
-    'import_index_type'                     => '',
-    'import_index_start'                    => '',
+    'import_index_title'                    => 'Import data into Firefly III',
+    'import_index_sub_title'                => 'Index',
+    'import_general_index_intro'            => 'Welcome to Firefly\'s import routine. There are a few ways of importing data into Firefly III, displayed here as buttons.',
+    'import_index_intro'                    => 'This routine will help you import files from your bank into Firefly III. Please check out the help pages in the top right corner.',
+    'import_index_file'                     => 'Select your file',
+    'import_index_config'                   => 'If you have previously imported data into Firefly III, you may have a configuration file, which will pre-set configuration values for you. For some banks, other users have kindly provided their <a href="https://github.com/firefly-iii/import-configurations/wiki">configuration file</a>.',
+    'import_index_type'                     => 'Select the type of file you will upload',
+    'import_index_start'                    => 'Start importing',
 
     // supported file types:
-    'import_file_type_csv'                  => '',
+    'import_file_type_csv'                  => 'CSV (comma separated values)',
 
     // import configuration routine:
-    'import_config_sub_title'               => '',
-    'import_config_bread_crumb'             => '',
+    'import_config_sub_title'               => 'Set up your import file',
+    'import_config_bread_crumb'             => 'Set up your import file',
 
     // import status page:
-    'import_status_bread_crumb'             => '',
-    'import_status_sub_title'               => '',
-    'import_status_wait_title'              => '',
-    'import_status_wait_text'               => '',
-    'import_status_ready_title'             => '',
-    'import_status_ready_text'              => '',
-    'import_status_ready_config'            => '',
-    'import_status_ready_start'             => '',
-    'import_status_ready_share'             => '',
-    'import_status_running_title'           => '',
-    'import_status_running_placeholder'     => '',
-    'import_status_errors_title'            => '',
-    'import_status_errors_single'           => '',
-    'import_status_errors_multi'            => '',
-    'import_status_fatal_title'             => '',
-    'import_status_fatal_text'              => '',
-    'import_status_fatal_more'              => '',
-    'import_status_finished_title'          => '',
-    'import_status_finished_text'           => '',
-    'import_status_finished_job'            => '',
-    'import_with_key'                       => '',
+    'import_status_bread_crumb'             => 'Import status',
+    'import_status_sub_title'               => 'Import status',
+    'import_status_wait_title'              => 'Please hold...',
+    'import_status_wait_text'               => 'This box will disappear in a moment.',
+    'import_status_ready_title'             => 'Import is ready to start',
+    'import_status_ready_text'              => 'The import is ready to start. All the configuration you needed to do has been done. Please download the configuration file. It will help you with the import should it not go as planned. To actually run the import, you can either execute the following command in your console, or run the web-based import. Depending on your configuration, the console import will give you more feedback.',
+    'import_status_ready_config'            => 'Download configuration',
+    'import_status_ready_start'             => 'Start the import',
+    'import_status_ready_share'             => 'Please consider downloading your configuration and sharing it at the <strong><a href="https://github.com/firefly-iii/import-configurations/wiki">import configuration center</a></strong>. This will allow other users of Firefly III to import their files more easily.',
+    'import_status_running_title'           => 'The import is running',
+    'import_status_running_placeholder'     => 'Please hold for an update...',
+    'import_status_errors_title'            => 'Errors during the import',
+    'import_status_errors_single'           => 'An error has occured during the import. It does not appear to be fatal.',
+    'import_status_errors_multi'            => 'Some errors occured during the import. These do not appear to be fatal.',
+    'import_status_fatal_title'             => 'A fatal error occurred',
+    'import_status_fatal_text'              => 'A fatal error occurred, which the import-routine cannot recover from. Please see the explanation in red below.',
+    'import_status_fatal_more'              => 'If the error is a time-out, the import will have stopped half-way. For some server configurations, it is merely the server that stopped while the import keeps running in the background. To verify this, check out the log files. If the problem persists, consider importing over the command line instead.',
+    'import_status_finished_title'          => 'Import routine finished',
+    'import_status_finished_text'           => 'The import routine has imported your file.',
+    'import_status_finished_job'            => 'The transactions imported can be found in tag <a href=":link" class="label label-success" style="font-size:100%;font-weight:normal;">:tag</a>.',
+    'import_with_key'                       => 'Import with key \':key\'',
 
     // sandstorm.io errors and messages:
-    'sandstorm_not_available'               => '',
+    'sandstorm_not_available'               => 'This function is not available when you are using Firefly III within a Sandstorm.io environment.',
 
     // empty lists? no objects? instructions:
-    'no_transactions_in_period'             => '',
-    'no_accounts_title_asset'               => '',
-    'no_accounts_intro_asset'               => '',
-    'no_accounts_imperative_asset'          => '',
-    'no_accounts_create_asset'              => '',
-    'no_accounts_title_expense'             => '',
-    'no_accounts_intro_expense'             => '',
-    'no_accounts_imperative_expense'        => '',
-    'no_accounts_create_expense'            => '',
-    'no_accounts_title_revenue'             => '',
-    'no_accounts_intro_revenue'             => '',
-    'no_accounts_imperative_revenue'        => '',
-    'no_accounts_create_revenue'            => '',
-    'no_budgets_title_default'              => '',
-    'no_budgets_intro_default'              => '',
-    'no_budgets_imperative_default'         => '',
-    'no_budgets_create_default'             => '',
-    'no_categories_title_default'           => '',
-    'no_categories_intro_default'           => '',
-    'no_categories_imperative_default'      => '',
-    'no_categories_create_default'          => '',
-    'no_tags_title_default'                 => '',
-    'no_tags_intro_default'                 => '',
-    'no_tags_imperative_default'            => '',
-    'no_tags_create_default'                => '',
-    'no_transactions_title_withdrawal'      => '',
-    'no_transactions_intro_withdrawal'      => '',
-    'no_transactions_imperative_withdrawal' => '',
-    'no_transactions_create_withdrawal'     => '',
-    'no_transactions_title_deposit'         => '',
-    'no_transactions_intro_deposit'         => '',
-    'no_transactions_imperative_deposit'    => '',
-    'no_transactions_create_deposit'        => '',
-    'no_transactions_title_transfers'       => '',
-    'no_transactions_intro_transfers'       => '',
-    'no_transactions_imperative_transfers'  => '',
-    'no_transactions_create_transfers'      => '',
-    'no_piggies_title_default'              => '',
-    'no_piggies_intro_default'              => '',
-    'no_piggies_imperative_default'         => '',
-    'no_piggies_create_default'             => '',
-    'no_bills_title_default'                => '',
-    'no_bills_intro_default'                => '',
-    'no_bills_imperative_default'           => '',
-    'no_bills_create_default'               => '',
+    'no_transactions_in_period'             => 'There are no transactions in this period.',
+    'no_accounts_title_asset'               => 'Let\'s create an asset account!',
+    'no_accounts_intro_asset'               => 'You have no asset accounts yet. Asset accounts are your main accounts: your checking account, savings account, shared account or even your credit card.',
+    'no_accounts_imperative_asset'          => 'To start using Firefly III you must create at least one asset account. Let\'s do so now:',
+    'no_accounts_create_asset'              => 'Create an asset account',
+    'no_accounts_title_expense'             => 'Let\'s create an expense account!',
+    'no_accounts_intro_expense'             => 'You have no expense accounts yet. Expense accounts are the places where you spend money, such as shops and supermarkets.',
+    'no_accounts_imperative_expense'        => 'Expense accounts are created automatically when you create transactions, but you can create one manually too, if you want. Let\'s create one now:',
+    'no_accounts_create_expense'            => 'Create an expense account',
+    'no_accounts_title_revenue'             => 'Let\'s create a revenue account!',
+    'no_accounts_intro_revenue'             => 'You have no revenue accounts yet. Revenue accounts are the places where you receive money from, such as your employer.',
+    'no_accounts_imperative_revenue'        => 'Revenue accounts are created automatically when you create transactions, but you can create one manually too, if you want. Let\'s create one now:',
+    'no_accounts_create_revenue'            => 'Create a revenue account',
+    'no_budgets_title_default'              => 'Let\'s create a budget',
+    'no_budgets_intro_default'              => 'You have no budgets yet. Budgets are used to organise your expenses into logical groups, which you can give a soft-cap to limit your expenses.',
+    'no_budgets_imperative_default'         => 'Budgets are the basic tools of financial management. Let\'s create one now:',
+    'no_budgets_create_default'             => 'Create a budget',
+    'no_categories_title_default'           => 'Let\'s create a category!',
+    'no_categories_intro_default'           => 'You have no categories yet. Categories are used to fine tune your transactions and label them with their designated category.',
+    'no_categories_imperative_default'      => 'Categories are created automatically when you create transactions, but you can create one manually too. Let\'s create one now:',
+    'no_categories_create_default'          => 'Create a category',
+    'no_tags_title_default'                 => 'Let\'s create a tag!',
+    'no_tags_intro_default'                 => 'You have no tags yet. Tags are used to fine tune your transactions and label them with specific keywords.',
+    'no_tags_imperative_default'            => 'Tags are created automatically when you create transactions, but you can create one manually too. Let\'s create one now:',
+    'no_tags_create_default'                => 'Create a tag',
+    'no_transactions_title_withdrawal'      => 'Let\'s create an expense!',
+    'no_transactions_intro_withdrawal'      => 'You have no expenses yet. You should create expenses to start managing your finances.',
+    'no_transactions_imperative_withdrawal' => 'Have you spent some money? Then you should write it down:',
+    'no_transactions_create_withdrawal'     => 'Create an expense',
+    'no_transactions_title_deposit'         => 'Let\'s create some income!',
+    'no_transactions_intro_deposit'         => 'You have no recorded income yet. You should create income entries to start managing your finances.',
+    'no_transactions_imperative_deposit'    => 'Have you received some money? Then you should write it down:',
+    'no_transactions_create_deposit'        => 'Create a deposit',
+    'no_transactions_title_transfers'       => 'Let\'s create a transfer!',
+    'no_transactions_intro_transfers'       => 'You have no transfers yet. When you move money between asset accounts, it is recorded as a transfer.',
+    'no_transactions_imperative_transfers'  => 'Have you moved some money around? Then you should write it down:',
+    'no_transactions_create_transfers'      => 'Create a transfer',
+    'no_piggies_title_default'              => 'Let\'s create a piggy bank!',
+    'no_piggies_intro_default'              => 'You have no piggy banks yet. You can create piggy banks to divide your savings and keep track of what you\'re saving up for.',
+    'no_piggies_imperative_default'         => 'Do you have things you\'re saving money for? Create a piggy bank and keep track:',
+    'no_piggies_create_default'             => 'Create a new piggy bank',
+    'no_bills_title_default'                => 'Let\'s create a bill!',
+    'no_bills_intro_default'                => 'You have no bills yet. You can create bills to keep track of regular expenses, like your rent of insurance.',
+    'no_bills_imperative_default'           => 'Do you have such regular bills? Create a bill and keep track of your payments:',
+    'no_bills_create_default'               => 'Create a bill',
 
 
 ];
\ No newline at end of file

From d232a7abbb35f8e9781a3b614f6e3e9d85eb9265 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Fri, 25 Aug 2017 07:37:11 +0200
Subject: [PATCH 345/668] New translations firefly.php (German)

---
 resources/lang/de_DE/firefly.php | 360 +++++++++++++++----------------
 1 file changed, 180 insertions(+), 180 deletions(-)

diff --git a/resources/lang/de_DE/firefly.php b/resources/lang/de_DE/firefly.php
index d8585b6c2d..dd6a8153c1 100644
--- a/resources/lang/de_DE/firefly.php
+++ b/resources/lang/de_DE/firefly.php
@@ -27,7 +27,7 @@ return [
     'to'                                         => 'Bis',
     'showEverything'                             => 'Alles anzeigen',
     'never'                                      => 'Nie',
-    'no_results_for_empty_search'                => '',
+    'no_results_for_empty_search'                => 'Your search was empty, so nothing was found.',
     'removed_amount'                             => ':amount enfernt',
     'added_amount'                               => ':amount hinzugefügt',
     'asset_account_role_help'                    => 'Alle zusätzlichen Optionen, welche aus ihren Entscheidung entstehen, können später eingestellt werden.',
@@ -72,14 +72,14 @@ return [
     'user_id_is'                                 => 'Ihre Benutzerkennung ist <strong>:user</strong>',
     'field_supports_markdown'                    => 'Diese Feld unterstützt <a href="https://en.support.wordpress.com/markdown-quick-reference/"> Abschlag </a>.',
     'need_more_help'                             => 'Wenn du hilfe beim bedienen von Firefly III brauchst, <a href="https://github.com/firefly-iii/firefly-iii/issues">erstelle ein Ticket auf Github</a>.',
-    'reenable_intro_text'                        => '',
-    'intro_boxes_after_refresh'                  => '',
+    'reenable_intro_text'                        => 'You can also reenable <a href="#" id="reenableGuidance">the introduction guidance</a>.',
+    'intro_boxes_after_refresh'                  => 'The introduction boxes will reappear when you refresh the page.',
     'show_all_no_filter'                         => 'Alle Transaktionen anzeigen, ohne diese nach Datum zu gruppieren.',
     'expenses_by_category'                       => 'Ausgaben nach Kategorie',
     'expenses_by_budget'                         => 'Ausgaben nach Budget',
     'income_by_category'                         => 'Einkommen nach Kategorie',
-    'expenses_by_asset_account'                  => '',
-    'expenses_by_expense_account'                => '',
+    'expenses_by_asset_account'                  => 'Expenses by asset account',
+    'expenses_by_expense_account'                => 'Expenses by expense account',
     'cannot_redirect_to_account'                 => 'Entschuldigung. Firefly III kann Sie nicht zur richtigen Seite weiterleiten.',
     'sum_of_expenses'                            => 'Summe von Ausgaben',
     'sum_of_income'                              => 'Summe von Einnahmen',
@@ -133,12 +133,12 @@ return [
 
     // search
     'search'                                     => 'Suche',
-    'search_found_transactions'                  => '',
-    'general_search_error'                       => '',
-    'search_box'                                 => '',
-    'search_box_intro'                           => '',
-    'search_error'                               => '',
-    'search_searching'                           => '',
+    'search_found_transactions'                  => 'Number of transactions found:',
+    'general_search_error'                       => 'An error occured while searching. Please check the log files for more information.',
+    'search_box'                                 => 'Search',
+    'search_box_intro'                           => 'Welcome to the search function of Firefly III. Enter your search query in the box. Make sure you check out the help file because the search is pretty advanced.',
+    'search_error'                               => 'Error while searching',
+    'search_searching'                           => 'Searching ...',
 
     // repeat frequencies:
     'repeat_freq_yearly'                         => 'Jährlich',
@@ -228,14 +228,14 @@ return [
     'warning_transaction_subset'                 => 'Aus Kapazitätgründen ist diese Liste auf :max_num_transactions Überweisungen limitiert und zeigt möglicherweise nur einen Teil dieser an',
     'warning_no_matching_transactions'           => 'Keine übereinstimmenden Überweisungen gefunden. Aus Kapazitätgründen werden nur die letzten :num_transactions Überweisungen überprüft.',
     'warning_no_valid_triggers'                  => 'Keine gültigen Trigger gefunden.',
-    'apply_rule_selection'                       => '',
-    'apply_rule_selection_intro'                 => '',
+    'apply_rule_selection'                       => 'Apply rule ":title" to a selection of your transactions',
+    'apply_rule_selection_intro'                 => 'Rules like ":title" are normally only applied to new or updated transactions, but you can tell Firefly III to run it on a selection of your existing transactions. This can be useful when you have updated a rule and you need the changes to be applied to all of your other transactions.',
     'include_transactions_from_accounts'         => 'Überweisungen von diesem Konto einbeziehen',
-    'applied_rule_selection'                     => '',
+    'applied_rule_selection'                     => 'Rule ":title" has been applied to your selection.',
     'execute'                                    => 'Ausführen',
-    'apply_rule_group_selection'                 => '',
-    'apply_rule_group_selection_intro'           => '',
-    'applied_rule_group_selection'               => '',
+    'apply_rule_group_selection'                 => 'Apply rule group ":title" to a selection of your transactions',
+    'apply_rule_group_selection_intro'           => 'Rule groups like ":title" are normally only applied to new or updated transactions, but you can tell Firefly III to run all the rules in this group on a selection of your existing transactions. This can be useful when you have updated a group of rules and you need the changes to be applied to all of your other transactions.',
+    'applied_rule_group_selection'               => 'Rule group ":title" has been applied to your selection.',
 
     // actions and triggers
     'rule_trigger_user_action'                   => 'Die Nutzeraktion ist ":trigger_value"',
@@ -389,16 +389,16 @@ Sollen zusätzlich Ihre Girokonten angezeigt werden?',
     'password_changed'                           => 'Passwort geändert!',
     'should_change'                              => 'Ziel ist es, ihr Passwort zu ändern.',
     'invalid_password'                           => 'Ungültiges Passwort!',
-    'what_is_pw_security'                        => '',
-    'secure_pw_title'                            => '',
-    'secure_pw_history'                          => '',
-    'secure_pw_check_box'                        => '',
-    'secure_pw_sha1'                             => '',
-    'secure_pw_hash_speed'                       => '',
-    'secure_pw_hash_security'                    => '',
-    'secure_pw_should'                           => '',
-    'secure_pw_long_password'                    => '',
-    'secure_pw_short'                            => '',
+    'what_is_pw_security'                        => 'What is "verify password security"?',
+    'secure_pw_title'                            => 'How to choose a secure password',
+    'secure_pw_history'                          => 'In August 2017 well known security researcher Troy Hunt released a list of 306 million stolen passwords. These passwords were stolen during breakins at companies like LinkedIn, Adobe and NeoPets (and many more).',
+    'secure_pw_check_box'                        => 'By checking the box, Firefly III will send the SHA1 hash of your password to <a href="https://www.troyhunt.com/introducing-306-million-freely-downloadable-pwned-passwords/">the website of Troy Hunt</a> to see if it is on the list. This will stop you from using unsafe passwords as is recommended in the latest <a href="https://pages.nist.gov/800-63-3/sp800-63b.html">NIST Special Publication</a> on this subject.',
+    'secure_pw_sha1'                             => 'But I thought SHA1 was broken?',
+    'secure_pw_hash_speed'                       => 'Yes, but not in this context. As you can read on <a href="https://shattered.io/">the website detailing how they broke SHA1</a>, it is now slightly easier to find a "collision": another string that results in the same SHA1-hash. It now only takes 10,000 years using a single-GPU machine.',
+    'secure_pw_hash_security'                    => 'This collision would not be equal to your password, nor would it be useful on (a site like) Firefly III. This application does not use SHA1 for password verification. So it is safe to check this box. Your password is hashed and sent over HTTPS.',
+    'secure_pw_should'                           => 'Should I check the box?',
+    'secure_pw_long_password'                    => 'If you just generated a long, single-use password for Firefly III using some kind of password generator: <strong>no</strong>.',
+    'secure_pw_short'                            => 'If you just entered the password you always use: <em>Please yes</em>.',
 
 
     // attachments
@@ -501,7 +501,7 @@ Sollen zusätzlich Ihre Girokonten angezeigt werden?',
     'update_amount'                              => 'Betrag aktualisieren',
     'update_budget'                              => 'Budget aktualisieren',
     'update_budget_amount_range'                 => 'Aktualisiere (erwarteten) verfügbaren Betrag zwischen :start und :end',
-    'budget_period_navigator'                    => '',
+    'budget_period_navigator'                    => 'Period navigator',
 
     // bills:
     'matching_on'                                => 'Reagiert auf',
@@ -526,8 +526,8 @@ Sollen zusätzlich Ihre Girokonten angezeigt werden?',
     'average_bill_amount_overall'                => 'Durchschnittliche Rechnungssumme (gesamt)',
     'not_or_not_yet'                             => '(noch) nicht',
     'not_expected_period'                        => 'Diesen Zeitraum nicht erwartet',
-    'bill_is_active'                             => '',
-    'bill_will_automatch'                        => '',
+    'bill_is_active'                             => 'Bill is active',
+    'bill_will_automatch'                        => 'Bill will automatically linked to matching transactions',
     // accounts:
     'details_for_asset'                          => 'Details für Girokonto ":name"',
     'details_for_expense'                        => 'Details für Debitor ":name"',
@@ -605,7 +605,7 @@ Sollen zusätzlich Ihre Girokonten angezeigt werden?',
     'delete_selected'                            => 'Auswahl löschen',
     'mass_delete_journals'                       => 'Löschen Sie eine Reihe von Überweisungen',
     'mass_edit_journals'                         => 'Bearbeiten Sie eine Reihe von Überweisungen',
-    'cannot_edit_other_fields'                   => '',
+    'cannot_edit_other_fields'                   => 'You cannot mass-edit other fields than the ones here, because there is no room to show them. Please follow the link and edit them by one-by-one, if you need to edit these fields.',
     'perm-delete-many'                           => 'Das Löschen von mehreren Elementen auf einmal kann sich störend auswirken. Bitte seien Sie vorsichtig.',
     'mass_deleted_transactions_success'          => ':amount Überweisung(en) gelöscht.',
     'mass_edited_transactions_success'           => ':amount Überweisung(en) aktualisiert',
@@ -615,9 +615,9 @@ Sollen zusätzlich Ihre Girokonten angezeigt werden?',
     'welcome'                                    => 'Willkommen bei Firefly!',
     'submit'                                     => 'Bestätigen',
     'getting_started'                            => 'Erste Schritte',
-    'to_get_started'                             => '',
-    'savings_balance_text'                       => '',
-    'finish_up_new_user'                         => '',
+    'to_get_started'                             => 'It is good to see you have successfully installed Firefly III. To get started with this tool please enter your bank\'s name and the balance of your main checking account. Do not worry yet if you have multiple accounts. You can add those later. It\'s just that Firefly III needs something to start with.',
+    'savings_balance_text'                       => 'Firefly III will automatically create a savings account for you. By default, there will be no money in your savings account, but if you tell Firefly III the balance it will be stored as such.',
+    'finish_up_new_user'                         => 'That\'s it! You can continue by pressing <strong>Submit</strong>. You will be taken to the index of Firefly III.',
     'stored_new_accounts_new_user'               => 'Yay! Ihre neuen Konten wurden gespeichert.',
 
     // home page:
@@ -675,11 +675,11 @@ Sollen zusätzlich Ihre Girokonten angezeigt werden?',
     'errors'                                     => 'Fehler',
 
     // reports:
-    'report_default'                             => '',
-    'report_audit'                               => '',
-    'report_category'                            => '',
-    'report_budget'                              => '',
-    'report_tag'                                 => '',
+    'report_default'                             => 'Default financial report between :start and :end',
+    'report_audit'                               => 'Transaction history overview between :start and :end',
+    'report_category'                            => 'Category report between :start and :end',
+    'report_budget'                              => 'Budget report between :start and :end',
+    'report_tag'                                 => 'Tag report between :start and :end',
     'quick_link_reports'                         => 'Schnellzugriff',
     'quick_link_default_report'                  => 'Standard Finanzbericht',
     'quick_link_audit_report'                    => 'Transaktionshistorie',
@@ -694,7 +694,7 @@ Sollen zusätzlich Ihre Girokonten angezeigt werden?',
     'balanceEnd'                                 => 'Bilanz zum Ende der Periode',
     'splitByAccount'                             => 'Nach Konto aufteilen',
     'coveredWithTags'                            => 'Abgedeckt durch Tags',
-    'leftUnbalanced'                             => '',
+    'leftUnbalanced'                             => 'Left unbalanced',
     'leftInBudget'                               => 'Übrig im Budget',
     'sumOfSums'                                  => 'Summe der Summen',
     'noCategory'                                 => '(keine Kategorie)',
@@ -712,41 +712,41 @@ Sollen zusätzlich Ihre Girokonten angezeigt werden?',
     'report_type_audit'                          => 'Übersicht der Transaktionen (Prüfung)',
     'report_type_category'                       => 'Kategorie-Bericht',
     'report_type_budget'                         => 'Budgetbericht',
-    'report_type_tag'                            => '',
+    'report_type_tag'                            => 'Tag report',
     'more_info_help'                             => 'Weitere Informationen über diese Art von Berichten finden Sie in der Hilfe. Drücken Sie hierfür das (?)-Symbol in der oberen rechten Ecke.',
     'report_included_accounts'                   => 'Eingezogene Konten',
     'report_date_range'                          => 'Zeitraum',
     'report_preset_ranges'                       => 'Voreingestellte Bereiche',
     'shared'                                     => 'Geteilt',
     'fiscal_year'                                => 'Geschäftsjahr',
-    'income_entry'                               => '',
-    'expense_entry'                              => '',
-    'category_entry'                             => '',
-    'budget_spent_amount'                        => '',
-    'balance_amount'                             => '',
-    'no_audit_activity'                          => '',
+    'income_entry'                               => 'Income from account ":name" between :start and :end',
+    'expense_entry'                              => 'Expenses to account ":name" between :start and :end',
+    'category_entry'                             => 'Expenses in category ":name" between :start and :end',
+    'budget_spent_amount'                        => 'Expenses in budget ":budget" between :start and :end',
+    'balance_amount'                             => 'Expenses in budget ":budget" paid from account ":account" between :start and :end',
+    'no_audit_activity'                          => 'No activity was recorded on account <a href=":url" title=":account_name">:account_name</a> between :start and :end.',
     'audit_end_balance'                          => 'Kontostand von <a href=":url" title=":account_name">:account_name</a> Ende war: :balance',
     'reports_extra_options'                      => 'Zusatzoptionen',
     'report_has_no_extra_options'                => 'Dieser Bericht hat keine zusätzliche Optionen',
     'reports_submit'                             => 'Zeige Bericht',
     'end_after_start_date'                       => 'Enddatum des Berichts muss nach dem Startdatum liegen.',
-    'select_category'                            => '',
-    'select_budget'                              => '',
-    'select_tag'                                 => '',
+    'select_category'                            => 'Select category(ies)',
+    'select_budget'                              => 'Select budget(s).',
+    'select_tag'                                 => 'Select tag(s).',
     'income_per_category'                        => 'Einnahmen pro Kategorie',
     'expense_per_category'                       => 'Ausgaben pro Kategorie',
     'expense_per_budget'                         => 'Ausgaben pro Budget',
     'income_per_account'                         => 'Einnahmen pro Konto',
     'expense_per_account'                        => 'Ausgaben pro Konto',
-    'expense_per_tag'                            => '',
-    'income_per_tag'                             => '',
-    'include_expense_not_in_budget'              => '',
-    'include_expense_not_in_account'             => '',
-    'include_expense_not_in_category'            => '',
-    'include_income_not_in_category'             => '',
-    'include_income_not_in_account'              => '',
-    'include_income_not_in_tags'                 => '',
-    'include_expense_not_in_tags'                => '',
+    'expense_per_tag'                            => 'Expense per tag',
+    'income_per_tag'                             => 'Income per tag',
+    'include_expense_not_in_budget'              => 'Included expenses not in the selected budget(s)',
+    'include_expense_not_in_account'             => 'Included expenses not in the selected account(s)',
+    'include_expense_not_in_category'            => 'Included expenses not in the selected category(ies)',
+    'include_income_not_in_category'             => 'Included income not in the selected category(ies)',
+    'include_income_not_in_account'              => 'Included income not in the selected account(s)',
+    'include_income_not_in_tags'                 => 'Included income not in the selected tag(s)',
+    'include_expense_not_in_tags'                => 'Included expenses not in the selected tag(s)',
     'everything_else'                            => 'Der Rest',
     'income_and_expenses'                        => 'Einkommen und Ausgaben',
     'spent_average'                              => 'Ausgaben (Durchschnitt)',
@@ -758,9 +758,9 @@ Sollen zusätzlich Ihre Girokonten angezeigt werden?',
     'description'                                => 'Beschreibung',
     'sum_of_period'                              => 'Summe des Zeitraums',
     'average_in_period'                          => 'Durchschnitt im Zeitraum',
-    'account_role_defaultAsset'                  => '',
-    'account_role_sharedAsset'                   => '',
-    'account_role_savingAsset'                   => '',
+    'account_role_defaultAsset'                  => 'Default asset account',
+    'account_role_sharedAsset'                   => 'Shared asset account',
+    'account_role_savingAsset'                   => 'Savings account',
     'account_role_ccAsset'                       => 'Kreditkarte',
 
     // charts:
@@ -800,7 +800,7 @@ Sollen zusätzlich Ihre Girokonten angezeigt werden?',
     'sum_of_piggy_banks'                         => 'Summe der Sparschweine',
     'saved_so_far'                               => 'Gespart',
     'left_to_save'                               => 'Zu Sparen',
-    'suggested_amount'                           => '',
+    'suggested_amount'                           => 'Suggested monthly amount to save',
     'add_money_to_piggy_title'                   => 'Geld dem Sparschwein ":name" hinzufügen',
     'remove_money_from_piggy_title'              => 'Geld dem Sparschwein ":name" entnehmen',
     'add'                                        => 'Hinzufügen',
@@ -820,15 +820,15 @@ Sollen zusätzlich Ihre Girokonten angezeigt werden?',
     'table'                      => 'Tabelle',
     'delete_piggy_bank'          => 'Sparschwein ":name" löschen',
     'cannot_add_amount_piggy'    => ':amount konnte nicht zu ":name" hinzugefügt werden.',
-    'cannot_remove_from_piggy'   => '',
+    'cannot_remove_from_piggy'   => 'Could not remove :amount from ":name".',
     'deleted_piggy_bank'         => 'Sparschwein ":name" gelöscht',
     'added_amount_to_piggy'      => ':amount zu ":name" hinzugefügt',
     'removed_amount_from_piggy'  => ':amount von ":name" entfernt',
 
     // tags
     'regular_tag'                => 'Nur ein normaler Tag.',
-    'balancing_act'              => '',
-    'advance_payment'            => '',
+    'balancing_act'              => 'The tag takes at most two transactions; an expense and a transfer. They\'ll balance each other out.',
+    'advance_payment'            => 'The tag accepts one expense and any number of deposits aimed to repay the original expense.',
     'delete_tag'                 => 'Tag ":tag" entfernen',
     'deleted_tag'                => 'Tag ":tag" entfernt',
     'new_tag'                    => 'Neuen Tag erstellen',
@@ -864,42 +864,42 @@ Sollen zusätzlich Ihre Girokonten angezeigt werden?',
     'configuration_updated'                 => 'Die Konfiguration wurde aktualisiert',
     'setting_is_demo_site'                  => 'Demonstrationsseite',
     'setting_is_demo_site_explain'          => 'Wenn sie diese Option auswählen, wird sich diese Installation wie eine Demonstrationsseite verhalten, was ungwollte Auswirkungen haben kann.',
-    'block_code_bounced'                    => '',
+    'block_code_bounced'                    => 'Email message(s) bounced',
     'block_code_expired'                    => 'Demo-Konto abgelaufen',
     'no_block_code'                         => 'Kein Grund für Block oder Benutzer nicht blockiert',
     // links
-    'journal_link_configuration'            => '',
-    'create_new_link_type'                  => '',
-    'store_new_link_type'                   => '',
-    'update_link_type'                      => '',
-    'edit_link_type'                        => '',
-    'updated_link_type'                     => '',
-    'delete_link_type'                      => '',
-    'deleted_link_type'                     => '',
-    'stored_new_link_type'                  => '',
-    'cannot_edit_link_type'                 => '',
-    'link_type_help_name'                   => '',
-    'link_type_help_inward'                 => '',
-    'link_type_help_outward'                => '',
-    'save_connections_by_moving'            => '',
-    'do_not_save_connection'                => '',
-    'link_transaction'                      => '',
-    'link_to_other_transaction'             => '',
-    'select_transaction_to_link'            => '',
-    'this_transaction'                      => '',
-    'transaction'                           => '',
-    'comments'                              => '',
-    'to_link_not_found'                     => '',
-    'invalid_link_data'                     => '',
-    'journals_linked'                       => '',
-    'journals_error_linked'                 => '',
-    'journal_links'                         => '',
-    'this_withdrawal'                       => '',
-    'this_deposit'                          => '',
-    'this_transfer'                         => '',
-    'overview_for_link'                     => '',
-    'delete_journal_link'                   => '',
-    'deleted_link'                          => '',
+    'journal_link_configuration'            => 'Transaction links configuration',
+    'create_new_link_type'                  => 'Create new link type',
+    'store_new_link_type'                   => 'Store new link type',
+    'update_link_type'                      => 'Update link type',
+    'edit_link_type'                        => 'Edit link type ":name"',
+    'updated_link_type'                     => 'Updated link type ":name"',
+    'delete_link_type'                      => 'Delete link type ":name"',
+    'deleted_link_type'                     => 'Deleted link type ":name"',
+    'stored_new_link_type'                  => 'Store new link type ":name"',
+    'cannot_edit_link_type'                 => 'Cannot edit link type ":name"',
+    'link_type_help_name'                   => 'Ie. "Duplicates"',
+    'link_type_help_inward'                 => 'Ie. "duplicates"',
+    'link_type_help_outward'                => 'Ie. "is duplicated by"',
+    'save_connections_by_moving'            => 'Save the link between these transaction(s) by moving them to another link type:',
+    'do_not_save_connection'                => '(do not save connection)',
+    'link_transaction'                      => 'Link transaction',
+    'link_to_other_transaction'             => 'Link this transaction to another transaction',
+    'select_transaction_to_link'            => 'Select a transaction to link this transaction to',
+    'this_transaction'                      => 'This transaction',
+    'transaction'                           => 'Transaction',
+    'comments'                              => 'Comments',
+    'to_link_not_found'                     => 'If the transaction you want to link to is not listed, simply enter its ID.',
+    'invalid_link_data'                     => 'Invalid link type selected. Cannot link transaction.',
+    'journals_linked'                       => 'Transactions are linked.',
+    'journals_error_linked'                 => 'These transactions are already linked.',
+    'journal_links'                         => 'Transaction links',
+    'this_withdrawal'                       => 'This withdrawal',
+    'this_deposit'                          => 'This deposit',
+    'this_transfer'                         => 'This transfer',
+    'overview_for_link'                     => 'Overview for link type ":name"',
+    'delete_journal_link'                   => 'Delete the link between <a href=":source_link">:source</a> and <a href=":destination_link">:destination</a>',
+    'deleted_link'                          => 'Deleted link',
 
 
     // split a transaction:
@@ -910,104 +910,104 @@ Sollen zusätzlich Ihre Girokonten angezeigt werden?',
     'split_this_withdrawal'                 => 'Diese Ausgabe aufteilen',
     'split_this_deposit'                    => 'Diese Einnahme aufteilen',
     'split_this_transfer'                   => 'Diese Überweisung aufteilen',
-    'cannot_edit_multiple_source'           => '',
-    'cannot_edit_multiple_dest'             => '',
-    'cannot_edit_opening_balance'           => '',
-    'no_edit_multiple_left'                 => '',
+    'cannot_edit_multiple_source'           => 'You cannot edit splitted transaction #:id with description ":description" because it contains multiple source accounts.',
+    'cannot_edit_multiple_dest'             => 'You cannot edit splitted transaction #:id with description ":description" because it contains multiple destination accounts.',
+    'cannot_edit_opening_balance'           => 'You cannot edit the opening balance of an account.',
+    'no_edit_multiple_left'                 => 'You have selected no valid transactions to edit.',
 
     // import bread crumbs and titles:
     'import'                                => 'Import',
     'import_data'                           => 'Daten importieren',
 
     // import index page:
-    'import_index_title'                    => '',
-    'import_index_sub_title'                => '',
-    'import_general_index_intro'            => '',
-    'import_index_intro'                    => '',
-    'import_index_file'                     => '',
-    'import_index_config'                   => '',
-    'import_index_type'                     => '',
-    'import_index_start'                    => '',
+    'import_index_title'                    => 'Import data into Firefly III',
+    'import_index_sub_title'                => 'Index',
+    'import_general_index_intro'            => 'Welcome to Firefly\'s import routine. There are a few ways of importing data into Firefly III, displayed here as buttons.',
+    'import_index_intro'                    => 'This routine will help you import files from your bank into Firefly III. Please check out the help pages in the top right corner.',
+    'import_index_file'                     => 'Select your file',
+    'import_index_config'                   => 'If you have previously imported data into Firefly III, you may have a configuration file, which will pre-set configuration values for you. For some banks, other users have kindly provided their <a href="https://github.com/firefly-iii/import-configurations/wiki">configuration file</a>.',
+    'import_index_type'                     => 'Select the type of file you will upload',
+    'import_index_start'                    => 'Start importing',
 
     // supported file types:
     'import_file_type_csv'                  => 'CSV (Kommagetrennte Werte)',
 
     // import configuration routine:
-    'import_config_sub_title'               => '',
-    'import_config_bread_crumb'             => '',
+    'import_config_sub_title'               => 'Set up your import file',
+    'import_config_bread_crumb'             => 'Set up your import file',
 
     // import status page:
-    'import_status_bread_crumb'             => '',
-    'import_status_sub_title'               => '',
-    'import_status_wait_title'              => '',
-    'import_status_wait_text'               => '',
-    'import_status_ready_title'             => '',
-    'import_status_ready_text'              => '',
-    'import_status_ready_config'            => '',
-    'import_status_ready_start'             => '',
-    'import_status_ready_share'             => '',
-    'import_status_running_title'           => '',
-    'import_status_running_placeholder'     => '',
-    'import_status_errors_title'            => '',
-    'import_status_errors_single'           => '',
-    'import_status_errors_multi'            => '',
-    'import_status_fatal_title'             => '',
-    'import_status_fatal_text'              => '',
-    'import_status_fatal_more'              => '',
-    'import_status_finished_title'          => '',
-    'import_status_finished_text'           => '',
-    'import_status_finished_job'            => '',
-    'import_with_key'                       => '',
+    'import_status_bread_crumb'             => 'Import status',
+    'import_status_sub_title'               => 'Import status',
+    'import_status_wait_title'              => 'Please hold...',
+    'import_status_wait_text'               => 'This box will disappear in a moment.',
+    'import_status_ready_title'             => 'Import is ready to start',
+    'import_status_ready_text'              => 'The import is ready to start. All the configuration you needed to do has been done. Please download the configuration file. It will help you with the import should it not go as planned. To actually run the import, you can either execute the following command in your console, or run the web-based import. Depending on your configuration, the console import will give you more feedback.',
+    'import_status_ready_config'            => 'Download configuration',
+    'import_status_ready_start'             => 'Start the import',
+    'import_status_ready_share'             => 'Please consider downloading your configuration and sharing it at the <strong><a href="https://github.com/firefly-iii/import-configurations/wiki">import configuration center</a></strong>. This will allow other users of Firefly III to import their files more easily.',
+    'import_status_running_title'           => 'The import is running',
+    'import_status_running_placeholder'     => 'Please hold for an update...',
+    'import_status_errors_title'            => 'Errors during the import',
+    'import_status_errors_single'           => 'An error has occured during the import. It does not appear to be fatal.',
+    'import_status_errors_multi'            => 'Some errors occured during the import. These do not appear to be fatal.',
+    'import_status_fatal_title'             => 'A fatal error occurred',
+    'import_status_fatal_text'              => 'A fatal error occurred, which the import-routine cannot recover from. Please see the explanation in red below.',
+    'import_status_fatal_more'              => 'If the error is a time-out, the import will have stopped half-way. For some server configurations, it is merely the server that stopped while the import keeps running in the background. To verify this, check out the log files. If the problem persists, consider importing over the command line instead.',
+    'import_status_finished_title'          => 'Import routine finished',
+    'import_status_finished_text'           => 'The import routine has imported your file.',
+    'import_status_finished_job'            => 'The transactions imported can be found in tag <a href=":link" class="label label-success" style="font-size:100%;font-weight:normal;">:tag</a>.',
+    'import_with_key'                       => 'Import with key \':key\'',
 
     // sandstorm.io errors and messages:
-    'sandstorm_not_available'               => '',
+    'sandstorm_not_available'               => 'This function is not available when you are using Firefly III within a Sandstorm.io environment.',
 
     // empty lists? no objects? instructions:
-    'no_transactions_in_period'             => '',
-    'no_accounts_title_asset'               => '',
-    'no_accounts_intro_asset'               => '',
-    'no_accounts_imperative_asset'          => '',
-    'no_accounts_create_asset'              => '',
-    'no_accounts_title_expense'             => '',
-    'no_accounts_intro_expense'             => '',
-    'no_accounts_imperative_expense'        => '',
-    'no_accounts_create_expense'            => '',
-    'no_accounts_title_revenue'             => '',
-    'no_accounts_intro_revenue'             => '',
-    'no_accounts_imperative_revenue'        => '',
-    'no_accounts_create_revenue'            => '',
-    'no_budgets_title_default'              => '',
-    'no_budgets_intro_default'              => '',
-    'no_budgets_imperative_default'         => '',
-    'no_budgets_create_default'             => '',
-    'no_categories_title_default'           => '',
-    'no_categories_intro_default'           => '',
-    'no_categories_imperative_default'      => '',
-    'no_categories_create_default'          => '',
-    'no_tags_title_default'                 => '',
-    'no_tags_intro_default'                 => '',
-    'no_tags_imperative_default'            => '',
-    'no_tags_create_default'                => '',
-    'no_transactions_title_withdrawal'      => '',
-    'no_transactions_intro_withdrawal'      => '',
-    'no_transactions_imperative_withdrawal' => '',
-    'no_transactions_create_withdrawal'     => '',
-    'no_transactions_title_deposit'         => '',
-    'no_transactions_intro_deposit'         => '',
-    'no_transactions_imperative_deposit'    => '',
-    'no_transactions_create_deposit'        => '',
-    'no_transactions_title_transfers'       => '',
-    'no_transactions_intro_transfers'       => '',
-    'no_transactions_imperative_transfers'  => '',
-    'no_transactions_create_transfers'      => '',
-    'no_piggies_title_default'              => '',
-    'no_piggies_intro_default'              => '',
-    'no_piggies_imperative_default'         => '',
-    'no_piggies_create_default'             => '',
-    'no_bills_title_default'                => '',
-    'no_bills_intro_default'                => '',
-    'no_bills_imperative_default'           => '',
-    'no_bills_create_default'               => '',
+    'no_transactions_in_period'             => 'There are no transactions in this period.',
+    'no_accounts_title_asset'               => 'Let\'s create an asset account!',
+    'no_accounts_intro_asset'               => 'You have no asset accounts yet. Asset accounts are your main accounts: your checking account, savings account, shared account or even your credit card.',
+    'no_accounts_imperative_asset'          => 'To start using Firefly III you must create at least one asset account. Let\'s do so now:',
+    'no_accounts_create_asset'              => 'Create an asset account',
+    'no_accounts_title_expense'             => 'Let\'s create an expense account!',
+    'no_accounts_intro_expense'             => 'You have no expense accounts yet. Expense accounts are the places where you spend money, such as shops and supermarkets.',
+    'no_accounts_imperative_expense'        => 'Expense accounts are created automatically when you create transactions, but you can create one manually too, if you want. Let\'s create one now:',
+    'no_accounts_create_expense'            => 'Create an expense account',
+    'no_accounts_title_revenue'             => 'Let\'s create a revenue account!',
+    'no_accounts_intro_revenue'             => 'You have no revenue accounts yet. Revenue accounts are the places where you receive money from, such as your employer.',
+    'no_accounts_imperative_revenue'        => 'Revenue accounts are created automatically when you create transactions, but you can create one manually too, if you want. Let\'s create one now:',
+    'no_accounts_create_revenue'            => 'Create a revenue account',
+    'no_budgets_title_default'              => 'Let\'s create a budget',
+    'no_budgets_intro_default'              => 'You have no budgets yet. Budgets are used to organise your expenses into logical groups, which you can give a soft-cap to limit your expenses.',
+    'no_budgets_imperative_default'         => 'Budgets are the basic tools of financial management. Let\'s create one now:',
+    'no_budgets_create_default'             => 'Create a budget',
+    'no_categories_title_default'           => 'Let\'s create a category!',
+    'no_categories_intro_default'           => 'You have no categories yet. Categories are used to fine tune your transactions and label them with their designated category.',
+    'no_categories_imperative_default'      => 'Categories are created automatically when you create transactions, but you can create one manually too. Let\'s create one now:',
+    'no_categories_create_default'          => 'Create a category',
+    'no_tags_title_default'                 => 'Let\'s create a tag!',
+    'no_tags_intro_default'                 => 'You have no tags yet. Tags are used to fine tune your transactions and label them with specific keywords.',
+    'no_tags_imperative_default'            => 'Tags are created automatically when you create transactions, but you can create one manually too. Let\'s create one now:',
+    'no_tags_create_default'                => 'Create a tag',
+    'no_transactions_title_withdrawal'      => 'Let\'s create an expense!',
+    'no_transactions_intro_withdrawal'      => 'You have no expenses yet. You should create expenses to start managing your finances.',
+    'no_transactions_imperative_withdrawal' => 'Have you spent some money? Then you should write it down:',
+    'no_transactions_create_withdrawal'     => 'Create an expense',
+    'no_transactions_title_deposit'         => 'Let\'s create some income!',
+    'no_transactions_intro_deposit'         => 'You have no recorded income yet. You should create income entries to start managing your finances.',
+    'no_transactions_imperative_deposit'    => 'Have you received some money? Then you should write it down:',
+    'no_transactions_create_deposit'        => 'Create a deposit',
+    'no_transactions_title_transfers'       => 'Let\'s create a transfer!',
+    'no_transactions_intro_transfers'       => 'You have no transfers yet. When you move money between asset accounts, it is recorded as a transfer.',
+    'no_transactions_imperative_transfers'  => 'Have you moved some money around? Then you should write it down:',
+    'no_transactions_create_transfers'      => 'Create a transfer',
+    'no_piggies_title_default'              => 'Let\'s create a piggy bank!',
+    'no_piggies_intro_default'              => 'You have no piggy banks yet. You can create piggy banks to divide your savings and keep track of what you\'re saving up for.',
+    'no_piggies_imperative_default'         => 'Do you have things you\'re saving money for? Create a piggy bank and keep track:',
+    'no_piggies_create_default'             => 'Create a new piggy bank',
+    'no_bills_title_default'                => 'Let\'s create a bill!',
+    'no_bills_intro_default'                => 'You have no bills yet. You can create bills to keep track of regular expenses, like your rent of insurance.',
+    'no_bills_imperative_default'           => 'Do you have such regular bills? Create a bill and keep track of your payments:',
+    'no_bills_create_default'               => 'Create a bill',
 
 
 ];
\ No newline at end of file

From 7e032fdbb302701645072256baf43983b540882a Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Fri, 25 Aug 2017 07:37:15 +0200
Subject: [PATCH 346/668] New translations firefly.php (Chinese Traditional)

---
 resources/lang/zh_TW/firefly.php | 1482 +++++++++++++++---------------
 1 file changed, 741 insertions(+), 741 deletions(-)

diff --git a/resources/lang/zh_TW/firefly.php b/resources/lang/zh_TW/firefly.php
index 3fce1988f2..3ea696070e 100644
--- a/resources/lang/zh_TW/firefly.php
+++ b/resources/lang/zh_TW/firefly.php
@@ -21,13 +21,13 @@ return [
     'everything'                                 => '顯示所有',
     'customRange'                                => '自訂範圍',
     'apply'                                      => '套用',
-    'select_date'                                => '',
+    'select_date'                                => 'Select date..',
     'cancel'                                     => '取消',
     'from'                                       => '從',
     'to'                                         => '到',
     'showEverything'                             => '全部顯示',
     'never'                                      => '從來沒有',
-    'no_results_for_empty_search'                => '',
+    'no_results_for_empty_search'                => 'Your search was empty, so nothing was found.',
     'removed_amount'                             => '移除了 :amount',
     'added_amount'                               => '添加了 :amount',
     'asset_account_role_help'                    => '你可以稍後再設置其他選項。',
@@ -63,85 +63,85 @@ return [
     'two_factor_lost_fix_owner'                  => '否則，請電郵網站擁有者，<a href="mailto::site_owner">:site_owner</a> 並要求他們重置你的雙重身份驗證。',
     'warning_much_data'                          => ':days 天的資料需要一點時間載入。',
     'registered'                                 => '您已成功註冊 ！',
-    'Default asset account'                      => '',
+    'Default asset account'                      => 'Default asset account',
     'no_budget_pointer'                          => '你還沒有預算。你可以在<a href="/budgets">預算</a>頁來建立預算。預算可以幫助你跟蹤支出情況。',
-    'Savings account'                            => '',
-    'Credit card'                                => '',
+    'Savings account'                            => 'Savings account',
+    'Credit card'                                => 'Credit card',
     'source_accounts'                            => '來源帳戶',
     'destination_accounts'                       => '目標帳戶',
-    'user_id_is'                                 => '',
-    'field_supports_markdown'                    => '',
-    'need_more_help'                             => '',
-    'reenable_intro_text'                        => '',
-    'intro_boxes_after_refresh'                  => '',
-    'show_all_no_filter'                         => '',
-    'expenses_by_category'                       => '',
-    'expenses_by_budget'                         => '',
-    'income_by_category'                         => '',
-    'expenses_by_asset_account'                  => '',
-    'expenses_by_expense_account'                => '',
-    'cannot_redirect_to_account'                 => '',
-    'sum_of_expenses'                            => '',
-    'sum_of_income'                              => '',
-    'total_sum'                                  => '',
-    'spent_in_specific_budget'                   => '',
-    'sum_of_expenses_in_budget'                  => '',
-    'left_in_budget_limit'                       => '',
-    'cannot_reset_demo_user'                     => '',
-    'current_period'                             => '',
-    'show_the_current_period_and_overview'       => '',
-    'pref_languages_locale'                      => '',
-    'budget_in_period'                           => '',
-    'chart_budget_in_period'                     => '',
-    'chart_account_in_period'                    => '',
-    'chart_category_in_period'                   => '',
-    'chart_category_all'                         => '',
-    'clone_withdrawal'                           => '',
-    'clone_deposit'                              => '',
-    'clone_transfer'                             => '',
-    'multi_select_no_selection'                  => '',
-    'multi_select_all_selected'                  => '',
-    'multi_select_filter_placeholder'            => '',
-    'between_dates_breadcrumb'                   => '',
-    'all_journals_without_budget'                => '',
-    'journals_without_budget'                    => '',
-    'all_journals_without_category'              => '',
-    'journals_without_category'                  => '',
-    'all_journals_for_account'                   => '',
-    'chart_all_journals_for_account'             => '',
-    'journals_in_period_for_account'             => '',
-    'transferred'                                => '',
-    'all_withdrawal'                             => '',
-    'all_transactions'                           => '',
-    'title_withdrawal_between'                   => '',
-    'all_deposit'                                => '',
-    'title_deposit_between'                      => '',
-    'all_transfers'                              => '',
-    'title_transfers_between'                    => '',
-    'all_transfer'                               => '',
-    'all_journals_for_tag'                       => '',
-    'title_transfer_between'                     => '',
-    'all_journals_for_category'                  => '',
-    'all_journals_for_budget'                    => '',
-    'chart_all_journals_for_budget'              => '',
-    'journals_in_period_for_category'            => '',
-    'journals_in_period_for_tag'                 => '',
-    'not_available_demo_user'                    => '',
-    'exchange_rate_instructions'                 => '',
-    'transfer_exchange_rate_instructions'        => '',
-    'transaction_data'                           => '',
+    'user_id_is'                                 => 'Your user id is <strong>:user</strong>',
+    'field_supports_markdown'                    => 'This field supports <a href="https://en.support.wordpress.com/markdown-quick-reference/">Markdown</a>.',
+    'need_more_help'                             => 'If you need more help using Firefly III, please <a href="https://github.com/firefly-iii/firefly-iii/issues">open a ticket on Github</a>.',
+    'reenable_intro_text'                        => 'You can also reenable <a href="#" id="reenableGuidance">the introduction guidance</a>.',
+    'intro_boxes_after_refresh'                  => 'The introduction boxes will reappear when you refresh the page.',
+    'show_all_no_filter'                         => 'Show all transactions without grouping them by date.',
+    'expenses_by_category'                       => 'Expenses by category',
+    'expenses_by_budget'                         => 'Expenses by budget',
+    'income_by_category'                         => 'Income by category',
+    'expenses_by_asset_account'                  => 'Expenses by asset account',
+    'expenses_by_expense_account'                => 'Expenses by expense account',
+    'cannot_redirect_to_account'                 => 'Firefly III cannot redirect you to the correct page. Apologies.',
+    'sum_of_expenses'                            => 'Sum of expenses',
+    'sum_of_income'                              => 'Sum of income',
+    'total_sum'                                  => 'Total sum',
+    'spent_in_specific_budget'                   => 'Spent in budget ":budget"',
+    'sum_of_expenses_in_budget'                  => 'Spent total in budget ":budget"',
+    'left_in_budget_limit'                       => 'Left to spend according to budgeting',
+    'cannot_reset_demo_user'                     => 'You cannot reset the password of the demonstration account',
+    'current_period'                             => 'Current period',
+    'show_the_current_period_and_overview'       => 'Show the current period and overview',
+    'pref_languages_locale'                      => 'For a language other than English to work properly, your operating system must be equipped with the correct locale-information. If these are not present, currency data, dates and amounts may be formatted wrong.',
+    'budget_in_period'                           => 'All transactions for budget ":name" between :start and :end',
+    'chart_budget_in_period'                     => 'Chart for all transactions for budget ":name" between :start and :end',
+    'chart_account_in_period'                    => 'Chart for all transactions for account ":name" between :start and :end',
+    'chart_category_in_period'                   => 'Chart for all transactions for category ":name" between :start and :end',
+    'chart_category_all'                         => 'Chart for all transactions for category ":name"',
+    'clone_withdrawal'                           => 'Clone this withdrawal',
+    'clone_deposit'                              => 'Clone this deposit',
+    'clone_transfer'                             => 'Clone this transfer',
+    'multi_select_no_selection'                  => 'None selected',
+    'multi_select_all_selected'                  => 'All selected',
+    'multi_select_filter_placeholder'            => 'Find..',
+    'between_dates_breadcrumb'                   => 'Between :start and :end',
+    'all_journals_without_budget'                => 'All transactions without a budget',
+    'journals_without_budget'                    => 'Transactions without a budget',
+    'all_journals_without_category'              => 'All transactions without a category',
+    'journals_without_category'                  => 'Transactions without a category',
+    'all_journals_for_account'                   => 'All transactions for account :name',
+    'chart_all_journals_for_account'             => 'Chart of all transactions for account :name',
+    'journals_in_period_for_account'             => 'All transactions for account :name between :start and :end',
+    'transferred'                                => 'Transferred',
+    'all_withdrawal'                             => 'All expenses',
+    'all_transactions'                           => 'All transactions',
+    'title_withdrawal_between'                   => 'All expenses between :start and :end',
+    'all_deposit'                                => 'All revenue',
+    'title_deposit_between'                      => 'All revenue between :start and :end',
+    'all_transfers'                              => 'All transfers',
+    'title_transfers_between'                    => 'All transfers between :start and :end',
+    'all_transfer'                               => 'All transfers',
+    'all_journals_for_tag'                       => 'All transactions for tag ":tag"',
+    'title_transfer_between'                     => 'All transfers between :start and :end',
+    'all_journals_for_category'                  => 'All transactions for category :name',
+    'all_journals_for_budget'                    => 'All transactions for budget :name',
+    'chart_all_journals_for_budget'              => 'Chart of all transactions for budget :name',
+    'journals_in_period_for_category'            => 'All transactions for category :name between :start and :end',
+    'journals_in_period_for_tag'                 => 'All transactions for tag :tag between :start and :end',
+    'not_available_demo_user'                    => 'The feature you try to access is not available to demo users.',
+    'exchange_rate_instructions'                 => 'Asset account "@name" only accepts transactions in @native_currency. If you wish to use @foreign_currency instead, make sure that the amount in @native_currency is known as well:',
+    'transfer_exchange_rate_instructions'        => 'Source asset account "@source_name" only accepts transactions in @source_currency. Destination asset account "@dest_name" only accepts transactions in @dest_currency. You must provide the transferred amount correctly in both currencies.',
+    'transaction_data'                           => 'Transaction data',
 
     // search
     'search'                                     => '搜尋',
-    'search_found_transactions'                  => '',
-    'general_search_error'                       => '',
-    'search_box'                                 => '',
-    'search_box_intro'                           => '',
-    'search_error'                               => '',
-    'search_searching'                           => '',
+    'search_found_transactions'                  => 'Number of transactions found:',
+    'general_search_error'                       => 'An error occured while searching. Please check the log files for more information.',
+    'search_box'                                 => 'Search',
+    'search_box_intro'                           => 'Welcome to the search function of Firefly III. Enter your search query in the box. Make sure you check out the help file because the search is pretty advanced.',
+    'search_error'                               => 'Error while searching',
+    'search_searching'                           => 'Searching ...',
 
     // repeat frequencies:
-    'repeat_freq_yearly'                         => '',
+    'repeat_freq_yearly'                         => 'yearly',
     'repeat_freq_monthly'                        => '每月',
     'weekly'                                     => '每週',
     'quarterly'                                  => '每季',
@@ -150,108 +150,108 @@ return [
 
     // export data:
     'import_and_export'                          => '匯入與匯出',
-    'export_data'                                => '',
-    'export_data_intro'                          => '',
-    'export_format'                              => '',
-    'export_format_csv'                          => '',
+    'export_data'                                => 'Export data',
+    'export_data_intro'                          => 'For backup purposes, when migrating to another system or when migrating to another Firefly III installation.',
+    'export_format'                              => 'Export format',
+    'export_format_csv'                          => 'Comma separated values (CSV file)',
     'export_format_mt940'                        => 'MT940 相容格式',
     'export_included_accounts'                   => '從這些帳戶匯出交易記錄',
     'include_old_uploads_help'                   => 'Firefly III 不會扔掉過去已導入的原始 CSV 檔。你可以將它們包含在匯出的檔案中。',
     'do_export'                                  => '匯出',
     'export_status_never_started'                => '匯出尚未開始',
-    'export_status_make_exporter'                => '',
+    'export_status_make_exporter'                => 'Creating exporter thing...',
     'export_status_collecting_journals'          => '正在收集你的交易資料...',
     'export_status_collected_journals'           => '你的交易資料已經收集成功！',
     'export_status_converting_to_export_format'  => '正在轉換您的交易資料...',
-    'export_status_converted_to_export_format'   => '',
-    'export_status_creating_journal_file'        => '',
-    'export_status_created_journal_file'         => '',
-    'export_status_collecting_attachments'       => '',
-    'export_status_collected_attachments'        => '',
-    'export_status_collecting_old_uploads'       => '',
-    'export_status_collected_old_uploads'        => '',
-    'export_status_creating_config_file'         => '',
-    'export_status_created_config_file'          => '',
-    'export_status_creating_zip_file'            => '',
-    'export_status_created_zip_file'             => '',
-    'export_status_finished'                     => '',
-    'export_data_please_wait'                    => '',
+    'export_status_converted_to_export_format'   => 'Converted your transactions!',
+    'export_status_creating_journal_file'        => 'Creating the export file...',
+    'export_status_created_journal_file'         => 'Created the export file!',
+    'export_status_collecting_attachments'       => 'Collecting all your attachments...',
+    'export_status_collected_attachments'        => 'Collected all your attachments!',
+    'export_status_collecting_old_uploads'       => 'Collecting all your previous uploads...',
+    'export_status_collected_old_uploads'        => 'Collected all your previous uploads!',
+    'export_status_creating_config_file'         => 'Creating a configuration file...',
+    'export_status_created_config_file'          => 'Created a configuration file!',
+    'export_status_creating_zip_file'            => 'Creating a zip file...',
+    'export_status_created_zip_file'             => 'Created a zip file!',
+    'export_status_finished'                     => 'Export has succesfully finished! Yay!',
+    'export_data_please_wait'                    => 'Please wait...',
 
     // rules
-    'rules'                                      => '',
-    'rule_name'                                  => '',
-    'rule_triggers'                              => '',
-    'rule_actions'                               => '',
-    'new_rule'                                   => '',
-    'new_rule_group'                             => '',
-    'rule_priority_up'                           => '',
-    'rule_priority_down'                         => '',
-    'make_new_rule_group'                        => '',
-    'store_new_rule_group'                       => '',
-    'created_new_rule_group'                     => '',
-    'updated_rule_group'                         => '',
-    'edit_rule_group'                            => '',
-    'delete_rule_group'                          => '',
-    'deleted_rule_group'                         => '',
-    'update_rule_group'                          => '',
-    'no_rules_in_group'                          => '',
-    'move_rule_group_up'                         => '',
-    'move_rule_group_down'                       => '',
-    'save_rules_by_moving'                       => '',
-    'make_new_rule'                              => '',
-    'rule_help_stop_processing'                  => '',
-    'rule_help_active'                           => '',
-    'stored_new_rule'                            => '',
-    'deleted_rule'                               => '',
-    'store_new_rule'                             => '',
-    'updated_rule'                               => '',
-    'default_rule_group_name'                    => '',
+    'rules'                                      => 'Rules',
+    'rule_name'                                  => 'Name of rule',
+    'rule_triggers'                              => 'Rule triggers when',
+    'rule_actions'                               => 'Rule will',
+    'new_rule'                                   => 'New rule',
+    'new_rule_group'                             => 'New rule group',
+    'rule_priority_up'                           => 'Give rule more priority',
+    'rule_priority_down'                         => 'Give rule less priority',
+    'make_new_rule_group'                        => 'Make new rule group',
+    'store_new_rule_group'                       => 'Store new rule group',
+    'created_new_rule_group'                     => 'New rule group ":title" stored!',
+    'updated_rule_group'                         => 'Successfully updated rule group ":title".',
+    'edit_rule_group'                            => 'Edit rule group ":title"',
+    'delete_rule_group'                          => 'Delete rule group ":title"',
+    'deleted_rule_group'                         => 'Deleted rule group ":title"',
+    'update_rule_group'                          => 'Update rule group',
+    'no_rules_in_group'                          => 'There are no rules in this group',
+    'move_rule_group_up'                         => 'Move rule group up',
+    'move_rule_group_down'                       => 'Move rule group down',
+    'save_rules_by_moving'                       => 'Save these rule(s) by moving them to another rule group:',
+    'make_new_rule'                              => 'Make new rule in rule group ":title"',
+    'rule_help_stop_processing'                  => 'When you check this box, later rules in this group will not be executed.',
+    'rule_help_active'                           => 'Inactive rules will never fire.',
+    'stored_new_rule'                            => 'Stored new rule with title ":title"',
+    'deleted_rule'                               => 'Deleted rule with title ":title"',
+    'store_new_rule'                             => 'Store new rule',
+    'updated_rule'                               => 'Updated rule with title ":title"',
+    'default_rule_group_name'                    => 'Default rules',
     'default_rule_group_description'             => '所有不屬於任何組別的規則',
-    'default_rule_name'                          => '',
+    'default_rule_name'                          => 'Your first default rule',
     'default_rule_description'                   => '這是一個例子。你可以把這個規則刪除。',
     'default_rule_trigger_description'           => '賣世界的小男孩',
-    'default_rule_trigger_from_account'          => '',
+    'default_rule_trigger_from_account'          => 'David Bowie',
     'default_rule_action_prepend'                => '買下了整個世界。錢給了',
-    'default_rule_action_set_category'           => '',
-    'trigger'                                    => '',
-    'trigger_value'                              => '',
-    'stop_processing_other_triggers'             => '',
-    'add_rule_trigger'                           => '',
-    'action'                                     => '',
-    'action_value'                               => '',
-    'stop_executing_other_actions'               => '',
-    'add_rule_action'                            => '',
-    'edit_rule'                                  => '',
-    'delete_rule'                                => '',
-    'update_rule'                                => '',
-    'test_rule_triggers'                         => '',
-    'warning_transaction_subset'                 => '',
-    'warning_no_matching_transactions'           => '',
-    'warning_no_valid_triggers'                  => '',
-    'apply_rule_selection'                       => '',
-    'apply_rule_selection_intro'                 => '',
-    'include_transactions_from_accounts'         => '',
-    'applied_rule_selection'                     => '',
-    'execute'                                    => '',
-    'apply_rule_group_selection'                 => '',
-    'apply_rule_group_selection_intro'           => '',
-    'applied_rule_group_selection'               => '',
+    'default_rule_action_set_category'           => 'Large expenses',
+    'trigger'                                    => 'Trigger',
+    'trigger_value'                              => 'Trigger on value',
+    'stop_processing_other_triggers'             => 'Stop processing other triggers',
+    'add_rule_trigger'                           => 'Add new trigger',
+    'action'                                     => 'Action',
+    'action_value'                               => 'Action value',
+    'stop_executing_other_actions'               => 'Stop executing other actions',
+    'add_rule_action'                            => 'Add new action',
+    'edit_rule'                                  => 'Edit rule ":title"',
+    'delete_rule'                                => 'Delete rule ":title"',
+    'update_rule'                                => 'Update rule',
+    'test_rule_triggers'                         => 'See matching transactions',
+    'warning_transaction_subset'                 => 'For performance reasons this list is limited to :max_num_transactions and may only show a subset of matching transactions',
+    'warning_no_matching_transactions'           => 'No matching transactions found. Please note that for performance reasons, only the last :num_transactions transactions have been checked.',
+    'warning_no_valid_triggers'                  => 'No valid triggers provided.',
+    'apply_rule_selection'                       => 'Apply rule ":title" to a selection of your transactions',
+    'apply_rule_selection_intro'                 => 'Rules like ":title" are normally only applied to new or updated transactions, but you can tell Firefly III to run it on a selection of your existing transactions. This can be useful when you have updated a rule and you need the changes to be applied to all of your other transactions.',
+    'include_transactions_from_accounts'         => 'Include transactions from these accounts',
+    'applied_rule_selection'                     => 'Rule ":title" has been applied to your selection.',
+    'execute'                                    => 'Execute',
+    'apply_rule_group_selection'                 => 'Apply rule group ":title" to a selection of your transactions',
+    'apply_rule_group_selection_intro'           => 'Rule groups like ":title" are normally only applied to new or updated transactions, but you can tell Firefly III to run all the rules in this group on a selection of your existing transactions. This can be useful when you have updated a group of rules and you need the changes to be applied to all of your other transactions.',
+    'applied_rule_group_selection'               => 'Rule group ":title" has been applied to your selection.',
 
     // actions and triggers
-    'rule_trigger_user_action'                   => '',
+    'rule_trigger_user_action'                   => 'User action is ":trigger_value"',
     'rule_trigger_from_account_starts'           => '以 ":trigger_value" 開頭的來源帳戶',
     'rule_trigger_from_account_ends'             => '以 ":trigger_value" 為結尾的來源帳戶',
     'rule_trigger_from_account_is'               => '來源帳戶是 ":trigger_value"',
     'rule_trigger_from_account_contains'         => '含 ":trigger_value" 的來源帳戶',
-    'rule_trigger_to_account_starts'             => '',
-    'rule_trigger_to_account_ends'               => '',
-    'rule_trigger_to_account_is'                 => '',
-    'rule_trigger_to_account_contains'           => '',
-    'rule_trigger_transaction_type'              => '',
-    'rule_trigger_category_is'                   => '',
-    'rule_trigger_amount_less'                   => '',
-    'rule_trigger_amount_exactly'                => '',
-    'rule_trigger_amount_more'                   => '',
+    'rule_trigger_to_account_starts'             => 'Destination account starts with ":trigger_value"',
+    'rule_trigger_to_account_ends'               => 'Destination account ends with ":trigger_value"',
+    'rule_trigger_to_account_is'                 => 'Destination account is ":trigger_value"',
+    'rule_trigger_to_account_contains'           => 'Destination account contains ":trigger_value"',
+    'rule_trigger_transaction_type'              => 'Transaction is of type ":trigger_value"',
+    'rule_trigger_category_is'                   => 'Category is ":trigger_value"',
+    'rule_trigger_amount_less'                   => 'Amount is less than :trigger_value',
+    'rule_trigger_amount_exactly'                => 'Amount is :trigger_value',
+    'rule_trigger_amount_more'                   => 'Amount is more than :trigger_value',
     'rule_trigger_description_starts'            => '以 ":trigger_value" 開頭的描述',
     'rule_trigger_description_ends'              => '以 ":trigger_value" 為結尾的描述',
     'rule_trigger_description_contains'          => '含 ":trigger_value" 的描述',
@@ -260,39 +260,39 @@ return [
     'rule_trigger_from_account_ends_choice'      => '來源帳戶以…結尾',
     'rule_trigger_from_account_is_choice'        => '來源帳戶是…',
     'rule_trigger_from_account_contains_choice'  => '來源帳戶含有…',
-    'rule_trigger_to_account_starts_choice'      => '',
-    'rule_trigger_to_account_ends_choice'        => '',
-    'rule_trigger_to_account_is_choice'          => '',
-    'rule_trigger_to_account_contains_choice'    => '',
-    'rule_trigger_transaction_type_choice'       => '',
-    'rule_trigger_amount_less_choice'            => '',
-    'rule_trigger_amount_exactly_choice'         => '',
-    'rule_trigger_amount_more_choice'            => '',
+    'rule_trigger_to_account_starts_choice'      => 'Destination account starts with..',
+    'rule_trigger_to_account_ends_choice'        => 'Destination account ends with..',
+    'rule_trigger_to_account_is_choice'          => 'Destination account is..',
+    'rule_trigger_to_account_contains_choice'    => 'Destination account contains..',
+    'rule_trigger_transaction_type_choice'       => 'Transaction is of type..',
+    'rule_trigger_amount_less_choice'            => 'Amount is less than..',
+    'rule_trigger_amount_exactly_choice'         => 'Amount is..',
+    'rule_trigger_amount_more_choice'            => 'Amount is more than..',
     'rule_trigger_description_starts_choice'     => '描述以…開頭',
     'rule_trigger_description_ends_choice'       => '描述以…結尾',
     'rule_trigger_description_contains_choice'   => '描述包含…',
     'rule_trigger_description_is_choice'         => '描述是…',
-    'rule_trigger_category_is_choice'            => '',
-    'rule_trigger_budget_is_choice'              => '',
-    'rule_trigger_tag_is_choice'                 => '',
-    'rule_trigger_has_attachments_choice'        => '',
-    'rule_trigger_has_attachments'               => '',
-    'rule_trigger_store_journal'                 => '',
-    'rule_trigger_update_journal'                => '',
-    'rule_action_set_category'                   => '',
-    'rule_action_clear_category'                 => '',
-    'rule_action_set_budget'                     => '',
-    'rule_action_clear_budget'                   => '',
+    'rule_trigger_category_is_choice'            => 'Category is..',
+    'rule_trigger_budget_is_choice'              => 'Budget is..',
+    'rule_trigger_tag_is_choice'                 => '(A) tag is..',
+    'rule_trigger_has_attachments_choice'        => 'Has at least this many attachments',
+    'rule_trigger_has_attachments'               => 'Has at least :trigger_value attachment(s)',
+    'rule_trigger_store_journal'                 => 'When a transaction is created',
+    'rule_trigger_update_journal'                => 'When a transaction is updated',
+    'rule_action_set_category'                   => 'Set category to ":action_value"',
+    'rule_action_clear_category'                 => 'Clear category',
+    'rule_action_set_budget'                     => 'Set budget to ":action_value"',
+    'rule_action_clear_budget'                   => 'Clear budget',
     'rule_action_add_tag'                        => '新增標籤 ":action_value"',
     'rule_action_remove_tag'                     => '刪除標籤 ":action_value"',
     'rule_action_remove_all_tags'                => '移除所有標籤',
     'rule_action_set_description'                => '設置描述為 ":action_value"',
     'rule_action_append_description'             => '描述後加上 ":action_value"',
     'rule_action_prepend_description'            => '描述前加上 ":action_value"',
-    'rule_action_set_category_choice'            => '',
-    'rule_action_clear_category_choice'          => '',
-    'rule_action_set_budget_choice'              => '',
-    'rule_action_clear_budget_choice'            => '',
+    'rule_action_set_category_choice'            => 'Set category to..',
+    'rule_action_clear_category_choice'          => 'Clear any category',
+    'rule_action_set_budget_choice'              => 'Set budget to..',
+    'rule_action_clear_budget_choice'            => 'Clear any budget',
     'rule_action_add_tag_choice'                 => '新增標籤…',
     'rule_action_remove_tag_choice'              => '移除標籤…',
     'rule_action_remove_all_tags_choice'         => '移除所有標籤',
@@ -301,33 +301,33 @@ return [
     'rule_action_prepend_description_choice'     => '描述前加上…',
     'rule_action_set_source_account_choice'      => '把來源帳戶設置為...',
     'rule_action_set_source_account'             => '將來源帳戶設置為 :action_value',
-    'rule_action_set_destination_account_choice' => '',
-    'rule_action_set_destination_account'        => '',
+    'rule_action_set_destination_account_choice' => 'Set destination account to...',
+    'rule_action_set_destination_account'        => 'Set destination account to :action_value',
 
     // tags
     'store_new_tag'                              => '儲存新的標籤',
     'update_tag'                                 => '更新標籤',
-    'no_location_set'                            => '',
-    'meta_data'                                  => '',
-    'location'                                   => '',
+    'no_location_set'                            => 'No location set.',
+    'meta_data'                                  => 'Meta data',
+    'location'                                   => 'Location',
 
     // preferences
-    'pref_home_screen_accounts'                  => '',
-    'pref_home_screen_accounts_help'             => '',
-    'pref_view_range'                            => '',
-    'pref_view_range_help'                       => '',
-    'pref_1D'                                    => '',
-    'pref_1W'                                    => '',
-    'pref_1M'                                    => '',
-    'pref_3M'                                    => '',
-    'pref_6M'                                    => '',
-    'pref_1Y'                                    => '',
-    'pref_languages'                             => '',
-    'pref_languages_help'                        => '',
-    'pref_custom_fiscal_year'                    => '',
-    'pref_custom_fiscal_year_label'              => '',
-    'pref_custom_fiscal_year_help'               => '',
-    'pref_fiscal_year_start_label'               => '',
+    'pref_home_screen_accounts'                  => 'Home screen accounts',
+    'pref_home_screen_accounts_help'             => 'Which accounts should be displayed on the home page?',
+    'pref_view_range'                            => 'View range',
+    'pref_view_range_help'                       => 'Some charts are automatically grouped in periods. What period would you prefer?',
+    'pref_1D'                                    => 'One day',
+    'pref_1W'                                    => 'One week',
+    'pref_1M'                                    => 'One month',
+    'pref_3M'                                    => 'Three months (quarter)',
+    'pref_6M'                                    => 'Six months',
+    'pref_1Y'                                    => 'One year',
+    'pref_languages'                             => 'Languages',
+    'pref_languages_help'                        => 'Firefly III supports several languages. Which one do you prefer?',
+    'pref_custom_fiscal_year'                    => 'Fiscal year settings',
+    'pref_custom_fiscal_year_label'              => 'Enabled',
+    'pref_custom_fiscal_year_help'               => 'In countries that use a financial year other than January 1 to December 31, you can switch this on and specify start / end days of the fiscal year',
+    'pref_fiscal_year_start_label'               => 'Fiscal year start date',
     'pref_two_factor_auth'                       => '雙重身份驗證',
     'pref_two_factor_auth_help'                  => '當您啟用二步驗證 （也稱為雙重身份驗證） 時，你的帳戶安全性將會更上一層樓。你需要以您知道的東西（密碼）和你擁有的東西（驗證碼）來進行登錄。驗證碼是由您的手機上的應用程式生成的，如 Authy 或 Google Authenticator 。',
     'pref_enable_two_factor_auth'                => '啟用雙重身份驗證',
@@ -338,256 +338,256 @@ return [
     'pref_two_factor_auth_reset_code'            => '重置驗證代碼',
     'pref_two_factor_auth_remove_code'           => '刪除驗證代碼',
     'pref_two_factor_auth_remove_will_disable'   => '（這也會禁用雙重身份驗證）',
-    'pref_save_settings'                         => '',
-    'saved_preferences'                          => '',
-    'preferences_general'                        => '',
-    'preferences_frontpage'                      => '',
-    'preferences_security'                       => '',
-    'preferences_layout'                         => '',
-    'pref_home_show_deposits'                    => '',
-    'pref_home_show_deposits_info'               => '',
-    'pref_home_do_show_deposits'                 => '',
-    'successful_count'                           => '',
-    'transaction_page_size_title'                => '',
-    'transaction_page_size_help'                 => '',
-    'transaction_page_size_label'                => '',
-    'between_dates'                              => '',
-    'pref_optional_fields_transaction'           => '',
-    'pref_optional_fields_transaction_help'      => '',
-    'optional_tj_date_fields'                    => '',
-    'optional_tj_business_fields'                => '',
-    'optional_tj_attachment_fields'              => '',
-    'pref_optional_tj_interest_date'             => '',
-    'pref_optional_tj_book_date'                 => '',
-    'pref_optional_tj_process_date'              => '',
+    'pref_save_settings'                         => 'Save settings',
+    'saved_preferences'                          => 'Preferences saved!',
+    'preferences_general'                        => 'General',
+    'preferences_frontpage'                      => 'Home screen',
+    'preferences_security'                       => 'Security',
+    'preferences_layout'                         => 'Layout',
+    'pref_home_show_deposits'                    => 'Show deposits on the home screen',
+    'pref_home_show_deposits_info'               => 'The home screen already shows your expense accounts. Should it also show your revenue accounts?',
+    'pref_home_do_show_deposits'                 => 'Yes, show them',
+    'successful_count'                           => 'of which :count successful',
+    'transaction_page_size_title'                => 'Page size',
+    'transaction_page_size_help'                 => 'Any list of transactions shows at most this many transactions',
+    'transaction_page_size_label'                => 'Page size',
+    'between_dates'                              => '(:start and :end)',
+    'pref_optional_fields_transaction'           => 'Optional fields for transactions',
+    'pref_optional_fields_transaction_help'      => 'By default not all fields are enabled when creating a new transaction (because of the clutter). Below, you can enable these fields if you think they could be useful for you. Of course, any field that is disabled, but already filled in, will be visible regardless of the setting.',
+    'optional_tj_date_fields'                    => 'Date fields',
+    'optional_tj_business_fields'                => 'Business fields',
+    'optional_tj_attachment_fields'              => 'Attachment fields',
+    'pref_optional_tj_interest_date'             => 'Interest date',
+    'pref_optional_tj_book_date'                 => 'Book date',
+    'pref_optional_tj_process_date'              => 'Processing date',
     'pref_optional_tj_due_date'                  => '到期日',
-    'pref_optional_tj_payment_date'              => '',
-    'pref_optional_tj_invoice_date'              => '',
-    'pref_optional_tj_internal_reference'        => '',
-    'pref_optional_tj_notes'                     => '',
-    'pref_optional_tj_attachments'               => '',
-    'optional_field_meta_dates'                  => '',
-    'optional_field_meta_business'               => '',
-    'optional_field_attachments'                 => '',
-    'optional_field_meta_data'                   => '',
+    'pref_optional_tj_payment_date'              => 'Payment date',
+    'pref_optional_tj_invoice_date'              => 'Invoice date',
+    'pref_optional_tj_internal_reference'        => 'Internal reference',
+    'pref_optional_tj_notes'                     => 'Notes',
+    'pref_optional_tj_attachments'               => 'Attachments',
+    'optional_field_meta_dates'                  => 'Dates',
+    'optional_field_meta_business'               => 'Business',
+    'optional_field_attachments'                 => 'Attachments',
+    'optional_field_meta_data'                   => 'Optional meta data',
 
 
     // profile:
-    'change_your_password'                       => '',
-    'delete_account'                             => '',
-    'current_password'                           => '',
-    'new_password'                               => '',
-    'new_password_again'                         => '',
-    'delete_your_account'                        => '',
-    'delete_your_account_help'                   => '',
-    'delete_your_account_password'               => '',
-    'password'                                   => '',
-    'are_you_sure'                               => '',
-    'delete_account_button'                      => '',
-    'invalid_current_password'                   => '',
-    'password_changed'                           => '',
-    'should_change'                              => '',
-    'invalid_password'                           => '',
-    'what_is_pw_security'                        => '',
-    'secure_pw_title'                            => '',
-    'secure_pw_history'                          => '',
-    'secure_pw_check_box'                        => '',
-    'secure_pw_sha1'                             => '',
-    'secure_pw_hash_speed'                       => '',
-    'secure_pw_hash_security'                    => '',
-    'secure_pw_should'                           => '',
-    'secure_pw_long_password'                    => '',
-    'secure_pw_short'                            => '',
+    'change_your_password'                       => 'Change your password',
+    'delete_account'                             => 'Delete account',
+    'current_password'                           => 'Current password',
+    'new_password'                               => 'New password',
+    'new_password_again'                         => 'New password (again)',
+    'delete_your_account'                        => 'Delete your account',
+    'delete_your_account_help'                   => 'Deleting your account will also delete any accounts, transactions, <em>anything</em> you might have saved into Firefly III. It\'ll be GONE.',
+    'delete_your_account_password'               => 'Enter your password to continue.',
+    'password'                                   => 'Password',
+    'are_you_sure'                               => 'Are you sure? You cannot undo this.',
+    'delete_account_button'                      => 'DELETE your account',
+    'invalid_current_password'                   => 'Invalid current password!',
+    'password_changed'                           => 'Password changed!',
+    'should_change'                              => 'The idea is to change your password.',
+    'invalid_password'                           => 'Invalid password!',
+    'what_is_pw_security'                        => 'What is "verify password security"?',
+    'secure_pw_title'                            => 'How to choose a secure password',
+    'secure_pw_history'                          => 'In August 2017 well known security researcher Troy Hunt released a list of 306 million stolen passwords. These passwords were stolen during breakins at companies like LinkedIn, Adobe and NeoPets (and many more).',
+    'secure_pw_check_box'                        => 'By checking the box, Firefly III will send the SHA1 hash of your password to <a href="https://www.troyhunt.com/introducing-306-million-freely-downloadable-pwned-passwords/">the website of Troy Hunt</a> to see if it is on the list. This will stop you from using unsafe passwords as is recommended in the latest <a href="https://pages.nist.gov/800-63-3/sp800-63b.html">NIST Special Publication</a> on this subject.',
+    'secure_pw_sha1'                             => 'But I thought SHA1 was broken?',
+    'secure_pw_hash_speed'                       => 'Yes, but not in this context. As you can read on <a href="https://shattered.io/">the website detailing how they broke SHA1</a>, it is now slightly easier to find a "collision": another string that results in the same SHA1-hash. It now only takes 10,000 years using a single-GPU machine.',
+    'secure_pw_hash_security'                    => 'This collision would not be equal to your password, nor would it be useful on (a site like) Firefly III. This application does not use SHA1 for password verification. So it is safe to check this box. Your password is hashed and sent over HTTPS.',
+    'secure_pw_should'                           => 'Should I check the box?',
+    'secure_pw_long_password'                    => 'If you just generated a long, single-use password for Firefly III using some kind of password generator: <strong>no</strong>.',
+    'secure_pw_short'                            => 'If you just entered the password you always use: <em>Please yes</em>.',
 
 
     // attachments
-    'nr_of_attachments'                          => '',
-    'attachments'                                => '',
-    'edit_attachment'                            => '',
-    'update_attachment'                          => '',
-    'delete_attachment'                          => '',
-    'attachment_deleted'                         => '',
-    'attachment_updated'                         => '',
-    'upload_max_file_size'                       => '',
+    'nr_of_attachments'                          => 'One attachment|:count attachments',
+    'attachments'                                => 'Attachments',
+    'edit_attachment'                            => 'Edit attachment ":name"',
+    'update_attachment'                          => 'Update attachment',
+    'delete_attachment'                          => 'Delete attachment ":name"',
+    'attachment_deleted'                         => 'Deleted attachment ":name"',
+    'attachment_updated'                         => 'Updated attachment ":name"',
+    'upload_max_file_size'                       => 'Maximum file size: :size',
 
     // transaction index
-    'title_expenses'                             => '',
-    'title_withdrawal'                           => '',
-    'title_revenue'                              => '',
-    'title_deposit'                              => '',
-    'title_transfer'                             => '',
-    'title_transfers'                            => '',
+    'title_expenses'                             => 'Expenses',
+    'title_withdrawal'                           => 'Expenses',
+    'title_revenue'                              => 'Revenue / income',
+    'title_deposit'                              => 'Revenue / income',
+    'title_transfer'                             => 'Transfers',
+    'title_transfers'                            => 'Transfers',
 
     // convert stuff:
-    'convert_is_already_type_Withdrawal'         => '',
-    'convert_is_already_type_Deposit'            => '',
-    'convert_is_already_type_Transfer'           => '',
-    'convert_to_Withdrawal'                      => '',
-    'convert_to_Deposit'                         => '',
-    'convert_to_Transfer'                        => '',
-    'convert_options_WithdrawalDeposit'          => '',
-    'convert_options_WithdrawalTransfer'         => '',
-    'convert_options_DepositTransfer'            => '',
-    'convert_options_DepositWithdrawal'          => '',
-    'convert_options_TransferWithdrawal'         => '',
-    'convert_options_TransferDeposit'            => '',
-    'transaction_journal_convert_options'        => '',
-    'convert_Withdrawal_to_deposit'              => '',
-    'convert_Withdrawal_to_transfer'             => '',
-    'convert_Deposit_to_withdrawal'              => '',
-    'convert_Deposit_to_transfer'                => '',
-    'convert_Transfer_to_deposit'                => '',
-    'convert_Transfer_to_withdrawal'             => '',
-    'convert_please_set_revenue_source'          => '',
-    'convert_please_set_asset_destination'       => '',
-    'convert_please_set_expense_destination'     => '',
-    'convert_please_set_asset_source'            => '',
-    'convert_explanation_withdrawal_deposit'     => '',
+    'convert_is_already_type_Withdrawal'         => 'This transaction is already a withdrawal',
+    'convert_is_already_type_Deposit'            => 'This transaction is already a deposit',
+    'convert_is_already_type_Transfer'           => 'This transaction is already a transfer',
+    'convert_to_Withdrawal'                      => 'Convert ":description" to a withdrawal',
+    'convert_to_Deposit'                         => 'Convert ":description" to a deposit',
+    'convert_to_Transfer'                        => 'Convert ":description" to a transfer',
+    'convert_options_WithdrawalDeposit'          => 'Convert a withdrawal into a deposit',
+    'convert_options_WithdrawalTransfer'         => 'Convert a withdrawal into a transfer',
+    'convert_options_DepositTransfer'            => 'Convert a deposit into a transfer',
+    'convert_options_DepositWithdrawal'          => 'Convert a deposit into a withdrawal',
+    'convert_options_TransferWithdrawal'         => 'Convert a transfer into a withdrawal',
+    'convert_options_TransferDeposit'            => 'Convert a transfer into a deposit',
+    'transaction_journal_convert_options'        => 'Convert this transaction',
+    'convert_Withdrawal_to_deposit'              => 'Convert this withdrawal to a deposit',
+    'convert_Withdrawal_to_transfer'             => 'Convert this withdrawal to a transfer',
+    'convert_Deposit_to_withdrawal'              => 'Convert this deposit to a withdrawal',
+    'convert_Deposit_to_transfer'                => 'Convert this deposit to a transfer',
+    'convert_Transfer_to_deposit'                => 'Convert this transfer to a deposit',
+    'convert_Transfer_to_withdrawal'             => 'Convert this transfer to a withdrawal',
+    'convert_please_set_revenue_source'          => 'Please pick the revenue account where the money will come from.',
+    'convert_please_set_asset_destination'       => 'Please pick the asset account where the money will go to.',
+    'convert_please_set_expense_destination'     => 'Please pick the expense account where the money will go to.',
+    'convert_please_set_asset_source'            => 'Please pick the asset account where the money will come from.',
+    'convert_explanation_withdrawal_deposit'     => 'If you convert this withdrawal into a deposit, :amount will be deposited into <a href=":sourceRoute">:sourceName</a> instead of taken from it.',
     'convert_explanation_withdrawal_transfer'    => '如果你把這個提款（支出）轉換為轉帳， :amount 會從 <a href=":sourceRoute">:sourceName</a> 轉帳到新的資產帳戶，而不會付款到 <a href=":destinationRoute">:destinationName</a> 。',
-    'convert_explanation_deposit_withdrawal'     => '',
-    'convert_explanation_deposit_transfer'       => '',
-    'convert_explanation_transfer_withdrawal'    => '',
-    'convert_explanation_transfer_deposit'       => '',
-    'converted_to_Withdrawal'                    => '',
-    'converted_to_Deposit'                       => '',
-    'converted_to_Transfer'                      => '',
+    'convert_explanation_deposit_withdrawal'     => 'If you convert this deposit into a withdrawal, :amount will be removed from <a href=":destinationRoute">:destinationName</a> instead of added to it.',
+    'convert_explanation_deposit_transfer'       => 'If you convert this deposit into a transfer, :amount will be transferred from an asset account of your choice into <a href=":destinationRoute">:destinationName</a>.',
+    'convert_explanation_transfer_withdrawal'    => 'If you convert this transfer into a withdrawal, :amount will go from <a href=":sourceRoute">:sourceName</a> to a new destination as an expense, instead of to <a href=":destinationRoute">:destinationName</a> as a transfer.',
+    'convert_explanation_transfer_deposit'       => 'If you convert this transfer into a deposit, :amount will be deposited into account <a href=":destinationRoute">:destinationName</a> instead of being transferred there.',
+    'converted_to_Withdrawal'                    => 'The transaction has been converted to a withdrawal',
+    'converted_to_Deposit'                       => 'The transaction has been converted to a deposit',
+    'converted_to_Transfer'                      => 'The transaction has been converted to a transfer',
 
 
     // create new stuff:
-    'create_new_withdrawal'                      => '',
-    'create_new_deposit'                         => '',
-    'create_new_transfer'                        => '',
+    'create_new_withdrawal'                      => 'Create new withdrawal',
+    'create_new_deposit'                         => 'Create new deposit',
+    'create_new_transfer'                        => 'Create new transfer',
     'create_new_asset'                           => '建立新的資產帳戶',
-    'create_new_expense'                         => '',
-    'create_new_revenue'                         => '',
-    'create_new_piggy_bank'                      => '',
+    'create_new_expense'                         => 'Create new expense account',
+    'create_new_revenue'                         => 'Create new revenue account',
+    'create_new_piggy_bank'                      => 'Create new piggy bank',
     'create_new_bill'                            => '建立新賬單',
 
     // currencies:
-    'create_currency'                            => '',
-    'store_currency'                             => '',
-    'update_currency'                            => '',
-    'new_default_currency'                       => '',
-    'cannot_delete_currency'                     => '',
-    'deleted_currency'                           => '',
-    'created_currency'                           => '',
-    'updated_currency'                           => '',
-    'ask_site_owner'                             => '',
-    'currencies_intro'                           => '',
-    'make_default_currency'                      => '',
-    'default_currency'                           => '',
+    'create_currency'                            => 'Create a new currency',
+    'store_currency'                             => 'Store new currency',
+    'update_currency'                            => 'Update currency',
+    'new_default_currency'                       => ':name is now the default currency.',
+    'cannot_delete_currency'                     => 'Cannot delete :name because it is still in use.',
+    'deleted_currency'                           => 'Currency :name deleted',
+    'created_currency'                           => 'Currency :name created',
+    'updated_currency'                           => 'Currency :name updated',
+    'ask_site_owner'                             => 'Please ask :owner to add, remove or edit currencies.',
+    'currencies_intro'                           => 'Firefly III supports various currencies which you can set and enable here.',
+    'make_default_currency'                      => 'make default',
+    'default_currency'                           => 'default',
 
     // forms:
-    'mandatoryFields'                            => '',
-    'optionalFields'                             => '',
-    'options'                                    => '',
+    'mandatoryFields'                            => 'Mandatory fields',
+    'optionalFields'                             => 'Optional fields',
+    'options'                                    => 'Options',
 
     // budgets:
-    'create_new_budget'                          => '',
-    'store_new_budget'                           => '',
-    'stored_new_budget'                          => '',
-    'available_between'                          => '',
-    'transactionsWithoutBudget'                  => '',
-    'transactions_no_budget'                     => '',
-    'spent_between'                              => '',
-    'createBudget'                               => '',
-    'inactiveBudgets'                            => '',
-    'without_budget_between'                     => '',
-    'delete_budget'                              => '',
-    'deleted_budget'                             => '',
-    'edit_budget'                                => '',
-    'updated_budget'                             => '',
-    'update_amount'                              => '',
-    'update_budget'                              => '',
-    'update_budget_amount_range'                 => '',
-    'budget_period_navigator'                    => '',
+    'create_new_budget'                          => 'Create a new budget',
+    'store_new_budget'                           => 'Store new budget',
+    'stored_new_budget'                          => 'Stored new budget ":name"',
+    'available_between'                          => 'Available between :start and :end',
+    'transactionsWithoutBudget'                  => 'Expenses without budget',
+    'transactions_no_budget'                     => 'Expenses without budget between :start and :end',
+    'spent_between'                              => 'Spent between :start and :end',
+    'createBudget'                               => 'New budget',
+    'inactiveBudgets'                            => 'Inactive budgets',
+    'without_budget_between'                     => 'Transactions without a budget between :start and :end',
+    'delete_budget'                              => 'Delete budget ":name"',
+    'deleted_budget'                             => 'Deleted budget ":name"',
+    'edit_budget'                                => 'Edit budget ":name"',
+    'updated_budget'                             => 'Updated budget ":name"',
+    'update_amount'                              => 'Update amount',
+    'update_budget'                              => 'Update budget',
+    'update_budget_amount_range'                 => 'Update (expected) available amount between :start and :end',
+    'budget_period_navigator'                    => 'Period navigator',
 
     // bills:
-    'matching_on'                                => '',
-    'between_amounts'                            => '',
-    'repeats'                                    => '',
-    'connected_journals'                         => '',
-    'auto_match_on'                              => '',
-    'auto_match_off'                             => '',
-    'next_expected_match'                        => '',
+    'matching_on'                                => 'Matching on',
+    'between_amounts'                            => 'between :low and :high.',
+    'repeats'                                    => 'Repeats',
+    'connected_journals'                         => 'Connected transactions',
+    'auto_match_on'                              => 'Automatically matched by Firefly',
+    'auto_match_off'                             => 'Not automatically matched by Firefly',
+    'next_expected_match'                        => 'Next expected match',
     'delete_bill'                                => '刪除賬單 ":name"',
     'deleted_bill'                               => '成功刪除賬單 ":name"',
     'edit_bill'                                  => '編輯賬單 ":name"',
-    'more'                                       => '',
-    'rescan_old'                                 => '',
+    'more'                                       => 'More',
+    'rescan_old'                                 => 'Rescan old transactions',
     'update_bill'                                => '更新賬單',
     'updated_bill'                               => '更新了帳單 ":name"',
     'store_new_bill'                             => '儲存新的賬單',
     'stored_new_bill'                            => '儲存了新的賬單 ":name"',
-    'cannot_scan_inactive_bill'                  => '',
-    'rescanned_bill'                             => '',
+    'cannot_scan_inactive_bill'                  => 'Inactive bills cannot be scanned.',
+    'rescanned_bill'                             => 'Rescanned everything.',
     'average_bill_amount_year'                   => '平均賬單金額 （:year）',
     'average_bill_amount_overall'                => '平均賬單金額 （總計）',
-    'not_or_not_yet'                             => '',
-    'not_expected_period'                        => '',
-    'bill_is_active'                             => '',
-    'bill_will_automatch'                        => '',
+    'not_or_not_yet'                             => 'Not (yet)',
+    'not_expected_period'                        => 'Not expected this period',
+    'bill_is_active'                             => 'Bill is active',
+    'bill_will_automatch'                        => 'Bill will automatically linked to matching transactions',
     // accounts:
     'details_for_asset'                          => '資產帳戶的詳細資訊 ":name"',
-    'details_for_expense'                        => '',
-    'details_for_revenue'                        => '',
-    'details_for_cash'                           => '',
+    'details_for_expense'                        => 'Details for expense account ":name"',
+    'details_for_revenue'                        => 'Details for revenue account ":name"',
+    'details_for_cash'                           => 'Details for cash account ":name"',
     'store_new_asset_account'                    => '儲存新的資產帳戶',
-    'store_new_expense_account'                  => '',
-    'store_new_revenue_account'                  => '',
+    'store_new_expense_account'                  => 'Store new expense account',
+    'store_new_revenue_account'                  => 'Store new revenue account',
     'edit_asset_account'                         => '編輯資產帳戶 ":name"',
-    'edit_expense_account'                       => '',
-    'edit_revenue_account'                       => '',
+    'edit_expense_account'                       => 'Edit expense account ":name"',
+    'edit_revenue_account'                       => 'Edit revenue account ":name"',
     'delete_asset_account'                       => '刪除資產帳戶 ":name"',
-    'delete_expense_account'                     => '',
-    'delete_revenue_account'                     => '',
+    'delete_expense_account'                     => 'Delete expense account ":name"',
+    'delete_revenue_account'                     => 'Delete revenue account ":name"',
     'asset_deleted'                              => '成功刪除資產帳戶 ":name"',
-    'expense_deleted'                            => '',
-    'revenue_deleted'                            => '',
+    'expense_deleted'                            => 'Successfully deleted expense account ":name"',
+    'revenue_deleted'                            => 'Successfully deleted revenue account ":name"',
     'update_asset_account'                       => '更新資產帳戶資訊',
-    'update_expense_account'                     => '',
-    'update_revenue_account'                     => '',
+    'update_expense_account'                     => 'Update expense account',
+    'update_revenue_account'                     => 'Update revenue account',
     'make_new_asset_account'                     => '建立新的資產帳戶',
-    'make_new_expense_account'                   => '',
-    'make_new_revenue_account'                   => '',
+    'make_new_expense_account'                   => 'Create a new expense account',
+    'make_new_revenue_account'                   => 'Create a new revenue account',
     'asset_accounts'                             => '資產帳戶',
-    'expense_accounts'                           => '',
-    'revenue_accounts'                           => '',
-    'cash_accounts'                              => '',
-    'Cash account'                               => '',
-    'account_type'                               => '',
-    'save_transactions_by_moving'                => '',
-    'stored_new_account'                         => '',
-    'updated_account'                            => '',
-    'credit_card_options'                        => '',
-    'no_transactions_account'                    => '',
-    'no_data_for_chart'                          => '',
-    'select_more_than_one_account'               => '',
-    'select_more_than_one_category'              => '',
-    'select_more_than_one_budget'                => '',
-    'select_more_than_one_tag'                   => '',
-    'account_default_currency'                   => '',
+    'expense_accounts'                           => 'Expense accounts',
+    'revenue_accounts'                           => 'Revenue accounts',
+    'cash_accounts'                              => 'Cash accounts',
+    'Cash account'                               => 'Cash account',
+    'account_type'                               => 'Account type',
+    'save_transactions_by_moving'                => 'Save these transaction(s) by moving them to another account:',
+    'stored_new_account'                         => 'New account ":name" stored!',
+    'updated_account'                            => 'Updated account ":name"',
+    'credit_card_options'                        => 'Credit card options',
+    'no_transactions_account'                    => 'There are no transactions (in this period) for asset account ":name".',
+    'no_data_for_chart'                          => 'There is not enough information (yet) to generate this chart.',
+    'select_more_than_one_account'               => 'Please select more than one account',
+    'select_more_than_one_category'              => 'Please select more than one category',
+    'select_more_than_one_budget'                => 'Please select more than one budget',
+    'select_more_than_one_tag'                   => 'Please select more than one tag',
+    'account_default_currency'                   => 'If you select another currency, new transactions from this account will have this currency pre-selected.',
 
     // categories:
-    'new_category'                               => '',
-    'create_new_category'                        => '',
-    'without_category'                           => '',
-    'update_category'                            => '',
-    'updated_category'                           => '',
-    'categories'                                 => '',
-    'edit_category'                              => '',
-    'no_category'                                => '',
-    'category'                                   => '',
-    'delete_category'                            => '',
-    'deleted_category'                           => '',
-    'store_category'                             => '',
-    'stored_category'                            => '',
-    'without_category_between'                   => '',
+    'new_category'                               => 'New category',
+    'create_new_category'                        => 'Create a new category',
+    'without_category'                           => 'Without a category',
+    'update_category'                            => 'Update category',
+    'updated_category'                           => 'Updated category ":name"',
+    'categories'                                 => 'Categories',
+    'edit_category'                              => 'Edit category ":name"',
+    'no_category'                                => '(no category)',
+    'category'                                   => 'Category',
+    'delete_category'                            => 'Delete category ":name"',
+    'deleted_category'                           => 'Deleted category ":name"',
+    'store_category'                             => 'Store new category',
+    'stored_category'                            => 'Stored new category ":name"',
+    'without_category_between'                   => 'Without category between :start and :end',
 
     // transactions:
-    'update_withdrawal'                          => '',
-    'update_deposit'                             => '',
-    'update_transfer'                            => '',
+    'update_withdrawal'                          => 'Update withdrawal',
+    'update_deposit'                             => 'Update deposit',
+    'update_transfer'                            => 'Update transfer',
     'updated_withdrawal'                         => '成功更新提款 ":description"',
     'updated_deposit'                            => '成功更新存款 ":description"',
     'updated_transfer'                           => '成功更新轉帳 ":description"',
@@ -598,231 +598,231 @@ return [
     'deleted_deposit'                            => '成功刪除存款 ":description"',
     'deleted_transfer'                           => '成功刪除轉帳 ":description"',
     'stored_journal'                             => '成功建立交易 ":description"',
-    'select_transactions'                        => '',
-    'stop_selection'                             => '',
-    'edit_selected'                              => '',
-    'delete_selected'                            => '',
-    'mass_delete_journals'                       => '',
-    'mass_edit_journals'                         => '',
-    'cannot_edit_other_fields'                   => '',
-    'perm-delete-many'                           => '',
-    'mass_deleted_transactions_success'          => '',
-    'mass_edited_transactions_success'           => '',
+    'select_transactions'                        => 'Select transactions',
+    'stop_selection'                             => 'Stop selecting transactions',
+    'edit_selected'                              => 'Edit selected',
+    'delete_selected'                            => 'Delete selected',
+    'mass_delete_journals'                       => 'Delete a number of transactions',
+    'mass_edit_journals'                         => 'Edit a number of transactions',
+    'cannot_edit_other_fields'                   => 'You cannot mass-edit other fields than the ones here, because there is no room to show them. Please follow the link and edit them by one-by-one, if you need to edit these fields.',
+    'perm-delete-many'                           => 'Deleting many items in one go can be very disruptive. Please be cautious.',
+    'mass_deleted_transactions_success'          => 'Deleted :amount transaction(s).',
+    'mass_edited_transactions_success'           => 'Updated :amount transaction(s)',
 
 
     // new user:
-    'welcome'                                    => '',
-    'submit'                                     => '',
-    'getting_started'                            => '',
-    'to_get_started'                             => '',
-    'savings_balance_text'                       => '',
-    'finish_up_new_user'                         => '',
-    'stored_new_accounts_new_user'               => '',
+    'welcome'                                    => 'Welcome to Firefly!',
+    'submit'                                     => 'Submit',
+    'getting_started'                            => 'Getting started',
+    'to_get_started'                             => 'It is good to see you have successfully installed Firefly III. To get started with this tool please enter your bank\'s name and the balance of your main checking account. Do not worry yet if you have multiple accounts. You can add those later. It\'s just that Firefly III needs something to start with.',
+    'savings_balance_text'                       => 'Firefly III will automatically create a savings account for you. By default, there will be no money in your savings account, but if you tell Firefly III the balance it will be stored as such.',
+    'finish_up_new_user'                         => 'That\'s it! You can continue by pressing <strong>Submit</strong>. You will be taken to the index of Firefly III.',
+    'stored_new_accounts_new_user'               => 'Yay! Your new accounts have been stored.',
 
     // home page:
-    'yourAccounts'                               => '',
-    'budgetsAndSpending'                         => '',
-    'savings'                                    => '',
-    'newWithdrawal'                              => '',
-    'newDeposit'                                 => '',
-    'newTransfer'                                => '',
-    'moneyIn'                                    => '',
-    'moneyOut'                                   => '',
+    'yourAccounts'                               => 'Your accounts',
+    'budgetsAndSpending'                         => 'Budgets and spending',
+    'savings'                                    => 'Savings',
+    'newWithdrawal'                              => 'New expense',
+    'newDeposit'                                 => 'New deposit',
+    'newTransfer'                                => 'New transfer',
+    'moneyIn'                                    => 'Money in',
+    'moneyOut'                                   => 'Money out',
     'billsToPay'                                 => '待付賬單',
     'billsPaid'                                  => '已付賬單',
 
     // menu and titles, should be recycled as often as possible:
-    'currency'                                   => '',
-    'preferences'                                => '',
-    'logout'                                     => '',
-    'searchPlaceholder'                          => '',
-    'dashboard'                                  => '',
-    'currencies'                                 => '',
-    'accounts'                                   => '',
+    'currency'                                   => 'Currency',
+    'preferences'                                => 'Preferences',
+    'logout'                                     => 'Logout',
+    'searchPlaceholder'                          => 'Search...',
+    'dashboard'                                  => 'Dashboard',
+    'currencies'                                 => 'Currencies',
+    'accounts'                                   => 'Accounts',
     'Asset account'                              => '資產帳戶',
     'Default account'                            => '資產帳戶',
-    'Expense account'                            => '',
-    'Revenue account'                            => '',
+    'Expense account'                            => 'Expense account',
+    'Revenue account'                            => 'Revenue account',
     'Initial balance account'                    => '初始帳戶',
-    'budgets'                                    => '',
+    'budgets'                                    => 'Budgets',
     'tags'                                       => '標籤',
-    'reports'                                    => '',
-    'transactions'                               => '',
-    'expenses'                                   => '',
-    'income'                                     => '',
-    'transfers'                                  => '',
-    'moneyManagement'                            => '',
-    'piggyBanks'                                 => '',
+    'reports'                                    => 'Reports',
+    'transactions'                               => 'Transactions',
+    'expenses'                                   => 'Expenses',
+    'income'                                     => 'Revenue / income',
+    'transfers'                                  => 'Transfers',
+    'moneyManagement'                            => 'Money management',
+    'piggyBanks'                                 => 'Piggy banks',
     'bills'                                      => '賬單',
-    'withdrawal'                                 => '',
-    'deposit'                                    => '',
-    'account'                                    => '',
-    'transfer'                                   => '',
-    'Withdrawal'                                 => '',
-    'Deposit'                                    => '',
-    'Transfer'                                   => '',
+    'withdrawal'                                 => 'Withdrawal',
+    'deposit'                                    => 'Deposit',
+    'account'                                    => 'Account',
+    'transfer'                                   => 'Transfer',
+    'Withdrawal'                                 => 'Withdrawal',
+    'Deposit'                                    => 'Deposit',
+    'Transfer'                                   => 'Transfer',
     'bill'                                       => '賬單',
-    'yes'                                        => '',
-    'no'                                         => '',
-    'amount'                                     => '',
-    'overview'                                   => '',
-    'saveOnAccount'                              => '',
-    'unknown'                                    => '',
-    'daily'                                      => '',
-    'monthly'                                    => '',
-    'profile'                                    => '',
-    'errors'                                     => '',
+    'yes'                                        => 'Yes',
+    'no'                                         => 'No',
+    'amount'                                     => 'Amount',
+    'overview'                                   => 'Overview',
+    'saveOnAccount'                              => 'Save on account',
+    'unknown'                                    => 'Unknown',
+    'daily'                                      => 'Daily',
+    'monthly'                                    => 'Monthly',
+    'profile'                                    => 'Profile',
+    'errors'                                     => 'Errors',
 
     // reports:
-    'report_default'                             => '',
-    'report_audit'                               => '',
-    'report_category'                            => '',
-    'report_budget'                              => '',
-    'report_tag'                                 => '',
-    'quick_link_reports'                         => '',
-    'quick_link_default_report'                  => '',
-    'quick_link_audit_report'                    => '',
-    'report_this_month_quick'                    => '',
-    'report_this_year_quick'                     => '',
-    'report_this_fiscal_year_quick'              => '',
-    'report_all_time_quick'                      => '',
-    'reports_can_bookmark'                       => '',
-    'incomeVsExpenses'                           => '',
+    'report_default'                             => 'Default financial report between :start and :end',
+    'report_audit'                               => 'Transaction history overview between :start and :end',
+    'report_category'                            => 'Category report between :start and :end',
+    'report_budget'                              => 'Budget report between :start and :end',
+    'report_tag'                                 => 'Tag report between :start and :end',
+    'quick_link_reports'                         => 'Quick links',
+    'quick_link_default_report'                  => 'Default financial report',
+    'quick_link_audit_report'                    => 'Transaction history overview',
+    'report_this_month_quick'                    => 'Current month, all accounts',
+    'report_this_year_quick'                     => 'Current year, all accounts',
+    'report_this_fiscal_year_quick'              => 'Current fiscal year, all accounts',
+    'report_all_time_quick'                      => 'All-time, all accounts',
+    'reports_can_bookmark'                       => 'Remember that reports can be bookmarked.',
+    'incomeVsExpenses'                           => 'Income vs. expenses',
     'accountBalances'                            => '帳戶餘額',
     'balanceStart'                               => '期間之初的結餘',
     'balanceEnd'                                 => '期間之未的結餘',
     'splitByAccount'                             => '以帳號來分割',
-    'coveredWithTags'                            => '',
-    'leftUnbalanced'                             => '',
-    'leftInBudget'                               => '',
-    'sumOfSums'                                  => '',
-    'noCategory'                                 => '',
-    'notCharged'                                 => '',
-    'inactive'                                   => '',
-    'active'                                     => '',
-    'difference'                                 => '',
-    'in'                                         => '',
-    'out'                                        => '',
-    'topX'                                       => '',
-    'show_full_list'                             => '',
-    'show_only_top'                              => '',
-    'report_type'                                => '',
-    'report_type_default'                        => '',
-    'report_type_audit'                          => '',
-    'report_type_category'                       => '',
-    'report_type_budget'                         => '',
-    'report_type_tag'                            => '',
-    'more_info_help'                             => '',
-    'report_included_accounts'                   => '',
-    'report_date_range'                          => '',
-    'report_preset_ranges'                       => '',
-    'shared'                                     => '',
-    'fiscal_year'                                => '',
-    'income_entry'                               => '',
-    'expense_entry'                              => '',
-    'category_entry'                             => '',
-    'budget_spent_amount'                        => '',
+    'coveredWithTags'                            => 'Covered with tags',
+    'leftUnbalanced'                             => 'Left unbalanced',
+    'leftInBudget'                               => 'Left in budget',
+    'sumOfSums'                                  => 'Sum of sums',
+    'noCategory'                                 => '(no category)',
+    'notCharged'                                 => 'Not charged (yet)',
+    'inactive'                                   => 'Inactive',
+    'active'                                     => 'Active',
+    'difference'                                 => 'Difference',
+    'in'                                         => 'In',
+    'out'                                        => 'Out',
+    'topX'                                       => 'top :number',
+    'show_full_list'                             => 'Show entire list',
+    'show_only_top'                              => 'Show only top :number',
+    'report_type'                                => 'Report type',
+    'report_type_default'                        => 'Default financial report',
+    'report_type_audit'                          => 'Transaction history overview (audit)',
+    'report_type_category'                       => 'Category report',
+    'report_type_budget'                         => 'Budget report',
+    'report_type_tag'                            => 'Tag report',
+    'more_info_help'                             => 'More information about these types of reports can be found in the help pages. Press the (?) icon in the top right corner.',
+    'report_included_accounts'                   => 'Included accounts',
+    'report_date_range'                          => 'Date range',
+    'report_preset_ranges'                       => 'Pre-set ranges',
+    'shared'                                     => 'Shared',
+    'fiscal_year'                                => 'Fiscal year',
+    'income_entry'                               => 'Income from account ":name" between :start and :end',
+    'expense_entry'                              => 'Expenses to account ":name" between :start and :end',
+    'category_entry'                             => 'Expenses in category ":name" between :start and :end',
+    'budget_spent_amount'                        => 'Expenses in budget ":budget" between :start and :end',
     'balance_amount'                             => '與 :start 和 :end 之間由帳號 ":account" 支付的預算 ":budget" 的支出',
-    'no_audit_activity'                          => '',
+    'no_audit_activity'                          => 'No activity was recorded on account <a href=":url" title=":account_name">:account_name</a> between :start and :end.',
     'audit_end_balance'                          => '<a href=":url" title=":account_name">:account_name</a> 在 :end 後的餘額是: :balance',
-    'reports_extra_options'                      => '',
-    'report_has_no_extra_options'                => '',
-    'reports_submit'                             => '',
-    'end_after_start_date'                       => '',
-    'select_category'                            => '',
-    'select_budget'                              => '',
-    'select_tag'                                 => '',
-    'income_per_category'                        => '',
-    'expense_per_category'                       => '',
-    'expense_per_budget'                         => '',
-    'income_per_account'                         => '',
-    'expense_per_account'                        => '',
-    'expense_per_tag'                            => '',
-    'income_per_tag'                             => '',
-    'include_expense_not_in_budget'              => '',
-    'include_expense_not_in_account'             => '',
-    'include_expense_not_in_category'            => '',
-    'include_income_not_in_category'             => '',
-    'include_income_not_in_account'              => '',
-    'include_income_not_in_tags'                 => '',
-    'include_expense_not_in_tags'                => '',
-    'everything_else'                            => '',
-    'income_and_expenses'                        => '',
-    'spent_average'                              => '',
-    'income_average'                             => '',
-    'transaction_count'                          => '',
-    'average_spending_per_account'               => '',
-    'average_income_per_account'                 => '',
-    'total'                                      => '',
-    'description'                                => '',
-    'sum_of_period'                              => '',
-    'average_in_period'                          => '',
-    'account_role_defaultAsset'                  => '',
-    'account_role_sharedAsset'                   => '',
-    'account_role_savingAsset'                   => '',
-    'account_role_ccAsset'                       => '',
+    'reports_extra_options'                      => 'Extra options',
+    'report_has_no_extra_options'                => 'This report has no extra options',
+    'reports_submit'                             => 'View report',
+    'end_after_start_date'                       => 'End date of report must be after start date.',
+    'select_category'                            => 'Select category(ies)',
+    'select_budget'                              => 'Select budget(s).',
+    'select_tag'                                 => 'Select tag(s).',
+    'income_per_category'                        => 'Income per category',
+    'expense_per_category'                       => 'Expense per category',
+    'expense_per_budget'                         => 'Expense per budget',
+    'income_per_account'                         => 'Income per account',
+    'expense_per_account'                        => 'Expense per account',
+    'expense_per_tag'                            => 'Expense per tag',
+    'income_per_tag'                             => 'Income per tag',
+    'include_expense_not_in_budget'              => 'Included expenses not in the selected budget(s)',
+    'include_expense_not_in_account'             => 'Included expenses not in the selected account(s)',
+    'include_expense_not_in_category'            => 'Included expenses not in the selected category(ies)',
+    'include_income_not_in_category'             => 'Included income not in the selected category(ies)',
+    'include_income_not_in_account'              => 'Included income not in the selected account(s)',
+    'include_income_not_in_tags'                 => 'Included income not in the selected tag(s)',
+    'include_expense_not_in_tags'                => 'Included expenses not in the selected tag(s)',
+    'everything_else'                            => 'Everything else',
+    'income_and_expenses'                        => 'Income and expenses',
+    'spent_average'                              => 'Spent (average)',
+    'income_average'                             => 'Income (average)',
+    'transaction_count'                          => 'Transaction count',
+    'average_spending_per_account'               => 'Average spending per account',
+    'average_income_per_account'                 => 'Average income per account',
+    'total'                                      => 'Total',
+    'description'                                => 'Description',
+    'sum_of_period'                              => 'Sum of period',
+    'average_in_period'                          => 'Average in period',
+    'account_role_defaultAsset'                  => 'Default asset account',
+    'account_role_sharedAsset'                   => 'Shared asset account',
+    'account_role_savingAsset'                   => 'Savings account',
+    'account_role_ccAsset'                       => 'Credit card',
 
     // charts:
-    'chart'                                      => '',
-    'month'                                      => '',
-    'budget'                                     => '',
-    'spent'                                      => '',
-    'spent_in_budget'                            => '',
-    'left_to_spend'                              => '',
-    'earned'                                     => '',
-    'overspent'                                  => '',
-    'left'                                       => '',
-    'no_budget'                                  => '',
-    'max-amount'                                 => '',
-    'min-amount'                                 => '',
-    'journal-amount'                             => '',
-    'name'                                       => '',
-    'date'                                       => '',
-    'paid'                                       => '',
-    'unpaid'                                     => '',
-    'day'                                        => '',
-    'budgeted'                                   => '',
-    'period'                                     => '',
+    'chart'                                      => 'Chart',
+    'month'                                      => 'Month',
+    'budget'                                     => 'Budget',
+    'spent'                                      => 'Spent',
+    'spent_in_budget'                            => 'Spent in budget',
+    'left_to_spend'                              => 'Left to spend',
+    'earned'                                     => 'Earned',
+    'overspent'                                  => 'Overspent',
+    'left'                                       => 'Left',
+    'no_budget'                                  => '(no budget)',
+    'max-amount'                                 => 'Maximum amount',
+    'min-amount'                                 => 'Minumum amount',
+    'journal-amount'                             => 'Current bill entry',
+    'name'                                       => 'Name',
+    'date'                                       => 'Date',
+    'paid'                                       => 'Paid',
+    'unpaid'                                     => 'Unpaid',
+    'day'                                        => 'Day',
+    'budgeted'                                   => 'Budgeted',
+    'period'                                     => 'Period',
     'balance'                                    => '餘額',
-    'sum'                                        => '',
-    'average'                                    => '',
+    'sum'                                        => 'Sum',
+    'average'                                    => 'Average',
     'balanceFor'                                 => ':name 的餘額',
 
     // piggy banks:
-    'add_money_to_piggy'                         => '',
-    'piggy_bank'                                 => '',
-    'new_piggy_bank'                             => '',
-    'store_piggy_bank'                           => '',
-    'stored_piggy_bank'                          => '',
-    'account_status'                             => '',
-    'left_for_piggy_banks'                       => '',
-    'sum_of_piggy_banks'                         => '',
-    'saved_so_far'                               => '',
-    'left_to_save'                               => '',
-    'suggested_amount'                           => '',
-    'add_money_to_piggy_title'                   => '',
-    'remove_money_from_piggy_title'              => '',
-    'add'                                        => '',
+    'add_money_to_piggy'                         => 'Add money to piggy bank ":name"',
+    'piggy_bank'                                 => 'Piggy bank',
+    'new_piggy_bank'                             => 'New piggy bank',
+    'store_piggy_bank'                           => 'Store new piggy bank',
+    'stored_piggy_bank'                          => 'Store new piggy bank ":name"',
+    'account_status'                             => 'Account status',
+    'left_for_piggy_banks'                       => 'Left for piggy banks',
+    'sum_of_piggy_banks'                         => 'Sum of piggy banks',
+    'saved_so_far'                               => 'Saved so far',
+    'left_to_save'                               => 'Left to save',
+    'suggested_amount'                           => 'Suggested monthly amount to save',
+    'add_money_to_piggy_title'                   => 'Add money to piggy bank ":name"',
+    'remove_money_from_piggy_title'              => 'Remove money from piggy bank ":name"',
+    'add'                                        => 'Add',
 
-    'remove'                     => '',
-    'max_amount_add'             => '',
-    'max_amount_remove'          => '',
-    'update_piggy_button'        => '',
-    'update_piggy_title'         => '',
-    'updated_piggy_bank'         => '',
-    'details'                    => '',
-    'events'                     => '',
-    'target_amount'              => '',
-    'start_date'                 => '',
+    'remove'                     => 'Remove',
+    'max_amount_add'             => 'The maximum amount you can add is',
+    'max_amount_remove'          => 'The maximum amount you can remove is',
+    'update_piggy_button'        => 'Update piggy bank',
+    'update_piggy_title'         => 'Update piggy bank ":name"',
+    'updated_piggy_bank'         => 'Updated piggy bank ":name"',
+    'details'                    => 'Details',
+    'events'                     => 'Events',
+    'target_amount'              => 'Target amount',
+    'start_date'                 => 'Start date',
     'target_date'                => '儲蓄目標日期',
     'no_target_date'             => '沒有儲蓄目標日期',
-    'table'                      => '',
-    'delete_piggy_bank'          => '',
-    'cannot_add_amount_piggy'    => '',
-    'cannot_remove_from_piggy'   => '',
-    'deleted_piggy_bank'         => '',
-    'added_amount_to_piggy'      => '',
-    'removed_amount_from_piggy'  => '',
+    'table'                      => 'Table',
+    'delete_piggy_bank'          => 'Delete piggy bank ":name"',
+    'cannot_add_amount_piggy'    => 'Could not add :amount to ":name".',
+    'cannot_remove_from_piggy'   => 'Could not remove :amount from ":name".',
+    'deleted_piggy_bank'         => 'Deleted piggy bank ":name"',
+    'added_amount_to_piggy'      => 'Added :amount to ":name"',
+    'removed_amount_from_piggy'  => 'Removed :amount from ":name"',
 
     // tags
     'regular_tag'                => '只是一個普通的標籤。',
@@ -835,178 +835,178 @@ return [
     'updated_tag'                => '更新了標籤 ":tag"',
     'created_tag'                => '成功創建標籤 ":tag" ！',
 
-    'transaction_journal_information'       => '',
-    'transaction_journal_meta'              => '',
-    'total_amount'                          => '',
-    'number_of_decimals'                    => '',
+    'transaction_journal_information'       => 'Transaction information',
+    'transaction_journal_meta'              => 'Meta information',
+    'total_amount'                          => 'Total amount',
+    'number_of_decimals'                    => 'Number of decimals',
 
     // administration
-    'administration'                        => '',
-    'user_administration'                   => '',
-    'list_all_users'                        => '',
-    'all_users'                             => '',
-    'instance_configuration'                => '',
-    'firefly_instance_configuration'        => '',
-    'setting_single_user_mode'              => '',
-    'setting_single_user_mode_explain'      => '',
-    'store_configuration'                   => '',
-    'single_user_administration'            => '',
-    'edit_user'                             => '',
-    'hidden_fields_preferences'             => '',
-    'user_data_information'                 => '',
-    'user_information'                      => '',
-    'total_size'                            => '',
-    'budget_or_budgets'                     => '',
-    'budgets_with_limits'                   => '',
-    'rule_or_rules'                         => '',
-    'rulegroup_or_groups'                   => '',
-    'configuration_updated'                 => '',
-    'setting_is_demo_site'                  => '',
-    'setting_is_demo_site_explain'          => '',
-    'block_code_bounced'                    => '',
-    'block_code_expired'                    => '',
-    'no_block_code'                         => '',
+    'administration'                        => 'Administration',
+    'user_administration'                   => 'User administration',
+    'list_all_users'                        => 'All users',
+    'all_users'                             => 'All users',
+    'instance_configuration'                => 'Configuration',
+    'firefly_instance_configuration'        => 'Configuration options for Firefly III',
+    'setting_single_user_mode'              => 'Single user mode',
+    'setting_single_user_mode_explain'      => 'By default, Firefly III only accepts one (1) registration: you. This is a security measure, preventing others from using your instance unless you allow them to. Future registrations are blocked. When you uncheck this box, others can use your instance as wel, assuming they can reach it (when it is connected to the internet).',
+    'store_configuration'                   => 'Store configuration',
+    'single_user_administration'            => 'User administration for :email',
+    'edit_user'                             => 'Edit user :email',
+    'hidden_fields_preferences'             => 'Not all fields are visible right now. You must enable them in your <a href=":link">settings</a>.',
+    'user_data_information'                 => 'User data',
+    'user_information'                      => 'User information',
+    'total_size'                            => 'total size',
+    'budget_or_budgets'                     => 'budget(s)',
+    'budgets_with_limits'                   => 'budget(s) with configured amount',
+    'rule_or_rules'                         => 'rule(s)',
+    'rulegroup_or_groups'                   => 'rule group(s)',
+    'configuration_updated'                 => 'The configuration has been updated',
+    'setting_is_demo_site'                  => 'Demo site',
+    'setting_is_demo_site_explain'          => 'If you check this box, this installation will behave as if it is the demo site, which can have weird side effects.',
+    'block_code_bounced'                    => 'Email message(s) bounced',
+    'block_code_expired'                    => 'Demo account expired',
+    'no_block_code'                         => 'No reason for block or user not blocked',
     // links
-    'journal_link_configuration'            => '',
-    'create_new_link_type'                  => '',
-    'store_new_link_type'                   => '',
-    'update_link_type'                      => '',
-    'edit_link_type'                        => '',
-    'updated_link_type'                     => '',
-    'delete_link_type'                      => '',
-    'deleted_link_type'                     => '',
-    'stored_new_link_type'                  => '',
-    'cannot_edit_link_type'                 => '',
-    'link_type_help_name'                   => '',
-    'link_type_help_inward'                 => '',
-    'link_type_help_outward'                => '',
-    'save_connections_by_moving'            => '',
-    'do_not_save_connection'                => '',
-    'link_transaction'                      => '',
-    'link_to_other_transaction'             => '',
-    'select_transaction_to_link'            => '',
-    'this_transaction'                      => '',
-    'transaction'                           => '',
-    'comments'                              => '',
-    'to_link_not_found'                     => '',
-    'invalid_link_data'                     => '',
-    'journals_linked'                       => '',
-    'journals_error_linked'                 => '',
-    'journal_links'                         => '',
-    'this_withdrawal'                       => '',
-    'this_deposit'                          => '',
-    'this_transfer'                         => '',
-    'overview_for_link'                     => '',
-    'delete_journal_link'                   => '',
-    'deleted_link'                          => '',
+    'journal_link_configuration'            => 'Transaction links configuration',
+    'create_new_link_type'                  => 'Create new link type',
+    'store_new_link_type'                   => 'Store new link type',
+    'update_link_type'                      => 'Update link type',
+    'edit_link_type'                        => 'Edit link type ":name"',
+    'updated_link_type'                     => 'Updated link type ":name"',
+    'delete_link_type'                      => 'Delete link type ":name"',
+    'deleted_link_type'                     => 'Deleted link type ":name"',
+    'stored_new_link_type'                  => 'Store new link type ":name"',
+    'cannot_edit_link_type'                 => 'Cannot edit link type ":name"',
+    'link_type_help_name'                   => 'Ie. "Duplicates"',
+    'link_type_help_inward'                 => 'Ie. "duplicates"',
+    'link_type_help_outward'                => 'Ie. "is duplicated by"',
+    'save_connections_by_moving'            => 'Save the link between these transaction(s) by moving them to another link type:',
+    'do_not_save_connection'                => '(do not save connection)',
+    'link_transaction'                      => 'Link transaction',
+    'link_to_other_transaction'             => 'Link this transaction to another transaction',
+    'select_transaction_to_link'            => 'Select a transaction to link this transaction to',
+    'this_transaction'                      => 'This transaction',
+    'transaction'                           => 'Transaction',
+    'comments'                              => 'Comments',
+    'to_link_not_found'                     => 'If the transaction you want to link to is not listed, simply enter its ID.',
+    'invalid_link_data'                     => 'Invalid link type selected. Cannot link transaction.',
+    'journals_linked'                       => 'Transactions are linked.',
+    'journals_error_linked'                 => 'These transactions are already linked.',
+    'journal_links'                         => 'Transaction links',
+    'this_withdrawal'                       => 'This withdrawal',
+    'this_deposit'                          => 'This deposit',
+    'this_transfer'                         => 'This transfer',
+    'overview_for_link'                     => 'Overview for link type ":name"',
+    'delete_journal_link'                   => 'Delete the link between <a href=":source_link">:source</a> and <a href=":destination_link">:destination</a>',
+    'deleted_link'                          => 'Deleted link',
 
 
     // split a transaction:
     'splits'                                => '分割',
-    'add_another_split'                     => '',
-    'split-transactions'                    => '',
-    'do_split'                              => '',
-    'split_this_withdrawal'                 => '',
-    'split_this_deposit'                    => '',
-    'split_this_transfer'                   => '',
+    'add_another_split'                     => 'Add another split',
+    'split-transactions'                    => 'Split transactions',
+    'do_split'                              => 'Do a split',
+    'split_this_withdrawal'                 => 'Split this withdrawal',
+    'split_this_deposit'                    => 'Split this deposit',
+    'split_this_transfer'                   => 'Split this transfer',
     'cannot_edit_multiple_source'           => '你不能修改描述為 ":description" 的分割交易 #:id 因為他有多個來源帳號。',
     'cannot_edit_multiple_dest'             => '你不能修改描述為 ":description" 的分割交易 #:id 因為他有多個目標帳號。',
-    'cannot_edit_opening_balance'           => '',
-    'no_edit_multiple_left'                 => '',
+    'cannot_edit_opening_balance'           => 'You cannot edit the opening balance of an account.',
+    'no_edit_multiple_left'                 => 'You have selected no valid transactions to edit.',
 
     // import bread crumbs and titles:
     'import'                                => '匯入',
     'import_data'                           => '匯入資料',
 
     // import index page:
-    'import_index_title'                    => '',
-    'import_index_sub_title'                => '',
-    'import_general_index_intro'            => '',
-    'import_index_intro'                    => '',
-    'import_index_file'                     => '',
-    'import_index_config'                   => '',
-    'import_index_type'                     => '',
-    'import_index_start'                    => '',
+    'import_index_title'                    => 'Import data into Firefly III',
+    'import_index_sub_title'                => 'Index',
+    'import_general_index_intro'            => 'Welcome to Firefly\'s import routine. There are a few ways of importing data into Firefly III, displayed here as buttons.',
+    'import_index_intro'                    => 'This routine will help you import files from your bank into Firefly III. Please check out the help pages in the top right corner.',
+    'import_index_file'                     => 'Select your file',
+    'import_index_config'                   => 'If you have previously imported data into Firefly III, you may have a configuration file, which will pre-set configuration values for you. For some banks, other users have kindly provided their <a href="https://github.com/firefly-iii/import-configurations/wiki">configuration file</a>.',
+    'import_index_type'                     => 'Select the type of file you will upload',
+    'import_index_start'                    => 'Start importing',
 
     // supported file types:
-    'import_file_type_csv'                  => '',
+    'import_file_type_csv'                  => 'CSV (comma separated values)',
 
     // import configuration routine:
-    'import_config_sub_title'               => '',
-    'import_config_bread_crumb'             => '',
+    'import_config_sub_title'               => 'Set up your import file',
+    'import_config_bread_crumb'             => 'Set up your import file',
 
     // import status page:
-    'import_status_bread_crumb'             => '',
-    'import_status_sub_title'               => '',
-    'import_status_wait_title'              => '',
-    'import_status_wait_text'               => '',
-    'import_status_ready_title'             => '',
-    'import_status_ready_text'              => '',
-    'import_status_ready_config'            => '',
-    'import_status_ready_start'             => '',
-    'import_status_ready_share'             => '',
-    'import_status_running_title'           => '',
-    'import_status_running_placeholder'     => '',
-    'import_status_errors_title'            => '',
-    'import_status_errors_single'           => '',
-    'import_status_errors_multi'            => '',
-    'import_status_fatal_title'             => '',
-    'import_status_fatal_text'              => '',
-    'import_status_fatal_more'              => '',
-    'import_status_finished_title'          => '',
-    'import_status_finished_text'           => '',
-    'import_status_finished_job'            => '',
+    'import_status_bread_crumb'             => 'Import status',
+    'import_status_sub_title'               => 'Import status',
+    'import_status_wait_title'              => 'Please hold...',
+    'import_status_wait_text'               => 'This box will disappear in a moment.',
+    'import_status_ready_title'             => 'Import is ready to start',
+    'import_status_ready_text'              => 'The import is ready to start. All the configuration you needed to do has been done. Please download the configuration file. It will help you with the import should it not go as planned. To actually run the import, you can either execute the following command in your console, or run the web-based import. Depending on your configuration, the console import will give you more feedback.',
+    'import_status_ready_config'            => 'Download configuration',
+    'import_status_ready_start'             => 'Start the import',
+    'import_status_ready_share'             => 'Please consider downloading your configuration and sharing it at the <strong><a href="https://github.com/firefly-iii/import-configurations/wiki">import configuration center</a></strong>. This will allow other users of Firefly III to import their files more easily.',
+    'import_status_running_title'           => 'The import is running',
+    'import_status_running_placeholder'     => 'Please hold for an update...',
+    'import_status_errors_title'            => 'Errors during the import',
+    'import_status_errors_single'           => 'An error has occured during the import. It does not appear to be fatal.',
+    'import_status_errors_multi'            => 'Some errors occured during the import. These do not appear to be fatal.',
+    'import_status_fatal_title'             => 'A fatal error occurred',
+    'import_status_fatal_text'              => 'A fatal error occurred, which the import-routine cannot recover from. Please see the explanation in red below.',
+    'import_status_fatal_more'              => 'If the error is a time-out, the import will have stopped half-way. For some server configurations, it is merely the server that stopped while the import keeps running in the background. To verify this, check out the log files. If the problem persists, consider importing over the command line instead.',
+    'import_status_finished_title'          => 'Import routine finished',
+    'import_status_finished_text'           => 'The import routine has imported your file.',
+    'import_status_finished_job'            => 'The transactions imported can be found in tag <a href=":link" class="label label-success" style="font-size:100%;font-weight:normal;">:tag</a>.',
     'import_with_key'                       => '以鍵 \':key\' 作匯入',
 
     // sandstorm.io errors and messages:
-    'sandstorm_not_available'               => '',
+    'sandstorm_not_available'               => 'This function is not available when you are using Firefly III within a Sandstorm.io environment.',
 
     // empty lists? no objects? instructions:
-    'no_transactions_in_period'             => '',
-    'no_accounts_title_asset'               => '',
-    'no_accounts_intro_asset'               => '',
-    'no_accounts_imperative_asset'          => '',
-    'no_accounts_create_asset'              => '',
-    'no_accounts_title_expense'             => '',
-    'no_accounts_intro_expense'             => '',
-    'no_accounts_imperative_expense'        => '',
-    'no_accounts_create_expense'            => '',
-    'no_accounts_title_revenue'             => '',
-    'no_accounts_intro_revenue'             => '',
-    'no_accounts_imperative_revenue'        => '',
-    'no_accounts_create_revenue'            => '',
-    'no_budgets_title_default'              => '',
-    'no_budgets_intro_default'              => '',
-    'no_budgets_imperative_default'         => '',
-    'no_budgets_create_default'             => '',
-    'no_categories_title_default'           => '',
-    'no_categories_intro_default'           => '',
-    'no_categories_imperative_default'      => '',
-    'no_categories_create_default'          => '',
-    'no_tags_title_default'                 => '',
-    'no_tags_intro_default'                 => '',
-    'no_tags_imperative_default'            => '',
-    'no_tags_create_default'                => '',
-    'no_transactions_title_withdrawal'      => '',
-    'no_transactions_intro_withdrawal'      => '',
-    'no_transactions_imperative_withdrawal' => '',
-    'no_transactions_create_withdrawal'     => '',
-    'no_transactions_title_deposit'         => '',
-    'no_transactions_intro_deposit'         => '',
-    'no_transactions_imperative_deposit'    => '',
-    'no_transactions_create_deposit'        => '',
-    'no_transactions_title_transfers'       => '',
-    'no_transactions_intro_transfers'       => '',
-    'no_transactions_imperative_transfers'  => '',
-    'no_transactions_create_transfers'      => '',
-    'no_piggies_title_default'              => '',
-    'no_piggies_intro_default'              => '',
-    'no_piggies_imperative_default'         => '',
-    'no_piggies_create_default'             => '',
-    'no_bills_title_default'                => '',
-    'no_bills_intro_default'                => '',
-    'no_bills_imperative_default'           => '',
-    'no_bills_create_default'               => '',
+    'no_transactions_in_period'             => 'There are no transactions in this period.',
+    'no_accounts_title_asset'               => 'Let\'s create an asset account!',
+    'no_accounts_intro_asset'               => 'You have no asset accounts yet. Asset accounts are your main accounts: your checking account, savings account, shared account or even your credit card.',
+    'no_accounts_imperative_asset'          => 'To start using Firefly III you must create at least one asset account. Let\'s do so now:',
+    'no_accounts_create_asset'              => 'Create an asset account',
+    'no_accounts_title_expense'             => 'Let\'s create an expense account!',
+    'no_accounts_intro_expense'             => 'You have no expense accounts yet. Expense accounts are the places where you spend money, such as shops and supermarkets.',
+    'no_accounts_imperative_expense'        => 'Expense accounts are created automatically when you create transactions, but you can create one manually too, if you want. Let\'s create one now:',
+    'no_accounts_create_expense'            => 'Create an expense account',
+    'no_accounts_title_revenue'             => 'Let\'s create a revenue account!',
+    'no_accounts_intro_revenue'             => 'You have no revenue accounts yet. Revenue accounts are the places where you receive money from, such as your employer.',
+    'no_accounts_imperative_revenue'        => 'Revenue accounts are created automatically when you create transactions, but you can create one manually too, if you want. Let\'s create one now:',
+    'no_accounts_create_revenue'            => 'Create a revenue account',
+    'no_budgets_title_default'              => 'Let\'s create a budget',
+    'no_budgets_intro_default'              => 'You have no budgets yet. Budgets are used to organise your expenses into logical groups, which you can give a soft-cap to limit your expenses.',
+    'no_budgets_imperative_default'         => 'Budgets are the basic tools of financial management. Let\'s create one now:',
+    'no_budgets_create_default'             => 'Create a budget',
+    'no_categories_title_default'           => 'Let\'s create a category!',
+    'no_categories_intro_default'           => 'You have no categories yet. Categories are used to fine tune your transactions and label them with their designated category.',
+    'no_categories_imperative_default'      => 'Categories are created automatically when you create transactions, but you can create one manually too. Let\'s create one now:',
+    'no_categories_create_default'          => 'Create a category',
+    'no_tags_title_default'                 => 'Let\'s create a tag!',
+    'no_tags_intro_default'                 => 'You have no tags yet. Tags are used to fine tune your transactions and label them with specific keywords.',
+    'no_tags_imperative_default'            => 'Tags are created automatically when you create transactions, but you can create one manually too. Let\'s create one now:',
+    'no_tags_create_default'                => 'Create a tag',
+    'no_transactions_title_withdrawal'      => 'Let\'s create an expense!',
+    'no_transactions_intro_withdrawal'      => 'You have no expenses yet. You should create expenses to start managing your finances.',
+    'no_transactions_imperative_withdrawal' => 'Have you spent some money? Then you should write it down:',
+    'no_transactions_create_withdrawal'     => 'Create an expense',
+    'no_transactions_title_deposit'         => 'Let\'s create some income!',
+    'no_transactions_intro_deposit'         => 'You have no recorded income yet. You should create income entries to start managing your finances.',
+    'no_transactions_imperative_deposit'    => 'Have you received some money? Then you should write it down:',
+    'no_transactions_create_deposit'        => 'Create a deposit',
+    'no_transactions_title_transfers'       => 'Let\'s create a transfer!',
+    'no_transactions_intro_transfers'       => 'You have no transfers yet. When you move money between asset accounts, it is recorded as a transfer.',
+    'no_transactions_imperative_transfers'  => 'Have you moved some money around? Then you should write it down:',
+    'no_transactions_create_transfers'      => 'Create a transfer',
+    'no_piggies_title_default'              => 'Let\'s create a piggy bank!',
+    'no_piggies_intro_default'              => 'You have no piggy banks yet. You can create piggy banks to divide your savings and keep track of what you\'re saving up for.',
+    'no_piggies_imperative_default'         => 'Do you have things you\'re saving money for? Create a piggy bank and keep track:',
+    'no_piggies_create_default'             => 'Create a new piggy bank',
+    'no_bills_title_default'                => 'Let\'s create a bill!',
+    'no_bills_intro_default'                => 'You have no bills yet. You can create bills to keep track of regular expenses, like your rent of insurance.',
+    'no_bills_imperative_default'           => 'Do you have such regular bills? Create a bill and keep track of your payments:',
+    'no_bills_create_default'               => 'Create a bill',
 
 
 ];
\ No newline at end of file

From 30373db89c0942c46f9d49b9483e655b49b51d3a Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Fri, 25 Aug 2017 07:37:16 +0200
Subject: [PATCH 347/668] New translations csv.php (Spanish)

---
 resources/lang/es_ES/csv.php | 46 ++++++++++++++++++------------------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/resources/lang/es_ES/csv.php b/resources/lang/es_ES/csv.php
index 5377c2cecb..ffdf32c5eb 100644
--- a/resources/lang/es_ES/csv.php
+++ b/resources/lang/es_ES/csv.php
@@ -14,36 +14,36 @@ declare(strict_types=1);
 return [
 
     // initial config
-    'initial_title'                 => '',
+    'initial_title'                 => 'Import setup (1/3) - Basic CSV import setup',
     'initial_text'                  => 'Para poder importar correctamente el archivo, por favor comprueba las opciones a continuación.',
-    'initial_box'                   => '',
-    'initial_box_title'             => '',
+    'initial_box'                   => 'Basic CSV import setup',
+    'initial_box_title'             => 'Basic CSV import setup options',
     'initial_header_help'           => 'Marque aquí si el CSV contiene títulos de columna en la primera fila.',
-    'initial_date_help'             => '',
-    'initial_delimiter_help'        => '',
-    'initial_import_account_help'   => '',
-    'initial_submit'                => '',
+    'initial_date_help'             => 'Date time format in your CSV. Follow the format like <a href="https://secure.php.net/manual/en/datetime.createfromformat.php#refsect1-datetime.createfromformat-parameters">this page</a> indicates. The default value will parse dates that look like this: :dateExample.',
+    'initial_delimiter_help'        => 'Choose the field delimiter that is used in your input file. If not sure, comma is the safest option.',
+    'initial_import_account_help'   => 'If your CSV file does NOT contain information about your asset account(s), use this dropdown to select to which account the transactions in the CSV belong to.',
+    'initial_submit'                => 'Continue with step 2/3',
 
     // roles config
-    'roles_title'                   => '',
-    'roles_text'                    => '',
-    'roles_table'                   => '',
-    'roles_column_name'             => '',
-    'roles_column_example'          => '',
-    'roles_column_role'             => '',
-    'roles_do_map_value'            => '',
-    'roles_column'                  => '',
-    'roles_no_example_data'         => '',
-    'roles_submit'                  => '',
-    'roles_warning'                 => '',
+    'roles_title'                   => 'Import setup (2/3) - Define each column\'s role',
+    'roles_text'                    => 'Each column in your CSV file contains certain data. Please indicate what kind of data the importer should expect. The option to "map" data means that you will link each entry found in the column to a value in your database. An often mapped column is the column that contains the IBAN of the opposing account. That can be easily matched to IBAN\'s present in your database already.',
+    'roles_table'                   => 'Table',
+    'roles_column_name'             => 'Name of column',
+    'roles_column_example'          => 'Column example data',
+    'roles_column_role'             => 'Column data meaning',
+    'roles_do_map_value'            => 'Map these values',
+    'roles_column'                  => 'Column',
+    'roles_no_example_data'         => 'No example data available',
+    'roles_submit'                  => 'Continue with step 3/3',
+    'roles_warning'                 => 'At the very least, mark one column as the amount-column. It is advisable to also select a column for the description, date and the opposing account.',
 
     // map data
-    'map_title'                     => '',
+    'map_title'                     => 'Import setup (3/3) - Connect import data to Firefly III data',
     'map_text'                      => 'En las siguientes tablas el valor de la izquierda muestra información encontrada en el CSV cargado. Es su tarea mapear este valor, si es posible, a un valor ya presente en su base de datos. Firefly respeterá este mapeo. Si no hay un valor hacia el cual mapear o no desea mapear un valor específico, no seleccione ninguno.',
-    'map_field_value'               => '',
-    'map_field_mapped_to'           => '',
-    'map_do_not_map'                => '',
-    'map_submit'                    => '',
+    'map_field_value'               => 'Field value',
+    'map_field_mapped_to'           => 'Mapped to',
+    'map_do_not_map'                => '(do not map)',
+    'map_submit'                    => 'Start the import',
 
     // map things.
     'column__ignore'                => '(ignorar esta columna)',

From ed6da918e1c0781a9f0db29bc7bed28dc9911fae Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Fri, 25 Aug 2017 07:37:18 +0200
Subject: [PATCH 348/668] New translations firefly.php (Polish)

---
 resources/lang/pl_PL/firefly.php | 346 +++++++++++++++----------------
 1 file changed, 173 insertions(+), 173 deletions(-)

diff --git a/resources/lang/pl_PL/firefly.php b/resources/lang/pl_PL/firefly.php
index e54328956b..2352179e23 100644
--- a/resources/lang/pl_PL/firefly.php
+++ b/resources/lang/pl_PL/firefly.php
@@ -71,31 +71,31 @@ return [
     'destination_accounts'                       => 'Konto(a) docelowe',
     'user_id_is'                                 => 'Twój id użytkownika to <strong>:user</strong>',
     'field_supports_markdown'                    => 'To pole obsługuje <a href="https://en.support.wordpress.com/markdown-quick-reference/"> Markdown</a>.',
-    'need_more_help'                             => '',
-    'reenable_intro_text'                        => '',
-    'intro_boxes_after_refresh'                  => '',
+    'need_more_help'                             => 'If you need more help using Firefly III, please <a href="https://github.com/firefly-iii/firefly-iii/issues">open a ticket on Github</a>.',
+    'reenable_intro_text'                        => 'You can also reenable <a href="#" id="reenableGuidance">the introduction guidance</a>.',
+    'intro_boxes_after_refresh'                  => 'The introduction boxes will reappear when you refresh the page.',
     'show_all_no_filter'                         => 'Pokaż wszystkie transakcje bez grupowania ich według daty.',
     'expenses_by_category'                       => 'Wydatki wg kategorii',
     'expenses_by_budget'                         => 'Wydatki wg budżetu',
     'income_by_category'                         => 'Dochody wg kategorii',
-    'expenses_by_asset_account'                  => '',
-    'expenses_by_expense_account'                => '',
-    'cannot_redirect_to_account'                 => '',
+    'expenses_by_asset_account'                  => 'Expenses by asset account',
+    'expenses_by_expense_account'                => 'Expenses by expense account',
+    'cannot_redirect_to_account'                 => 'Firefly III cannot redirect you to the correct page. Apologies.',
     'sum_of_expenses'                            => 'Suma wydatków',
     'sum_of_income'                              => 'Suma dochodów',
-    'total_sum'                                  => '',
+    'total_sum'                                  => 'Total sum',
     'spent_in_specific_budget'                   => 'Wydatki w budżecie ":budget"',
     'sum_of_expenses_in_budget'                  => 'Wydano łącznie w budżecie ":budget"',
-    'left_in_budget_limit'                       => '',
+    'left_in_budget_limit'                       => 'Left to spend according to budgeting',
     'cannot_reset_demo_user'                     => 'Nie można zresetować hasła do konta demonstracyjnego',
     'current_period'                             => 'Bieżący okres',
     'show_the_current_period_and_overview'       => 'Pokaż bieżący okres oraz przegląd',
-    'pref_languages_locale'                      => '',
-    'budget_in_period'                           => '',
-    'chart_budget_in_period'                     => '',
-    'chart_account_in_period'                    => '',
-    'chart_category_in_period'                   => '',
-    'chart_category_all'                         => '',
+    'pref_languages_locale'                      => 'For a language other than English to work properly, your operating system must be equipped with the correct locale-information. If these are not present, currency data, dates and amounts may be formatted wrong.',
+    'budget_in_period'                           => 'All transactions for budget ":name" between :start and :end',
+    'chart_budget_in_period'                     => 'Chart for all transactions for budget ":name" between :start and :end',
+    'chart_account_in_period'                    => 'Chart for all transactions for account ":name" between :start and :end',
+    'chart_category_in_period'                   => 'Chart for all transactions for category ":name" between :start and :end',
+    'chart_category_all'                         => 'Chart for all transactions for category ":name"',
     'clone_withdrawal'                           => 'Zduplikuj tę wypłatę',
     'clone_deposit'                              => 'Zduplikuj tą wpłatę',
     'clone_transfer'                             => 'Zduplikuj ten transfer',
@@ -110,7 +110,7 @@ return [
     'all_journals_for_account'                   => 'Wszystkie transakcje dla konta :name',
     'chart_all_journals_for_account'             => 'Wykres wszystkich transakcji dla konta :name',
     'journals_in_period_for_account'             => 'Wszystkie transakcje dla konta :name od :start do :end',
-    'transferred'                                => '',
+    'transferred'                                => 'Transferred',
     'all_withdrawal'                             => 'Wszystkie wydatki',
     'all_transactions'                           => 'Wszystkie transakcje',
     'title_withdrawal_between'                   => 'Wszystkie wydatki między :start a :koniec',
@@ -127,14 +127,14 @@ return [
     'journals_in_period_for_category'            => 'Wszystkie transakcje dla kategorii :name od :start do :end',
     'journals_in_period_for_tag'                 => 'Wszystkie transakcje dla tagu :name od :start do :end',
     'not_available_demo_user'                    => 'Funkcja, do której próbujesz uzyskać dostęp nie jest dostępna dla użytkowników demo.',
-    'exchange_rate_instructions'                 => '',
-    'transfer_exchange_rate_instructions'        => '',
+    'exchange_rate_instructions'                 => 'Asset account "@name" only accepts transactions in @native_currency. If you wish to use @foreign_currency instead, make sure that the amount in @native_currency is known as well:',
+    'transfer_exchange_rate_instructions'        => 'Source asset account "@source_name" only accepts transactions in @source_currency. Destination asset account "@dest_name" only accepts transactions in @dest_currency. You must provide the transferred amount correctly in both currencies.',
     'transaction_data'                           => 'Dane transakcji',
 
     // search
     'search'                                     => 'Szukaj',
-    'search_found_transactions'                  => '',
-    'general_search_error'                       => '',
+    'search_found_transactions'                  => 'Number of transactions found:',
+    'general_search_error'                       => 'An error occured while searching. Please check the log files for more information.',
     'search_box'                                 => 'Szukaj',
     'search_box_intro'                           => 'Witamy w funkcji wyszukiwania Firefly III. Wpisz zapytanie w polu. Upewnij się, że sprawdziłeś plik pomocy, ponieważ wyszukiwanie jest dość zaawansowane.',
     'search_error'                               => 'Błąd podczas wyszukiwania',
@@ -151,25 +151,25 @@ return [
     // export data:
     'import_and_export'                          => 'Import / eksport',
     'export_data'                                => 'Eksportuj dane',
-    'export_data_intro'                          => '',
+    'export_data_intro'                          => 'For backup purposes, when migrating to another system or when migrating to another Firefly III installation.',
     'export_format'                              => 'Format eksportu',
     'export_format_csv'                          => 'Wartości oddzielone przecinkami (plik CSV)',
     'export_format_mt940'                        => 'Format kompatybilny z MT940',
     'export_included_accounts'                   => 'Eksportuj transakcje z tych kont',
-    'include_old_uploads_help'                   => '',
+    'include_old_uploads_help'                   => 'Firefly III does not throw away the original CSV files you have imported in the past. You can include them in your export.',
     'do_export'                                  => 'Eksportuj',
     'export_status_never_started'                => 'Eksport nie został jeszcze rozpoczęty',
-    'export_status_make_exporter'                => '',
-    'export_status_collecting_journals'          => '',
-    'export_status_collected_journals'           => '',
-    'export_status_converting_to_export_format'  => '',
+    'export_status_make_exporter'                => 'Creating exporter thing...',
+    'export_status_collecting_journals'          => 'Collecting your transactions...',
+    'export_status_collected_journals'           => 'Collected your transactions!',
+    'export_status_converting_to_export_format'  => 'Converting your transactions...',
     'export_status_converted_to_export_format'   => 'Przekonwertowano twoje transakcje!',
     'export_status_creating_journal_file'        => 'Tworzenie pliku eksportu...',
     'export_status_created_journal_file'         => 'Utworzono plik eksportu!',
-    'export_status_collecting_attachments'       => '',
+    'export_status_collecting_attachments'       => 'Collecting all your attachments...',
     'export_status_collected_attachments'        => 'Zebrano wszystkie twoje załączniki!',
-    'export_status_collecting_old_uploads'       => '',
-    'export_status_collected_old_uploads'        => '',
+    'export_status_collecting_old_uploads'       => 'Collecting all your previous uploads...',
+    'export_status_collected_old_uploads'        => 'Collected all your previous uploads!',
     'export_status_creating_config_file'         => 'Tworzenie pliku konfiguracji...',
     'export_status_created_config_file'          => 'Utworzono plik konfiguracyjny!',
     'export_status_creating_zip_file'            => 'Tworzenie pliku zip...',
@@ -214,28 +214,28 @@ return [
     'default_rule_action_prepend'                => 'Kupił świat od ',
     'default_rule_action_set_category'           => 'Duże wydatki',
     'trigger'                                    => 'Wyzwalacz',
-    'trigger_value'                              => '',
+    'trigger_value'                              => 'Trigger on value',
     'stop_processing_other_triggers'             => 'Zatrzymaj przetwarzanie innych wyzwalaczy',
     'add_rule_trigger'                           => 'Dodaj nowy wyzwalacz',
     'action'                                     => 'Akcja',
-    'action_value'                               => '',
+    'action_value'                               => 'Action value',
     'stop_executing_other_actions'               => 'Zatrzymaj wykonywanie innych akcji',
     'add_rule_action'                            => 'Dodaj nową akcję',
     'edit_rule'                                  => 'Modyfikuj regułę ":title"',
     'delete_rule'                                => 'Usuń regułę ":title"',
     'update_rule'                                => 'Modyfikuj regułę',
     'test_rule_triggers'                         => 'Zobacz dopasowane transakcje',
-    'warning_transaction_subset'                 => '',
-    'warning_no_matching_transactions'           => '',
+    'warning_transaction_subset'                 => 'For performance reasons this list is limited to :max_num_transactions and may only show a subset of matching transactions',
+    'warning_no_matching_transactions'           => 'No matching transactions found. Please note that for performance reasons, only the last :num_transactions transactions have been checked.',
     'warning_no_valid_triggers'                  => 'Nie dostarczono prawidłowych wyzwalaczy.',
-    'apply_rule_selection'                       => '',
-    'apply_rule_selection_intro'                 => '',
+    'apply_rule_selection'                       => 'Apply rule ":title" to a selection of your transactions',
+    'apply_rule_selection_intro'                 => 'Rules like ":title" are normally only applied to new or updated transactions, but you can tell Firefly III to run it on a selection of your existing transactions. This can be useful when you have updated a rule and you need the changes to be applied to all of your other transactions.',
     'include_transactions_from_accounts'         => 'Uwzględnij transakcje z tych kont',
-    'applied_rule_selection'                     => '',
+    'applied_rule_selection'                     => 'Rule ":title" has been applied to your selection.',
     'execute'                                    => 'Wykonaj',
-    'apply_rule_group_selection'                 => '',
-    'apply_rule_group_selection_intro'           => '',
-    'applied_rule_group_selection'               => '',
+    'apply_rule_group_selection'                 => 'Apply rule group ":title" to a selection of your transactions',
+    'apply_rule_group_selection_intro'           => 'Rule groups like ":title" are normally only applied to new or updated transactions, but you can tell Firefly III to run all the rules in this group on a selection of your existing transactions. This can be useful when you have updated a group of rules and you need the changes to be applied to all of your other transactions.',
+    'applied_rule_group_selection'               => 'Rule group ":title" has been applied to your selection.',
 
     // actions and triggers
     'rule_trigger_user_action'                   => 'Akcją użytkownika jest ":trigger_value"',
@@ -248,7 +248,7 @@ return [
     'rule_trigger_to_account_is'                 => 'Kontem docelowym jest ":trigger_value"',
     'rule_trigger_to_account_contains'           => 'Konto docelowe zawiera ":trigger_value"',
     'rule_trigger_transaction_type'              => 'Transakcja jest typu ":trigger_value"',
-    'rule_trigger_category_is'                   => '',
+    'rule_trigger_category_is'                   => 'Category is ":trigger_value"',
     'rule_trigger_amount_less'                   => 'Kwota jest mniejsza niż :trigger_value',
     'rule_trigger_amount_exactly'                => 'Kwota jest równa :trigger_value',
     'rule_trigger_amount_more'                   => 'Kwota jest większa niż :trigger_value',
@@ -275,8 +275,8 @@ return [
     'rule_trigger_category_is_choice'            => 'Kategoria jest..',
     'rule_trigger_budget_is_choice'              => 'Budżet jest..',
     'rule_trigger_tag_is_choice'                 => 'Tag jest..',
-    'rule_trigger_has_attachments_choice'        => '',
-    'rule_trigger_has_attachments'               => '',
+    'rule_trigger_has_attachments_choice'        => 'Has at least this many attachments',
+    'rule_trigger_has_attachments'               => 'Has at least :trigger_value attachment(s)',
     'rule_trigger_store_journal'                 => 'Po utworzeniu transakcji',
     'rule_trigger_update_journal'                => 'Po zmodyfikowaniu transakcji',
     'rule_action_set_category'                   => 'Ustaw kategorię na ":action_value"',
@@ -329,12 +329,12 @@ return [
     'pref_custom_fiscal_year_help'               => 'W krajach, w których rok podatkowy nie zaczyna się 1 stycznia i nie kończy 31 grudnia, możesz włączyć tą opcję oraz podać początek / koniec roku podatkowego',
     'pref_fiscal_year_start_label'               => 'Początek roku podatkowego',
     'pref_two_factor_auth'                       => 'Weryfikacja dwuetapowa',
-    'pref_two_factor_auth_help'                  => '',
+    'pref_two_factor_auth_help'                  => 'When you enable 2-step verification (also known as two-factor authentication), you add an extra layer of security to your account. You sign in with something you know (your password) and something you have (a verification code). Verification codes are generated by an application on your phone, such as Authy or Google Authenticator.',
     'pref_enable_two_factor_auth'                => 'Włącz weryfikację dwuetapową',
     'pref_two_factor_auth_disabled'              => 'Kod weryfikacji dwuetapowej został usunięty i wyłączony',
     'pref_two_factor_auth_remove_it'             => 'Nie zapomnij usunąć konta z aplikacji uwierzytelniajcej!',
     'pref_two_factor_auth_code'                  => 'Zweryfikuj kod',
-    'pref_two_factor_auth_code_help'             => '',
+    'pref_two_factor_auth_code_help'             => 'Scan the QR code with an application on your phone such as Authy or Google Authenticator and enter the generated code.',
     'pref_two_factor_auth_reset_code'            => 'Zresetuj kod weryfikacyjny',
     'pref_two_factor_auth_remove_code'           => 'Usuń kod weryfikacyjny',
     'pref_two_factor_auth_remove_will_disable'   => '(to również wyłączy uwierzytelnianie dwuskładnikowe)',
@@ -347,27 +347,27 @@ return [
     'pref_home_show_deposits'                    => 'Pokaż przychody na stronie domowej',
     'pref_home_show_deposits_info'               => 'Ekran główny pokazuje już konta wydatków. Czy chcesz wyświetlać również konta przychodów?',
     'pref_home_do_show_deposits'                 => 'Tak, pokaż je',
-    'successful_count'                           => '',
+    'successful_count'                           => 'of which :count successful',
     'transaction_page_size_title'                => 'Rozmiar strony',
     'transaction_page_size_help'                 => 'Dowolna lista transakcji będzie pokazywać maksymalnie tyle transakcji',
     'transaction_page_size_label'                => 'Rozmiar strony',
     'between_dates'                              => '(:start i :end)',
     'pref_optional_fields_transaction'           => 'Opcjonalne pola dla transakcji',
-    'pref_optional_fields_transaction_help'      => '',
+    'pref_optional_fields_transaction_help'      => 'By default not all fields are enabled when creating a new transaction (because of the clutter). Below, you can enable these fields if you think they could be useful for you. Of course, any field that is disabled, but already filled in, will be visible regardless of the setting.',
     'optional_tj_date_fields'                    => 'Pola dat',
     'optional_tj_business_fields'                => 'Pola biznesowe',
     'optional_tj_attachment_fields'              => 'Pola załączników',
-    'pref_optional_tj_interest_date'             => '',
+    'pref_optional_tj_interest_date'             => 'Interest date',
     'pref_optional_tj_book_date'                 => 'Data księgowania',
-    'pref_optional_tj_process_date'              => '',
+    'pref_optional_tj_process_date'              => 'Processing date',
     'pref_optional_tj_due_date'                  => 'Termin realizacji',
     'pref_optional_tj_payment_date'              => 'Data płatności',
     'pref_optional_tj_invoice_date'              => 'Data faktury',
-    'pref_optional_tj_internal_reference'        => '',
+    'pref_optional_tj_internal_reference'        => 'Internal reference',
     'pref_optional_tj_notes'                     => 'Notatki',
     'pref_optional_tj_attachments'               => 'Załączniki',
     'optional_field_meta_dates'                  => 'Daty',
-    'optional_field_meta_business'               => '',
+    'optional_field_meta_business'               => 'Business',
     'optional_field_attachments'                 => 'Załączniki',
     'optional_field_meta_data'                   => 'Opcjonalne metadane',
 
@@ -388,16 +388,16 @@ return [
     'password_changed'                           => 'Hasło zostało zmienione!',
     'should_change'                              => 'Chodzi o to, aby zmienić swoje hasło.',
     'invalid_password'                           => 'Nieprawidłowe hasło!',
-    'what_is_pw_security'                        => '',
-    'secure_pw_title'                            => '',
-    'secure_pw_history'                          => '',
-    'secure_pw_check_box'                        => '',
-    'secure_pw_sha1'                             => '',
-    'secure_pw_hash_speed'                       => '',
-    'secure_pw_hash_security'                    => '',
-    'secure_pw_should'                           => '',
-    'secure_pw_long_password'                    => '',
-    'secure_pw_short'                            => '',
+    'what_is_pw_security'                        => 'What is "verify password security"?',
+    'secure_pw_title'                            => 'How to choose a secure password',
+    'secure_pw_history'                          => 'In August 2017 well known security researcher Troy Hunt released a list of 306 million stolen passwords. These passwords were stolen during breakins at companies like LinkedIn, Adobe and NeoPets (and many more).',
+    'secure_pw_check_box'                        => 'By checking the box, Firefly III will send the SHA1 hash of your password to <a href="https://www.troyhunt.com/introducing-306-million-freely-downloadable-pwned-passwords/">the website of Troy Hunt</a> to see if it is on the list. This will stop you from using unsafe passwords as is recommended in the latest <a href="https://pages.nist.gov/800-63-3/sp800-63b.html">NIST Special Publication</a> on this subject.',
+    'secure_pw_sha1'                             => 'But I thought SHA1 was broken?',
+    'secure_pw_hash_speed'                       => 'Yes, but not in this context. As you can read on <a href="https://shattered.io/">the website detailing how they broke SHA1</a>, it is now slightly easier to find a "collision": another string that results in the same SHA1-hash. It now only takes 10,000 years using a single-GPU machine.',
+    'secure_pw_hash_security'                    => 'This collision would not be equal to your password, nor would it be useful on (a site like) Firefly III. This application does not use SHA1 for password verification. So it is safe to check this box. Your password is hashed and sent over HTTPS.',
+    'secure_pw_should'                           => 'Should I check the box?',
+    'secure_pw_long_password'                    => 'If you just generated a long, single-use password for Firefly III using some kind of password generator: <strong>no</strong>.',
+    'secure_pw_short'                            => 'If you just entered the password you always use: <em>Please yes</em>.',
 
 
     // attachments
@@ -442,12 +442,12 @@ return [
     'convert_please_set_asset_destination'       => 'Proszę wybierz konto aktywów, do którego będą wychodzić pieniądze.',
     'convert_please_set_expense_destination'     => 'Proszę wybierz konto wydatków, do którego będą wychodzić pieniądze.',
     'convert_please_set_asset_source'            => 'Proszę wybierz konto aktywów, z którego będą przychodzić pieniądze.',
-    'convert_explanation_withdrawal_deposit'     => '',
-    'convert_explanation_withdrawal_transfer'    => '',
-    'convert_explanation_deposit_withdrawal'     => '',
-    'convert_explanation_deposit_transfer'       => '',
-    'convert_explanation_transfer_withdrawal'    => '',
-    'convert_explanation_transfer_deposit'       => '',
+    'convert_explanation_withdrawal_deposit'     => 'If you convert this withdrawal into a deposit, :amount will be deposited into <a href=":sourceRoute">:sourceName</a> instead of taken from it.',
+    'convert_explanation_withdrawal_transfer'    => 'If you convert this withdrawal into a transfer, :amount will be transferred from <a href=":sourceRoute">:sourceName</a> to a new asset account, instead of being paid to <a href=":destinationRoute">:destinationName</a>.',
+    'convert_explanation_deposit_withdrawal'     => 'If you convert this deposit into a withdrawal, :amount will be removed from <a href=":destinationRoute">:destinationName</a> instead of added to it.',
+    'convert_explanation_deposit_transfer'       => 'If you convert this deposit into a transfer, :amount will be transferred from an asset account of your choice into <a href=":destinationRoute">:destinationName</a>.',
+    'convert_explanation_transfer_withdrawal'    => 'If you convert this transfer into a withdrawal, :amount will go from <a href=":sourceRoute">:sourceName</a> to a new destination as an expense, instead of to <a href=":destinationRoute">:destinationName</a> as a transfer.',
+    'convert_explanation_transfer_deposit'       => 'If you convert this transfer into a deposit, :amount will be deposited into account <a href=":destinationRoute">:destinationName</a> instead of being transferred there.',
     'converted_to_Withdrawal'                    => 'Transakcja została przekonwertowana do wypłaty',
     'converted_to_Deposit'                       => 'Transakcja została przekonwertowana do wpłaty',
     'converted_to_Transfer'                      => 'Transakcja została przekonwertowana do transferu',
@@ -499,22 +499,22 @@ return [
     'updated_budget'                             => 'Zmodyfikowano budżet ":name"',
     'update_amount'                              => 'Aktualizuj kwotę',
     'update_budget'                              => 'Aktualizuj budżet',
-    'update_budget_amount_range'                 => '',
-    'budget_period_navigator'                    => '',
+    'update_budget_amount_range'                 => 'Update (expected) available amount between :start and :end',
+    'budget_period_navigator'                    => 'Period navigator',
 
     // bills:
-    'matching_on'                                => '',
+    'matching_on'                                => 'Matching on',
     'between_amounts'                            => 'między :low i :high.',
     'repeats'                                    => 'Powtarza się',
     'connected_journals'                         => 'Powiązane transakcje',
     'auto_match_on'                              => 'Automatycznie dopasowane przez Firefly',
-    'auto_match_off'                             => '',
+    'auto_match_off'                             => 'Not automatically matched by Firefly',
     'next_expected_match'                        => 'Następne oczekiwane dopasowanie',
     'delete_bill'                                => 'Usuń rachunek ":name"',
     'deleted_bill'                               => 'Usunięto rachunek ":name"',
     'edit_bill'                                  => 'Modyfikuj rachunek ":name"',
     'more'                                       => 'Więcej',
-    'rescan_old'                                 => '',
+    'rescan_old'                                 => 'Rescan old transactions',
     'update_bill'                                => 'Aktualizuj rachunek',
     'updated_bill'                               => 'Zaktualizowano rachunek ":name"',
     'store_new_bill'                             => 'Zapisz nowy rachunek',
@@ -523,10 +523,10 @@ return [
     'rescanned_bill'                             => 'Zeskanowano wszystko.',
     'average_bill_amount_year'                   => 'Średnia kwota rachunku (:year)',
     'average_bill_amount_overall'                => 'Średnia kwota rachunku (ogólnie)',
-    'not_or_not_yet'                             => '',
-    'not_expected_period'                        => '',
-    'bill_is_active'                             => '',
-    'bill_will_automatch'                        => '',
+    'not_or_not_yet'                             => 'Not (yet)',
+    'not_expected_period'                        => 'Not expected this period',
+    'bill_is_active'                             => 'Bill is active',
+    'bill_will_automatch'                        => 'Bill will automatically linked to matching transactions',
     // accounts:
     'details_for_asset'                          => 'Szczegóły konta aktywów ":name"',
     'details_for_expense'                        => 'Szczegóły konta wydatków ":name"',
@@ -566,7 +566,7 @@ return [
     'select_more_than_one_category'              => 'Proszę wybierz więcej niż jedną kategorię',
     'select_more_than_one_budget'                => 'Proszę wybierz więcej niż jeden budżet',
     'select_more_than_one_tag'                   => 'Proszę wybierz więcej niż jeden tag',
-    'account_default_currency'                   => '',
+    'account_default_currency'                   => 'If you select another currency, new transactions from this account will have this currency pre-selected.',
 
     // categories:
     'new_category'                               => 'Nowa kategoria',
@@ -599,13 +599,13 @@ return [
     'deleted_transfer'                           => 'Pomyślnie usunięto transfer ":description"',
     'stored_journal'                             => 'Pomyślnie utworzono nową transakcję ":description"',
     'select_transactions'                        => 'Wybierz transakcje',
-    'stop_selection'                             => '',
+    'stop_selection'                             => 'Stop selecting transactions',
     'edit_selected'                              => 'Modyfikuj zaznaczone',
     'delete_selected'                            => 'Usuń zaznaczone',
     'mass_delete_journals'                       => 'Usuń wiele transakcji',
     'mass_edit_journals'                         => 'Modyfikuj wiele transakcji',
-    'cannot_edit_other_fields'                   => '',
-    'perm-delete-many'                           => '',
+    'cannot_edit_other_fields'                   => 'You cannot mass-edit other fields than the ones here, because there is no room to show them. Please follow the link and edit them by one-by-one, if you need to edit these fields.',
+    'perm-delete-many'                           => 'Deleting many items in one go can be very disruptive. Please be cautious.',
     'mass_deleted_transactions_success'          => 'Usunięto :amount transakcję(i).',
     'mass_edited_transactions_success'           => 'Zaktualizowano :amount transakcję(i)',
 
@@ -614,9 +614,9 @@ return [
     'welcome'                                    => 'Witaj w Firefly!',
     'submit'                                     => 'Prześlij',
     'getting_started'                            => 'Pierwsze kroki',
-    'to_get_started'                             => '',
-    'savings_balance_text'                       => '',
-    'finish_up_new_user'                         => '',
+    'to_get_started'                             => 'It is good to see you have successfully installed Firefly III. To get started with this tool please enter your bank\'s name and the balance of your main checking account. Do not worry yet if you have multiple accounts. You can add those later. It\'s just that Firefly III needs something to start with.',
+    'savings_balance_text'                       => 'Firefly III will automatically create a savings account for you. By default, there will be no money in your savings account, but if you tell Firefly III the balance it will be stored as such.',
+    'finish_up_new_user'                         => 'That\'s it! You can continue by pressing <strong>Submit</strong>. You will be taken to the index of Firefly III.',
     'stored_new_accounts_new_user'               => 'Yay! Twoje nowe konta zostały zapisane.',
 
     // home page:
@@ -666,7 +666,7 @@ return [
     'no'                                         => 'Nie',
     'amount'                                     => 'Kwota',
     'overview'                                   => 'Przegląd',
-    'saveOnAccount'                              => '',
+    'saveOnAccount'                              => 'Save on account',
     'unknown'                                    => 'Nieznane',
     'daily'                                      => 'Dziennie',
     'monthly'                                    => 'Miesięcznie',
@@ -678,53 +678,53 @@ return [
     'report_audit'                               => 'Przegląd historii transakcji między :start i :end',
     'report_category'                            => 'Raport kategorii między :start i :end',
     'report_budget'                              => 'Raport budżetów między :start i :end',
-    'report_tag'                                 => '',
+    'report_tag'                                 => 'Tag report between :start and :end',
     'quick_link_reports'                         => 'Szybkie linki',
     'quick_link_default_report'                  => 'Domyślny raport finansowy',
     'quick_link_audit_report'                    => 'Przegląd historii transakcji',
     'report_this_month_quick'                    => 'Bieżący miesiąc, wszystkie konta',
     'report_this_year_quick'                     => 'Bieżący rok, wszystkie konta',
     'report_this_fiscal_year_quick'              => 'Bieżący rok podatkowy, wszystkie konta',
-    'report_all_time_quick'                      => '',
-    'reports_can_bookmark'                       => '',
+    'report_all_time_quick'                      => 'All-time, all accounts',
+    'reports_can_bookmark'                       => 'Remember that reports can be bookmarked.',
     'incomeVsExpenses'                           => 'Dochody a wydatki',
     'accountBalances'                            => 'Salda kont',
     'balanceStart'                               => 'Saldo na początku okresu',
     'balanceEnd'                                 => 'Saldo na końcu okresu',
-    'splitByAccount'                             => '',
-    'coveredWithTags'                            => '',
-    'leftUnbalanced'                             => '',
+    'splitByAccount'                             => 'Split by account',
+    'coveredWithTags'                            => 'Covered with tags',
+    'leftUnbalanced'                             => 'Left unbalanced',
     'leftInBudget'                               => 'Pozostało w budżecie',
     'sumOfSums'                                  => 'Suma sum',
     'noCategory'                                 => '(bez kategorii)',
-    'notCharged'                                 => '',
+    'notCharged'                                 => 'Not charged (yet)',
     'inactive'                                   => 'Nieaktywne',
     'active'                                     => 'Aktywne',
     'difference'                                 => 'Różnica',
-    'in'                                         => '',
-    'out'                                        => '',
-    'topX'                                       => '',
+    'in'                                         => 'In',
+    'out'                                        => 'Out',
+    'topX'                                       => 'top :number',
     'show_full_list'                             => 'Pokaż całą listę',
-    'show_only_top'                              => '',
+    'show_only_top'                              => 'Show only top :number',
     'report_type'                                => 'Typ raportu',
     'report_type_default'                        => 'Domyślny raport finansowy',
     'report_type_audit'                          => 'Przegląd historii transakcji (audyt)',
     'report_type_category'                       => 'Raport kategorii',
     'report_type_budget'                         => 'Raport budżetów',
     'report_type_tag'                            => 'Raport tagów',
-    'more_info_help'                             => '',
+    'more_info_help'                             => 'More information about these types of reports can be found in the help pages. Press the (?) icon in the top right corner.',
     'report_included_accounts'                   => 'Uwzględnione konta',
     'report_date_range'                          => 'Zakres dat',
     'report_preset_ranges'                       => 'Predefiniowane zakresy',
     'shared'                                     => 'Udostępnione',
     'fiscal_year'                                => 'Rok podatkowy',
-    'income_entry'                               => '',
-    'expense_entry'                              => '',
+    'income_entry'                               => 'Income from account ":name" between :start and :end',
+    'expense_entry'                              => 'Expenses to account ":name" between :start and :end',
     'category_entry'                             => 'Wydatki w kategorii ":name" między :start i :end',
     'budget_spent_amount'                        => 'Wydatki w budżecie ":budget" między :start i :end',
-    'balance_amount'                             => '',
-    'no_audit_activity'                          => '',
-    'audit_end_balance'                          => '',
+    'balance_amount'                             => 'Expenses in budget ":budget" paid from account ":account" between :start and :end',
+    'no_audit_activity'                          => 'No activity was recorded on account <a href=":url" title=":account_name">:account_name</a> between :start and :end.',
+    'audit_end_balance'                          => 'Account balance of <a href=":url" title=":account_name">:account_name</a> at the end of :end was: :balance',
     'reports_extra_options'                      => 'Dodatkowe opcje',
     'report_has_no_extra_options'                => 'Ten raport nie ma dodatkowych opcji',
     'reports_submit'                             => 'Zobacz raport',
@@ -739,13 +739,13 @@ return [
     'expense_per_account'                        => 'Wydatek wg konta',
     'expense_per_tag'                            => 'Wydatek wg tagu',
     'income_per_tag'                             => 'Przychód wg tagu',
-    'include_expense_not_in_budget'              => '',
-    'include_expense_not_in_account'             => '',
-    'include_expense_not_in_category'            => '',
-    'include_income_not_in_category'             => '',
-    'include_income_not_in_account'              => '',
-    'include_income_not_in_tags'                 => '',
-    'include_expense_not_in_tags'                => '',
+    'include_expense_not_in_budget'              => 'Included expenses not in the selected budget(s)',
+    'include_expense_not_in_account'             => 'Included expenses not in the selected account(s)',
+    'include_expense_not_in_category'            => 'Included expenses not in the selected category(ies)',
+    'include_income_not_in_category'             => 'Included income not in the selected category(ies)',
+    'include_income_not_in_account'              => 'Included income not in the selected account(s)',
+    'include_income_not_in_tags'                 => 'Included income not in the selected tag(s)',
+    'include_expense_not_in_tags'                => 'Included expenses not in the selected tag(s)',
     'everything_else'                            => 'Wszystko inne',
     'income_and_expenses'                        => 'Dochody i wydatki',
     'spent_average'                              => 'Wydano (średnia)',
@@ -775,7 +775,7 @@ return [
     'no_budget'                                  => '(bez budżetu)',
     'max-amount'                                 => 'Maksymalna kwota',
     'min-amount'                                 => 'Minimalna kwota',
-    'journal-amount'                             => '',
+    'journal-amount'                             => 'Current bill entry',
     'name'                                       => 'Nazwa',
     'date'                                       => 'Data',
     'paid'                                       => 'Zpłacone',
@@ -791,15 +791,15 @@ return [
     // piggy banks:
     'add_money_to_piggy'                         => 'Dodaj pieniądze do skarbonki ":name"',
     'piggy_bank'                                 => 'Skarbonka',
-    'new_piggy_bank'                             => '',
+    'new_piggy_bank'                             => 'New piggy bank',
     'store_piggy_bank'                           => 'Zapisz nową skarbonkę',
     'stored_piggy_bank'                          => 'Zapisz nową skarbonkę ":name"',
     'account_status'                             => 'Status konta',
-    'left_for_piggy_banks'                       => '',
-    'sum_of_piggy_banks'                         => '',
+    'left_for_piggy_banks'                       => 'Left for piggy banks',
+    'sum_of_piggy_banks'                         => 'Sum of piggy banks',
     'saved_so_far'                               => 'Zaoszczędzono do tej pory',
     'left_to_save'                               => 'Pozostało do zaoszczędzenia',
-    'suggested_amount'                           => '',
+    'suggested_amount'                           => 'Suggested monthly amount to save',
     'add_money_to_piggy_title'                   => 'Dodaj pieniądze do skarbonki ":name"',
     'remove_money_from_piggy_title'              => 'Usuń pieniądze ze skarbonki ":name"',
     'add'                                        => 'Dodaj',
@@ -815,19 +815,19 @@ return [
     'target_amount'              => 'Kwota docelowa',
     'start_date'                 => 'Data rozpoczęcia',
     'target_date'                => 'Data docelowa',
-    'no_target_date'             => '',
+    'no_target_date'             => 'No target date',
     'table'                      => 'Tabela',
     'delete_piggy_bank'          => 'Usuń skarbonkę ":name"',
     'cannot_add_amount_piggy'    => 'Nie można dodać :amount do ":name".',
-    'cannot_remove_from_piggy'   => '',
+    'cannot_remove_from_piggy'   => 'Could not remove :amount from ":name".',
     'deleted_piggy_bank'         => 'Usunięto skarbonkę ":name"',
-    'added_amount_to_piggy'      => '',
-    'removed_amount_from_piggy'  => '',
+    'added_amount_to_piggy'      => 'Added :amount to ":name"',
+    'removed_amount_from_piggy'  => 'Removed :amount from ":name"',
 
     // tags
     'regular_tag'                => 'Po prostu zwykły tag.',
-    'balancing_act'              => '',
-    'advance_payment'            => '',
+    'balancing_act'              => 'The tag takes at most two transactions; an expense and a transfer. They\'ll balance each other out.',
+    'advance_payment'            => 'The tag accepts one expense and any number of deposits aimed to repay the original expense.',
     'delete_tag'                 => 'Usuń tag ":tag"',
     'deleted_tag'                => 'Usunięto tag ":tag"',
     'new_tag'                    => 'Utwórz nowy tag',
@@ -850,55 +850,55 @@ return [
     'setting_single_user_mode'              => 'Tryb pojedynczego użytkownika',
     'setting_single_user_mode_explain'      => 'Domyślnie, Firefly III pozwala na jednego (1) użytkownika: Ciebie. Jest to środek bezpieczeństwa uniemożliwiający innym używanie Twojej instalacji, chyba że im pozwolisz. Kolejne rejestracje są zablokowane. Jeżeli odznaczysz to pole, inne osoby będą mogły używać Twojej instalacji Firefly III (zakładając, że jest ona dostępna w Internecie).',
     'store_configuration'                   => 'Zapisz konfigurację',
-    'single_user_administration'            => '',
+    'single_user_administration'            => 'User administration for :email',
     'edit_user'                             => 'Modyfikuj użytkownika :email',
-    'hidden_fields_preferences'             => '',
+    'hidden_fields_preferences'             => 'Not all fields are visible right now. You must enable them in your <a href=":link">settings</a>.',
     'user_data_information'                 => 'Dane użytkownika',
     'user_information'                      => 'Informacja o użytkowniku',
     'total_size'                            => 'łączny rozmiar',
     'budget_or_budgets'                     => 'budżet(y)',
-    'budgets_with_limits'                   => '',
+    'budgets_with_limits'                   => 'budget(s) with configured amount',
     'rule_or_rules'                         => 'reguła(y)',
     'rulegroup_or_groups'                   => 'grupa(y) reguł',
     'configuration_updated'                 => 'Konfiguracja została zaktualizowana',
     'setting_is_demo_site'                  => 'Strona demonstracyjna',
-    'setting_is_demo_site_explain'          => '',
+    'setting_is_demo_site_explain'          => 'If you check this box, this installation will behave as if it is the demo site, which can have weird side effects.',
     'block_code_bounced'                    => 'Odrzucony e-mail potwierdzający',
     'block_code_expired'                    => 'Demonstracyjne konto wygasło',
     'no_block_code'                         => 'Brak powody blokady lub użytkownik niezablokowany',
     // links
-    'journal_link_configuration'            => '',
-    'create_new_link_type'                  => '',
-    'store_new_link_type'                   => '',
-    'update_link_type'                      => '',
-    'edit_link_type'                        => '',
-    'updated_link_type'                     => '',
-    'delete_link_type'                      => '',
-    'deleted_link_type'                     => '',
-    'stored_new_link_type'                  => '',
-    'cannot_edit_link_type'                 => '',
-    'link_type_help_name'                   => '',
-    'link_type_help_inward'                 => '',
-    'link_type_help_outward'                => '',
-    'save_connections_by_moving'            => '',
-    'do_not_save_connection'                => '',
-    'link_transaction'                      => '',
-    'link_to_other_transaction'             => '',
-    'select_transaction_to_link'            => '',
-    'this_transaction'                      => '',
-    'transaction'                           => '',
+    'journal_link_configuration'            => 'Transaction links configuration',
+    'create_new_link_type'                  => 'Create new link type',
+    'store_new_link_type'                   => 'Store new link type',
+    'update_link_type'                      => 'Update link type',
+    'edit_link_type'                        => 'Edit link type ":name"',
+    'updated_link_type'                     => 'Updated link type ":name"',
+    'delete_link_type'                      => 'Delete link type ":name"',
+    'deleted_link_type'                     => 'Deleted link type ":name"',
+    'stored_new_link_type'                  => 'Store new link type ":name"',
+    'cannot_edit_link_type'                 => 'Cannot edit link type ":name"',
+    'link_type_help_name'                   => 'Ie. "Duplicates"',
+    'link_type_help_inward'                 => 'Ie. "duplicates"',
+    'link_type_help_outward'                => 'Ie. "is duplicated by"',
+    'save_connections_by_moving'            => 'Save the link between these transaction(s) by moving them to another link type:',
+    'do_not_save_connection'                => '(do not save connection)',
+    'link_transaction'                      => 'Link transaction',
+    'link_to_other_transaction'             => 'Link this transaction to another transaction',
+    'select_transaction_to_link'            => 'Select a transaction to link this transaction to',
+    'this_transaction'                      => 'This transaction',
+    'transaction'                           => 'Transaction',
     'comments'                              => 'Komentarze',
-    'to_link_not_found'                     => '',
-    'invalid_link_data'                     => '',
-    'journals_linked'                       => '',
-    'journals_error_linked'                 => '',
-    'journal_links'                         => '',
-    'this_withdrawal'                       => '',
-    'this_deposit'                          => '',
-    'this_transfer'                         => '',
-    'overview_for_link'                     => '',
-    'delete_journal_link'                   => '',
-    'deleted_link'                          => '',
+    'to_link_not_found'                     => 'If the transaction you want to link to is not listed, simply enter its ID.',
+    'invalid_link_data'                     => 'Invalid link type selected. Cannot link transaction.',
+    'journals_linked'                       => 'Transactions are linked.',
+    'journals_error_linked'                 => 'These transactions are already linked.',
+    'journal_links'                         => 'Transaction links',
+    'this_withdrawal'                       => 'This withdrawal',
+    'this_deposit'                          => 'This deposit',
+    'this_transfer'                         => 'This transfer',
+    'overview_for_link'                     => 'Overview for link type ":name"',
+    'delete_journal_link'                   => 'Delete the link between <a href=":source_link">:source</a> and <a href=":destination_link">:destination</a>',
+    'deleted_link'                          => 'Deleted link',
 
 
     // split a transaction:
@@ -909,9 +909,9 @@ return [
     'split_this_withdrawal'                 => 'Podziel tą wypłatę',
     'split_this_deposit'                    => 'Podziel tą wpłatę',
     'split_this_transfer'                   => 'Podziel ten transfer',
-    'cannot_edit_multiple_source'           => '',
-    'cannot_edit_multiple_dest'             => '',
-    'cannot_edit_opening_balance'           => '',
+    'cannot_edit_multiple_source'           => 'You cannot edit splitted transaction #:id with description ":description" because it contains multiple source accounts.',
+    'cannot_edit_multiple_dest'             => 'You cannot edit splitted transaction #:id with description ":description" because it contains multiple destination accounts.',
+    'cannot_edit_opening_balance'           => 'You cannot edit the opening balance of an account.',
     'no_edit_multiple_left'                 => 'Nie wybrałeś żadnych poprawnych transakcji do edycji.',
 
     // import bread crumbs and titles:
@@ -968,24 +968,24 @@ return [
     'no_accounts_imperative_asset'          => 'Aby rozpocząć korzystanie z Firefly III należy utworzyć co najmniej jedno konto aktywów. Zróbmy je więc teraz:',
     'no_accounts_create_asset'              => 'Utwórz konto aktywów',
     'no_accounts_title_expense'             => 'Stwórzmy konto wydatków!',
-    'no_accounts_intro_expense'             => '',
-    'no_accounts_imperative_expense'        => '',
+    'no_accounts_intro_expense'             => 'You have no expense accounts yet. Expense accounts are the places where you spend money, such as shops and supermarkets.',
+    'no_accounts_imperative_expense'        => 'Expense accounts are created automatically when you create transactions, but you can create one manually too, if you want. Let\'s create one now:',
     'no_accounts_create_expense'            => 'Utwórz konto wydatków',
     'no_accounts_title_revenue'             => 'Stwórzmy konto przychodów!',
-    'no_accounts_intro_revenue'             => '',
-    'no_accounts_imperative_revenue'        => '',
+    'no_accounts_intro_revenue'             => 'You have no revenue accounts yet. Revenue accounts are the places where you receive money from, such as your employer.',
+    'no_accounts_imperative_revenue'        => 'Revenue accounts are created automatically when you create transactions, but you can create one manually too, if you want. Let\'s create one now:',
     'no_accounts_create_revenue'            => 'Utwórz konto przychodów',
     'no_budgets_title_default'              => 'Stwórzmy budżet',
-    'no_budgets_intro_default'              => '',
-    'no_budgets_imperative_default'         => '',
+    'no_budgets_intro_default'              => 'You have no budgets yet. Budgets are used to organise your expenses into logical groups, which you can give a soft-cap to limit your expenses.',
+    'no_budgets_imperative_default'         => 'Budgets are the basic tools of financial management. Let\'s create one now:',
     'no_budgets_create_default'             => 'Stwórz budżet',
     'no_categories_title_default'           => 'Stwórzmy kategorię!',
-    'no_categories_intro_default'           => '',
-    'no_categories_imperative_default'      => '',
-    'no_categories_create_default'          => '',
+    'no_categories_intro_default'           => 'You have no categories yet. Categories are used to fine tune your transactions and label them with their designated category.',
+    'no_categories_imperative_default'      => 'Categories are created automatically when you create transactions, but you can create one manually too. Let\'s create one now:',
+    'no_categories_create_default'          => 'Create a category',
     'no_tags_title_default'                 => 'Stwórzmy tag!',
-    'no_tags_intro_default'                 => '',
-    'no_tags_imperative_default'            => '',
+    'no_tags_intro_default'                 => 'You have no tags yet. Tags are used to fine tune your transactions and label them with specific keywords.',
+    'no_tags_imperative_default'            => 'Tags are created automatically when you create transactions, but you can create one manually too. Let\'s create one now:',
     'no_tags_create_default'                => 'Utwórz tag',
     'no_transactions_title_withdrawal'      => 'Stwórzmy wydatek!',
     'no_transactions_intro_withdrawal'      => 'Jeszcze nie masz wydatków. Powinieneś utworzyć wydatki aby rozpocząć zarządzanie swoimi finansami.',
@@ -994,18 +994,18 @@ return [
     'no_transactions_title_deposit'         => 'Stwórzmy przychód!',
     'no_transactions_intro_deposit'         => 'Jeszcze nie masz przychodów. Powinieneś utworzyć przychody aby rozpocząć zarządzanie swoimi finansami.',
     'no_transactions_imperative_deposit'    => 'Otrzymałeś trochę pieniędzy? Zatem powinieneś je zapisać:',
-    'no_transactions_create_deposit'        => '',
+    'no_transactions_create_deposit'        => 'Create a deposit',
     'no_transactions_title_transfers'       => 'Stwórzmy transfer!',
-    'no_transactions_intro_transfers'       => '',
-    'no_transactions_imperative_transfers'  => '',
+    'no_transactions_intro_transfers'       => 'You have no transfers yet. When you move money between asset accounts, it is recorded as a transfer.',
+    'no_transactions_imperative_transfers'  => 'Have you moved some money around? Then you should write it down:',
     'no_transactions_create_transfers'      => 'Utwórz transfer',
     'no_piggies_title_default'              => 'Stwórzmy skarbonkę!',
-    'no_piggies_intro_default'              => '',
-    'no_piggies_imperative_default'         => '',
+    'no_piggies_intro_default'              => 'You have no piggy banks yet. You can create piggy banks to divide your savings and keep track of what you\'re saving up for.',
+    'no_piggies_imperative_default'         => 'Do you have things you\'re saving money for? Create a piggy bank and keep track:',
     'no_piggies_create_default'             => 'Utwórz nową skarbonkę',
     'no_bills_title_default'                => 'Stwórzmy rachunek!',
-    'no_bills_intro_default'                => '',
-    'no_bills_imperative_default'           => '',
+    'no_bills_intro_default'                => 'You have no bills yet. You can create bills to keep track of regular expenses, like your rent of insurance.',
+    'no_bills_imperative_default'           => 'Do you have such regular bills? Create a bill and keep track of your payments:',
     'no_bills_create_default'               => 'Utwórz rachunek',
 
 

From 7758dcaababa9c7a3b77e85ce3aed49175e63547 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Fri, 25 Aug 2017 07:37:20 +0200
Subject: [PATCH 349/668] New translations firefly.php (Portuguese, Brazilian)

---
 resources/lang/pt_BR/firefly.php | 526 +++++++++++++++----------------
 1 file changed, 263 insertions(+), 263 deletions(-)

diff --git a/resources/lang/pt_BR/firefly.php b/resources/lang/pt_BR/firefly.php
index 483753013b..4b99a70477 100644
--- a/resources/lang/pt_BR/firefly.php
+++ b/resources/lang/pt_BR/firefly.php
@@ -27,7 +27,7 @@ return [
     'to'                                         => 'Até',
     'showEverything'                             => 'Mostrar tudo',
     'never'                                      => 'Nunca',
-    'no_results_for_empty_search'                => '',
+    'no_results_for_empty_search'                => 'Your search was empty, so nothing was found.',
     'removed_amount'                             => ':amount removido',
     'added_amount'                               => ':amount adicionada',
     'asset_account_role_help'                    => 'Quaisquer opções extras resultantes da sua escolha pode ser definido mais tarde.',
@@ -70,75 +70,75 @@ return [
     'source_accounts'                            => 'Conta(s) de origem',
     'destination_accounts'                       => 'Conta(s) de destino',
     'user_id_is'                                 => 'Seu id de usuário é <strong>:user</strong>',
-    'field_supports_markdown'                    => '',
-    'need_more_help'                             => '',
-    'reenable_intro_text'                        => '',
-    'intro_boxes_after_refresh'                  => '',
-    'show_all_no_filter'                         => '',
+    'field_supports_markdown'                    => 'This field supports <a href="https://en.support.wordpress.com/markdown-quick-reference/">Markdown</a>.',
+    'need_more_help'                             => 'If you need more help using Firefly III, please <a href="https://github.com/firefly-iii/firefly-iii/issues">open a ticket on Github</a>.',
+    'reenable_intro_text'                        => 'You can also reenable <a href="#" id="reenableGuidance">the introduction guidance</a>.',
+    'intro_boxes_after_refresh'                  => 'The introduction boxes will reappear when you refresh the page.',
+    'show_all_no_filter'                         => 'Show all transactions without grouping them by date.',
     'expenses_by_category'                       => 'Despesa por categoria',
     'expenses_by_budget'                         => 'Despesas pelo orçamento',
     'income_by_category'                         => 'Receitas por categoria',
-    'expenses_by_asset_account'                  => '',
-    'expenses_by_expense_account'                => '',
+    'expenses_by_asset_account'                  => 'Expenses by asset account',
+    'expenses_by_expense_account'                => 'Expenses by expense account',
     'cannot_redirect_to_account'                 => 'Firefly III não pode redirecioná-lo para a página correta. Minhas desculpas.',
-    'sum_of_expenses'                            => '',
-    'sum_of_income'                              => '',
-    'total_sum'                                  => '',
-    'spent_in_specific_budget'                   => '',
-    'sum_of_expenses_in_budget'                  => '',
-    'left_in_budget_limit'                       => '',
-    'cannot_reset_demo_user'                     => '',
-    'current_period'                             => '',
-    'show_the_current_period_and_overview'       => '',
-    'pref_languages_locale'                      => '',
-    'budget_in_period'                           => '',
-    'chart_budget_in_period'                     => '',
-    'chart_account_in_period'                    => '',
-    'chart_category_in_period'                   => '',
-    'chart_category_all'                         => '',
-    'clone_withdrawal'                           => '',
-    'clone_deposit'                              => '',
-    'clone_transfer'                             => '',
-    'multi_select_no_selection'                  => '',
-    'multi_select_all_selected'                  => '',
-    'multi_select_filter_placeholder'            => '',
-    'between_dates_breadcrumb'                   => '',
-    'all_journals_without_budget'                => '',
-    'journals_without_budget'                    => '',
-    'all_journals_without_category'              => '',
-    'journals_without_category'                  => '',
-    'all_journals_for_account'                   => '',
-    'chart_all_journals_for_account'             => '',
-    'journals_in_period_for_account'             => '',
-    'transferred'                                => '',
-    'all_withdrawal'                             => '',
-    'all_transactions'                           => '',
-    'title_withdrawal_between'                   => '',
-    'all_deposit'                                => '',
-    'title_deposit_between'                      => '',
-    'all_transfers'                              => '',
-    'title_transfers_between'                    => '',
-    'all_transfer'                               => '',
-    'all_journals_for_tag'                       => '',
-    'title_transfer_between'                     => '',
-    'all_journals_for_category'                  => '',
-    'all_journals_for_budget'                    => '',
-    'chart_all_journals_for_budget'              => '',
-    'journals_in_period_for_category'            => '',
-    'journals_in_period_for_tag'                 => '',
-    'not_available_demo_user'                    => '',
-    'exchange_rate_instructions'                 => '',
-    'transfer_exchange_rate_instructions'        => '',
-    'transaction_data'                           => '',
+    'sum_of_expenses'                            => 'Sum of expenses',
+    'sum_of_income'                              => 'Sum of income',
+    'total_sum'                                  => 'Total sum',
+    'spent_in_specific_budget'                   => 'Spent in budget ":budget"',
+    'sum_of_expenses_in_budget'                  => 'Spent total in budget ":budget"',
+    'left_in_budget_limit'                       => 'Left to spend according to budgeting',
+    'cannot_reset_demo_user'                     => 'You cannot reset the password of the demonstration account',
+    'current_period'                             => 'Current period',
+    'show_the_current_period_and_overview'       => 'Show the current period and overview',
+    'pref_languages_locale'                      => 'For a language other than English to work properly, your operating system must be equipped with the correct locale-information. If these are not present, currency data, dates and amounts may be formatted wrong.',
+    'budget_in_period'                           => 'All transactions for budget ":name" between :start and :end',
+    'chart_budget_in_period'                     => 'Chart for all transactions for budget ":name" between :start and :end',
+    'chart_account_in_period'                    => 'Chart for all transactions for account ":name" between :start and :end',
+    'chart_category_in_period'                   => 'Chart for all transactions for category ":name" between :start and :end',
+    'chart_category_all'                         => 'Chart for all transactions for category ":name"',
+    'clone_withdrawal'                           => 'Clone this withdrawal',
+    'clone_deposit'                              => 'Clone this deposit',
+    'clone_transfer'                             => 'Clone this transfer',
+    'multi_select_no_selection'                  => 'None selected',
+    'multi_select_all_selected'                  => 'All selected',
+    'multi_select_filter_placeholder'            => 'Find..',
+    'between_dates_breadcrumb'                   => 'Between :start and :end',
+    'all_journals_without_budget'                => 'All transactions without a budget',
+    'journals_without_budget'                    => 'Transactions without a budget',
+    'all_journals_without_category'              => 'All transactions without a category',
+    'journals_without_category'                  => 'Transactions without a category',
+    'all_journals_for_account'                   => 'All transactions for account :name',
+    'chart_all_journals_for_account'             => 'Chart of all transactions for account :name',
+    'journals_in_period_for_account'             => 'All transactions for account :name between :start and :end',
+    'transferred'                                => 'Transferred',
+    'all_withdrawal'                             => 'All expenses',
+    'all_transactions'                           => 'All transactions',
+    'title_withdrawal_between'                   => 'All expenses between :start and :end',
+    'all_deposit'                                => 'All revenue',
+    'title_deposit_between'                      => 'All revenue between :start and :end',
+    'all_transfers'                              => 'All transfers',
+    'title_transfers_between'                    => 'All transfers between :start and :end',
+    'all_transfer'                               => 'All transfers',
+    'all_journals_for_tag'                       => 'All transactions for tag ":tag"',
+    'title_transfer_between'                     => 'All transfers between :start and :end',
+    'all_journals_for_category'                  => 'All transactions for category :name',
+    'all_journals_for_budget'                    => 'All transactions for budget :name',
+    'chart_all_journals_for_budget'              => 'Chart of all transactions for budget :name',
+    'journals_in_period_for_category'            => 'All transactions for category :name between :start and :end',
+    'journals_in_period_for_tag'                 => 'All transactions for tag :tag between :start and :end',
+    'not_available_demo_user'                    => 'The feature you try to access is not available to demo users.',
+    'exchange_rate_instructions'                 => 'Asset account "@name" only accepts transactions in @native_currency. If you wish to use @foreign_currency instead, make sure that the amount in @native_currency is known as well:',
+    'transfer_exchange_rate_instructions'        => 'Source asset account "@source_name" only accepts transactions in @source_currency. Destination asset account "@dest_name" only accepts transactions in @dest_currency. You must provide the transferred amount correctly in both currencies.',
+    'transaction_data'                           => 'Transaction data',
 
     // search
     'search'                                     => 'Pesquisa',
-    'search_found_transactions'                  => '',
-    'general_search_error'                       => '',
-    'search_box'                                 => '',
-    'search_box_intro'                           => '',
-    'search_error'                               => '',
-    'search_searching'                           => '',
+    'search_found_transactions'                  => 'Number of transactions found:',
+    'general_search_error'                       => 'An error occured while searching. Please check the log files for more information.',
+    'search_box'                                 => 'Search',
+    'search_box_intro'                           => 'Welcome to the search function of Firefly III. Enter your search query in the box. Make sure you check out the help file because the search is pretty advanced.',
+    'search_error'                               => 'Error while searching',
+    'search_searching'                           => 'Searching ...',
 
     // repeat frequencies:
     'repeat_freq_yearly'                         => 'anual',
@@ -228,14 +228,14 @@ return [
     'warning_transaction_subset'                 => 'Por razões de desempenho esta lista está limitado a :max_num_transactions e só pode mostrar um subconjunto das transações correspondentes',
     'warning_no_matching_transactions'           => 'Nenhuma transação correspondente encontrada. Por favor note que por motivos de desempenho, apenas as últimas :num_transactions transações tenham sido verificadas.',
     'warning_no_valid_triggers'                  => 'Sem gatilhos válidos fornecidos.',
-    'apply_rule_selection'                       => '',
-    'apply_rule_selection_intro'                 => '',
+    'apply_rule_selection'                       => 'Apply rule ":title" to a selection of your transactions',
+    'apply_rule_selection_intro'                 => 'Rules like ":title" are normally only applied to new or updated transactions, but you can tell Firefly III to run it on a selection of your existing transactions. This can be useful when you have updated a rule and you need the changes to be applied to all of your other transactions.',
     'include_transactions_from_accounts'         => 'Incluir as transações destas contas',
-    'applied_rule_selection'                     => '',
+    'applied_rule_selection'                     => 'Rule ":title" has been applied to your selection.',
     'execute'                                    => 'Executar',
-    'apply_rule_group_selection'                 => '',
-    'apply_rule_group_selection_intro'           => '',
-    'applied_rule_group_selection'               => '',
+    'apply_rule_group_selection'                 => 'Apply rule group ":title" to a selection of your transactions',
+    'apply_rule_group_selection_intro'           => 'Rule groups like ":title" are normally only applied to new or updated transactions, but you can tell Firefly III to run all the rules in this group on a selection of your existing transactions. This can be useful when you have updated a group of rules and you need the changes to be applied to all of your other transactions.',
+    'applied_rule_group_selection'               => 'Rule group ":title" has been applied to your selection.',
 
     // actions and triggers
     'rule_trigger_user_action'                   => 'Ação do usuário é ":trigger_value"',
@@ -248,7 +248,7 @@ return [
     'rule_trigger_to_account_is'                 => 'Conta de destino é ":trigger_value"',
     'rule_trigger_to_account_contains'           => 'Conta de destino contém ":trigger_value"',
     'rule_trigger_transaction_type'              => 'Transação é do tipo ":trigger_value"',
-    'rule_trigger_category_is'                   => '',
+    'rule_trigger_category_is'                   => 'Category is ":trigger_value"',
     'rule_trigger_amount_less'                   => 'Quantia é inferior :trigger_value',
     'rule_trigger_amount_exactly'                => 'Quantia é: trigger_value',
     'rule_trigger_amount_more'                   => 'Quantia é mais de :trigger_value',
@@ -272,13 +272,13 @@ return [
     'rule_trigger_description_ends_choice'       => 'Descrição termina com..',
     'rule_trigger_description_contains_choice'   => 'Descrição contém..',
     'rule_trigger_description_is_choice'         => 'Descrição é..',
-    'rule_trigger_category_is_choice'            => '',
-    'rule_trigger_budget_is_choice'              => '',
-    'rule_trigger_tag_is_choice'                 => '',
-    'rule_trigger_has_attachments_choice'        => '',
-    'rule_trigger_has_attachments'               => '',
-    'rule_trigger_store_journal'                 => '',
-    'rule_trigger_update_journal'                => '',
+    'rule_trigger_category_is_choice'            => 'Category is..',
+    'rule_trigger_budget_is_choice'              => 'Budget is..',
+    'rule_trigger_tag_is_choice'                 => '(A) tag is..',
+    'rule_trigger_has_attachments_choice'        => 'Has at least this many attachments',
+    'rule_trigger_has_attachments'               => 'Has at least :trigger_value attachment(s)',
+    'rule_trigger_store_journal'                 => 'When a transaction is created',
+    'rule_trigger_update_journal'                => 'When a transaction is updated',
     'rule_action_set_category'                   => 'Definir categoria para ":action_value"',
     'rule_action_clear_category'                 => 'Limpar categoria',
     'rule_action_set_budget'                     => 'Definir orçamento para ":action_value"',
@@ -345,7 +345,7 @@ return [
     'preferences_security'                       => 'Segurança',
     'preferences_layout'                         => 'Layout',
     'pref_home_show_deposits'                    => 'Depósitos de mostrar na tela inicial',
-    'pref_home_show_deposits_info'               => '',
+    'pref_home_show_deposits_info'               => 'The home screen already shows your expense accounts. Should it also show your revenue accounts?',
     'pref_home_do_show_deposits'                 => 'Sim, mostrar-lhes',
     'successful_count'                           => 'dos quais :count bem sucedida',
     'transaction_page_size_title'                => 'Tamanho da página',
@@ -353,7 +353,7 @@ return [
     'transaction_page_size_label'                => 'Tamanho da página',
     'between_dates'                              => '(:start e :end)',
     'pref_optional_fields_transaction'           => 'Campos opcionais para transações',
-    'pref_optional_fields_transaction_help'      => '',
+    'pref_optional_fields_transaction_help'      => 'By default not all fields are enabled when creating a new transaction (because of the clutter). Below, you can enable these fields if you think they could be useful for you. Of course, any field that is disabled, but already filled in, will be visible regardless of the setting.',
     'optional_tj_date_fields'                    => 'Campos de data',
     'optional_tj_business_fields'                => 'Campos de negócios',
     'optional_tj_attachment_fields'              => 'Campos de anexo',
@@ -388,16 +388,16 @@ return [
     'password_changed'                           => 'Senha alterada!',
     'should_change'                              => 'A idéia é alterar sua senha.',
     'invalid_password'                           => 'Senha inválida!',
-    'what_is_pw_security'                        => '',
-    'secure_pw_title'                            => '',
-    'secure_pw_history'                          => '',
-    'secure_pw_check_box'                        => '',
-    'secure_pw_sha1'                             => '',
-    'secure_pw_hash_speed'                       => '',
-    'secure_pw_hash_security'                    => '',
-    'secure_pw_should'                           => '',
-    'secure_pw_long_password'                    => '',
-    'secure_pw_short'                            => '',
+    'what_is_pw_security'                        => 'What is "verify password security"?',
+    'secure_pw_title'                            => 'How to choose a secure password',
+    'secure_pw_history'                          => 'In August 2017 well known security researcher Troy Hunt released a list of 306 million stolen passwords. These passwords were stolen during breakins at companies like LinkedIn, Adobe and NeoPets (and many more).',
+    'secure_pw_check_box'                        => 'By checking the box, Firefly III will send the SHA1 hash of your password to <a href="https://www.troyhunt.com/introducing-306-million-freely-downloadable-pwned-passwords/">the website of Troy Hunt</a> to see if it is on the list. This will stop you from using unsafe passwords as is recommended in the latest <a href="https://pages.nist.gov/800-63-3/sp800-63b.html">NIST Special Publication</a> on this subject.',
+    'secure_pw_sha1'                             => 'But I thought SHA1 was broken?',
+    'secure_pw_hash_speed'                       => 'Yes, but not in this context. As you can read on <a href="https://shattered.io/">the website detailing how they broke SHA1</a>, it is now slightly easier to find a "collision": another string that results in the same SHA1-hash. It now only takes 10,000 years using a single-GPU machine.',
+    'secure_pw_hash_security'                    => 'This collision would not be equal to your password, nor would it be useful on (a site like) Firefly III. This application does not use SHA1 for password verification. So it is safe to check this box. Your password is hashed and sent over HTTPS.',
+    'secure_pw_should'                           => 'Should I check the box?',
+    'secure_pw_long_password'                    => 'If you just generated a long, single-use password for Firefly III using some kind of password generator: <strong>no</strong>.',
+    'secure_pw_short'                            => 'If you just entered the password you always use: <em>Please yes</em>.',
 
 
     // attachments
@@ -442,15 +442,15 @@ return [
     'convert_please_set_asset_destination'       => 'Por favor, escolha a conta de ativo para onde vai o dinheiro.',
     'convert_please_set_expense_destination'     => 'Por favor, escolha a conta de despesas para onde o dinheiro vai.',
     'convert_please_set_asset_source'            => 'Por favor, escolha a conta de ativo, de onde virá o dinheiro.',
-    'convert_explanation_withdrawal_deposit'     => '',
-    'convert_explanation_withdrawal_transfer'    => '',
-    'convert_explanation_deposit_withdrawal'     => '',
-    'convert_explanation_deposit_transfer'       => '',
-    'convert_explanation_transfer_withdrawal'    => '',
-    'convert_explanation_transfer_deposit'       => '',
-    'converted_to_Withdrawal'                    => '',
-    'converted_to_Deposit'                       => '',
-    'converted_to_Transfer'                      => '',
+    'convert_explanation_withdrawal_deposit'     => 'If you convert this withdrawal into a deposit, :amount will be deposited into <a href=":sourceRoute">:sourceName</a> instead of taken from it.',
+    'convert_explanation_withdrawal_transfer'    => 'If you convert this withdrawal into a transfer, :amount will be transferred from <a href=":sourceRoute">:sourceName</a> to a new asset account, instead of being paid to <a href=":destinationRoute">:destinationName</a>.',
+    'convert_explanation_deposit_withdrawal'     => 'If you convert this deposit into a withdrawal, :amount will be removed from <a href=":destinationRoute">:destinationName</a> instead of added to it.',
+    'convert_explanation_deposit_transfer'       => 'If you convert this deposit into a transfer, :amount will be transferred from an asset account of your choice into <a href=":destinationRoute">:destinationName</a>.',
+    'convert_explanation_transfer_withdrawal'    => 'If you convert this transfer into a withdrawal, :amount will go from <a href=":sourceRoute">:sourceName</a> to a new destination as an expense, instead of to <a href=":destinationRoute">:destinationName</a> as a transfer.',
+    'convert_explanation_transfer_deposit'       => 'If you convert this transfer into a deposit, :amount will be deposited into account <a href=":destinationRoute">:destinationName</a> instead of being transferred there.',
+    'converted_to_Withdrawal'                    => 'The transaction has been converted to a withdrawal',
+    'converted_to_Deposit'                       => 'The transaction has been converted to a deposit',
+    'converted_to_Transfer'                      => 'The transaction has been converted to a transfer',
 
 
     // create new stuff:
@@ -468,7 +468,7 @@ return [
     'store_currency'                             => 'Armazenar nova moeda',
     'update_currency'                            => 'Atualizar moeda',
     'new_default_currency'                       => 'Agora :name é a moeda padrão.',
-    'cannot_delete_currency'                     => '',
+    'cannot_delete_currency'                     => 'Cannot delete :name because it is still in use.',
     'deleted_currency'                           => 'Moeda :name excluída',
     'created_currency'                           => 'Moeda :name criada',
     'updated_currency'                           => 'Moeda :name atualizada',
@@ -500,7 +500,7 @@ return [
     'update_amount'                              => 'Atualizar quantia',
     'update_budget'                              => 'Atualizar Orçamento',
     'update_budget_amount_range'                 => 'Atualizar quantia disponível (esperada) entre :start e :end',
-    'budget_period_navigator'                    => '',
+    'budget_period_navigator'                    => 'Period navigator',
 
     // bills:
     'matching_on'                                => 'Corresponde em',
@@ -525,8 +525,8 @@ return [
     'average_bill_amount_overall'                => 'Média de fatura (geral)',
     'not_or_not_yet'                             => 'Não (ainda)',
     'not_expected_period'                        => 'Não esperado neste período',
-    'bill_is_active'                             => '',
-    'bill_will_automatch'                        => '',
+    'bill_is_active'                             => 'Bill is active',
+    'bill_will_automatch'                        => 'Bill will automatically linked to matching transactions',
     // accounts:
     'details_for_asset'                          => 'Detalhes para a conta de ativo ":name"',
     'details_for_expense'                        => 'Detalhes para a conta de despesas ":name"',
@@ -560,13 +560,13 @@ return [
     'stored_new_account'                         => 'Nova conta ":name" armazenado!',
     'updated_account'                            => 'Conta ":name" atualizada',
     'credit_card_options'                        => 'Opções de cartão de crédito',
-    'no_transactions_account'                    => '',
-    'no_data_for_chart'                          => '',
+    'no_transactions_account'                    => 'There are no transactions (in this period) for asset account ":name".',
+    'no_data_for_chart'                          => 'There is not enough information (yet) to generate this chart.',
     'select_more_than_one_account'               => 'Por favor, selecione mais de uma conta',
     'select_more_than_one_category'              => 'Por favor, selecione mais de uma categoria',
-    'select_more_than_one_budget'                => '',
-    'select_more_than_one_tag'                   => '',
-    'account_default_currency'                   => '',
+    'select_more_than_one_budget'                => 'Please select more than one budget',
+    'select_more_than_one_tag'                   => 'Please select more than one tag',
+    'account_default_currency'                   => 'If you select another currency, new transactions from this account will have this currency pre-selected.',
 
     // categories:
     'new_category'                               => 'Nova categoria',
@@ -614,9 +614,9 @@ return [
     'welcome'                                    => 'Bem Vindo ao Firefly!',
     'submit'                                     => 'Enviar',
     'getting_started'                            => 'Iniciar',
-    'to_get_started'                             => '',
-    'savings_balance_text'                       => '',
-    'finish_up_new_user'                         => '',
+    'to_get_started'                             => 'It is good to see you have successfully installed Firefly III. To get started with this tool please enter your bank\'s name and the balance of your main checking account. Do not worry yet if you have multiple accounts. You can add those later. It\'s just that Firefly III needs something to start with.',
+    'savings_balance_text'                       => 'Firefly III will automatically create a savings account for you. By default, there will be no money in your savings account, but if you tell Firefly III the balance it will be stored as such.',
+    'finish_up_new_user'                         => 'That\'s it! You can continue by pressing <strong>Submit</strong>. You will be taken to the index of Firefly III.',
     'stored_new_accounts_new_user'               => 'Yay! Suas novas contas foram armazenadas.',
 
     // home page:
@@ -674,11 +674,11 @@ return [
     'errors'                                     => 'Erros',
 
     // reports:
-    'report_default'                             => '',
-    'report_audit'                               => '',
-    'report_category'                            => '',
-    'report_budget'                              => '',
-    'report_tag'                                 => '',
+    'report_default'                             => 'Default financial report between :start and :end',
+    'report_audit'                               => 'Transaction history overview between :start and :end',
+    'report_category'                            => 'Category report between :start and :end',
+    'report_budget'                              => 'Budget report between :start and :end',
+    'report_tag'                                 => 'Tag report between :start and :end',
     'quick_link_reports'                         => 'Ligações rápidas',
     'quick_link_default_report'                  => 'Relatório financeiro padrão',
     'quick_link_audit_report'                    => 'Visão geral do histórico de transação',
@@ -705,13 +705,13 @@ return [
     'out'                                        => 'Saída',
     'topX'                                       => 'topo :number',
     'show_full_list'                             => 'Mostrar a lista inteira',
-    'show_only_top'                              => '',
+    'show_only_top'                              => 'Show only top :number',
     'report_type'                                => 'Tipo de relatório',
     'report_type_default'                        => 'Relatório financeiro padrão',
     'report_type_audit'                          => 'Visão geral do histórico de transação (auditoria)',
     'report_type_category'                       => 'Relatório por Categorias',
-    'report_type_budget'                         => '',
-    'report_type_tag'                            => '',
+    'report_type_budget'                         => 'Budget report',
+    'report_type_tag'                            => 'Tag report',
     'more_info_help'                             => 'Mais informações sobre esses tipos de relatórios podem ser encontradas nas páginas de ajuda. Pressione o ícone (?) no canto superior direito.',
     'report_included_accounts'                   => 'Contas incluídas',
     'report_date_range'                          => 'Período',
@@ -729,23 +729,23 @@ return [
     'report_has_no_extra_options'                => 'Este relatório não tem mais opções',
     'reports_submit'                             => 'Visualizar relatório',
     'end_after_start_date'                       => 'Data de término do relatório deve ser depois da data de início.',
-    'select_category'                            => '',
-    'select_budget'                              => '',
-    'select_tag'                                 => '',
+    'select_category'                            => 'Select category(ies)',
+    'select_budget'                              => 'Select budget(s).',
+    'select_tag'                                 => 'Select tag(s).',
     'income_per_category'                        => 'Receitas por categoria',
     'expense_per_category'                       => 'Despesa por categoria',
-    'expense_per_budget'                         => '',
+    'expense_per_budget'                         => 'Expense per budget',
     'income_per_account'                         => 'Rendimento por conta',
     'expense_per_account'                        => 'Por conta de despesas',
-    'expense_per_tag'                            => '',
-    'income_per_tag'                             => '',
-    'include_expense_not_in_budget'              => '',
-    'include_expense_not_in_account'             => '',
-    'include_expense_not_in_category'            => '',
-    'include_income_not_in_category'             => '',
-    'include_income_not_in_account'              => '',
-    'include_income_not_in_tags'                 => '',
-    'include_expense_not_in_tags'                => '',
+    'expense_per_tag'                            => 'Expense per tag',
+    'income_per_tag'                             => 'Income per tag',
+    'include_expense_not_in_budget'              => 'Included expenses not in the selected budget(s)',
+    'include_expense_not_in_account'             => 'Included expenses not in the selected account(s)',
+    'include_expense_not_in_category'            => 'Included expenses not in the selected category(ies)',
+    'include_income_not_in_category'             => 'Included income not in the selected category(ies)',
+    'include_income_not_in_account'              => 'Included income not in the selected account(s)',
+    'include_income_not_in_tags'                 => 'Included income not in the selected tag(s)',
+    'include_expense_not_in_tags'                => 'Included expenses not in the selected tag(s)',
     'everything_else'                            => 'Todo o resto',
     'income_and_expenses'                        => 'Receitas e despesas',
     'spent_average'                              => 'Gastos (média)',
@@ -755,27 +755,27 @@ return [
     'average_income_per_account'                 => 'Rendimento médio por conta',
     'total'                                      => 'Total',
     'description'                                => 'Descrição',
-    'sum_of_period'                              => '',
-    'average_in_period'                          => '',
-    'account_role_defaultAsset'                  => '',
-    'account_role_sharedAsset'                   => '',
-    'account_role_savingAsset'                   => '',
-    'account_role_ccAsset'                       => '',
+    'sum_of_period'                              => 'Sum of period',
+    'average_in_period'                          => 'Average in period',
+    'account_role_defaultAsset'                  => 'Default asset account',
+    'account_role_sharedAsset'                   => 'Shared asset account',
+    'account_role_savingAsset'                   => 'Savings account',
+    'account_role_ccAsset'                       => 'Credit card',
 
     // charts:
     'chart'                                      => 'Gráfico',
     'month'                                      => 'Mês',
     'budget'                                     => 'Orçamento',
     'spent'                                      => 'Gasto',
-    'spent_in_budget'                            => '',
-    'left_to_spend'                              => '',
+    'spent_in_budget'                            => 'Spent in budget',
+    'left_to_spend'                              => 'Left to spend',
     'earned'                                     => 'Ganho',
     'overspent'                                  => 'Gasto excedido',
     'left'                                       => 'Esquerda',
     'no_budget'                                  => '(sem orçamento)',
-    'max-amount'                                 => '',
-    'min-amount'                                 => '',
-    'journal-amount'                             => '',
+    'max-amount'                                 => 'Maximum amount',
+    'min-amount'                                 => 'Minumum amount',
+    'journal-amount'                             => 'Current bill entry',
     'name'                                       => 'Nome',
     'date'                                       => 'Data',
     'paid'                                       => 'Pago',
@@ -791,7 +791,7 @@ return [
     // piggy banks:
     'add_money_to_piggy'                         => 'Adicionar dinheiro ao cofrinho ":name"',
     'piggy_bank'                                 => 'Cofrinho',
-    'new_piggy_bank'                             => '',
+    'new_piggy_bank'                             => 'New piggy bank',
     'store_piggy_bank'                           => 'Armazenar novo cofrinho',
     'stored_piggy_bank'                          => 'Armazenar novo cofrinho ":name"',
     'account_status'                             => 'Status da Conta',
@@ -799,7 +799,7 @@ return [
     'sum_of_piggy_banks'                         => 'Soma dos cofrinhos',
     'saved_so_far'                               => 'Salvo até agora',
     'left_to_save'                               => 'Esquerda para salvar',
-    'suggested_amount'                           => '',
+    'suggested_amount'                           => 'Suggested monthly amount to save',
     'add_money_to_piggy_title'                   => 'Adicionar dinheiro ao cofrinho ":name"',
     'remove_money_from_piggy_title'              => 'Retire o dinheiro do cofrinho ":name"',
     'add'                                        => 'Adicionar',
@@ -819,7 +819,7 @@ return [
     'table'                      => 'Tabela',
     'delete_piggy_bank'          => 'Apagar cofrinho ":name"',
     'cannot_add_amount_piggy'    => 'Não foi possível adicionar :amount a ":name".',
-    'cannot_remove_from_piggy'   => '',
+    'cannot_remove_from_piggy'   => 'Could not remove :amount from ":name".',
     'deleted_piggy_bank'         => 'Apagar cofrinho ":name"',
     'added_amount_to_piggy'      => 'Adicionado :amount de ":name"',
     'removed_amount_from_piggy'  => 'Removido :amount de ":name"',
@@ -838,7 +838,7 @@ return [
     'transaction_journal_information'       => 'Informação da transação',
     'transaction_journal_meta'              => 'Meta-informação',
     'total_amount'                          => 'Valor total',
-    'number_of_decimals'                    => '',
+    'number_of_decimals'                    => 'Number of decimals',
 
     // administration
     'administration'                        => 'Administração',
@@ -848,11 +848,11 @@ return [
     'instance_configuration'                => 'Configuração',
     'firefly_instance_configuration'        => 'Opções de configuração para Firefly III',
     'setting_single_user_mode'              => 'Modo de usuário único',
-    'setting_single_user_mode_explain'      => '',
+    'setting_single_user_mode_explain'      => 'By default, Firefly III only accepts one (1) registration: you. This is a security measure, preventing others from using your instance unless you allow them to. Future registrations are blocked. When you uncheck this box, others can use your instance as wel, assuming they can reach it (when it is connected to the internet).',
     'store_configuration'                   => 'Configuração da Loja',
-    'single_user_administration'            => '',
-    'edit_user'                             => '',
-    'hidden_fields_preferences'             => '',
+    'single_user_administration'            => 'User administration for :email',
+    'edit_user'                             => 'Edit user :email',
+    'hidden_fields_preferences'             => 'Not all fields are visible right now. You must enable them in your <a href=":link">settings</a>.',
     'user_data_information'                 => 'Dados de usuário',
     'user_information'                      => 'Informações do usuário',
     'total_size'                            => 'tamanho total',
@@ -862,43 +862,43 @@ return [
     'rulegroup_or_groups'                   => 'grupo(s) de regra',
     'configuration_updated'                 => 'A configuração foi atualizada',
     'setting_is_demo_site'                  => 'Site demo',
-    'setting_is_demo_site_explain'          => '',
-    'block_code_bounced'                    => '',
-    'block_code_expired'                    => '',
-    'no_block_code'                         => '',
+    'setting_is_demo_site_explain'          => 'If you check this box, this installation will behave as if it is the demo site, which can have weird side effects.',
+    'block_code_bounced'                    => 'Email message(s) bounced',
+    'block_code_expired'                    => 'Demo account expired',
+    'no_block_code'                         => 'No reason for block or user not blocked',
     // links
-    'journal_link_configuration'            => '',
-    'create_new_link_type'                  => '',
-    'store_new_link_type'                   => '',
-    'update_link_type'                      => '',
-    'edit_link_type'                        => '',
-    'updated_link_type'                     => '',
-    'delete_link_type'                      => '',
-    'deleted_link_type'                     => '',
-    'stored_new_link_type'                  => '',
-    'cannot_edit_link_type'                 => '',
-    'link_type_help_name'                   => '',
-    'link_type_help_inward'                 => '',
-    'link_type_help_outward'                => '',
-    'save_connections_by_moving'            => '',
-    'do_not_save_connection'                => '',
-    'link_transaction'                      => '',
-    'link_to_other_transaction'             => '',
-    'select_transaction_to_link'            => '',
-    'this_transaction'                      => '',
-    'transaction'                           => '',
-    'comments'                              => '',
-    'to_link_not_found'                     => '',
-    'invalid_link_data'                     => '',
-    'journals_linked'                       => '',
-    'journals_error_linked'                 => '',
-    'journal_links'                         => '',
-    'this_withdrawal'                       => '',
-    'this_deposit'                          => '',
-    'this_transfer'                         => '',
-    'overview_for_link'                     => '',
-    'delete_journal_link'                   => '',
-    'deleted_link'                          => '',
+    'journal_link_configuration'            => 'Transaction links configuration',
+    'create_new_link_type'                  => 'Create new link type',
+    'store_new_link_type'                   => 'Store new link type',
+    'update_link_type'                      => 'Update link type',
+    'edit_link_type'                        => 'Edit link type ":name"',
+    'updated_link_type'                     => 'Updated link type ":name"',
+    'delete_link_type'                      => 'Delete link type ":name"',
+    'deleted_link_type'                     => 'Deleted link type ":name"',
+    'stored_new_link_type'                  => 'Store new link type ":name"',
+    'cannot_edit_link_type'                 => 'Cannot edit link type ":name"',
+    'link_type_help_name'                   => 'Ie. "Duplicates"',
+    'link_type_help_inward'                 => 'Ie. "duplicates"',
+    'link_type_help_outward'                => 'Ie. "is duplicated by"',
+    'save_connections_by_moving'            => 'Save the link between these transaction(s) by moving them to another link type:',
+    'do_not_save_connection'                => '(do not save connection)',
+    'link_transaction'                      => 'Link transaction',
+    'link_to_other_transaction'             => 'Link this transaction to another transaction',
+    'select_transaction_to_link'            => 'Select a transaction to link this transaction to',
+    'this_transaction'                      => 'This transaction',
+    'transaction'                           => 'Transaction',
+    'comments'                              => 'Comments',
+    'to_link_not_found'                     => 'If the transaction you want to link to is not listed, simply enter its ID.',
+    'invalid_link_data'                     => 'Invalid link type selected. Cannot link transaction.',
+    'journals_linked'                       => 'Transactions are linked.',
+    'journals_error_linked'                 => 'These transactions are already linked.',
+    'journal_links'                         => 'Transaction links',
+    'this_withdrawal'                       => 'This withdrawal',
+    'this_deposit'                          => 'This deposit',
+    'this_transfer'                         => 'This transfer',
+    'overview_for_link'                     => 'Overview for link type ":name"',
+    'delete_journal_link'                   => 'Delete the link between <a href=":source_link">:source</a> and <a href=":destination_link">:destination</a>',
+    'deleted_link'                          => 'Deleted link',
 
 
     // split a transaction:
@@ -911,7 +911,7 @@ return [
     'split_this_transfer'                   => 'Dividir essa transferência',
     'cannot_edit_multiple_source'           => 'Você não pode editar transações parceladas #:id com a descrição ":description" porque ele contém várias contas de origem.',
     'cannot_edit_multiple_dest'             => 'Você não pode editar transações parceladas #:id com a descrição ":description" porque ele contém várias contas de destino.',
-    'cannot_edit_opening_balance'           => '',
+    'cannot_edit_opening_balance'           => 'You cannot edit the opening balance of an account.',
     'no_edit_multiple_left'                 => 'Você não selecionou nenhuma transação válida para editar.',
 
     // import bread crumbs and titles:
@@ -919,94 +919,94 @@ return [
     'import_data'                           => 'Importar dados',
 
     // import index page:
-    'import_index_title'                    => '',
-    'import_index_sub_title'                => '',
-    'import_general_index_intro'            => '',
-    'import_index_intro'                    => '',
-    'import_index_file'                     => '',
-    'import_index_config'                   => '',
-    'import_index_type'                     => '',
-    'import_index_start'                    => '',
+    'import_index_title'                    => 'Import data into Firefly III',
+    'import_index_sub_title'                => 'Index',
+    'import_general_index_intro'            => 'Welcome to Firefly\'s import routine. There are a few ways of importing data into Firefly III, displayed here as buttons.',
+    'import_index_intro'                    => 'This routine will help you import files from your bank into Firefly III. Please check out the help pages in the top right corner.',
+    'import_index_file'                     => 'Select your file',
+    'import_index_config'                   => 'If you have previously imported data into Firefly III, you may have a configuration file, which will pre-set configuration values for you. For some banks, other users have kindly provided their <a href="https://github.com/firefly-iii/import-configurations/wiki">configuration file</a>.',
+    'import_index_type'                     => 'Select the type of file you will upload',
+    'import_index_start'                    => 'Start importing',
 
     // supported file types:
     'import_file_type_csv'                  => 'CSV (valores separados por vírgula)',
 
     // import configuration routine:
-    'import_config_sub_title'               => '',
-    'import_config_bread_crumb'             => '',
+    'import_config_sub_title'               => 'Set up your import file',
+    'import_config_bread_crumb'             => 'Set up your import file',
 
     // import status page:
-    'import_status_bread_crumb'             => '',
-    'import_status_sub_title'               => '',
-    'import_status_wait_title'              => '',
-    'import_status_wait_text'               => '',
-    'import_status_ready_title'             => '',
-    'import_status_ready_text'              => '',
-    'import_status_ready_config'            => '',
-    'import_status_ready_start'             => '',
-    'import_status_ready_share'             => '',
-    'import_status_running_title'           => '',
-    'import_status_running_placeholder'     => '',
-    'import_status_errors_title'            => '',
-    'import_status_errors_single'           => '',
-    'import_status_errors_multi'            => '',
-    'import_status_fatal_title'             => '',
-    'import_status_fatal_text'              => '',
-    'import_status_fatal_more'              => '',
-    'import_status_finished_title'          => '',
-    'import_status_finished_text'           => '',
-    'import_status_finished_job'            => '',
+    'import_status_bread_crumb'             => 'Import status',
+    'import_status_sub_title'               => 'Import status',
+    'import_status_wait_title'              => 'Please hold...',
+    'import_status_wait_text'               => 'This box will disappear in a moment.',
+    'import_status_ready_title'             => 'Import is ready to start',
+    'import_status_ready_text'              => 'The import is ready to start. All the configuration you needed to do has been done. Please download the configuration file. It will help you with the import should it not go as planned. To actually run the import, you can either execute the following command in your console, or run the web-based import. Depending on your configuration, the console import will give you more feedback.',
+    'import_status_ready_config'            => 'Download configuration',
+    'import_status_ready_start'             => 'Start the import',
+    'import_status_ready_share'             => 'Please consider downloading your configuration and sharing it at the <strong><a href="https://github.com/firefly-iii/import-configurations/wiki">import configuration center</a></strong>. This will allow other users of Firefly III to import their files more easily.',
+    'import_status_running_title'           => 'The import is running',
+    'import_status_running_placeholder'     => 'Please hold for an update...',
+    'import_status_errors_title'            => 'Errors during the import',
+    'import_status_errors_single'           => 'An error has occured during the import. It does not appear to be fatal.',
+    'import_status_errors_multi'            => 'Some errors occured during the import. These do not appear to be fatal.',
+    'import_status_fatal_title'             => 'A fatal error occurred',
+    'import_status_fatal_text'              => 'A fatal error occurred, which the import-routine cannot recover from. Please see the explanation in red below.',
+    'import_status_fatal_more'              => 'If the error is a time-out, the import will have stopped half-way. For some server configurations, it is merely the server that stopped while the import keeps running in the background. To verify this, check out the log files. If the problem persists, consider importing over the command line instead.',
+    'import_status_finished_title'          => 'Import routine finished',
+    'import_status_finished_text'           => 'The import routine has imported your file.',
+    'import_status_finished_job'            => 'The transactions imported can be found in tag <a href=":link" class="label label-success" style="font-size:100%;font-weight:normal;">:tag</a>.',
     'import_with_key'                       => 'Importação com chave \':key\'',
 
     // sandstorm.io errors and messages:
-    'sandstorm_not_available'               => '',
+    'sandstorm_not_available'               => 'This function is not available when you are using Firefly III within a Sandstorm.io environment.',
 
     // empty lists? no objects? instructions:
-    'no_transactions_in_period'             => '',
-    'no_accounts_title_asset'               => '',
-    'no_accounts_intro_asset'               => '',
-    'no_accounts_imperative_asset'          => '',
-    'no_accounts_create_asset'              => '',
-    'no_accounts_title_expense'             => '',
-    'no_accounts_intro_expense'             => '',
-    'no_accounts_imperative_expense'        => '',
-    'no_accounts_create_expense'            => '',
-    'no_accounts_title_revenue'             => '',
-    'no_accounts_intro_revenue'             => '',
-    'no_accounts_imperative_revenue'        => '',
-    'no_accounts_create_revenue'            => '',
-    'no_budgets_title_default'              => '',
-    'no_budgets_intro_default'              => '',
-    'no_budgets_imperative_default'         => '',
-    'no_budgets_create_default'             => '',
-    'no_categories_title_default'           => '',
-    'no_categories_intro_default'           => '',
-    'no_categories_imperative_default'      => '',
-    'no_categories_create_default'          => '',
-    'no_tags_title_default'                 => '',
-    'no_tags_intro_default'                 => '',
-    'no_tags_imperative_default'            => '',
-    'no_tags_create_default'                => '',
-    'no_transactions_title_withdrawal'      => '',
-    'no_transactions_intro_withdrawal'      => '',
-    'no_transactions_imperative_withdrawal' => '',
-    'no_transactions_create_withdrawal'     => '',
-    'no_transactions_title_deposit'         => '',
-    'no_transactions_intro_deposit'         => '',
-    'no_transactions_imperative_deposit'    => '',
-    'no_transactions_create_deposit'        => '',
-    'no_transactions_title_transfers'       => '',
-    'no_transactions_intro_transfers'       => '',
-    'no_transactions_imperative_transfers'  => '',
-    'no_transactions_create_transfers'      => '',
-    'no_piggies_title_default'              => '',
-    'no_piggies_intro_default'              => '',
-    'no_piggies_imperative_default'         => '',
-    'no_piggies_create_default'             => '',
-    'no_bills_title_default'                => '',
-    'no_bills_intro_default'                => '',
-    'no_bills_imperative_default'           => '',
-    'no_bills_create_default'               => '',
+    'no_transactions_in_period'             => 'There are no transactions in this period.',
+    'no_accounts_title_asset'               => 'Let\'s create an asset account!',
+    'no_accounts_intro_asset'               => 'You have no asset accounts yet. Asset accounts are your main accounts: your checking account, savings account, shared account or even your credit card.',
+    'no_accounts_imperative_asset'          => 'To start using Firefly III you must create at least one asset account. Let\'s do so now:',
+    'no_accounts_create_asset'              => 'Create an asset account',
+    'no_accounts_title_expense'             => 'Let\'s create an expense account!',
+    'no_accounts_intro_expense'             => 'You have no expense accounts yet. Expense accounts are the places where you spend money, such as shops and supermarkets.',
+    'no_accounts_imperative_expense'        => 'Expense accounts are created automatically when you create transactions, but you can create one manually too, if you want. Let\'s create one now:',
+    'no_accounts_create_expense'            => 'Create an expense account',
+    'no_accounts_title_revenue'             => 'Let\'s create a revenue account!',
+    'no_accounts_intro_revenue'             => 'You have no revenue accounts yet. Revenue accounts are the places where you receive money from, such as your employer.',
+    'no_accounts_imperative_revenue'        => 'Revenue accounts are created automatically when you create transactions, but you can create one manually too, if you want. Let\'s create one now:',
+    'no_accounts_create_revenue'            => 'Create a revenue account',
+    'no_budgets_title_default'              => 'Let\'s create a budget',
+    'no_budgets_intro_default'              => 'You have no budgets yet. Budgets are used to organise your expenses into logical groups, which you can give a soft-cap to limit your expenses.',
+    'no_budgets_imperative_default'         => 'Budgets are the basic tools of financial management. Let\'s create one now:',
+    'no_budgets_create_default'             => 'Create a budget',
+    'no_categories_title_default'           => 'Let\'s create a category!',
+    'no_categories_intro_default'           => 'You have no categories yet. Categories are used to fine tune your transactions and label them with their designated category.',
+    'no_categories_imperative_default'      => 'Categories are created automatically when you create transactions, but you can create one manually too. Let\'s create one now:',
+    'no_categories_create_default'          => 'Create a category',
+    'no_tags_title_default'                 => 'Let\'s create a tag!',
+    'no_tags_intro_default'                 => 'You have no tags yet. Tags are used to fine tune your transactions and label them with specific keywords.',
+    'no_tags_imperative_default'            => 'Tags are created automatically when you create transactions, but you can create one manually too. Let\'s create one now:',
+    'no_tags_create_default'                => 'Create a tag',
+    'no_transactions_title_withdrawal'      => 'Let\'s create an expense!',
+    'no_transactions_intro_withdrawal'      => 'You have no expenses yet. You should create expenses to start managing your finances.',
+    'no_transactions_imperative_withdrawal' => 'Have you spent some money? Then you should write it down:',
+    'no_transactions_create_withdrawal'     => 'Create an expense',
+    'no_transactions_title_deposit'         => 'Let\'s create some income!',
+    'no_transactions_intro_deposit'         => 'You have no recorded income yet. You should create income entries to start managing your finances.',
+    'no_transactions_imperative_deposit'    => 'Have you received some money? Then you should write it down:',
+    'no_transactions_create_deposit'        => 'Create a deposit',
+    'no_transactions_title_transfers'       => 'Let\'s create a transfer!',
+    'no_transactions_intro_transfers'       => 'You have no transfers yet. When you move money between asset accounts, it is recorded as a transfer.',
+    'no_transactions_imperative_transfers'  => 'Have you moved some money around? Then you should write it down:',
+    'no_transactions_create_transfers'      => 'Create a transfer',
+    'no_piggies_title_default'              => 'Let\'s create a piggy bank!',
+    'no_piggies_intro_default'              => 'You have no piggy banks yet. You can create piggy banks to divide your savings and keep track of what you\'re saving up for.',
+    'no_piggies_imperative_default'         => 'Do you have things you\'re saving money for? Create a piggy bank and keep track:',
+    'no_piggies_create_default'             => 'Create a new piggy bank',
+    'no_bills_title_default'                => 'Let\'s create a bill!',
+    'no_bills_intro_default'                => 'You have no bills yet. You can create bills to keep track of regular expenses, like your rent of insurance.',
+    'no_bills_imperative_default'           => 'Do you have such regular bills? Create a bill and keep track of your payments:',
+    'no_bills_create_default'               => 'Create a bill',
 
 
 ];
\ No newline at end of file

From 907ff896096692f9575e0cc0b29a09d2b922321e Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Fri, 25 Aug 2017 07:37:23 +0200
Subject: [PATCH 350/668] New translations form.php (Chinese Traditional)

---
 resources/lang/zh_TW/form.php | 158 +++++++++++++++++-----------------
 1 file changed, 79 insertions(+), 79 deletions(-)

diff --git a/resources/lang/zh_TW/form.php b/resources/lang/zh_TW/form.php
index 260702cf88..2889759d75 100644
--- a/resources/lang/zh_TW/form.php
+++ b/resources/lang/zh_TW/form.php
@@ -27,14 +27,14 @@ return [
     'match'                          => '匹配於',
     'repeat_freq'                    => '循環週期',
     'journal_currency_id'            => '貨幣',
-    'currency_id'                    => '',
-    'attachments'                    => '',
+    'currency_id'                    => 'Currency',
+    'attachments'                    => 'Attachments',
     'journal_amount'                 => '金額',
     'journal_asset_source_account'   => '資產帳戶 （源頭）',
     'journal_source_account_name'    => '收入帳戶 （源頭）',
     'journal_source_account_id'      => '資產帳戶 （源頭）',
-    'BIC'                            => '',
-    'verify_password'                => '',
+    'BIC'                            => 'BIC',
+    'verify_password'                => 'Verify password security',
     'account_from_id'                => '從帳戶',
     'account_to_id'                  => '到帳戶',
     'source_account'                 => '來源帳戶',
@@ -66,28 +66,28 @@ return [
     'description'                    => '描述',
     'expense_account'                => '支出帳戶',
     'revenue_account'                => '收入帳戶',
-    'decimal_places'                 => '',
-    'exchange_rate_instruction'      => '',
-    'exchanged_amount'               => '',
-    'source_amount'                  => '',
-    'destination_amount'             => '',
-    'native_amount'                  => '',
+    'decimal_places'                 => 'Decimal places',
+    'exchange_rate_instruction'      => 'Foreign currencies',
+    'exchanged_amount'               => 'Exchanged amount',
+    'source_amount'                  => 'Amount (source)',
+    'destination_amount'             => 'Amount (destination)',
+    'native_amount'                  => 'Native amount',
 
     'revenue_account_source'      => '收入帳戶 （源頭）',
     'source_account_asset'        => '來源帳戶 （資產帳戶）',
-    'destination_account_expense' => '',
-    'destination_account_asset'   => '',
+    'destination_account_expense' => 'Destination account (expense account)',
+    'destination_account_asset'   => 'Destination account (asset account)',
     'source_account_revenue'      => '來源帳戶 （收入帳戶）',
-    'type'                        => '',
-    'convert_Withdrawal'          => '',
-    'convert_Deposit'             => '',
-    'convert_Transfer'            => '',
+    'type'                        => 'Type',
+    'convert_Withdrawal'          => 'Convert withdrawal',
+    'convert_Deposit'             => 'Convert deposit',
+    'convert_Transfer'            => 'Convert transfer',
 
 
     'amount'                     => '金額',
     'date'                       => '日期',
     'interest_date'              => '付息日',
-    'book_date'                  => '',
+    'book_date'                  => 'Book date',
     'process_date'               => '處理日期',
     'category'                   => '類別',
     'tags'                       => '標籤',
@@ -96,32 +96,32 @@ return [
     'targetdate'                 => '儲蓄目標日期',
     'tag'                        => '標籤',
     'under'                      => '低於',
-    'symbol'                     => '',
-    'code'                       => '',
-    'iban'                       => '',
+    'symbol'                     => 'Symbol',
+    'code'                       => 'Code',
+    'iban'                       => 'IBAN',
     'accountNumber'              => '帳戶號碼',
     'has_headers'                => '標頭',
     'date_format'                => '日期格式',
-    'specifix'                   => '',
+    'specifix'                   => 'Bank- or file specific fixes',
     'attachments[]'              => '附檔',
     'store_new_withdrawal'       => '存儲新提款',
     'store_new_deposit'          => '存儲新存款',
     'store_new_transfer'         => '存儲新轉帳',
     'add_new_withdrawal'         => '新增提款',
     'add_new_deposit'            => '新增新存款',
-    'add_new_transfer'           => '',
-    'noPiggybank'                => '',
+    'add_new_transfer'           => 'Add a new transfer',
+    'noPiggybank'                => '(no piggy bank)',
     'title'                      => '標題',
     'notes'                      => '備註',
     'filename'                   => '檔案名稱',
-    'mime'                       => '',
-    'size'                       => '',
-    'trigger'                    => '',
-    'stop_processing'            => '',
-    'start_date'                 => '',
-    'end_date'                   => '',
-    'export_start_range'         => '',
-    'export_end_range'           => '',
+    'mime'                       => 'Mime type',
+    'size'                       => 'Size',
+    'trigger'                    => 'Trigger',
+    'stop_processing'            => 'Stop processing',
+    'start_date'                 => 'Start of range',
+    'end_date'                   => 'End of range',
+    'export_start_range'         => 'Start of export range',
+    'export_end_range'           => 'End of export range',
     'export_format'              => '檔案格式',
     'include_attachments'        => '包括上傳的附件',
     'include_old_uploads'        => '包含導入的資料',
@@ -132,68 +132,68 @@ return [
     'delete_category'            => '刪除類別 ":name"',
     'delete_currency'            => '刪除貨幣 ":name"',
     'delete_journal'             => '刪除包含描述 ":description" 的交易',
-    'delete_attachment'          => '',
-    'delete_rule'                => '',
-    'delete_rule_group'          => '',
-    'delete_link_type'           => '',
-    'attachment_areYouSure'      => '',
-    'account_areYouSure'         => '',
+    'delete_attachment'          => 'Delete attachment ":name"',
+    'delete_rule'                => 'Delete rule ":title"',
+    'delete_rule_group'          => 'Delete rule group ":title"',
+    'delete_link_type'           => 'Delete link type ":name"',
+    'attachment_areYouSure'      => 'Are you sure you want to delete the attachment named ":name"?',
+    'account_areYouSure'         => 'Are you sure you want to delete the account named ":name"?',
     'bill_areYouSure'            => '你確定要刪除賬單 ":name" 嗎？',
-    'rule_areYouSure'            => '',
-    'ruleGroup_areYouSure'       => '',
-    'budget_areYouSure'          => '',
-    'category_areYouSure'        => '',
-    'currency_areYouSure'        => '',
-    'piggyBank_areYouSure'       => '',
+    'rule_areYouSure'            => 'Are you sure you want to delete the rule titled ":title"?',
+    'ruleGroup_areYouSure'       => 'Are you sure you want to delete the rule group titled ":title"?',
+    'budget_areYouSure'          => 'Are you sure you want to delete the budget named ":name"?',
+    'category_areYouSure'        => 'Are you sure you want to delete the category named ":name"?',
+    'currency_areYouSure'        => 'Are you sure you want to delete the currency named ":name"?',
+    'piggyBank_areYouSure'       => 'Are you sure you want to delete the piggy bank named ":name"?',
     'journal_areYouSure'         => '你真的要刪除這個描述為 ":description" 的交易嗎？',
-    'mass_journal_are_you_sure'  => '',
+    'mass_journal_are_you_sure'  => 'Are you sure you want to delete these transactions?',
     'tag_areYouSure'             => '你真的要要刪除標籤 ":tag" 嗎？',
-    'journal_link_areYouSure'    => '',
-    'linkType_areYouSure'        => '',
-    'permDeleteWarning'          => '',
-    'mass_make_selection'        => '',
-    'delete_all_permanently'     => '',
-    'update_all_journals'        => '',
-    'also_delete_transactions'   => '',
-    'also_delete_connections'    => '',
-    'also_delete_rules'          => '',
-    'also_delete_piggyBanks'     => '',
-    'bill_keep_transactions'     => '',
-    'budget_keep_transactions'   => '',
-    'category_keep_transactions' => '',
-    'tag_keep_transactions'      => '',
+    'journal_link_areYouSure'    => 'Are you sure you want to delete the link between <a href=":source_link">:source</a> and <a href=":destination_link">:destination</a>?',
+    'linkType_areYouSure'        => 'Are you sure you want to delete the link type ":name" (":inward" / ":outward")?',
+    'permDeleteWarning'          => 'Deleting stuff from Firely is permanent and cannot be undone.',
+    'mass_make_selection'        => 'You can still prevent items from being deleted by removing the checkbox.',
+    'delete_all_permanently'     => 'Delete selected permanently',
+    'update_all_journals'        => 'Update these transactions',
+    'also_delete_transactions'   => 'The only transaction connected to this account will be deleted as well.|All :count transactions connected to this account will be deleted as well.',
+    'also_delete_connections'    => 'The only transaction linked with this link type will lose this connection.|All :count transactions linked with this link type will lose their connection.',
+    'also_delete_rules'          => 'The only rule connected to this rule group will be deleted as well.|All :count rules connected to this rule group will be deleted as well.',
+    'also_delete_piggyBanks'     => 'The only piggy bank connected to this account will be deleted as well.|All :count piggy bank connected to this account will be deleted as well.',
+    'bill_keep_transactions'     => 'The only transaction connected to this bill will not be deleted.|All :count transactions connected to this bill will spared deletion.',
+    'budget_keep_transactions'   => 'The only transaction connected to this budget will not be deleted.|All :count transactions connected to this budget will spared deletion.',
+    'category_keep_transactions' => 'The only transaction connected to this category will not be deleted.|All :count transactions connected to this category will spared deletion.',
+    'tag_keep_transactions'      => 'The only transaction connected to this tag will not be deleted.|All :count transactions connected to this tag will spared deletion.',
 
-    'email'                 => '',
-    'password'              => '',
-    'password_confirmation' => '',
-    'blocked'               => '',
-    'blocked_code'          => '',
+    'email'                 => 'Email address',
+    'password'              => 'Password',
+    'password_confirmation' => 'Password (again)',
+    'blocked'               => 'Is blocked?',
+    'blocked_code'          => 'Reason for block',
 
 
     // admin
-    'domain'                => '',
-    'single_user_mode'      => '',
-    'must_confirm_account'  => '',
-    'is_demo_site'          => '',
+    'domain'                => 'Domain',
+    'single_user_mode'      => 'Single user mode',
+    'must_confirm_account'  => 'New users must activate account',
+    'is_demo_site'          => 'Is demo site',
 
 
     // import
     'import_file'           => '匯入檔案',
-    'configuration_file'    => '',
+    'configuration_file'    => 'Configuration file',
     'import_file_type'      => '匯入檔案類型',
-    'csv_comma'             => '',
-    'csv_semicolon'         => '',
-    'csv_tab'               => '',
-    'csv_delimiter'         => '',
-    'csv_import_account'    => '',
-    'csv_config'            => '',
+    'csv_comma'             => 'A comma (,)',
+    'csv_semicolon'         => 'A semicolon (;)',
+    'csv_tab'               => 'A tab (invisible)',
+    'csv_delimiter'         => 'CSV field delimiter',
+    'csv_import_account'    => 'Default import account',
+    'csv_config'            => 'CSV import configuration',
 
 
     'due_date'           => '到期日',
-    'payment_date'       => '',
-    'invoice_date'       => '',
-    'internal_reference' => '',
+    'payment_date'       => 'Payment date',
+    'invoice_date'       => 'Invoice date',
+    'internal_reference' => 'Internal reference',
 
-    'inward'  => '',
-    'outward' => '',
+    'inward'  => 'Inward description',
+    'outward' => 'Outward description',
 ];
\ No newline at end of file

From d78a5d122577ab200face1e36b5dc746a2ea3f5b Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Fri, 25 Aug 2017 07:37:25 +0200
Subject: [PATCH 351/668] New translations firefly.php (Spanish)

---
 resources/lang/es_ES/firefly.php | 1744 +++++++++++++++---------------
 1 file changed, 872 insertions(+), 872 deletions(-)

diff --git a/resources/lang/es_ES/firefly.php b/resources/lang/es_ES/firefly.php
index c3db80f888..b427e5317f 100644
--- a/resources/lang/es_ES/firefly.php
+++ b/resources/lang/es_ES/firefly.php
@@ -56,957 +56,957 @@ return [
     'two_factor_title'                           => 'Autenticación en dos pasos',
     'authenticate'                               => 'Autentificar',
     'two_factor_forgot_title'                    => 'Autenticación en dos pasos perdida',
-    'two_factor_forgot'                          => '',
-    'two_factor_lost_header'                     => '',
+    'two_factor_forgot'                          => 'I forgot my two-factor thing.',
+    'two_factor_lost_header'                     => 'Lost your two factor authentication?',
     'two_factor_lost_intro'                      => 'Por desgracia, esto no es algo que se pueda restablecer desde la interfaz web. Tienes dos opciones.',
-    'two_factor_lost_fix_self'                   => '',
-    'two_factor_lost_fix_owner'                  => '',
-    'warning_much_data'                          => '',
+    'two_factor_lost_fix_self'                   => 'If you run your own instance of Firefly III, check the logs in <code>storage/logs</code> for instructions.',
+    'two_factor_lost_fix_owner'                  => 'Otherwise, email the site owner, <a href="mailto::site_owner">:site_owner</a> and ask them to reset your two factor authentication.',
+    'warning_much_data'                          => ':days days of data may take a while to load.',
     'registered'                                 => '¡Te has registrado con éxito!',
-    'Default asset account'                      => '',
-    'no_budget_pointer'                          => '',
-    'Savings account'                            => '',
-    'Credit card'                                => '',
-    'source_accounts'                            => '',
-    'destination_accounts'                       => '',
-    'user_id_is'                                 => '',
-    'field_supports_markdown'                    => '',
-    'need_more_help'                             => '',
-    'reenable_intro_text'                        => '',
-    'intro_boxes_after_refresh'                  => '',
-    'show_all_no_filter'                         => '',
-    'expenses_by_category'                       => '',
-    'expenses_by_budget'                         => '',
-    'income_by_category'                         => '',
-    'expenses_by_asset_account'                  => '',
-    'expenses_by_expense_account'                => '',
-    'cannot_redirect_to_account'                 => '',
-    'sum_of_expenses'                            => '',
-    'sum_of_income'                              => '',
-    'total_sum'                                  => '',
-    'spent_in_specific_budget'                   => '',
-    'sum_of_expenses_in_budget'                  => '',
-    'left_in_budget_limit'                       => '',
-    'cannot_reset_demo_user'                     => '',
-    'current_period'                             => '',
-    'show_the_current_period_and_overview'       => '',
-    'pref_languages_locale'                      => '',
-    'budget_in_period'                           => '',
-    'chart_budget_in_period'                     => '',
-    'chart_account_in_period'                    => '',
-    'chart_category_in_period'                   => '',
-    'chart_category_all'                         => '',
-    'clone_withdrawal'                           => '',
-    'clone_deposit'                              => '',
-    'clone_transfer'                             => '',
-    'multi_select_no_selection'                  => '',
-    'multi_select_all_selected'                  => '',
-    'multi_select_filter_placeholder'            => '',
-    'between_dates_breadcrumb'                   => '',
-    'all_journals_without_budget'                => '',
-    'journals_without_budget'                    => '',
-    'all_journals_without_category'              => '',
-    'journals_without_category'                  => '',
-    'all_journals_for_account'                   => '',
-    'chart_all_journals_for_account'             => '',
-    'journals_in_period_for_account'             => '',
-    'transferred'                                => '',
-    'all_withdrawal'                             => '',
-    'all_transactions'                           => '',
-    'title_withdrawal_between'                   => '',
-    'all_deposit'                                => '',
-    'title_deposit_between'                      => '',
-    'all_transfers'                              => '',
-    'title_transfers_between'                    => '',
-    'all_transfer'                               => '',
-    'all_journals_for_tag'                       => '',
-    'title_transfer_between'                     => '',
-    'all_journals_for_category'                  => '',
-    'all_journals_for_budget'                    => '',
-    'chart_all_journals_for_budget'              => '',
-    'journals_in_period_for_category'            => '',
-    'journals_in_period_for_tag'                 => '',
-    'not_available_demo_user'                    => '',
-    'exchange_rate_instructions'                 => '',
-    'transfer_exchange_rate_instructions'        => '',
-    'transaction_data'                           => '',
+    'Default asset account'                      => '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.',
+    'Savings account'                            => 'Savings account',
+    'Credit card'                                => 'Credit card',
+    'source_accounts'                            => 'Source account(s)',
+    'destination_accounts'                       => 'Destination account(s)',
+    'user_id_is'                                 => 'Your user id is <strong>:user</strong>',
+    'field_supports_markdown'                    => 'This field supports <a href="https://en.support.wordpress.com/markdown-quick-reference/">Markdown</a>.',
+    'need_more_help'                             => 'If you need more help using Firefly III, please <a href="https://github.com/firefly-iii/firefly-iii/issues">open a ticket on Github</a>.',
+    'reenable_intro_text'                        => 'You can also reenable <a href="#" id="reenableGuidance">the introduction guidance</a>.',
+    'intro_boxes_after_refresh'                  => 'The introduction boxes will reappear when you refresh the page.',
+    'show_all_no_filter'                         => 'Show all transactions without grouping them by date.',
+    'expenses_by_category'                       => 'Expenses by category',
+    'expenses_by_budget'                         => 'Expenses by budget',
+    'income_by_category'                         => 'Income by category',
+    'expenses_by_asset_account'                  => 'Expenses by asset account',
+    'expenses_by_expense_account'                => 'Expenses by expense account',
+    'cannot_redirect_to_account'                 => 'Firefly III cannot redirect you to the correct page. Apologies.',
+    'sum_of_expenses'                            => 'Sum of expenses',
+    'sum_of_income'                              => 'Sum of income',
+    'total_sum'                                  => 'Total sum',
+    'spent_in_specific_budget'                   => 'Spent in budget ":budget"',
+    'sum_of_expenses_in_budget'                  => 'Spent total in budget ":budget"',
+    'left_in_budget_limit'                       => 'Left to spend according to budgeting',
+    'cannot_reset_demo_user'                     => 'You cannot reset the password of the demonstration account',
+    'current_period'                             => 'Current period',
+    'show_the_current_period_and_overview'       => 'Show the current period and overview',
+    'pref_languages_locale'                      => 'For a language other than English to work properly, your operating system must be equipped with the correct locale-information. If these are not present, currency data, dates and amounts may be formatted wrong.',
+    'budget_in_period'                           => 'All transactions for budget ":name" between :start and :end',
+    'chart_budget_in_period'                     => 'Chart for all transactions for budget ":name" between :start and :end',
+    'chart_account_in_period'                    => 'Chart for all transactions for account ":name" between :start and :end',
+    'chart_category_in_period'                   => 'Chart for all transactions for category ":name" between :start and :end',
+    'chart_category_all'                         => 'Chart for all transactions for category ":name"',
+    'clone_withdrawal'                           => 'Clone this withdrawal',
+    'clone_deposit'                              => 'Clone this deposit',
+    'clone_transfer'                             => 'Clone this transfer',
+    'multi_select_no_selection'                  => 'None selected',
+    'multi_select_all_selected'                  => 'All selected',
+    'multi_select_filter_placeholder'            => 'Find..',
+    'between_dates_breadcrumb'                   => 'Between :start and :end',
+    'all_journals_without_budget'                => 'All transactions without a budget',
+    'journals_without_budget'                    => 'Transactions without a budget',
+    'all_journals_without_category'              => 'All transactions without a category',
+    'journals_without_category'                  => 'Transactions without a category',
+    'all_journals_for_account'                   => 'All transactions for account :name',
+    'chart_all_journals_for_account'             => 'Chart of all transactions for account :name',
+    'journals_in_period_for_account'             => 'All transactions for account :name between :start and :end',
+    'transferred'                                => 'Transferred',
+    'all_withdrawal'                             => 'All expenses',
+    'all_transactions'                           => 'All transactions',
+    'title_withdrawal_between'                   => 'All expenses between :start and :end',
+    'all_deposit'                                => 'All revenue',
+    'title_deposit_between'                      => 'All revenue between :start and :end',
+    'all_transfers'                              => 'All transfers',
+    'title_transfers_between'                    => 'All transfers between :start and :end',
+    'all_transfer'                               => 'All transfers',
+    'all_journals_for_tag'                       => 'All transactions for tag ":tag"',
+    'title_transfer_between'                     => 'All transfers between :start and :end',
+    'all_journals_for_category'                  => 'All transactions for category :name',
+    'all_journals_for_budget'                    => 'All transactions for budget :name',
+    'chart_all_journals_for_budget'              => 'Chart of all transactions for budget :name',
+    'journals_in_period_for_category'            => 'All transactions for category :name between :start and :end',
+    'journals_in_period_for_tag'                 => 'All transactions for tag :tag between :start and :end',
+    'not_available_demo_user'                    => 'The feature you try to access is not available to demo users.',
+    'exchange_rate_instructions'                 => 'Asset account "@name" only accepts transactions in @native_currency. If you wish to use @foreign_currency instead, make sure that the amount in @native_currency is known as well:',
+    'transfer_exchange_rate_instructions'        => 'Source asset account "@source_name" only accepts transactions in @source_currency. Destination asset account "@dest_name" only accepts transactions in @dest_currency. You must provide the transferred amount correctly in both currencies.',
+    'transaction_data'                           => 'Transaction data',
 
     // search
-    'search'                                     => '',
-    'search_found_transactions'                  => '',
-    'general_search_error'                       => '',
-    'search_box'                                 => '',
-    'search_box_intro'                           => '',
-    'search_error'                               => '',
-    'search_searching'                           => '',
+    'search'                                     => 'Search',
+    'search_found_transactions'                  => 'Number of transactions found:',
+    'general_search_error'                       => 'An error occured while searching. Please check the log files for more information.',
+    'search_box'                                 => 'Search',
+    'search_box_intro'                           => 'Welcome to the search function of Firefly III. Enter your search query in the box. Make sure you check out the help file because the search is pretty advanced.',
+    'search_error'                               => 'Error while searching',
+    'search_searching'                           => 'Searching ...',
 
     // repeat frequencies:
-    'repeat_freq_yearly'                         => '',
-    'repeat_freq_monthly'                        => '',
-    'weekly'                                     => '',
-    'quarterly'                                  => '',
-    'half-year'                                  => '',
-    'yearly'                                     => '',
+    'repeat_freq_yearly'                         => 'yearly',
+    'repeat_freq_monthly'                        => 'monthly',
+    'weekly'                                     => 'weekly',
+    'quarterly'                                  => 'quarterly',
+    'half-year'                                  => 'every half year',
+    'yearly'                                     => 'yearly',
 
     // export data:
-    'import_and_export'                          => '',
-    'export_data'                                => '',
-    'export_data_intro'                          => '',
-    'export_format'                              => '',
-    'export_format_csv'                          => '',
-    'export_format_mt940'                        => '',
-    'export_included_accounts'                   => '',
-    'include_old_uploads_help'                   => '',
-    'do_export'                                  => '',
-    'export_status_never_started'                => '',
-    'export_status_make_exporter'                => '',
-    'export_status_collecting_journals'          => '',
-    'export_status_collected_journals'           => '',
-    'export_status_converting_to_export_format'  => '',
-    'export_status_converted_to_export_format'   => '',
-    'export_status_creating_journal_file'        => '',
-    'export_status_created_journal_file'         => '',
-    'export_status_collecting_attachments'       => '',
-    'export_status_collected_attachments'        => '',
-    'export_status_collecting_old_uploads'       => '',
-    'export_status_collected_old_uploads'        => '',
-    'export_status_creating_config_file'         => '',
-    'export_status_created_config_file'          => '',
-    'export_status_creating_zip_file'            => '',
-    'export_status_created_zip_file'             => '',
-    'export_status_finished'                     => '',
-    'export_data_please_wait'                    => '',
+    'import_and_export'                          => 'Import and export',
+    'export_data'                                => 'Export data',
+    'export_data_intro'                          => 'For backup purposes, when migrating to another system or when migrating to another Firefly III installation.',
+    'export_format'                              => 'Export format',
+    'export_format_csv'                          => 'Comma separated values (CSV file)',
+    'export_format_mt940'                        => 'MT940 compatible format',
+    'export_included_accounts'                   => 'Export transactions from these accounts',
+    'include_old_uploads_help'                   => 'Firefly III does not throw away the original CSV files you have imported in the past. You can include them in your export.',
+    'do_export'                                  => 'Export',
+    'export_status_never_started'                => 'The export has not started yet',
+    'export_status_make_exporter'                => 'Creating exporter thing...',
+    'export_status_collecting_journals'          => 'Collecting your transactions...',
+    'export_status_collected_journals'           => 'Collected your transactions!',
+    'export_status_converting_to_export_format'  => 'Converting your transactions...',
+    'export_status_converted_to_export_format'   => 'Converted your transactions!',
+    'export_status_creating_journal_file'        => 'Creating the export file...',
+    'export_status_created_journal_file'         => 'Created the export file!',
+    'export_status_collecting_attachments'       => 'Collecting all your attachments...',
+    'export_status_collected_attachments'        => 'Collected all your attachments!',
+    'export_status_collecting_old_uploads'       => 'Collecting all your previous uploads...',
+    'export_status_collected_old_uploads'        => 'Collected all your previous uploads!',
+    'export_status_creating_config_file'         => 'Creating a configuration file...',
+    'export_status_created_config_file'          => 'Created a configuration file!',
+    'export_status_creating_zip_file'            => 'Creating a zip file...',
+    'export_status_created_zip_file'             => 'Created a zip file!',
+    'export_status_finished'                     => 'Export has succesfully finished! Yay!',
+    'export_data_please_wait'                    => 'Please wait...',
 
     // rules
-    'rules'                                      => '',
-    'rule_name'                                  => '',
-    'rule_triggers'                              => '',
-    'rule_actions'                               => '',
-    'new_rule'                                   => '',
-    'new_rule_group'                             => '',
-    'rule_priority_up'                           => '',
-    'rule_priority_down'                         => '',
-    'make_new_rule_group'                        => '',
-    'store_new_rule_group'                       => '',
-    'created_new_rule_group'                     => '',
-    'updated_rule_group'                         => '',
-    'edit_rule_group'                            => '',
-    'delete_rule_group'                          => '',
-    'deleted_rule_group'                         => '',
-    'update_rule_group'                          => '',
-    'no_rules_in_group'                          => '',
-    'move_rule_group_up'                         => '',
-    'move_rule_group_down'                       => '',
-    'save_rules_by_moving'                       => '',
-    'make_new_rule'                              => '',
-    'rule_help_stop_processing'                  => '',
-    'rule_help_active'                           => '',
-    'stored_new_rule'                            => '',
-    'deleted_rule'                               => '',
-    'store_new_rule'                             => '',
-    'updated_rule'                               => '',
-    'default_rule_group_name'                    => '',
-    'default_rule_group_description'             => '',
-    'default_rule_name'                          => '',
-    'default_rule_description'                   => '',
-    'default_rule_trigger_description'           => '',
-    'default_rule_trigger_from_account'          => '',
-    'default_rule_action_prepend'                => '',
-    'default_rule_action_set_category'           => '',
-    'trigger'                                    => '',
-    'trigger_value'                              => '',
-    'stop_processing_other_triggers'             => '',
-    'add_rule_trigger'                           => '',
-    'action'                                     => '',
-    'action_value'                               => '',
-    'stop_executing_other_actions'               => '',
-    'add_rule_action'                            => '',
-    'edit_rule'                                  => '',
-    'delete_rule'                                => '',
-    'update_rule'                                => '',
-    'test_rule_triggers'                         => '',
-    'warning_transaction_subset'                 => '',
-    'warning_no_matching_transactions'           => '',
-    'warning_no_valid_triggers'                  => '',
-    'apply_rule_selection'                       => '',
-    'apply_rule_selection_intro'                 => '',
-    'include_transactions_from_accounts'         => '',
-    'applied_rule_selection'                     => '',
-    'execute'                                    => '',
-    'apply_rule_group_selection'                 => '',
-    'apply_rule_group_selection_intro'           => '',
-    'applied_rule_group_selection'               => '',
+    'rules'                                      => 'Rules',
+    'rule_name'                                  => 'Name of rule',
+    'rule_triggers'                              => 'Rule triggers when',
+    'rule_actions'                               => 'Rule will',
+    'new_rule'                                   => 'New rule',
+    'new_rule_group'                             => 'New rule group',
+    'rule_priority_up'                           => 'Give rule more priority',
+    'rule_priority_down'                         => 'Give rule less priority',
+    'make_new_rule_group'                        => 'Make new rule group',
+    'store_new_rule_group'                       => 'Store new rule group',
+    'created_new_rule_group'                     => 'New rule group ":title" stored!',
+    'updated_rule_group'                         => 'Successfully updated rule group ":title".',
+    'edit_rule_group'                            => 'Edit rule group ":title"',
+    'delete_rule_group'                          => 'Delete rule group ":title"',
+    'deleted_rule_group'                         => 'Deleted rule group ":title"',
+    'update_rule_group'                          => 'Update rule group',
+    'no_rules_in_group'                          => 'There are no rules in this group',
+    'move_rule_group_up'                         => 'Move rule group up',
+    'move_rule_group_down'                       => 'Move rule group down',
+    'save_rules_by_moving'                       => 'Save these rule(s) by moving them to another rule group:',
+    'make_new_rule'                              => 'Make new rule in rule group ":title"',
+    'rule_help_stop_processing'                  => 'When you check this box, later rules in this group will not be executed.',
+    'rule_help_active'                           => 'Inactive rules will never fire.',
+    'stored_new_rule'                            => 'Stored new rule with title ":title"',
+    'deleted_rule'                               => 'Deleted rule with title ":title"',
+    'store_new_rule'                             => 'Store new rule',
+    'updated_rule'                               => 'Updated rule with title ":title"',
+    'default_rule_group_name'                    => 'Default rules',
+    'default_rule_group_description'             => 'All your rules not in a particular group.',
+    'default_rule_name'                          => 'Your first default rule',
+    'default_rule_description'                   => 'This rule is an example. You can safely delete it.',
+    'default_rule_trigger_description'           => 'The Man Who Sold the World',
+    'default_rule_trigger_from_account'          => 'David Bowie',
+    'default_rule_action_prepend'                => 'Bought the world from ',
+    'default_rule_action_set_category'           => 'Large expenses',
+    'trigger'                                    => 'Trigger',
+    'trigger_value'                              => 'Trigger on value',
+    'stop_processing_other_triggers'             => 'Stop processing other triggers',
+    'add_rule_trigger'                           => 'Add new trigger',
+    'action'                                     => 'Action',
+    'action_value'                               => 'Action value',
+    'stop_executing_other_actions'               => 'Stop executing other actions',
+    'add_rule_action'                            => 'Add new action',
+    'edit_rule'                                  => 'Edit rule ":title"',
+    'delete_rule'                                => 'Delete rule ":title"',
+    'update_rule'                                => 'Update rule',
+    'test_rule_triggers'                         => 'See matching transactions',
+    'warning_transaction_subset'                 => 'For performance reasons this list is limited to :max_num_transactions and may only show a subset of matching transactions',
+    'warning_no_matching_transactions'           => 'No matching transactions found. Please note that for performance reasons, only the last :num_transactions transactions have been checked.',
+    'warning_no_valid_triggers'                  => 'No valid triggers provided.',
+    'apply_rule_selection'                       => 'Apply rule ":title" to a selection of your transactions',
+    'apply_rule_selection_intro'                 => 'Rules like ":title" are normally only applied to new or updated transactions, but you can tell Firefly III to run it on a selection of your existing transactions. This can be useful when you have updated a rule and you need the changes to be applied to all of your other transactions.',
+    'include_transactions_from_accounts'         => 'Include transactions from these accounts',
+    'applied_rule_selection'                     => 'Rule ":title" has been applied to your selection.',
+    'execute'                                    => 'Execute',
+    'apply_rule_group_selection'                 => 'Apply rule group ":title" to a selection of your transactions',
+    'apply_rule_group_selection_intro'           => 'Rule groups like ":title" are normally only applied to new or updated transactions, but you can tell Firefly III to run all the rules in this group on a selection of your existing transactions. This can be useful when you have updated a group of rules and you need the changes to be applied to all of your other transactions.',
+    'applied_rule_group_selection'               => 'Rule group ":title" has been applied to your selection.',
 
     // actions and triggers
-    'rule_trigger_user_action'                   => '',
-    'rule_trigger_from_account_starts'           => '',
-    'rule_trigger_from_account_ends'             => '',
-    'rule_trigger_from_account_is'               => '',
-    'rule_trigger_from_account_contains'         => '',
-    'rule_trigger_to_account_starts'             => '',
-    'rule_trigger_to_account_ends'               => '',
-    'rule_trigger_to_account_is'                 => '',
-    'rule_trigger_to_account_contains'           => '',
-    'rule_trigger_transaction_type'              => '',
-    'rule_trigger_category_is'                   => '',
-    'rule_trigger_amount_less'                   => '',
-    'rule_trigger_amount_exactly'                => '',
-    'rule_trigger_amount_more'                   => '',
-    'rule_trigger_description_starts'            => '',
-    'rule_trigger_description_ends'              => '',
-    'rule_trigger_description_contains'          => '',
-    'rule_trigger_description_is'                => '',
-    'rule_trigger_from_account_starts_choice'    => '',
-    'rule_trigger_from_account_ends_choice'      => '',
-    'rule_trigger_from_account_is_choice'        => '',
-    'rule_trigger_from_account_contains_choice'  => '',
-    'rule_trigger_to_account_starts_choice'      => '',
-    'rule_trigger_to_account_ends_choice'        => '',
-    'rule_trigger_to_account_is_choice'          => '',
-    'rule_trigger_to_account_contains_choice'    => '',
-    'rule_trigger_transaction_type_choice'       => '',
-    'rule_trigger_amount_less_choice'            => '',
-    'rule_trigger_amount_exactly_choice'         => '',
-    'rule_trigger_amount_more_choice'            => '',
-    'rule_trigger_description_starts_choice'     => '',
-    'rule_trigger_description_ends_choice'       => '',
-    'rule_trigger_description_contains_choice'   => '',
-    'rule_trigger_description_is_choice'         => '',
-    'rule_trigger_category_is_choice'            => '',
-    'rule_trigger_budget_is_choice'              => '',
-    'rule_trigger_tag_is_choice'                 => '',
-    'rule_trigger_has_attachments_choice'        => '',
-    'rule_trigger_has_attachments'               => '',
-    'rule_trigger_store_journal'                 => '',
-    'rule_trigger_update_journal'                => '',
-    'rule_action_set_category'                   => '',
-    'rule_action_clear_category'                 => '',
-    'rule_action_set_budget'                     => '',
-    'rule_action_clear_budget'                   => '',
-    'rule_action_add_tag'                        => '',
-    'rule_action_remove_tag'                     => '',
-    'rule_action_remove_all_tags'                => '',
-    'rule_action_set_description'                => '',
-    'rule_action_append_description'             => '',
-    'rule_action_prepend_description'            => '',
-    'rule_action_set_category_choice'            => '',
-    'rule_action_clear_category_choice'          => '',
-    'rule_action_set_budget_choice'              => '',
-    'rule_action_clear_budget_choice'            => '',
-    'rule_action_add_tag_choice'                 => '',
-    'rule_action_remove_tag_choice'              => '',
-    'rule_action_remove_all_tags_choice'         => '',
-    'rule_action_set_description_choice'         => '',
-    'rule_action_append_description_choice'      => '',
-    'rule_action_prepend_description_choice'     => '',
-    'rule_action_set_source_account_choice'      => '',
-    'rule_action_set_source_account'             => '',
-    'rule_action_set_destination_account_choice' => '',
-    'rule_action_set_destination_account'        => '',
+    'rule_trigger_user_action'                   => 'User action is ":trigger_value"',
+    'rule_trigger_from_account_starts'           => 'Source account starts with ":trigger_value"',
+    'rule_trigger_from_account_ends'             => 'Source account ends with ":trigger_value"',
+    'rule_trigger_from_account_is'               => 'Source account is ":trigger_value"',
+    'rule_trigger_from_account_contains'         => 'Source account contains ":trigger_value"',
+    'rule_trigger_to_account_starts'             => 'Destination account starts with ":trigger_value"',
+    'rule_trigger_to_account_ends'               => 'Destination account ends with ":trigger_value"',
+    'rule_trigger_to_account_is'                 => 'Destination account is ":trigger_value"',
+    'rule_trigger_to_account_contains'           => 'Destination account contains ":trigger_value"',
+    'rule_trigger_transaction_type'              => 'Transaction is of type ":trigger_value"',
+    'rule_trigger_category_is'                   => 'Category is ":trigger_value"',
+    'rule_trigger_amount_less'                   => 'Amount is less than :trigger_value',
+    'rule_trigger_amount_exactly'                => 'Amount is :trigger_value',
+    'rule_trigger_amount_more'                   => 'Amount is more than :trigger_value',
+    'rule_trigger_description_starts'            => 'Description starts with ":trigger_value"',
+    'rule_trigger_description_ends'              => 'Description ends with ":trigger_value"',
+    'rule_trigger_description_contains'          => 'Description contains ":trigger_value"',
+    'rule_trigger_description_is'                => 'Description is ":trigger_value"',
+    'rule_trigger_from_account_starts_choice'    => 'Source account starts with..',
+    'rule_trigger_from_account_ends_choice'      => 'Source account ends with..',
+    'rule_trigger_from_account_is_choice'        => 'Source account is..',
+    'rule_trigger_from_account_contains_choice'  => 'Source account contains..',
+    'rule_trigger_to_account_starts_choice'      => 'Destination account starts with..',
+    'rule_trigger_to_account_ends_choice'        => 'Destination account ends with..',
+    'rule_trigger_to_account_is_choice'          => 'Destination account is..',
+    'rule_trigger_to_account_contains_choice'    => 'Destination account contains..',
+    'rule_trigger_transaction_type_choice'       => 'Transaction is of type..',
+    'rule_trigger_amount_less_choice'            => 'Amount is less than..',
+    'rule_trigger_amount_exactly_choice'         => 'Amount is..',
+    'rule_trigger_amount_more_choice'            => 'Amount is more than..',
+    'rule_trigger_description_starts_choice'     => 'Description starts with..',
+    'rule_trigger_description_ends_choice'       => 'Description ends with..',
+    'rule_trigger_description_contains_choice'   => 'Description contains..',
+    'rule_trigger_description_is_choice'         => 'Description is..',
+    'rule_trigger_category_is_choice'            => 'Category is..',
+    'rule_trigger_budget_is_choice'              => 'Budget is..',
+    'rule_trigger_tag_is_choice'                 => '(A) tag is..',
+    'rule_trigger_has_attachments_choice'        => 'Has at least this many attachments',
+    'rule_trigger_has_attachments'               => 'Has at least :trigger_value attachment(s)',
+    'rule_trigger_store_journal'                 => 'When a transaction is created',
+    'rule_trigger_update_journal'                => 'When a transaction is updated',
+    'rule_action_set_category'                   => 'Set category to ":action_value"',
+    'rule_action_clear_category'                 => 'Clear category',
+    'rule_action_set_budget'                     => 'Set budget to ":action_value"',
+    'rule_action_clear_budget'                   => 'Clear budget',
+    'rule_action_add_tag'                        => 'Add tag ":action_value"',
+    'rule_action_remove_tag'                     => 'Remove tag ":action_value"',
+    'rule_action_remove_all_tags'                => 'Remove all tags',
+    'rule_action_set_description'                => 'Set description to ":action_value"',
+    'rule_action_append_description'             => 'Append description with ":action_value"',
+    'rule_action_prepend_description'            => 'Prepend description with ":action_value"',
+    'rule_action_set_category_choice'            => 'Set category to..',
+    'rule_action_clear_category_choice'          => 'Clear any category',
+    'rule_action_set_budget_choice'              => 'Set budget to..',
+    'rule_action_clear_budget_choice'            => 'Clear any budget',
+    'rule_action_add_tag_choice'                 => 'Add tag..',
+    'rule_action_remove_tag_choice'              => 'Remove tag..',
+    'rule_action_remove_all_tags_choice'         => 'Remove all tags',
+    'rule_action_set_description_choice'         => 'Set description to..',
+    'rule_action_append_description_choice'      => 'Append description with..',
+    'rule_action_prepend_description_choice'     => 'Prepend description with..',
+    'rule_action_set_source_account_choice'      => 'Set source account to...',
+    'rule_action_set_source_account'             => 'Set source account to :action_value',
+    'rule_action_set_destination_account_choice' => 'Set destination account to...',
+    'rule_action_set_destination_account'        => 'Set destination account to :action_value',
 
     // tags
-    'store_new_tag'                              => '',
-    'update_tag'                                 => '',
-    'no_location_set'                            => '',
-    'meta_data'                                  => '',
-    'location'                                   => '',
+    'store_new_tag'                              => 'Store new tag',
+    'update_tag'                                 => 'Update tag',
+    'no_location_set'                            => 'No location set.',
+    'meta_data'                                  => 'Meta data',
+    'location'                                   => 'Location',
 
     // preferences
-    'pref_home_screen_accounts'                  => '',
-    'pref_home_screen_accounts_help'             => '',
-    'pref_view_range'                            => '',
-    'pref_view_range_help'                       => '',
-    'pref_1D'                                    => '',
-    'pref_1W'                                    => '',
-    'pref_1M'                                    => '',
-    'pref_3M'                                    => '',
-    'pref_6M'                                    => '',
-    'pref_1Y'                                    => '',
-    'pref_languages'                             => '',
-    'pref_languages_help'                        => '',
-    'pref_custom_fiscal_year'                    => '',
-    'pref_custom_fiscal_year_label'              => '',
-    'pref_custom_fiscal_year_help'               => '',
-    'pref_fiscal_year_start_label'               => '',
-    'pref_two_factor_auth'                       => '',
-    'pref_two_factor_auth_help'                  => '',
-    'pref_enable_two_factor_auth'                => '',
-    'pref_two_factor_auth_disabled'              => '',
-    'pref_two_factor_auth_remove_it'             => '',
-    'pref_two_factor_auth_code'                  => '',
-    'pref_two_factor_auth_code_help'             => '',
-    'pref_two_factor_auth_reset_code'            => '',
-    'pref_two_factor_auth_remove_code'           => '',
-    'pref_two_factor_auth_remove_will_disable'   => '',
-    'pref_save_settings'                         => '',
-    'saved_preferences'                          => '',
-    'preferences_general'                        => '',
-    'preferences_frontpage'                      => '',
-    'preferences_security'                       => '',
-    'preferences_layout'                         => '',
-    'pref_home_show_deposits'                    => '',
-    'pref_home_show_deposits_info'               => '',
-    'pref_home_do_show_deposits'                 => '',
-    'successful_count'                           => '',
-    'transaction_page_size_title'                => '',
-    'transaction_page_size_help'                 => '',
-    'transaction_page_size_label'                => '',
-    'between_dates'                              => '',
-    'pref_optional_fields_transaction'           => '',
-    'pref_optional_fields_transaction_help'      => '',
-    'optional_tj_date_fields'                    => '',
-    'optional_tj_business_fields'                => '',
-    'optional_tj_attachment_fields'              => '',
-    'pref_optional_tj_interest_date'             => '',
-    'pref_optional_tj_book_date'                 => '',
-    'pref_optional_tj_process_date'              => '',
-    'pref_optional_tj_due_date'                  => '',
-    'pref_optional_tj_payment_date'              => '',
-    'pref_optional_tj_invoice_date'              => '',
-    'pref_optional_tj_internal_reference'        => '',
-    'pref_optional_tj_notes'                     => '',
-    'pref_optional_tj_attachments'               => '',
-    'optional_field_meta_dates'                  => '',
-    'optional_field_meta_business'               => '',
-    'optional_field_attachments'                 => '',
-    'optional_field_meta_data'                   => '',
+    'pref_home_screen_accounts'                  => 'Home screen accounts',
+    'pref_home_screen_accounts_help'             => 'Which accounts should be displayed on the home page?',
+    'pref_view_range'                            => 'View range',
+    'pref_view_range_help'                       => 'Some charts are automatically grouped in periods. What period would you prefer?',
+    'pref_1D'                                    => 'One day',
+    'pref_1W'                                    => 'One week',
+    'pref_1M'                                    => 'One month',
+    'pref_3M'                                    => 'Three months (quarter)',
+    'pref_6M'                                    => 'Six months',
+    'pref_1Y'                                    => 'One year',
+    'pref_languages'                             => 'Languages',
+    'pref_languages_help'                        => 'Firefly III supports several languages. Which one do you prefer?',
+    'pref_custom_fiscal_year'                    => 'Fiscal year settings',
+    'pref_custom_fiscal_year_label'              => 'Enabled',
+    'pref_custom_fiscal_year_help'               => 'In countries that use a financial year other than January 1 to December 31, you can switch this on and specify start / end days of the fiscal year',
+    'pref_fiscal_year_start_label'               => 'Fiscal year start date',
+    'pref_two_factor_auth'                       => '2-step verification',
+    'pref_two_factor_auth_help'                  => 'When you enable 2-step verification (also known as two-factor authentication), you add an extra layer of security to your account. You sign in with something you know (your password) and something you have (a verification code). Verification codes are generated by an application on your phone, such as Authy or Google Authenticator.',
+    'pref_enable_two_factor_auth'                => 'Enable 2-step verification',
+    'pref_two_factor_auth_disabled'              => '2-step verification code removed and disabled',
+    'pref_two_factor_auth_remove_it'             => 'Don\'t forget to remove the account from your authentication app!',
+    'pref_two_factor_auth_code'                  => 'Verify code',
+    'pref_two_factor_auth_code_help'             => 'Scan the QR code with an application on your phone such as Authy or Google Authenticator and enter the generated code.',
+    'pref_two_factor_auth_reset_code'            => 'Reset verification code',
+    'pref_two_factor_auth_remove_code'           => 'Remove verification code',
+    'pref_two_factor_auth_remove_will_disable'   => '(this will also disable two-factor authentication)',
+    'pref_save_settings'                         => 'Save settings',
+    'saved_preferences'                          => 'Preferences saved!',
+    'preferences_general'                        => 'General',
+    'preferences_frontpage'                      => 'Home screen',
+    'preferences_security'                       => 'Security',
+    'preferences_layout'                         => 'Layout',
+    'pref_home_show_deposits'                    => 'Show deposits on the home screen',
+    'pref_home_show_deposits_info'               => 'The home screen already shows your expense accounts. Should it also show your revenue accounts?',
+    'pref_home_do_show_deposits'                 => 'Yes, show them',
+    'successful_count'                           => 'of which :count successful',
+    'transaction_page_size_title'                => 'Page size',
+    'transaction_page_size_help'                 => 'Any list of transactions shows at most this many transactions',
+    'transaction_page_size_label'                => 'Page size',
+    'between_dates'                              => '(:start and :end)',
+    'pref_optional_fields_transaction'           => 'Optional fields for transactions',
+    'pref_optional_fields_transaction_help'      => 'By default not all fields are enabled when creating a new transaction (because of the clutter). Below, you can enable these fields if you think they could be useful for you. Of course, any field that is disabled, but already filled in, will be visible regardless of the setting.',
+    'optional_tj_date_fields'                    => 'Date fields',
+    'optional_tj_business_fields'                => 'Business fields',
+    'optional_tj_attachment_fields'              => 'Attachment fields',
+    'pref_optional_tj_interest_date'             => 'Interest date',
+    'pref_optional_tj_book_date'                 => 'Book date',
+    'pref_optional_tj_process_date'              => 'Processing date',
+    'pref_optional_tj_due_date'                  => 'Due date',
+    'pref_optional_tj_payment_date'              => 'Payment date',
+    'pref_optional_tj_invoice_date'              => 'Invoice date',
+    'pref_optional_tj_internal_reference'        => 'Internal reference',
+    'pref_optional_tj_notes'                     => 'Notes',
+    'pref_optional_tj_attachments'               => 'Attachments',
+    'optional_field_meta_dates'                  => 'Dates',
+    'optional_field_meta_business'               => 'Business',
+    'optional_field_attachments'                 => 'Attachments',
+    'optional_field_meta_data'                   => 'Optional meta data',
 
 
     // profile:
-    'change_your_password'                       => '',
-    'delete_account'                             => '',
-    'current_password'                           => '',
-    'new_password'                               => '',
-    'new_password_again'                         => '',
-    'delete_your_account'                        => '',
-    'delete_your_account_help'                   => '',
-    'delete_your_account_password'               => '',
-    'password'                                   => '',
-    'are_you_sure'                               => '',
-    'delete_account_button'                      => '',
-    'invalid_current_password'                   => '',
-    'password_changed'                           => '',
-    'should_change'                              => '',
-    'invalid_password'                           => '',
-    'what_is_pw_security'                        => '',
-    'secure_pw_title'                            => '',
-    'secure_pw_history'                          => '',
-    'secure_pw_check_box'                        => '',
-    'secure_pw_sha1'                             => '',
-    'secure_pw_hash_speed'                       => '',
-    'secure_pw_hash_security'                    => '',
-    'secure_pw_should'                           => '',
-    'secure_pw_long_password'                    => '',
-    'secure_pw_short'                            => '',
+    'change_your_password'                       => 'Change your password',
+    'delete_account'                             => 'Delete account',
+    'current_password'                           => 'Current password',
+    'new_password'                               => 'New password',
+    'new_password_again'                         => 'New password (again)',
+    'delete_your_account'                        => 'Delete your account',
+    'delete_your_account_help'                   => 'Deleting your account will also delete any accounts, transactions, <em>anything</em> you might have saved into Firefly III. It\'ll be GONE.',
+    'delete_your_account_password'               => 'Enter your password to continue.',
+    'password'                                   => 'Password',
+    'are_you_sure'                               => 'Are you sure? You cannot undo this.',
+    'delete_account_button'                      => 'DELETE your account',
+    'invalid_current_password'                   => 'Invalid current password!',
+    'password_changed'                           => 'Password changed!',
+    'should_change'                              => 'The idea is to change your password.',
+    'invalid_password'                           => 'Invalid password!',
+    'what_is_pw_security'                        => 'What is "verify password security"?',
+    'secure_pw_title'                            => 'How to choose a secure password',
+    'secure_pw_history'                          => 'In August 2017 well known security researcher Troy Hunt released a list of 306 million stolen passwords. These passwords were stolen during breakins at companies like LinkedIn, Adobe and NeoPets (and many more).',
+    'secure_pw_check_box'                        => 'By checking the box, Firefly III will send the SHA1 hash of your password to <a href="https://www.troyhunt.com/introducing-306-million-freely-downloadable-pwned-passwords/">the website of Troy Hunt</a> to see if it is on the list. This will stop you from using unsafe passwords as is recommended in the latest <a href="https://pages.nist.gov/800-63-3/sp800-63b.html">NIST Special Publication</a> on this subject.',
+    'secure_pw_sha1'                             => 'But I thought SHA1 was broken?',
+    'secure_pw_hash_speed'                       => 'Yes, but not in this context. As you can read on <a href="https://shattered.io/">the website detailing how they broke SHA1</a>, it is now slightly easier to find a "collision": another string that results in the same SHA1-hash. It now only takes 10,000 years using a single-GPU machine.',
+    'secure_pw_hash_security'                    => 'This collision would not be equal to your password, nor would it be useful on (a site like) Firefly III. This application does not use SHA1 for password verification. So it is safe to check this box. Your password is hashed and sent over HTTPS.',
+    'secure_pw_should'                           => 'Should I check the box?',
+    'secure_pw_long_password'                    => 'If you just generated a long, single-use password for Firefly III using some kind of password generator: <strong>no</strong>.',
+    'secure_pw_short'                            => 'If you just entered the password you always use: <em>Please yes</em>.',
 
 
     // attachments
-    'nr_of_attachments'                          => '',
-    'attachments'                                => '',
-    'edit_attachment'                            => '',
-    'update_attachment'                          => '',
-    'delete_attachment'                          => '',
-    'attachment_deleted'                         => '',
-    'attachment_updated'                         => '',
-    'upload_max_file_size'                       => '',
+    'nr_of_attachments'                          => 'One attachment|:count attachments',
+    'attachments'                                => 'Attachments',
+    'edit_attachment'                            => 'Edit attachment ":name"',
+    'update_attachment'                          => 'Update attachment',
+    'delete_attachment'                          => 'Delete attachment ":name"',
+    'attachment_deleted'                         => 'Deleted attachment ":name"',
+    'attachment_updated'                         => 'Updated attachment ":name"',
+    'upload_max_file_size'                       => 'Maximum file size: :size',
 
     // transaction index
-    'title_expenses'                             => '',
-    'title_withdrawal'                           => '',
-    'title_revenue'                              => '',
-    'title_deposit'                              => '',
-    'title_transfer'                             => '',
-    'title_transfers'                            => '',
+    'title_expenses'                             => 'Expenses',
+    'title_withdrawal'                           => 'Expenses',
+    'title_revenue'                              => 'Revenue / income',
+    'title_deposit'                              => 'Revenue / income',
+    'title_transfer'                             => 'Transfers',
+    'title_transfers'                            => 'Transfers',
 
     // convert stuff:
-    'convert_is_already_type_Withdrawal'         => '',
-    'convert_is_already_type_Deposit'            => '',
-    'convert_is_already_type_Transfer'           => '',
-    'convert_to_Withdrawal'                      => '',
-    'convert_to_Deposit'                         => '',
-    'convert_to_Transfer'                        => '',
-    'convert_options_WithdrawalDeposit'          => '',
-    'convert_options_WithdrawalTransfer'         => '',
-    'convert_options_DepositTransfer'            => '',
-    'convert_options_DepositWithdrawal'          => '',
-    'convert_options_TransferWithdrawal'         => '',
-    'convert_options_TransferDeposit'            => '',
-    'transaction_journal_convert_options'        => '',
-    'convert_Withdrawal_to_deposit'              => '',
-    'convert_Withdrawal_to_transfer'             => '',
-    'convert_Deposit_to_withdrawal'              => '',
-    'convert_Deposit_to_transfer'                => '',
-    'convert_Transfer_to_deposit'                => '',
-    'convert_Transfer_to_withdrawal'             => '',
-    'convert_please_set_revenue_source'          => '',
-    'convert_please_set_asset_destination'       => '',
-    'convert_please_set_expense_destination'     => '',
-    'convert_please_set_asset_source'            => '',
-    'convert_explanation_withdrawal_deposit'     => '',
-    'convert_explanation_withdrawal_transfer'    => '',
-    'convert_explanation_deposit_withdrawal'     => '',
-    'convert_explanation_deposit_transfer'       => '',
-    'convert_explanation_transfer_withdrawal'    => '',
-    'convert_explanation_transfer_deposit'       => '',
-    'converted_to_Withdrawal'                    => '',
-    'converted_to_Deposit'                       => '',
-    'converted_to_Transfer'                      => '',
+    'convert_is_already_type_Withdrawal'         => 'This transaction is already a withdrawal',
+    'convert_is_already_type_Deposit'            => 'This transaction is already a deposit',
+    'convert_is_already_type_Transfer'           => 'This transaction is already a transfer',
+    'convert_to_Withdrawal'                      => 'Convert ":description" to a withdrawal',
+    'convert_to_Deposit'                         => 'Convert ":description" to a deposit',
+    'convert_to_Transfer'                        => 'Convert ":description" to a transfer',
+    'convert_options_WithdrawalDeposit'          => 'Convert a withdrawal into a deposit',
+    'convert_options_WithdrawalTransfer'         => 'Convert a withdrawal into a transfer',
+    'convert_options_DepositTransfer'            => 'Convert a deposit into a transfer',
+    'convert_options_DepositWithdrawal'          => 'Convert a deposit into a withdrawal',
+    'convert_options_TransferWithdrawal'         => 'Convert a transfer into a withdrawal',
+    'convert_options_TransferDeposit'            => 'Convert a transfer into a deposit',
+    'transaction_journal_convert_options'        => 'Convert this transaction',
+    'convert_Withdrawal_to_deposit'              => 'Convert this withdrawal to a deposit',
+    'convert_Withdrawal_to_transfer'             => 'Convert this withdrawal to a transfer',
+    'convert_Deposit_to_withdrawal'              => 'Convert this deposit to a withdrawal',
+    'convert_Deposit_to_transfer'                => 'Convert this deposit to a transfer',
+    'convert_Transfer_to_deposit'                => 'Convert this transfer to a deposit',
+    'convert_Transfer_to_withdrawal'             => 'Convert this transfer to a withdrawal',
+    'convert_please_set_revenue_source'          => 'Please pick the revenue account where the money will come from.',
+    'convert_please_set_asset_destination'       => 'Please pick the asset account where the money will go to.',
+    'convert_please_set_expense_destination'     => 'Please pick the expense account where the money will go to.',
+    'convert_please_set_asset_source'            => 'Please pick the asset account where the money will come from.',
+    'convert_explanation_withdrawal_deposit'     => 'If you convert this withdrawal into a deposit, :amount will be deposited into <a href=":sourceRoute">:sourceName</a> instead of taken from it.',
+    'convert_explanation_withdrawal_transfer'    => 'If you convert this withdrawal into a transfer, :amount will be transferred from <a href=":sourceRoute">:sourceName</a> to a new asset account, instead of being paid to <a href=":destinationRoute">:destinationName</a>.',
+    'convert_explanation_deposit_withdrawal'     => 'If you convert this deposit into a withdrawal, :amount will be removed from <a href=":destinationRoute">:destinationName</a> instead of added to it.',
+    'convert_explanation_deposit_transfer'       => 'If you convert this deposit into a transfer, :amount will be transferred from an asset account of your choice into <a href=":destinationRoute">:destinationName</a>.',
+    'convert_explanation_transfer_withdrawal'    => 'If you convert this transfer into a withdrawal, :amount will go from <a href=":sourceRoute">:sourceName</a> to a new destination as an expense, instead of to <a href=":destinationRoute">:destinationName</a> as a transfer.',
+    'convert_explanation_transfer_deposit'       => 'If you convert this transfer into a deposit, :amount will be deposited into account <a href=":destinationRoute">:destinationName</a> instead of being transferred there.',
+    'converted_to_Withdrawal'                    => 'The transaction has been converted to a withdrawal',
+    'converted_to_Deposit'                       => 'The transaction has been converted to a deposit',
+    'converted_to_Transfer'                      => 'The transaction has been converted to a transfer',
 
 
     // create new stuff:
-    'create_new_withdrawal'                      => '',
-    'create_new_deposit'                         => '',
-    'create_new_transfer'                        => '',
-    'create_new_asset'                           => '',
-    'create_new_expense'                         => '',
-    'create_new_revenue'                         => '',
-    'create_new_piggy_bank'                      => '',
-    'create_new_bill'                            => '',
+    'create_new_withdrawal'                      => 'Create new withdrawal',
+    'create_new_deposit'                         => 'Create new deposit',
+    'create_new_transfer'                        => 'Create new transfer',
+    'create_new_asset'                           => 'Create new asset account',
+    'create_new_expense'                         => 'Create new expense account',
+    'create_new_revenue'                         => 'Create new revenue account',
+    'create_new_piggy_bank'                      => 'Create new piggy bank',
+    'create_new_bill'                            => 'Create new bill',
 
     // currencies:
-    'create_currency'                            => '',
-    'store_currency'                             => '',
-    'update_currency'                            => '',
-    'new_default_currency'                       => '',
-    'cannot_delete_currency'                     => '',
-    'deleted_currency'                           => '',
-    'created_currency'                           => '',
-    'updated_currency'                           => '',
-    'ask_site_owner'                             => '',
-    'currencies_intro'                           => '',
-    'make_default_currency'                      => '',
-    'default_currency'                           => '',
+    'create_currency'                            => 'Create a new currency',
+    'store_currency'                             => 'Store new currency',
+    'update_currency'                            => 'Update currency',
+    'new_default_currency'                       => ':name is now the default currency.',
+    'cannot_delete_currency'                     => 'Cannot delete :name because it is still in use.',
+    'deleted_currency'                           => 'Currency :name deleted',
+    'created_currency'                           => 'Currency :name created',
+    'updated_currency'                           => 'Currency :name updated',
+    'ask_site_owner'                             => 'Please ask :owner to add, remove or edit currencies.',
+    'currencies_intro'                           => 'Firefly III supports various currencies which you can set and enable here.',
+    'make_default_currency'                      => 'make default',
+    'default_currency'                           => 'default',
 
     // forms:
-    'mandatoryFields'                            => '',
-    'optionalFields'                             => '',
-    'options'                                    => '',
+    'mandatoryFields'                            => 'Mandatory fields',
+    'optionalFields'                             => 'Optional fields',
+    'options'                                    => 'Options',
 
     // budgets:
-    'create_new_budget'                          => '',
-    'store_new_budget'                           => '',
-    'stored_new_budget'                          => '',
-    'available_between'                          => '',
-    'transactionsWithoutBudget'                  => '',
-    'transactions_no_budget'                     => '',
-    'spent_between'                              => '',
-    'createBudget'                               => '',
-    'inactiveBudgets'                            => '',
-    'without_budget_between'                     => '',
-    'delete_budget'                              => '',
-    'deleted_budget'                             => '',
-    'edit_budget'                                => '',
-    'updated_budget'                             => '',
-    'update_amount'                              => '',
-    'update_budget'                              => '',
-    'update_budget_amount_range'                 => '',
-    'budget_period_navigator'                    => '',
+    'create_new_budget'                          => 'Create a new budget',
+    'store_new_budget'                           => 'Store new budget',
+    'stored_new_budget'                          => 'Stored new budget ":name"',
+    'available_between'                          => 'Available between :start and :end',
+    'transactionsWithoutBudget'                  => 'Expenses without budget',
+    'transactions_no_budget'                     => 'Expenses without budget between :start and :end',
+    'spent_between'                              => 'Spent between :start and :end',
+    'createBudget'                               => 'New budget',
+    'inactiveBudgets'                            => 'Inactive budgets',
+    'without_budget_between'                     => 'Transactions without a budget between :start and :end',
+    'delete_budget'                              => 'Delete budget ":name"',
+    'deleted_budget'                             => 'Deleted budget ":name"',
+    'edit_budget'                                => 'Edit budget ":name"',
+    'updated_budget'                             => 'Updated budget ":name"',
+    'update_amount'                              => 'Update amount',
+    'update_budget'                              => 'Update budget',
+    'update_budget_amount_range'                 => 'Update (expected) available amount between :start and :end',
+    'budget_period_navigator'                    => 'Period navigator',
 
     // bills:
-    'matching_on'                                => '',
-    'between_amounts'                            => '',
-    'repeats'                                    => '',
-    'connected_journals'                         => '',
-    'auto_match_on'                              => '',
-    'auto_match_off'                             => '',
-    'next_expected_match'                        => '',
-    'delete_bill'                                => '',
-    'deleted_bill'                               => '',
-    'edit_bill'                                  => '',
-    'more'                                       => '',
-    'rescan_old'                                 => '',
-    'update_bill'                                => '',
-    'updated_bill'                               => '',
-    'store_new_bill'                             => '',
-    'stored_new_bill'                            => '',
-    'cannot_scan_inactive_bill'                  => '',
-    'rescanned_bill'                             => '',
-    'average_bill_amount_year'                   => '',
-    'average_bill_amount_overall'                => '',
-    'not_or_not_yet'                             => '',
-    'not_expected_period'                        => '',
-    'bill_is_active'                             => '',
-    'bill_will_automatch'                        => '',
+    'matching_on'                                => 'Matching on',
+    'between_amounts'                            => 'between :low and :high.',
+    'repeats'                                    => 'Repeats',
+    'connected_journals'                         => 'Connected transactions',
+    'auto_match_on'                              => 'Automatically matched by Firefly',
+    'auto_match_off'                             => 'Not automatically matched by Firefly',
+    'next_expected_match'                        => 'Next expected match',
+    'delete_bill'                                => 'Delete bill ":name"',
+    'deleted_bill'                               => 'Deleted bill ":name"',
+    'edit_bill'                                  => 'Edit bill ":name"',
+    'more'                                       => 'More',
+    'rescan_old'                                 => 'Rescan old transactions',
+    'update_bill'                                => 'Update bill',
+    'updated_bill'                               => 'Updated bill ":name"',
+    'store_new_bill'                             => 'Store new bill',
+    'stored_new_bill'                            => 'Stored new bill ":name"',
+    'cannot_scan_inactive_bill'                  => 'Inactive bills cannot be scanned.',
+    'rescanned_bill'                             => 'Rescanned everything.',
+    'average_bill_amount_year'                   => 'Average bill amount (:year)',
+    'average_bill_amount_overall'                => 'Average bill amount (overall)',
+    'not_or_not_yet'                             => 'Not (yet)',
+    'not_expected_period'                        => 'Not expected this period',
+    'bill_is_active'                             => 'Bill is active',
+    'bill_will_automatch'                        => 'Bill will automatically linked to matching transactions',
     // accounts:
-    'details_for_asset'                          => '',
-    'details_for_expense'                        => '',
-    'details_for_revenue'                        => '',
-    'details_for_cash'                           => '',
-    'store_new_asset_account'                    => '',
-    'store_new_expense_account'                  => '',
-    'store_new_revenue_account'                  => '',
-    'edit_asset_account'                         => '',
-    'edit_expense_account'                       => '',
-    'edit_revenue_account'                       => '',
-    'delete_asset_account'                       => '',
-    'delete_expense_account'                     => '',
-    'delete_revenue_account'                     => '',
-    'asset_deleted'                              => '',
-    'expense_deleted'                            => '',
-    'revenue_deleted'                            => '',
-    'update_asset_account'                       => '',
-    'update_expense_account'                     => '',
-    'update_revenue_account'                     => '',
-    'make_new_asset_account'                     => '',
-    'make_new_expense_account'                   => '',
-    'make_new_revenue_account'                   => '',
-    'asset_accounts'                             => '',
-    'expense_accounts'                           => '',
-    'revenue_accounts'                           => '',
-    'cash_accounts'                              => '',
-    'Cash account'                               => '',
-    'account_type'                               => '',
-    'save_transactions_by_moving'                => '',
-    'stored_new_account'                         => '',
-    'updated_account'                            => '',
-    'credit_card_options'                        => '',
-    'no_transactions_account'                    => '',
-    'no_data_for_chart'                          => '',
-    'select_more_than_one_account'               => '',
-    'select_more_than_one_category'              => '',
-    'select_more_than_one_budget'                => '',
-    'select_more_than_one_tag'                   => '',
-    'account_default_currency'                   => '',
+    'details_for_asset'                          => 'Details for asset account ":name"',
+    'details_for_expense'                        => 'Details for expense account ":name"',
+    'details_for_revenue'                        => 'Details for revenue account ":name"',
+    'details_for_cash'                           => 'Details for cash account ":name"',
+    'store_new_asset_account'                    => 'Store new asset account',
+    'store_new_expense_account'                  => 'Store new expense account',
+    'store_new_revenue_account'                  => 'Store new revenue account',
+    'edit_asset_account'                         => 'Edit asset account ":name"',
+    'edit_expense_account'                       => 'Edit expense account ":name"',
+    'edit_revenue_account'                       => 'Edit revenue account ":name"',
+    'delete_asset_account'                       => 'Delete asset account ":name"',
+    'delete_expense_account'                     => 'Delete expense account ":name"',
+    'delete_revenue_account'                     => 'Delete revenue account ":name"',
+    'asset_deleted'                              => 'Successfully deleted asset account ":name"',
+    'expense_deleted'                            => 'Successfully deleted expense account ":name"',
+    'revenue_deleted'                            => 'Successfully deleted revenue account ":name"',
+    'update_asset_account'                       => 'Update asset account',
+    'update_expense_account'                     => 'Update expense account',
+    'update_revenue_account'                     => 'Update revenue account',
+    'make_new_asset_account'                     => 'Create a new asset account',
+    'make_new_expense_account'                   => 'Create a new expense account',
+    'make_new_revenue_account'                   => 'Create a new revenue account',
+    'asset_accounts'                             => 'Asset accounts',
+    'expense_accounts'                           => 'Expense accounts',
+    'revenue_accounts'                           => 'Revenue accounts',
+    'cash_accounts'                              => 'Cash accounts',
+    'Cash account'                               => 'Cash account',
+    'account_type'                               => 'Account type',
+    'save_transactions_by_moving'                => 'Save these transaction(s) by moving them to another account:',
+    'stored_new_account'                         => 'New account ":name" stored!',
+    'updated_account'                            => 'Updated account ":name"',
+    'credit_card_options'                        => 'Credit card options',
+    'no_transactions_account'                    => 'There are no transactions (in this period) for asset account ":name".',
+    'no_data_for_chart'                          => 'There is not enough information (yet) to generate this chart.',
+    'select_more_than_one_account'               => 'Please select more than one account',
+    'select_more_than_one_category'              => 'Please select more than one category',
+    'select_more_than_one_budget'                => 'Please select more than one budget',
+    'select_more_than_one_tag'                   => 'Please select more than one tag',
+    'account_default_currency'                   => 'If you select another currency, new transactions from this account will have this currency pre-selected.',
 
     // categories:
-    'new_category'                               => '',
-    'create_new_category'                        => '',
-    'without_category'                           => '',
-    'update_category'                            => '',
-    'updated_category'                           => '',
-    'categories'                                 => '',
-    'edit_category'                              => '',
-    'no_category'                                => '',
-    'category'                                   => '',
-    'delete_category'                            => '',
-    'deleted_category'                           => '',
-    'store_category'                             => '',
-    'stored_category'                            => '',
-    'without_category_between'                   => '',
+    'new_category'                               => 'New category',
+    'create_new_category'                        => 'Create a new category',
+    'without_category'                           => 'Without a category',
+    'update_category'                            => 'Update category',
+    'updated_category'                           => 'Updated category ":name"',
+    'categories'                                 => 'Categories',
+    'edit_category'                              => 'Edit category ":name"',
+    'no_category'                                => '(no category)',
+    'category'                                   => 'Category',
+    'delete_category'                            => 'Delete category ":name"',
+    'deleted_category'                           => 'Deleted category ":name"',
+    'store_category'                             => 'Store new category',
+    'stored_category'                            => 'Stored new category ":name"',
+    'without_category_between'                   => 'Without category between :start and :end',
 
     // transactions:
-    'update_withdrawal'                          => '',
-    'update_deposit'                             => '',
-    'update_transfer'                            => '',
-    'updated_withdrawal'                         => '',
-    'updated_deposit'                            => '',
-    'updated_transfer'                           => '',
-    'delete_withdrawal'                          => '',
-    'delete_deposit'                             => '',
-    'delete_transfer'                            => '',
-    'deleted_withdrawal'                         => '',
-    'deleted_deposit'                            => '',
-    'deleted_transfer'                           => '',
-    'stored_journal'                             => '',
-    'select_transactions'                        => '',
-    'stop_selection'                             => '',
-    'edit_selected'                              => '',
-    'delete_selected'                            => '',
-    'mass_delete_journals'                       => '',
-    'mass_edit_journals'                         => '',
-    'cannot_edit_other_fields'                   => '',
-    'perm-delete-many'                           => '',
-    'mass_deleted_transactions_success'          => '',
-    'mass_edited_transactions_success'           => '',
+    'update_withdrawal'                          => 'Update withdrawal',
+    'update_deposit'                             => 'Update deposit',
+    'update_transfer'                            => 'Update transfer',
+    'updated_withdrawal'                         => 'Updated withdrawal ":description"',
+    'updated_deposit'                            => 'Updated deposit ":description"',
+    'updated_transfer'                           => 'Updated transfer ":description"',
+    'delete_withdrawal'                          => 'Delete withdrawal ":description"',
+    'delete_deposit'                             => 'Delete deposit ":description"',
+    'delete_transfer'                            => 'Delete transfer ":description"',
+    'deleted_withdrawal'                         => 'Successfully deleted withdrawal ":description"',
+    'deleted_deposit'                            => 'Successfully deleted deposit ":description"',
+    'deleted_transfer'                           => 'Successfully deleted transfer ":description"',
+    'stored_journal'                             => 'Successfully created new transaction ":description"',
+    'select_transactions'                        => 'Select transactions',
+    'stop_selection'                             => 'Stop selecting transactions',
+    'edit_selected'                              => 'Edit selected',
+    'delete_selected'                            => 'Delete selected',
+    'mass_delete_journals'                       => 'Delete a number of transactions',
+    'mass_edit_journals'                         => 'Edit a number of transactions',
+    'cannot_edit_other_fields'                   => 'You cannot mass-edit other fields than the ones here, because there is no room to show them. Please follow the link and edit them by one-by-one, if you need to edit these fields.',
+    'perm-delete-many'                           => 'Deleting many items in one go can be very disruptive. Please be cautious.',
+    'mass_deleted_transactions_success'          => 'Deleted :amount transaction(s).',
+    'mass_edited_transactions_success'           => 'Updated :amount transaction(s)',
 
 
     // new user:
-    'welcome'                                    => '',
-    'submit'                                     => '',
-    'getting_started'                            => '',
-    'to_get_started'                             => '',
-    'savings_balance_text'                       => '',
-    'finish_up_new_user'                         => '',
-    'stored_new_accounts_new_user'               => '',
+    'welcome'                                    => 'Welcome to Firefly!',
+    'submit'                                     => 'Submit',
+    'getting_started'                            => 'Getting started',
+    'to_get_started'                             => 'It is good to see you have successfully installed Firefly III. To get started with this tool please enter your bank\'s name and the balance of your main checking account. Do not worry yet if you have multiple accounts. You can add those later. It\'s just that Firefly III needs something to start with.',
+    'savings_balance_text'                       => 'Firefly III will automatically create a savings account for you. By default, there will be no money in your savings account, but if you tell Firefly III the balance it will be stored as such.',
+    'finish_up_new_user'                         => 'That\'s it! You can continue by pressing <strong>Submit</strong>. You will be taken to the index of Firefly III.',
+    'stored_new_accounts_new_user'               => 'Yay! Your new accounts have been stored.',
 
     // home page:
-    'yourAccounts'                               => '',
-    'budgetsAndSpending'                         => '',
-    'savings'                                    => '',
-    'newWithdrawal'                              => '',
-    'newDeposit'                                 => '',
-    'newTransfer'                                => '',
-    'moneyIn'                                    => '',
-    'moneyOut'                                   => '',
-    'billsToPay'                                 => '',
-    'billsPaid'                                  => '',
+    'yourAccounts'                               => 'Your accounts',
+    'budgetsAndSpending'                         => 'Budgets and spending',
+    'savings'                                    => 'Savings',
+    'newWithdrawal'                              => 'New expense',
+    'newDeposit'                                 => 'New deposit',
+    'newTransfer'                                => 'New transfer',
+    'moneyIn'                                    => 'Money in',
+    'moneyOut'                                   => 'Money out',
+    'billsToPay'                                 => 'Bills to pay',
+    'billsPaid'                                  => 'Bills paid',
 
     // menu and titles, should be recycled as often as possible:
-    'currency'                                   => '',
-    'preferences'                                => '',
-    'logout'                                     => '',
-    'searchPlaceholder'                          => '',
-    'dashboard'                                  => '',
-    'currencies'                                 => '',
-    'accounts'                                   => '',
-    'Asset account'                              => '',
-    'Default account'                            => '',
-    'Expense account'                            => '',
-    'Revenue account'                            => '',
-    'Initial balance account'                    => '',
-    'budgets'                                    => '',
-    'tags'                                       => '',
-    'reports'                                    => '',
-    'transactions'                               => '',
-    'expenses'                                   => '',
-    'income'                                     => '',
-    'transfers'                                  => '',
-    'moneyManagement'                            => '',
-    'piggyBanks'                                 => '',
-    'bills'                                      => '',
-    'withdrawal'                                 => '',
-    'deposit'                                    => '',
-    'account'                                    => '',
-    'transfer'                                   => '',
-    'Withdrawal'                                 => '',
-    'Deposit'                                    => '',
-    'Transfer'                                   => '',
-    'bill'                                       => '',
-    'yes'                                        => '',
-    'no'                                         => '',
-    'amount'                                     => '',
-    'overview'                                   => '',
-    'saveOnAccount'                              => '',
-    'unknown'                                    => '',
-    'daily'                                      => '',
-    'monthly'                                    => '',
-    'profile'                                    => '',
-    'errors'                                     => '',
+    'currency'                                   => 'Currency',
+    'preferences'                                => 'Preferences',
+    'logout'                                     => 'Logout',
+    'searchPlaceholder'                          => 'Search...',
+    'dashboard'                                  => 'Dashboard',
+    'currencies'                                 => 'Currencies',
+    'accounts'                                   => 'Accounts',
+    'Asset account'                              => 'Asset account',
+    'Default account'                            => 'Asset account',
+    'Expense account'                            => 'Expense account',
+    'Revenue account'                            => 'Revenue account',
+    'Initial balance account'                    => 'Initial balance account',
+    'budgets'                                    => 'Budgets',
+    'tags'                                       => 'Tags',
+    'reports'                                    => 'Reports',
+    'transactions'                               => 'Transactions',
+    'expenses'                                   => 'Expenses',
+    'income'                                     => 'Revenue / income',
+    'transfers'                                  => 'Transfers',
+    'moneyManagement'                            => 'Money management',
+    'piggyBanks'                                 => 'Piggy banks',
+    'bills'                                      => 'Bills',
+    'withdrawal'                                 => 'Withdrawal',
+    'deposit'                                    => 'Deposit',
+    'account'                                    => 'Account',
+    'transfer'                                   => 'Transfer',
+    'Withdrawal'                                 => 'Withdrawal',
+    'Deposit'                                    => 'Deposit',
+    'Transfer'                                   => 'Transfer',
+    'bill'                                       => 'Bill',
+    'yes'                                        => 'Yes',
+    'no'                                         => 'No',
+    'amount'                                     => 'Amount',
+    'overview'                                   => 'Overview',
+    'saveOnAccount'                              => 'Save on account',
+    'unknown'                                    => 'Unknown',
+    'daily'                                      => 'Daily',
+    'monthly'                                    => 'Monthly',
+    'profile'                                    => 'Profile',
+    'errors'                                     => 'Errors',
 
     // reports:
-    'report_default'                             => '',
-    'report_audit'                               => '',
-    'report_category'                            => '',
-    'report_budget'                              => '',
-    'report_tag'                                 => '',
-    'quick_link_reports'                         => '',
-    'quick_link_default_report'                  => '',
-    'quick_link_audit_report'                    => '',
-    'report_this_month_quick'                    => '',
-    'report_this_year_quick'                     => '',
-    'report_this_fiscal_year_quick'              => '',
-    'report_all_time_quick'                      => '',
-    'reports_can_bookmark'                       => '',
-    'incomeVsExpenses'                           => '',
-    'accountBalances'                            => '',
-    'balanceStart'                               => '',
-    'balanceEnd'                                 => '',
-    'splitByAccount'                             => '',
-    'coveredWithTags'                            => '',
-    'leftUnbalanced'                             => '',
-    'leftInBudget'                               => '',
-    'sumOfSums'                                  => '',
-    'noCategory'                                 => '',
-    'notCharged'                                 => '',
-    'inactive'                                   => '',
-    'active'                                     => '',
-    'difference'                                 => '',
-    'in'                                         => '',
-    'out'                                        => '',
-    'topX'                                       => '',
-    'show_full_list'                             => '',
-    'show_only_top'                              => '',
-    'report_type'                                => '',
-    'report_type_default'                        => '',
-    'report_type_audit'                          => '',
-    'report_type_category'                       => '',
-    'report_type_budget'                         => '',
-    'report_type_tag'                            => '',
-    'more_info_help'                             => '',
-    'report_included_accounts'                   => '',
-    'report_date_range'                          => '',
-    'report_preset_ranges'                       => '',
-    'shared'                                     => '',
-    'fiscal_year'                                => '',
-    'income_entry'                               => '',
-    'expense_entry'                              => '',
-    'category_entry'                             => '',
-    'budget_spent_amount'                        => '',
-    'balance_amount'                             => '',
-    'no_audit_activity'                          => '',
-    'audit_end_balance'                          => '',
-    'reports_extra_options'                      => '',
-    'report_has_no_extra_options'                => '',
-    'reports_submit'                             => '',
-    'end_after_start_date'                       => '',
-    'select_category'                            => '',
-    'select_budget'                              => '',
-    'select_tag'                                 => '',
-    'income_per_category'                        => '',
-    'expense_per_category'                       => '',
-    'expense_per_budget'                         => '',
-    'income_per_account'                         => '',
-    'expense_per_account'                        => '',
-    'expense_per_tag'                            => '',
-    'income_per_tag'                             => '',
-    'include_expense_not_in_budget'              => '',
-    'include_expense_not_in_account'             => '',
-    'include_expense_not_in_category'            => '',
-    'include_income_not_in_category'             => '',
-    'include_income_not_in_account'              => '',
-    'include_income_not_in_tags'                 => '',
-    'include_expense_not_in_tags'                => '',
-    'everything_else'                            => '',
-    'income_and_expenses'                        => '',
-    'spent_average'                              => '',
-    'income_average'                             => '',
-    'transaction_count'                          => '',
-    'average_spending_per_account'               => '',
-    'average_income_per_account'                 => '',
-    'total'                                      => '',
-    'description'                                => '',
-    'sum_of_period'                              => '',
-    'average_in_period'                          => '',
-    'account_role_defaultAsset'                  => '',
-    'account_role_sharedAsset'                   => '',
-    'account_role_savingAsset'                   => '',
-    'account_role_ccAsset'                       => '',
+    'report_default'                             => 'Default financial report between :start and :end',
+    'report_audit'                               => 'Transaction history overview between :start and :end',
+    'report_category'                            => 'Category report between :start and :end',
+    'report_budget'                              => 'Budget report between :start and :end',
+    'report_tag'                                 => 'Tag report between :start and :end',
+    'quick_link_reports'                         => 'Quick links',
+    'quick_link_default_report'                  => 'Default financial report',
+    'quick_link_audit_report'                    => 'Transaction history overview',
+    'report_this_month_quick'                    => 'Current month, all accounts',
+    'report_this_year_quick'                     => 'Current year, all accounts',
+    'report_this_fiscal_year_quick'              => 'Current fiscal year, all accounts',
+    'report_all_time_quick'                      => 'All-time, all accounts',
+    'reports_can_bookmark'                       => 'Remember that reports can be bookmarked.',
+    'incomeVsExpenses'                           => 'Income vs. expenses',
+    'accountBalances'                            => 'Account balances',
+    'balanceStart'                               => 'Balance at start of period',
+    'balanceEnd'                                 => 'Balance at end of period',
+    'splitByAccount'                             => 'Split by account',
+    'coveredWithTags'                            => 'Covered with tags',
+    'leftUnbalanced'                             => 'Left unbalanced',
+    'leftInBudget'                               => 'Left in budget',
+    'sumOfSums'                                  => 'Sum of sums',
+    'noCategory'                                 => '(no category)',
+    'notCharged'                                 => 'Not charged (yet)',
+    'inactive'                                   => 'Inactive',
+    'active'                                     => 'Active',
+    'difference'                                 => 'Difference',
+    'in'                                         => 'In',
+    'out'                                        => 'Out',
+    'topX'                                       => 'top :number',
+    'show_full_list'                             => 'Show entire list',
+    'show_only_top'                              => 'Show only top :number',
+    'report_type'                                => 'Report type',
+    'report_type_default'                        => 'Default financial report',
+    'report_type_audit'                          => 'Transaction history overview (audit)',
+    'report_type_category'                       => 'Category report',
+    'report_type_budget'                         => 'Budget report',
+    'report_type_tag'                            => 'Tag report',
+    'more_info_help'                             => 'More information about these types of reports can be found in the help pages. Press the (?) icon in the top right corner.',
+    'report_included_accounts'                   => 'Included accounts',
+    'report_date_range'                          => 'Date range',
+    'report_preset_ranges'                       => 'Pre-set ranges',
+    'shared'                                     => 'Shared',
+    'fiscal_year'                                => 'Fiscal year',
+    'income_entry'                               => 'Income from account ":name" between :start and :end',
+    'expense_entry'                              => 'Expenses to account ":name" between :start and :end',
+    'category_entry'                             => 'Expenses in category ":name" between :start and :end',
+    'budget_spent_amount'                        => 'Expenses in budget ":budget" between :start and :end',
+    'balance_amount'                             => 'Expenses in budget ":budget" paid from account ":account" between :start and :end',
+    'no_audit_activity'                          => 'No activity was recorded on account <a href=":url" title=":account_name">:account_name</a> between :start and :end.',
+    'audit_end_balance'                          => 'Account balance of <a href=":url" title=":account_name">:account_name</a> at the end of :end was: :balance',
+    'reports_extra_options'                      => 'Extra options',
+    'report_has_no_extra_options'                => 'This report has no extra options',
+    'reports_submit'                             => 'View report',
+    'end_after_start_date'                       => 'End date of report must be after start date.',
+    'select_category'                            => 'Select category(ies)',
+    'select_budget'                              => 'Select budget(s).',
+    'select_tag'                                 => 'Select tag(s).',
+    'income_per_category'                        => 'Income per category',
+    'expense_per_category'                       => 'Expense per category',
+    'expense_per_budget'                         => 'Expense per budget',
+    'income_per_account'                         => 'Income per account',
+    'expense_per_account'                        => 'Expense per account',
+    'expense_per_tag'                            => 'Expense per tag',
+    'income_per_tag'                             => 'Income per tag',
+    'include_expense_not_in_budget'              => 'Included expenses not in the selected budget(s)',
+    'include_expense_not_in_account'             => 'Included expenses not in the selected account(s)',
+    'include_expense_not_in_category'            => 'Included expenses not in the selected category(ies)',
+    'include_income_not_in_category'             => 'Included income not in the selected category(ies)',
+    'include_income_not_in_account'              => 'Included income not in the selected account(s)',
+    'include_income_not_in_tags'                 => 'Included income not in the selected tag(s)',
+    'include_expense_not_in_tags'                => 'Included expenses not in the selected tag(s)',
+    'everything_else'                            => 'Everything else',
+    'income_and_expenses'                        => 'Income and expenses',
+    'spent_average'                              => 'Spent (average)',
+    'income_average'                             => 'Income (average)',
+    'transaction_count'                          => 'Transaction count',
+    'average_spending_per_account'               => 'Average spending per account',
+    'average_income_per_account'                 => 'Average income per account',
+    'total'                                      => 'Total',
+    'description'                                => 'Description',
+    'sum_of_period'                              => 'Sum of period',
+    'average_in_period'                          => 'Average in period',
+    'account_role_defaultAsset'                  => 'Default asset account',
+    'account_role_sharedAsset'                   => 'Shared asset account',
+    'account_role_savingAsset'                   => 'Savings account',
+    'account_role_ccAsset'                       => 'Credit card',
 
     // charts:
-    'chart'                                      => '',
-    'month'                                      => '',
-    'budget'                                     => '',
-    'spent'                                      => '',
-    'spent_in_budget'                            => '',
-    'left_to_spend'                              => '',
-    'earned'                                     => '',
-    'overspent'                                  => '',
-    'left'                                       => '',
-    'no_budget'                                  => '',
-    'max-amount'                                 => '',
-    'min-amount'                                 => '',
-    'journal-amount'                             => '',
-    'name'                                       => '',
-    'date'                                       => '',
-    'paid'                                       => '',
-    'unpaid'                                     => '',
-    'day'                                        => '',
-    'budgeted'                                   => '',
-    'period'                                     => '',
-    'balance'                                    => '',
-    'sum'                                        => '',
-    'average'                                    => '',
-    'balanceFor'                                 => '',
+    'chart'                                      => 'Chart',
+    'month'                                      => 'Month',
+    'budget'                                     => 'Budget',
+    'spent'                                      => 'Spent',
+    'spent_in_budget'                            => 'Spent in budget',
+    'left_to_spend'                              => 'Left to spend',
+    'earned'                                     => 'Earned',
+    'overspent'                                  => 'Overspent',
+    'left'                                       => 'Left',
+    'no_budget'                                  => '(no budget)',
+    'max-amount'                                 => 'Maximum amount',
+    'min-amount'                                 => 'Minumum amount',
+    'journal-amount'                             => 'Current bill entry',
+    'name'                                       => 'Name',
+    'date'                                       => 'Date',
+    'paid'                                       => 'Paid',
+    'unpaid'                                     => 'Unpaid',
+    'day'                                        => 'Day',
+    'budgeted'                                   => 'Budgeted',
+    'period'                                     => 'Period',
+    'balance'                                    => 'Balance',
+    'sum'                                        => 'Sum',
+    'average'                                    => 'Average',
+    'balanceFor'                                 => 'Balance for :name',
 
     // piggy banks:
-    'add_money_to_piggy'                         => '',
-    'piggy_bank'                                 => '',
-    'new_piggy_bank'                             => '',
-    'store_piggy_bank'                           => '',
-    'stored_piggy_bank'                          => '',
-    'account_status'                             => '',
-    'left_for_piggy_banks'                       => '',
-    'sum_of_piggy_banks'                         => '',
-    'saved_so_far'                               => '',
-    'left_to_save'                               => '',
-    'suggested_amount'                           => '',
-    'add_money_to_piggy_title'                   => '',
-    'remove_money_from_piggy_title'              => '',
-    'add'                                        => '',
+    'add_money_to_piggy'                         => 'Add money to piggy bank ":name"',
+    'piggy_bank'                                 => 'Piggy bank',
+    'new_piggy_bank'                             => 'New piggy bank',
+    'store_piggy_bank'                           => 'Store new piggy bank',
+    'stored_piggy_bank'                          => 'Store new piggy bank ":name"',
+    'account_status'                             => 'Account status',
+    'left_for_piggy_banks'                       => 'Left for piggy banks',
+    'sum_of_piggy_banks'                         => 'Sum of piggy banks',
+    'saved_so_far'                               => 'Saved so far',
+    'left_to_save'                               => 'Left to save',
+    'suggested_amount'                           => 'Suggested monthly amount to save',
+    'add_money_to_piggy_title'                   => 'Add money to piggy bank ":name"',
+    'remove_money_from_piggy_title'              => 'Remove money from piggy bank ":name"',
+    'add'                                        => 'Add',
 
-    'remove'                     => '',
-    'max_amount_add'             => '',
-    'max_amount_remove'          => '',
-    'update_piggy_button'        => '',
-    'update_piggy_title'         => '',
-    'updated_piggy_bank'         => '',
-    'details'                    => '',
-    'events'                     => '',
-    'target_amount'              => '',
-    'start_date'                 => '',
-    'target_date'                => '',
-    'no_target_date'             => '',
-    'table'                      => '',
-    'delete_piggy_bank'          => '',
-    'cannot_add_amount_piggy'    => '',
-    'cannot_remove_from_piggy'   => '',
-    'deleted_piggy_bank'         => '',
-    'added_amount_to_piggy'      => '',
-    'removed_amount_from_piggy'  => '',
+    'remove'                     => 'Remove',
+    'max_amount_add'             => 'The maximum amount you can add is',
+    'max_amount_remove'          => 'The maximum amount you can remove is',
+    'update_piggy_button'        => 'Update piggy bank',
+    'update_piggy_title'         => 'Update piggy bank ":name"',
+    'updated_piggy_bank'         => 'Updated piggy bank ":name"',
+    'details'                    => 'Details',
+    'events'                     => 'Events',
+    'target_amount'              => 'Target amount',
+    'start_date'                 => 'Start date',
+    'target_date'                => 'Target date',
+    'no_target_date'             => 'No target date',
+    'table'                      => 'Table',
+    'delete_piggy_bank'          => 'Delete piggy bank ":name"',
+    'cannot_add_amount_piggy'    => 'Could not add :amount to ":name".',
+    'cannot_remove_from_piggy'   => 'Could not remove :amount from ":name".',
+    'deleted_piggy_bank'         => 'Deleted piggy bank ":name"',
+    'added_amount_to_piggy'      => 'Added :amount to ":name"',
+    'removed_amount_from_piggy'  => 'Removed :amount from ":name"',
 
     // tags
-    'regular_tag'                => '',
-    'balancing_act'              => '',
-    'advance_payment'            => '',
-    'delete_tag'                 => '',
-    'deleted_tag'                => '',
-    'new_tag'                    => '',
-    'edit_tag'                   => '',
-    'updated_tag'                => '',
-    'created_tag'                => '',
+    'regular_tag'                => 'Just a regular tag.',
+    'balancing_act'              => 'The tag takes at most two transactions; an expense and a transfer. They\'ll balance each other out.',
+    'advance_payment'            => 'The tag accepts one expense and any number of deposits aimed to repay the original expense.',
+    'delete_tag'                 => 'Delete tag ":tag"',
+    'deleted_tag'                => 'Deleted tag ":tag"',
+    'new_tag'                    => 'Make new tag',
+    'edit_tag'                   => 'Edit tag ":tag"',
+    'updated_tag'                => 'Updated tag ":tag"',
+    'created_tag'                => 'Tag ":tag" has been created!',
 
-    'transaction_journal_information'       => '',
-    'transaction_journal_meta'              => '',
-    'total_amount'                          => '',
-    'number_of_decimals'                    => '',
+    'transaction_journal_information'       => 'Transaction information',
+    'transaction_journal_meta'              => 'Meta information',
+    'total_amount'                          => 'Total amount',
+    'number_of_decimals'                    => 'Number of decimals',
 
     // administration
-    'administration'                        => '',
-    'user_administration'                   => '',
-    'list_all_users'                        => '',
-    'all_users'                             => '',
-    'instance_configuration'                => '',
-    'firefly_instance_configuration'        => '',
-    'setting_single_user_mode'              => '',
-    'setting_single_user_mode_explain'      => '',
-    'store_configuration'                   => '',
-    'single_user_administration'            => '',
-    'edit_user'                             => '',
-    'hidden_fields_preferences'             => '',
-    'user_data_information'                 => '',
-    'user_information'                      => '',
-    'total_size'                            => '',
-    'budget_or_budgets'                     => '',
-    'budgets_with_limits'                   => '',
-    'rule_or_rules'                         => '',
-    'rulegroup_or_groups'                   => '',
-    'configuration_updated'                 => '',
-    'setting_is_demo_site'                  => '',
-    'setting_is_demo_site_explain'          => '',
-    'block_code_bounced'                    => '',
-    'block_code_expired'                    => '',
-    'no_block_code'                         => '',
+    'administration'                        => 'Administration',
+    'user_administration'                   => 'User administration',
+    'list_all_users'                        => 'All users',
+    'all_users'                             => 'All users',
+    'instance_configuration'                => 'Configuration',
+    'firefly_instance_configuration'        => 'Configuration options for Firefly III',
+    'setting_single_user_mode'              => 'Single user mode',
+    'setting_single_user_mode_explain'      => 'By default, Firefly III only accepts one (1) registration: you. This is a security measure, preventing others from using your instance unless you allow them to. Future registrations are blocked. When you uncheck this box, others can use your instance as wel, assuming they can reach it (when it is connected to the internet).',
+    'store_configuration'                   => 'Store configuration',
+    'single_user_administration'            => 'User administration for :email',
+    'edit_user'                             => 'Edit user :email',
+    'hidden_fields_preferences'             => 'Not all fields are visible right now. You must enable them in your <a href=":link">settings</a>.',
+    'user_data_information'                 => 'User data',
+    'user_information'                      => 'User information',
+    'total_size'                            => 'total size',
+    'budget_or_budgets'                     => 'budget(s)',
+    'budgets_with_limits'                   => 'budget(s) with configured amount',
+    'rule_or_rules'                         => 'rule(s)',
+    'rulegroup_or_groups'                   => 'rule group(s)',
+    'configuration_updated'                 => 'The configuration has been updated',
+    'setting_is_demo_site'                  => 'Demo site',
+    'setting_is_demo_site_explain'          => 'If you check this box, this installation will behave as if it is the demo site, which can have weird side effects.',
+    'block_code_bounced'                    => 'Email message(s) bounced',
+    'block_code_expired'                    => 'Demo account expired',
+    'no_block_code'                         => 'No reason for block or user not blocked',
     // links
-    'journal_link_configuration'            => '',
-    'create_new_link_type'                  => '',
-    'store_new_link_type'                   => '',
-    'update_link_type'                      => '',
-    'edit_link_type'                        => '',
-    'updated_link_type'                     => '',
-    'delete_link_type'                      => '',
-    'deleted_link_type'                     => '',
-    'stored_new_link_type'                  => '',
-    'cannot_edit_link_type'                 => '',
-    'link_type_help_name'                   => '',
-    'link_type_help_inward'                 => '',
-    'link_type_help_outward'                => '',
-    'save_connections_by_moving'            => '',
-    'do_not_save_connection'                => '',
-    'link_transaction'                      => '',
-    'link_to_other_transaction'             => '',
-    'select_transaction_to_link'            => '',
-    'this_transaction'                      => '',
-    'transaction'                           => '',
-    'comments'                              => '',
-    'to_link_not_found'                     => '',
-    'invalid_link_data'                     => '',
-    'journals_linked'                       => '',
-    'journals_error_linked'                 => '',
-    'journal_links'                         => '',
-    'this_withdrawal'                       => '',
-    'this_deposit'                          => '',
-    'this_transfer'                         => '',
-    'overview_for_link'                     => '',
-    'delete_journal_link'                   => '',
-    'deleted_link'                          => '',
+    'journal_link_configuration'            => 'Transaction links configuration',
+    'create_new_link_type'                  => 'Create new link type',
+    'store_new_link_type'                   => 'Store new link type',
+    'update_link_type'                      => 'Update link type',
+    'edit_link_type'                        => 'Edit link type ":name"',
+    'updated_link_type'                     => 'Updated link type ":name"',
+    'delete_link_type'                      => 'Delete link type ":name"',
+    'deleted_link_type'                     => 'Deleted link type ":name"',
+    'stored_new_link_type'                  => 'Store new link type ":name"',
+    'cannot_edit_link_type'                 => 'Cannot edit link type ":name"',
+    'link_type_help_name'                   => 'Ie. "Duplicates"',
+    'link_type_help_inward'                 => 'Ie. "duplicates"',
+    'link_type_help_outward'                => 'Ie. "is duplicated by"',
+    'save_connections_by_moving'            => 'Save the link between these transaction(s) by moving them to another link type:',
+    'do_not_save_connection'                => '(do not save connection)',
+    'link_transaction'                      => 'Link transaction',
+    'link_to_other_transaction'             => 'Link this transaction to another transaction',
+    'select_transaction_to_link'            => 'Select a transaction to link this transaction to',
+    'this_transaction'                      => 'This transaction',
+    'transaction'                           => 'Transaction',
+    'comments'                              => 'Comments',
+    'to_link_not_found'                     => 'If the transaction you want to link to is not listed, simply enter its ID.',
+    'invalid_link_data'                     => 'Invalid link type selected. Cannot link transaction.',
+    'journals_linked'                       => 'Transactions are linked.',
+    'journals_error_linked'                 => 'These transactions are already linked.',
+    'journal_links'                         => 'Transaction links',
+    'this_withdrawal'                       => 'This withdrawal',
+    'this_deposit'                          => 'This deposit',
+    'this_transfer'                         => 'This transfer',
+    'overview_for_link'                     => 'Overview for link type ":name"',
+    'delete_journal_link'                   => 'Delete the link between <a href=":source_link">:source</a> and <a href=":destination_link">:destination</a>',
+    'deleted_link'                          => 'Deleted link',
 
 
     // split a transaction:
-    'splits'                                => '',
-    'add_another_split'                     => '',
-    'split-transactions'                    => '',
-    'do_split'                              => '',
-    'split_this_withdrawal'                 => '',
-    'split_this_deposit'                    => '',
-    'split_this_transfer'                   => '',
-    'cannot_edit_multiple_source'           => '',
-    'cannot_edit_multiple_dest'             => '',
-    'cannot_edit_opening_balance'           => '',
-    'no_edit_multiple_left'                 => '',
+    'splits'                                => 'Splits',
+    'add_another_split'                     => 'Add another split',
+    'split-transactions'                    => 'Split transactions',
+    'do_split'                              => 'Do a split',
+    'split_this_withdrawal'                 => 'Split this withdrawal',
+    'split_this_deposit'                    => 'Split this deposit',
+    'split_this_transfer'                   => 'Split this transfer',
+    'cannot_edit_multiple_source'           => 'You cannot edit splitted transaction #:id with description ":description" because it contains multiple source accounts.',
+    'cannot_edit_multiple_dest'             => 'You cannot edit splitted transaction #:id with description ":description" because it contains multiple destination accounts.',
+    'cannot_edit_opening_balance'           => 'You cannot edit the opening balance of an account.',
+    'no_edit_multiple_left'                 => 'You have selected no valid transactions to edit.',
 
     // import bread crumbs and titles:
-    'import'                                => '',
-    'import_data'                           => '',
+    'import'                                => 'Import',
+    'import_data'                           => 'Import data',
 
     // import index page:
-    'import_index_title'                    => '',
-    'import_index_sub_title'                => '',
-    'import_general_index_intro'            => '',
-    'import_index_intro'                    => '',
-    'import_index_file'                     => '',
-    'import_index_config'                   => '',
-    'import_index_type'                     => '',
-    'import_index_start'                    => '',
+    'import_index_title'                    => 'Import data into Firefly III',
+    'import_index_sub_title'                => 'Index',
+    'import_general_index_intro'            => 'Welcome to Firefly\'s import routine. There are a few ways of importing data into Firefly III, displayed here as buttons.',
+    'import_index_intro'                    => 'This routine will help you import files from your bank into Firefly III. Please check out the help pages in the top right corner.',
+    'import_index_file'                     => 'Select your file',
+    'import_index_config'                   => 'If you have previously imported data into Firefly III, you may have a configuration file, which will pre-set configuration values for you. For some banks, other users have kindly provided their <a href="https://github.com/firefly-iii/import-configurations/wiki">configuration file</a>.',
+    'import_index_type'                     => 'Select the type of file you will upload',
+    'import_index_start'                    => 'Start importing',
 
     // supported file types:
-    'import_file_type_csv'                  => '',
+    'import_file_type_csv'                  => 'CSV (comma separated values)',
 
     // import configuration routine:
-    'import_config_sub_title'               => '',
-    'import_config_bread_crumb'             => '',
+    'import_config_sub_title'               => 'Set up your import file',
+    'import_config_bread_crumb'             => 'Set up your import file',
 
     // import status page:
-    'import_status_bread_crumb'             => '',
-    'import_status_sub_title'               => '',
-    'import_status_wait_title'              => '',
-    'import_status_wait_text'               => '',
-    'import_status_ready_title'             => '',
-    'import_status_ready_text'              => '',
-    'import_status_ready_config'            => '',
-    'import_status_ready_start'             => '',
-    'import_status_ready_share'             => '',
-    'import_status_running_title'           => '',
-    'import_status_running_placeholder'     => '',
-    'import_status_errors_title'            => '',
-    'import_status_errors_single'           => '',
-    'import_status_errors_multi'            => '',
-    'import_status_fatal_title'             => '',
-    'import_status_fatal_text'              => '',
-    'import_status_fatal_more'              => '',
-    'import_status_finished_title'          => '',
-    'import_status_finished_text'           => '',
-    'import_status_finished_job'            => '',
-    'import_with_key'                       => '',
+    'import_status_bread_crumb'             => 'Import status',
+    'import_status_sub_title'               => 'Import status',
+    'import_status_wait_title'              => 'Please hold...',
+    'import_status_wait_text'               => 'This box will disappear in a moment.',
+    'import_status_ready_title'             => 'Import is ready to start',
+    'import_status_ready_text'              => 'The import is ready to start. All the configuration you needed to do has been done. Please download the configuration file. It will help you with the import should it not go as planned. To actually run the import, you can either execute the following command in your console, or run the web-based import. Depending on your configuration, the console import will give you more feedback.',
+    'import_status_ready_config'            => 'Download configuration',
+    'import_status_ready_start'             => 'Start the import',
+    'import_status_ready_share'             => 'Please consider downloading your configuration and sharing it at the <strong><a href="https://github.com/firefly-iii/import-configurations/wiki">import configuration center</a></strong>. This will allow other users of Firefly III to import their files more easily.',
+    'import_status_running_title'           => 'The import is running',
+    'import_status_running_placeholder'     => 'Please hold for an update...',
+    'import_status_errors_title'            => 'Errors during the import',
+    'import_status_errors_single'           => 'An error has occured during the import. It does not appear to be fatal.',
+    'import_status_errors_multi'            => 'Some errors occured during the import. These do not appear to be fatal.',
+    'import_status_fatal_title'             => 'A fatal error occurred',
+    'import_status_fatal_text'              => 'A fatal error occurred, which the import-routine cannot recover from. Please see the explanation in red below.',
+    'import_status_fatal_more'              => 'If the error is a time-out, the import will have stopped half-way. For some server configurations, it is merely the server that stopped while the import keeps running in the background. To verify this, check out the log files. If the problem persists, consider importing over the command line instead.',
+    'import_status_finished_title'          => 'Import routine finished',
+    'import_status_finished_text'           => 'The import routine has imported your file.',
+    'import_status_finished_job'            => 'The transactions imported can be found in tag <a href=":link" class="label label-success" style="font-size:100%;font-weight:normal;">:tag</a>.',
+    'import_with_key'                       => 'Import with key \':key\'',
 
     // sandstorm.io errors and messages:
-    'sandstorm_not_available'               => '',
+    'sandstorm_not_available'               => 'This function is not available when you are using Firefly III within a Sandstorm.io environment.',
 
     // empty lists? no objects? instructions:
-    'no_transactions_in_period'             => '',
-    'no_accounts_title_asset'               => '',
-    'no_accounts_intro_asset'               => '',
-    'no_accounts_imperative_asset'          => '',
-    'no_accounts_create_asset'              => '',
-    'no_accounts_title_expense'             => '',
-    'no_accounts_intro_expense'             => '',
-    'no_accounts_imperative_expense'        => '',
-    'no_accounts_create_expense'            => '',
-    'no_accounts_title_revenue'             => '',
-    'no_accounts_intro_revenue'             => '',
-    'no_accounts_imperative_revenue'        => '',
-    'no_accounts_create_revenue'            => '',
-    'no_budgets_title_default'              => '',
-    'no_budgets_intro_default'              => '',
-    'no_budgets_imperative_default'         => '',
-    'no_budgets_create_default'             => '',
-    'no_categories_title_default'           => '',
-    'no_categories_intro_default'           => '',
-    'no_categories_imperative_default'      => '',
-    'no_categories_create_default'          => '',
-    'no_tags_title_default'                 => '',
-    'no_tags_intro_default'                 => '',
-    'no_tags_imperative_default'            => '',
-    'no_tags_create_default'                => '',
-    'no_transactions_title_withdrawal'      => '',
-    'no_transactions_intro_withdrawal'      => '',
-    'no_transactions_imperative_withdrawal' => '',
-    'no_transactions_create_withdrawal'     => '',
-    'no_transactions_title_deposit'         => '',
-    'no_transactions_intro_deposit'         => '',
-    'no_transactions_imperative_deposit'    => '',
-    'no_transactions_create_deposit'        => '',
-    'no_transactions_title_transfers'       => '',
-    'no_transactions_intro_transfers'       => '',
-    'no_transactions_imperative_transfers'  => '',
-    'no_transactions_create_transfers'      => '',
-    'no_piggies_title_default'              => '',
-    'no_piggies_intro_default'              => '',
-    'no_piggies_imperative_default'         => '',
-    'no_piggies_create_default'             => '',
-    'no_bills_title_default'                => '',
-    'no_bills_intro_default'                => '',
-    'no_bills_imperative_default'           => '',
-    'no_bills_create_default'               => '',
+    'no_transactions_in_period'             => 'There are no transactions in this period.',
+    'no_accounts_title_asset'               => 'Let\'s create an asset account!',
+    'no_accounts_intro_asset'               => 'You have no asset accounts yet. Asset accounts are your main accounts: your checking account, savings account, shared account or even your credit card.',
+    'no_accounts_imperative_asset'          => 'To start using Firefly III you must create at least one asset account. Let\'s do so now:',
+    'no_accounts_create_asset'              => 'Create an asset account',
+    'no_accounts_title_expense'             => 'Let\'s create an expense account!',
+    'no_accounts_intro_expense'             => 'You have no expense accounts yet. Expense accounts are the places where you spend money, such as shops and supermarkets.',
+    'no_accounts_imperative_expense'        => 'Expense accounts are created automatically when you create transactions, but you can create one manually too, if you want. Let\'s create one now:',
+    'no_accounts_create_expense'            => 'Create an expense account',
+    'no_accounts_title_revenue'             => 'Let\'s create a revenue account!',
+    'no_accounts_intro_revenue'             => 'You have no revenue accounts yet. Revenue accounts are the places where you receive money from, such as your employer.',
+    'no_accounts_imperative_revenue'        => 'Revenue accounts are created automatically when you create transactions, but you can create one manually too, if you want. Let\'s create one now:',
+    'no_accounts_create_revenue'            => 'Create a revenue account',
+    'no_budgets_title_default'              => 'Let\'s create a budget',
+    'no_budgets_intro_default'              => 'You have no budgets yet. Budgets are used to organise your expenses into logical groups, which you can give a soft-cap to limit your expenses.',
+    'no_budgets_imperative_default'         => 'Budgets are the basic tools of financial management. Let\'s create one now:',
+    'no_budgets_create_default'             => 'Create a budget',
+    'no_categories_title_default'           => 'Let\'s create a category!',
+    'no_categories_intro_default'           => 'You have no categories yet. Categories are used to fine tune your transactions and label them with their designated category.',
+    'no_categories_imperative_default'      => 'Categories are created automatically when you create transactions, but you can create one manually too. Let\'s create one now:',
+    'no_categories_create_default'          => 'Create a category',
+    'no_tags_title_default'                 => 'Let\'s create a tag!',
+    'no_tags_intro_default'                 => 'You have no tags yet. Tags are used to fine tune your transactions and label them with specific keywords.',
+    'no_tags_imperative_default'            => 'Tags are created automatically when you create transactions, but you can create one manually too. Let\'s create one now:',
+    'no_tags_create_default'                => 'Create a tag',
+    'no_transactions_title_withdrawal'      => 'Let\'s create an expense!',
+    'no_transactions_intro_withdrawal'      => 'You have no expenses yet. You should create expenses to start managing your finances.',
+    'no_transactions_imperative_withdrawal' => 'Have you spent some money? Then you should write it down:',
+    'no_transactions_create_withdrawal'     => 'Create an expense',
+    'no_transactions_title_deposit'         => 'Let\'s create some income!',
+    'no_transactions_intro_deposit'         => 'You have no recorded income yet. You should create income entries to start managing your finances.',
+    'no_transactions_imperative_deposit'    => 'Have you received some money? Then you should write it down:',
+    'no_transactions_create_deposit'        => 'Create a deposit',
+    'no_transactions_title_transfers'       => 'Let\'s create a transfer!',
+    'no_transactions_intro_transfers'       => 'You have no transfers yet. When you move money between asset accounts, it is recorded as a transfer.',
+    'no_transactions_imperative_transfers'  => 'Have you moved some money around? Then you should write it down:',
+    'no_transactions_create_transfers'      => 'Create a transfer',
+    'no_piggies_title_default'              => 'Let\'s create a piggy bank!',
+    'no_piggies_intro_default'              => 'You have no piggy banks yet. You can create piggy banks to divide your savings and keep track of what you\'re saving up for.',
+    'no_piggies_imperative_default'         => 'Do you have things you\'re saving money for? Create a piggy bank and keep track:',
+    'no_piggies_create_default'             => 'Create a new piggy bank',
+    'no_bills_title_default'                => 'Let\'s create a bill!',
+    'no_bills_intro_default'                => 'You have no bills yet. You can create bills to keep track of regular expenses, like your rent of insurance.',
+    'no_bills_imperative_default'           => 'Do you have such regular bills? Create a bill and keep track of your payments:',
+    'no_bills_create_default'               => 'Create a bill',
 
 
 ];
\ No newline at end of file

From c38429d3a379878a324096b2b07a5dc780b96be6 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Fri, 25 Aug 2017 07:37:27 +0200
Subject: [PATCH 352/668] New translations firefly.php (Slovenian)

---
 resources/lang/sl_SI/firefly.php | 1672 +++++++++++++++---------------
 1 file changed, 836 insertions(+), 836 deletions(-)

diff --git a/resources/lang/sl_SI/firefly.php b/resources/lang/sl_SI/firefly.php
index 0020120886..719fa02e72 100644
--- a/resources/lang/sl_SI/firefly.php
+++ b/resources/lang/sl_SI/firefly.php
@@ -14,26 +14,26 @@ declare(strict_types=1);
 return [
     // general stuff:
     'close'                                      => 'zapri',
-    'actions'                                    => '',
+    'actions'                                    => 'Actions',
     'edit'                                       => 'uredi',
     'delete'                                     => 'izbriši',
     'welcomeBack'                                => 'Kaj dogaja?',
     'everything'                                 => 'vse',
     'customRange'                                => 'obseg po meri',
     'apply'                                      => 'uporabi',
-    'select_date'                                => '',
+    'select_date'                                => 'Select date..',
     'cancel'                                     => 'prekliči',
-    'from'                                       => '',
-    'to'                                         => '',
+    'from'                                       => 'From',
+    'to'                                         => 'To',
     'showEverything'                             => 'pokaži vse',
     'never'                                      => 'nikoli',
-    'no_results_for_empty_search'                => '',
-    'removed_amount'                             => '',
-    'added_amount'                               => '',
+    'no_results_for_empty_search'                => 'Your search was empty, so nothing was found.',
+    'removed_amount'                             => 'Removed :amount',
+    'added_amount'                               => 'Added :amount',
     'asset_account_role_help'                    => 'Dodatne možnosti se lahko nastavljajo tudi kasneje.',
-    'Opening balance'                            => '',
-    'create_new_stuff'                           => '',
-    'new_withdrawal'                             => '',
+    'Opening balance'                            => 'Opening balance',
+    'create_new_stuff'                           => 'Create new stuff',
+    'new_withdrawal'                             => 'New withdrawal',
     'new_deposit'                                => 'nov depozit',
     'new_transfer'                               => 'nov prenos',
     'new_asset_account'                          => 'nov premoženjski račun',
@@ -41,928 +41,928 @@ return [
     'new_revenue_account'                        => 'nov konto za dohodke',
     'new_budget'                                 => 'nov budžet',
     'new_bill'                                   => 'nov trajnik',
-    'block_account_logout'                       => '',
-    'flash_success'                              => '',
-    'flash_info'                                 => '',
-    'flash_warning'                              => '',
-    'flash_error'                                => '',
-    'flash_info_multiple'                        => '',
-    'flash_error_multiple'                       => '',
-    'net_worth'                                  => '',
-    'route_has_no_help'                          => '',
-    'two_factor_welcome'                         => '',
-    'two_factor_enter_code'                      => '',
-    'two_factor_code_here'                       => '',
-    'two_factor_title'                           => '',
-    'authenticate'                               => '',
-    'two_factor_forgot_title'                    => '',
-    'two_factor_forgot'                          => '',
-    'two_factor_lost_header'                     => '',
-    'two_factor_lost_intro'                      => '',
-    'two_factor_lost_fix_self'                   => '',
-    'two_factor_lost_fix_owner'                  => '',
-    'warning_much_data'                          => '',
-    'registered'                                 => '',
+    'block_account_logout'                       => 'You have been logged out. Blocked accounts cannot use this site. Did you register with a valid email address?',
+    'flash_success'                              => 'Success!',
+    'flash_info'                                 => 'Message',
+    'flash_warning'                              => 'Warning!',
+    'flash_error'                                => 'Error!',
+    'flash_info_multiple'                        => 'There is one message|There are :count messages',
+    'flash_error_multiple'                       => 'There is one error|There are :count errors',
+    'net_worth'                                  => 'Net worth',
+    'route_has_no_help'                          => 'There is no help for this route.',
+    'two_factor_welcome'                         => 'Hello, :user!',
+    'two_factor_enter_code'                      => 'To continue, please enter your two factor authentication code. Your application can generate it for you.',
+    'two_factor_code_here'                       => 'Enter code here',
+    'two_factor_title'                           => 'Two factor authentication',
+    'authenticate'                               => 'Authenticate',
+    'two_factor_forgot_title'                    => 'Lost two factor authentication',
+    'two_factor_forgot'                          => 'I forgot my two-factor thing.',
+    'two_factor_lost_header'                     => 'Lost your two factor authentication?',
+    'two_factor_lost_intro'                      => 'Unfortunately, this is not something you can reset from the web interface. You have two choices.',
+    'two_factor_lost_fix_self'                   => 'If you run your own instance of Firefly III, check the logs in <code>storage/logs</code> for instructions.',
+    'two_factor_lost_fix_owner'                  => 'Otherwise, email the site owner, <a href="mailto::site_owner">:site_owner</a> and ask them to reset your two factor authentication.',
+    'warning_much_data'                          => ':days days of data may take a while to load.',
+    'registered'                                 => 'You have registered successfully!',
     'Default asset account'                      => 'privzeti premoženjski račun',
     'no_budget_pointer'                          => 'Kot kaže niste definirali še nobenega budžeta. Budžete lahko ustvarite na strani  <a href="/budgets">budžeti></a>. Budžeti vam pomagajo držati pregled nad vašimi stroški.',
-    'Savings account'                            => '',
-    'Credit card'                                => '',
-    'source_accounts'                            => '',
-    'destination_accounts'                       => '',
-    'user_id_is'                                 => '',
-    'field_supports_markdown'                    => '',
-    'need_more_help'                             => '',
-    'reenable_intro_text'                        => '',
-    'intro_boxes_after_refresh'                  => '',
-    'show_all_no_filter'                         => '',
+    'Savings account'                            => 'Savings account',
+    'Credit card'                                => 'Credit card',
+    'source_accounts'                            => 'Source account(s)',
+    'destination_accounts'                       => 'Destination account(s)',
+    'user_id_is'                                 => 'Your user id is <strong>:user</strong>',
+    'field_supports_markdown'                    => 'This field supports <a href="https://en.support.wordpress.com/markdown-quick-reference/">Markdown</a>.',
+    'need_more_help'                             => 'If you need more help using Firefly III, please <a href="https://github.com/firefly-iii/firefly-iii/issues">open a ticket on Github</a>.',
+    'reenable_intro_text'                        => 'You can also reenable <a href="#" id="reenableGuidance">the introduction guidance</a>.',
+    'intro_boxes_after_refresh'                  => 'The introduction boxes will reappear when you refresh the page.',
+    'show_all_no_filter'                         => 'Show all transactions without grouping them by date.',
     'expenses_by_category'                       => 'stroški po kategorijah',
     'expenses_by_budget'                         => 'stroški po budžetih',
-    'income_by_category'                         => '',
+    'income_by_category'                         => 'Income by category',
     'expenses_by_asset_account'                  => 'stroški po premoženjskih računih',
     'expenses_by_expense_account'                => 'stroški po stroškovnih kontih',
-    'cannot_redirect_to_account'                 => '',
+    'cannot_redirect_to_account'                 => 'Firefly III cannot redirect you to the correct page. Apologies.',
     'sum_of_expenses'                            => 'vsota stroškov',
-    'sum_of_income'                              => '',
-    'total_sum'                                  => '',
-    'spent_in_specific_budget'                   => '',
-    'sum_of_expenses_in_budget'                  => '',
-    'left_in_budget_limit'                       => '',
-    'cannot_reset_demo_user'                     => '',
-    'current_period'                             => '',
-    'show_the_current_period_and_overview'       => '',
-    'pref_languages_locale'                      => '',
-    'budget_in_period'                           => '',
-    'chart_budget_in_period'                     => '',
-    'chart_account_in_period'                    => '',
-    'chart_category_in_period'                   => '',
-    'chart_category_all'                         => '',
-    'clone_withdrawal'                           => '',
-    'clone_deposit'                              => '',
-    'clone_transfer'                             => '',
-    'multi_select_no_selection'                  => '',
-    'multi_select_all_selected'                  => '',
-    'multi_select_filter_placeholder'            => '',
-    'between_dates_breadcrumb'                   => '',
-    'all_journals_without_budget'                => '',
-    'journals_without_budget'                    => '',
-    'all_journals_without_category'              => '',
-    'journals_without_category'                  => '',
-    'all_journals_for_account'                   => '',
-    'chart_all_journals_for_account'             => '',
-    'journals_in_period_for_account'             => '',
-    'transferred'                                => '',
+    'sum_of_income'                              => 'Sum of income',
+    'total_sum'                                  => 'Total sum',
+    'spent_in_specific_budget'                   => 'Spent in budget ":budget"',
+    'sum_of_expenses_in_budget'                  => 'Spent total in budget ":budget"',
+    'left_in_budget_limit'                       => 'Left to spend according to budgeting',
+    'cannot_reset_demo_user'                     => 'You cannot reset the password of the demonstration account',
+    'current_period'                             => 'Current period',
+    'show_the_current_period_and_overview'       => 'Show the current period and overview',
+    'pref_languages_locale'                      => 'For a language other than English to work properly, your operating system must be equipped with the correct locale-information. If these are not present, currency data, dates and amounts may be formatted wrong.',
+    'budget_in_period'                           => 'All transactions for budget ":name" between :start and :end',
+    'chart_budget_in_period'                     => 'Chart for all transactions for budget ":name" between :start and :end',
+    'chart_account_in_period'                    => 'Chart for all transactions for account ":name" between :start and :end',
+    'chart_category_in_period'                   => 'Chart for all transactions for category ":name" between :start and :end',
+    'chart_category_all'                         => 'Chart for all transactions for category ":name"',
+    'clone_withdrawal'                           => 'Clone this withdrawal',
+    'clone_deposit'                              => 'Clone this deposit',
+    'clone_transfer'                             => 'Clone this transfer',
+    'multi_select_no_selection'                  => 'None selected',
+    'multi_select_all_selected'                  => 'All selected',
+    'multi_select_filter_placeholder'            => 'Find..',
+    'between_dates_breadcrumb'                   => 'Between :start and :end',
+    'all_journals_without_budget'                => 'All transactions without a budget',
+    'journals_without_budget'                    => 'Transactions without a budget',
+    'all_journals_without_category'              => 'All transactions without a category',
+    'journals_without_category'                  => 'Transactions without a category',
+    'all_journals_for_account'                   => 'All transactions for account :name',
+    'chart_all_journals_for_account'             => 'Chart of all transactions for account :name',
+    'journals_in_period_for_account'             => 'All transactions for account :name between :start and :end',
+    'transferred'                                => 'Transferred',
     'all_withdrawal'                             => 'vsi stroški',
-    'all_transactions'                           => '',
+    'all_transactions'                           => 'All transactions',
     'title_withdrawal_between'                   => 'vsi stroški med :start in :end',
-    'all_deposit'                                => '',
-    'title_deposit_between'                      => '',
-    'all_transfers'                              => '',
-    'title_transfers_between'                    => '',
-    'all_transfer'                               => '',
-    'all_journals_for_tag'                       => '',
-    'title_transfer_between'                     => '',
-    'all_journals_for_category'                  => '',
-    'all_journals_for_budget'                    => '',
-    'chart_all_journals_for_budget'              => '',
-    'journals_in_period_for_category'            => '',
-    'journals_in_period_for_tag'                 => '',
-    'not_available_demo_user'                    => '',
+    'all_deposit'                                => 'All revenue',
+    'title_deposit_between'                      => 'All revenue between :start and :end',
+    'all_transfers'                              => 'All transfers',
+    'title_transfers_between'                    => 'All transfers between :start and :end',
+    'all_transfer'                               => 'All transfers',
+    'all_journals_for_tag'                       => 'All transactions for tag ":tag"',
+    'title_transfer_between'                     => 'All transfers between :start and :end',
+    'all_journals_for_category'                  => 'All transactions for category :name',
+    'all_journals_for_budget'                    => 'All transactions for budget :name',
+    'chart_all_journals_for_budget'              => 'Chart of all transactions for budget :name',
+    'journals_in_period_for_category'            => 'All transactions for category :name between :start and :end',
+    'journals_in_period_for_tag'                 => 'All transactions for tag :tag between :start and :end',
+    'not_available_demo_user'                    => 'The feature you try to access is not available to demo users.',
     'exchange_rate_instructions'                 => 'Premoženjski račun "@name" sprejema samo transakcije v @native_currency. Če želite namesto tega uporabiti @foreign_currency, morate podati tudi znesek v @native_currency:',
     'transfer_exchange_rate_instructions'        => 'Izvorni premoženjski račun "@source_name" sprejema samo transakcije v @source_currency. Ciljni premoženjski račun "@dest_name" sprejema samo transakcije v @dest_currency. Podati morate znesek v obeh valutah.',
-    'transaction_data'                           => '',
+    'transaction_data'                           => 'Transaction data',
 
     // search
-    'search'                                     => '',
-    'search_found_transactions'                  => '',
-    'general_search_error'                       => '',
-    'search_box'                                 => '',
-    'search_box_intro'                           => '',
-    'search_error'                               => '',
-    'search_searching'                           => '',
+    'search'                                     => 'Search',
+    'search_found_transactions'                  => 'Number of transactions found:',
+    'general_search_error'                       => 'An error occured while searching. Please check the log files for more information.',
+    'search_box'                                 => 'Search',
+    'search_box_intro'                           => 'Welcome to the search function of Firefly III. Enter your search query in the box. Make sure you check out the help file because the search is pretty advanced.',
+    'search_error'                               => 'Error while searching',
+    'search_searching'                           => 'Searching ...',
 
     // repeat frequencies:
-    'repeat_freq_yearly'                         => '',
-    'repeat_freq_monthly'                        => '',
-    'weekly'                                     => '',
-    'quarterly'                                  => '',
-    'half-year'                                  => '',
-    'yearly'                                     => '',
+    'repeat_freq_yearly'                         => 'yearly',
+    'repeat_freq_monthly'                        => 'monthly',
+    'weekly'                                     => 'weekly',
+    'quarterly'                                  => 'quarterly',
+    'half-year'                                  => 'every half year',
+    'yearly'                                     => 'yearly',
 
     // export data:
-    'import_and_export'                          => '',
-    'export_data'                                => '',
-    'export_data_intro'                          => '',
-    'export_format'                              => '',
-    'export_format_csv'                          => '',
-    'export_format_mt940'                        => '',
-    'export_included_accounts'                   => '',
-    'include_old_uploads_help'                   => '',
-    'do_export'                                  => '',
-    'export_status_never_started'                => '',
-    'export_status_make_exporter'                => '',
-    'export_status_collecting_journals'          => '',
-    'export_status_collected_journals'           => '',
-    'export_status_converting_to_export_format'  => '',
-    'export_status_converted_to_export_format'   => '',
-    'export_status_creating_journal_file'        => '',
-    'export_status_created_journal_file'         => '',
-    'export_status_collecting_attachments'       => '',
-    'export_status_collected_attachments'        => '',
-    'export_status_collecting_old_uploads'       => '',
-    'export_status_collected_old_uploads'        => '',
-    'export_status_creating_config_file'         => '',
-    'export_status_created_config_file'          => '',
-    'export_status_creating_zip_file'            => '',
-    'export_status_created_zip_file'             => '',
-    'export_status_finished'                     => '',
-    'export_data_please_wait'                    => '',
+    'import_and_export'                          => 'Import and export',
+    'export_data'                                => 'Export data',
+    'export_data_intro'                          => 'For backup purposes, when migrating to another system or when migrating to another Firefly III installation.',
+    'export_format'                              => 'Export format',
+    'export_format_csv'                          => 'Comma separated values (CSV file)',
+    'export_format_mt940'                        => 'MT940 compatible format',
+    'export_included_accounts'                   => 'Export transactions from these accounts',
+    'include_old_uploads_help'                   => 'Firefly III does not throw away the original CSV files you have imported in the past. You can include them in your export.',
+    'do_export'                                  => 'Export',
+    'export_status_never_started'                => 'The export has not started yet',
+    'export_status_make_exporter'                => 'Creating exporter thing...',
+    'export_status_collecting_journals'          => 'Collecting your transactions...',
+    'export_status_collected_journals'           => 'Collected your transactions!',
+    'export_status_converting_to_export_format'  => 'Converting your transactions...',
+    'export_status_converted_to_export_format'   => 'Converted your transactions!',
+    'export_status_creating_journal_file'        => 'Creating the export file...',
+    'export_status_created_journal_file'         => 'Created the export file!',
+    'export_status_collecting_attachments'       => 'Collecting all your attachments...',
+    'export_status_collected_attachments'        => 'Collected all your attachments!',
+    'export_status_collecting_old_uploads'       => 'Collecting all your previous uploads...',
+    'export_status_collected_old_uploads'        => 'Collected all your previous uploads!',
+    'export_status_creating_config_file'         => 'Creating a configuration file...',
+    'export_status_created_config_file'          => 'Created a configuration file!',
+    'export_status_creating_zip_file'            => 'Creating a zip file...',
+    'export_status_created_zip_file'             => 'Created a zip file!',
+    'export_status_finished'                     => 'Export has succesfully finished! Yay!',
+    'export_data_please_wait'                    => 'Please wait...',
 
     // rules
-    'rules'                                      => '',
-    'rule_name'                                  => '',
-    'rule_triggers'                              => '',
-    'rule_actions'                               => '',
-    'new_rule'                                   => '',
-    'new_rule_group'                             => '',
-    'rule_priority_up'                           => '',
-    'rule_priority_down'                         => '',
-    'make_new_rule_group'                        => '',
-    'store_new_rule_group'                       => '',
-    'created_new_rule_group'                     => '',
-    'updated_rule_group'                         => '',
-    'edit_rule_group'                            => '',
-    'delete_rule_group'                          => '',
-    'deleted_rule_group'                         => '',
-    'update_rule_group'                          => '',
-    'no_rules_in_group'                          => '',
-    'move_rule_group_up'                         => '',
-    'move_rule_group_down'                       => '',
-    'save_rules_by_moving'                       => '',
-    'make_new_rule'                              => '',
-    'rule_help_stop_processing'                  => '',
-    'rule_help_active'                           => '',
-    'stored_new_rule'                            => '',
-    'deleted_rule'                               => '',
-    'store_new_rule'                             => '',
-    'updated_rule'                               => '',
-    'default_rule_group_name'                    => '',
-    'default_rule_group_description'             => '',
-    'default_rule_name'                          => '',
-    'default_rule_description'                   => '',
-    'default_rule_trigger_description'           => '',
-    'default_rule_trigger_from_account'          => '',
-    'default_rule_action_prepend'                => '',
+    'rules'                                      => 'Rules',
+    'rule_name'                                  => 'Name of rule',
+    'rule_triggers'                              => 'Rule triggers when',
+    'rule_actions'                               => 'Rule will',
+    'new_rule'                                   => 'New rule',
+    'new_rule_group'                             => 'New rule group',
+    'rule_priority_up'                           => 'Give rule more priority',
+    'rule_priority_down'                         => 'Give rule less priority',
+    'make_new_rule_group'                        => 'Make new rule group',
+    'store_new_rule_group'                       => 'Store new rule group',
+    'created_new_rule_group'                     => 'New rule group ":title" stored!',
+    'updated_rule_group'                         => 'Successfully updated rule group ":title".',
+    'edit_rule_group'                            => 'Edit rule group ":title"',
+    'delete_rule_group'                          => 'Delete rule group ":title"',
+    'deleted_rule_group'                         => 'Deleted rule group ":title"',
+    'update_rule_group'                          => 'Update rule group',
+    'no_rules_in_group'                          => 'There are no rules in this group',
+    'move_rule_group_up'                         => 'Move rule group up',
+    'move_rule_group_down'                       => 'Move rule group down',
+    'save_rules_by_moving'                       => 'Save these rule(s) by moving them to another rule group:',
+    'make_new_rule'                              => 'Make new rule in rule group ":title"',
+    'rule_help_stop_processing'                  => 'When you check this box, later rules in this group will not be executed.',
+    'rule_help_active'                           => 'Inactive rules will never fire.',
+    'stored_new_rule'                            => 'Stored new rule with title ":title"',
+    'deleted_rule'                               => 'Deleted rule with title ":title"',
+    'store_new_rule'                             => 'Store new rule',
+    'updated_rule'                               => 'Updated rule with title ":title"',
+    'default_rule_group_name'                    => 'Default rules',
+    'default_rule_group_description'             => 'All your rules not in a particular group.',
+    'default_rule_name'                          => 'Your first default rule',
+    'default_rule_description'                   => 'This rule is an example. You can safely delete it.',
+    'default_rule_trigger_description'           => 'The Man Who Sold the World',
+    'default_rule_trigger_from_account'          => 'David Bowie',
+    'default_rule_action_prepend'                => 'Bought the world from ',
     'default_rule_action_set_category'           => 'veliki izdatki',
-    'trigger'                                    => '',
-    'trigger_value'                              => '',
-    'stop_processing_other_triggers'             => '',
-    'add_rule_trigger'                           => '',
-    'action'                                     => '',
-    'action_value'                               => '',
-    'stop_executing_other_actions'               => '',
-    'add_rule_action'                            => '',
-    'edit_rule'                                  => '',
-    'delete_rule'                                => '',
-    'update_rule'                                => '',
-    'test_rule_triggers'                         => '',
-    'warning_transaction_subset'                 => '',
-    'warning_no_matching_transactions'           => '',
-    'warning_no_valid_triggers'                  => '',
-    'apply_rule_selection'                       => '',
-    'apply_rule_selection_intro'                 => '',
-    'include_transactions_from_accounts'         => '',
-    'applied_rule_selection'                     => '',
-    'execute'                                    => '',
-    'apply_rule_group_selection'                 => '',
-    'apply_rule_group_selection_intro'           => '',
-    'applied_rule_group_selection'               => '',
+    'trigger'                                    => 'Trigger',
+    'trigger_value'                              => 'Trigger on value',
+    'stop_processing_other_triggers'             => 'Stop processing other triggers',
+    'add_rule_trigger'                           => 'Add new trigger',
+    'action'                                     => 'Action',
+    'action_value'                               => 'Action value',
+    'stop_executing_other_actions'               => 'Stop executing other actions',
+    'add_rule_action'                            => 'Add new action',
+    'edit_rule'                                  => 'Edit rule ":title"',
+    'delete_rule'                                => 'Delete rule ":title"',
+    'update_rule'                                => 'Update rule',
+    'test_rule_triggers'                         => 'See matching transactions',
+    'warning_transaction_subset'                 => 'For performance reasons this list is limited to :max_num_transactions and may only show a subset of matching transactions',
+    'warning_no_matching_transactions'           => 'No matching transactions found. Please note that for performance reasons, only the last :num_transactions transactions have been checked.',
+    'warning_no_valid_triggers'                  => 'No valid triggers provided.',
+    'apply_rule_selection'                       => 'Apply rule ":title" to a selection of your transactions',
+    'apply_rule_selection_intro'                 => 'Rules like ":title" are normally only applied to new or updated transactions, but you can tell Firefly III to run it on a selection of your existing transactions. This can be useful when you have updated a rule and you need the changes to be applied to all of your other transactions.',
+    'include_transactions_from_accounts'         => 'Include transactions from these accounts',
+    'applied_rule_selection'                     => 'Rule ":title" has been applied to your selection.',
+    'execute'                                    => 'Execute',
+    'apply_rule_group_selection'                 => 'Apply rule group ":title" to a selection of your transactions',
+    'apply_rule_group_selection_intro'           => 'Rule groups like ":title" are normally only applied to new or updated transactions, but you can tell Firefly III to run all the rules in this group on a selection of your existing transactions. This can be useful when you have updated a group of rules and you need the changes to be applied to all of your other transactions.',
+    'applied_rule_group_selection'               => 'Rule group ":title" has been applied to your selection.',
 
     // actions and triggers
-    'rule_trigger_user_action'                   => '',
-    'rule_trigger_from_account_starts'           => '',
-    'rule_trigger_from_account_ends'             => '',
-    'rule_trigger_from_account_is'               => '',
-    'rule_trigger_from_account_contains'         => '',
-    'rule_trigger_to_account_starts'             => '',
-    'rule_trigger_to_account_ends'               => '',
-    'rule_trigger_to_account_is'                 => '',
-    'rule_trigger_to_account_contains'           => '',
-    'rule_trigger_transaction_type'              => '',
-    'rule_trigger_category_is'                   => '',
-    'rule_trigger_amount_less'                   => '',
-    'rule_trigger_amount_exactly'                => '',
-    'rule_trigger_amount_more'                   => '',
-    'rule_trigger_description_starts'            => '',
-    'rule_trigger_description_ends'              => '',
-    'rule_trigger_description_contains'          => '',
-    'rule_trigger_description_is'                => '',
-    'rule_trigger_from_account_starts_choice'    => '',
-    'rule_trigger_from_account_ends_choice'      => '',
-    'rule_trigger_from_account_is_choice'        => '',
-    'rule_trigger_from_account_contains_choice'  => '',
-    'rule_trigger_to_account_starts_choice'      => '',
-    'rule_trigger_to_account_ends_choice'        => '',
-    'rule_trigger_to_account_is_choice'          => '',
-    'rule_trigger_to_account_contains_choice'    => '',
-    'rule_trigger_transaction_type_choice'       => '',
-    'rule_trigger_amount_less_choice'            => '',
-    'rule_trigger_amount_exactly_choice'         => '',
-    'rule_trigger_amount_more_choice'            => '',
-    'rule_trigger_description_starts_choice'     => '',
-    'rule_trigger_description_ends_choice'       => '',
-    'rule_trigger_description_contains_choice'   => '',
-    'rule_trigger_description_is_choice'         => '',
-    'rule_trigger_category_is_choice'            => '',
-    'rule_trigger_budget_is_choice'              => '',
-    'rule_trigger_tag_is_choice'                 => '',
-    'rule_trigger_has_attachments_choice'        => '',
-    'rule_trigger_has_attachments'               => '',
-    'rule_trigger_store_journal'                 => '',
-    'rule_trigger_update_journal'                => '',
-    'rule_action_set_category'                   => '',
-    'rule_action_clear_category'                 => '',
-    'rule_action_set_budget'                     => '',
-    'rule_action_clear_budget'                   => '',
-    'rule_action_add_tag'                        => '',
-    'rule_action_remove_tag'                     => '',
-    'rule_action_remove_all_tags'                => '',
-    'rule_action_set_description'                => '',
-    'rule_action_append_description'             => '',
-    'rule_action_prepend_description'            => '',
-    'rule_action_set_category_choice'            => '',
-    'rule_action_clear_category_choice'          => '',
-    'rule_action_set_budget_choice'              => '',
-    'rule_action_clear_budget_choice'            => '',
-    'rule_action_add_tag_choice'                 => '',
-    'rule_action_remove_tag_choice'              => '',
-    'rule_action_remove_all_tags_choice'         => '',
-    'rule_action_set_description_choice'         => '',
-    'rule_action_append_description_choice'      => '',
-    'rule_action_prepend_description_choice'     => '',
-    'rule_action_set_source_account_choice'      => '',
-    'rule_action_set_source_account'             => '',
-    'rule_action_set_destination_account_choice' => '',
-    'rule_action_set_destination_account'        => '',
+    'rule_trigger_user_action'                   => 'User action is ":trigger_value"',
+    'rule_trigger_from_account_starts'           => 'Source account starts with ":trigger_value"',
+    'rule_trigger_from_account_ends'             => 'Source account ends with ":trigger_value"',
+    'rule_trigger_from_account_is'               => 'Source account is ":trigger_value"',
+    'rule_trigger_from_account_contains'         => 'Source account contains ":trigger_value"',
+    'rule_trigger_to_account_starts'             => 'Destination account starts with ":trigger_value"',
+    'rule_trigger_to_account_ends'               => 'Destination account ends with ":trigger_value"',
+    'rule_trigger_to_account_is'                 => 'Destination account is ":trigger_value"',
+    'rule_trigger_to_account_contains'           => 'Destination account contains ":trigger_value"',
+    'rule_trigger_transaction_type'              => 'Transaction is of type ":trigger_value"',
+    'rule_trigger_category_is'                   => 'Category is ":trigger_value"',
+    'rule_trigger_amount_less'                   => 'Amount is less than :trigger_value',
+    'rule_trigger_amount_exactly'                => 'Amount is :trigger_value',
+    'rule_trigger_amount_more'                   => 'Amount is more than :trigger_value',
+    'rule_trigger_description_starts'            => 'Description starts with ":trigger_value"',
+    'rule_trigger_description_ends'              => 'Description ends with ":trigger_value"',
+    'rule_trigger_description_contains'          => 'Description contains ":trigger_value"',
+    'rule_trigger_description_is'                => 'Description is ":trigger_value"',
+    'rule_trigger_from_account_starts_choice'    => 'Source account starts with..',
+    'rule_trigger_from_account_ends_choice'      => 'Source account ends with..',
+    'rule_trigger_from_account_is_choice'        => 'Source account is..',
+    'rule_trigger_from_account_contains_choice'  => 'Source account contains..',
+    'rule_trigger_to_account_starts_choice'      => 'Destination account starts with..',
+    'rule_trigger_to_account_ends_choice'        => 'Destination account ends with..',
+    'rule_trigger_to_account_is_choice'          => 'Destination account is..',
+    'rule_trigger_to_account_contains_choice'    => 'Destination account contains..',
+    'rule_trigger_transaction_type_choice'       => 'Transaction is of type..',
+    'rule_trigger_amount_less_choice'            => 'Amount is less than..',
+    'rule_trigger_amount_exactly_choice'         => 'Amount is..',
+    'rule_trigger_amount_more_choice'            => 'Amount is more than..',
+    'rule_trigger_description_starts_choice'     => 'Description starts with..',
+    'rule_trigger_description_ends_choice'       => 'Description ends with..',
+    'rule_trigger_description_contains_choice'   => 'Description contains..',
+    'rule_trigger_description_is_choice'         => 'Description is..',
+    'rule_trigger_category_is_choice'            => 'Category is..',
+    'rule_trigger_budget_is_choice'              => 'Budget is..',
+    'rule_trigger_tag_is_choice'                 => '(A) tag is..',
+    'rule_trigger_has_attachments_choice'        => 'Has at least this many attachments',
+    'rule_trigger_has_attachments'               => 'Has at least :trigger_value attachment(s)',
+    'rule_trigger_store_journal'                 => 'When a transaction is created',
+    'rule_trigger_update_journal'                => 'When a transaction is updated',
+    'rule_action_set_category'                   => 'Set category to ":action_value"',
+    'rule_action_clear_category'                 => 'Clear category',
+    'rule_action_set_budget'                     => 'Set budget to ":action_value"',
+    'rule_action_clear_budget'                   => 'Clear budget',
+    'rule_action_add_tag'                        => 'Add tag ":action_value"',
+    'rule_action_remove_tag'                     => 'Remove tag ":action_value"',
+    'rule_action_remove_all_tags'                => 'Remove all tags',
+    'rule_action_set_description'                => 'Set description to ":action_value"',
+    'rule_action_append_description'             => 'Append description with ":action_value"',
+    'rule_action_prepend_description'            => 'Prepend description with ":action_value"',
+    'rule_action_set_category_choice'            => 'Set category to..',
+    'rule_action_clear_category_choice'          => 'Clear any category',
+    'rule_action_set_budget_choice'              => 'Set budget to..',
+    'rule_action_clear_budget_choice'            => 'Clear any budget',
+    'rule_action_add_tag_choice'                 => 'Add tag..',
+    'rule_action_remove_tag_choice'              => 'Remove tag..',
+    'rule_action_remove_all_tags_choice'         => 'Remove all tags',
+    'rule_action_set_description_choice'         => 'Set description to..',
+    'rule_action_append_description_choice'      => 'Append description with..',
+    'rule_action_prepend_description_choice'     => 'Prepend description with..',
+    'rule_action_set_source_account_choice'      => 'Set source account to...',
+    'rule_action_set_source_account'             => 'Set source account to :action_value',
+    'rule_action_set_destination_account_choice' => 'Set destination account to...',
+    'rule_action_set_destination_account'        => 'Set destination account to :action_value',
 
     // tags
-    'store_new_tag'                              => '',
-    'update_tag'                                 => '',
-    'no_location_set'                            => '',
-    'meta_data'                                  => '',
-    'location'                                   => '',
+    'store_new_tag'                              => 'Store new tag',
+    'update_tag'                                 => 'Update tag',
+    'no_location_set'                            => 'No location set.',
+    'meta_data'                                  => 'Meta data',
+    'location'                                   => 'Location',
 
     // preferences
-    'pref_home_screen_accounts'                  => '',
-    'pref_home_screen_accounts_help'             => '',
-    'pref_view_range'                            => '',
-    'pref_view_range_help'                       => '',
-    'pref_1D'                                    => '',
-    'pref_1W'                                    => '',
-    'pref_1M'                                    => '',
-    'pref_3M'                                    => '',
-    'pref_6M'                                    => '',
-    'pref_1Y'                                    => '',
-    'pref_languages'                             => '',
-    'pref_languages_help'                        => '',
-    'pref_custom_fiscal_year'                    => '',
-    'pref_custom_fiscal_year_label'              => '',
-    'pref_custom_fiscal_year_help'               => '',
-    'pref_fiscal_year_start_label'               => '',
-    'pref_two_factor_auth'                       => '',
-    'pref_two_factor_auth_help'                  => '',
-    'pref_enable_two_factor_auth'                => '',
-    'pref_two_factor_auth_disabled'              => '',
-    'pref_two_factor_auth_remove_it'             => '',
-    'pref_two_factor_auth_code'                  => '',
-    'pref_two_factor_auth_code_help'             => '',
-    'pref_two_factor_auth_reset_code'            => '',
-    'pref_two_factor_auth_remove_code'           => '',
-    'pref_two_factor_auth_remove_will_disable'   => '',
-    'pref_save_settings'                         => '',
-    'saved_preferences'                          => '',
-    'preferences_general'                        => '',
-    'preferences_frontpage'                      => '',
-    'preferences_security'                       => '',
-    'preferences_layout'                         => '',
-    'pref_home_show_deposits'                    => '',
+    'pref_home_screen_accounts'                  => 'Home screen accounts',
+    'pref_home_screen_accounts_help'             => 'Which accounts should be displayed on the home page?',
+    'pref_view_range'                            => 'View range',
+    'pref_view_range_help'                       => 'Some charts are automatically grouped in periods. What period would you prefer?',
+    'pref_1D'                                    => 'One day',
+    'pref_1W'                                    => 'One week',
+    'pref_1M'                                    => 'One month',
+    'pref_3M'                                    => 'Three months (quarter)',
+    'pref_6M'                                    => 'Six months',
+    'pref_1Y'                                    => 'One year',
+    'pref_languages'                             => 'Languages',
+    'pref_languages_help'                        => 'Firefly III supports several languages. Which one do you prefer?',
+    'pref_custom_fiscal_year'                    => 'Fiscal year settings',
+    'pref_custom_fiscal_year_label'              => 'Enabled',
+    'pref_custom_fiscal_year_help'               => 'In countries that use a financial year other than January 1 to December 31, you can switch this on and specify start / end days of the fiscal year',
+    'pref_fiscal_year_start_label'               => 'Fiscal year start date',
+    'pref_two_factor_auth'                       => '2-step verification',
+    'pref_two_factor_auth_help'                  => 'When you enable 2-step verification (also known as two-factor authentication), you add an extra layer of security to your account. You sign in with something you know (your password) and something you have (a verification code). Verification codes are generated by an application on your phone, such as Authy or Google Authenticator.',
+    'pref_enable_two_factor_auth'                => 'Enable 2-step verification',
+    'pref_two_factor_auth_disabled'              => '2-step verification code removed and disabled',
+    'pref_two_factor_auth_remove_it'             => 'Don\'t forget to remove the account from your authentication app!',
+    'pref_two_factor_auth_code'                  => 'Verify code',
+    'pref_two_factor_auth_code_help'             => 'Scan the QR code with an application on your phone such as Authy or Google Authenticator and enter the generated code.',
+    'pref_two_factor_auth_reset_code'            => 'Reset verification code',
+    'pref_two_factor_auth_remove_code'           => 'Remove verification code',
+    'pref_two_factor_auth_remove_will_disable'   => '(this will also disable two-factor authentication)',
+    'pref_save_settings'                         => 'Save settings',
+    'saved_preferences'                          => 'Preferences saved!',
+    'preferences_general'                        => 'General',
+    'preferences_frontpage'                      => 'Home screen',
+    'preferences_security'                       => 'Security',
+    'preferences_layout'                         => 'Layout',
+    'pref_home_show_deposits'                    => 'Show deposits on the home screen',
     'pref_home_show_deposits_info'               => 'Prva stran že prikazuje vaše stroškovne konte. Ali naj tudi prikazuje prihodkovne konte?',
-    'pref_home_do_show_deposits'                 => '',
-    'successful_count'                           => '',
-    'transaction_page_size_title'                => '',
-    'transaction_page_size_help'                 => '',
-    'transaction_page_size_label'                => '',
-    'between_dates'                              => '',
-    'pref_optional_fields_transaction'           => '',
-    'pref_optional_fields_transaction_help'      => '',
-    'optional_tj_date_fields'                    => '',
-    'optional_tj_business_fields'                => '',
-    'optional_tj_attachment_fields'              => '',
-    'pref_optional_tj_interest_date'             => '',
-    'pref_optional_tj_book_date'                 => '',
-    'pref_optional_tj_process_date'              => '',
-    'pref_optional_tj_due_date'                  => '',
-    'pref_optional_tj_payment_date'              => '',
-    'pref_optional_tj_invoice_date'              => '',
-    'pref_optional_tj_internal_reference'        => '',
-    'pref_optional_tj_notes'                     => '',
-    'pref_optional_tj_attachments'               => '',
-    'optional_field_meta_dates'                  => '',
-    'optional_field_meta_business'               => '',
-    'optional_field_attachments'                 => '',
-    'optional_field_meta_data'                   => '',
+    'pref_home_do_show_deposits'                 => 'Yes, show them',
+    'successful_count'                           => 'of which :count successful',
+    'transaction_page_size_title'                => 'Page size',
+    'transaction_page_size_help'                 => 'Any list of transactions shows at most this many transactions',
+    'transaction_page_size_label'                => 'Page size',
+    'between_dates'                              => '(:start and :end)',
+    'pref_optional_fields_transaction'           => 'Optional fields for transactions',
+    'pref_optional_fields_transaction_help'      => 'By default not all fields are enabled when creating a new transaction (because of the clutter). Below, you can enable these fields if you think they could be useful for you. Of course, any field that is disabled, but already filled in, will be visible regardless of the setting.',
+    'optional_tj_date_fields'                    => 'Date fields',
+    'optional_tj_business_fields'                => 'Business fields',
+    'optional_tj_attachment_fields'              => 'Attachment fields',
+    'pref_optional_tj_interest_date'             => 'Interest date',
+    'pref_optional_tj_book_date'                 => 'Book date',
+    'pref_optional_tj_process_date'              => 'Processing date',
+    'pref_optional_tj_due_date'                  => 'Due date',
+    'pref_optional_tj_payment_date'              => 'Payment date',
+    'pref_optional_tj_invoice_date'              => 'Invoice date',
+    'pref_optional_tj_internal_reference'        => 'Internal reference',
+    'pref_optional_tj_notes'                     => 'Notes',
+    'pref_optional_tj_attachments'               => 'Attachments',
+    'optional_field_meta_dates'                  => 'Dates',
+    'optional_field_meta_business'               => 'Business',
+    'optional_field_attachments'                 => 'Attachments',
+    'optional_field_meta_data'                   => 'Optional meta data',
 
 
     // profile:
-    'change_your_password'                       => '',
-    'delete_account'                             => '',
-    'current_password'                           => '',
-    'new_password'                               => '',
-    'new_password_again'                         => '',
-    'delete_your_account'                        => '',
-    'delete_your_account_help'                   => '',
-    'delete_your_account_password'               => '',
-    'password'                                   => '',
-    'are_you_sure'                               => '',
-    'delete_account_button'                      => '',
-    'invalid_current_password'                   => '',
-    'password_changed'                           => '',
-    'should_change'                              => '',
-    'invalid_password'                           => '',
-    'what_is_pw_security'                        => '',
-    'secure_pw_title'                            => '',
-    'secure_pw_history'                          => '',
-    'secure_pw_check_box'                        => '',
-    'secure_pw_sha1'                             => '',
-    'secure_pw_hash_speed'                       => '',
-    'secure_pw_hash_security'                    => '',
-    'secure_pw_should'                           => '',
-    'secure_pw_long_password'                    => '',
-    'secure_pw_short'                            => '',
+    'change_your_password'                       => 'Change your password',
+    'delete_account'                             => 'Delete account',
+    'current_password'                           => 'Current password',
+    'new_password'                               => 'New password',
+    'new_password_again'                         => 'New password (again)',
+    'delete_your_account'                        => 'Delete your account',
+    'delete_your_account_help'                   => 'Deleting your account will also delete any accounts, transactions, <em>anything</em> you might have saved into Firefly III. It\'ll be GONE.',
+    'delete_your_account_password'               => 'Enter your password to continue.',
+    'password'                                   => 'Password',
+    'are_you_sure'                               => 'Are you sure? You cannot undo this.',
+    'delete_account_button'                      => 'DELETE your account',
+    'invalid_current_password'                   => 'Invalid current password!',
+    'password_changed'                           => 'Password changed!',
+    'should_change'                              => 'The idea is to change your password.',
+    'invalid_password'                           => 'Invalid password!',
+    'what_is_pw_security'                        => 'What is "verify password security"?',
+    'secure_pw_title'                            => 'How to choose a secure password',
+    'secure_pw_history'                          => 'In August 2017 well known security researcher Troy Hunt released a list of 306 million stolen passwords. These passwords were stolen during breakins at companies like LinkedIn, Adobe and NeoPets (and many more).',
+    'secure_pw_check_box'                        => 'By checking the box, Firefly III will send the SHA1 hash of your password to <a href="https://www.troyhunt.com/introducing-306-million-freely-downloadable-pwned-passwords/">the website of Troy Hunt</a> to see if it is on the list. This will stop you from using unsafe passwords as is recommended in the latest <a href="https://pages.nist.gov/800-63-3/sp800-63b.html">NIST Special Publication</a> on this subject.',
+    'secure_pw_sha1'                             => 'But I thought SHA1 was broken?',
+    'secure_pw_hash_speed'                       => 'Yes, but not in this context. As you can read on <a href="https://shattered.io/">the website detailing how they broke SHA1</a>, it is now slightly easier to find a "collision": another string that results in the same SHA1-hash. It now only takes 10,000 years using a single-GPU machine.',
+    'secure_pw_hash_security'                    => 'This collision would not be equal to your password, nor would it be useful on (a site like) Firefly III. This application does not use SHA1 for password verification. So it is safe to check this box. Your password is hashed and sent over HTTPS.',
+    'secure_pw_should'                           => 'Should I check the box?',
+    'secure_pw_long_password'                    => 'If you just generated a long, single-use password for Firefly III using some kind of password generator: <strong>no</strong>.',
+    'secure_pw_short'                            => 'If you just entered the password you always use: <em>Please yes</em>.',
 
 
     // attachments
-    'nr_of_attachments'                          => '',
-    'attachments'                                => '',
-    'edit_attachment'                            => '',
-    'update_attachment'                          => '',
-    'delete_attachment'                          => '',
-    'attachment_deleted'                         => '',
-    'attachment_updated'                         => '',
-    'upload_max_file_size'                       => '',
+    'nr_of_attachments'                          => 'One attachment|:count attachments',
+    'attachments'                                => 'Attachments',
+    'edit_attachment'                            => 'Edit attachment ":name"',
+    'update_attachment'                          => 'Update attachment',
+    'delete_attachment'                          => 'Delete attachment ":name"',
+    'attachment_deleted'                         => 'Deleted attachment ":name"',
+    'attachment_updated'                         => 'Updated attachment ":name"',
+    'upload_max_file_size'                       => 'Maximum file size: :size',
 
     // transaction index
     'title_expenses'                             => 'stroški',
     'title_withdrawal'                           => 'stroški',
-    'title_revenue'                              => '',
-    'title_deposit'                              => '',
-    'title_transfer'                             => '',
-    'title_transfers'                            => '',
+    'title_revenue'                              => 'Revenue / income',
+    'title_deposit'                              => 'Revenue / income',
+    'title_transfer'                             => 'Transfers',
+    'title_transfers'                            => 'Transfers',
 
     // convert stuff:
-    'convert_is_already_type_Withdrawal'         => '',
-    'convert_is_already_type_Deposit'            => '',
-    'convert_is_already_type_Transfer'           => '',
-    'convert_to_Withdrawal'                      => '',
-    'convert_to_Deposit'                         => '',
-    'convert_to_Transfer'                        => '',
-    'convert_options_WithdrawalDeposit'          => '',
-    'convert_options_WithdrawalTransfer'         => '',
-    'convert_options_DepositTransfer'            => '',
-    'convert_options_DepositWithdrawal'          => '',
-    'convert_options_TransferWithdrawal'         => '',
-    'convert_options_TransferDeposit'            => '',
-    'transaction_journal_convert_options'        => '',
-    'convert_Withdrawal_to_deposit'              => '',
-    'convert_Withdrawal_to_transfer'             => '',
-    'convert_Deposit_to_withdrawal'              => '',
-    'convert_Deposit_to_transfer'                => '',
-    'convert_Transfer_to_deposit'                => '',
-    'convert_Transfer_to_withdrawal'             => '',
-    'convert_please_set_revenue_source'          => '',
+    'convert_is_already_type_Withdrawal'         => 'This transaction is already a withdrawal',
+    'convert_is_already_type_Deposit'            => 'This transaction is already a deposit',
+    'convert_is_already_type_Transfer'           => 'This transaction is already a transfer',
+    'convert_to_Withdrawal'                      => 'Convert ":description" to a withdrawal',
+    'convert_to_Deposit'                         => 'Convert ":description" to a deposit',
+    'convert_to_Transfer'                        => 'Convert ":description" to a transfer',
+    'convert_options_WithdrawalDeposit'          => 'Convert a withdrawal into a deposit',
+    'convert_options_WithdrawalTransfer'         => 'Convert a withdrawal into a transfer',
+    'convert_options_DepositTransfer'            => 'Convert a deposit into a transfer',
+    'convert_options_DepositWithdrawal'          => 'Convert a deposit into a withdrawal',
+    'convert_options_TransferWithdrawal'         => 'Convert a transfer into a withdrawal',
+    'convert_options_TransferDeposit'            => 'Convert a transfer into a deposit',
+    'transaction_journal_convert_options'        => 'Convert this transaction',
+    'convert_Withdrawal_to_deposit'              => 'Convert this withdrawal to a deposit',
+    'convert_Withdrawal_to_transfer'             => 'Convert this withdrawal to a transfer',
+    'convert_Deposit_to_withdrawal'              => 'Convert this deposit to a withdrawal',
+    'convert_Deposit_to_transfer'                => 'Convert this deposit to a transfer',
+    'convert_Transfer_to_deposit'                => 'Convert this transfer to a deposit',
+    'convert_Transfer_to_withdrawal'             => 'Convert this transfer to a withdrawal',
+    'convert_please_set_revenue_source'          => 'Please pick the revenue account where the money will come from.',
     'convert_please_set_asset_destination'       => 'Izberite premoženjski račun na katerega boste prenesli denar.',
     'convert_please_set_expense_destination'     => 'Izberite na kateri stroškovni konto bo denar šel.',
     'convert_please_set_asset_source'            => 'Izberite premoženjski račun iz katerega boste prenesli denar.',
-    'convert_explanation_withdrawal_deposit'     => '',
+    'convert_explanation_withdrawal_deposit'     => 'If you convert this withdrawal into a deposit, :amount will be deposited into <a href=":sourceRoute">:sourceName</a> instead of taken from it.',
     'convert_explanation_withdrawal_transfer'    => 'Če pretvorite ta izdatek v prenos, bo znesek v vrednosti :amount prenesen iz <a href=":sourceRoute">:sourceName</a> na drug premoženjski račun, namesto da bi bil plačan na <a href=":destinationRoute">:destinationName</a>.',
-    'convert_explanation_deposit_withdrawal'     => '',
+    'convert_explanation_deposit_withdrawal'     => 'If you convert this deposit into a withdrawal, :amount will be removed from <a href=":destinationRoute">:destinationName</a> instead of added to it.',
     'convert_explanation_deposit_transfer'       => 'Če pretvorite ta prihodek v prenos, bo znesek v vrednosti :amount prenesen iz izbranega premoženjskega računa na račun <a href=":destinationRoute">:destinationName</a>.',
-    'convert_explanation_transfer_withdrawal'    => '',
-    'convert_explanation_transfer_deposit'       => '',
-    'converted_to_Withdrawal'                    => '',
-    'converted_to_Deposit'                       => '',
-    'converted_to_Transfer'                      => '',
+    'convert_explanation_transfer_withdrawal'    => 'If you convert this transfer into a withdrawal, :amount will go from <a href=":sourceRoute">:sourceName</a> to a new destination as an expense, instead of to <a href=":destinationRoute">:destinationName</a> as a transfer.',
+    'convert_explanation_transfer_deposit'       => 'If you convert this transfer into a deposit, :amount will be deposited into account <a href=":destinationRoute">:destinationName</a> instead of being transferred there.',
+    'converted_to_Withdrawal'                    => 'The transaction has been converted to a withdrawal',
+    'converted_to_Deposit'                       => 'The transaction has been converted to a deposit',
+    'converted_to_Transfer'                      => 'The transaction has been converted to a transfer',
 
 
     // create new stuff:
-    'create_new_withdrawal'                      => '',
-    'create_new_deposit'                         => '',
-    'create_new_transfer'                        => '',
+    'create_new_withdrawal'                      => 'Create new withdrawal',
+    'create_new_deposit'                         => 'Create new deposit',
+    'create_new_transfer'                        => 'Create new transfer',
     'create_new_asset'                           => 'ustvari nov premoženjski račun',
     'create_new_expense'                         => 'ustvari nov konto za stroške',
-    'create_new_revenue'                         => '',
-    'create_new_piggy_bank'                      => '',
-    'create_new_bill'                            => '',
+    'create_new_revenue'                         => 'Create new revenue account',
+    'create_new_piggy_bank'                      => 'Create new piggy bank',
+    'create_new_bill'                            => 'Create new bill',
 
     // currencies:
-    'create_currency'                            => '',
-    'store_currency'                             => '',
-    'update_currency'                            => '',
-    'new_default_currency'                       => '',
-    'cannot_delete_currency'                     => '',
-    'deleted_currency'                           => '',
-    'created_currency'                           => '',
-    'updated_currency'                           => '',
-    'ask_site_owner'                             => '',
-    'currencies_intro'                           => '',
-    'make_default_currency'                      => '',
-    'default_currency'                           => '',
+    'create_currency'                            => 'Create a new currency',
+    'store_currency'                             => 'Store new currency',
+    'update_currency'                            => 'Update currency',
+    'new_default_currency'                       => ':name is now the default currency.',
+    'cannot_delete_currency'                     => 'Cannot delete :name because it is still in use.',
+    'deleted_currency'                           => 'Currency :name deleted',
+    'created_currency'                           => 'Currency :name created',
+    'updated_currency'                           => 'Currency :name updated',
+    'ask_site_owner'                             => 'Please ask :owner to add, remove or edit currencies.',
+    'currencies_intro'                           => 'Firefly III supports various currencies which you can set and enable here.',
+    'make_default_currency'                      => 'make default',
+    'default_currency'                           => 'default',
 
     // forms:
-    'mandatoryFields'                            => '',
-    'optionalFields'                             => '',
-    'options'                                    => '',
+    'mandatoryFields'                            => 'Mandatory fields',
+    'optionalFields'                             => 'Optional fields',
+    'options'                                    => 'Options',
 
     // budgets:
-    'create_new_budget'                          => '',
-    'store_new_budget'                           => '',
-    'stored_new_budget'                          => '',
-    'available_between'                          => '',
-    'transactionsWithoutBudget'                  => '',
-    'transactions_no_budget'                     => '',
-    'spent_between'                              => '',
-    'createBudget'                               => '',
-    'inactiveBudgets'                            => '',
-    'without_budget_between'                     => '',
-    'delete_budget'                              => '',
-    'deleted_budget'                             => '',
-    'edit_budget'                                => '',
-    'updated_budget'                             => '',
-    'update_amount'                              => '',
-    'update_budget'                              => '',
-    'update_budget_amount_range'                 => '',
-    'budget_period_navigator'                    => '',
+    'create_new_budget'                          => 'Create a new budget',
+    'store_new_budget'                           => 'Store new budget',
+    'stored_new_budget'                          => 'Stored new budget ":name"',
+    'available_between'                          => 'Available between :start and :end',
+    'transactionsWithoutBudget'                  => 'Expenses without budget',
+    'transactions_no_budget'                     => 'Expenses without budget between :start and :end',
+    'spent_between'                              => 'Spent between :start and :end',
+    'createBudget'                               => 'New budget',
+    'inactiveBudgets'                            => 'Inactive budgets',
+    'without_budget_between'                     => 'Transactions without a budget between :start and :end',
+    'delete_budget'                              => 'Delete budget ":name"',
+    'deleted_budget'                             => 'Deleted budget ":name"',
+    'edit_budget'                                => 'Edit budget ":name"',
+    'updated_budget'                             => 'Updated budget ":name"',
+    'update_amount'                              => 'Update amount',
+    'update_budget'                              => 'Update budget',
+    'update_budget_amount_range'                 => 'Update (expected) available amount between :start and :end',
+    'budget_period_navigator'                    => 'Period navigator',
 
     // bills:
-    'matching_on'                                => '',
-    'between_amounts'                            => '',
-    'repeats'                                    => '',
-    'connected_journals'                         => '',
-    'auto_match_on'                              => '',
-    'auto_match_off'                             => '',
-    'next_expected_match'                        => '',
-    'delete_bill'                                => '',
-    'deleted_bill'                               => '',
-    'edit_bill'                                  => '',
-    'more'                                       => '',
-    'rescan_old'                                 => '',
-    'update_bill'                                => '',
-    'updated_bill'                               => '',
-    'store_new_bill'                             => '',
-    'stored_new_bill'                            => '',
-    'cannot_scan_inactive_bill'                  => '',
-    'rescanned_bill'                             => '',
-    'average_bill_amount_year'                   => '',
-    'average_bill_amount_overall'                => '',
-    'not_or_not_yet'                             => '',
-    'not_expected_period'                        => '',
-    'bill_is_active'                             => '',
-    'bill_will_automatch'                        => '',
+    'matching_on'                                => 'Matching on',
+    'between_amounts'                            => 'between :low and :high.',
+    'repeats'                                    => 'Repeats',
+    'connected_journals'                         => 'Connected transactions',
+    'auto_match_on'                              => 'Automatically matched by Firefly',
+    'auto_match_off'                             => 'Not automatically matched by Firefly',
+    'next_expected_match'                        => 'Next expected match',
+    'delete_bill'                                => 'Delete bill ":name"',
+    'deleted_bill'                               => 'Deleted bill ":name"',
+    'edit_bill'                                  => 'Edit bill ":name"',
+    'more'                                       => 'More',
+    'rescan_old'                                 => 'Rescan old transactions',
+    'update_bill'                                => 'Update bill',
+    'updated_bill'                               => 'Updated bill ":name"',
+    'store_new_bill'                             => 'Store new bill',
+    'stored_new_bill'                            => 'Stored new bill ":name"',
+    'cannot_scan_inactive_bill'                  => 'Inactive bills cannot be scanned.',
+    'rescanned_bill'                             => 'Rescanned everything.',
+    'average_bill_amount_year'                   => 'Average bill amount (:year)',
+    'average_bill_amount_overall'                => 'Average bill amount (overall)',
+    'not_or_not_yet'                             => 'Not (yet)',
+    'not_expected_period'                        => 'Not expected this period',
+    'bill_is_active'                             => 'Bill is active',
+    'bill_will_automatch'                        => 'Bill will automatically linked to matching transactions',
     // accounts:
     'details_for_asset'                          => 'podrobnosti za premoženjski račun ":name"',
     'details_for_expense'                        => 'podrobnosti stroškovnega konta ":name"',
-    'details_for_revenue'                        => '',
-    'details_for_cash'                           => '',
+    'details_for_revenue'                        => 'Details for revenue account ":name"',
+    'details_for_cash'                           => 'Details for cash account ":name"',
     'store_new_asset_account'                    => 'shrani nov premoženjski račun',
     'store_new_expense_account'                  => 'shrani nov konto za stroške',
-    'store_new_revenue_account'                  => '',
+    'store_new_revenue_account'                  => 'Store new revenue account',
     'edit_asset_account'                         => 'uredi premoženjski račun ":name"',
     'edit_expense_account'                       => 'uredi stroškovni konto ":name"',
-    'edit_revenue_account'                       => '',
+    'edit_revenue_account'                       => 'Edit revenue account ":name"',
     'delete_asset_account'                       => 'izbriši premoženjski račun ":name"',
     'delete_expense_account'                     => 'izbriši stroškovni konto ":name"',
-    'delete_revenue_account'                     => '',
+    'delete_revenue_account'                     => 'Delete revenue account ":name"',
     'asset_deleted'                              => 'Premoženjski račun ":name" je bil uspešno izbrisan.',
     'expense_deleted'                            => 'stroškovni konto ":name" je bil uspešno izbrisan',
-    'revenue_deleted'                            => '',
+    'revenue_deleted'                            => 'Successfully deleted revenue account ":name"',
     'update_asset_account'                       => 'posodobi premoženjski račun',
     'update_expense_account'                     => 'posodobi stroškovni konto',
-    'update_revenue_account'                     => '',
+    'update_revenue_account'                     => 'Update revenue account',
     'make_new_asset_account'                     => 'ustvari nov premoženjski račun',
     'make_new_expense_account'                   => 'ustvari nov konto za stroške',
-    'make_new_revenue_account'                   => '',
+    'make_new_revenue_account'                   => 'Create a new revenue account',
     'asset_accounts'                             => 'premoženjski računi',
     'expense_accounts'                           => 'konti za stroške',
-    'revenue_accounts'                           => '',
-    'cash_accounts'                              => '',
-    'Cash account'                               => '',
-    'account_type'                               => '',
-    'save_transactions_by_moving'                => '',
-    'stored_new_account'                         => '',
-    'updated_account'                            => '',
-    'credit_card_options'                        => '',
+    'revenue_accounts'                           => 'Revenue accounts',
+    'cash_accounts'                              => 'Cash accounts',
+    'Cash account'                               => 'Cash account',
+    'account_type'                               => 'Account type',
+    'save_transactions_by_moving'                => 'Save these transaction(s) by moving them to another account:',
+    'stored_new_account'                         => 'New account ":name" stored!',
+    'updated_account'                            => 'Updated account ":name"',
+    'credit_card_options'                        => 'Credit card options',
     'no_transactions_account'                    => 'Ni transakcij (za to obdobje) za premoženjski račun ":name".',
-    'no_data_for_chart'                          => '',
-    'select_more_than_one_account'               => '',
-    'select_more_than_one_category'              => '',
-    'select_more_than_one_budget'                => '',
-    'select_more_than_one_tag'                   => '',
-    'account_default_currency'                   => '',
+    'no_data_for_chart'                          => 'There is not enough information (yet) to generate this chart.',
+    'select_more_than_one_account'               => 'Please select more than one account',
+    'select_more_than_one_category'              => 'Please select more than one category',
+    'select_more_than_one_budget'                => 'Please select more than one budget',
+    'select_more_than_one_tag'                   => 'Please select more than one tag',
+    'account_default_currency'                   => 'If you select another currency, new transactions from this account will have this currency pre-selected.',
 
     // categories:
-    'new_category'                               => '',
-    'create_new_category'                        => '',
-    'without_category'                           => '',
-    'update_category'                            => '',
-    'updated_category'                           => '',
-    'categories'                                 => '',
-    'edit_category'                              => '',
-    'no_category'                                => '',
-    'category'                                   => '',
-    'delete_category'                            => '',
-    'deleted_category'                           => '',
-    'store_category'                             => '',
-    'stored_category'                            => '',
-    'without_category_between'                   => '',
+    'new_category'                               => 'New category',
+    'create_new_category'                        => 'Create a new category',
+    'without_category'                           => 'Without a category',
+    'update_category'                            => 'Update category',
+    'updated_category'                           => 'Updated category ":name"',
+    'categories'                                 => 'Categories',
+    'edit_category'                              => 'Edit category ":name"',
+    'no_category'                                => '(no category)',
+    'category'                                   => 'Category',
+    'delete_category'                            => 'Delete category ":name"',
+    'deleted_category'                           => 'Deleted category ":name"',
+    'store_category'                             => 'Store new category',
+    'stored_category'                            => 'Stored new category ":name"',
+    'without_category_between'                   => 'Without category between :start and :end',
 
     // transactions:
-    'update_withdrawal'                          => '',
-    'update_deposit'                             => '',
-    'update_transfer'                            => '',
-    'updated_withdrawal'                         => '',
-    'updated_deposit'                            => '',
-    'updated_transfer'                           => '',
-    'delete_withdrawal'                          => '',
-    'delete_deposit'                             => '',
-    'delete_transfer'                            => '',
-    'deleted_withdrawal'                         => '',
-    'deleted_deposit'                            => '',
-    'deleted_transfer'                           => '',
-    'stored_journal'                             => '',
-    'select_transactions'                        => '',
-    'stop_selection'                             => '',
-    'edit_selected'                              => '',
-    'delete_selected'                            => '',
-    'mass_delete_journals'                       => '',
-    'mass_edit_journals'                         => '',
-    'cannot_edit_other_fields'                   => '',
-    'perm-delete-many'                           => '',
-    'mass_deleted_transactions_success'          => '',
-    'mass_edited_transactions_success'           => '',
+    'update_withdrawal'                          => 'Update withdrawal',
+    'update_deposit'                             => 'Update deposit',
+    'update_transfer'                            => 'Update transfer',
+    'updated_withdrawal'                         => 'Updated withdrawal ":description"',
+    'updated_deposit'                            => 'Updated deposit ":description"',
+    'updated_transfer'                           => 'Updated transfer ":description"',
+    'delete_withdrawal'                          => 'Delete withdrawal ":description"',
+    'delete_deposit'                             => 'Delete deposit ":description"',
+    'delete_transfer'                            => 'Delete transfer ":description"',
+    'deleted_withdrawal'                         => 'Successfully deleted withdrawal ":description"',
+    'deleted_deposit'                            => 'Successfully deleted deposit ":description"',
+    'deleted_transfer'                           => 'Successfully deleted transfer ":description"',
+    'stored_journal'                             => 'Successfully created new transaction ":description"',
+    'select_transactions'                        => 'Select transactions',
+    'stop_selection'                             => 'Stop selecting transactions',
+    'edit_selected'                              => 'Edit selected',
+    'delete_selected'                            => 'Delete selected',
+    'mass_delete_journals'                       => 'Delete a number of transactions',
+    'mass_edit_journals'                         => 'Edit a number of transactions',
+    'cannot_edit_other_fields'                   => 'You cannot mass-edit other fields than the ones here, because there is no room to show them. Please follow the link and edit them by one-by-one, if you need to edit these fields.',
+    'perm-delete-many'                           => 'Deleting many items in one go can be very disruptive. Please be cautious.',
+    'mass_deleted_transactions_success'          => 'Deleted :amount transaction(s).',
+    'mass_edited_transactions_success'           => 'Updated :amount transaction(s)',
 
 
     // new user:
-    'welcome'                                    => '',
-    'submit'                                     => '',
-    'getting_started'                            => '',
-    'to_get_started'                             => '',
-    'savings_balance_text'                       => '',
-    'finish_up_new_user'                         => '',
-    'stored_new_accounts_new_user'               => '',
+    'welcome'                                    => 'Welcome to Firefly!',
+    'submit'                                     => 'Submit',
+    'getting_started'                            => 'Getting started',
+    'to_get_started'                             => 'It is good to see you have successfully installed Firefly III. To get started with this tool please enter your bank\'s name and the balance of your main checking account. Do not worry yet if you have multiple accounts. You can add those later. It\'s just that Firefly III needs something to start with.',
+    'savings_balance_text'                       => 'Firefly III will automatically create a savings account for you. By default, there will be no money in your savings account, but if you tell Firefly III the balance it will be stored as such.',
+    'finish_up_new_user'                         => 'That\'s it! You can continue by pressing <strong>Submit</strong>. You will be taken to the index of Firefly III.',
+    'stored_new_accounts_new_user'               => 'Yay! Your new accounts have been stored.',
 
     // home page:
-    'yourAccounts'                               => '',
-    'budgetsAndSpending'                         => '',
-    'savings'                                    => '',
-    'newWithdrawal'                              => '',
-    'newDeposit'                                 => '',
-    'newTransfer'                                => '',
-    'moneyIn'                                    => '',
-    'moneyOut'                                   => '',
-    'billsToPay'                                 => '',
-    'billsPaid'                                  => '',
+    'yourAccounts'                               => 'Your accounts',
+    'budgetsAndSpending'                         => 'Budgets and spending',
+    'savings'                                    => 'Savings',
+    'newWithdrawal'                              => 'New expense',
+    'newDeposit'                                 => 'New deposit',
+    'newTransfer'                                => 'New transfer',
+    'moneyIn'                                    => 'Money in',
+    'moneyOut'                                   => 'Money out',
+    'billsToPay'                                 => 'Bills to pay',
+    'billsPaid'                                  => 'Bills paid',
 
     // menu and titles, should be recycled as often as possible:
-    'currency'                                   => '',
-    'preferences'                                => '',
-    'logout'                                     => '',
-    'searchPlaceholder'                          => '',
-    'dashboard'                                  => '',
-    'currencies'                                 => '',
-    'accounts'                                   => '',
+    'currency'                                   => 'Currency',
+    'preferences'                                => 'Preferences',
+    'logout'                                     => 'Logout',
+    'searchPlaceholder'                          => 'Search...',
+    'dashboard'                                  => 'Dashboard',
+    'currencies'                                 => 'Currencies',
+    'accounts'                                   => 'Accounts',
     'Asset account'                              => 'premoženjski računi',
     'Default account'                            => 'premoženjski račun',
     'Expense account'                            => 'konto stroškov',
-    'Revenue account'                            => '',
-    'Initial balance account'                    => '',
-    'budgets'                                    => '',
-    'tags'                                       => '',
-    'reports'                                    => '',
-    'transactions'                               => '',
+    'Revenue account'                            => 'Revenue account',
+    'Initial balance account'                    => 'Initial balance account',
+    'budgets'                                    => 'Budgets',
+    'tags'                                       => 'Tags',
+    'reports'                                    => 'Reports',
+    'transactions'                               => 'Transactions',
     'expenses'                                   => 'stroški',
-    'income'                                     => '',
-    'transfers'                                  => '',
-    'moneyManagement'                            => '',
-    'piggyBanks'                                 => '',
-    'bills'                                      => '',
-    'withdrawal'                                 => '',
-    'deposit'                                    => '',
-    'account'                                    => '',
-    'transfer'                                   => '',
-    'Withdrawal'                                 => '',
-    'Deposit'                                    => '',
-    'Transfer'                                   => '',
-    'bill'                                       => '',
-    'yes'                                        => '',
-    'no'                                         => '',
-    'amount'                                     => '',
-    'overview'                                   => '',
-    'saveOnAccount'                              => '',
-    'unknown'                                    => '',
-    'daily'                                      => '',
-    'monthly'                                    => '',
-    'profile'                                    => '',
-    'errors'                                     => '',
+    'income'                                     => 'Revenue / income',
+    'transfers'                                  => 'Transfers',
+    'moneyManagement'                            => 'Money management',
+    'piggyBanks'                                 => 'Piggy banks',
+    'bills'                                      => 'Bills',
+    'withdrawal'                                 => 'Withdrawal',
+    'deposit'                                    => 'Deposit',
+    'account'                                    => 'Account',
+    'transfer'                                   => 'Transfer',
+    'Withdrawal'                                 => 'Withdrawal',
+    'Deposit'                                    => 'Deposit',
+    'Transfer'                                   => 'Transfer',
+    'bill'                                       => 'Bill',
+    'yes'                                        => 'Yes',
+    'no'                                         => 'No',
+    'amount'                                     => 'Amount',
+    'overview'                                   => 'Overview',
+    'saveOnAccount'                              => 'Save on account',
+    'unknown'                                    => 'Unknown',
+    'daily'                                      => 'Daily',
+    'monthly'                                    => 'Monthly',
+    'profile'                                    => 'Profile',
+    'errors'                                     => 'Errors',
 
     // reports:
-    'report_default'                             => '',
-    'report_audit'                               => '',
-    'report_category'                            => '',
-    'report_budget'                              => '',
-    'report_tag'                                 => '',
-    'quick_link_reports'                         => '',
-    'quick_link_default_report'                  => '',
-    'quick_link_audit_report'                    => '',
-    'report_this_month_quick'                    => '',
-    'report_this_year_quick'                     => '',
-    'report_this_fiscal_year_quick'              => '',
-    'report_all_time_quick'                      => '',
-    'reports_can_bookmark'                       => '',
+    'report_default'                             => 'Default financial report between :start and :end',
+    'report_audit'                               => 'Transaction history overview between :start and :end',
+    'report_category'                            => 'Category report between :start and :end',
+    'report_budget'                              => 'Budget report between :start and :end',
+    'report_tag'                                 => 'Tag report between :start and :end',
+    'quick_link_reports'                         => 'Quick links',
+    'quick_link_default_report'                  => 'Default financial report',
+    'quick_link_audit_report'                    => 'Transaction history overview',
+    'report_this_month_quick'                    => 'Current month, all accounts',
+    'report_this_year_quick'                     => 'Current year, all accounts',
+    'report_this_fiscal_year_quick'              => 'Current fiscal year, all accounts',
+    'report_all_time_quick'                      => 'All-time, all accounts',
+    'reports_can_bookmark'                       => 'Remember that reports can be bookmarked.',
     'incomeVsExpenses'                           => 'prihodki napram odhodkom',
-    'accountBalances'                            => '',
-    'balanceStart'                               => '',
-    'balanceEnd'                                 => '',
-    'splitByAccount'                             => '',
-    'coveredWithTags'                            => '',
-    'leftUnbalanced'                             => '',
-    'leftInBudget'                               => '',
-    'sumOfSums'                                  => '',
-    'noCategory'                                 => '',
-    'notCharged'                                 => '',
-    'inactive'                                   => '',
-    'active'                                     => '',
-    'difference'                                 => '',
-    'in'                                         => '',
-    'out'                                        => '',
-    'topX'                                       => '',
-    'show_full_list'                             => '',
-    'show_only_top'                              => '',
-    'report_type'                                => '',
-    'report_type_default'                        => '',
-    'report_type_audit'                          => '',
-    'report_type_category'                       => '',
-    'report_type_budget'                         => '',
-    'report_type_tag'                            => '',
-    'more_info_help'                             => '',
-    'report_included_accounts'                   => '',
-    'report_date_range'                          => '',
-    'report_preset_ranges'                       => '',
-    'shared'                                     => '',
-    'fiscal_year'                                => '',
-    'income_entry'                               => '',
+    'accountBalances'                            => 'Account balances',
+    'balanceStart'                               => 'Balance at start of period',
+    'balanceEnd'                                 => 'Balance at end of period',
+    'splitByAccount'                             => 'Split by account',
+    'coveredWithTags'                            => 'Covered with tags',
+    'leftUnbalanced'                             => 'Left unbalanced',
+    'leftInBudget'                               => 'Left in budget',
+    'sumOfSums'                                  => 'Sum of sums',
+    'noCategory'                                 => '(no category)',
+    'notCharged'                                 => 'Not charged (yet)',
+    'inactive'                                   => 'Inactive',
+    'active'                                     => 'Active',
+    'difference'                                 => 'Difference',
+    'in'                                         => 'In',
+    'out'                                        => 'Out',
+    'topX'                                       => 'top :number',
+    'show_full_list'                             => 'Show entire list',
+    'show_only_top'                              => 'Show only top :number',
+    'report_type'                                => 'Report type',
+    'report_type_default'                        => 'Default financial report',
+    'report_type_audit'                          => 'Transaction history overview (audit)',
+    'report_type_category'                       => 'Category report',
+    'report_type_budget'                         => 'Budget report',
+    'report_type_tag'                            => 'Tag report',
+    'more_info_help'                             => 'More information about these types of reports can be found in the help pages. Press the (?) icon in the top right corner.',
+    'report_included_accounts'                   => 'Included accounts',
+    'report_date_range'                          => 'Date range',
+    'report_preset_ranges'                       => 'Pre-set ranges',
+    'shared'                                     => 'Shared',
+    'fiscal_year'                                => 'Fiscal year',
+    'income_entry'                               => 'Income from account ":name" between :start and :end',
     'expense_entry'                              => 'stroški na kontu ":name" med :start in :end',
-    'category_entry'                             => '',
-    'budget_spent_amount'                        => '',
-    'balance_amount'                             => '',
-    'no_audit_activity'                          => '',
-    'audit_end_balance'                          => '',
-    'reports_extra_options'                      => '',
-    'report_has_no_extra_options'                => '',
-    'reports_submit'                             => '',
-    'end_after_start_date'                       => '',
-    'select_category'                            => '',
-    'select_budget'                              => '',
-    'select_tag'                                 => '',
-    'income_per_category'                        => '',
+    'category_entry'                             => 'Expenses in category ":name" between :start and :end',
+    'budget_spent_amount'                        => 'Expenses in budget ":budget" between :start and :end',
+    'balance_amount'                             => 'Expenses in budget ":budget" paid from account ":account" between :start and :end',
+    'no_audit_activity'                          => 'No activity was recorded on account <a href=":url" title=":account_name">:account_name</a> between :start and :end.',
+    'audit_end_balance'                          => 'Account balance of <a href=":url" title=":account_name">:account_name</a> at the end of :end was: :balance',
+    'reports_extra_options'                      => 'Extra options',
+    'report_has_no_extra_options'                => 'This report has no extra options',
+    'reports_submit'                             => 'View report',
+    'end_after_start_date'                       => 'End date of report must be after start date.',
+    'select_category'                            => 'Select category(ies)',
+    'select_budget'                              => 'Select budget(s).',
+    'select_tag'                                 => 'Select tag(s).',
+    'income_per_category'                        => 'Income per category',
     'expense_per_category'                       => 'stroški po kategorijah',
     'expense_per_budget'                         => 'stroški po budžetih',
-    'income_per_account'                         => '',
+    'income_per_account'                         => 'Income per account',
     'expense_per_account'                        => 'stroški po kontih',
     'expense_per_tag'                            => 'stroški po značkah',
-    'income_per_tag'                             => '',
-    'include_expense_not_in_budget'              => '',
-    'include_expense_not_in_account'             => '',
-    'include_expense_not_in_category'            => '',
-    'include_income_not_in_category'             => '',
-    'include_income_not_in_account'              => '',
-    'include_income_not_in_tags'                 => '',
-    'include_expense_not_in_tags'                => '',
-    'everything_else'                            => '',
+    'income_per_tag'                             => 'Income per tag',
+    'include_expense_not_in_budget'              => 'Included expenses not in the selected budget(s)',
+    'include_expense_not_in_account'             => 'Included expenses not in the selected account(s)',
+    'include_expense_not_in_category'            => 'Included expenses not in the selected category(ies)',
+    'include_income_not_in_category'             => 'Included income not in the selected category(ies)',
+    'include_income_not_in_account'              => 'Included income not in the selected account(s)',
+    'include_income_not_in_tags'                 => 'Included income not in the selected tag(s)',
+    'include_expense_not_in_tags'                => 'Included expenses not in the selected tag(s)',
+    'everything_else'                            => 'Everything else',
     'income_and_expenses'                        => 'prihodki in odhodki',
-    'spent_average'                              => '',
-    'income_average'                             => '',
-    'transaction_count'                          => '',
-    'average_spending_per_account'               => '',
-    'average_income_per_account'                 => '',
-    'total'                                      => '',
-    'description'                                => '',
-    'sum_of_period'                              => '',
-    'average_in_period'                          => '',
+    'spent_average'                              => 'Spent (average)',
+    'income_average'                             => 'Income (average)',
+    'transaction_count'                          => 'Transaction count',
+    'average_spending_per_account'               => 'Average spending per account',
+    'average_income_per_account'                 => 'Average income per account',
+    'total'                                      => 'Total',
+    'description'                                => 'Description',
+    'sum_of_period'                              => 'Sum of period',
+    'average_in_period'                          => 'Average in period',
     'account_role_defaultAsset'                  => 'privzeti premoženjski račun',
     'account_role_sharedAsset'                   => 'deljen premoženjski račun',
     'account_role_savingAsset'                   => 'varčevalni račun',
     'account_role_ccAsset'                       => 'kreditna kartica',
 
     // charts:
-    'chart'                                      => '',
-    'month'                                      => '',
-    'budget'                                     => '',
-    'spent'                                      => '',
-    'spent_in_budget'                            => '',
-    'left_to_spend'                              => '',
-    'earned'                                     => '',
-    'overspent'                                  => '',
-    'left'                                       => '',
-    'no_budget'                                  => '',
-    'max-amount'                                 => '',
-    'min-amount'                                 => '',
-    'journal-amount'                             => '',
-    'name'                                       => '',
-    'date'                                       => '',
-    'paid'                                       => '',
-    'unpaid'                                     => '',
-    'day'                                        => '',
-    'budgeted'                                   => '',
-    'period'                                     => '',
-    'balance'                                    => '',
-    'sum'                                        => '',
-    'average'                                    => '',
-    'balanceFor'                                 => '',
+    'chart'                                      => 'Chart',
+    'month'                                      => 'Month',
+    'budget'                                     => 'Budget',
+    'spent'                                      => 'Spent',
+    'spent_in_budget'                            => 'Spent in budget',
+    'left_to_spend'                              => 'Left to spend',
+    'earned'                                     => 'Earned',
+    'overspent'                                  => 'Overspent',
+    'left'                                       => 'Left',
+    'no_budget'                                  => '(no budget)',
+    'max-amount'                                 => 'Maximum amount',
+    'min-amount'                                 => 'Minumum amount',
+    'journal-amount'                             => 'Current bill entry',
+    'name'                                       => 'Name',
+    'date'                                       => 'Date',
+    'paid'                                       => 'Paid',
+    'unpaid'                                     => 'Unpaid',
+    'day'                                        => 'Day',
+    'budgeted'                                   => 'Budgeted',
+    'period'                                     => 'Period',
+    'balance'                                    => 'Balance',
+    'sum'                                        => 'Sum',
+    'average'                                    => 'Average',
+    'balanceFor'                                 => 'Balance for :name',
 
     // piggy banks:
-    'add_money_to_piggy'                         => '',
-    'piggy_bank'                                 => '',
-    'new_piggy_bank'                             => '',
-    'store_piggy_bank'                           => '',
-    'stored_piggy_bank'                          => '',
-    'account_status'                             => '',
-    'left_for_piggy_banks'                       => '',
-    'sum_of_piggy_banks'                         => '',
-    'saved_so_far'                               => '',
-    'left_to_save'                               => '',
-    'suggested_amount'                           => '',
-    'add_money_to_piggy_title'                   => '',
-    'remove_money_from_piggy_title'              => '',
-    'add'                                        => '',
+    'add_money_to_piggy'                         => 'Add money to piggy bank ":name"',
+    'piggy_bank'                                 => 'Piggy bank',
+    'new_piggy_bank'                             => 'New piggy bank',
+    'store_piggy_bank'                           => 'Store new piggy bank',
+    'stored_piggy_bank'                          => 'Store new piggy bank ":name"',
+    'account_status'                             => 'Account status',
+    'left_for_piggy_banks'                       => 'Left for piggy banks',
+    'sum_of_piggy_banks'                         => 'Sum of piggy banks',
+    'saved_so_far'                               => 'Saved so far',
+    'left_to_save'                               => 'Left to save',
+    'suggested_amount'                           => 'Suggested monthly amount to save',
+    'add_money_to_piggy_title'                   => 'Add money to piggy bank ":name"',
+    'remove_money_from_piggy_title'              => 'Remove money from piggy bank ":name"',
+    'add'                                        => 'Add',
 
-    'remove'                     => '',
-    'max_amount_add'             => '',
-    'max_amount_remove'          => '',
-    'update_piggy_button'        => '',
-    'update_piggy_title'         => '',
-    'updated_piggy_bank'         => '',
-    'details'                    => '',
-    'events'                     => '',
-    'target_amount'              => '',
-    'start_date'                 => '',
-    'target_date'                => '',
-    'no_target_date'             => '',
-    'table'                      => '',
-    'delete_piggy_bank'          => '',
-    'cannot_add_amount_piggy'    => '',
-    'cannot_remove_from_piggy'   => '',
-    'deleted_piggy_bank'         => '',
-    'added_amount_to_piggy'      => '',
-    'removed_amount_from_piggy'  => '',
+    'remove'                     => 'Remove',
+    'max_amount_add'             => 'The maximum amount you can add is',
+    'max_amount_remove'          => 'The maximum amount you can remove is',
+    'update_piggy_button'        => 'Update piggy bank',
+    'update_piggy_title'         => 'Update piggy bank ":name"',
+    'updated_piggy_bank'         => 'Updated piggy bank ":name"',
+    'details'                    => 'Details',
+    'events'                     => 'Events',
+    'target_amount'              => 'Target amount',
+    'start_date'                 => 'Start date',
+    'target_date'                => 'Target date',
+    'no_target_date'             => 'No target date',
+    'table'                      => 'Table',
+    'delete_piggy_bank'          => 'Delete piggy bank ":name"',
+    'cannot_add_amount_piggy'    => 'Could not add :amount to ":name".',
+    'cannot_remove_from_piggy'   => 'Could not remove :amount from ":name".',
+    'deleted_piggy_bank'         => 'Deleted piggy bank ":name"',
+    'added_amount_to_piggy'      => 'Added :amount to ":name"',
+    'removed_amount_from_piggy'  => 'Removed :amount from ":name"',
 
     // tags
-    'regular_tag'                => '',
-    'balancing_act'              => '',
-    'advance_payment'            => '',
-    'delete_tag'                 => '',
-    'deleted_tag'                => '',
-    'new_tag'                    => '',
-    'edit_tag'                   => '',
-    'updated_tag'                => '',
-    'created_tag'                => '',
+    'regular_tag'                => 'Just a regular tag.',
+    'balancing_act'              => 'The tag takes at most two transactions; an expense and a transfer. They\'ll balance each other out.',
+    'advance_payment'            => 'The tag accepts one expense and any number of deposits aimed to repay the original expense.',
+    'delete_tag'                 => 'Delete tag ":tag"',
+    'deleted_tag'                => 'Deleted tag ":tag"',
+    'new_tag'                    => 'Make new tag',
+    'edit_tag'                   => 'Edit tag ":tag"',
+    'updated_tag'                => 'Updated tag ":tag"',
+    'created_tag'                => 'Tag ":tag" has been created!',
 
-    'transaction_journal_information'       => '',
-    'transaction_journal_meta'              => '',
-    'total_amount'                          => '',
-    'number_of_decimals'                    => '',
+    'transaction_journal_information'       => 'Transaction information',
+    'transaction_journal_meta'              => 'Meta information',
+    'total_amount'                          => 'Total amount',
+    'number_of_decimals'                    => 'Number of decimals',
 
     // administration
-    'administration'                        => '',
-    'user_administration'                   => '',
-    'list_all_users'                        => '',
-    'all_users'                             => '',
-    'instance_configuration'                => '',
-    'firefly_instance_configuration'        => '',
-    'setting_single_user_mode'              => '',
-    'setting_single_user_mode_explain'      => '',
-    'store_configuration'                   => '',
-    'single_user_administration'            => '',
-    'edit_user'                             => '',
-    'hidden_fields_preferences'             => '',
-    'user_data_information'                 => '',
-    'user_information'                      => '',
-    'total_size'                            => '',
-    'budget_or_budgets'                     => '',
-    'budgets_with_limits'                   => '',
-    'rule_or_rules'                         => '',
-    'rulegroup_or_groups'                   => '',
-    'configuration_updated'                 => '',
-    'setting_is_demo_site'                  => '',
-    'setting_is_demo_site_explain'          => '',
-    'block_code_bounced'                    => '',
-    'block_code_expired'                    => '',
-    'no_block_code'                         => '',
+    'administration'                        => 'Administration',
+    'user_administration'                   => 'User administration',
+    'list_all_users'                        => 'All users',
+    'all_users'                             => 'All users',
+    'instance_configuration'                => 'Configuration',
+    'firefly_instance_configuration'        => 'Configuration options for Firefly III',
+    'setting_single_user_mode'              => 'Single user mode',
+    'setting_single_user_mode_explain'      => 'By default, Firefly III only accepts one (1) registration: you. This is a security measure, preventing others from using your instance unless you allow them to. Future registrations are blocked. When you uncheck this box, others can use your instance as wel, assuming they can reach it (when it is connected to the internet).',
+    'store_configuration'                   => 'Store configuration',
+    'single_user_administration'            => 'User administration for :email',
+    'edit_user'                             => 'Edit user :email',
+    'hidden_fields_preferences'             => 'Not all fields are visible right now. You must enable them in your <a href=":link">settings</a>.',
+    'user_data_information'                 => 'User data',
+    'user_information'                      => 'User information',
+    'total_size'                            => 'total size',
+    'budget_or_budgets'                     => 'budget(s)',
+    'budgets_with_limits'                   => 'budget(s) with configured amount',
+    'rule_or_rules'                         => 'rule(s)',
+    'rulegroup_or_groups'                   => 'rule group(s)',
+    'configuration_updated'                 => 'The configuration has been updated',
+    'setting_is_demo_site'                  => 'Demo site',
+    'setting_is_demo_site_explain'          => 'If you check this box, this installation will behave as if it is the demo site, which can have weird side effects.',
+    'block_code_bounced'                    => 'Email message(s) bounced',
+    'block_code_expired'                    => 'Demo account expired',
+    'no_block_code'                         => 'No reason for block or user not blocked',
     // links
-    'journal_link_configuration'            => '',
-    'create_new_link_type'                  => '',
-    'store_new_link_type'                   => '',
-    'update_link_type'                      => '',
-    'edit_link_type'                        => '',
-    'updated_link_type'                     => '',
-    'delete_link_type'                      => '',
-    'deleted_link_type'                     => '',
-    'stored_new_link_type'                  => '',
-    'cannot_edit_link_type'                 => '',
-    'link_type_help_name'                   => '',
-    'link_type_help_inward'                 => '',
-    'link_type_help_outward'                => '',
-    'save_connections_by_moving'            => '',
-    'do_not_save_connection'                => '',
-    'link_transaction'                      => '',
-    'link_to_other_transaction'             => '',
-    'select_transaction_to_link'            => '',
-    'this_transaction'                      => '',
-    'transaction'                           => '',
-    'comments'                              => '',
-    'to_link_not_found'                     => '',
-    'invalid_link_data'                     => '',
-    'journals_linked'                       => '',
-    'journals_error_linked'                 => '',
-    'journal_links'                         => '',
-    'this_withdrawal'                       => '',
-    'this_deposit'                          => '',
-    'this_transfer'                         => '',
-    'overview_for_link'                     => '',
-    'delete_journal_link'                   => '',
-    'deleted_link'                          => '',
+    'journal_link_configuration'            => 'Transaction links configuration',
+    'create_new_link_type'                  => 'Create new link type',
+    'store_new_link_type'                   => 'Store new link type',
+    'update_link_type'                      => 'Update link type',
+    'edit_link_type'                        => 'Edit link type ":name"',
+    'updated_link_type'                     => 'Updated link type ":name"',
+    'delete_link_type'                      => 'Delete link type ":name"',
+    'deleted_link_type'                     => 'Deleted link type ":name"',
+    'stored_new_link_type'                  => 'Store new link type ":name"',
+    'cannot_edit_link_type'                 => 'Cannot edit link type ":name"',
+    'link_type_help_name'                   => 'Ie. "Duplicates"',
+    'link_type_help_inward'                 => 'Ie. "duplicates"',
+    'link_type_help_outward'                => 'Ie. "is duplicated by"',
+    'save_connections_by_moving'            => 'Save the link between these transaction(s) by moving them to another link type:',
+    'do_not_save_connection'                => '(do not save connection)',
+    'link_transaction'                      => 'Link transaction',
+    'link_to_other_transaction'             => 'Link this transaction to another transaction',
+    'select_transaction_to_link'            => 'Select a transaction to link this transaction to',
+    'this_transaction'                      => 'This transaction',
+    'transaction'                           => 'Transaction',
+    'comments'                              => 'Comments',
+    'to_link_not_found'                     => 'If the transaction you want to link to is not listed, simply enter its ID.',
+    'invalid_link_data'                     => 'Invalid link type selected. Cannot link transaction.',
+    'journals_linked'                       => 'Transactions are linked.',
+    'journals_error_linked'                 => 'These transactions are already linked.',
+    'journal_links'                         => 'Transaction links',
+    'this_withdrawal'                       => 'This withdrawal',
+    'this_deposit'                          => 'This deposit',
+    'this_transfer'                         => 'This transfer',
+    'overview_for_link'                     => 'Overview for link type ":name"',
+    'delete_journal_link'                   => 'Delete the link between <a href=":source_link">:source</a> and <a href=":destination_link">:destination</a>',
+    'deleted_link'                          => 'Deleted link',
 
 
     // split a transaction:
-    'splits'                                => '',
-    'add_another_split'                     => '',
-    'split-transactions'                    => '',
-    'do_split'                              => '',
-    'split_this_withdrawal'                 => '',
-    'split_this_deposit'                    => '',
-    'split_this_transfer'                   => '',
-    'cannot_edit_multiple_source'           => '',
-    'cannot_edit_multiple_dest'             => '',
-    'cannot_edit_opening_balance'           => '',
-    'no_edit_multiple_left'                 => '',
+    'splits'                                => 'Splits',
+    'add_another_split'                     => 'Add another split',
+    'split-transactions'                    => 'Split transactions',
+    'do_split'                              => 'Do a split',
+    'split_this_withdrawal'                 => 'Split this withdrawal',
+    'split_this_deposit'                    => 'Split this deposit',
+    'split_this_transfer'                   => 'Split this transfer',
+    'cannot_edit_multiple_source'           => 'You cannot edit splitted transaction #:id with description ":description" because it contains multiple source accounts.',
+    'cannot_edit_multiple_dest'             => 'You cannot edit splitted transaction #:id with description ":description" because it contains multiple destination accounts.',
+    'cannot_edit_opening_balance'           => 'You cannot edit the opening balance of an account.',
+    'no_edit_multiple_left'                 => 'You have selected no valid transactions to edit.',
 
     // import bread crumbs and titles:
-    'import'                                => '',
-    'import_data'                           => '',
+    'import'                                => 'Import',
+    'import_data'                           => 'Import data',
 
     // import index page:
-    'import_index_title'                    => '',
-    'import_index_sub_title'                => '',
-    'import_general_index_intro'            => '',
-    'import_index_intro'                    => '',
-    'import_index_file'                     => '',
-    'import_index_config'                   => '',
-    'import_index_type'                     => '',
-    'import_index_start'                    => '',
+    'import_index_title'                    => 'Import data into Firefly III',
+    'import_index_sub_title'                => 'Index',
+    'import_general_index_intro'            => 'Welcome to Firefly\'s import routine. There are a few ways of importing data into Firefly III, displayed here as buttons.',
+    'import_index_intro'                    => 'This routine will help you import files from your bank into Firefly III. Please check out the help pages in the top right corner.',
+    'import_index_file'                     => 'Select your file',
+    'import_index_config'                   => 'If you have previously imported data into Firefly III, you may have a configuration file, which will pre-set configuration values for you. For some banks, other users have kindly provided their <a href="https://github.com/firefly-iii/import-configurations/wiki">configuration file</a>.',
+    'import_index_type'                     => 'Select the type of file you will upload',
+    'import_index_start'                    => 'Start importing',
 
     // supported file types:
-    'import_file_type_csv'                  => '',
+    'import_file_type_csv'                  => 'CSV (comma separated values)',
 
     // import configuration routine:
-    'import_config_sub_title'               => '',
-    'import_config_bread_crumb'             => '',
+    'import_config_sub_title'               => 'Set up your import file',
+    'import_config_bread_crumb'             => 'Set up your import file',
 
     // import status page:
-    'import_status_bread_crumb'             => '',
-    'import_status_sub_title'               => '',
-    'import_status_wait_title'              => '',
-    'import_status_wait_text'               => '',
-    'import_status_ready_title'             => '',
-    'import_status_ready_text'              => '',
-    'import_status_ready_config'            => '',
-    'import_status_ready_start'             => '',
-    'import_status_ready_share'             => '',
-    'import_status_running_title'           => '',
-    'import_status_running_placeholder'     => '',
-    'import_status_errors_title'            => '',
-    'import_status_errors_single'           => '',
-    'import_status_errors_multi'            => '',
-    'import_status_fatal_title'             => '',
-    'import_status_fatal_text'              => '',
-    'import_status_fatal_more'              => '',
-    'import_status_finished_title'          => '',
-    'import_status_finished_text'           => '',
-    'import_status_finished_job'            => '',
-    'import_with_key'                       => '',
+    'import_status_bread_crumb'             => 'Import status',
+    'import_status_sub_title'               => 'Import status',
+    'import_status_wait_title'              => 'Please hold...',
+    'import_status_wait_text'               => 'This box will disappear in a moment.',
+    'import_status_ready_title'             => 'Import is ready to start',
+    'import_status_ready_text'              => 'The import is ready to start. All the configuration you needed to do has been done. Please download the configuration file. It will help you with the import should it not go as planned. To actually run the import, you can either execute the following command in your console, or run the web-based import. Depending on your configuration, the console import will give you more feedback.',
+    'import_status_ready_config'            => 'Download configuration',
+    'import_status_ready_start'             => 'Start the import',
+    'import_status_ready_share'             => 'Please consider downloading your configuration and sharing it at the <strong><a href="https://github.com/firefly-iii/import-configurations/wiki">import configuration center</a></strong>. This will allow other users of Firefly III to import their files more easily.',
+    'import_status_running_title'           => 'The import is running',
+    'import_status_running_placeholder'     => 'Please hold for an update...',
+    'import_status_errors_title'            => 'Errors during the import',
+    'import_status_errors_single'           => 'An error has occured during the import. It does not appear to be fatal.',
+    'import_status_errors_multi'            => 'Some errors occured during the import. These do not appear to be fatal.',
+    'import_status_fatal_title'             => 'A fatal error occurred',
+    'import_status_fatal_text'              => 'A fatal error occurred, which the import-routine cannot recover from. Please see the explanation in red below.',
+    'import_status_fatal_more'              => 'If the error is a time-out, the import will have stopped half-way. For some server configurations, it is merely the server that stopped while the import keeps running in the background. To verify this, check out the log files. If the problem persists, consider importing over the command line instead.',
+    'import_status_finished_title'          => 'Import routine finished',
+    'import_status_finished_text'           => 'The import routine has imported your file.',
+    'import_status_finished_job'            => 'The transactions imported can be found in tag <a href=":link" class="label label-success" style="font-size:100%;font-weight:normal;">:tag</a>.',
+    'import_with_key'                       => 'Import with key \':key\'',
 
     // sandstorm.io errors and messages:
-    'sandstorm_not_available'               => '',
+    'sandstorm_not_available'               => 'This function is not available when you are using Firefly III within a Sandstorm.io environment.',
 
     // empty lists? no objects? instructions:
-    'no_transactions_in_period'             => '',
+    'no_transactions_in_period'             => 'There are no transactions in this period.',
     'no_accounts_title_asset'               => 'Ustvarite premoženjski račun!',
     'no_accounts_intro_asset'               => 'Še nobenega premoženjskega računa nimate. Premoženjski računi so vaši glavni računi sredstev: tekoči računi, skupni računi, varčevalni računi in celo računi kreditnih kartic.',
     'no_accounts_imperative_asset'          => 'Da začnete uporabljati Firefly III, morate ustvariti vsaj en premoženjski račun:',
@@ -971,42 +971,42 @@ return [
     'no_accounts_intro_expense'             => 'Nimate še nobenega konta za stroške. Stroškovni konti so konti kamor knjižite denar, ki ste ga zapravili kot npr. trgovine in supermarketi.',
     'no_accounts_imperative_expense'        => 'Stroškovni konti se ustvarijo avtomatično ko ustvarite transakcije, lahko pa jih ustvarite tudi na roke, če želite:',
     'no_accounts_create_expense'            => 'ustvari konto za stroške',
-    'no_accounts_title_revenue'             => '',
-    'no_accounts_intro_revenue'             => '',
-    'no_accounts_imperative_revenue'        => '',
-    'no_accounts_create_revenue'            => '',
-    'no_budgets_title_default'              => '',
-    'no_budgets_intro_default'              => '',
-    'no_budgets_imperative_default'         => '',
-    'no_budgets_create_default'             => '',
-    'no_categories_title_default'           => '',
-    'no_categories_intro_default'           => '',
-    'no_categories_imperative_default'      => '',
-    'no_categories_create_default'          => '',
-    'no_tags_title_default'                 => '',
-    'no_tags_intro_default'                 => '',
-    'no_tags_imperative_default'            => '',
-    'no_tags_create_default'                => '',
-    'no_transactions_title_withdrawal'      => '',
-    'no_transactions_intro_withdrawal'      => '',
-    'no_transactions_imperative_withdrawal' => '',
-    'no_transactions_create_withdrawal'     => '',
-    'no_transactions_title_deposit'         => '',
-    'no_transactions_intro_deposit'         => '',
-    'no_transactions_imperative_deposit'    => '',
-    'no_transactions_create_deposit'        => '',
-    'no_transactions_title_transfers'       => '',
+    'no_accounts_title_revenue'             => 'Let\'s create a revenue account!',
+    'no_accounts_intro_revenue'             => 'You have no revenue accounts yet. Revenue accounts are the places where you receive money from, such as your employer.',
+    'no_accounts_imperative_revenue'        => 'Revenue accounts are created automatically when you create transactions, but you can create one manually too, if you want. Let\'s create one now:',
+    'no_accounts_create_revenue'            => 'Create a revenue account',
+    'no_budgets_title_default'              => 'Let\'s create a budget',
+    'no_budgets_intro_default'              => 'You have no budgets yet. Budgets are used to organise your expenses into logical groups, which you can give a soft-cap to limit your expenses.',
+    'no_budgets_imperative_default'         => 'Budgets are the basic tools of financial management. Let\'s create one now:',
+    'no_budgets_create_default'             => 'Create a budget',
+    'no_categories_title_default'           => 'Let\'s create a category!',
+    'no_categories_intro_default'           => 'You have no categories yet. Categories are used to fine tune your transactions and label them with their designated category.',
+    'no_categories_imperative_default'      => 'Categories are created automatically when you create transactions, but you can create one manually too. Let\'s create one now:',
+    'no_categories_create_default'          => 'Create a category',
+    'no_tags_title_default'                 => 'Let\'s create a tag!',
+    'no_tags_intro_default'                 => 'You have no tags yet. Tags are used to fine tune your transactions and label them with specific keywords.',
+    'no_tags_imperative_default'            => 'Tags are created automatically when you create transactions, but you can create one manually too. Let\'s create one now:',
+    'no_tags_create_default'                => 'Create a tag',
+    'no_transactions_title_withdrawal'      => 'Let\'s create an expense!',
+    'no_transactions_intro_withdrawal'      => 'You have no expenses yet. You should create expenses to start managing your finances.',
+    'no_transactions_imperative_withdrawal' => 'Have you spent some money? Then you should write it down:',
+    'no_transactions_create_withdrawal'     => 'Create an expense',
+    'no_transactions_title_deposit'         => 'Let\'s create some income!',
+    'no_transactions_intro_deposit'         => 'You have no recorded income yet. You should create income entries to start managing your finances.',
+    'no_transactions_imperative_deposit'    => 'Have you received some money? Then you should write it down:',
+    'no_transactions_create_deposit'        => 'Create a deposit',
+    'no_transactions_title_transfers'       => 'Let\'s create a transfer!',
     'no_transactions_intro_transfers'       => 'Nimate še nobenih prenosov. Če prenašate denar med svojimi premoženjskimi računi, se to zabeleži kot prenos.',
-    'no_transactions_imperative_transfers'  => '',
-    'no_transactions_create_transfers'      => '',
-    'no_piggies_title_default'              => '',
-    'no_piggies_intro_default'              => '',
-    'no_piggies_imperative_default'         => '',
-    'no_piggies_create_default'             => '',
-    'no_bills_title_default'                => '',
-    'no_bills_intro_default'                => '',
-    'no_bills_imperative_default'           => '',
-    'no_bills_create_default'               => '',
+    'no_transactions_imperative_transfers'  => 'Have you moved some money around? Then you should write it down:',
+    'no_transactions_create_transfers'      => 'Create a transfer',
+    'no_piggies_title_default'              => 'Let\'s create a piggy bank!',
+    'no_piggies_intro_default'              => 'You have no piggy banks yet. You can create piggy banks to divide your savings and keep track of what you\'re saving up for.',
+    'no_piggies_imperative_default'         => 'Do you have things you\'re saving money for? Create a piggy bank and keep track:',
+    'no_piggies_create_default'             => 'Create a new piggy bank',
+    'no_bills_title_default'                => 'Let\'s create a bill!',
+    'no_bills_intro_default'                => 'You have no bills yet. You can create bills to keep track of regular expenses, like your rent of insurance.',
+    'no_bills_imperative_default'           => 'Do you have such regular bills? Create a bill and keep track of your payments:',
+    'no_bills_create_default'               => 'Create a bill',
 
 
 ];
\ No newline at end of file

From 4b2abb6f250bb4c6ae1a988f2911a32a09feb420 Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Fri, 25 Aug 2017 16:03:36 +0200
Subject: [PATCH 353/668] Add ability to translate links.

---
 app/Support/Twig/General.php           |  1 +
 app/Support/Twig/Translation.php       | 34 ++++++++++++++
 resources/lang/en_US/firefly.php       | 64 +++++++++++++++-----------
 resources/views/transactions/show.twig |  4 +-
 4 files changed, 73 insertions(+), 30 deletions(-)

diff --git a/app/Support/Twig/General.php b/app/Support/Twig/General.php
index c027514019..f4c1e319b3 100644
--- a/app/Support/Twig/General.php
+++ b/app/Support/Twig/General.php
@@ -61,6 +61,7 @@ class General extends Twig_Extension
             $this->steamPositive(),
             $this->activeRoutePartial(),
             $this->activeRoutePartialWhat(),
+
         ];
 
     }
diff --git a/app/Support/Twig/Translation.php b/app/Support/Twig/Translation.php
index a01b616bd6..ef64b3aca7 100644
--- a/app/Support/Twig/Translation.php
+++ b/app/Support/Twig/Translation.php
@@ -15,6 +15,7 @@ namespace FireflyIII\Support\Twig;
 
 use Twig_Extension;
 use Twig_SimpleFilter;
+use Twig_SimpleFunction;
 
 /**
  *
@@ -43,6 +44,39 @@ class Translation extends Twig_Extension
         return $filters;
     }
 
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getFunctions(): array
+    {
+        return [
+            $this->journalLinkTranslation(),
+
+        ];
+
+    }
+
+    /**
+     * @return Twig_SimpleFunction
+     */
+    public function journalLinkTranslation(): Twig_SimpleFunction
+    {
+        return new Twig_SimpleFunction(
+            'journalLinkTranslation', function (int $linkTypeId, string $direction, string $original) {
+            $key = sprintf('firefly.%d_%s', $linkTypeId, $direction);
+            $translation = trans($key);
+            if($key === $translation) {
+                return $original;
+            }
+
+            return $translation;
+
+
+        }, ['is_safe' => ['html']]
+        );
+    }
+
     /**
      * {@inheritDoc}
      */
diff --git a/resources/lang/en_US/firefly.php b/resources/lang/en_US/firefly.php
index 54d8cebe46..30f0528cd9 100644
--- a/resources/lang/en_US/firefly.php
+++ b/resources/lang/en_US/firefly.php
@@ -804,36 +804,36 @@ return [
     'remove_money_from_piggy_title'              => 'Remove money from piggy bank ":name"',
     'add'                                        => 'Add',
 
-    'remove'                     => 'Remove',
-    'max_amount_add'             => 'The maximum amount you can add is',
-    'max_amount_remove'          => 'The maximum amount you can remove is',
-    'update_piggy_button'        => 'Update piggy bank',
-    'update_piggy_title'         => 'Update piggy bank ":name"',
-    'updated_piggy_bank'         => 'Updated piggy bank ":name"',
-    'details'                    => 'Details',
-    'events'                     => 'Events',
-    'target_amount'              => 'Target amount',
-    'start_date'                 => 'Start date',
-    'target_date'                => 'Target date',
-    'no_target_date'             => 'No target date',
-    'table'                      => 'Table',
-    'delete_piggy_bank'          => 'Delete piggy bank ":name"',
-    'cannot_add_amount_piggy'    => 'Could not add :amount to ":name".',
-    'cannot_remove_from_piggy'   => 'Could not remove :amount from ":name".',
-    'deleted_piggy_bank'         => 'Deleted piggy bank ":name"',
-    'added_amount_to_piggy'      => 'Added :amount to ":name"',
-    'removed_amount_from_piggy'  => 'Removed :amount from ":name"',
+    'remove'                    => 'Remove',
+    'max_amount_add'            => 'The maximum amount you can add is',
+    'max_amount_remove'         => 'The maximum amount you can remove is',
+    'update_piggy_button'       => 'Update piggy bank',
+    'update_piggy_title'        => 'Update piggy bank ":name"',
+    'updated_piggy_bank'        => 'Updated piggy bank ":name"',
+    'details'                   => 'Details',
+    'events'                    => 'Events',
+    'target_amount'             => 'Target amount',
+    'start_date'                => 'Start date',
+    'target_date'               => 'Target date',
+    'no_target_date'            => 'No target date',
+    'table'                     => 'Table',
+    'delete_piggy_bank'         => 'Delete piggy bank ":name"',
+    'cannot_add_amount_piggy'   => 'Could not add :amount to ":name".',
+    'cannot_remove_from_piggy'  => 'Could not remove :amount from ":name".',
+    'deleted_piggy_bank'        => 'Deleted piggy bank ":name"',
+    'added_amount_to_piggy'     => 'Added :amount to ":name"',
+    'removed_amount_from_piggy' => 'Removed :amount from ":name"',
 
     // tags
-    'regular_tag'                => 'Just a regular tag.',
-    'balancing_act'              => 'The tag takes at most two transactions; an expense and a transfer. They\'ll balance each other out.',
-    'advance_payment'            => 'The tag accepts one expense and any number of deposits aimed to repay the original expense.',
-    'delete_tag'                 => 'Delete tag ":tag"',
-    'deleted_tag'                => 'Deleted tag ":tag"',
-    'new_tag'                    => 'Make new tag',
-    'edit_tag'                   => 'Edit tag ":tag"',
-    'updated_tag'                => 'Updated tag ":tag"',
-    'created_tag'                => 'Tag ":tag" has been created!',
+    'regular_tag'               => 'Just a regular tag.',
+    'balancing_act'             => 'The tag takes at most two transactions; an expense and a transfer. They\'ll balance each other out.',
+    'advance_payment'           => 'The tag accepts one expense and any number of deposits aimed to repay the original expense.',
+    'delete_tag'                => 'Delete tag ":tag"',
+    'deleted_tag'               => 'Deleted tag ":tag"',
+    'new_tag'                   => 'Make new tag',
+    'edit_tag'                  => 'Edit tag ":tag"',
+    'updated_tag'               => 'Updated tag ":tag"',
+    'created_tag'               => 'Tag ":tag" has been created!',
 
     'transaction_journal_information'       => 'Transaction information',
     'transaction_journal_meta'              => 'Meta information',
@@ -899,6 +899,14 @@ return [
     'overview_for_link'                     => 'Overview for link type ":name"',
     'delete_journal_link'                   => 'Delete the link between <a href=":source_link">:source</a> and <a href=":destination_link">:destination</a>',
     'deleted_link'                          => 'Deleted link',
+    '1_outward'                             => 'relates to',
+    '2_outward'                             => '(partially) refunds',
+    '3_outward'                             => '(partially) pays for',
+    '4_outward'                             => '(partially) reimburses',
+    '1_inward'                              => 'relates to',
+    '2_inward'                              => 'is (partially) refunded by',
+    '3_inward'                              => 'is (partially) paid for by',
+    '4_inward'                              => 'is (partially) reimbursed by',
 
 
     // split a transaction:
diff --git a/resources/views/transactions/show.twig b/resources/views/transactions/show.twig
index 4b19773112..0fe99308d4 100644
--- a/resources/views/transactions/show.twig
+++ b/resources/views/transactions/show.twig
@@ -329,13 +329,13 @@
                                     <td>
                                         {{ ('this_'~(what|lower))|_ }}
                                         {% if link.source.id == journal.id %}
-                                            {{ link.linkType.outward }}
+                                            {{ journalLinkTranslation(link.link_type_id,'outward', link.linkType.outward) }}
                                             <a href="{{ route('transactions.show',link.destination.id) }}">
                                                 #{{ link.destination.id }}: {{ link.destination.description }}
                                             </a>
                                             ({{ journalAmount(link.destination) }})
                                         {% else %}
-                                            {{ link.linkType.inward }}
+                                            {{ journalLinkTranslation(link.link_type_id,'inward', link.linkType.inward) }}
                                             <a href="{{ route('transactions.show',link.source.id) }}">
                                                 #{{ link.source.id }}: {{ link.source.description }}</a>
                                             ({{ journalAmount(link.source) }})

From 2da3f740573ae63cba4fe4b02ea202bb8cabc3bf Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Fri, 25 Aug 2017 16:10:25 +0200
Subject: [PATCH 354/668] New translations firefly.php (Russian)

---
 resources/lang/ru_RU/firefly.php | 64 ++++++++++++++++++--------------
 1 file changed, 36 insertions(+), 28 deletions(-)

diff --git a/resources/lang/ru_RU/firefly.php b/resources/lang/ru_RU/firefly.php
index 468735bab6..73eff711e0 100644
--- a/resources/lang/ru_RU/firefly.php
+++ b/resources/lang/ru_RU/firefly.php
@@ -804,36 +804,36 @@ return [
     'remove_money_from_piggy_title'              => 'Remove money from piggy bank ":name"',
     'add'                                        => 'Add',
 
-    'remove'                     => 'Remove',
-    'max_amount_add'             => 'The maximum amount you can add is',
-    'max_amount_remove'          => 'The maximum amount you can remove is',
-    'update_piggy_button'        => 'Update piggy bank',
-    'update_piggy_title'         => 'Update piggy bank ":name"',
-    'updated_piggy_bank'         => 'Updated piggy bank ":name"',
-    'details'                    => 'Details',
-    'events'                     => 'Events',
-    'target_amount'              => 'Target amount',
-    'start_date'                 => 'Start date',
-    'target_date'                => 'Target date',
-    'no_target_date'             => 'No target date',
-    'table'                      => 'Table',
-    'delete_piggy_bank'          => 'Delete piggy bank ":name"',
-    'cannot_add_amount_piggy'    => 'Could not add :amount to ":name".',
-    'cannot_remove_from_piggy'   => 'Could not remove :amount from ":name".',
-    'deleted_piggy_bank'         => 'Deleted piggy bank ":name"',
-    'added_amount_to_piggy'      => 'Added :amount to ":name"',
-    'removed_amount_from_piggy'  => 'Removed :amount from ":name"',
+    'remove'                    => 'Remove',
+    'max_amount_add'            => 'The maximum amount you can add is',
+    'max_amount_remove'         => 'The maximum amount you can remove is',
+    'update_piggy_button'       => 'Update piggy bank',
+    'update_piggy_title'        => 'Update piggy bank ":name"',
+    'updated_piggy_bank'        => 'Updated piggy bank ":name"',
+    'details'                   => 'Details',
+    'events'                    => 'Events',
+    'target_amount'             => 'Target amount',
+    'start_date'                => 'Start date',
+    'target_date'               => 'Target date',
+    'no_target_date'            => 'No target date',
+    'table'                     => 'Table',
+    'delete_piggy_bank'         => 'Delete piggy bank ":name"',
+    'cannot_add_amount_piggy'   => 'Could not add :amount to ":name".',
+    'cannot_remove_from_piggy'  => 'Could not remove :amount from ":name".',
+    'deleted_piggy_bank'        => 'Deleted piggy bank ":name"',
+    'added_amount_to_piggy'     => 'Added :amount to ":name"',
+    'removed_amount_from_piggy' => 'Removed :amount from ":name"',
 
     // tags
-    'regular_tag'                => 'Just a regular tag.',
-    'balancing_act'              => 'The tag takes at most two transactions; an expense and a transfer. They\'ll balance each other out.',
-    'advance_payment'            => 'The tag accepts one expense and any number of deposits aimed to repay the original expense.',
-    'delete_tag'                 => 'Delete tag ":tag"',
-    'deleted_tag'                => 'Deleted tag ":tag"',
-    'new_tag'                    => 'Make new tag',
-    'edit_tag'                   => 'Edit tag ":tag"',
-    'updated_tag'                => 'Updated tag ":tag"',
-    'created_tag'                => 'Tag ":tag" has been created!',
+    'regular_tag'               => 'Just a regular tag.',
+    'balancing_act'             => 'The tag takes at most two transactions; an expense and a transfer. They\'ll balance each other out.',
+    'advance_payment'           => 'The tag accepts one expense and any number of deposits aimed to repay the original expense.',
+    'delete_tag'                => 'Delete tag ":tag"',
+    'deleted_tag'               => 'Deleted tag ":tag"',
+    'new_tag'                   => 'Make new tag',
+    'edit_tag'                  => 'Edit tag ":tag"',
+    'updated_tag'               => 'Updated tag ":tag"',
+    'created_tag'               => 'Tag ":tag" has been created!',
 
     'transaction_journal_information'       => 'Transaction information',
     'transaction_journal_meta'              => 'Meta information',
@@ -899,6 +899,14 @@ return [
     'overview_for_link'                     => 'Overview for link type ":name"',
     'delete_journal_link'                   => 'Delete the link between <a href=":source_link">:source</a> and <a href=":destination_link">:destination</a>',
     'deleted_link'                          => 'Deleted link',
+    '1_outward'                             => 'relates to',
+    '2_outward'                             => '(partially) refunds',
+    '3_outward'                             => '(partially) pays for',
+    '4_outward'                             => '(partially) reimburses',
+    '1_inward'                              => 'relates to',
+    '2_inward'                              => 'is (partially) refunded by',
+    '3_inward'                              => 'is (partially) paid for by',
+    '4_inward'                              => 'is (partially) reimbursed by',
 
 
     // split a transaction:

From 4eb93dd139733d6f451effbbbc343db8cc304e48 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Fri, 25 Aug 2017 16:10:42 +0200
Subject: [PATCH 355/668] New translations firefly.php (German)

---
 resources/lang/de_DE/firefly.php | 64 ++++++++++++++++++--------------
 1 file changed, 36 insertions(+), 28 deletions(-)

diff --git a/resources/lang/de_DE/firefly.php b/resources/lang/de_DE/firefly.php
index dd6a8153c1..21846db799 100644
--- a/resources/lang/de_DE/firefly.php
+++ b/resources/lang/de_DE/firefly.php
@@ -805,36 +805,36 @@ Sollen zusätzlich Ihre Girokonten angezeigt werden?',
     'remove_money_from_piggy_title'              => 'Geld dem Sparschwein ":name" entnehmen',
     'add'                                        => 'Hinzufügen',
 
-    'remove'                     => 'Entfernen',
-    'max_amount_add'             => 'Der maximale Betrag, den Sie hinzufügen können ist',
-    'max_amount_remove'          => 'Der maximale Betrag, den Sie entnehmen können ist',
-    'update_piggy_button'        => 'Sparschwein aktualisieren',
-    'update_piggy_title'         => 'Sparschwein ":name" aktualisieren',
-    'updated_piggy_bank'         => 'Sparschwein ":name" aktualisiert',
-    'details'                    => 'Details',
-    'events'                     => 'Ereignisse',
-    'target_amount'              => 'Zielbetrag',
-    'start_date'                 => 'Startdatum',
-    'target_date'                => 'Zieldatum',
-    'no_target_date'             => 'Kein Zieldatum',
-    'table'                      => 'Tabelle',
-    'delete_piggy_bank'          => 'Sparschwein ":name" löschen',
-    'cannot_add_amount_piggy'    => ':amount konnte nicht zu ":name" hinzugefügt werden.',
-    'cannot_remove_from_piggy'   => 'Could not remove :amount from ":name".',
-    'deleted_piggy_bank'         => 'Sparschwein ":name" gelöscht',
-    'added_amount_to_piggy'      => ':amount zu ":name" hinzugefügt',
-    'removed_amount_from_piggy'  => ':amount von ":name" entfernt',
+    'remove'                    => 'Entfernen',
+    'max_amount_add'            => 'Der maximale Betrag, den Sie hinzufügen können ist',
+    'max_amount_remove'         => 'Der maximale Betrag, den Sie entnehmen können ist',
+    'update_piggy_button'       => 'Sparschwein aktualisieren',
+    'update_piggy_title'        => 'Sparschwein ":name" aktualisieren',
+    'updated_piggy_bank'        => 'Sparschwein ":name" aktualisiert',
+    'details'                   => 'Details',
+    'events'                    => 'Ereignisse',
+    'target_amount'             => 'Zielbetrag',
+    'start_date'                => 'Startdatum',
+    'target_date'               => 'Zieldatum',
+    'no_target_date'            => 'Kein Zieldatum',
+    'table'                     => 'Tabelle',
+    'delete_piggy_bank'         => 'Sparschwein ":name" löschen',
+    'cannot_add_amount_piggy'   => ':amount konnte nicht zu ":name" hinzugefügt werden.',
+    'cannot_remove_from_piggy'  => 'Could not remove :amount from ":name".',
+    'deleted_piggy_bank'        => 'Sparschwein ":name" gelöscht',
+    'added_amount_to_piggy'     => ':amount zu ":name" hinzugefügt',
+    'removed_amount_from_piggy' => ':amount von ":name" entfernt',
 
     // tags
-    'regular_tag'                => 'Nur ein normaler Tag.',
-    'balancing_act'              => 'The tag takes at most two transactions; an expense and a transfer. They\'ll balance each other out.',
-    'advance_payment'            => 'The tag accepts one expense and any number of deposits aimed to repay the original expense.',
-    'delete_tag'                 => 'Tag ":tag" entfernen',
-    'deleted_tag'                => 'Tag ":tag" entfernt',
-    'new_tag'                    => 'Neuen Tag erstellen',
-    'edit_tag'                   => 'Tag ":tag" bearbeiten',
-    'updated_tag'                => 'Aktualisierter Tag ":tag"',
-    'created_tag'                => 'Tag ":tag" wurde erstellt!',
+    'regular_tag'               => 'Nur ein normaler Tag.',
+    'balancing_act'             => 'The tag takes at most two transactions; an expense and a transfer. They\'ll balance each other out.',
+    'advance_payment'           => 'The tag accepts one expense and any number of deposits aimed to repay the original expense.',
+    'delete_tag'                => 'Tag ":tag" entfernen',
+    'deleted_tag'               => 'Tag ":tag" entfernt',
+    'new_tag'                   => 'Neuen Tag erstellen',
+    'edit_tag'                  => 'Tag ":tag" bearbeiten',
+    'updated_tag'               => 'Aktualisierter Tag ":tag"',
+    'created_tag'               => 'Tag ":tag" wurde erstellt!',
 
     'transaction_journal_information'       => 'Transaktionsinformationen',
     'transaction_journal_meta'              => 'Metainformationen',
@@ -900,6 +900,14 @@ Sollen zusätzlich Ihre Girokonten angezeigt werden?',
     'overview_for_link'                     => 'Overview for link type ":name"',
     'delete_journal_link'                   => 'Delete the link between <a href=":source_link">:source</a> and <a href=":destination_link">:destination</a>',
     'deleted_link'                          => 'Deleted link',
+    '1_outward'                             => 'relates to',
+    '2_outward'                             => '(partially) refunds',
+    '3_outward'                             => '(partially) pays for',
+    '4_outward'                             => '(partially) reimburses',
+    '1_inward'                              => 'relates to',
+    '2_inward'                              => 'is (partially) refunded by',
+    '3_inward'                              => 'is (partially) paid for by',
+    '4_inward'                              => 'is (partially) reimbursed by',
 
 
     // split a transaction:

From f484785395f7fa561132e869547bb94a3f5620c7 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Fri, 25 Aug 2017 16:10:45 +0200
Subject: [PATCH 356/668] New translations firefly.php (Polish)

---
 resources/lang/pl_PL/firefly.php | 64 ++++++++++++++++++--------------
 1 file changed, 36 insertions(+), 28 deletions(-)

diff --git a/resources/lang/pl_PL/firefly.php b/resources/lang/pl_PL/firefly.php
index 2352179e23..3942ebfa8d 100644
--- a/resources/lang/pl_PL/firefly.php
+++ b/resources/lang/pl_PL/firefly.php
@@ -804,36 +804,36 @@ return [
     'remove_money_from_piggy_title'              => 'Usuń pieniądze ze skarbonki ":name"',
     'add'                                        => 'Dodaj',
 
-    'remove'                     => 'Usuń',
-    'max_amount_add'             => 'Maksymalną kwotą, którą możesz dodać jest',
-    'max_amount_remove'          => 'Maksymalną kwotą, którą możesz usunąć jest',
-    'update_piggy_button'        => 'Aktualizuj skarbonkę',
-    'update_piggy_title'         => 'Aktualizuj skarbonkę ":name"',
-    'updated_piggy_bank'         => 'Zaktualizowano skarbonkę ":name"',
-    'details'                    => 'Szczegóły',
-    'events'                     => 'Zdarzenia',
-    'target_amount'              => 'Kwota docelowa',
-    'start_date'                 => 'Data rozpoczęcia',
-    'target_date'                => 'Data docelowa',
-    'no_target_date'             => 'No target date',
-    'table'                      => 'Tabela',
-    'delete_piggy_bank'          => 'Usuń skarbonkę ":name"',
-    'cannot_add_amount_piggy'    => 'Nie można dodać :amount do ":name".',
-    'cannot_remove_from_piggy'   => 'Could not remove :amount from ":name".',
-    'deleted_piggy_bank'         => 'Usunięto skarbonkę ":name"',
-    'added_amount_to_piggy'      => 'Added :amount to ":name"',
-    'removed_amount_from_piggy'  => 'Removed :amount from ":name"',
+    'remove'                    => 'Usuń',
+    'max_amount_add'            => 'Maksymalną kwotą, którą możesz dodać jest',
+    'max_amount_remove'         => 'Maksymalną kwotą, którą możesz usunąć jest',
+    'update_piggy_button'       => 'Aktualizuj skarbonkę',
+    'update_piggy_title'        => 'Aktualizuj skarbonkę ":name"',
+    'updated_piggy_bank'        => 'Zaktualizowano skarbonkę ":name"',
+    'details'                   => 'Szczegóły',
+    'events'                    => 'Zdarzenia',
+    'target_amount'             => 'Kwota docelowa',
+    'start_date'                => 'Data rozpoczęcia',
+    'target_date'               => 'Data docelowa',
+    'no_target_date'            => 'No target date',
+    'table'                     => 'Tabela',
+    'delete_piggy_bank'         => 'Usuń skarbonkę ":name"',
+    'cannot_add_amount_piggy'   => 'Nie można dodać :amount do ":name".',
+    'cannot_remove_from_piggy'  => 'Could not remove :amount from ":name".',
+    'deleted_piggy_bank'        => 'Usunięto skarbonkę ":name"',
+    'added_amount_to_piggy'     => 'Added :amount to ":name"',
+    'removed_amount_from_piggy' => 'Removed :amount from ":name"',
 
     // tags
-    'regular_tag'                => 'Po prostu zwykły tag.',
-    'balancing_act'              => 'The tag takes at most two transactions; an expense and a transfer. They\'ll balance each other out.',
-    'advance_payment'            => 'The tag accepts one expense and any number of deposits aimed to repay the original expense.',
-    'delete_tag'                 => 'Usuń tag ":tag"',
-    'deleted_tag'                => 'Usunięto tag ":tag"',
-    'new_tag'                    => 'Utwórz nowy tag',
-    'edit_tag'                   => 'Modyfikuj tag ":tag"',
-    'updated_tag'                => 'Zaktualizowano tag ":tag"',
-    'created_tag'                => 'Tag ":tag" został utworzony!',
+    'regular_tag'               => 'Po prostu zwykły tag.',
+    'balancing_act'             => 'The tag takes at most two transactions; an expense and a transfer. They\'ll balance each other out.',
+    'advance_payment'           => 'The tag accepts one expense and any number of deposits aimed to repay the original expense.',
+    'delete_tag'                => 'Usuń tag ":tag"',
+    'deleted_tag'               => 'Usunięto tag ":tag"',
+    'new_tag'                   => 'Utwórz nowy tag',
+    'edit_tag'                  => 'Modyfikuj tag ":tag"',
+    'updated_tag'               => 'Zaktualizowano tag ":tag"',
+    'created_tag'               => 'Tag ":tag" został utworzony!',
 
     'transaction_journal_information'       => 'Informacje o transakcji',
     'transaction_journal_meta'              => 'Meta informacje',
@@ -899,6 +899,14 @@ return [
     'overview_for_link'                     => 'Overview for link type ":name"',
     'delete_journal_link'                   => 'Delete the link between <a href=":source_link">:source</a> and <a href=":destination_link">:destination</a>',
     'deleted_link'                          => 'Deleted link',
+    '1_outward'                             => 'relates to',
+    '2_outward'                             => '(partially) refunds',
+    '3_outward'                             => '(partially) pays for',
+    '4_outward'                             => '(partially) reimburses',
+    '1_inward'                              => 'relates to',
+    '2_inward'                              => 'is (partially) refunded by',
+    '3_inward'                              => 'is (partially) paid for by',
+    '4_inward'                              => 'is (partially) reimbursed by',
 
 
     // split a transaction:

From 6215ec8cf6284daa72b930306196e54f025c4952 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Fri, 25 Aug 2017 16:10:48 +0200
Subject: [PATCH 357/668] New translations firefly.php (French)

---
 resources/lang/fr_FR/firefly.php | 64 ++++++++++++++++++--------------
 1 file changed, 36 insertions(+), 28 deletions(-)

diff --git a/resources/lang/fr_FR/firefly.php b/resources/lang/fr_FR/firefly.php
index 607bb2dd50..81462ad486 100644
--- a/resources/lang/fr_FR/firefly.php
+++ b/resources/lang/fr_FR/firefly.php
@@ -804,36 +804,36 @@ return [
     'remove_money_from_piggy_title'              => 'Retirer l’argent de la tirelire ":name"',
     'add'                                        => 'Ajouter',
 
-    'remove'                     => 'Enlever',
-    'max_amount_add'             => 'Le montant maximum que vous pouvez ajouter est',
-    'max_amount_remove'          => 'Le montant maximum que vous pouvez supprimer est',
-    'update_piggy_button'        => 'Mise à jour tirelire',
-    'update_piggy_title'         => 'Mise à jour de tirelire ":name"',
-    'updated_piggy_bank'         => 'Mise à jour de la tirelire ":name"',
-    'details'                    => 'Détails',
-    'events'                     => 'Evènements',
-    'target_amount'              => 'Montant cible',
-    'start_date'                 => 'Date de début',
-    'target_date'                => 'Date cible',
-    'no_target_date'             => 'Aucune date butoir',
-    'table'                      => 'Tableau',
-    'delete_piggy_bank'          => 'Supprimer la tirelire ":name"',
-    'cannot_add_amount_piggy'    => 'Impossible d\'ajouter :amount à ":name".',
-    'cannot_remove_from_piggy'   => 'Impossible de supprimer :amount à ":name".',
-    'deleted_piggy_bank'         => 'Tirelire ":name" supprimée',
-    'added_amount_to_piggy'      => 'Ajouté :amount à ":name"',
-    'removed_amount_from_piggy'  => 'Supprimé :amount du ":name"',
+    'remove'                    => 'Enlever',
+    'max_amount_add'            => 'Le montant maximum que vous pouvez ajouter est',
+    'max_amount_remove'         => 'Le montant maximum que vous pouvez supprimer est',
+    'update_piggy_button'       => 'Mise à jour tirelire',
+    'update_piggy_title'        => 'Mise à jour de tirelire ":name"',
+    'updated_piggy_bank'        => 'Mise à jour de la tirelire ":name"',
+    'details'                   => 'Détails',
+    'events'                    => 'Evènements',
+    'target_amount'             => 'Montant cible',
+    'start_date'                => 'Date de début',
+    'target_date'               => 'Date cible',
+    'no_target_date'            => 'Aucune date butoir',
+    'table'                     => 'Tableau',
+    'delete_piggy_bank'         => 'Supprimer la tirelire ":name"',
+    'cannot_add_amount_piggy'   => 'Impossible d\'ajouter :amount à ":name".',
+    'cannot_remove_from_piggy'  => 'Impossible de supprimer :amount à ":name".',
+    'deleted_piggy_bank'        => 'Tirelire ":name" supprimée',
+    'added_amount_to_piggy'     => 'Ajouté :amount à ":name"',
+    'removed_amount_from_piggy' => 'Supprimé :amount du ":name"',
 
     // tags
-    'regular_tag'                => 'Juste une balise ordinaire.',
-    'balancing_act'              => 'Un tag prend au maximum deux opérations : une dépense et un transfert. Ils s\'équilibreront mutuellement.',
-    'advance_payment'            => 'Un tag accepte une dépense et un nombre quelconque de dépôts visant à rembourser la dépense originale.',
-    'delete_tag'                 => 'Supprimer le tag ":tag"',
-    'deleted_tag'                => 'Tag ":tag" supprimé',
-    'new_tag'                    => 'Créer un nouveau tag',
-    'edit_tag'                   => 'Modifier le tag ":tag"',
-    'updated_tag'                => 'Mise à jour de la balise ": tag"',
-    'created_tag'                => 'Tag ":tag" a été créé !',
+    'regular_tag'               => 'Juste une balise ordinaire.',
+    'balancing_act'             => 'Un tag prend au maximum deux opérations : une dépense et un transfert. Ils s\'équilibreront mutuellement.',
+    'advance_payment'           => 'Un tag accepte une dépense et un nombre quelconque de dépôts visant à rembourser la dépense originale.',
+    'delete_tag'                => 'Supprimer le tag ":tag"',
+    'deleted_tag'               => 'Tag ":tag" supprimé',
+    'new_tag'                   => 'Créer un nouveau tag',
+    'edit_tag'                  => 'Modifier le tag ":tag"',
+    'updated_tag'               => 'Mise à jour de la balise ": tag"',
+    'created_tag'               => 'Tag ":tag" a été créé !',
 
     'transaction_journal_information'       => 'Informations sur les transactions',
     'transaction_journal_meta'              => 'Méta informations',
@@ -899,6 +899,14 @@ return [
     'overview_for_link'                     => 'Overview for link type ":name"',
     'delete_journal_link'                   => 'Delete the link between <a href=":source_link">:source</a> and <a href=":destination_link">:destination</a>',
     'deleted_link'                          => 'Deleted link',
+    '1_outward'                             => 'relates to',
+    '2_outward'                             => '(partially) refunds',
+    '3_outward'                             => '(partially) pays for',
+    '4_outward'                             => '(partially) reimburses',
+    '1_inward'                              => 'relates to',
+    '2_inward'                              => 'is (partially) refunded by',
+    '3_inward'                              => 'is (partially) paid for by',
+    '4_inward'                              => 'is (partially) reimbursed by',
 
 
     // split a transaction:

From d5e8f5810df454c9492ce3e89af8e226d9bad4af Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Fri, 25 Aug 2017 16:10:50 +0200
Subject: [PATCH 358/668] New translations firefly.php (Dutch)

---
 resources/lang/nl_NL/firefly.php | 64 ++++++++++++++++++--------------
 1 file changed, 36 insertions(+), 28 deletions(-)

diff --git a/resources/lang/nl_NL/firefly.php b/resources/lang/nl_NL/firefly.php
index 299ecac582..87ce295c76 100644
--- a/resources/lang/nl_NL/firefly.php
+++ b/resources/lang/nl_NL/firefly.php
@@ -804,36 +804,36 @@ return [
     'remove_money_from_piggy_title'              => 'Haal geld uit spaarpotje ":name"',
     'add'                                        => 'Toevoegen',
 
-    'remove'                     => 'Verwijderen',
-    'max_amount_add'             => 'Hooguit toe te voegen',
-    'max_amount_remove'          => 'Hooguit te verwijderen',
-    'update_piggy_button'        => 'Wijzig spaarpotje',
-    'update_piggy_title'         => 'Wijzig spaarpotje ":name"',
-    'updated_piggy_bank'         => 'Spaarpotje ":name" geüpdatet',
-    'details'                    => 'Details',
-    'events'                     => 'Gebeurtenissen',
-    'target_amount'              => 'Doelbedrag',
-    'start_date'                 => 'Startdatum',
-    'target_date'                => 'Doeldatum',
-    'no_target_date'             => 'Geen doeldatum',
-    'table'                      => 'Tabel',
-    'delete_piggy_bank'          => 'Verwijder spaarpotje ":name"',
-    'cannot_add_amount_piggy'    => 'Kon bedrag :amount niet aan ":name" toevoegen.',
-    'cannot_remove_from_piggy'   => 'Kon bedrag :amount niet weghalen uit ":name".',
-    'deleted_piggy_bank'         => 'Spaarpotje ":name" verwijderd',
-    'added_amount_to_piggy'      => ':amount aan ":name" toegevoegd',
-    'removed_amount_from_piggy'  => ':amount uit ":name" gehaald',
+    'remove'                    => 'Verwijderen',
+    'max_amount_add'            => 'Hooguit toe te voegen',
+    'max_amount_remove'         => 'Hooguit te verwijderen',
+    'update_piggy_button'       => 'Wijzig spaarpotje',
+    'update_piggy_title'        => 'Wijzig spaarpotje ":name"',
+    'updated_piggy_bank'        => 'Spaarpotje ":name" geüpdatet',
+    'details'                   => 'Details',
+    'events'                    => 'Gebeurtenissen',
+    'target_amount'             => 'Doelbedrag',
+    'start_date'                => 'Startdatum',
+    'target_date'               => 'Doeldatum',
+    'no_target_date'            => 'Geen doeldatum',
+    'table'                     => 'Tabel',
+    'delete_piggy_bank'         => 'Verwijder spaarpotje ":name"',
+    'cannot_add_amount_piggy'   => 'Kon bedrag :amount niet aan ":name" toevoegen.',
+    'cannot_remove_from_piggy'  => 'Kon bedrag :amount niet weghalen uit ":name".',
+    'deleted_piggy_bank'        => 'Spaarpotje ":name" verwijderd',
+    'added_amount_to_piggy'     => ':amount aan ":name" toegevoegd',
+    'removed_amount_from_piggy' => ':amount uit ":name" gehaald',
 
     // tags
-    'regular_tag'                => 'Een gewone tag.',
-    'balancing_act'              => 'Er kunnen maar twee transacties worden getagged; een uitgaven en inkomsten. Ze balanceren elkaar.',
-    'advance_payment'            => 'Je kan een uitgave taggen en zoveel inkomsten om de uitgave (helemaal) te compenseren.',
-    'delete_tag'                 => 'Verwijder tag ":tag"',
-    'deleted_tag'                => 'Tag ":tag" verwijderd',
-    'new_tag'                    => 'Maak nieuwe tag',
-    'edit_tag'                   => 'Wijzig tag ":tag"',
-    'updated_tag'                => 'Tag ":tag" geüpdatet',
-    'created_tag'                => 'Tag ":tag" opgeslagen!',
+    'regular_tag'               => 'Een gewone tag.',
+    'balancing_act'             => 'Er kunnen maar twee transacties worden getagged; een uitgaven en inkomsten. Ze balanceren elkaar.',
+    'advance_payment'           => 'Je kan een uitgave taggen en zoveel inkomsten om de uitgave (helemaal) te compenseren.',
+    'delete_tag'                => 'Verwijder tag ":tag"',
+    'deleted_tag'               => 'Tag ":tag" verwijderd',
+    'new_tag'                   => 'Maak nieuwe tag',
+    'edit_tag'                  => 'Wijzig tag ":tag"',
+    'updated_tag'               => 'Tag ":tag" geüpdatet',
+    'created_tag'               => 'Tag ":tag" opgeslagen!',
 
     'transaction_journal_information'       => 'Transactieinformatie',
     'transaction_journal_meta'              => 'Metainformatie',
@@ -899,6 +899,14 @@ return [
     'overview_for_link'                     => 'Overzicht voor koppeltype ":name"',
     'delete_journal_link'                   => 'Verwijder de koppeling tussen <a href=":source_link">:source</a> en <a href=":destination_link">:destination</a>',
     'deleted_link'                          => 'Koppeling verwijderd',
+    '1_outward'                             => 'relates to',
+    '2_outward'                             => '(partially) refunds',
+    '3_outward'                             => '(partially) pays for',
+    '4_outward'                             => '(partially) reimburses',
+    '1_inward'                              => 'relates to',
+    '2_inward'                              => 'is (partially) refunded by',
+    '3_inward'                              => 'is (partially) paid for by',
+    '4_inward'                              => 'is (partially) reimbursed by',
 
 
     // split a transaction:

From 90c4f449e83571b171183eff7aa7ff423fa21083 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Fri, 25 Aug 2017 16:10:53 +0200
Subject: [PATCH 359/668] New translations firefly.php (Portuguese, Brazilian)

---
 resources/lang/pt_BR/firefly.php | 64 ++++++++++++++++++--------------
 1 file changed, 36 insertions(+), 28 deletions(-)

diff --git a/resources/lang/pt_BR/firefly.php b/resources/lang/pt_BR/firefly.php
index 4b99a70477..43f0b91b58 100644
--- a/resources/lang/pt_BR/firefly.php
+++ b/resources/lang/pt_BR/firefly.php
@@ -804,36 +804,36 @@ return [
     'remove_money_from_piggy_title'              => 'Retire o dinheiro do cofrinho ":name"',
     'add'                                        => 'Adicionar',
 
-    'remove'                     => 'Remover',
-    'max_amount_add'             => 'É a quantidade máxima que você pode adicionar é',
-    'max_amount_remove'          => 'É a quantidade máxima que você pode remover é',
-    'update_piggy_button'        => 'Atualizar cofrinho',
-    'update_piggy_title'         => 'Atualizar cofrinho ":name"',
-    'updated_piggy_bank'         => 'Cofrinho ":name" atualizado',
-    'details'                    => 'Detalhes',
-    'events'                     => 'Eventos',
-    'target_amount'              => 'Valor alvo',
-    'start_date'                 => 'Data de Início',
-    'target_date'                => 'Data Alvo',
-    'no_target_date'             => 'Nenhum data',
-    'table'                      => 'Tabela',
-    'delete_piggy_bank'          => 'Apagar cofrinho ":name"',
-    'cannot_add_amount_piggy'    => 'Não foi possível adicionar :amount a ":name".',
-    'cannot_remove_from_piggy'   => 'Could not remove :amount from ":name".',
-    'deleted_piggy_bank'         => 'Apagar cofrinho ":name"',
-    'added_amount_to_piggy'      => 'Adicionado :amount de ":name"',
-    'removed_amount_from_piggy'  => 'Removido :amount de ":name"',
+    'remove'                    => 'Remover',
+    'max_amount_add'            => 'É a quantidade máxima que você pode adicionar é',
+    'max_amount_remove'         => 'É a quantidade máxima que você pode remover é',
+    'update_piggy_button'       => 'Atualizar cofrinho',
+    'update_piggy_title'        => 'Atualizar cofrinho ":name"',
+    'updated_piggy_bank'        => 'Cofrinho ":name" atualizado',
+    'details'                   => 'Detalhes',
+    'events'                    => 'Eventos',
+    'target_amount'             => 'Valor alvo',
+    'start_date'                => 'Data de Início',
+    'target_date'               => 'Data Alvo',
+    'no_target_date'            => 'Nenhum data',
+    'table'                     => 'Tabela',
+    'delete_piggy_bank'         => 'Apagar cofrinho ":name"',
+    'cannot_add_amount_piggy'   => 'Não foi possível adicionar :amount a ":name".',
+    'cannot_remove_from_piggy'  => 'Could not remove :amount from ":name".',
+    'deleted_piggy_bank'        => 'Apagar cofrinho ":name"',
+    'added_amount_to_piggy'     => 'Adicionado :amount de ":name"',
+    'removed_amount_from_piggy' => 'Removido :amount de ":name"',
 
     // tags
-    'regular_tag'                => 'Apenas uma tag regular.',
-    'balancing_act'              => 'A tag leva no máximo duas transações; um gasto e uma transferência. Eles vão equilibrar um ao outro.',
-    'advance_payment'            => 'A tag aceita uma despesa e qualquer número de depósitos destinados para pagar a despesa original.',
-    'delete_tag'                 => 'Apagar tag ":tag"',
-    'deleted_tag'                => 'Apagar tag ":tag"',
-    'new_tag'                    => 'Fazer nova tag',
-    'edit_tag'                   => 'Editar tag ":tag"',
-    'updated_tag'                => 'Tag atualizada ":tag"',
-    'created_tag'                => 'Tag ":tag" foi criada!',
+    'regular_tag'               => 'Apenas uma tag regular.',
+    'balancing_act'             => 'A tag leva no máximo duas transações; um gasto e uma transferência. Eles vão equilibrar um ao outro.',
+    'advance_payment'           => 'A tag aceita uma despesa e qualquer número de depósitos destinados para pagar a despesa original.',
+    'delete_tag'                => 'Apagar tag ":tag"',
+    'deleted_tag'               => 'Apagar tag ":tag"',
+    'new_tag'                   => 'Fazer nova tag',
+    'edit_tag'                  => 'Editar tag ":tag"',
+    'updated_tag'               => 'Tag atualizada ":tag"',
+    'created_tag'               => 'Tag ":tag" foi criada!',
 
     'transaction_journal_information'       => 'Informação da transação',
     'transaction_journal_meta'              => 'Meta-informação',
@@ -899,6 +899,14 @@ return [
     'overview_for_link'                     => 'Overview for link type ":name"',
     'delete_journal_link'                   => 'Delete the link between <a href=":source_link">:source</a> and <a href=":destination_link">:destination</a>',
     'deleted_link'                          => 'Deleted link',
+    '1_outward'                             => 'relates to',
+    '2_outward'                             => '(partially) refunds',
+    '3_outward'                             => '(partially) pays for',
+    '4_outward'                             => '(partially) reimburses',
+    '1_inward'                              => 'relates to',
+    '2_inward'                              => 'is (partially) refunded by',
+    '3_inward'                              => 'is (partially) paid for by',
+    '4_inward'                              => 'is (partially) reimbursed by',
 
 
     // split a transaction:

From d6b664375ebeba7313a4aea67eea5d9e3cee85d5 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Fri, 25 Aug 2017 16:10:56 +0200
Subject: [PATCH 360/668] New translations firefly.php (Slovenian)

---
 resources/lang/sl_SI/firefly.php | 64 ++++++++++++++++++--------------
 1 file changed, 36 insertions(+), 28 deletions(-)

diff --git a/resources/lang/sl_SI/firefly.php b/resources/lang/sl_SI/firefly.php
index 719fa02e72..725e42692b 100644
--- a/resources/lang/sl_SI/firefly.php
+++ b/resources/lang/sl_SI/firefly.php
@@ -804,36 +804,36 @@ return [
     'remove_money_from_piggy_title'              => 'Remove money from piggy bank ":name"',
     'add'                                        => 'Add',
 
-    'remove'                     => 'Remove',
-    'max_amount_add'             => 'The maximum amount you can add is',
-    'max_amount_remove'          => 'The maximum amount you can remove is',
-    'update_piggy_button'        => 'Update piggy bank',
-    'update_piggy_title'         => 'Update piggy bank ":name"',
-    'updated_piggy_bank'         => 'Updated piggy bank ":name"',
-    'details'                    => 'Details',
-    'events'                     => 'Events',
-    'target_amount'              => 'Target amount',
-    'start_date'                 => 'Start date',
-    'target_date'                => 'Target date',
-    'no_target_date'             => 'No target date',
-    'table'                      => 'Table',
-    'delete_piggy_bank'          => 'Delete piggy bank ":name"',
-    'cannot_add_amount_piggy'    => 'Could not add :amount to ":name".',
-    'cannot_remove_from_piggy'   => 'Could not remove :amount from ":name".',
-    'deleted_piggy_bank'         => 'Deleted piggy bank ":name"',
-    'added_amount_to_piggy'      => 'Added :amount to ":name"',
-    'removed_amount_from_piggy'  => 'Removed :amount from ":name"',
+    'remove'                    => 'Remove',
+    'max_amount_add'            => 'The maximum amount you can add is',
+    'max_amount_remove'         => 'The maximum amount you can remove is',
+    'update_piggy_button'       => 'Update piggy bank',
+    'update_piggy_title'        => 'Update piggy bank ":name"',
+    'updated_piggy_bank'        => 'Updated piggy bank ":name"',
+    'details'                   => 'Details',
+    'events'                    => 'Events',
+    'target_amount'             => 'Target amount',
+    'start_date'                => 'Start date',
+    'target_date'               => 'Target date',
+    'no_target_date'            => 'No target date',
+    'table'                     => 'Table',
+    'delete_piggy_bank'         => 'Delete piggy bank ":name"',
+    'cannot_add_amount_piggy'   => 'Could not add :amount to ":name".',
+    'cannot_remove_from_piggy'  => 'Could not remove :amount from ":name".',
+    'deleted_piggy_bank'        => 'Deleted piggy bank ":name"',
+    'added_amount_to_piggy'     => 'Added :amount to ":name"',
+    'removed_amount_from_piggy' => 'Removed :amount from ":name"',
 
     // tags
-    'regular_tag'                => 'Just a regular tag.',
-    'balancing_act'              => 'The tag takes at most two transactions; an expense and a transfer. They\'ll balance each other out.',
-    'advance_payment'            => 'The tag accepts one expense and any number of deposits aimed to repay the original expense.',
-    'delete_tag'                 => 'Delete tag ":tag"',
-    'deleted_tag'                => 'Deleted tag ":tag"',
-    'new_tag'                    => 'Make new tag',
-    'edit_tag'                   => 'Edit tag ":tag"',
-    'updated_tag'                => 'Updated tag ":tag"',
-    'created_tag'                => 'Tag ":tag" has been created!',
+    'regular_tag'               => 'Just a regular tag.',
+    'balancing_act'             => 'The tag takes at most two transactions; an expense and a transfer. They\'ll balance each other out.',
+    'advance_payment'           => 'The tag accepts one expense and any number of deposits aimed to repay the original expense.',
+    'delete_tag'                => 'Delete tag ":tag"',
+    'deleted_tag'               => 'Deleted tag ":tag"',
+    'new_tag'                   => 'Make new tag',
+    'edit_tag'                  => 'Edit tag ":tag"',
+    'updated_tag'               => 'Updated tag ":tag"',
+    'created_tag'               => 'Tag ":tag" has been created!',
 
     'transaction_journal_information'       => 'Transaction information',
     'transaction_journal_meta'              => 'Meta information',
@@ -899,6 +899,14 @@ return [
     'overview_for_link'                     => 'Overview for link type ":name"',
     'delete_journal_link'                   => 'Delete the link between <a href=":source_link">:source</a> and <a href=":destination_link">:destination</a>',
     'deleted_link'                          => 'Deleted link',
+    '1_outward'                             => 'relates to',
+    '2_outward'                             => '(partially) refunds',
+    '3_outward'                             => '(partially) pays for',
+    '4_outward'                             => '(partially) reimburses',
+    '1_inward'                              => 'relates to',
+    '2_inward'                              => 'is (partially) refunded by',
+    '3_inward'                              => 'is (partially) paid for by',
+    '4_inward'                              => 'is (partially) reimbursed by',
 
 
     // split a transaction:

From eb331104df0d5b99e77461feb30dcfc2a0e63fc0 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Fri, 25 Aug 2017 16:11:01 +0200
Subject: [PATCH 361/668] New translations firefly.php (Spanish)

---
 resources/lang/es_ES/firefly.php | 64 ++++++++++++++++++--------------
 1 file changed, 36 insertions(+), 28 deletions(-)

diff --git a/resources/lang/es_ES/firefly.php b/resources/lang/es_ES/firefly.php
index b427e5317f..0eb7ac268f 100644
--- a/resources/lang/es_ES/firefly.php
+++ b/resources/lang/es_ES/firefly.php
@@ -804,36 +804,36 @@ return [
     'remove_money_from_piggy_title'              => 'Remove money from piggy bank ":name"',
     'add'                                        => 'Add',
 
-    'remove'                     => 'Remove',
-    'max_amount_add'             => 'The maximum amount you can add is',
-    'max_amount_remove'          => 'The maximum amount you can remove is',
-    'update_piggy_button'        => 'Update piggy bank',
-    'update_piggy_title'         => 'Update piggy bank ":name"',
-    'updated_piggy_bank'         => 'Updated piggy bank ":name"',
-    'details'                    => 'Details',
-    'events'                     => 'Events',
-    'target_amount'              => 'Target amount',
-    'start_date'                 => 'Start date',
-    'target_date'                => 'Target date',
-    'no_target_date'             => 'No target date',
-    'table'                      => 'Table',
-    'delete_piggy_bank'          => 'Delete piggy bank ":name"',
-    'cannot_add_amount_piggy'    => 'Could not add :amount to ":name".',
-    'cannot_remove_from_piggy'   => 'Could not remove :amount from ":name".',
-    'deleted_piggy_bank'         => 'Deleted piggy bank ":name"',
-    'added_amount_to_piggy'      => 'Added :amount to ":name"',
-    'removed_amount_from_piggy'  => 'Removed :amount from ":name"',
+    'remove'                    => 'Remove',
+    'max_amount_add'            => 'The maximum amount you can add is',
+    'max_amount_remove'         => 'The maximum amount you can remove is',
+    'update_piggy_button'       => 'Update piggy bank',
+    'update_piggy_title'        => 'Update piggy bank ":name"',
+    'updated_piggy_bank'        => 'Updated piggy bank ":name"',
+    'details'                   => 'Details',
+    'events'                    => 'Events',
+    'target_amount'             => 'Target amount',
+    'start_date'                => 'Start date',
+    'target_date'               => 'Target date',
+    'no_target_date'            => 'No target date',
+    'table'                     => 'Table',
+    'delete_piggy_bank'         => 'Delete piggy bank ":name"',
+    'cannot_add_amount_piggy'   => 'Could not add :amount to ":name".',
+    'cannot_remove_from_piggy'  => 'Could not remove :amount from ":name".',
+    'deleted_piggy_bank'        => 'Deleted piggy bank ":name"',
+    'added_amount_to_piggy'     => 'Added :amount to ":name"',
+    'removed_amount_from_piggy' => 'Removed :amount from ":name"',
 
     // tags
-    'regular_tag'                => 'Just a regular tag.',
-    'balancing_act'              => 'The tag takes at most two transactions; an expense and a transfer. They\'ll balance each other out.',
-    'advance_payment'            => 'The tag accepts one expense and any number of deposits aimed to repay the original expense.',
-    'delete_tag'                 => 'Delete tag ":tag"',
-    'deleted_tag'                => 'Deleted tag ":tag"',
-    'new_tag'                    => 'Make new tag',
-    'edit_tag'                   => 'Edit tag ":tag"',
-    'updated_tag'                => 'Updated tag ":tag"',
-    'created_tag'                => 'Tag ":tag" has been created!',
+    'regular_tag'               => 'Just a regular tag.',
+    'balancing_act'             => 'The tag takes at most two transactions; an expense and a transfer. They\'ll balance each other out.',
+    'advance_payment'           => 'The tag accepts one expense and any number of deposits aimed to repay the original expense.',
+    'delete_tag'                => 'Delete tag ":tag"',
+    'deleted_tag'               => 'Deleted tag ":tag"',
+    'new_tag'                   => 'Make new tag',
+    'edit_tag'                  => 'Edit tag ":tag"',
+    'updated_tag'               => 'Updated tag ":tag"',
+    'created_tag'               => 'Tag ":tag" has been created!',
 
     'transaction_journal_information'       => 'Transaction information',
     'transaction_journal_meta'              => 'Meta information',
@@ -899,6 +899,14 @@ return [
     'overview_for_link'                     => 'Overview for link type ":name"',
     'delete_journal_link'                   => 'Delete the link between <a href=":source_link">:source</a> and <a href=":destination_link">:destination</a>',
     'deleted_link'                          => 'Deleted link',
+    '1_outward'                             => 'relates to',
+    '2_outward'                             => '(partially) refunds',
+    '3_outward'                             => '(partially) pays for',
+    '4_outward'                             => '(partially) reimburses',
+    '1_inward'                              => 'relates to',
+    '2_inward'                              => 'is (partially) refunded by',
+    '3_inward'                              => 'is (partially) paid for by',
+    '4_inward'                              => 'is (partially) reimbursed by',
 
 
     // split a transaction:

From 4e6e7c0562e1abad7d3825fe1b1741a204ba1be8 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Fri, 25 Aug 2017 16:30:41 +0200
Subject: [PATCH 362/668] New translations firefly.php (Dutch)

---
 resources/lang/nl_NL/firefly.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/resources/lang/nl_NL/firefly.php b/resources/lang/nl_NL/firefly.php
index 87ce295c76..8c8e0209b9 100644
--- a/resources/lang/nl_NL/firefly.php
+++ b/resources/lang/nl_NL/firefly.php
@@ -899,14 +899,14 @@ return [
     'overview_for_link'                     => 'Overzicht voor koppeltype ":name"',
     'delete_journal_link'                   => 'Verwijder de koppeling tussen <a href=":source_link">:source</a> en <a href=":destination_link">:destination</a>',
     'deleted_link'                          => 'Koppeling verwijderd',
-    '1_outward'                             => 'relates to',
-    '2_outward'                             => '(partially) refunds',
-    '3_outward'                             => '(partially) pays for',
-    '4_outward'                             => '(partially) reimburses',
-    '1_inward'                              => 'relates to',
-    '2_inward'                              => 'is (partially) refunded by',
-    '3_inward'                              => 'is (partially) paid for by',
-    '4_inward'                              => 'is (partially) reimbursed by',
+    '1_outward'                             => 'is gerelateerd aan',
+    '2_outward'                             => 'is een (gedeeltelijke) terugbetaling voor',
+    '3_outward'                             => 'betaalt (deels voor)',
+    '4_outward'                             => 'vergoedt (deels)',
+    '1_inward'                              => 'is gerelateerd aan',
+    '2_inward'                              => 'wordt (deels) terugbetaald door',
+    '3_inward'                              => 'wordt (deels) betaald door',
+    '4_inward'                              => 'wordt (deels) vergoed door',
 
 
     // split a transaction:

From b08eccd076901da3ba565c804327fd832079a4d8 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Fri, 25 Aug 2017 18:30:07 +0200
Subject: [PATCH 363/668] New translations firefly.php (French)

---
 resources/lang/fr_FR/firefly.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/lang/fr_FR/firefly.php b/resources/lang/fr_FR/firefly.php
index 81462ad486..9396acf71a 100644
--- a/resources/lang/fr_FR/firefly.php
+++ b/resources/lang/fr_FR/firefly.php
@@ -899,8 +899,8 @@ return [
     'overview_for_link'                     => 'Overview for link type ":name"',
     'delete_journal_link'                   => 'Delete the link between <a href=":source_link">:source</a> and <a href=":destination_link">:destination</a>',
     'deleted_link'                          => 'Deleted link',
-    '1_outward'                             => 'relates to',
-    '2_outward'                             => '(partially) refunds',
+    '1_outward'                             => 'lié à',
+    '2_outward'                             => 'remboursements (partiellement)',
     '3_outward'                             => '(partially) pays for',
     '4_outward'                             => '(partially) reimburses',
     '1_inward'                              => 'relates to',

From 0f229e4d7b9d04b222134a7b29064b2151b84a22 Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Sat, 26 Aug 2017 06:21:22 +0200
Subject: [PATCH 364/668] Improved extraction of bunq data.

---
 .../Controllers/Import/BankController.php     |   2 +-
 app/Services/Bunq/Object/Alias.php            |  69 ++++++++++
 app/Services/Bunq/Object/Amount.php           |  58 ++++++++
 app/Services/Bunq/Object/Avatar.php           |  23 ++++
 .../Bunq/Object/MonetaryAccountBank.php       | 124 +++++++++++++++++-
 .../Bunq/Object/MonetaryAccountProfile.php    |  43 ++++++
 .../Bunq/Object/MonetaryAccountSetting.php    |  67 ++++++++++
 .../Bunq/Object/NotificationFilter.php        |  32 +++++
 app/Services/Bunq/Object/UserCompany.php      |  10 ++
 .../Request/ListMonetaryAccountRequest.php    |  79 +++++++++++
 .../Import/Information/BunqInformation.php    | 101 +++++++++++---
 .../Information/InformationInterface.php      |  14 +-
 .../Prerequisites/BunqPrerequisites.php       |   3 +-
 config/firefly.php                            |   2 +-
 14 files changed, 605 insertions(+), 22 deletions(-)
 create mode 100644 app/Services/Bunq/Object/Alias.php
 create mode 100644 app/Services/Bunq/Object/Amount.php
 create mode 100644 app/Services/Bunq/Object/Avatar.php
 create mode 100644 app/Services/Bunq/Object/MonetaryAccountProfile.php
 create mode 100644 app/Services/Bunq/Object/MonetaryAccountSetting.php
 create mode 100644 app/Services/Bunq/Object/NotificationFilter.php
 create mode 100644 app/Services/Bunq/Request/ListMonetaryAccountRequest.php

diff --git a/app/Http/Controllers/Import/BankController.php b/app/Http/Controllers/Import/BankController.php
index d54fa5726d..d8a0279063 100644
--- a/app/Http/Controllers/Import/BankController.php
+++ b/app/Http/Controllers/Import/BankController.php
@@ -34,7 +34,7 @@ class BankController extends Controller
         $object->setUser(auth()->user());
 
         if ($object->hasPrerequisites()) {
-            return redirect(route('import.banq.prerequisites', [$bank]));
+            return redirect(route('import.bank.prerequisites', [$bank]));
         }
         $class = config(sprintf('firefly.import_info.%s', $bank));
         /** @var InformationInterface $object */
diff --git a/app/Services/Bunq/Object/Alias.php b/app/Services/Bunq/Object/Alias.php
new file mode 100644
index 0000000000..7d1703eabc
--- /dev/null
+++ b/app/Services/Bunq/Object/Alias.php
@@ -0,0 +1,69 @@
+<?php
+/**
+ * Alias.php
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Services\Bunq\Object;
+
+/**
+ * Class Alias
+ *
+ * @package FireflyIII\Services\Bunq\Object
+ */
+class Alias extends BunqObject
+{
+    /** @var string */
+    private $name = '';
+    /** @var string */
+    private $type = '';
+    /** @var string */
+    private $value = '';
+
+    /**
+     * Alias constructor.
+     *
+     * @param array $data
+     */
+    public function __construct(array $data)
+    {
+        $this->type  = $data['type'];
+        $this->name  = $data['name'];
+        $this->value = $data['value'];
+
+        return;
+    }
+
+    /**
+     * @return string
+     */
+    public function getName(): string
+    {
+        return $this->name;
+    }
+
+    /**
+     * @return string
+     */
+    public function getType(): string
+    {
+        return $this->type;
+    }
+
+    /**
+     * @return string
+     */
+    public function getValue(): string
+    {
+        return $this->value;
+    }
+
+
+
+}
\ No newline at end of file
diff --git a/app/Services/Bunq/Object/Amount.php b/app/Services/Bunq/Object/Amount.php
new file mode 100644
index 0000000000..857e85f304
--- /dev/null
+++ b/app/Services/Bunq/Object/Amount.php
@@ -0,0 +1,58 @@
+<?php
+/**
+ * Currency.php
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Services\Bunq\Object;
+
+/**
+ * Class Amount
+ *
+ * @package FireflyIII\Services\Bunq\Object
+ */
+class Amount extends BunqObject
+{
+    /** @var string */
+    private $currency = '';
+    /** @var string */
+    private $value = '';
+
+    /**
+     * Amount constructor.
+     *
+     * @param array $data
+     */
+    public function __construct(array $data)
+    {
+        $this->currency = $data['currency'];
+        $this->value    = $data['value'];
+
+        return;
+    }
+
+    /**
+     * @return string
+     */
+    public function getCurrency(): string
+    {
+        return $this->currency;
+    }
+
+    /**
+     * @return string
+     */
+    public function getValue(): string
+    {
+        return $this->value;
+    }
+
+
+
+}
\ No newline at end of file
diff --git a/app/Services/Bunq/Object/Avatar.php b/app/Services/Bunq/Object/Avatar.php
new file mode 100644
index 0000000000..adfc41cde6
--- /dev/null
+++ b/app/Services/Bunq/Object/Avatar.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * Avatar.php
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Services\Bunq\Object;
+
+/**
+ * Class Avatar
+ *
+ * @package FireflyIII\Services\Bunq\Object
+ */
+class Avatar extends BunqObject
+{
+
+}
\ No newline at end of file
diff --git a/app/Services/Bunq/Object/MonetaryAccountBank.php b/app/Services/Bunq/Object/MonetaryAccountBank.php
index 2642d0ac5f..0295983581 100644
--- a/app/Services/Bunq/Object/MonetaryAccountBank.php
+++ b/app/Services/Bunq/Object/MonetaryAccountBank.php
@@ -12,6 +12,8 @@ declare(strict_types=1);
 
 namespace FireflyIII\Services\Bunq\Object;
 
+use Carbon\Carbon;
+
 /**
  * Class MonetaryAccountBank
  *
@@ -19,13 +21,133 @@ namespace FireflyIII\Services\Bunq\Object;
  */
 class MonetaryAccountBank extends BunqObject
 {
+    /** @var array */
+    private $aliases = [];
+    /** @var  Avatar */
+    private $avatar;
+    /** @var  Amount */
+    private $balance;
+    /** @var Carbon */
+    private $created;
+    /** @var string */
+    private $currency = '';
+    /** @var  Amount */
+    private $dailyLimit;
+    /** @var  Amount */
+    private $dailySpent;
+    /** @var string */
+    private $description = '';
+    /** @var int */
+    private $id = 0;
+    /** @var  MonetaryAccountProfile */
+    private $monetaryAccountProfile;
+    /** @var array */
+    private $notificationFilters = [];
+    /** @var  Amount */
+    private $overdraftLimit;
+    /** @var string */
+    private $publicUuid = '';
+    /** @var string */
+    private $reason = '';
+    /** @var string */
+    private $reasonDescription = '';
+    /** @var  MonetaryAccountSetting */
+    private $setting;
+    /** @var string */
+    private $status = '';
+    /** @var string */
+    private $subStatus = '';
+    /** @var Carbon */
+    private $updated;
+    /** @var int */
+    private $userId = 0;
+
+    /**
+     * @return string
+     */
+    public function getDescription(): string
+    {
+        return $this->description;
+    }
+
+    /**
+     * @return int
+     */
+    public function getId(): int
+    {
+        return $this->id;
+    }
+
+    /**
+     * @return array
+     */
+    public function getAliases(): array
+    {
+        return $this->aliases;
+    }
+
+    /**
+     * @return string
+     */
+    public function getCurrency(): string
+    {
+        return $this->currency;
+    }
+
+    /**
+     * @return Amount
+     */
+    public function getBalance(): Amount
+    {
+        return $this->balance;
+    }
+
+    /**
+     * @return MonetaryAccountSetting
+     */
+    public function getSetting(): MonetaryAccountSetting
+    {
+        return $this->setting;
+    }
+
+
+
     /**
      * MonetaryAccountBank constructor.
      *
      * @param array $data
      */
-    public function __construct(array $data) {
+    public function __construct(array $data)
+    {
+        $this->id                     = $data['id'];
+        $this->created                = Carbon::createFromFormat('Y-m-d H:i:s.u', $data['created']);
+        $this->updated                = Carbon::createFromFormat('Y-m-d H:i:s.u', $data['updated']);
+        $this->balance                = new Amount($data['balance']);
+        $this->currency               = $data['currency'];
+        $this->dailyLimit             = new Amount($data['daily_limit']);
+        $this->dailySpent             = new Amount($data['daily_spent']);
+        $this->description            = $data['description'];
+        $this->publicUuid             = $data['public_uuid'];
+        $this->status                 = $data['status'];
+        $this->subStatus              = $data['sub_status'];
+        $this->userId                 = $data['user_id'];
+        $this->status                 = $data['status'];
+        $this->subStatus              = $data['sub_status'];
+        $this->monetaryAccountProfile = new MonetaryAccountProfile($data['monetary_account_profile']);
+        $this->setting                = new MonetaryAccountSetting($data['setting']);
+        $this->overdraftLimit         = new Amount($data['overdraft_limit']);
 
+        $this->publicUuid = $data['public_uuid'];
+
+        // create aliases:
+        foreach ($data['alias'] as $alias) {
+            $this->aliases[] = new Alias($alias);
+        }
+        foreach ($data['notification_filters'] as $filter) {
+            $this->notificationFilters = new NotificationFilter($filter);
+        }
+
+        return;
     }
 
 }
\ No newline at end of file
diff --git a/app/Services/Bunq/Object/MonetaryAccountProfile.php b/app/Services/Bunq/Object/MonetaryAccountProfile.php
new file mode 100644
index 0000000000..e4995ea19c
--- /dev/null
+++ b/app/Services/Bunq/Object/MonetaryAccountProfile.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ * MonetaryAccountProfile.php
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Services\Bunq\Object;
+
+/**
+ * Class MonetaryAccountProfile
+ *
+ * @package FireflyIII\Services\Bunq\Object
+ */
+class MonetaryAccountProfile extends BunqObject
+{
+    /** @var string */
+    private $profileActionRequired = '';
+    /** @var  Amount */
+    private $profileAmountRequired;
+    private $profileDrain;
+    private $profileFill;
+
+    /**
+     * MonetaryAccountProfile constructor.
+     *
+     * @param array $data
+     */
+    public function __construct(array $data)
+    {
+        $this->profileDrain          = null;
+        $this->profileFill           = null;
+        $this->profileActionRequired = $data['profile_action_required'];
+        $this->profileAmountRequired = new Amount($data['profile_amount_required']);
+        return;
+    }
+
+}
\ No newline at end of file
diff --git a/app/Services/Bunq/Object/MonetaryAccountSetting.php b/app/Services/Bunq/Object/MonetaryAccountSetting.php
new file mode 100644
index 0000000000..e1277c3dbc
--- /dev/null
+++ b/app/Services/Bunq/Object/MonetaryAccountSetting.php
@@ -0,0 +1,67 @@
+<?php
+/**
+ * MonetaryAccountSetting.php
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Services\Bunq\Object;
+
+/**
+ * Class MonetaryAccountSetting
+ *
+ * @package FireflyIII\Services\Bunq\Object
+ */
+class MonetaryAccountSetting extends BunqObject
+{
+    /** @var string */
+    private $color = '';
+    /** @var string */
+    private $defaultAvatarStatus = '';
+    /** @var string */
+    private $restrictionChat = '';
+
+    /**
+     * MonetaryAccountSetting constructor.
+     *
+     * @param array $data
+     */
+    public function __construct(array $data)
+    {
+        $this->color               = $data['color'];
+        $this->defaultAvatarStatus = $data['default_avatar_status'];
+        $this->restrictionChat     = $data['restriction_chat'];
+        return;
+    }
+
+    /**
+     * @return string
+     */
+    public function getColor(): string
+    {
+        return $this->color;
+    }
+
+    /**
+     * @return string
+     */
+    public function getDefaultAvatarStatus(): string
+    {
+        return $this->defaultAvatarStatus;
+    }
+
+    /**
+     * @return string
+     */
+    public function getRestrictionChat(): string
+    {
+        return $this->restrictionChat;
+    }
+
+
+}
\ No newline at end of file
diff --git a/app/Services/Bunq/Object/NotificationFilter.php b/app/Services/Bunq/Object/NotificationFilter.php
new file mode 100644
index 0000000000..f12843c159
--- /dev/null
+++ b/app/Services/Bunq/Object/NotificationFilter.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * NotificationFilter.php
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Services\Bunq\Object;
+
+/**
+ * Class NotificationFilter
+ *
+ * @package FireflyIII\Services\Bunq\Object
+ */
+class NotificationFilter extends BunqObject
+{
+    /**
+     * NotificationFilter constructor.
+     *
+     * @param array $data
+     */
+    public function __construct(array $data) {
+        var_dump($data);
+        exit;
+    }
+
+}
\ No newline at end of file
diff --git a/app/Services/Bunq/Object/UserCompany.php b/app/Services/Bunq/Object/UserCompany.php
index c0c861f947..57c250773a 100644
--- a/app/Services/Bunq/Object/UserCompany.php
+++ b/app/Services/Bunq/Object/UserCompany.php
@@ -94,4 +94,14 @@ class UserCompany extends BunqObject
 
     }
 
+    /**
+     * @return int
+     */
+    public function getId(): int
+    {
+        return $this->id;
+    }
+
+
+
 }
\ No newline at end of file
diff --git a/app/Services/Bunq/Request/ListMonetaryAccountRequest.php b/app/Services/Bunq/Request/ListMonetaryAccountRequest.php
new file mode 100644
index 0000000000..8022149b71
--- /dev/null
+++ b/app/Services/Bunq/Request/ListMonetaryAccountRequest.php
@@ -0,0 +1,79 @@
+<?php
+/**
+ * ListMonetaryAccountRequest.php
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Services\Bunq\Request;
+
+use FireflyIII\Services\Bunq\Object\MonetaryAccountBank;
+use FireflyIII\Services\Bunq\Token\SessionToken;
+use Illuminate\Support\Collection;
+
+/**
+ * Class ListMonetaryAccountRequest
+ *
+ * @package FireflyIII\Services\Bunq\Request
+ */
+class ListMonetaryAccountRequest extends BunqRequest
+{
+    /** @var  Collection */
+    private $monetaryAccounts;
+    /** @var  SessionToken */
+    private $sessionToken;
+    /** @var int */
+    private $userId = 0;
+
+    /**
+     * @return Collection
+     */
+    public function getMonetaryAccounts(): Collection
+    {
+        return $this->monetaryAccounts;
+    }
+
+    /**
+     *
+     */
+    public function call(): void
+    {
+        $this->monetaryAccounts                  = new Collection;
+        $uri                                     = sprintf('/v1/user/%d/monetary-account', $this->userId);
+        $data                                    = [];
+        $headers                                 = $this->getDefaultHeaders();
+        $headers['X-Bunq-Client-Authentication'] = $this->sessionToken->getToken();
+        $response                                = $this->sendSignedBunqGet($uri, $data, $headers);
+
+        // create device server objects:
+        $raw = $this->getArrayFromResponse('MonetaryAccountBank', $response);
+        foreach ($raw as $entry) {
+            $account = new MonetaryAccountBank($entry);
+            $this->monetaryAccounts->push($account);
+        }
+
+        return;
+    }
+
+    /**
+     * @param SessionToken $sessionToken
+     */
+    public function setSessionToken(SessionToken $sessionToken)
+    {
+        $this->sessionToken = $sessionToken;
+    }
+
+    /**
+     * @param int $userId
+     */
+    public function setUserId(int $userId)
+    {
+        $this->userId = $userId;
+    }
+
+}
\ No newline at end of file
diff --git a/app/Support/Import/Information/BunqInformation.php b/app/Support/Import/Information/BunqInformation.php
index 3c41800fa1..9acf363f2e 100644
--- a/app/Support/Import/Information/BunqInformation.php
+++ b/app/Support/Import/Information/BunqInformation.php
@@ -12,8 +12,12 @@ declare(strict_types=1);
 
 namespace FireflyIII\Support\Import\Information;
 
+use FireflyIII\Exceptions\FireflyException;
+use FireflyIII\Services\Bunq\Object\Alias;
+use FireflyIII\Services\Bunq\Object\MonetaryAccountBank;
 use FireflyIII\Services\Bunq\Request\DeleteDeviceSessionRequest;
 use FireflyIII\Services\Bunq\Request\DeviceSessionRequest;
+use FireflyIII\Services\Bunq\Request\ListMonetaryAccountRequest;
 use FireflyIII\Services\Bunq\Request\ListUserRequest;
 use FireflyIII\Services\Bunq\Token\SessionToken;
 use FireflyIII\User;
@@ -35,20 +39,52 @@ class BunqInformation implements InformationInterface
     /**
      * Returns a collection of accounts. Preferrably, these follow a uniform Firefly III format so they can be managed over banks.
      *
-     * @return Collection
+     * The format for these bank accounts is basically this:
+     *
+     * id: bank specific id
+     * name: bank appointed name
+     * number: account number (usually IBAN)
+     * currency: ISO code of currency
+     * balance: current balance
+     *
+     *
+     * any other fields are optional but can be useful:
+     * image: logo or account specific thing
+     * color: any associated color.
+     *
+     * @return array
      */
-    public function getAccounts(): Collection
+    public function getAccounts(): array
     {
         Log::debug('Now in getAccounts()');
         $sessionToken = $this->startSession();
-        $this->getUserInformation($sessionToken);
+        $id           = $this->getUserInformation($sessionToken);
 
         // get list of Bunq accounts:
+        $accounts = $this->getMonetaryAccounts($sessionToken, $id);
+        $return   = [];
+        /** @var MonetaryAccountBank $account */
+        foreach ($accounts as $account) {
+            $current = [
+                'id'       => $account->getId(),
+                'name'     => $account->getDescription(),
+                'currency' => $account->getCurrency(),
+                'balance'  => $account->getBalance()->getValue(),
+                'color'    => $account->getSetting()->getColor(),
 
+            ];
+            /** @var Alias $alias */
+            foreach ($account->getAliases() as $alias) {
+                if ($alias->getType() === 'IBAN') {
+                    $current['number'] = $alias->getValue();
+                }
+            }
+            $return[] = $current;
+        }
 
         $this->closeSession($sessionToken);
 
-        return new Collection;
+        return $return;
     }
 
     /**
@@ -78,19 +114,49 @@ class BunqInformation implements InformationInterface
         $request->setServerPublicKey($serverPublicKey);
         $request->setSessionToken($sessionToken);
         $request->call();
+
         return;
     }
 
     /**
      * @param SessionToken $sessionToken
+     * @param int          $userId
+     *
+     * @return Collection
      */
-    private function getUserInformation(SessionToken $sessionToken): void
+    private function getMonetaryAccounts(SessionToken $sessionToken, int $userId): Collection
     {
-        $apiKey            = Preferences::getForUser($this->user, 'bunq_api_key')->data;
-        $serverPublicKey   = Preferences::getForUser($this->user, 'bunq_server_public_key')->data;
-        $server            = config('firefly.bunq.server');
-        $privateKey        = Preferences::getForUser($this->user, 'bunq_private_key')->data;
-        $request = new ListUserRequest;
+        $apiKey          = Preferences::getForUser($this->user, 'bunq_api_key')->data;
+        $serverPublicKey = Preferences::getForUser($this->user, 'bunq_server_public_key')->data;
+        $server          = config('firefly.bunq.server');
+        $privateKey      = Preferences::getForUser($this->user, 'bunq_private_key')->data;
+        $request         = new ListMonetaryAccountRequest;
+
+        $request->setSessionToken($sessionToken);
+        $request->setSecret($apiKey);
+        $request->setServerPublicKey($serverPublicKey);
+        $request->setServer($server);
+        $request->setPrivateKey($privateKey);
+        $request->setUserId($userId);
+        $request->call();
+
+        return $request->getMonetaryAccounts();
+
+    }
+
+    /**
+     * @param SessionToken $sessionToken
+     *
+     * @return int
+     * @throws FireflyException
+     */
+    private function getUserInformation(SessionToken $sessionToken): int
+    {
+        $apiKey          = Preferences::getForUser($this->user, 'bunq_api_key')->data;
+        $serverPublicKey = Preferences::getForUser($this->user, 'bunq_server_public_key')->data;
+        $server          = config('firefly.bunq.server');
+        $privateKey      = Preferences::getForUser($this->user, 'bunq_private_key')->data;
+        $request         = new ListUserRequest;
         $request->setSessionToken($sessionToken);
         $request->setSecret($apiKey);
         $request->setServerPublicKey($serverPublicKey);
@@ -98,12 +164,15 @@ class BunqInformation implements InformationInterface
         $request->setPrivateKey($privateKey);
         $request->call();
         // return the first that isn't null?
-        // get all objects, try to find ID.
-        var_dump($request->getUserCompany());
-        var_dump($request->getUserLight());
-        var_dump($request->getUserPerson());
-
-        return;
+        $company = $request->getUserCompany();
+        if ($company->getId() > 0) {
+            return $company->getId();
+        }
+        $user = $request->getUserPerson();
+        if ($user->getId() > 0) {
+            return $user->getId();
+        }
+        throw new FireflyException('Expected user or company from Bunq, but got neither.');
     }
 
     /**
diff --git a/app/Support/Import/Information/InformationInterface.php b/app/Support/Import/Information/InformationInterface.php
index a3a8fb6dca..47dbf90ef4 100644
--- a/app/Support/Import/Information/InformationInterface.php
+++ b/app/Support/Import/Information/InformationInterface.php
@@ -33,7 +33,17 @@ interface InformationInterface
     /**
      * Returns a collection of accounts. Preferrably, these follow a uniform Firefly III format so they can be managed over banks.
      *
-     * @return Collection
+     * The format for these bank accounts is basically this:
+     *
+     * id: bank specific id
+     * name: bank appointed name
+     * number: account number (usually IBAN)
+     * currency: ISO code of currency
+     *
+     * any other fields are optional but can be useful:
+     * image: logo or account specific thing
+     *
+     * @return array
      */
-    public function getAccounts(): Collection;
+    public function getAccounts(): array;
 }
\ No newline at end of file
diff --git a/app/Support/Import/Prerequisites/BunqPrerequisites.php b/app/Support/Import/Prerequisites/BunqPrerequisites.php
index 44abdf488b..022d1e44b9 100644
--- a/app/Support/Import/Prerequisites/BunqPrerequisites.php
+++ b/app/Support/Import/Prerequisites/BunqPrerequisites.php
@@ -68,7 +68,8 @@ class BunqPrerequisites implements PrerequisitesInterface
     {
         $apiKey = Preferences::getForUser($this->user, 'bunq_api_key', false);
 
-        return ($apiKey->data === false);
+
+        return ($apiKey->data === false || is_null($apiKey->data));
     }
 
     /**
diff --git a/config/firefly.php b/config/firefly.php
index a31becc9af..51c26ecb91 100644
--- a/config/firefly.php
+++ b/config/firefly.php
@@ -46,7 +46,7 @@ return [
         'bunq' => 'FireflyIII\Support\Import\Information\BunqInformation',
     ],
     'bunq'                       => [
-        'server' => 'https://api.bunq.com',
+        'server' => 'https://sandbox.public.api.bunq.com',
     ],
     'default_export_format'      => 'csv',
     'default_import_format'      => 'csv',

From 7329098ed884ee51cace24730f187f64f63d33f6 Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Sat, 26 Aug 2017 10:00:08 +0200
Subject: [PATCH 365/668] Fix rounding for amounts.

---
 app/Http/Controllers/BillController.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/app/Http/Controllers/BillController.php b/app/Http/Controllers/BillController.php
index 38139d5102..c5ac25fcd3 100644
--- a/app/Http/Controllers/BillController.php
+++ b/app/Http/Controllers/BillController.php
@@ -13,6 +13,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Http\Controllers;
 
+use Amount;
 use Carbon\Carbon;
 use FireflyIII\Helpers\Collector\JournalCollectorInterface;
 use FireflyIII\Http\Requests\BillFormRequest;
@@ -129,6 +130,11 @@ class BillController extends Controller
         if (session('bills.edit.fromUpdate') !== true) {
             $this->rememberPreviousUri('bills.edit.uri');
         }
+
+        $currency         = Amount::getDefaultCurrency();
+        $bill->amount_min = round($bill->amount_min, $currency->decimal_places);
+        $bill->amount_max = round($bill->amount_max, $currency->decimal_places);
+
         $request->session()->forget('bills.edit.fromUpdate');
         $request->session()->flash('gaEventCategory', 'bills');
         $request->session()->flash('gaEventAction', 'edit');

From 094ddfcf5f2eeeedafcfb17e89b56d2b2264d3c8 Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Sat, 26 Aug 2017 10:01:48 +0200
Subject: [PATCH 366/668] Fix rounding for amounts.

---
 app/Http/Controllers/BudgetController.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/Http/Controllers/BudgetController.php b/app/Http/Controllers/BudgetController.php
index 3e051b8b83..26845470c8 100644
--- a/app/Http/Controllers/BudgetController.php
+++ b/app/Http/Controllers/BudgetController.php
@@ -451,6 +451,7 @@ class BudgetController extends Controller
         $end             = session('end', new Carbon);
         $defaultCurrency = Amount::getDefaultCurrency();
         $available       = $this->repository->getAvailableBudget($defaultCurrency, $start, $end);
+        $available       = round($available, $defaultCurrency->decimal_places);
 
 
         return view('budgets.income', compact('available', 'start', 'end'));

From ea2af2378dbe38dada89437fc15e4cda8fb85a40 Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Sat, 26 Aug 2017 14:30:41 +0200
Subject: [PATCH 367/668] Expand budget pages to work with new date view.

---
 app/Http/Controllers/BudgetController.php | 26 +++++++++++------------
 app/Http/Requests/BudgetIncomeRequest.php |  2 ++
 public/js/ff/budgets/index.js             |  9 ++++----
 resources/views/budgets/income.twig       |  2 ++
 resources/views/budgets/index.twig        |  6 +++++-
 routes/web.php                            |  3 ++-
 6 files changed, 28 insertions(+), 20 deletions(-)

diff --git a/app/Http/Controllers/BudgetController.php b/app/Http/Controllers/BudgetController.php
index 26845470c8..e0d7bd983e 100644
--- a/app/Http/Controllers/BudgetController.php
+++ b/app/Http/Controllers/BudgetController.php
@@ -75,11 +75,9 @@ class BudgetController extends Controller
      */
     public function amount(Request $request, Budget $budget)
     {
-        $amount = intval($request->get('amount'));
-        /** @var Carbon $start */
-        $start = session('start', Carbon::now()->startOfMonth());
-        /** @var Carbon $end */
-        $end         = session('end', Carbon::now()->endOfMonth());
+        $amount      = intval($request->get('amount'));
+        $start       = Carbon::createFromFormat('Y-m-d', $request->get('start'));
+        $end         = Carbon::createFromFormat('Y-m-d', $request->get('end'));
         $budgetLimit = $this->repository->updateLimitAmount($budget, $start, $end, $amount);
         if ($amount === 0) {
             $budgetLimit = null;
@@ -243,7 +241,7 @@ class BudgetController extends Controller
             compact(
                 'available', 'currentMonth', 'next', 'nextText', 'prev', 'prevText',
                 'periodStart', 'periodEnd', 'budgetInformation', 'inactive', 'budgets',
-                'spent', 'budgeted', 'previousLoop', 'nextLoop', 'start'
+                'spent', 'budgeted', 'previousLoop', 'nextLoop', 'start', 'end'
             )
         );
     }
@@ -313,15 +311,15 @@ class BudgetController extends Controller
      */
     public function postUpdateIncome(BudgetIncomeRequest $request)
     {
-        $start           = session('start', new Carbon);
-        $end             = session('end', new Carbon);
+        $start           = Carbon::createFromFormat('Y-m-d', $request->string('start'));
+        $end             = Carbon::createFromFormat('Y-m-d', $request->string('end'));
         $defaultCurrency = Amount::getDefaultCurrency();
         $amount          = $request->get('amount');
 
         $this->repository->setAvailableBudget($defaultCurrency, $start, $end, $amount);
         Preferences::mark();
 
-        return redirect(route('budgets.index'));
+        return redirect(route('budgets.index',[$start->format('Y-m-d')]));
     }
 
     /**
@@ -443,17 +441,17 @@ class BudgetController extends Controller
     }
 
     /**
-     * @return View
+     * @param Carbon $start
+     * @param Carbon $end
+     *
+     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
      */
-    public function updateIncome()
+    public function updateIncome(Carbon $start, Carbon $end)
     {
-        $start           = session('start', new Carbon);
-        $end             = session('end', new Carbon);
         $defaultCurrency = Amount::getDefaultCurrency();
         $available       = $this->repository->getAvailableBudget($defaultCurrency, $start, $end);
         $available       = round($available, $defaultCurrency->decimal_places);
 
-
         return view('budgets.income', compact('available', 'start', 'end'));
     }
 
diff --git a/app/Http/Requests/BudgetIncomeRequest.php b/app/Http/Requests/BudgetIncomeRequest.php
index 8af316dd48..7f2375e3b0 100644
--- a/app/Http/Requests/BudgetIncomeRequest.php
+++ b/app/Http/Requests/BudgetIncomeRequest.php
@@ -37,6 +37,8 @@ class BudgetIncomeRequest extends Request
     {
         return [
             'amount' => 'numeric|required|min:0',
+            'start'  => 'required|date|before:end',
+            'end'    => 'required|date|after:start',
         ];
     }
 }
diff --git a/public/js/ff/budgets/index.js b/public/js/ff/budgets/index.js
index 79dd675ecd..df5c8f55e1 100644
--- a/public/js/ff/budgets/index.js
+++ b/public/js/ff/budgets/index.js
@@ -89,7 +89,8 @@ function updateBudgetedAmounts(e) {
         drawBudgetedBar();
 
         // send a post to Firefly to update the amount:
-        $.post('budgets/amount/' + id, {amount: value}).done(function (data) {
+        var newUri = budgetAmountUri.replace("REPLACE", id);
+        $.post(newUri, {amount: value,start: periodStart, end: periodEnd}).done(function (data) {
             // update the link if relevant:
             if (data.repetition > 0) {
                 $('.budget-link[data-id="' + id + '"]').attr('href', 'budgets/show/' + id + '/' + data.repetition);
@@ -120,8 +121,8 @@ $(function () {
     $('.selectPeriod').change(function (e) {
         var sel = $(e.target).val();
         if (sel !== "x") {
-            var newURI = budgetIndexURI.replace("REPLACE", sel);
-            window.location.assign(newURI);
+            var newUri = budgetIndexUri.replace("REPLACE", sel);
+            window.location.assign(newUri);
         }
     });
 
@@ -129,7 +130,7 @@ $(function () {
 
 function updateIncome() {
     "use strict";
-    $('#defaultModal').empty().load('budgets/income', function () {
+    $('#defaultModal').empty().load(updateIncomeUri, function () {
         $('#defaultModal').modal('show');
     });
 
diff --git a/resources/views/budgets/income.twig b/resources/views/budgets/income.twig
index 89e28bd710..50c80832f3 100644
--- a/resources/views/budgets/income.twig
+++ b/resources/views/budgets/income.twig
@@ -12,6 +12,8 @@
         <form style="display: inline;" id="income" action="{{ route('budgets.income.post') }}" method="POST">
             <div class="modal-body">
                 <input type="hidden" name="_token" value="{{ csrf_token() }}"/>
+                <input type="hidden" name="start" value="{{ start.format('Y-m-d') }}"/>
+                <input type="hidden" name="end" value="{{ end.format('Y-m-d') }}"/>
 
                 <div class="input-group">
                     <div class="input-group-addon">{{ getCurrencySymbol()|raw }}</div>
diff --git a/resources/views/budgets/index.twig b/resources/views/budgets/index.twig
index d09f2af40c..030239feef 100644
--- a/resources/views/budgets/index.twig
+++ b/resources/views/budgets/index.twig
@@ -229,7 +229,11 @@
         // budgeted data:
         var budgeted = {{ budgeted }};
         var available = {{ available }};
-        var budgetIndexURI = "{{ route('budgets.index','REPLACE') }}";
+        var budgetIndexUri = "{{ route('budgets.index','REPLACE') }}";
+        var budgetAmountUri = "{{ route('budgets.amount','REPLACE') }}";
+        var updateIncomeUri = "{{ route('budgets.income',[start.format('Y-m-d'),end.format('Y-m-d')]) }}";
+        var periodStart = "{{ start.format('Y-m-d') }}";
+        var periodEnd = "{{ end.format('Y-m-d') }}";
     </script>
     <script type="text/javascript" src="js/lib/bootstrap-sortable.js"></script>
     <script type="text/javascript" src="js/ff/budgets/index.js"></script>
diff --git a/routes/web.php b/routes/web.php
index 99ceda197d..d68231e4bd 100755
--- a/routes/web.php
+++ b/routes/web.php
@@ -136,7 +136,7 @@ Route::group(
  */
 Route::group(
     ['middleware' => 'user-full-auth', 'prefix' => 'budgets', 'as' => 'budgets.'], function () {
-    Route::get('income', ['uses' => 'BudgetController@updateIncome', 'as' => 'income']);
+    Route::get('income/{start_date}/{end_date}', ['uses' => 'BudgetController@updateIncome', 'as' => 'income']);
     Route::get('create', ['uses' => 'BudgetController@create', 'as' => 'create']);
     Route::get('edit/{budget}', ['uses' => 'BudgetController@edit', 'as' => 'edit']);
     Route::get('delete/{budget}', ['uses' => 'BudgetController@delete', 'as' => 'delete']);
@@ -403,6 +403,7 @@ Route::group(
     Route::post('bank/{bank}/prerequisites', ['uses' => 'Import\BankController@postPrerequisites', 'as' => 'bank.prerequisites.post']);
 
     Route::get('bank/{bank}/form', ['uses' => 'Import\BankController@form', 'as' => 'bank.form']);
+    Route::post('bank/{bank}/form', ['uses' => 'Import\BankController@postForm', 'as' => 'bank.form.post']);
 }
 );
 

From 9238efbd3ad34537b029ae4cd47333f7e40b1e53 Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Sat, 26 Aug 2017 14:44:05 +0200
Subject: [PATCH 368/668] Fix tag cloud

---
 app/Http/Controllers/TagController.php | 12 ------------
 app/Repositories/Tag/TagRepository.php | 19 +++++++++++++++++++
 2 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/app/Http/Controllers/TagController.php b/app/Http/Controllers/TagController.php
index 64d1d22701..3a7f9dd1c4 100644
--- a/app/Http/Controllers/TagController.php
+++ b/app/Http/Controllers/TagController.php
@@ -43,9 +43,6 @@ use View;
 class TagController extends Controller
 {
 
-    /** @var array */
-    public $tagOptions = [];
-
     /** @var  TagRepositoryInterface */
     protected $repository;
 
@@ -60,17 +57,8 @@ class TagController extends Controller
         $this->middleware(
             function ($request, $next) {
                 $this->repository = app(TagRepositoryInterface::class);
-                $this->tagOptions = [
-                    'nothing'        => trans('firefly.regular_tag'),
-                    'balancingAct'   => trans('firefly.balancing_act'),
-                    'advancePayment' => trans('firefly.advance_payment'),
-                ];
-
-
                 View::share('title', strval(trans('firefly.tags')));
                 View::share('mainTitleIcon', 'fa-tags');
-                View::share('tagOptions', $this->tagOptions);
-
 
                 return $next($request);
             }
diff --git a/app/Repositories/Tag/TagRepository.php b/app/Repositories/Tag/TagRepository.php
index d48d277ea6..4a5b350a27 100644
--- a/app/Repositories/Tag/TagRepository.php
+++ b/app/Repositories/Tag/TagRepository.php
@@ -275,17 +275,23 @@ class TagRepository implements TagRepositoryInterface
         $max    = 0;
         $query  = $this->user->tags();
         $return = [];
+        Log::debug('Going to build tag-cloud');
         if (!is_null($year)) {
+            Log::debug(sprintf('Year is not null: %d', $year));
             $start = $year . '-01-01';
             $end   = $year . '-12-31';
             $query->where('date', '>=', $start)->where('date', '<=', $end);
         }
         if (is_null($year)) {
             $query->whereNull('date');
+            Log::debug('Year is NULL');
         }
         $tags      = $query->orderBy('id', 'desc')->get();
         $temporary = [];
+        Log::debug(sprintf('Found %d tags', $tags->count()));
+        /** @var Tag $tag */
         foreach ($tags as $tag) {
+
             $amount      = floatval($this->sumOfTag($tag, null, null));
             $min         = $amount < $min || is_null($min) ? $amount : $min;
             $max         = $amount > $max ? $amount : $max;
@@ -293,6 +299,8 @@ class TagRepository implements TagRepositoryInterface
                 'amount' => $amount,
                 'tag'    => $tag,
             ];
+            Log::debug(sprintf('Now working on tag %s with total amount %s', $tag->tag, $amount));
+            Log::debug(sprintf('Minimum is now %f, maximum is %f', $min, $max));
         }
         /** @var array $entry */
         foreach ($temporary as $entry) {
@@ -304,6 +312,8 @@ class TagRepository implements TagRepositoryInterface
             ];
         }
 
+        Log::debug('DONE with tagcloud');
+
         return $return;
     }
 
@@ -337,7 +347,16 @@ class TagRepository implements TagRepositoryInterface
      */
     private function cloudScale(array $range, float $amount, float $min, float $max): int
     {
+        Log::debug(sprintf('Now in cloudScale with %s as amount and %f min, %f max', $amount, $min, $max));
         $amountDiff = $max - $min;
+        Log::debug(sprintf('AmountDiff is %f', $amountDiff));
+
+        // no difference? Every tag same range:
+        if($amountDiff === 0.0) {
+            Log::debug(sprintf('AmountDiff is zero, return %d', $range[0]));
+            return $range[0];
+        }
+
         $diff       = $range[1] - $range[0];
         $step       = 1;
         if ($diff != 0) {

From 989e931edfe1203c35e36d004ee9951e8638a03c Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Sat, 26 Aug 2017 14:44:19 +0200
Subject: [PATCH 369/668] Add language string [skip ci]

---
 resources/lang/en_US/firefly.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/resources/lang/en_US/firefly.php b/resources/lang/en_US/firefly.php
index 30f0528cd9..4c4cc20289 100644
--- a/resources/lang/en_US/firefly.php
+++ b/resources/lang/en_US/firefly.php
@@ -310,6 +310,7 @@ return [
     'no_location_set'                            => 'No location set.',
     'meta_data'                                  => 'Meta data',
     'location'                                   => 'Location',
+    'without_date'                               => 'Without date',
 
     // preferences
     'pref_home_screen_accounts'                  => 'Home screen accounts',

From 50837af607ff89cc44a913b148423fcf17996b0d Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Sat, 26 Aug 2017 14:50:08 +0200
Subject: [PATCH 370/668] Expand tag view.

---
 app/Http/Controllers/TagController.php        |  7 +++--
 app/Repositories/Tag/TagRepository.php        | 28 +++++++++++++++++++
 .../Tag/TagRepositoryInterface.php            |  9 ++++++
 resources/lang/en_US/firefly.php              |  1 +
 resources/views/tags/show.twig                |  2 ++
 5 files changed, 45 insertions(+), 2 deletions(-)

diff --git a/app/Http/Controllers/TagController.php b/app/Http/Controllers/TagController.php
index 3a7f9dd1c4..f4ecb7f429 100644
--- a/app/Http/Controllers/TagController.php
+++ b/app/Http/Controllers/TagController.php
@@ -171,7 +171,6 @@ class TagController extends Controller
         }
         $count = $repository->count();
 
-
         return view('tags.index', compact('clouds', 'count'));
     }
 
@@ -205,6 +204,7 @@ class TagController extends Controller
             $start    = $repository->firstUseDate($tag);
             $end      = new Carbon;
             $sum      = $repository->sumOfTag($tag, null, null);
+            $result   = $repository->resultOfTag($tag, null, null);
             $path     = route('tags.show', [$tag->id, 'all']);
         }
 
@@ -219,6 +219,7 @@ class TagController extends Controller
             );
             $periods  = $this->getPeriodOverview($tag);
             $sum      = $repository->sumOfTag($tag, $start, $end);
+            $result   = $repository->resultOfTag($tag, $start, $end);
             $path     = route('tags.show', [$tag->id, $moment]);
         }
 
@@ -227,6 +228,8 @@ class TagController extends Controller
             $start    = clone session('start', Navigation::startOfPeriod(new Carbon, $range));
             $end      = clone session('end', Navigation::endOfPeriod(new Carbon, $range));
             $periods  = $this->getPeriodOverview($tag);
+            $sum      = $repository->sumOfTag($tag, $start, $end);
+            $result   = $repository->resultOfTag($tag, $start, $end);
             $subTitle = trans(
                 'firefly.journals_in_period_for_tag',
                 ['tag' => $tag->tag, 'start' => $start->formatLocalized($this->monthAndDayFormat), 'end' => $end->formatLocalized($this->monthAndDayFormat)]
@@ -241,7 +244,7 @@ class TagController extends Controller
         $journals->setPath($path);
 
 
-        return view('tags.show', compact('apiKey', 'tag', 'periods', 'subTitle', 'subTitleIcon', 'journals', 'sum', 'start', 'end', 'moment'));
+        return view('tags.show', compact('apiKey', 'tag', 'result', 'periods', 'subTitle', 'subTitleIcon', 'journals', 'sum', 'start', 'end', 'moment'));
     }
 
     /**
diff --git a/app/Repositories/Tag/TagRepository.php b/app/Repositories/Tag/TagRepository.php
index 4a5b350a27..3f3218da19 100644
--- a/app/Repositories/Tag/TagRepository.php
+++ b/app/Repositories/Tag/TagRepository.php
@@ -262,6 +262,34 @@ class TagRepository implements TagRepositoryInterface
         return strval($sum);
     }
 
+    /**
+     * Same as sum of tag but substracts income instead of adding it as well.
+     *
+     * @param Tag         $tag
+     * @param Carbon|null $start
+     * @param Carbon|null $end
+     *
+     * @return string
+     */
+    public function resultOfTag(Tag $tag, ?Carbon $start, ?Carbon $end): string
+    {
+        /** @var JournalCollectorInterface $collector */
+        $collector = app(JournalCollectorInterface::class);
+
+        if (!is_null($start) && !is_null($end)) {
+            $collector->setRange($start, $end);
+        }
+
+        $collector->setAllAssetAccounts()->setTag($tag);
+        $journals = $collector->getJournals();
+        $sum      = '0';
+        foreach ($journals as $journal) {
+            $sum = bcadd($sum, strval($journal->transaction_amount));
+        }
+
+        return strval($sum);
+    }
+
     /**
      * Generates a tag cloud.
      *
diff --git a/app/Repositories/Tag/TagRepositoryInterface.php b/app/Repositories/Tag/TagRepositoryInterface.php
index 6ed8ec4edd..85e54f58c7 100644
--- a/app/Repositories/Tag/TagRepositoryInterface.php
+++ b/app/Repositories/Tag/TagRepositoryInterface.php
@@ -108,6 +108,15 @@ interface TagRepositoryInterface
      */
     public function setUser(User $user);
 
+    /**
+     * @param Tag         $tag
+     * @param Carbon|null $start
+     * @param Carbon|null $end
+     *
+     * @return string
+     */
+    public function resultOfTag(Tag $tag, ?Carbon $start, ?Carbon $end): string;
+
     /**
      * @param Tag    $tag
      * @param Carbon $start
diff --git a/resources/lang/en_US/firefly.php b/resources/lang/en_US/firefly.php
index 4c4cc20289..73f0f9434e 100644
--- a/resources/lang/en_US/firefly.php
+++ b/resources/lang/en_US/firefly.php
@@ -311,6 +311,7 @@ return [
     'meta_data'                                  => 'Meta data',
     'location'                                   => 'Location',
     'without_date'                               => 'Without date',
+    'result'                                     => 'Result',
 
     // preferences
     'pref_home_screen_accounts'                  => 'Home screen accounts',
diff --git a/resources/views/tags/show.twig b/resources/views/tags/show.twig
index acd4a376ad..dd99386bdd 100644
--- a/resources/views/tags/show.twig
+++ b/resources/views/tags/show.twig
@@ -40,10 +40,12 @@
                     {% if moment == 'all' %}
                         <p>
                             {{ 'total_sum'|_ }}: {{ sum|formatAmount }}<br/>
+                            {{ 'total_result'|_ }}: {{ result|formatAmount }}<br/>
                         </p>
                     {% else %}
                         <p>
                             {{ 'sum'|_ }}: {{ sum|formatAmount }}<br/>
+                            {{ 'result'|_ }}: {{ result|formatAmount }}<br/>
                         </p>
                     {% endif %}
 

From 338d7587b218840d4fe672e5553e6359db81757c Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sat, 26 Aug 2017 14:50:21 +0200
Subject: [PATCH 371/668] New translations firefly.php (Russian)

---
 resources/lang/ru_RU/firefly.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/resources/lang/ru_RU/firefly.php b/resources/lang/ru_RU/firefly.php
index 73eff711e0..401086bd8b 100644
--- a/resources/lang/ru_RU/firefly.php
+++ b/resources/lang/ru_RU/firefly.php
@@ -310,6 +310,7 @@ return [
     'no_location_set'                            => 'No location set.',
     'meta_data'                                  => 'Meta data',
     'location'                                   => 'Location',
+    'without_date'                               => 'Without date',
 
     // preferences
     'pref_home_screen_accounts'                  => 'Счета, отображаемые в сводке',

From 70e146aedd3466042a76f61198b18163b9ad80c1 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sat, 26 Aug 2017 14:52:40 +0200
Subject: [PATCH 372/668] New translations firefly.php (German)

---
 resources/lang/de_DE/firefly.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/resources/lang/de_DE/firefly.php b/resources/lang/de_DE/firefly.php
index 21846db799..010d0a734e 100644
--- a/resources/lang/de_DE/firefly.php
+++ b/resources/lang/de_DE/firefly.php
@@ -310,6 +310,7 @@ return [
     'no_location_set'                            => 'Kein Ort gesetzt.',
     'meta_data'                                  => 'Metadaten',
     'location'                                   => 'Standort',
+    'without_date'                               => 'Without date',
 
     // preferences
     'pref_home_screen_accounts'                  => 'Konten auf dem Startbildschirm',

From 16aaa0b5a67b49f20b15786cac892f16635c9d5f Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sat, 26 Aug 2017 14:52:43 +0200
Subject: [PATCH 373/668] New translations firefly.php (Polish)

---
 resources/lang/pl_PL/firefly.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/resources/lang/pl_PL/firefly.php b/resources/lang/pl_PL/firefly.php
index 3942ebfa8d..936034edb8 100644
--- a/resources/lang/pl_PL/firefly.php
+++ b/resources/lang/pl_PL/firefly.php
@@ -310,6 +310,7 @@ return [
     'no_location_set'                            => 'Nie ustawiono lokalizacji.',
     'meta_data'                                  => 'Metadane',
     'location'                                   => 'Lokalizacja',
+    'without_date'                               => 'Without date',
 
     // preferences
     'pref_home_screen_accounts'                  => 'Konta na stronie domowej',

From fa6e82dd25559c8c361fd4cb44d61f2355bdf9b0 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sat, 26 Aug 2017 14:52:45 +0200
Subject: [PATCH 374/668] New translations firefly.php (French)

---
 resources/lang/fr_FR/firefly.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/resources/lang/fr_FR/firefly.php b/resources/lang/fr_FR/firefly.php
index 9396acf71a..a1967690f3 100644
--- a/resources/lang/fr_FR/firefly.php
+++ b/resources/lang/fr_FR/firefly.php
@@ -310,6 +310,7 @@ return [
     'no_location_set'                            => 'Aucun emplacement défini.',
     'meta_data'                                  => 'Meta-données',
     'location'                                   => 'Emplacement',
+    'without_date'                               => 'Without date',
 
     // preferences
     'pref_home_screen_accounts'                  => 'Comptes de l’écran d’accueil',

From cf05970ccf463c9b65091e3ad2e31a2b11079f63 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sat, 26 Aug 2017 14:52:47 +0200
Subject: [PATCH 375/668] New translations firefly.php (Dutch)

---
 resources/lang/nl_NL/firefly.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/resources/lang/nl_NL/firefly.php b/resources/lang/nl_NL/firefly.php
index 8c8e0209b9..4b8680b4c3 100644
--- a/resources/lang/nl_NL/firefly.php
+++ b/resources/lang/nl_NL/firefly.php
@@ -310,6 +310,7 @@ return [
     'no_location_set'                            => 'Zonder plaats',
     'meta_data'                                  => 'Metagegevens',
     'location'                                   => 'Plaats',
+    'without_date'                               => 'Without date',
 
     // preferences
     'pref_home_screen_accounts'                  => 'Voorpaginarekeningen',

From eed6d6c49de3d76b325650c96e6e90e80d9ac54a Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sat, 26 Aug 2017 14:52:50 +0200
Subject: [PATCH 376/668] New translations firefly.php (Portuguese, Brazilian)

---
 resources/lang/pt_BR/firefly.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/resources/lang/pt_BR/firefly.php b/resources/lang/pt_BR/firefly.php
index 43f0b91b58..90831b2f70 100644
--- a/resources/lang/pt_BR/firefly.php
+++ b/resources/lang/pt_BR/firefly.php
@@ -310,6 +310,7 @@ return [
     'no_location_set'                            => 'Nenhuma localização.',
     'meta_data'                                  => 'Meta dados',
     'location'                                   => 'Localização',
+    'without_date'                               => 'Without date',
 
     // preferences
     'pref_home_screen_accounts'                  => 'Conta da tela inicial',

From bfcc1d8f03aa49ac08968e9a5a53ba1ab67a493d Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sat, 26 Aug 2017 14:52:53 +0200
Subject: [PATCH 377/668] New translations firefly.php (Slovenian)

---
 resources/lang/sl_SI/firefly.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/resources/lang/sl_SI/firefly.php b/resources/lang/sl_SI/firefly.php
index 725e42692b..5a62fb8b10 100644
--- a/resources/lang/sl_SI/firefly.php
+++ b/resources/lang/sl_SI/firefly.php
@@ -310,6 +310,7 @@ return [
     'no_location_set'                            => 'No location set.',
     'meta_data'                                  => 'Meta data',
     'location'                                   => 'Location',
+    'without_date'                               => 'Without date',
 
     // preferences
     'pref_home_screen_accounts'                  => 'Home screen accounts',

From 6a5bdebb7c7f2087ff21bf7b00f4de03c19f922e Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sat, 26 Aug 2017 14:52:56 +0200
Subject: [PATCH 378/668] New translations firefly.php (Spanish)

---
 resources/lang/es_ES/firefly.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/resources/lang/es_ES/firefly.php b/resources/lang/es_ES/firefly.php
index 0eb7ac268f..77a9fc5429 100644
--- a/resources/lang/es_ES/firefly.php
+++ b/resources/lang/es_ES/firefly.php
@@ -310,6 +310,7 @@ return [
     'no_location_set'                            => 'No location set.',
     'meta_data'                                  => 'Meta data',
     'location'                                   => 'Location',
+    'without_date'                               => 'Without date',
 
     // preferences
     'pref_home_screen_accounts'                  => 'Home screen accounts',

From e0bcbb0396f507759823d6f2e636e1871fb80029 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sat, 26 Aug 2017 15:00:20 +0200
Subject: [PATCH 379/668] New translations firefly.php (Russian)

---
 resources/lang/ru_RU/firefly.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/resources/lang/ru_RU/firefly.php b/resources/lang/ru_RU/firefly.php
index 401086bd8b..e167a2b63c 100644
--- a/resources/lang/ru_RU/firefly.php
+++ b/resources/lang/ru_RU/firefly.php
@@ -311,6 +311,7 @@ return [
     'meta_data'                                  => 'Meta data',
     'location'                                   => 'Location',
     'without_date'                               => 'Without date',
+    'result'                                     => 'Result',
 
     // preferences
     'pref_home_screen_accounts'                  => 'Счета, отображаемые в сводке',

From 07e31d674535657dc1300bb44067aff66bd59a29 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sat, 26 Aug 2017 15:02:42 +0200
Subject: [PATCH 380/668] New translations firefly.php (German)

---
 resources/lang/de_DE/firefly.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/resources/lang/de_DE/firefly.php b/resources/lang/de_DE/firefly.php
index 010d0a734e..3e343d2a5d 100644
--- a/resources/lang/de_DE/firefly.php
+++ b/resources/lang/de_DE/firefly.php
@@ -311,6 +311,7 @@ return [
     'meta_data'                                  => 'Metadaten',
     'location'                                   => 'Standort',
     'without_date'                               => 'Without date',
+    'result'                                     => 'Result',
 
     // preferences
     'pref_home_screen_accounts'                  => 'Konten auf dem Startbildschirm',

From ef4bc0ca0cb02fb809a48ba092becd1d8757d0ad Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sat, 26 Aug 2017 15:02:44 +0200
Subject: [PATCH 381/668] New translations firefly.php (Polish)

---
 resources/lang/pl_PL/firefly.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/resources/lang/pl_PL/firefly.php b/resources/lang/pl_PL/firefly.php
index 936034edb8..aaa8170eb6 100644
--- a/resources/lang/pl_PL/firefly.php
+++ b/resources/lang/pl_PL/firefly.php
@@ -311,6 +311,7 @@ return [
     'meta_data'                                  => 'Metadane',
     'location'                                   => 'Lokalizacja',
     'without_date'                               => 'Without date',
+    'result'                                     => 'Result',
 
     // preferences
     'pref_home_screen_accounts'                  => 'Konta na stronie domowej',

From ab5ff6446e5470061491271a4b09fa2bad7e169d Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sat, 26 Aug 2017 15:02:46 +0200
Subject: [PATCH 382/668] New translations firefly.php (French)

---
 resources/lang/fr_FR/firefly.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/resources/lang/fr_FR/firefly.php b/resources/lang/fr_FR/firefly.php
index a1967690f3..356f02ac77 100644
--- a/resources/lang/fr_FR/firefly.php
+++ b/resources/lang/fr_FR/firefly.php
@@ -311,6 +311,7 @@ return [
     'meta_data'                                  => 'Meta-données',
     'location'                                   => 'Emplacement',
     'without_date'                               => 'Without date',
+    'result'                                     => 'Result',
 
     // preferences
     'pref_home_screen_accounts'                  => 'Comptes de l’écran d’accueil',

From 4022b6b9cddfa94db5ba058cb917d19b28e46aa2 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sat, 26 Aug 2017 15:02:48 +0200
Subject: [PATCH 383/668] New translations firefly.php (Dutch)

---
 resources/lang/nl_NL/firefly.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/resources/lang/nl_NL/firefly.php b/resources/lang/nl_NL/firefly.php
index 4b8680b4c3..9673bae705 100644
--- a/resources/lang/nl_NL/firefly.php
+++ b/resources/lang/nl_NL/firefly.php
@@ -311,6 +311,7 @@ return [
     'meta_data'                                  => 'Metagegevens',
     'location'                                   => 'Plaats',
     'without_date'                               => 'Without date',
+    'result'                                     => 'Result',
 
     // preferences
     'pref_home_screen_accounts'                  => 'Voorpaginarekeningen',

From bf818e1ede31e7d4645d4f39f9b8b652095bdb15 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sat, 26 Aug 2017 15:02:51 +0200
Subject: [PATCH 384/668] New translations firefly.php (Portuguese, Brazilian)

---
 resources/lang/pt_BR/firefly.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/resources/lang/pt_BR/firefly.php b/resources/lang/pt_BR/firefly.php
index 90831b2f70..4e3b0c51b6 100644
--- a/resources/lang/pt_BR/firefly.php
+++ b/resources/lang/pt_BR/firefly.php
@@ -311,6 +311,7 @@ return [
     'meta_data'                                  => 'Meta dados',
     'location'                                   => 'Localização',
     'without_date'                               => 'Without date',
+    'result'                                     => 'Result',
 
     // preferences
     'pref_home_screen_accounts'                  => 'Conta da tela inicial',

From 6c150f9d0685dff812062cc221c04965c179967a Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sat, 26 Aug 2017 15:02:54 +0200
Subject: [PATCH 385/668] New translations firefly.php (Slovenian)

---
 resources/lang/sl_SI/firefly.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/resources/lang/sl_SI/firefly.php b/resources/lang/sl_SI/firefly.php
index 5a62fb8b10..6570dac355 100644
--- a/resources/lang/sl_SI/firefly.php
+++ b/resources/lang/sl_SI/firefly.php
@@ -311,6 +311,7 @@ return [
     'meta_data'                                  => 'Meta data',
     'location'                                   => 'Location',
     'without_date'                               => 'Without date',
+    'result'                                     => 'Result',
 
     // preferences
     'pref_home_screen_accounts'                  => 'Home screen accounts',

From 43b829bf02df31123953b224268ed125cec3e10a Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sat, 26 Aug 2017 15:02:58 +0200
Subject: [PATCH 386/668] New translations firefly.php (Spanish)

---
 resources/lang/es_ES/firefly.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/resources/lang/es_ES/firefly.php b/resources/lang/es_ES/firefly.php
index 77a9fc5429..c046bbba3a 100644
--- a/resources/lang/es_ES/firefly.php
+++ b/resources/lang/es_ES/firefly.php
@@ -311,6 +311,7 @@ return [
     'meta_data'                                  => 'Meta data',
     'location'                                   => 'Location',
     'without_date'                               => 'Without date',
+    'result'                                     => 'Result',
 
     // preferences
     'pref_home_screen_accounts'                  => 'Home screen accounts',

From b8d4776671884de407a30bcc893e22c396719b26 Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Sat, 26 Aug 2017 21:28:14 +0200
Subject: [PATCH 387/668] Remove unused code.

---
 app/Helpers/Report/BalanceReportHelper.php | 120 ---------------------
 1 file changed, 120 deletions(-)

diff --git a/app/Helpers/Report/BalanceReportHelper.php b/app/Helpers/Report/BalanceReportHelper.php
index dadef8fe41..63bb4114da 100644
--- a/app/Helpers/Report/BalanceReportHelper.php
+++ b/app/Helpers/Report/BalanceReportHelper.php
@@ -74,14 +74,9 @@ class BalanceReportHelper implements BalanceReportHelperInterface
             $line = $this->createBalanceLine($budgetLimit, $accounts);
             $balance->addBalanceLine($line);
         }
-        Log::debug('Create rest of the things.');
         $noBudgetLine       = $this->createNoBudgetLine($accounts, $start, $end);
-        $coveredByTagLine   = $this->createTagsBalanceLine($accounts, $start, $end);
-        $leftUnbalancedLine = $this->createLeftUnbalancedLine($noBudgetLine, $coveredByTagLine);
 
         $balance->addBalanceLine($noBudgetLine);
-        $balance->addBalanceLine($coveredByTagLine);
-        $balance->addBalanceLine($leftUnbalancedLine);
         $balance->setBalanceHeader($header);
 
         Log::debug('Clear unused budgets.');
@@ -93,53 +88,6 @@ class BalanceReportHelper implements BalanceReportHelperInterface
         return $balance;
     }
 
-    /**
-     * This method collects all transfers that are part of a "balancing act" tag
-     * and groups the amounts of those transfers by their destination account.
-     *
-     * This is used to indicate which expenses, usually outside of budgets, have been
-     * corrected by transfers from a savings account.
-     *
-     * @param Collection $accounts
-     * @param Carbon     $start
-     * @param Carbon     $end
-     *
-     * @return Collection
-     */
-    private function allCoveredByBalancingActs(Collection $accounts, Carbon $start, Carbon $end): Collection
-    {
-        $ids = $accounts->pluck('id')->toArray();
-        $set = auth()->user()->tags()
-                     ->leftJoin('tag_transaction_journal', 'tag_transaction_journal.tag_id', '=', 'tags.id')
-                     ->leftJoin('transaction_journals', 'tag_transaction_journal.transaction_journal_id', '=', 'transaction_journals.id')
-                     ->leftJoin('transaction_types', 'transaction_journals.transaction_type_id', '=', 'transaction_types.id')
-                     ->leftJoin(
-                         'transactions AS t_source', function (JoinClause $join) {
-                         $join->on('transaction_journals.id', '=', 't_source.transaction_journal_id')->where('t_source.amount', '<', 0);
-                     }
-                     )
-                     ->leftJoin(
-                         'transactions AS t_destination', function (JoinClause $join) {
-                         $join->on('transaction_journals.id', '=', 't_destination.transaction_journal_id')->where('t_destination.amount', '>', 0);
-                     }
-                     )
-                     ->where('tags.tagMode', 'balancingAct')
-                     ->where('transaction_types.type', TransactionType::TRANSFER)
-                     ->where('transaction_journals.date', '>=', $start->format('Y-m-d'))
-                     ->where('transaction_journals.date', '<=', $end->format('Y-m-d'))
-                     ->whereNull('transaction_journals.deleted_at')
-                     ->whereIn('t_source.account_id', $ids)
-                     ->whereIn('t_destination.account_id', $ids)
-                     ->groupBy('t_destination.account_id')
-                     ->get(
-                         [
-                             't_destination.account_id',
-                             DB::raw('SUM(t_destination.amount) AS sum'),
-                         ]
-                     );
-
-        return $set;
-    }
 
 
     /**
@@ -168,40 +116,6 @@ class BalanceReportHelper implements BalanceReportHelperInterface
         return $line;
     }
 
-    /**
-     * @param BalanceLine $noBudgetLine
-     * @param BalanceLine $coveredByTagLine
-     *
-     * @return BalanceLine
-     */
-    private function createLeftUnbalancedLine(BalanceLine $noBudgetLine, BalanceLine $coveredByTagLine): BalanceLine
-    {
-        $line = new BalanceLine;
-        $line->setRole(BalanceLine::ROLE_DIFFROLE);
-        $noBudgetEntries = $noBudgetLine->getBalanceEntries();
-        $tagEntries      = $coveredByTagLine->getBalanceEntries();
-
-        foreach ($noBudgetEntries as $entry) {
-            $account  = $entry->getAccount();
-            $tagEntry = $tagEntries->filter(
-                function (BalanceEntry $current) use ($account) {
-                    return $current->getAccount()->id === $account->id;
-                }
-            );
-            if ($tagEntry->first()) {
-                // found corresponding entry. As we should:
-                $newEntry = new BalanceEntry;
-                $newEntry->setAccount($account);
-                $spent = bcadd($tagEntry->first()->getLeft(), $entry->getSpent());
-                $newEntry->setSpent($spent);
-                $line->addBalanceEntry($newEntry);
-            }
-        }
-
-        return $line;
-
-
-    }
 
     /**
      * @param Collection $accounts
@@ -227,41 +141,7 @@ class BalanceReportHelper implements BalanceReportHelperInterface
         return $empty;
     }
 
-    /**
-     * @param Collection $accounts
-     * @param Carbon     $start
-     * @param Carbon     $end
-     *
-     * @return BalanceLine
-     */
-    private function createTagsBalanceLine(Collection $accounts, Carbon $start, Carbon $end): BalanceLine
-    {
-        $tags     = new BalanceLine;
-        $tagsLeft = $this->allCoveredByBalancingActs($accounts, $start, $end);
 
-        $tags->setRole(BalanceLine::ROLE_TAGROLE);
-
-        foreach ($accounts as $account) {
-            $leftEntry = $tagsLeft->filter(
-                function (Tag $tag) use ($account) {
-                    return $tag->account_id === $account->id;
-                }
-            );
-            $left      = '0';
-            if (!is_null($leftEntry->first())) {
-                $left = $leftEntry->first()->sum;
-            }
-
-            // balanced by tags
-            $tagEntry = new BalanceEntry;
-            $tagEntry->setAccount($account);
-            $tagEntry->setLeft($left);
-            $tags->addBalanceEntry($tagEntry);
-
-        }
-
-        return $tags;
-    }
 
     /**
      * @param Balance $balance

From 1ecf3d04d9e654f69651a3b5d516c632aa331762 Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Sun, 27 Aug 2017 08:53:48 +0200
Subject: [PATCH 388/668] Fix attachment count

---
 resources/views/list/journals.twig | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/resources/views/list/journals.twig b/resources/views/list/journals.twig
index c8921545a9..d874e634ec 100644
--- a/resources/views/list/journals.twig
+++ b/resources/views/list/journals.twig
@@ -53,10 +53,10 @@
                     {% endif %}
                 </a>
                 {{ splitJournalIndicator(transaction.journal_id) }}
-
-                {% if transaction.transactionJournal.attachments|length > 0 %}
+                {% set countAtt = transaction.transactionJournal.attachments.count %}
+                {% if countAtt > 0 %}
                     <i class="fa fa-paperclip"
-                       title="{{ Lang.choice('firefly.nr_of_attachments', journal.attachments|length, {count: journal.attachments|length}) }}"></i>
+                       title="{{ Lang.choice('firefly.nr_of_attachments', countAtt, {count: countAtt}) }}"></i>
                 {% endif %}
 
             </td>

From 1319cb2e4e583fb62b63a12b9a27c3006f199520 Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Sun, 27 Aug 2017 08:54:58 +0200
Subject: [PATCH 389/668] Improving bunq import.

---
 .../Controllers/Import/BankController.php     | 48 ++++++++-
 app/Services/Bunq/Object/Alias.php            |  1 -
 app/Services/Bunq/Object/Amount.php           |  1 -
 .../Bunq/Object/MonetaryAccountBank.php       | 98 +++++++++----------
 .../Bunq/Object/MonetaryAccountProfile.php    |  1 +
 .../Bunq/Object/MonetaryAccountSetting.php    |  1 +
 .../Bunq/Object/NotificationFilter.php        |  3 +-
 app/Services/Bunq/Object/ServerPublicKey.php  | 19 ++--
 app/Services/Bunq/Object/UserCompany.php      |  1 -
 app/Services/Bunq/Object/UserLight.php        |  2 +-
 app/Services/Bunq/Request/BunqRequest.php     |  9 +-
 .../Import/Information/BunqInformation.php    | 21 ++--
 .../Prerequisites/BunqPrerequisites.php       |  3 -
 config/firefly.php                            |  3 +
 resources/views/import/bank/form.twig         | 69 +++++++++++++
 .../views/import/bunq/prerequisites.twig      |  2 +-
 16 files changed, 195 insertions(+), 87 deletions(-)
 create mode 100644 resources/views/import/bank/form.twig

diff --git a/app/Http/Controllers/Import/BankController.php b/app/Http/Controllers/Import/BankController.php
index d8a0279063..1e853620b5 100644
--- a/app/Http/Controllers/Import/BankController.php
+++ b/app/Http/Controllers/Import/BankController.php
@@ -21,6 +21,7 @@ use Session;
 
 class BankController extends Controller
 {
+
     /**
      * This method must ask the user all parameters necessary to start importing data. This may not be enough
      * to finish the import itself (ie. mapping) but it should be enough to begin: accounts to import from,
@@ -42,6 +43,49 @@ class BankController extends Controller
         $object->setUser(auth()->user());
         $remoteAccounts = $object->getAccounts();
 
+        return view('import.bank.form', compact('remoteAccounts', 'bank'));
+
+    }
+
+    /**
+     * With the information given in the submitted form Firefly III will call upon the bank's classes to return transaction
+     * information as requested. The user will be able to map unknown data and continue. Or maybe, it's put into some kind of
+     * fake CSV file and forwarded to the import routine.
+     *
+     * @param Request $request
+     * @param string  $bank
+     *
+     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
+     */
+    public function postForm(Request $request, string $bank)
+    {
+
+        $class = config(sprintf('firefly.import_pre.%s', $bank));
+        /** @var PrerequisitesInterface $object */
+        $object = app($class);
+        $object->setUser(auth()->user());
+
+        if ($object->hasPrerequisites()) {
+            return redirect(route('import.bank.prerequisites', [$bank]));
+        }
+        $remoteAccounts = $request->get('do_import');
+        if (!is_array($remoteAccounts) || count($remoteAccounts) === 0) {
+            Session::flash('error', 'Must select accounts');
+
+            return redirect(route('import.bank.form', [$bank]));
+        }
+        $remoteAccounts = array_keys($remoteAccounts);
+
+        $class = config(sprintf('firefly.import_pre.%s', $bank));
+
+        var_dump($remoteAccounts);exit;
+
+        // get import file
+
+        // get import config
+
+
+
     }
 
     /**
@@ -66,6 +110,7 @@ class BankController extends Controller
         $object->setUser(auth()->user());
         if (!$object->hasPrerequisites()) {
             Log::debug(sprintf('No more prerequisites for %s, move to form.', $bank));
+
             return redirect(route('import.bank.form', [$bank]));
         }
         Log::debug('Going to store entered preprerequisites.');
@@ -102,7 +147,8 @@ class BankController extends Controller
 
             return view($view, $parameters);
         }
-            return redirect(route('import.bank.form', [$bank]));
+
+        return redirect(route('import.bank.form', [$bank]));
     }
 
 }
diff --git a/app/Services/Bunq/Object/Alias.php b/app/Services/Bunq/Object/Alias.php
index 7d1703eabc..7b0ed84ea3 100644
--- a/app/Services/Bunq/Object/Alias.php
+++ b/app/Services/Bunq/Object/Alias.php
@@ -65,5 +65,4 @@ class Alias extends BunqObject
     }
 
 
-
 }
\ No newline at end of file
diff --git a/app/Services/Bunq/Object/Amount.php b/app/Services/Bunq/Object/Amount.php
index 857e85f304..cd7782a0ad 100644
--- a/app/Services/Bunq/Object/Amount.php
+++ b/app/Services/Bunq/Object/Amount.php
@@ -54,5 +54,4 @@ class Amount extends BunqObject
     }
 
 
-
 }
\ No newline at end of file
diff --git a/app/Services/Bunq/Object/MonetaryAccountBank.php b/app/Services/Bunq/Object/MonetaryAccountBank.php
index 0295983581..5082c858e0 100644
--- a/app/Services/Bunq/Object/MonetaryAccountBank.php
+++ b/app/Services/Bunq/Object/MonetaryAccountBank.php
@@ -62,56 +62,6 @@ class MonetaryAccountBank extends BunqObject
     /** @var int */
     private $userId = 0;
 
-    /**
-     * @return string
-     */
-    public function getDescription(): string
-    {
-        return $this->description;
-    }
-
-    /**
-     * @return int
-     */
-    public function getId(): int
-    {
-        return $this->id;
-    }
-
-    /**
-     * @return array
-     */
-    public function getAliases(): array
-    {
-        return $this->aliases;
-    }
-
-    /**
-     * @return string
-     */
-    public function getCurrency(): string
-    {
-        return $this->currency;
-    }
-
-    /**
-     * @return Amount
-     */
-    public function getBalance(): Amount
-    {
-        return $this->balance;
-    }
-
-    /**
-     * @return MonetaryAccountSetting
-     */
-    public function getSetting(): MonetaryAccountSetting
-    {
-        return $this->setting;
-    }
-
-
-
     /**
      * MonetaryAccountBank constructor.
      *
@@ -150,4 +100,52 @@ class MonetaryAccountBank extends BunqObject
         return;
     }
 
+    /**
+     * @return array
+     */
+    public function getAliases(): array
+    {
+        return $this->aliases;
+    }
+
+    /**
+     * @return Amount
+     */
+    public function getBalance(): Amount
+    {
+        return $this->balance;
+    }
+
+    /**
+     * @return string
+     */
+    public function getCurrency(): string
+    {
+        return $this->currency;
+    }
+
+    /**
+     * @return string
+     */
+    public function getDescription(): string
+    {
+        return $this->description;
+    }
+
+    /**
+     * @return int
+     */
+    public function getId(): int
+    {
+        return $this->id;
+    }
+
+    /**
+     * @return MonetaryAccountSetting
+     */
+    public function getSetting(): MonetaryAccountSetting
+    {
+        return $this->setting;
+    }
+
 }
\ No newline at end of file
diff --git a/app/Services/Bunq/Object/MonetaryAccountProfile.php b/app/Services/Bunq/Object/MonetaryAccountProfile.php
index e4995ea19c..a19d3403ee 100644
--- a/app/Services/Bunq/Object/MonetaryAccountProfile.php
+++ b/app/Services/Bunq/Object/MonetaryAccountProfile.php
@@ -37,6 +37,7 @@ class MonetaryAccountProfile extends BunqObject
         $this->profileFill           = null;
         $this->profileActionRequired = $data['profile_action_required'];
         $this->profileAmountRequired = new Amount($data['profile_amount_required']);
+
         return;
     }
 
diff --git a/app/Services/Bunq/Object/MonetaryAccountSetting.php b/app/Services/Bunq/Object/MonetaryAccountSetting.php
index e1277c3dbc..38fe8db75d 100644
--- a/app/Services/Bunq/Object/MonetaryAccountSetting.php
+++ b/app/Services/Bunq/Object/MonetaryAccountSetting.php
@@ -36,6 +36,7 @@ class MonetaryAccountSetting extends BunqObject
         $this->color               = $data['color'];
         $this->defaultAvatarStatus = $data['default_avatar_status'];
         $this->restrictionChat     = $data['restriction_chat'];
+
         return;
     }
 
diff --git a/app/Services/Bunq/Object/NotificationFilter.php b/app/Services/Bunq/Object/NotificationFilter.php
index f12843c159..06bf96b01e 100644
--- a/app/Services/Bunq/Object/NotificationFilter.php
+++ b/app/Services/Bunq/Object/NotificationFilter.php
@@ -24,7 +24,8 @@ class NotificationFilter extends BunqObject
      *
      * @param array $data
      */
-    public function __construct(array $data) {
+    public function __construct(array $data)
+    {
         var_dump($data);
         exit;
     }
diff --git a/app/Services/Bunq/Object/ServerPublicKey.php b/app/Services/Bunq/Object/ServerPublicKey.php
index 78426d34d1..56aa17654b 100644
--- a/app/Services/Bunq/Object/ServerPublicKey.php
+++ b/app/Services/Bunq/Object/ServerPublicKey.php
@@ -27,16 +27,9 @@ class ServerPublicKey extends BunqObject
      *
      * @param array $response
      */
-    public function __construct(array $response) {
-        $this->publicKey = $response['server_public_key'];
-    }
-
-    /**
-     * @param string $publicKey
-     */
-    public function setPublicKey(string $publicKey)
+    public function __construct(array $response)
     {
-        $this->publicKey = $publicKey;
+        $this->publicKey = $response['server_public_key'];
     }
 
     /**
@@ -47,5 +40,13 @@ class ServerPublicKey extends BunqObject
         return $this->publicKey;
     }
 
+    /**
+     * @param string $publicKey
+     */
+    public function setPublicKey(string $publicKey)
+    {
+        $this->publicKey = $publicKey;
+    }
+
 
 }
\ No newline at end of file
diff --git a/app/Services/Bunq/Object/UserCompany.php b/app/Services/Bunq/Object/UserCompany.php
index 57c250773a..a0efcaf876 100644
--- a/app/Services/Bunq/Object/UserCompany.php
+++ b/app/Services/Bunq/Object/UserCompany.php
@@ -103,5 +103,4 @@ class UserCompany extends BunqObject
     }
 
 
-
 }
\ No newline at end of file
diff --git a/app/Services/Bunq/Object/UserLight.php b/app/Services/Bunq/Object/UserLight.php
index fe47df54a7..baed9d9620 100644
--- a/app/Services/Bunq/Object/UserLight.php
+++ b/app/Services/Bunq/Object/UserLight.php
@@ -51,7 +51,7 @@ class UserLight extends BunqObject
      */
     public function __construct(array $data)
     {
-        if(count($data) === 0) {
+        if (count($data) === 0) {
             return;
         }
         $this->id             = intval($data['id']);
diff --git a/app/Services/Bunq/Request/BunqRequest.php b/app/Services/Bunq/Request/BunqRequest.php
index 629378377f..0046d2f35b 100644
--- a/app/Services/Bunq/Request/BunqRequest.php
+++ b/app/Services/Bunq/Request/BunqRequest.php
@@ -45,6 +45,7 @@ abstract class BunqRequest
      */
     public function __construct()
     {
+        $this->server = config('firefly.bunq.server');
     }
 
     /**
@@ -60,14 +61,6 @@ abstract class BunqRequest
         return $this->server;
     }
 
-    /**
-     * @param string $server
-     */
-    public function setServer(string $server)
-    {
-        $this->server = $server;
-    }
-
     /**
      * @param string $privateKey
      */
diff --git a/app/Support/Import/Information/BunqInformation.php b/app/Support/Import/Information/BunqInformation.php
index 9acf363f2e..6d0c955280 100644
--- a/app/Support/Import/Information/BunqInformation.php
+++ b/app/Support/Import/Information/BunqInformation.php
@@ -13,6 +13,7 @@ declare(strict_types=1);
 namespace FireflyIII\Support\Import\Information;
 
 use FireflyIII\Exceptions\FireflyException;
+use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
 use FireflyIII\Services\Bunq\Object\Alias;
 use FireflyIII\Services\Bunq\Object\MonetaryAccountBank;
 use FireflyIII\Services\Bunq\Request\DeleteDeviceSessionRequest;
@@ -20,6 +21,7 @@ use FireflyIII\Services\Bunq\Request\DeviceSessionRequest;
 use FireflyIII\Services\Bunq\Request\ListMonetaryAccountRequest;
 use FireflyIII\Services\Bunq\Request\ListUserRequest;
 use FireflyIII\Services\Bunq\Token\SessionToken;
+use FireflyIII\Support\CacheProperties;
 use FireflyIII\User;
 use Illuminate\Support\Collection;
 use Log;
@@ -56,22 +58,28 @@ class BunqInformation implements InformationInterface
      */
     public function getAccounts(): array
     {
+        // cache for an hour:
+        $cache = new CacheProperties;
+        $cache->addProperty('bunq.get-accounts');
+        $cache->addProperty(date('dmy h'));
+        if ($cache->has()) {
+            return $cache->get(); // @codeCoverageIgnore
+        }
         Log::debug('Now in getAccounts()');
         $sessionToken = $this->startSession();
         $id           = $this->getUserInformation($sessionToken);
-
         // get list of Bunq accounts:
         $accounts = $this->getMonetaryAccounts($sessionToken, $id);
         $return   = [];
         /** @var MonetaryAccountBank $account */
         foreach ($accounts as $account) {
+
             $current = [
                 'id'       => $account->getId(),
                 'name'     => $account->getDescription(),
                 'currency' => $account->getCurrency(),
                 'balance'  => $account->getBalance()->getValue(),
                 'color'    => $account->getSetting()->getColor(),
-
             ];
             /** @var Alias $alias */
             foreach ($account->getAliases() as $alias) {
@@ -81,6 +89,7 @@ class BunqInformation implements InformationInterface
             }
             $return[] = $current;
         }
+        $cache->store($return);
 
         $this->closeSession($sessionToken);
 
@@ -105,11 +114,9 @@ class BunqInformation implements InformationInterface
         Log::debug('Going to close session');
         $apiKey          = Preferences::getForUser($this->user, 'bunq_api_key')->data;
         $serverPublicKey = Preferences::getForUser($this->user, 'bunq_server_public_key')->data;
-        $server          = config('firefly.bunq.server');
         $privateKey      = Preferences::getForUser($this->user, 'bunq_private_key')->data;
         $request         = new DeleteDeviceSessionRequest();
         $request->setSecret($apiKey);
-        $request->setServer($server);
         $request->setPrivateKey($privateKey);
         $request->setServerPublicKey($serverPublicKey);
         $request->setSessionToken($sessionToken);
@@ -128,14 +135,12 @@ class BunqInformation implements InformationInterface
     {
         $apiKey          = Preferences::getForUser($this->user, 'bunq_api_key')->data;
         $serverPublicKey = Preferences::getForUser($this->user, 'bunq_server_public_key')->data;
-        $server          = config('firefly.bunq.server');
         $privateKey      = Preferences::getForUser($this->user, 'bunq_private_key')->data;
         $request         = new ListMonetaryAccountRequest;
 
         $request->setSessionToken($sessionToken);
         $request->setSecret($apiKey);
         $request->setServerPublicKey($serverPublicKey);
-        $request->setServer($server);
         $request->setPrivateKey($privateKey);
         $request->setUserId($userId);
         $request->call();
@@ -154,13 +159,11 @@ class BunqInformation implements InformationInterface
     {
         $apiKey          = Preferences::getForUser($this->user, 'bunq_api_key')->data;
         $serverPublicKey = Preferences::getForUser($this->user, 'bunq_server_public_key')->data;
-        $server          = config('firefly.bunq.server');
         $privateKey      = Preferences::getForUser($this->user, 'bunq_private_key')->data;
         $request         = new ListUserRequest;
         $request->setSessionToken($sessionToken);
         $request->setSecret($apiKey);
         $request->setServerPublicKey($serverPublicKey);
-        $request->setServer($server);
         $request->setPrivateKey($privateKey);
         $request->call();
         // return the first that isn't null?
@@ -183,13 +186,11 @@ class BunqInformation implements InformationInterface
         Log::debug('Now in startSession.');
         $apiKey            = Preferences::getForUser($this->user, 'bunq_api_key')->data;
         $serverPublicKey   = Preferences::getForUser($this->user, 'bunq_server_public_key')->data;
-        $server            = config('firefly.bunq.server');
         $privateKey        = Preferences::getForUser($this->user, 'bunq_private_key')->data;
         $installationToken = Preferences::getForUser($this->user, 'bunq_installation_token')->data;
         $request           = new DeviceSessionRequest();
         $request->setSecret($apiKey);
         $request->setServerPublicKey($serverPublicKey);
-        $request->setServer($server);
         $request->setPrivateKey($privateKey);
         $request->setInstallationToken($installationToken);
         $request->call();
diff --git a/app/Support/Import/Prerequisites/BunqPrerequisites.php b/app/Support/Import/Prerequisites/BunqPrerequisites.php
index 022d1e44b9..a83d4ec4c8 100644
--- a/app/Support/Import/Prerequisites/BunqPrerequisites.php
+++ b/app/Support/Import/Prerequisites/BunqPrerequisites.php
@@ -157,7 +157,6 @@ class BunqPrerequisites implements PrerequisitesInterface
         $request->setInstallationToken($installationToken);
         $request->setServerPublicKey($serverPublicKey);
         $request->setPrivateKey($this->getPrivateKey());
-        $request->setServer(config('firefly.bunq.server'));
         $request->call();
         $devices = $request->getDevices();
         /** @var DeviceServer $device */
@@ -186,7 +185,6 @@ class BunqPrerequisites implements PrerequisitesInterface
         // verify bunq api code:
         $publicKey = $this->getPublicKey();
         $request   = new InstallationTokenRequest;
-        $request->setServer(strval(config('firefly.bunq.server')));
         $request->setPublicKey($publicKey);
         $request->call();
         Log::debug('Sent request');
@@ -301,7 +299,6 @@ class BunqPrerequisites implements PrerequisitesInterface
         $serverPublicKey   = $this->getServerPublicKey();
         $apiKey            = Preferences::getForUser($this->user, 'bunq_api_key', '');
         $request           = new DeviceServerRequest;
-        $request->setServer(strval(config('firefly.bunq.server')));
         $request->setPrivateKey($this->getPrivateKey());
         $request->setDescription('Firefly III v' . config('firefly.version') . ' for ' . $this->user->email);
         $request->setSecret($apiKey->data);
diff --git a/config/firefly.php b/config/firefly.php
index 51c26ecb91..2ecb8a3782 100644
--- a/config/firefly.php
+++ b/config/firefly.php
@@ -45,6 +45,9 @@ return [
     'import_info'                => [
         'bunq' => 'FireflyIII\Support\Import\Information\BunqInformation',
     ],
+    'import_transactions'        => [
+        'bunq' => 'FireflyIII\Support\Import\Transactions\BunqTransactions',
+    ],
     'bunq'                       => [
         'server' => 'https://sandbox.public.api.bunq.com',
     ],
diff --git a/resources/views/import/bank/form.twig b/resources/views/import/bank/form.twig
new file mode 100644
index 0000000000..17bd9ac029
--- /dev/null
+++ b/resources/views/import/bank/form.twig
@@ -0,0 +1,69 @@
+{% extends "./layout/default" %}
+
+{% block breadcrumbs %}
+    {{ Breadcrumbs.renderIfExists }}
+{% endblock %}
+{% block content %}
+    <div class="row">
+        <form class="form-horizontal" action="{{ route('import.bank.form.post',[bank]) }}" method="post">
+            <input type="hidden" name="_token" value="{{ csrf_token() }}"/>
+            <div class="col-lg-12 col-md-12 col-sm-12">
+                <div class="box box-default">
+                    <div class="box-header with-border">
+                        <h3 class="box-title">{{ trans('bank.bank_form_title') }}</h3>
+                    </div>
+                    <div class="box-body">
+                        <div class="row">
+                            <div class="col-lg-8">
+                                <p>
+                                    {{ trans('bank.bank_form_text') }}
+                                </p>
+                            </div>
+                        </div>
+                        <div class="row">
+                            <div class="col-lg-8">
+                                <table class="table">
+                                    <thead>
+                                    <tr>
+                                        <th colspan="2">Account</th>
+                                        <th>Current balance</th>
+                                    </tr>
+                                    </thead>
+                                    <tbody>
+
+                                    {% for remoteAccount in remoteAccounts %}
+                                        <tr>
+                                            <td>
+                                                <input type="checkbox" name="do_import[{{ remoteAccount.id }}]" checked id="do_import_{{ remoteAccount.id }}" />
+                                            </td>
+                                            <td>
+                                                <strong {% if remoteAccount.color !='' %} style="color:{{ remoteAccount.color }}"{% endif %}>
+                                                    {{ remoteAccount.name }}
+                                                </strong>
+                                                <br />{{ remoteAccount.number }}
+                                            </td>
+                                            <td>
+                                                {{ remoteAccount.currency }}
+                                                {{ remoteAccount.balance }}
+                                            </td>
+                                        </tr>
+                                    {% endfor %}
+                                    </tbody>
+                                </table>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="box-footer">
+                        <button type="submit" class="btn pull-right btn-success">
+                            {{ ('submit')|_ }}
+                        </button>
+                    </div>
+                </div>
+            </div>
+        </form>
+    </div>
+{% endblock %}
+{% block scripts %}
+{% endblock %}
+{% block styles %}
+{% endblock %}
diff --git a/resources/views/import/bunq/prerequisites.twig b/resources/views/import/bunq/prerequisites.twig
index aafe01c93d..a70da151d1 100644
--- a/resources/views/import/bunq/prerequisites.twig
+++ b/resources/views/import/bunq/prerequisites.twig
@@ -5,7 +5,7 @@
 {% endblock %}
 {% block content %}
     <div class="row">
-        <form class="form-horizontal" id="report-form" action="{{ route('import.bank.prerequisites.post',['bunq']) }}" method="post">
+        <form class="form-horizontal" action="{{ route('import.bank.prerequisites.post',['bunq']) }}" method="post">
             <input type="hidden" name="_token" value="{{ csrf_token() }}"/>
             <div class="col-lg-12 col-md-12 col-sm-12">
                 <div class="box box-default">

From 5c2c9477850d3b1892b85bfb3d0d9fc6838a2929 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 27 Aug 2017 09:00:07 +0200
Subject: [PATCH 390/668] New translations firefly.php (Dutch)

---
 resources/lang/nl_NL/firefly.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/lang/nl_NL/firefly.php b/resources/lang/nl_NL/firefly.php
index 9673bae705..52744a1745 100644
--- a/resources/lang/nl_NL/firefly.php
+++ b/resources/lang/nl_NL/firefly.php
@@ -310,8 +310,8 @@ return [
     'no_location_set'                            => 'Zonder plaats',
     'meta_data'                                  => 'Metagegevens',
     'location'                                   => 'Plaats',
-    'without_date'                               => 'Without date',
-    'result'                                     => 'Result',
+    'without_date'                               => 'Zonder datum',
+    'result'                                     => 'Resultaat',
 
     // preferences
     'pref_home_screen_accounts'                  => 'Voorpaginarekeningen',

From b1b9804acab86a0ba0a5675286f20273104a88d4 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 27 Aug 2017 09:10:06 +0200
Subject: [PATCH 391/668] New translations firefly.php (German)

---
 resources/lang/de_DE/firefly.php | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/resources/lang/de_DE/firefly.php b/resources/lang/de_DE/firefly.php
index 3e343d2a5d..7f051be35a 100644
--- a/resources/lang/de_DE/firefly.php
+++ b/resources/lang/de_DE/firefly.php
@@ -27,7 +27,7 @@ return [
     'to'                                         => 'Bis',
     'showEverything'                             => 'Alles anzeigen',
     'never'                                      => 'Nie',
-    'no_results_for_empty_search'                => 'Your search was empty, so nothing was found.',
+    'no_results_for_empty_search'                => 'Ihre Suche war leer, also wurde nichts gefunden.',
     'removed_amount'                             => ':amount enfernt',
     'added_amount'                               => ':amount hinzugefügt',
     'asset_account_role_help'                    => 'Alle zusätzlichen Optionen, welche aus ihren Entscheidung entstehen, können später eingestellt werden.',
@@ -72,14 +72,14 @@ return [
     'user_id_is'                                 => 'Ihre Benutzerkennung ist <strong>:user</strong>',
     'field_supports_markdown'                    => 'Diese Feld unterstützt <a href="https://en.support.wordpress.com/markdown-quick-reference/"> Abschlag </a>.',
     'need_more_help'                             => 'Wenn du hilfe beim bedienen von Firefly III brauchst, <a href="https://github.com/firefly-iii/firefly-iii/issues">erstelle ein Ticket auf Github</a>.',
-    'reenable_intro_text'                        => 'You can also reenable <a href="#" id="reenableGuidance">the introduction guidance</a>.',
-    'intro_boxes_after_refresh'                  => 'The introduction boxes will reappear when you refresh the page.',
+    'reenable_intro_text'                        => 'Sie können auch <a href="#" id="reenableGuidance">die Einführung</a> wieder aktivieren.',
+    'intro_boxes_after_refresh'                  => 'Die Einführungsfelder werden wieder angezeigt, wenn Sie die Seite aktualisieren.',
     'show_all_no_filter'                         => 'Alle Transaktionen anzeigen, ohne diese nach Datum zu gruppieren.',
     'expenses_by_category'                       => 'Ausgaben nach Kategorie',
     'expenses_by_budget'                         => 'Ausgaben nach Budget',
     'income_by_category'                         => 'Einkommen nach Kategorie',
-    'expenses_by_asset_account'                  => 'Expenses by asset account',
-    'expenses_by_expense_account'                => 'Expenses by expense account',
+    'expenses_by_asset_account'                  => 'Aufwendungen nach Vermögenskonto',
+    'expenses_by_expense_account'                => 'Aufwendungen nach Aufwandskonto',
     'cannot_redirect_to_account'                 => 'Entschuldigung. Firefly III kann Sie nicht zur richtigen Seite weiterleiten.',
     'sum_of_expenses'                            => 'Summe von Ausgaben',
     'sum_of_income'                              => 'Summe von Einnahmen',
@@ -133,12 +133,12 @@ return [
 
     // search
     'search'                                     => 'Suche',
-    'search_found_transactions'                  => 'Number of transactions found:',
-    'general_search_error'                       => 'An error occured while searching. Please check the log files for more information.',
-    'search_box'                                 => 'Search',
-    'search_box_intro'                           => 'Welcome to the search function of Firefly III. Enter your search query in the box. Make sure you check out the help file because the search is pretty advanced.',
-    'search_error'                               => 'Error while searching',
-    'search_searching'                           => 'Searching ...',
+    'search_found_transactions'                  => 'Anzahl der gefundenen Transaktionen:',
+    'general_search_error'                       => 'Bei der Suche ist ein Fehler aufgetreten. Bitte überprüfen Sie die Protokolldateien für weitere Informationen.',
+    'search_box'                                 => 'Suche',
+    'search_box_intro'                           => 'Willkommen zur Suchfunktion von Firefly III. Geben Sie Ihre Suchanfrage in das Feld ein. Stellen Sie sicher, dass Sie sich die Hilfedatei ansehen, da die Suche ziemlich fortgeschritten ist.',
+    'search_error'                               => 'Fehler beim Suchen',
+    'search_searching'                           => 'Suche ...',
 
     // repeat frequencies:
     'repeat_freq_yearly'                         => 'Jährlich',
@@ -228,7 +228,7 @@ return [
     'warning_transaction_subset'                 => 'Aus Kapazitätgründen ist diese Liste auf :max_num_transactions Überweisungen limitiert und zeigt möglicherweise nur einen Teil dieser an',
     'warning_no_matching_transactions'           => 'Keine übereinstimmenden Überweisungen gefunden. Aus Kapazitätgründen werden nur die letzten :num_transactions Überweisungen überprüft.',
     'warning_no_valid_triggers'                  => 'Keine gültigen Trigger gefunden.',
-    'apply_rule_selection'                       => 'Apply rule ":title" to a selection of your transactions',
+    'apply_rule_selection'                       => 'Übernehmen Sie die Regel ": title" auf eine Auswahl Ihrer Transaktionen',
     'apply_rule_selection_intro'                 => 'Rules like ":title" are normally only applied to new or updated transactions, but you can tell Firefly III to run it on a selection of your existing transactions. This can be useful when you have updated a rule and you need the changes to be applied to all of your other transactions.',
     'include_transactions_from_accounts'         => 'Überweisungen von diesem Konto einbeziehen',
     'applied_rule_selection'                     => 'Rule ":title" has been applied to your selection.',

From f26c672421cf6b2854985f513030301397ff875e Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 27 Aug 2017 09:10:08 +0200
Subject: [PATCH 392/668] New translations breadcrumbs.php (German)

---
 resources/lang/de_DE/breadcrumbs.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/lang/de_DE/breadcrumbs.php b/resources/lang/de_DE/breadcrumbs.php
index 1666561f85..cf71c1e008 100644
--- a/resources/lang/de_DE/breadcrumbs.php
+++ b/resources/lang/de_DE/breadcrumbs.php
@@ -26,7 +26,7 @@ return [
     'edit_bill'           => 'Bearbeite Rechnung ":name"',
     'delete_bill'         => 'Lösche Rechnung ":name"',
     'reports'             => 'Berichte',
-    'search_result'       => 'Search results for ":query"',
+    'search_result'       => 'Suchergebnisse für ":query"',
     'withdrawal_list'     => 'Ausgaben',
     'deposit_list'        => 'Umsatz, Einkommen und Einlagen',
     'transfer_list'       => 'Überweisungen',
@@ -40,5 +40,5 @@ return [
     'createTag'           => 'Neuen Tag erstellen',
     'edit_tag'            => 'Bearbeite Tag ":tag"',
     'delete_tag'          => 'Lösche Tag ":tag"',
-    'delete_journal_link' => 'Delete link between transactions',
+    'delete_journal_link' => 'Verbindung zwischen Transaktionen löschen',
 ];
\ No newline at end of file

From f014828423144b3a8da7d7aaf84229d17edd0b68 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 27 Aug 2017 09:10:10 +0200
Subject: [PATCH 393/668] New translations csv.php (German)

---
 resources/lang/de_DE/csv.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/de_DE/csv.php b/resources/lang/de_DE/csv.php
index c110606470..cfdaf73cb9 100644
--- a/resources/lang/de_DE/csv.php
+++ b/resources/lang/de_DE/csv.php
@@ -35,7 +35,7 @@ return [
     'roles_column'                  => 'Spalte',
     'roles_no_example_data'         => 'Keine Beispieldaten vorhanden',
     'roles_submit'                  => 'Fortfahren mit Schritt 3/3',
-    'roles_warning'                 => 'At the very least, mark one column as the amount-column. It is advisable to also select a column for the description, date and the opposing account.',
+    'roles_warning'                 => 'Markieren Sie zumindest eine Spalte als Betrags-spalte. Es empfiehlt sich auch, eine Spalte für die Beschreibung, das Datum und das Gegenkonto auszuwählen.',
 
     // map data
     'map_title'                     => 'Import Einrichten (3/3) - Import mit bereits vorhandenen Daten verknüpfen',

From d89f45d53428ed7d7dfc023639ef63193534bd79 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 27 Aug 2017 09:20:05 +0200
Subject: [PATCH 394/668] New translations validation.php (German)

---
 resources/lang/de_DE/validation.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/de_DE/validation.php b/resources/lang/de_DE/validation.php
index 583ebb4302..b44eca6dfc 100644
--- a/resources/lang/de_DE/validation.php
+++ b/resources/lang/de_DE/validation.php
@@ -90,5 +90,5 @@ return [
     'in_array'                       => ':attribute existiert nicht in :other.',
     'present'                        => 'Das :attribute Feld muss vorhanden sein.',
     'amount_zero'                    => 'Der Gesamtbetrag darf nicht Null sein',
-    'secure_password'                => 'This is not a secure password. Please try again. For more information, visit https://goo.gl/NCh2tN',
+    'secure_password'                => 'Das ist kein sicheres Passwort. Bitte versuche es erneut. Weitere Informationen finden Sie unter https://goo.gl/NCh2tN',
 ];
\ No newline at end of file

From 6ffdbcafc51a7a04bb20765f4d4240159094e5d7 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 27 Aug 2017 09:20:06 +0200
Subject: [PATCH 395/668] New translations csv.php (German)

---
 resources/lang/de_DE/csv.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/de_DE/csv.php b/resources/lang/de_DE/csv.php
index cfdaf73cb9..910478384f 100644
--- a/resources/lang/de_DE/csv.php
+++ b/resources/lang/de_DE/csv.php
@@ -17,7 +17,7 @@ return [
     'initial_title'                 => 'Import Einrichten (1/3) - Grundlegende Einstellungen',
     'initial_text'                  => 'Um Ihre Datei korrekt importieren zu können, überprüfen Sie die folgenden Optionen.',
     'initial_box'                   => 'Standard CSV Importeinstellungen',
-    'initial_box_title'             => 'Basic CSV import setup options',
+    'initial_box_title'             => 'Standard CSV Importoptionen',
     'initial_header_help'           => 'Hier auswählen, wenn die ersten Zeilen der CSV-Datei die Spaltenüberschriften sind.',
     'initial_date_help'             => 'Datumsformat in ihrer CSV-Datei. Geben Sie das Format so an, wie es <a href="https://secure.php.net/manual/en/datetime.createfromformat.php#refsect1-datetime.createfromformat-parameters">diese Seite</a> zeigt. Die Standardeinstellung ergibt Daten die so aussehen: :dateExample.',
     'initial_delimiter_help'        => 'Wählen Sie das Trennzeichen, welches in ihrer Datei genutzt wird. Wenn Sie nicht sicher sind ist Komma die sicherste Option.',

From 47dd8610c6c24c634252b9e29c2f42b3a66225e1 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 27 Aug 2017 11:00:05 +0200
Subject: [PATCH 396/668] New translations breadcrumbs.php (Russian)

---
 resources/lang/ru_RU/breadcrumbs.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/ru_RU/breadcrumbs.php b/resources/lang/ru_RU/breadcrumbs.php
index 4b9bfd8f1d..40c55d9b63 100644
--- a/resources/lang/ru_RU/breadcrumbs.php
+++ b/resources/lang/ru_RU/breadcrumbs.php
@@ -40,5 +40,5 @@ return [
     'createTag'           => 'Создать новую метку',
     'edit_tag'            => 'Редактирование метки ":tag"',
     'delete_tag'          => 'Удаление метки ":tag"',
-    'delete_journal_link' => 'Delete link between transactions',
+    'delete_journal_link' => 'Удалить связь между транзакциями',
 ];
\ No newline at end of file

From b6227e633cdb01fe9a9a11d67ea583216a801bf6 Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Sun, 27 Aug 2017 11:07:14 +0200
Subject: [PATCH 397/668] Fix tests

---
 tests/Feature/Controllers/BudgetControllerTest.php | 6 +++---
 tests/Feature/Controllers/TagControllerTest.php    | 6 ++++++
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/tests/Feature/Controllers/BudgetControllerTest.php b/tests/Feature/Controllers/BudgetControllerTest.php
index 06aa91b33d..24bb163aed 100644
--- a/tests/Feature/Controllers/BudgetControllerTest.php
+++ b/tests/Feature/Controllers/BudgetControllerTest.php
@@ -44,7 +44,7 @@ class BudgetControllerTest extends TestCase
         $journalRepos->shouldReceive('first')->once()->andReturn(new TransactionJournal);
         $repository->shouldReceive('updateLimitAmount')->andReturn(new BudgetLimit);
 
-        $data = ['amount' => 200,];
+        $data = ['amount' => 200, 'start' => '2017-01-01', 'end' => '2017-01-31'];
         $this->be($this->user());
         $response = $this->post(route('budgets.amount', [1]), $data);
         $response->assertStatus(200);
@@ -61,7 +61,7 @@ class BudgetControllerTest extends TestCase
         $journalRepos->shouldReceive('first')->once()->andReturn(new TransactionJournal);
         $repository->shouldReceive('updateLimitAmount')->andReturn(new BudgetLimit);
 
-        $data = ['amount' => 0,];
+        $data = ['amount' => 0, 'start' => '2017-01-01', 'end' => '2017-01-31'];
         $this->be($this->user());
         $response = $this->post(route('budgets.amount', [1]), $data);
         $response->assertStatus(200);
@@ -542,7 +542,7 @@ class BudgetControllerTest extends TestCase
         $repository->shouldReceive('getAvailableBudget')->andReturn('1');
         $repository->shouldReceive('cleanupBudgets');
 
-        $response = $this->get(route('budgets.income', [1]));
+        $response = $this->get(route('budgets.income', ['2017-01-01', '2017-01-31']));
         $response->assertStatus(200);
     }
 
diff --git a/tests/Feature/Controllers/TagControllerTest.php b/tests/Feature/Controllers/TagControllerTest.php
index 7e1c5c8e76..4846cd6136 100644
--- a/tests/Feature/Controllers/TagControllerTest.php
+++ b/tests/Feature/Controllers/TagControllerTest.php
@@ -129,6 +129,9 @@ class TagControllerTest extends TestCase
         $repository->shouldReceive('firstUseDate')->andReturn(new Carbon)->once();
         $repository->shouldReceive('lastUseDate')->andReturn(new Carbon)->once();
         $repository->shouldReceive('earnedInPeriod')->andReturn('1')->once();
+        $repository->shouldReceive('sumOfTag')->andReturn('1')->once();
+        $repository->shouldReceive('resultOfTag')->andReturn('1')->once();
+
 
         $collector->shouldReceive('removeFilter')->andReturnSelf()->once();
 
@@ -161,6 +164,8 @@ class TagControllerTest extends TestCase
         $journalRepos->shouldReceive('first')->once()->andReturn(new TransactionJournal);
         $repository->shouldReceive('firstUseDate')->andReturn(new Carbon)->once();
 
+        $repository->shouldReceive('resultOfTag')->andReturn('1')->once();
+
         $collector->shouldReceive('removeFilter')->andReturnSelf()->once();
         $repository->shouldReceive('sumOfTag')->andReturn('1')->once();
         $collector->shouldReceive('setAllAssetAccounts')->andReturnSelf()->once();
@@ -195,6 +200,7 @@ class TagControllerTest extends TestCase
         $repository->shouldReceive('lastUseDate')->andReturn(new Carbon)->once();
         $repository->shouldReceive('earnedInPeriod')->andReturn('1')->once();
         $repository->shouldReceive('sumOfTag')->andReturn('1')->once();
+        $repository->shouldReceive('resultOfTag')->andReturn('1')->once();
 
         $collector->shouldReceive('removeFilter')->andReturnSelf()->once();
         $collector->shouldReceive('setAllAssetAccounts')->andReturnSelf()->once();

From a6f0faa058eccf3168bc5cd3ad8a64168e8add0b Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Mon, 28 Aug 2017 13:30:07 +0200
Subject: [PATCH 398/668] New translations list.php (German)

---
 resources/lang/de_DE/list.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/de_DE/list.php b/resources/lang/de_DE/list.php
index d18f01a6d5..04d2833b59 100644
--- a/resources/lang/de_DE/list.php
+++ b/resources/lang/de_DE/list.php
@@ -90,5 +90,5 @@ return [
     'tags_count'             => 'Anzahl Tags',
     'inward'                 => 'Inward description',
     'outward'                => 'Outward description',
-    'number_of_transactions' => 'Number of transactions',
+    'number_of_transactions' => 'Anzahl der Zahlungsvorgänge',
 ];
\ No newline at end of file

From 28af10444d353cd0c90469e373d855c6caddf6cf Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Mon, 28 Aug 2017 13:30:09 +0200
Subject: [PATCH 399/668] New translations form.php (German)

---
 resources/lang/de_DE/form.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/lang/de_DE/form.php b/resources/lang/de_DE/form.php
index b890cee4ff..eb43674b01 100644
--- a/resources/lang/de_DE/form.php
+++ b/resources/lang/de_DE/form.php
@@ -34,7 +34,7 @@ return [
     'journal_source_account_name'    => 'Kreditor (Quelle)',
     'journal_source_account_id'      => 'Girokonto (Quelle)',
     'BIC'                            => 'BIC',
-    'verify_password'                => 'Verify password security',
+    'verify_password'                => 'Überprüfen Sie die Kennwortsicherheit',
     'account_from_id'                => 'Vom Konto',
     'account_to_id'                  => 'Auf Konto',
     'source_account'                 => 'Quellkonto',
@@ -148,7 +148,7 @@ return [
     'journal_areYouSure'         => 'Sind Sie sicher, dass Sie die Überweisung mit dem Namen ":description" löschen möchten?',
     'mass_journal_are_you_sure'  => 'Sind Sie sicher, dass Sie diese Überweisung löschen möchten?',
     'tag_areYouSure'             => 'Sind Sie sicher, dass Sie den Tag ":name" löschen möchten?',
-    'journal_link_areYouSure'    => 'Are you sure you want to delete the link between <a href=":source_link">:source</a> and <a href=":destination_link">:destination</a>?',
+    'journal_link_areYouSure'    => 'Bist du sicher, dass du die Verknüpfung zwischen <a href=":source_link">:source</a> und <a href=":destination_link">:destination</a> löschen möchtest?',
     'linkType_areYouSure'        => 'Are you sure you want to delete the link type ":name" (":inward" / ":outward")?',
     'permDeleteWarning'          => 'Das Löschen von Dingen in Firefly ist dauerhaft und kann nicht rückgängig gemacht werden.',
     'mass_make_selection'        => 'Sie können das Löschen von Elementen verhinden, indem Sie die Checkbox entfernen.',

From 5c30146ee023616437d213d29fab66d9c12d87cc Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Mon, 28 Aug 2017 13:30:12 +0200
Subject: [PATCH 400/668] New translations firefly.php (German)

---
 resources/lang/de_DE/firefly.php | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/resources/lang/de_DE/firefly.php b/resources/lang/de_DE/firefly.php
index 7f051be35a..729d53502f 100644
--- a/resources/lang/de_DE/firefly.php
+++ b/resources/lang/de_DE/firefly.php
@@ -229,13 +229,13 @@ return [
     'warning_no_matching_transactions'           => 'Keine übereinstimmenden Überweisungen gefunden. Aus Kapazitätgründen werden nur die letzten :num_transactions Überweisungen überprüft.',
     'warning_no_valid_triggers'                  => 'Keine gültigen Trigger gefunden.',
     'apply_rule_selection'                       => 'Übernehmen Sie die Regel ": title" auf eine Auswahl Ihrer Transaktionen',
-    'apply_rule_selection_intro'                 => 'Rules like ":title" are normally only applied to new or updated transactions, but you can tell Firefly III to run it on a selection of your existing transactions. This can be useful when you have updated a rule and you need the changes to be applied to all of your other transactions.',
+    'apply_rule_selection_intro'                 => 'Regeln wie ": title" werden in der Regel nur auf neue oder aktualisierte Transaktionen angewandt, aber Sie können die Regel auch auf eine Auswahl Ihrer bestehenden Transaktionen anwenden. Dies kann nützlich sein, wenn Sie eine Regel aktualisiert haben und Sie die Änderungen benötigen, auf andere Transaktionen zu aktualisieren.',
     'include_transactions_from_accounts'         => 'Überweisungen von diesem Konto einbeziehen',
-    'applied_rule_selection'                     => 'Rule ":title" has been applied to your selection.',
+    'applied_rule_selection'                     => 'Regel ": Titel" wurde auf Ihre Auswahl angewendet.',
     'execute'                                    => 'Ausführen',
-    'apply_rule_group_selection'                 => 'Apply rule group ":title" to a selection of your transactions',
-    'apply_rule_group_selection_intro'           => 'Rule groups like ":title" are normally only applied to new or updated transactions, but you can tell Firefly III to run all the rules in this group on a selection of your existing transactions. This can be useful when you have updated a group of rules and you need the changes to be applied to all of your other transactions.',
-    'applied_rule_group_selection'               => 'Rule group ":title" has been applied to your selection.',
+    'apply_rule_group_selection'                 => 'Anwenden der Regelgruppe ": title" auf eine Auswahl Ihrer Transaktionen',
+    'apply_rule_group_selection_intro'           => 'Regelgruppen wie ": title" werden in der Regel nur auf neue oder aktualisierte Transaktionen angewandt, aber Sie können die Gruppe auch auf eine Auswahl Ihrer bestehenden Transaktionen anwenden. Dies kann nützlich sein, wenn Sie eine Gruppe aktualisiert haben und Sie die Änderungen benötigen, auf andere Transaktionen zu aktualisieren.',
+    'applied_rule_group_selection'               => 'Regelgruppe ": title" wurde auf Ihre Auswahl angewendet.',
 
     // actions and triggers
     'rule_trigger_user_action'                   => 'Die Nutzeraktion ist ":trigger_value"',
@@ -310,8 +310,8 @@ return [
     'no_location_set'                            => 'Kein Ort gesetzt.',
     'meta_data'                                  => 'Metadaten',
     'location'                                   => 'Standort',
-    'without_date'                               => 'Without date',
-    'result'                                     => 'Result',
+    'without_date'                               => 'Ohne Datum',
+    'result'                                     => 'Ergebnis',
 
     // preferences
     'pref_home_screen_accounts'                  => 'Konten auf dem Startbildschirm',
@@ -391,16 +391,16 @@ Sollen zusätzlich Ihre Girokonten angezeigt werden?',
     'password_changed'                           => 'Passwort geändert!',
     'should_change'                              => 'Ziel ist es, ihr Passwort zu ändern.',
     'invalid_password'                           => 'Ungültiges Passwort!',
-    'what_is_pw_security'                        => 'What is "verify password security"?',
-    'secure_pw_title'                            => 'How to choose a secure password',
-    'secure_pw_history'                          => 'In August 2017 well known security researcher Troy Hunt released a list of 306 million stolen passwords. These passwords were stolen during breakins at companies like LinkedIn, Adobe and NeoPets (and many more).',
+    'what_is_pw_security'                        => 'Was ist "Kennwort Sicherheit überprüfen"?',
+    'secure_pw_title'                            => 'So wählen Sie ein sicheres Passwort aus',
+    'secure_pw_history'                          => 'Im August 2017 veröffentlichte die bekannte Sicherheitsforscherin Troy Hunt eine Liste von 306 Millionen gestohlenen Passwörtern. Diese Passwörter wurden während der Einbrücje bei Firmen wie LinkedIn, Adobe und NeoPets (und vielen mehr) gestohlen.',
     'secure_pw_check_box'                        => 'By checking the box, Firefly III will send the SHA1 hash of your password to <a href="https://www.troyhunt.com/introducing-306-million-freely-downloadable-pwned-passwords/">the website of Troy Hunt</a> to see if it is on the list. This will stop you from using unsafe passwords as is recommended in the latest <a href="https://pages.nist.gov/800-63-3/sp800-63b.html">NIST Special Publication</a> on this subject.',
-    'secure_pw_sha1'                             => 'But I thought SHA1 was broken?',
+    'secure_pw_sha1'                             => 'Aber ich dachte, dass SHA1 kaputt war?',
     'secure_pw_hash_speed'                       => 'Yes, but not in this context. As you can read on <a href="https://shattered.io/">the website detailing how they broke SHA1</a>, it is now slightly easier to find a "collision": another string that results in the same SHA1-hash. It now only takes 10,000 years using a single-GPU machine.',
     'secure_pw_hash_security'                    => 'This collision would not be equal to your password, nor would it be useful on (a site like) Firefly III. This application does not use SHA1 for password verification. So it is safe to check this box. Your password is hashed and sent over HTTPS.',
     'secure_pw_should'                           => 'Should I check the box?',
-    'secure_pw_long_password'                    => 'If you just generated a long, single-use password for Firefly III using some kind of password generator: <strong>no</strong>.',
-    'secure_pw_short'                            => 'If you just entered the password you always use: <em>Please yes</em>.',
+    'secure_pw_long_password'                    => 'Wenn du gerade ein langes, Single-Use-Passwort für Firefly III mit einem Kennwortgenerator generiert hast: <strong>Nein</strong>.',
+    'secure_pw_short'                            => 'Wenn Sie gerade das Passwort eingegeben haben, verwenden Sie immer: <em>Bitte ja</em>.',
 
 
     // attachments
@@ -503,7 +503,7 @@ Sollen zusätzlich Ihre Girokonten angezeigt werden?',
     'update_amount'                              => 'Betrag aktualisieren',
     'update_budget'                              => 'Budget aktualisieren',
     'update_budget_amount_range'                 => 'Aktualisiere (erwarteten) verfügbaren Betrag zwischen :start und :end',
-    'budget_period_navigator'                    => 'Period navigator',
+    'budget_period_navigator'                    => 'Zeitraum-navigator',
 
     // bills:
     'matching_on'                                => 'Reagiert auf',
@@ -528,8 +528,8 @@ Sollen zusätzlich Ihre Girokonten angezeigt werden?',
     'average_bill_amount_overall'                => 'Durchschnittliche Rechnungssumme (gesamt)',
     'not_or_not_yet'                             => '(noch) nicht',
     'not_expected_period'                        => 'Diesen Zeitraum nicht erwartet',
-    'bill_is_active'                             => 'Bill is active',
-    'bill_will_automatch'                        => 'Bill will automatically linked to matching transactions',
+    'bill_is_active'                             => 'Rechnung ist aktiv',
+    'bill_will_automatch'                        => 'Rechnung wird automatisch mit passenden Transaktionen verknüpft',
     // accounts:
     'details_for_asset'                          => 'Details für Girokonto ":name"',
     'details_for_expense'                        => 'Details für Debitor ":name"',

From 4b7fc7b80ba62601adc809fcfb8d0c1dffde8ae6 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Mon, 28 Aug 2017 18:20:07 +0200
Subject: [PATCH 401/668] New translations breadcrumbs.php (Spanish)

---
 resources/lang/es_ES/breadcrumbs.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/es_ES/breadcrumbs.php b/resources/lang/es_ES/breadcrumbs.php
index 6f94cb1792..3c866039f5 100644
--- a/resources/lang/es_ES/breadcrumbs.php
+++ b/resources/lang/es_ES/breadcrumbs.php
@@ -40,5 +40,5 @@ return [
     'createTag'           => 'Crear nueva etiqueta',
     'edit_tag'            => 'Editar etiqueta ":tag"',
     'delete_tag'          => 'Eliminar etiqueta ":tag"',
-    'delete_journal_link' => 'Delete link between transactions',
+    'delete_journal_link' => 'Eliminar enlace entre transacciones',
 ];
\ No newline at end of file

From c6f2d4a0c48bccf9d785688af65b905fd8ab4f8c Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Mon, 28 Aug 2017 18:30:08 +0200
Subject: [PATCH 402/668] New translations list.php (Spanish)

---
 resources/lang/es_ES/list.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/resources/lang/es_ES/list.php b/resources/lang/es_ES/list.php
index b26fb4f2ad..f18389fe7f 100644
--- a/resources/lang/es_ES/list.php
+++ b/resources/lang/es_ES/list.php
@@ -88,7 +88,7 @@ return [
     'budget_count'           => 'Número de presupuestos',
     'rule_and_groups_count'  => 'Número de reglas y grupos de reglas',
     'tags_count'             => 'Número de etiquetas',
-    'inward'                 => 'Inward description',
-    'outward'                => 'Outward description',
-    'number_of_transactions' => 'Number of transactions',
+    'inward'                 => 'Descripción interna',
+    'outward'                => 'Descripción externa',
+    'number_of_transactions' => 'Número de transacciones',
 ];
\ No newline at end of file

From 9adfbf1668f0480cc4618d59ab6754a168ebb98c Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Mon, 28 Aug 2017 18:40:06 +0200
Subject: [PATCH 403/668] New translations csv.php (Spanish)

---
 resources/lang/es_ES/csv.php | 46 ++++++++++++++++++------------------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/resources/lang/es_ES/csv.php b/resources/lang/es_ES/csv.php
index ffdf32c5eb..05fff74b06 100644
--- a/resources/lang/es_ES/csv.php
+++ b/resources/lang/es_ES/csv.php
@@ -14,36 +14,36 @@ declare(strict_types=1);
 return [
 
     // initial config
-    'initial_title'                 => 'Import setup (1/3) - Basic CSV import setup',
+    'initial_title'                 => 'Configuración de importación (1/3) - Configuración de importación de CSV simple',
     'initial_text'                  => 'Para poder importar correctamente el archivo, por favor comprueba las opciones a continuación.',
-    'initial_box'                   => 'Basic CSV import setup',
-    'initial_box_title'             => 'Basic CSV import setup options',
+    'initial_box'                   => 'Configuración de importación de CSV simple',
+    'initial_box_title'             => 'Opciones de configuración para importación de CSV simple',
     'initial_header_help'           => 'Marque aquí si el CSV contiene títulos de columna en la primera fila.',
-    'initial_date_help'             => 'Date time format in your CSV. Follow the format like <a href="https://secure.php.net/manual/en/datetime.createfromformat.php#refsect1-datetime.createfromformat-parameters">this page</a> indicates. The default value will parse dates that look like this: :dateExample.',
-    'initial_delimiter_help'        => 'Choose the field delimiter that is used in your input file. If not sure, comma is the safest option.',
-    'initial_import_account_help'   => 'If your CSV file does NOT contain information about your asset account(s), use this dropdown to select to which account the transactions in the CSV belong to.',
-    'initial_submit'                => 'Continue with step 2/3',
+    'initial_date_help'             => 'Formato de fecha y hora en el CSV. Siga un formato como los que indica <a href="https://secure.php.net/manual/es/datetime.createfromformat.php#refsect1-datetime.createfromformat-parameters">esta página</a>. El valor por defecto interpretará fechas que se vean así: :dateExample.',
+    'initial_delimiter_help'        => 'Elija el delimitador de campos de su archivo de entrada. Si no está seguro, la coma es la opción más segura.',
+    'initial_import_account_help'   => 'Si su archivo CSV NO contiene información sobre su(s) caja(s) de ahorros, seleccione una opción del desplegable para definir a qué cuenta pertenecen las transacciones del CSV.',
+    'initial_submit'                => 'Continúe con el paso 2/3',
 
     // roles config
-    'roles_title'                   => 'Import setup (2/3) - Define each column\'s role',
-    'roles_text'                    => 'Each column in your CSV file contains certain data. Please indicate what kind of data the importer should expect. The option to "map" data means that you will link each entry found in the column to a value in your database. An often mapped column is the column that contains the IBAN of the opposing account. That can be easily matched to IBAN\'s present in your database already.',
-    'roles_table'                   => 'Table',
-    'roles_column_name'             => 'Name of column',
-    'roles_column_example'          => 'Column example data',
-    'roles_column_role'             => 'Column data meaning',
-    'roles_do_map_value'            => 'Map these values',
-    'roles_column'                  => 'Column',
-    'roles_no_example_data'         => 'No example data available',
-    'roles_submit'                  => 'Continue with step 3/3',
-    'roles_warning'                 => 'At the very least, mark one column as the amount-column. It is advisable to also select a column for the description, date and the opposing account.',
+    'roles_title'                   => 'Configuración de importación (2/3) - Define el rol de cada columna',
+    'roles_text'                    => 'Cada columna en su archivo CSV contiene ciertos datos. Indique qué tipo de datos debe esperar el importador. La opción de "mapear" datos significa que enlazará cada entrada encontrada en la columna con un valor en su base de datos. Una columna a menudo mapeada es la columna que contiene el IBAN de la cuenta de contrapartida. Eso puede enlazarse fácilmente con cuentas IBAN ya presentes en su base de datos.',
+    'roles_table'                   => 'Tabla',
+    'roles_column_name'             => 'Nombre de la columna',
+    'roles_column_example'          => 'Ejemplo de datos de columna',
+    'roles_column_role'             => 'Significado de los datos de la columna',
+    'roles_do_map_value'            => 'Mapear estos valores',
+    'roles_column'                  => 'Columna',
+    'roles_no_example_data'         => 'No hay datos de ejemplo disponibles',
+    'roles_submit'                  => 'Continúe con el paso 3/3',
+    'roles_warning'                 => 'Como mínimo, marque una columna como la columna de importe. También es aconsejable seleccionar una columna para la descripción, fecha y la cuenta de contrapartida.',
 
     // map data
-    'map_title'                     => 'Import setup (3/3) - Connect import data to Firefly III data',
+    'map_title'                     => 'Configuración de la importación (3/3) - Conecta los datos de importación a los datos de Firefly III',
     'map_text'                      => 'En las siguientes tablas el valor de la izquierda muestra información encontrada en el CSV cargado. Es su tarea mapear este valor, si es posible, a un valor ya presente en su base de datos. Firefly respeterá este mapeo. Si no hay un valor hacia el cual mapear o no desea mapear un valor específico, no seleccione ninguno.',
-    'map_field_value'               => 'Field value',
-    'map_field_mapped_to'           => 'Mapped to',
-    'map_do_not_map'                => '(do not map)',
-    'map_submit'                    => 'Start the import',
+    'map_field_value'               => 'Valor del campo',
+    'map_field_mapped_to'           => 'Mapeado a',
+    'map_do_not_map'                => '(no mapear)',
+    'map_submit'                    => 'Iniciar la importación',
 
     // map things.
     'column__ignore'                => '(ignorar esta columna)',

From aa64e7947e4b8f1b4967e30617924380f8b51310 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Mon, 28 Aug 2017 18:40:07 +0200
Subject: [PATCH 404/668] New translations help.php (Spanish)

---
 resources/lang/es_ES/help.php | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/resources/lang/es_ES/help.php b/resources/lang/es_ES/help.php
index 0f77f62304..d34ea04a3f 100644
--- a/resources/lang/es_ES/help.php
+++ b/resources/lang/es_ES/help.php
@@ -14,22 +14,22 @@ declare(strict_types=1);
 return [
 
     // tour!
-    'main-content-title'     => 'Welcome to Firefly III',
+    'main-content-title'     => 'Bienvenido a Firefly III',
     'main-content-text'      => 'Do yourself a favor and follow this short guide to make sure you know your way around.',
-    'sidebar-toggle-title'   => 'Sidebar to create stuff',
-    'sidebar-toggle-text'    => 'Hidden under the plus icon are all the buttons to create new stuff. Accounts, transactions, everything!',
-    'account-menu-title'     => 'All your accounts',
-    'account-menu-text'      => 'Here you can find all the accounts you\'ve made.',
-    'budget-menu-title'      => 'Budgets',
-    'budget-menu-text'       => 'Use this page to organise your finances and limit spending.',
-    'report-menu-title'      => 'Reports',
+    'sidebar-toggle-title'   => 'Barra lateral para crear items',
+    'sidebar-toggle-text'    => 'Ocultos bajo el icono más (+) encontrará botones para crear items nuevos. Cuentas, transacciones, ¡de todo!',
+    'account-menu-title'     => 'Todas sus cuentas',
+    'account-menu-text'      => 'Aquí puede encontrar todas las cuentas que ha creado.',
+    'budget-menu-title'      => 'Presupuestos',
+    'budget-menu-text'       => 'Utilice esta página para organizar sus finanzas y limitar el gasto.',
+    'report-menu-title'      => 'Informes',
     'report-menu-text'       => 'Check this out when you want a solid overview of your finances.',
-    'transaction-menu-title' => 'Transactions',
-    'transaction-menu-text'  => 'All transactions you\'ve created can be found here.',
-    'option-menu-title'      => 'Options',
-    'option-menu-text'       => 'This is pretty self-explanatory.',
-    'main-content-end-title' => 'The end!',
-    'main-content-end-text'  => 'Remember that every page has a small question mark at the right top. Click it to get help about the page you\'re on.',
-    'index'                  => 'index',
+    'transaction-menu-title' => 'Transacciones',
+    'transaction-menu-text'  => 'Aquí encontrarás todas las transacciones que has creado.',
+    'option-menu-title'      => 'Opciones',
+    'option-menu-text'       => 'Esto se explica por sí solo.',
+    'main-content-end-title' => '¡Fin!',
+    'main-content-end-text'  => 'Recuerde que cada página tiene un pequeño signo de interrogación en la parte superior derecha. Haz clic en él para obtener ayuda sobre la página en la que estás.',
+    'index'                  => 'índice',
     'home'                   => 'home',
 ];
\ No newline at end of file

From 17501c6cadd30f5ca57180281ad2fd4d26fe39d6 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Mon, 28 Aug 2017 18:50:05 +0200
Subject: [PATCH 405/668] New translations help.php (Spanish)

---
 resources/lang/es_ES/help.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/resources/lang/es_ES/help.php b/resources/lang/es_ES/help.php
index d34ea04a3f..e5ae3baf33 100644
--- a/resources/lang/es_ES/help.php
+++ b/resources/lang/es_ES/help.php
@@ -15,7 +15,7 @@ return [
 
     // tour!
     'main-content-title'     => 'Bienvenido a Firefly III',
-    'main-content-text'      => 'Do yourself a favor and follow this short guide to make sure you know your way around.',
+    'main-content-text'      => 'Hazte un favor y sigue esta breve guía para asegurarte de que sabes manejarte en el sistema.',
     'sidebar-toggle-title'   => 'Barra lateral para crear items',
     'sidebar-toggle-text'    => 'Ocultos bajo el icono más (+) encontrará botones para crear items nuevos. Cuentas, transacciones, ¡de todo!',
     'account-menu-title'     => 'Todas sus cuentas',
@@ -23,7 +23,7 @@ return [
     'budget-menu-title'      => 'Presupuestos',
     'budget-menu-text'       => 'Utilice esta página para organizar sus finanzas y limitar el gasto.',
     'report-menu-title'      => 'Informes',
-    'report-menu-text'       => 'Check this out when you want a solid overview of your finances.',
+    'report-menu-text'       => 'Comprueba esto cuando quieras tener una visión general de tus finanzas.',
     'transaction-menu-title' => 'Transacciones',
     'transaction-menu-text'  => 'Aquí encontrarás todas las transacciones que has creado.',
     'option-menu-title'      => 'Opciones',
@@ -31,5 +31,5 @@ return [
     'main-content-end-title' => '¡Fin!',
     'main-content-end-text'  => 'Recuerde que cada página tiene un pequeño signo de interrogación en la parte superior derecha. Haz clic en él para obtener ayuda sobre la página en la que estás.',
     'index'                  => 'índice',
-    'home'                   => 'home',
+    'home'                   => 'inicio',
 ];
\ No newline at end of file

From c8f4c6bd49faa68768b9cfbf7b0650c971020c01 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Mon, 28 Aug 2017 19:00:12 +0200
Subject: [PATCH 406/668] New translations form.php (Spanish)

---
 resources/lang/es_ES/form.php | 58 +++++++++++++++++------------------
 1 file changed, 29 insertions(+), 29 deletions(-)

diff --git a/resources/lang/es_ES/form.php b/resources/lang/es_ES/form.php
index 2121358fdc..839788ad33 100644
--- a/resources/lang/es_ES/form.php
+++ b/resources/lang/es_ES/form.php
@@ -46,31 +46,31 @@ return [
     'note'                           => 'Notas',
     'split_journal'                  => 'Split this transaction',
     'split_journal_explanation'      => 'Split this transaction in multiple parts',
-    'currency'                       => 'Currency',
+    'currency'                       => 'Divisa',
     'account_id'                     => 'Asset account',
-    'budget_id'                      => 'Budget',
-    'openingBalance'                 => 'Opening balance',
+    'budget_id'                      => 'Presupuesto',
+    'openingBalance'                 => 'Saldo inicial',
     'tagMode'                        => 'Tag mode',
     'tagPosition'                    => 'Tag location',
-    'virtualBalance'                 => 'Virtual balance',
-    'longitude_latitude'             => 'Location',
-    'targetamount'                   => 'Target amount',
-    'accountRole'                    => 'Account role',
-    'openingBalanceDate'             => 'Opening balance date',
+    'virtualBalance'                 => 'Saldo virtual',
+    'longitude_latitude'             => 'Ubicación',
+    'targetamount'                   => 'Cantidad objetivo',
+    'accountRole'                    => 'Tipo de cuenta',
+    'openingBalanceDate'             => 'Fecha del saldo inicial',
     'ccType'                         => 'Credit card payment plan',
     'ccMonthlyPaymentDate'           => 'Credit card monthly payment date',
     'piggy_bank_id'                  => 'Piggy bank',
     'returnHere'                     => 'Return here',
     'returnHereExplanation'          => 'After storing, return here to create another one.',
     'returnHereUpdateExplanation'    => 'After updating, return here.',
-    'description'                    => 'Description',
-    'expense_account'                => 'Expense account',
-    'revenue_account'                => 'Revenue account',
-    'decimal_places'                 => 'Decimal places',
-    'exchange_rate_instruction'      => 'Foreign currencies',
+    'description'                    => 'Descripción',
+    'expense_account'                => 'Cuenta de gastos',
+    'revenue_account'                => 'Cuenta de ingresos',
+    'decimal_places'                 => 'Lugares decimales',
+    'exchange_rate_instruction'      => 'Monedas extranjeras',
     'exchanged_amount'               => 'Exchanged amount',
-    'source_amount'                  => 'Amount (source)',
-    'destination_amount'             => 'Amount (destination)',
+    'source_amount'                  => 'Importe (origen)',
+    'destination_amount'             => 'Importe (destino)',
     'native_amount'                  => 'Native amount',
 
     'revenue_account_source'      => 'Revenue account (source)',
@@ -80,19 +80,19 @@ return [
     'source_account_revenue'      => 'Source account (revenue account)',
     'type'                        => 'Tipo',
     'convert_Withdrawal'          => 'Convert withdrawal',
-    'convert_Deposit'             => 'Convert deposit',
-    'convert_Transfer'            => 'Convert transfer',
+    'convert_Deposit'             => 'Convertir depósito',
+    'convert_Transfer'            => 'Convertir transferencia',
 
 
     'amount'                     => 'Importe',
     'date'                       => 'Fecha',
-    'interest_date'              => 'Interest date',
+    'interest_date'              => 'Fecha de interés',
     'book_date'                  => 'Book date',
-    'process_date'               => 'Processing date',
-    'category'                   => 'Category',
-    'tags'                       => 'Tags',
-    'deletePermanently'          => 'Delete permanently',
-    'cancel'                     => 'Cancel',
+    'process_date'               => 'Fecha de procesamiento',
+    'category'                   => 'Categoría',
+    'tags'                       => 'Etiquetas',
+    'deletePermanently'          => 'Borrar permanentemente',
+    'cancel'                     => 'Cancelar',
     'targetdate'                 => 'Target date',
     'tag'                        => 'Etiqueta',
     'under'                      => 'Under',
@@ -130,12 +130,12 @@ return [
     'delete_bill'                => 'Delete bill ":name"',
     'delete_budget'              => 'Delete budget ":name"',
     'delete_category'            => 'Delete category ":name"',
-    'delete_currency'            => 'Delete currency ":name"',
-    'delete_journal'             => 'Delete transaction with description ":description"',
-    'delete_attachment'          => 'Delete attachment ":name"',
-    'delete_rule'                => 'Delete rule ":title"',
-    'delete_rule_group'          => 'Delete rule group ":title"',
-    'delete_link_type'           => 'Delete link type ":name"',
+    'delete_currency'            => 'Eliminar divisa ":name"',
+    'delete_journal'             => 'Eliminar la transacción con descripción ":description"',
+    'delete_attachment'          => 'Eliminar adjunto ":name"',
+    'delete_rule'                => 'Eliminar regla ":title"',
+    'delete_rule_group'          => 'Eliminar grupo de reglas ":title"',
+    'delete_link_type'           => 'Eliminar tipo de enlace ":name"',
     'attachment_areYouSure'      => 'Are you sure you want to delete the attachment named ":name"?',
     'account_areYouSure'         => 'Are you sure you want to delete the account named ":name"?',
     'bill_areYouSure'            => 'Are you sure you want to delete the bill named ":name"?',

From 3cce84dfa7651724b91b26b755ca9501f7c7e469 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Mon, 28 Aug 2017 19:00:14 +0200
Subject: [PATCH 407/668] New translations firefly.php (Spanish)

---
 resources/lang/es_ES/firefly.php | 56 ++++++++++++++++----------------
 1 file changed, 28 insertions(+), 28 deletions(-)

diff --git a/resources/lang/es_ES/firefly.php b/resources/lang/es_ES/firefly.php
index c046bbba3a..a1dfbdad46 100644
--- a/resources/lang/es_ES/firefly.php
+++ b/resources/lang/es_ES/firefly.php
@@ -65,32 +65,32 @@ return [
     'registered'                                 => '¡Te has registrado con éxito!',
     'Default asset account'                      => '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.',
-    'Savings account'                            => 'Savings account',
-    'Credit card'                                => 'Credit card',
-    'source_accounts'                            => 'Source account(s)',
-    'destination_accounts'                       => 'Destination account(s)',
-    'user_id_is'                                 => 'Your user id is <strong>:user</strong>',
-    'field_supports_markdown'                    => 'This field supports <a href="https://en.support.wordpress.com/markdown-quick-reference/">Markdown</a>.',
-    'need_more_help'                             => 'If you need more help using Firefly III, please <a href="https://github.com/firefly-iii/firefly-iii/issues">open a ticket on Github</a>.',
-    'reenable_intro_text'                        => 'You can also reenable <a href="#" id="reenableGuidance">the introduction guidance</a>.',
-    'intro_boxes_after_refresh'                  => 'The introduction boxes will reappear when you refresh the page.',
-    'show_all_no_filter'                         => 'Show all transactions without grouping them by date.',
-    'expenses_by_category'                       => 'Expenses by category',
-    'expenses_by_budget'                         => 'Expenses by budget',
-    'income_by_category'                         => 'Income by category',
+    'Savings account'                            => 'Cuenta de ahorros',
+    'Credit card'                                => 'Tarjeta de crédito',
+    'source_accounts'                            => 'Cuenta(s) origen',
+    'destination_accounts'                       => 'Cuenta(s) destino',
+    'user_id_is'                                 => 'Tu id de usuario es <strong>: user</strong>',
+    'field_supports_markdown'                    => 'Este campo admite <a href="https://en.support.wordpress.com/markdown-quick-reference/">Markdown</a>.',
+    'need_more_help'                             => 'Si necesita más ayuda con Firefly III, por favor <a href="https://github.com/firefly-iii/firefly-iii/issues">abre un ticket en Github</a>.',
+    'reenable_intro_text'                        => 'También puede volver a activar <a href="#" id="reenableGuidance">la guía de introducción</a>.',
+    'intro_boxes_after_refresh'                  => 'Los cuadros de introducción volverán a aparecer cuando actualices la página.',
+    'show_all_no_filter'                         => 'Mostrar todas las transacciones sin agruparlas por fecha.',
+    'expenses_by_category'                       => 'Gastos por categoría',
+    'expenses_by_budget'                         => 'Gastos por presupuesto',
+    'income_by_category'                         => 'Ingresos por categoría',
     'expenses_by_asset_account'                  => 'Expenses by asset account',
     'expenses_by_expense_account'                => 'Expenses by expense account',
     'cannot_redirect_to_account'                 => 'Firefly III cannot redirect you to the correct page. Apologies.',
-    'sum_of_expenses'                            => 'Sum of expenses',
-    'sum_of_income'                              => 'Sum of income',
-    'total_sum'                                  => 'Total sum',
+    'sum_of_expenses'                            => 'Total gastos',
+    'sum_of_income'                              => 'Total ingresos',
+    'total_sum'                                  => 'Suma total',
     'spent_in_specific_budget'                   => 'Spent in budget ":budget"',
     'sum_of_expenses_in_budget'                  => 'Spent total in budget ":budget"',
     'left_in_budget_limit'                       => 'Left to spend according to budgeting',
     'cannot_reset_demo_user'                     => 'You cannot reset the password of the demonstration account',
-    'current_period'                             => 'Current period',
-    'show_the_current_period_and_overview'       => 'Show the current period and overview',
-    'pref_languages_locale'                      => 'For a language other than English to work properly, your operating system must be equipped with the correct locale-information. If these are not present, currency data, dates and amounts may be formatted wrong.',
+    'current_period'                             => 'Período actual',
+    'show_the_current_period_and_overview'       => 'Mostrar el período actual y el resumen',
+    'pref_languages_locale'                      => 'Para que un idioma distinto al inglés funcione correctamente, su sistema operativo debe disponer de la información regional correcta. Si no está disponible, los datos de divisas, fechas y cantidades pueden tener un formato incorrecto.',
     'budget_in_period'                           => 'All transactions for budget ":name" between :start and :end',
     'chart_budget_in_period'                     => 'Chart for all transactions for budget ":name" between :start and :end',
     'chart_account_in_period'                    => 'Chart for all transactions for account ":name" between :start and :end',
@@ -98,10 +98,10 @@ return [
     'chart_category_all'                         => 'Chart for all transactions for category ":name"',
     'clone_withdrawal'                           => 'Clone this withdrawal',
     'clone_deposit'                              => 'Clone this deposit',
-    'clone_transfer'                             => 'Clone this transfer',
+    'clone_transfer'                             => 'Duplicar esta transferencia',
     'multi_select_no_selection'                  => 'None selected',
     'multi_select_all_selected'                  => 'All selected',
-    'multi_select_filter_placeholder'            => 'Find..',
+    'multi_select_filter_placeholder'            => 'Buscar...',
     'between_dates_breadcrumb'                   => 'Between :start and :end',
     'all_journals_without_budget'                => 'All transactions without a budget',
     'journals_without_budget'                    => 'Transactions without a budget',
@@ -110,16 +110,16 @@ return [
     'all_journals_for_account'                   => 'All transactions for account :name',
     'chart_all_journals_for_account'             => 'Chart of all transactions for account :name',
     'journals_in_period_for_account'             => 'All transactions for account :name between :start and :end',
-    'transferred'                                => 'Transferred',
-    'all_withdrawal'                             => 'All expenses',
-    'all_transactions'                           => 'All transactions',
+    'transferred'                                => 'Transferido',
+    'all_withdrawal'                             => 'Todos los gastos',
+    'all_transactions'                           => 'Todas las transacciones',
     'title_withdrawal_between'                   => 'All expenses between :start and :end',
-    'all_deposit'                                => 'All revenue',
+    'all_deposit'                                => 'Todos los ingresos',
     'title_deposit_between'                      => 'All revenue between :start and :end',
-    'all_transfers'                              => 'All transfers',
+    'all_transfers'                              => 'Todas las transferencias',
     'title_transfers_between'                    => 'All transfers between :start and :end',
-    'all_transfer'                               => 'All transfers',
-    'all_journals_for_tag'                       => 'All transactions for tag ":tag"',
+    'all_transfer'                               => 'Todas las transferencias',
+    'all_journals_for_tag'                       => 'Todas las transacciones etiquetadas como ":tag"',
     'title_transfer_between'                     => 'All transfers between :start and :end',
     'all_journals_for_category'                  => 'All transactions for category :name',
     'all_journals_for_budget'                    => 'All transactions for budget :name',

From c6cc750166c35bdb452f58c4fcac48bbd3e772b9 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Tue, 29 Aug 2017 09:20:12 +0200
Subject: [PATCH 408/668] New translations firefly.php (Spanish)

---
 resources/lang/es_ES/firefly.php | 66 ++++++++++++++++----------------
 1 file changed, 33 insertions(+), 33 deletions(-)

diff --git a/resources/lang/es_ES/firefly.php b/resources/lang/es_ES/firefly.php
index a1dfbdad46..592434f0b6 100644
--- a/resources/lang/es_ES/firefly.php
+++ b/resources/lang/es_ES/firefly.php
@@ -17,7 +17,7 @@ return [
     'actions'                                    => 'Acciones',
     'edit'                                       => 'Editar',
     'delete'                                     => 'Eliminar',
-    'welcomeBack'                                => '¿Qué está tocando?',
+    'welcomeBack'                                => '¿Qué está pasando?',
     'everything'                                 => 'Todo',
     'customRange'                                => 'Rango personalizado',
     'apply'                                      => 'Aplicar',
@@ -64,7 +64,7 @@ return [
     'warning_much_data'                          => ':days days of data may take a while to load.',
     'registered'                                 => '¡Te has registrado con éxito!',
     'Default asset account'                      => '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'                          => 'Parece que aún no tienes presupuestos. Debe crear algunos en la página <a href="/budgets">presupuestos</a>. Los presupuestos pueden ayudarle a realizar un seguimiento de los gastos.',
     'Savings account'                            => 'Cuenta de ahorros',
     'Credit card'                                => 'Tarjeta de crédito',
     'source_accounts'                            => 'Cuenta(s) origen',
@@ -285,7 +285,7 @@ return [
     'rule_action_clear_budget'                   => 'Clear budget',
     'rule_action_add_tag'                        => 'Add tag ":action_value"',
     'rule_action_remove_tag'                     => 'Remove tag ":action_value"',
-    'rule_action_remove_all_tags'                => 'Remove all tags',
+    'rule_action_remove_all_tags'                => 'Eliminar todas las etiquetas',
     'rule_action_set_description'                => 'Set description to ":action_value"',
     'rule_action_append_description'             => 'Append description with ":action_value"',
     'rule_action_prepend_description'            => 'Prepend description with ":action_value"',
@@ -295,7 +295,7 @@ return [
     'rule_action_clear_budget_choice'            => 'Clear any budget',
     'rule_action_add_tag_choice'                 => 'Add tag..',
     'rule_action_remove_tag_choice'              => 'Remove tag..',
-    'rule_action_remove_all_tags_choice'         => 'Remove all tags',
+    'rule_action_remove_all_tags_choice'         => 'Eliminar todas las etiquetas',
     'rule_action_set_description_choice'         => 'Set description to..',
     'rule_action_append_description_choice'      => 'Append description with..',
     'rule_action_prepend_description_choice'     => 'Prepend description with..',
@@ -314,8 +314,8 @@ return [
     'result'                                     => 'Result',
 
     // preferences
-    'pref_home_screen_accounts'                  => 'Home screen accounts',
-    'pref_home_screen_accounts_help'             => 'Which accounts should be displayed on the home page?',
+    'pref_home_screen_accounts'                  => 'Cuentas de la pantalla de inicio',
+    'pref_home_screen_accounts_help'             => '¿Qué cuentas se deben mostrar en la página de inicio?',
     'pref_view_range'                            => 'View range',
     'pref_view_range_help'                       => 'Some charts are automatically grouped in periods. What period would you prefer?',
     'pref_1D'                                    => 'One day',
@@ -493,7 +493,7 @@ return [
     'transactions_no_budget'                     => 'Expenses without budget between :start and :end',
     'spent_between'                              => 'Spent between :start and :end',
     'createBudget'                               => 'New budget',
-    'inactiveBudgets'                            => 'Inactive budgets',
+    'inactiveBudgets'                            => 'Presupuestos inactivos',
     'without_budget_between'                     => 'Transactions without a budget between :start and :end',
     'delete_budget'                              => 'Delete budget ":name"',
     'deleted_budget'                             => 'Deleted budget ":name"',
@@ -553,9 +553,9 @@ return [
     'make_new_expense_account'                   => 'Create a new expense account',
     'make_new_revenue_account'                   => 'Create a new revenue account',
     'asset_accounts'                             => 'Asset accounts',
-    'expense_accounts'                           => 'Expense accounts',
-    'revenue_accounts'                           => 'Revenue accounts',
-    'cash_accounts'                              => 'Cash accounts',
+    'expense_accounts'                           => 'Cuentas de gastos',
+    'revenue_accounts'                           => 'Cuentas de ingresos',
+    'cash_accounts'                              => 'Cuentas de efectivo',
     'Cash account'                               => 'Cash account',
     'account_type'                               => 'Account type',
     'save_transactions_by_moving'                => 'Save these transaction(s) by moving them to another account:',
@@ -576,7 +576,7 @@ return [
     'without_category'                           => 'Without a category',
     'update_category'                            => 'Update category',
     'updated_category'                           => 'Updated category ":name"',
-    'categories'                                 => 'Categories',
+    'categories'                                 => 'Categorías',
     'edit_category'                              => 'Edit category ":name"',
     'no_category'                                => '(no category)',
     'category'                                   => 'Category',
@@ -622,8 +622,8 @@ return [
     'stored_new_accounts_new_user'               => 'Yay! Your new accounts have been stored.',
 
     // home page:
-    'yourAccounts'                               => 'Your accounts',
-    'budgetsAndSpending'                         => 'Budgets and spending',
+    'yourAccounts'                               => 'Tus cuentas',
+    'budgetsAndSpending'                         => 'Presupuestos y gastos',
     'savings'                                    => 'Savings',
     'newWithdrawal'                              => 'New expense',
     'newDeposit'                                 => 'New deposit',
@@ -638,17 +638,17 @@ return [
     'preferences'                                => 'Preferences',
     'logout'                                     => 'Logout',
     'searchPlaceholder'                          => 'Search...',
-    'dashboard'                                  => 'Dashboard',
+    'dashboard'                                  => 'Panel de control',
     'currencies'                                 => 'Currencies',
-    'accounts'                                   => 'Accounts',
+    'accounts'                                   => 'Cuentas',
     'Asset account'                              => 'Asset account',
     'Default account'                            => 'Asset account',
     'Expense account'                            => 'Expense account',
     'Revenue account'                            => 'Revenue account',
     'Initial balance account'                    => 'Initial balance account',
-    'budgets'                                    => 'Budgets',
-    'tags'                                       => 'Tags',
-    'reports'                                    => 'Reports',
+    'budgets'                                    => 'Presupuestos',
+    'tags'                                       => 'Etiquetas',
+    'reports'                                    => 'Informes',
     'transactions'                               => 'Transactions',
     'expenses'                                   => 'Expenses',
     'income'                                     => 'Revenue / income',
@@ -715,7 +715,7 @@ return [
     'report_type_budget'                         => 'Budget report',
     'report_type_tag'                            => 'Tag report',
     'more_info_help'                             => 'More information about these types of reports can be found in the help pages. Press the (?) icon in the top right corner.',
-    'report_included_accounts'                   => 'Included accounts',
+    'report_included_accounts'                   => 'Cuentas incluidas',
     'report_date_range'                          => 'Date range',
     'report_preset_ranges'                       => 'Pre-set ranges',
     'shared'                                     => 'Shared',
@@ -858,8 +858,8 @@ return [
     'user_data_information'                 => 'User data',
     'user_information'                      => 'User information',
     'total_size'                            => 'total size',
-    'budget_or_budgets'                     => 'budget(s)',
-    'budgets_with_limits'                   => 'budget(s) with configured amount',
+    'budget_or_budgets'                     => 'presupuesto(s)',
+    'budgets_with_limits'                   => 'presupuesto(s) con el importe configurado',
     'rule_or_rules'                         => 'rule(s)',
     'rulegroup_or_groups'                   => 'rule group(s)',
     'configuration_updated'                 => 'The configuration has been updated',
@@ -985,18 +985,18 @@ return [
     'no_accounts_intro_revenue'             => 'You have no revenue accounts yet. Revenue accounts are the places where you receive money from, such as your employer.',
     'no_accounts_imperative_revenue'        => 'Revenue accounts are created automatically when you create transactions, but you can create one manually too, if you want. Let\'s create one now:',
     'no_accounts_create_revenue'            => 'Create a revenue account',
-    'no_budgets_title_default'              => 'Let\'s create a budget',
-    'no_budgets_intro_default'              => 'You have no budgets yet. Budgets are used to organise your expenses into logical groups, which you can give a soft-cap to limit your expenses.',
-    'no_budgets_imperative_default'         => 'Budgets are the basic tools of financial management. Let\'s create one now:',
-    'no_budgets_create_default'             => 'Create a budget',
-    'no_categories_title_default'           => 'Let\'s create a category!',
-    'no_categories_intro_default'           => 'You have no categories yet. Categories are used to fine tune your transactions and label them with their designated category.',
-    'no_categories_imperative_default'      => 'Categories are created automatically when you create transactions, but you can create one manually too. Let\'s create one now:',
-    'no_categories_create_default'          => 'Create a category',
-    'no_tags_title_default'                 => 'Let\'s create a tag!',
-    'no_tags_intro_default'                 => 'You have no tags yet. Tags are used to fine tune your transactions and label them with specific keywords.',
-    'no_tags_imperative_default'            => 'Tags are created automatically when you create transactions, but you can create one manually too. Let\'s create one now:',
-    'no_tags_create_default'                => 'Create a tag',
+    'no_budgets_title_default'              => 'Vamos a crear un presupuesto',
+    'no_budgets_intro_default'              => 'Todavía no tienes presupuestos. Los presupuestos se usan para organizar tus gastos en grupos, a los que puedes asignar un tope para limitarlos.',
+    'no_budgets_imperative_default'         => 'Los presupuestos son las herramientas básicas de la gestión financiera. Vamos a crear uno ahora:',
+    'no_budgets_create_default'             => 'Crear un presupuesto',
+    'no_categories_title_default'           => '¡Vamos a crear una categoría!',
+    'no_categories_intro_default'           => 'Todavía no tienes categorías. Las categorías se utilizan para ajustar sus transacciones y etiquetarlas con su categoría designada.',
+    'no_categories_imperative_default'      => 'Las categorías se crean automáticamente al crear transacciones, pero también puedes crearlas manualmente. Vamos a crear una:',
+    'no_categories_create_default'          => 'Crear una categoría',
+    'no_tags_title_default'                 => '¡Vamos a crear una etiqueta!',
+    'no_tags_intro_default'                 => 'Todavía no tienes etiquetas. Las etiquetas se utilizan para ajustar tus transacciones y etiquetarlas con palabras clave específicas.',
+    'no_tags_imperative_default'            => 'Las etiquetas se crean automáticamente al crear transacciones, pero también puedes crearlas manualmente. Vamos a crear una:',
+    'no_tags_create_default'                => 'Crear etiqueta',
     'no_transactions_title_withdrawal'      => 'Let\'s create an expense!',
     'no_transactions_intro_withdrawal'      => 'You have no expenses yet. You should create expenses to start managing your finances.',
     'no_transactions_imperative_withdrawal' => 'Have you spent some money? Then you should write it down:',

From 14a8c686c073d1e17851b8df840265d1abee1e4d Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Tue, 29 Aug 2017 09:30:09 +0200
Subject: [PATCH 409/668] New translations firefly.php (Spanish)

---
 resources/lang/es_ES/firefly.php | 46 ++++++++++++++++----------------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/resources/lang/es_ES/firefly.php b/resources/lang/es_ES/firefly.php
index 592434f0b6..8a933ef4df 100644
--- a/resources/lang/es_ES/firefly.php
+++ b/resources/lang/es_ES/firefly.php
@@ -212,7 +212,7 @@ return [
     'default_rule_trigger_description'           => 'The Man Who Sold the World',
     'default_rule_trigger_from_account'          => 'David Bowie',
     'default_rule_action_prepend'                => 'Bought the world from ',
-    'default_rule_action_set_category'           => 'Large expenses',
+    'default_rule_action_set_category'           => 'Grandes gastos',
     'trigger'                                    => 'Trigger',
     'trigger_value'                              => 'Trigger on value',
     'stop_processing_other_triggers'             => 'Stop processing other triggers',
@@ -413,10 +413,10 @@ return [
     'upload_max_file_size'                       => 'Maximum file size: :size',
 
     // transaction index
-    'title_expenses'                             => 'Expenses',
-    'title_withdrawal'                           => 'Expenses',
-    'title_revenue'                              => 'Revenue / income',
-    'title_deposit'                              => 'Revenue / income',
+    'title_expenses'                             => 'Gastos',
+    'title_withdrawal'                           => 'Gastos',
+    'title_revenue'                              => 'Ingresos / salarios',
+    'title_deposit'                              => 'Ingresos / salarios',
     'title_transfer'                             => 'Transfers',
     'title_transfers'                            => 'Transfers',
 
@@ -630,8 +630,8 @@ return [
     'newTransfer'                                => 'New transfer',
     'moneyIn'                                    => 'Money in',
     'moneyOut'                                   => 'Money out',
-    'billsToPay'                                 => 'Bills to pay',
-    'billsPaid'                                  => 'Bills paid',
+    'billsToPay'                                 => 'Facturas a pagar',
+    'billsPaid'                                  => 'Facturas pagadas',
 
     // menu and titles, should be recycled as often as possible:
     'currency'                                   => 'Currency',
@@ -649,13 +649,13 @@ return [
     'budgets'                                    => 'Presupuestos',
     'tags'                                       => 'Etiquetas',
     'reports'                                    => 'Informes',
-    'transactions'                               => 'Transactions',
-    'expenses'                                   => 'Expenses',
-    'income'                                     => 'Revenue / income',
+    'transactions'                               => 'Transacciones',
+    'expenses'                                   => 'Gastos',
+    'income'                                     => 'Ingresos / salarios',
     'transfers'                                  => 'Transfers',
-    'moneyManagement'                            => 'Money management',
-    'piggyBanks'                                 => 'Piggy banks',
-    'bills'                                      => 'Bills',
+    'moneyManagement'                            => 'Gestión del dinero',
+    'piggyBanks'                                 => 'Huchas',
+    'bills'                                      => 'Facturas',
     'withdrawal'                                 => 'Withdrawal',
     'deposit'                                    => 'Deposit',
     'account'                                    => 'Account',
@@ -681,14 +681,14 @@ return [
     'report_category'                            => 'Category report between :start and :end',
     'report_budget'                              => 'Budget report between :start and :end',
     'report_tag'                                 => 'Tag report between :start and :end',
-    'quick_link_reports'                         => 'Quick links',
+    'quick_link_reports'                         => 'Enlaces rápidos',
     'quick_link_default_report'                  => 'Default financial report',
     'quick_link_audit_report'                    => 'Transaction history overview',
     'report_this_month_quick'                    => 'Current month, all accounts',
     'report_this_year_quick'                     => 'Current year, all accounts',
     'report_this_fiscal_year_quick'              => 'Current fiscal year, all accounts',
     'report_all_time_quick'                      => 'All-time, all accounts',
-    'reports_can_bookmark'                       => 'Remember that reports can be bookmarked.',
+    'reports_can_bookmark'                       => 'Recuerda que los informes pueden ser marcados como favoritos.',
     'incomeVsExpenses'                           => 'Income vs. expenses',
     'accountBalances'                            => 'Account balances',
     'balanceStart'                               => 'Balance at start of period',
@@ -714,7 +714,7 @@ return [
     'report_type_category'                       => 'Category report',
     'report_type_budget'                         => 'Budget report',
     'report_type_tag'                            => 'Tag report',
-    'more_info_help'                             => 'More information about these types of reports can be found in the help pages. Press the (?) icon in the top right corner.',
+    'more_info_help'                             => 'Puedes encontrar más información sobre estos tipos de informes en las páginas de ayuda. Pulsa el icono (?) En la esquina superior derecha.',
     'report_included_accounts'                   => 'Cuentas incluidas',
     'report_date_range'                          => 'Date range',
     'report_preset_ranges'                       => 'Pre-set ranges',
@@ -727,9 +727,9 @@ return [
     'balance_amount'                             => 'Expenses in budget ":budget" paid from account ":account" between :start and :end',
     'no_audit_activity'                          => 'No activity was recorded on account <a href=":url" title=":account_name">:account_name</a> between :start and :end.',
     'audit_end_balance'                          => 'Account balance of <a href=":url" title=":account_name">:account_name</a> at the end of :end was: :balance',
-    'reports_extra_options'                      => 'Extra options',
+    'reports_extra_options'                      => 'Opciones adicionales',
     'report_has_no_extra_options'                => 'This report has no extra options',
-    'reports_submit'                             => 'View report',
+    'reports_submit'                             => 'Ver informe',
     'end_after_start_date'                       => 'End date of report must be after start date.',
     'select_category'                            => 'Select category(ies)',
     'select_budget'                              => 'Select budget(s).',
@@ -797,8 +797,8 @@ return [
     'store_piggy_bank'                           => 'Store new piggy bank',
     'stored_piggy_bank'                          => 'Store new piggy bank ":name"',
     'account_status'                             => 'Account status',
-    'left_for_piggy_banks'                       => 'Left for piggy banks',
-    'sum_of_piggy_banks'                         => 'Sum of piggy banks',
+    'left_for_piggy_banks'                       => 'Apartado para las huchas',
+    'sum_of_piggy_banks'                         => 'Total de huchas',
     'saved_so_far'                               => 'Saved so far',
     'left_to_save'                               => 'Left to save',
     'suggested_amount'                           => 'Suggested monthly amount to save',
@@ -1010,12 +1010,12 @@ return [
     'no_transactions_imperative_transfers'  => 'Have you moved some money around? Then you should write it down:',
     'no_transactions_create_transfers'      => 'Create a transfer',
     'no_piggies_title_default'              => 'Let\'s create a piggy bank!',
-    'no_piggies_intro_default'              => 'You have no piggy banks yet. You can create piggy banks to divide your savings and keep track of what you\'re saving up for.',
+    'no_piggies_intro_default'              => 'Aún no tienes huchas. Puedes crear huchas para dividir tus ahorros y hacer un seguimiento de para qué estás ahorrando.',
     'no_piggies_imperative_default'         => 'Do you have things you\'re saving money for? Create a piggy bank and keep track:',
     'no_piggies_create_default'             => 'Create a new piggy bank',
     'no_bills_title_default'                => 'Let\'s create a bill!',
-    'no_bills_intro_default'                => 'You have no bills yet. You can create bills to keep track of regular expenses, like your rent of insurance.',
-    'no_bills_imperative_default'           => 'Do you have such regular bills? Create a bill and keep track of your payments:',
+    'no_bills_intro_default'                => 'Aún no tienes facturas. Puedes crear facturas para realizar un seguimiento de los gastos periódicos, como el alquiler o un seguro.',
+    'no_bills_imperative_default'           => '¿Tienes facturas periódicas? Crea una factura y haz un seguimiento de tus pagos:',
     'no_bills_create_default'               => 'Create a bill',
 
 

From c4bca4c214022814a0e2d56ff3a595e9328d8076 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Tue, 29 Aug 2017 09:40:13 +0200
Subject: [PATCH 410/668] New translations firefly.php (Spanish)

---
 resources/lang/es_ES/firefly.php | 78 ++++++++++++++++----------------
 1 file changed, 39 insertions(+), 39 deletions(-)

diff --git a/resources/lang/es_ES/firefly.php b/resources/lang/es_ES/firefly.php
index 8a933ef4df..8d648cd33e 100644
--- a/resources/lang/es_ES/firefly.php
+++ b/resources/lang/es_ES/firefly.php
@@ -149,15 +149,15 @@ return [
     'yearly'                                     => 'yearly',
 
     // export data:
-    'import_and_export'                          => 'Import and export',
-    'export_data'                                => 'Export data',
+    'import_and_export'                          => 'Importar y exportar',
+    'export_data'                                => 'Exportar datos',
     'export_data_intro'                          => 'For backup purposes, when migrating to another system or when migrating to another Firefly III installation.',
-    'export_format'                              => 'Export format',
+    'export_format'                              => 'Formato de exportación',
     'export_format_csv'                          => 'Comma separated values (CSV file)',
     'export_format_mt940'                        => 'MT940 compatible format',
-    'export_included_accounts'                   => 'Export transactions from these accounts',
+    'export_included_accounts'                   => 'Exportar transacciones de estas cuentas',
     'include_old_uploads_help'                   => 'Firefly III does not throw away the original CSV files you have imported in the past. You can include them in your export.',
-    'do_export'                                  => 'Export',
+    'do_export'                                  => 'Exportar',
     'export_status_never_started'                => 'The export has not started yet',
     'export_status_make_exporter'                => 'Creating exporter thing...',
     'export_status_collecting_journals'          => 'Collecting your transactions...',
@@ -175,10 +175,10 @@ return [
     'export_status_creating_zip_file'            => 'Creating a zip file...',
     'export_status_created_zip_file'             => 'Created a zip file!',
     'export_status_finished'                     => 'Export has succesfully finished! Yay!',
-    'export_data_please_wait'                    => 'Please wait...',
+    'export_data_please_wait'                    => 'Espera, por favor...',
 
     // rules
-    'rules'                                      => 'Rules',
+    'rules'                                      => 'Reglas',
     'rule_name'                                  => 'Name of rule',
     'rule_triggers'                              => 'Rule triggers when',
     'rule_actions'                               => 'Rule will',
@@ -194,19 +194,19 @@ return [
     'delete_rule_group'                          => 'Delete rule group ":title"',
     'deleted_rule_group'                         => 'Deleted rule group ":title"',
     'update_rule_group'                          => 'Update rule group',
-    'no_rules_in_group'                          => 'There are no rules in this group',
+    'no_rules_in_group'                          => 'No hay reglas en este grupo',
     'move_rule_group_up'                         => 'Move rule group up',
     'move_rule_group_down'                       => 'Move rule group down',
-    'save_rules_by_moving'                       => 'Save these rule(s) by moving them to another rule group:',
+    'save_rules_by_moving'                       => 'Guardar esta(s) regla(s) moviéndola(s) a otro grupo:',
     'make_new_rule'                              => 'Make new rule in rule group ":title"',
-    'rule_help_stop_processing'                  => 'When you check this box, later rules in this group will not be executed.',
-    'rule_help_active'                           => 'Inactive rules will never fire.',
+    'rule_help_stop_processing'                  => 'Al marcar esta casilla, las reglas posteriores de este grupo no se ejecutarán.',
+    'rule_help_active'                           => 'Las reglas inactivas nunca se ejecutan.',
     'stored_new_rule'                            => 'Stored new rule with title ":title"',
     'deleted_rule'                               => 'Deleted rule with title ":title"',
     'store_new_rule'                             => 'Store new rule',
     'updated_rule'                               => 'Updated rule with title ":title"',
-    'default_rule_group_name'                    => 'Default rules',
-    'default_rule_group_description'             => 'All your rules not in a particular group.',
+    'default_rule_group_name'                    => 'Reglaspredeterminada',
+    'default_rule_group_description'             => 'Todas las reglas que no pertenecen a ningún grupo.',
     'default_rule_name'                          => 'Your first default rule',
     'default_rule_description'                   => 'This rule is an example. You can safely delete it.',
     'default_rule_trigger_description'           => 'The Man Who Sold the World',
@@ -229,12 +229,12 @@ return [
     'warning_no_matching_transactions'           => 'No matching transactions found. Please note that for performance reasons, only the last :num_transactions transactions have been checked.',
     'warning_no_valid_triggers'                  => 'No valid triggers provided.',
     'apply_rule_selection'                       => 'Apply rule ":title" to a selection of your transactions',
-    'apply_rule_selection_intro'                 => 'Rules like ":title" are normally only applied to new or updated transactions, but you can tell Firefly III to run it on a selection of your existing transactions. This can be useful when you have updated a rule and you need the changes to be applied to all of your other transactions.',
+    'apply_rule_selection_intro'                 => 'Las reglas como ":title" normalmente sólo se aplican a transacciones nuevas o actualizadas, pero puedes indicarle a Firefly III que las ejecute en una selección de transacciones existentes. Esto puede ser útil si has actualizado una regla y necesitas que los cambios se apliquen a todas tus otras transacciones.',
     'include_transactions_from_accounts'         => 'Include transactions from these accounts',
     'applied_rule_selection'                     => 'Rule ":title" has been applied to your selection.',
     'execute'                                    => 'Execute',
     'apply_rule_group_selection'                 => 'Apply rule group ":title" to a selection of your transactions',
-    'apply_rule_group_selection_intro'           => 'Rule groups like ":title" are normally only applied to new or updated transactions, but you can tell Firefly III to run all the rules in this group on a selection of your existing transactions. This can be useful when you have updated a group of rules and you need the changes to be applied to all of your other transactions.',
+    'apply_rule_group_selection_intro'           => 'Los grupos de reglas como ":title" normalmente sólo se aplican a transacciones nuevas o actualizadas, pero puedes indicarle a Firefly III que ejecute todas las reglas de este grupo en una selección de transacciones existentes. Esto puede ser útil si has actualizado un grupo de reglas y necesitas que los cambios se apliquen a todas tus otras transacciones.',
     'applied_rule_group_selection'               => 'Rule group ":title" has been applied to your selection.',
 
     // actions and triggers
@@ -427,11 +427,11 @@ return [
     'convert_to_Withdrawal'                      => 'Convert ":description" to a withdrawal',
     'convert_to_Deposit'                         => 'Convert ":description" to a deposit',
     'convert_to_Transfer'                        => 'Convert ":description" to a transfer',
-    'convert_options_WithdrawalDeposit'          => 'Convert a withdrawal into a deposit',
-    'convert_options_WithdrawalTransfer'         => 'Convert a withdrawal into a transfer',
-    'convert_options_DepositTransfer'            => 'Convert a deposit into a transfer',
-    'convert_options_DepositWithdrawal'          => 'Convert a deposit into a withdrawal',
-    'convert_options_TransferWithdrawal'         => 'Convert a transfer into a withdrawal',
+    'convert_options_WithdrawalDeposit'          => 'Convertir una retirada de efectivo en un depósito',
+    'convert_options_WithdrawalTransfer'         => 'Convertir una retirada de efectivo en una transferencia',
+    'convert_options_DepositTransfer'            => 'Convertir un depósito en una transferencia',
+    'convert_options_DepositWithdrawal'          => 'Convertir un depósito en una retirada de efectivo',
+    'convert_options_TransferWithdrawal'         => 'Convertir una transferencia en una retirada de efectivo',
     'convert_options_TransferDeposit'            => 'Convert a transfer into a deposit',
     'transaction_journal_convert_options'        => 'Convert this transaction',
     'convert_Withdrawal_to_deposit'              => 'Convert this withdrawal to a deposit',
@@ -482,7 +482,7 @@ return [
     // forms:
     'mandatoryFields'                            => 'Mandatory fields',
     'optionalFields'                             => 'Optional fields',
-    'options'                                    => 'Options',
+    'options'                                    => 'Opciones',
 
     // budgets:
     'create_new_budget'                          => 'Create a new budget',
@@ -521,7 +521,7 @@ return [
     'updated_bill'                               => 'Updated bill ":name"',
     'store_new_bill'                             => 'Store new bill',
     'stored_new_bill'                            => 'Stored new bill ":name"',
-    'cannot_scan_inactive_bill'                  => 'Inactive bills cannot be scanned.',
+    'cannot_scan_inactive_bill'                  => 'Las facturas inactivas no pueden ser escaneadas.',
     'rescanned_bill'                             => 'Rescanned everything.',
     'average_bill_amount_year'                   => 'Average bill amount (:year)',
     'average_bill_amount_overall'                => 'Average bill amount (overall)',
@@ -561,7 +561,7 @@ return [
     'save_transactions_by_moving'                => 'Save these transaction(s) by moving them to another account:',
     'stored_new_account'                         => 'New account ":name" stored!',
     'updated_account'                            => 'Updated account ":name"',
-    'credit_card_options'                        => 'Credit card options',
+    'credit_card_options'                        => 'Opciones de tarjeta de crédito',
     'no_transactions_account'                    => 'There are no transactions (in this period) for asset account ":name".',
     'no_data_for_chart'                          => 'There is not enough information (yet) to generate this chart.',
     'select_more_than_one_account'               => 'Please select more than one account',
@@ -728,7 +728,7 @@ return [
     'no_audit_activity'                          => 'No activity was recorded on account <a href=":url" title=":account_name">:account_name</a> between :start and :end.',
     'audit_end_balance'                          => 'Account balance of <a href=":url" title=":account_name">:account_name</a> at the end of :end was: :balance',
     'reports_extra_options'                      => 'Opciones adicionales',
-    'report_has_no_extra_options'                => 'This report has no extra options',
+    'report_has_no_extra_options'                => 'Este informe no tiene opciones adicionales',
     'reports_submit'                             => 'Ver informe',
     'end_after_start_date'                       => 'End date of report must be after start date.',
     'select_category'                            => 'Select category(ies)',
@@ -848,7 +848,7 @@ return [
     'list_all_users'                        => 'All users',
     'all_users'                             => 'All users',
     'instance_configuration'                => 'Configuration',
-    'firefly_instance_configuration'        => 'Configuration options for Firefly III',
+    'firefly_instance_configuration'        => 'Opciones de configuración de Firefly III',
     'setting_single_user_mode'              => 'Single user mode',
     'setting_single_user_mode_explain'      => 'By default, Firefly III only accepts one (1) registration: you. This is a security measure, preventing others from using your instance unless you allow them to. Future registrations are blocked. When you uncheck this box, others can use your instance as wel, assuming they can reach it (when it is connected to the internet).',
     'store_configuration'                   => 'Store configuration',
@@ -860,7 +860,7 @@ return [
     'total_size'                            => 'total size',
     'budget_or_budgets'                     => 'presupuesto(s)',
     'budgets_with_limits'                   => 'presupuesto(s) con el importe configurado',
-    'rule_or_rules'                         => 'rule(s)',
+    'rule_or_rules'                         => 'regla(s)',
     'rulegroup_or_groups'                   => 'rule group(s)',
     'configuration_updated'                 => 'The configuration has been updated',
     'setting_is_demo_site'                  => 'Demo site',
@@ -925,18 +925,18 @@ return [
     'no_edit_multiple_left'                 => 'You have selected no valid transactions to edit.',
 
     // import bread crumbs and titles:
-    'import'                                => 'Import',
-    'import_data'                           => 'Import data',
+    'import'                                => 'Importar',
+    'import_data'                           => 'Importar datos',
 
     // import index page:
-    'import_index_title'                    => 'Import data into Firefly III',
-    'import_index_sub_title'                => 'Index',
+    'import_index_title'                    => 'Importar datos a Firefly III',
+    'import_index_sub_title'                => 'Índice',
     'import_general_index_intro'            => 'Welcome to Firefly\'s import routine. There are a few ways of importing data into Firefly III, displayed here as buttons.',
     'import_index_intro'                    => 'This routine will help you import files from your bank into Firefly III. Please check out the help pages in the top right corner.',
     'import_index_file'                     => 'Select your file',
     'import_index_config'                   => 'If you have previously imported data into Firefly III, you may have a configuration file, which will pre-set configuration values for you. For some banks, other users have kindly provided their <a href="https://github.com/firefly-iii/import-configurations/wiki">configuration file</a>.',
     'import_index_type'                     => 'Select the type of file you will upload',
-    'import_index_start'                    => 'Start importing',
+    'import_index_start'                    => 'Iniciar importación',
 
     // supported file types:
     'import_file_type_csv'                  => 'CSV (comma separated values)',
@@ -946,18 +946,18 @@ return [
     'import_config_bread_crumb'             => 'Set up your import file',
 
     // import status page:
-    'import_status_bread_crumb'             => 'Import status',
-    'import_status_sub_title'               => 'Import status',
+    'import_status_bread_crumb'             => 'Estado de la importación',
+    'import_status_sub_title'               => 'Estado de la importación',
     'import_status_wait_title'              => 'Please hold...',
     'import_status_wait_text'               => 'This box will disappear in a moment.',
-    'import_status_ready_title'             => 'Import is ready to start',
+    'import_status_ready_title'             => 'La importación está lista para empezar',
     'import_status_ready_text'              => 'The import is ready to start. All the configuration you needed to do has been done. Please download the configuration file. It will help you with the import should it not go as planned. To actually run the import, you can either execute the following command in your console, or run the web-based import. Depending on your configuration, the console import will give you more feedback.',
     'import_status_ready_config'            => 'Download configuration',
-    'import_status_ready_start'             => 'Start the import',
+    'import_status_ready_start'             => 'Iniciar la importación',
     'import_status_ready_share'             => 'Please consider downloading your configuration and sharing it at the <strong><a href="https://github.com/firefly-iii/import-configurations/wiki">import configuration center</a></strong>. This will allow other users of Firefly III to import their files more easily.',
-    'import_status_running_title'           => 'The import is running',
+    'import_status_running_title'           => 'La importación se está ejecutando',
     'import_status_running_placeholder'     => 'Please hold for an update...',
-    'import_status_errors_title'            => 'Errors during the import',
+    'import_status_errors_title'            => 'Errores durante la importación',
     'import_status_errors_single'           => 'An error has occured during the import. It does not appear to be fatal.',
     'import_status_errors_multi'            => 'Some errors occured during the import. These do not appear to be fatal.',
     'import_status_fatal_title'             => 'A fatal error occurred',
@@ -1013,10 +1013,10 @@ return [
     'no_piggies_intro_default'              => 'Aún no tienes huchas. Puedes crear huchas para dividir tus ahorros y hacer un seguimiento de para qué estás ahorrando.',
     'no_piggies_imperative_default'         => 'Do you have things you\'re saving money for? Create a piggy bank and keep track:',
     'no_piggies_create_default'             => 'Create a new piggy bank',
-    'no_bills_title_default'                => 'Let\'s create a bill!',
+    'no_bills_title_default'                => '¡Vamos a crear una factura!',
     'no_bills_intro_default'                => 'Aún no tienes facturas. Puedes crear facturas para realizar un seguimiento de los gastos periódicos, como el alquiler o un seguro.',
     'no_bills_imperative_default'           => '¿Tienes facturas periódicas? Crea una factura y haz un seguimiento de tus pagos:',
-    'no_bills_create_default'               => 'Create a bill',
+    'no_bills_create_default'               => 'Crear una factura',
 
 
 ];
\ No newline at end of file

From 69846bfb182fe21de8e58dff2dcba6e0d2e1f438 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Tue, 29 Aug 2017 09:50:10 +0200
Subject: [PATCH 411/668] New translations firefly.php (Spanish)

---
 resources/lang/es_ES/firefly.php | 46 ++++++++++++++++----------------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/resources/lang/es_ES/firefly.php b/resources/lang/es_ES/firefly.php
index 8d648cd33e..81d80ad9f1 100644
--- a/resources/lang/es_ES/firefly.php
+++ b/resources/lang/es_ES/firefly.php
@@ -132,13 +132,13 @@ return [
     'transaction_data'                           => 'Transaction data',
 
     // search
-    'search'                                     => 'Search',
-    'search_found_transactions'                  => 'Number of transactions found:',
-    'general_search_error'                       => 'An error occured while searching. Please check the log files for more information.',
-    'search_box'                                 => 'Search',
-    'search_box_intro'                           => 'Welcome to the search function of Firefly III. Enter your search query in the box. Make sure you check out the help file because the search is pretty advanced.',
-    'search_error'                               => 'Error while searching',
-    'search_searching'                           => 'Searching ...',
+    'search'                                     => 'Buscar',
+    'search_found_transactions'                  => 'Transacciones encontradas:',
+    'general_search_error'                       => 'Se ha producido un error durante la búsqueda. Por favor, compruebe los archivos de registro para obtener más información.',
+    'search_box'                                 => 'Buscar',
+    'search_box_intro'                           => 'Bienvenido a la función de búsqueda de Firefly III. Introduce tu consulta de búsqueda en el cuadro. Asegúrate de revisar el archivo de ayuda porque el buscador es bastante avanzado.',
+    'search_error'                               => 'Error durante la búsqueda',
+    'search_searching'                           => 'Buscando...',
 
     // repeat frequencies:
     'repeat_freq_yearly'                         => 'yearly',
@@ -341,11 +341,11 @@ return [
     'pref_two_factor_auth_remove_code'           => 'Remove verification code',
     'pref_two_factor_auth_remove_will_disable'   => '(this will also disable two-factor authentication)',
     'pref_save_settings'                         => 'Save settings',
-    'saved_preferences'                          => 'Preferences saved!',
+    'saved_preferences'                          => '¡Preferencias guardadas!',
     'preferences_general'                        => 'General',
-    'preferences_frontpage'                      => 'Home screen',
-    'preferences_security'                       => 'Security',
-    'preferences_layout'                         => 'Layout',
+    'preferences_frontpage'                      => 'Pantalla de inicio',
+    'preferences_security'                       => 'Seguridad',
+    'preferences_layout'                         => 'Diseño',
     'pref_home_show_deposits'                    => 'Show deposits on the home screen',
     'pref_home_show_deposits_info'               => 'The home screen already shows your expense accounts. Should it also show your revenue accounts?',
     'pref_home_do_show_deposits'                 => 'Yes, show them',
@@ -392,7 +392,7 @@ return [
     'invalid_password'                           => 'Invalid password!',
     'what_is_pw_security'                        => 'What is "verify password security"?',
     'secure_pw_title'                            => 'How to choose a secure password',
-    'secure_pw_history'                          => 'In August 2017 well known security researcher Troy Hunt released a list of 306 million stolen passwords. These passwords were stolen during breakins at companies like LinkedIn, Adobe and NeoPets (and many more).',
+    'secure_pw_history'                          => 'En agosto de 2017 el conocido investigador de seguridad Troy Hunt publicó una lista de 306 millones de contraseñas robadas. Estas contraseñas fueron robadas durante intrusiones a empresas como LinkedIn, Adobe y NeoPets (y muchos más).',
     'secure_pw_check_box'                        => 'By checking the box, Firefly III will send the SHA1 hash of your password to <a href="https://www.troyhunt.com/introducing-306-million-freely-downloadable-pwned-passwords/">the website of Troy Hunt</a> to see if it is on the list. This will stop you from using unsafe passwords as is recommended in the latest <a href="https://pages.nist.gov/800-63-3/sp800-63b.html">NIST Special Publication</a> on this subject.',
     'secure_pw_sha1'                             => 'But I thought SHA1 was broken?',
     'secure_pw_hash_speed'                       => 'Yes, but not in this context. As you can read on <a href="https://shattered.io/">the website detailing how they broke SHA1</a>, it is now slightly easier to find a "collision": another string that results in the same SHA1-hash. It now only takes 10,000 years using a single-GPU machine.',
@@ -432,8 +432,8 @@ return [
     'convert_options_DepositTransfer'            => 'Convertir un depósito en una transferencia',
     'convert_options_DepositWithdrawal'          => 'Convertir un depósito en una retirada de efectivo',
     'convert_options_TransferWithdrawal'         => 'Convertir una transferencia en una retirada de efectivo',
-    'convert_options_TransferDeposit'            => 'Convert a transfer into a deposit',
-    'transaction_journal_convert_options'        => 'Convert this transaction',
+    'convert_options_TransferDeposit'            => 'Convertir una transferencia en un depósito',
+    'transaction_journal_convert_options'        => 'Convertir esta transacción',
     'convert_Withdrawal_to_deposit'              => 'Convert this withdrawal to a deposit',
     'convert_Withdrawal_to_transfer'             => 'Convert this withdrawal to a transfer',
     'convert_Deposit_to_withdrawal'              => 'Convert this deposit to a withdrawal',
@@ -635,11 +635,11 @@ return [
 
     // menu and titles, should be recycled as often as possible:
     'currency'                                   => 'Currency',
-    'preferences'                                => 'Preferences',
-    'logout'                                     => 'Logout',
-    'searchPlaceholder'                          => 'Search...',
+    'preferences'                                => 'Preferencias',
+    'logout'                                     => 'Cerrar sesión',
+    'searchPlaceholder'                          => 'Buscar...',
     'dashboard'                                  => 'Panel de control',
-    'currencies'                                 => 'Currencies',
+    'currencies'                                 => 'Divisas',
     'accounts'                                   => 'Cuentas',
     'Asset account'                              => 'Asset account',
     'Default account'                            => 'Asset account',
@@ -672,7 +672,7 @@ return [
     'unknown'                                    => 'Unknown',
     'daily'                                      => 'Daily',
     'monthly'                                    => 'Monthly',
-    'profile'                                    => 'Profile',
+    'profile'                                    => 'Perfil',
     'errors'                                     => 'Errors',
 
     // reports:
@@ -843,8 +843,8 @@ return [
     'number_of_decimals'                    => 'Number of decimals',
 
     // administration
-    'administration'                        => 'Administration',
-    'user_administration'                   => 'User administration',
+    'administration'                        => 'Administración',
+    'user_administration'                   => 'Administración de usuarios',
     'list_all_users'                        => 'All users',
     'all_users'                             => 'All users',
     'instance_configuration'                => 'Configuration',
@@ -852,9 +852,9 @@ return [
     'setting_single_user_mode'              => 'Single user mode',
     'setting_single_user_mode_explain'      => 'By default, Firefly III only accepts one (1) registration: you. This is a security measure, preventing others from using your instance unless you allow them to. Future registrations are blocked. When you uncheck this box, others can use your instance as wel, assuming they can reach it (when it is connected to the internet).',
     'store_configuration'                   => 'Store configuration',
-    'single_user_administration'            => 'User administration for :email',
+    'single_user_administration'            => 'Administración de usuarios para :email',
     'edit_user'                             => 'Edit user :email',
-    'hidden_fields_preferences'             => 'Not all fields are visible right now. You must enable them in your <a href=":link">settings</a>.',
+    'hidden_fields_preferences'             => 'No todos los campos están visibles ahora. Debes habilitarlos en tu <a href=":link">configuración</a>.',
     'user_data_information'                 => 'User data',
     'user_information'                      => 'User information',
     'total_size'                            => 'total size',

From d610302e79a3b0107e88d0bd7e859d4d04d48280 Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Wed, 30 Aug 2017 07:00:17 +0200
Subject: [PATCH 412/668] Code for #782

---
 .../Json/AutoCompleteController.php           | 32 ++++++++++++++++
 app/Http/Controllers/JsonController.php       | 38 -------------------
 routes/web.php                                |  4 +-
 3 files changed, 34 insertions(+), 40 deletions(-)

diff --git a/app/Http/Controllers/Json/AutoCompleteController.php b/app/Http/Controllers/Json/AutoCompleteController.php
index dbcbf45ab0..49a7fbc377 100644
--- a/app/Http/Controllers/Json/AutoCompleteController.php
+++ b/app/Http/Controllers/Json/AutoCompleteController.php
@@ -50,6 +50,20 @@ class AutoCompleteController extends Controller
 
     }
 
+    /**
+     * @param JournalCollectorInterface $collector
+     *
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function allTransactionJournals(JournalCollectorInterface $collector)
+    {
+        $collector->setLimit(250)->setPage(1);
+        $return = array_unique($collector->getJournals()->pluck('description')->toArray());
+        sort($return);
+
+        return Response::json($return);
+    }
+
     /**
      * Returns a JSON list of all beneficiaries.
      *
@@ -134,4 +148,22 @@ class AutoCompleteController extends Controller
         return Response::json($return);
     }
 
+    /**
+     * @param JournalCollectorInterface $collector
+     * @param string                    $what
+     *
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function transactionJournals(JournalCollectorInterface $collector, string $what)
+    {
+        $type  = config('firefly.transactionTypesByWhat.' . $what);
+        $types = [$type];
+
+        $collector->setTypes($types)->setLimit(250)->setPage(1);
+        $return = array_unique($collector->getJournals()->pluck('description')->toArray());
+        sort($return);
+
+        return Response::json($return);
+    }
+
 }
\ No newline at end of file
diff --git a/app/Http/Controllers/JsonController.php b/app/Http/Controllers/JsonController.php
index 06a4aa4d1d..f9162ed690 100644
--- a/app/Http/Controllers/JsonController.php
+++ b/app/Http/Controllers/JsonController.php
@@ -16,9 +16,7 @@ namespace FireflyIII\Http\Controllers;
 use Amount;
 use Carbon\Carbon;
 use FireflyIII\Helpers\Collector\JournalCollectorInterface;
-use FireflyIII\Models\AccountType;
 use FireflyIII\Models\TransactionType;
-use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Repositories\Bill\BillRepositoryInterface;
 use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
 use FireflyIII\Repositories\Category\CategoryRepositoryInterface;
@@ -62,22 +60,6 @@ class JsonController extends Controller
         return Response::json(['html' => $view]);
     }
 
-    /**
-     * @param JournalCollectorInterface $collector
-     *
-     * @return \Illuminate\Http\JsonResponse
-     */
-    public function allTransactionJournals(JournalCollectorInterface $collector)
-    {
-        $collector->setLimit(100)->setPage(1);
-        $return = array_unique($collector->getJournals()->pluck('description')->toArray());
-        sort($return);
-
-        return Response::json($return);
-
-
-    }
-
     /**
      * @param BillRepositoryInterface $repository
      *
@@ -230,26 +212,6 @@ class JsonController extends Controller
 
     }
 
-    /**
-     * @param JournalCollectorInterface $collector
-     * @param string                    $what
-     *
-     * @return \Illuminate\Http\JsonResponse
-     */
-    public function transactionJournals(JournalCollectorInterface $collector, string $what)
-    {
-        $type  = config('firefly.transactionTypesByWhat.' . $what);
-        $types = [$type];
-
-        $collector->setTypes($types)->setLimit(100)->setPage(1);
-        $return = array_unique($collector->getJournals()->pluck('description')->toArray());
-        sort($return);
-
-        return Response::json($return);
-
-
-    }
-
     /**
      * @param JournalRepositoryInterface $repository
      *
diff --git a/routes/web.php b/routes/web.php
index d68231e4bd..7a952d5a0a 100755
--- a/routes/web.php
+++ b/routes/web.php
@@ -443,9 +443,9 @@ Route::group(
     Route::get('box/out', ['uses' => 'JsonController@boxOut', 'as' => 'box.out']);
     Route::get('box/bills-unpaid', ['uses' => 'JsonController@boxBillsUnpaid', 'as' => 'box.unpaid']);
     Route::get('box/bills-paid', ['uses' => 'JsonController@boxBillsPaid', 'as' => 'box.paid']);
-    Route::get('transaction-journals/all', ['uses' => 'JsonController@allTransactionJournals', 'as' => 'all-transaction-journals']);
+    Route::get('transaction-journals/all', ['uses' => 'Json\AutoCompleteController@allTransactionJournals', 'as' => 'all-transaction-journals']);
     Route::get('transaction-journals/with-id/{tj}', ['uses' => 'Json\AutoCompleteController@journalsWithId', 'as' => 'journals-with-id']);
-    Route::get('transaction-journals/{what}', ['uses' => 'JsonController@transactionJournals', 'as' => 'transaction-journals']);
+    Route::get('transaction-journals/{what}', ['uses' => 'Json\AutoCompleteController@transactionJournals', 'as' => 'transaction-journals']);
     Route::get('transaction-types', ['uses' => 'JsonController@transactionTypes', 'as' => 'transaction-types']);
     Route::get('trigger', ['uses' => 'JsonController@trigger', 'as' => 'trigger']);
     Route::get('action', ['uses' => 'JsonController@action', 'as' => 'action']);

From 062272a6e8e96647c262b798f10b0e35753e0d2b Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Wed, 30 Aug 2017 07:09:52 +0200
Subject: [PATCH 413/668] Format translations [skip ci]

---
 resources/lang/en_US/list.php | 131 +++++++++++++++++-----------------
 1 file changed, 65 insertions(+), 66 deletions(-)

diff --git a/resources/lang/en_US/list.php b/resources/lang/en_US/list.php
index a5a19d981e..b9055dc9f4 100644
--- a/resources/lang/en_US/list.php
+++ b/resources/lang/en_US/list.php
@@ -12,72 +12,71 @@ declare(strict_types=1);
  */
 
 return [
-    'buttons'               => 'Buttons',
-    'icon'                  => 'Icon',
-    'id'                    => 'ID',
-    'create_date'           => 'Created at',
-    'update_date'           => 'Updated at',
-    'balance_before'        => 'Balance before',
-    'balance_after'         => 'Balance after',
-    'name'                  => 'Name',
-    'role'                  => 'Role',
-    'currentBalance'        => 'Current balance',
-    'active'                => 'Is active?',
-    'lastActivity'          => 'Last activity',
-    'balanceDiff'           => 'Balance difference between :start and :end',
-    'matchedOn'             => 'Matched on',
-    'matchesOn'             => 'Matched on',
-    'account_type'          => 'Account type',
-    'created_at'            => 'Created at',
-    'new_balance'           => 'New balance',
-    'account'               => 'Account',
-    'matchingAmount'        => 'Amount',
-    'lastMatch'             => 'Last match',
-    'split_number'          => 'Split #',
-    'destination'           => 'Destination',
-    'source'                => 'Source',
-    'next_expected_match'   => 'Next expected match',
-    'automatch'             => 'Auto match?',
-    'repeat_freq'           => 'Repeats',
-    'description'           => 'Description',
-    'amount'                => 'Amount',
-    'internal_reference'    => 'Internal reference',
-    'date'                  => 'Date',
-    'interest_date'         => 'Interest date',
-    'book_date'             => 'Book date',
-    'process_date'          => 'Processing date',
-    'due_date'              => 'Due date',
-    'payment_date'          => 'Payment date',
-    'invoice_date'          => 'Invoice date',
-    'interal_reference'     => 'Internal reference',
-    'notes'                 => 'Notes',
-    'from'                  => 'From',
-    'piggy_bank'            => 'Piggy bank',
-    'to'                    => 'To',
-    'budget'                => 'Budget',
-    'category'              => 'Category',
-    'bill'                  => 'Bill',
-    'withdrawal'            => 'Withdrawal',
-    'deposit'               => 'Deposit',
-    'transfer'              => 'Transfer',
-    'type'                  => 'Type',
-    'completed'             => 'Completed',
-    'iban'                  => 'IBAN',
-    'paid_current_period'   => 'Paid this period',
-    'email'                 => 'Email',
-    'registered_at'         => 'Registered at',
-    'is_activated'          => 'Is activated',
-    'is_blocked'            => 'Is blocked',
-    'is_admin'              => 'Is admin',
-    'has_two_factor'        => 'Has 2FA',
-    'confirmed_from'        => 'Confirmed from',
-    'registered_from'       => 'Registered from',
-    'blocked_code'          => 'Block code',
-    'domain'                => 'Domain',
-    'registration_attempts' => 'Registration attempts',
-    'source_account'        => 'Source account',
-    'destination_account'   => 'Destination account',
-
+    'buttons'                => 'Buttons',
+    'icon'                   => 'Icon',
+    'id'                     => 'ID',
+    'create_date'            => 'Created at',
+    'update_date'            => 'Updated at',
+    'balance_before'         => 'Balance before',
+    'balance_after'          => 'Balance after',
+    'name'                   => 'Name',
+    'role'                   => 'Role',
+    'currentBalance'         => 'Current balance',
+    'active'                 => 'Is active?',
+    'lastActivity'           => 'Last activity',
+    'balanceDiff'            => 'Balance difference between :start and :end',
+    'matchedOn'              => 'Matched on',
+    'matchesOn'              => 'Matched on',
+    'account_type'           => 'Account type',
+    'created_at'             => 'Created at',
+    'new_balance'            => 'New balance',
+    'account'                => 'Account',
+    'matchingAmount'         => 'Amount',
+    'lastMatch'              => 'Last match',
+    'split_number'           => 'Split #',
+    'destination'            => 'Destination',
+    'source'                 => 'Source',
+    'next_expected_match'    => 'Next expected match',
+    'automatch'              => 'Auto match?',
+    'repeat_freq'            => 'Repeats',
+    'description'            => 'Description',
+    'amount'                 => 'Amount',
+    'internal_reference'     => 'Internal reference',
+    'date'                   => 'Date',
+    'interest_date'          => 'Interest date',
+    'book_date'              => 'Book date',
+    'process_date'           => 'Processing date',
+    'due_date'               => 'Due date',
+    'payment_date'           => 'Payment date',
+    'invoice_date'           => 'Invoice date',
+    'interal_reference'      => 'Internal reference',
+    'notes'                  => 'Notes',
+    'from'                   => 'From',
+    'piggy_bank'             => 'Piggy bank',
+    'to'                     => 'To',
+    'budget'                 => 'Budget',
+    'category'               => 'Category',
+    'bill'                   => 'Bill',
+    'withdrawal'             => 'Withdrawal',
+    'deposit'                => 'Deposit',
+    'transfer'               => 'Transfer',
+    'type'                   => 'Type',
+    'completed'              => 'Completed',
+    'iban'                   => 'IBAN',
+    'paid_current_period'    => 'Paid this period',
+    'email'                  => 'Email',
+    'registered_at'          => 'Registered at',
+    'is_activated'           => 'Is activated',
+    'is_blocked'             => 'Is blocked',
+    'is_admin'               => 'Is admin',
+    'has_two_factor'         => 'Has 2FA',
+    'confirmed_from'         => 'Confirmed from',
+    'registered_from'        => 'Registered from',
+    'blocked_code'           => 'Block code',
+    'domain'                 => 'Domain',
+    'registration_attempts'  => 'Registration attempts',
+    'source_account'         => 'Source account',
+    'destination_account'    => 'Destination account',
     'accounts_count'         => 'Number of accounts',
     'journals_count'         => 'Number of transactions',
     'attachments_count'      => 'Number of attachments',

From 0a8e6e9f0737d867205a06c2c6a278b6c51ab1a0 Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Wed, 30 Aug 2017 07:10:06 +0200
Subject: [PATCH 414/668] Code for #784

---
 resources/views/list/accounts.twig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/views/list/accounts.twig b/resources/views/list/accounts.twig
index ac14cb3a77..af7a7be7f7 100644
--- a/resources/views/list/accounts.twig
+++ b/resources/views/list/accounts.twig
@@ -6,7 +6,7 @@
         {% if what == 'asset' %}
             <th data-defaultsign="az" class="hidden-sm hidden-xs hidden-md">{{ trans('list.role') }}</th>
         {% endif %}
-        <th data-defaultsign="az" class="hidden-sm hidden-xs">{{ trans('list.iban') }}</th>
+        <th data-defaultsign="az" class="hidden-sm hidden-xs">{{ trans('form.accountNumber') }}</th>
         <th data-defaultsign="_19">{{ trans('list.currentBalance') }}</th>
         <th class="hidden-sm hidden-xs">{{ trans('list.active') }}</th>
         <th data-defaultsign="month" class="hidden-sm hidden-xs hidden-md">{{ trans('list.lastActivity') }}</th>
@@ -33,7 +33,7 @@
                     {% endfor %}
                 </td>
             {% endif %}
-            <td class="hidden-sm hidden-xs">{{ account.iban }}</td>
+            <td class="hidden-sm hidden-xs">{{ account.iban }}{% if account.iban == '' %}{{ account.getMeta('accountNumber') }}{% endif %}</td>
             <td data-value="{{ account.endBalance }}" style="text-align: right;">
                 <span style="margin-right:5px;">
                 {{ formatAmountByAccount(account, account.endBalance) }}

From 4aaacf8e2e39e4926b499eccc9a10f84ac0b84a7 Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Wed, 30 Aug 2017 07:14:35 +0200
Subject: [PATCH 415/668] Ask for CC number when asset is a CC. #784

---
 app/Http/Controllers/AccountController.php | 2 +-
 resources/lang/en_US/form.php              | 1 +
 resources/views/accounts/edit.twig         | 6 +++++-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php
index b1f35acc20..995a3c9e5d 100644
--- a/app/Http/Controllers/AccountController.php
+++ b/app/Http/Controllers/AccountController.php
@@ -194,7 +194,7 @@ class AccountController extends Controller
 
         return view(
             'accounts.edit', compact(
-                               'allCurrencies', 'currencySelectList', 'account', 'currency', 'subTitle', 'subTitleIcon', 'what', 'roles'
+                               'allCurrencies', 'currencySelectList', 'account', 'currency', 'subTitle', 'subTitleIcon', 'what', 'roles', 'preFilled'
                            )
         );
     }
diff --git a/resources/lang/en_US/form.php b/resources/lang/en_US/form.php
index 311133b340..5c30300170 100644
--- a/resources/lang/en_US/form.php
+++ b/resources/lang/en_US/form.php
@@ -100,6 +100,7 @@ return [
     'code'                       => 'Code',
     'iban'                       => 'IBAN',
     'accountNumber'              => 'Account number',
+    'creditCardNumber'           => 'Credit card number',
     'has_headers'                => 'Headers',
     'date_format'                => 'Date format',
     'specifix'                   => 'Bank- or file specific fixes',
diff --git a/resources/views/accounts/edit.twig b/resources/views/accounts/edit.twig
index 461a4402c7..e0b4ebf916 100644
--- a/resources/views/accounts/edit.twig
+++ b/resources/views/accounts/edit.twig
@@ -33,7 +33,11 @@
                 <div class="box-body">
                     {{ ExpandedForm.text('iban') }}
                     {{ ExpandedForm.text('BIC', null, {maxlength: 11}) }}
-                    {{ ExpandedForm.text('accountNumber') }}
+                    {% if preFilled.accountRole == 'ccAsset' %}
+                        {{ ExpandedForm.text('accountNumber', null , {label:trans('form.creditCardNumber')}) }}
+                    {% else %}
+                        {{ ExpandedForm.text('accountNumber') }}
+                    {% endif %}
 
                     {% if account.accounttype.type == 'Default account' or account.accounttype.type == 'Asset account' %}
 

From 6642e9358148096efa5c690a5b590ce0d57674ae Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Wed, 30 Aug 2017 07:20:16 +0200
Subject: [PATCH 416/668] New translations list.php (Spanish)

---
 resources/lang/es_ES/list.php | 131 +++++++++++++++++-----------------
 1 file changed, 65 insertions(+), 66 deletions(-)

diff --git a/resources/lang/es_ES/list.php b/resources/lang/es_ES/list.php
index f18389fe7f..dd936b736b 100644
--- a/resources/lang/es_ES/list.php
+++ b/resources/lang/es_ES/list.php
@@ -12,72 +12,71 @@ declare(strict_types=1);
  */
 
 return [
-    'buttons'               => 'Botones',
-    'icon'                  => 'Icono',
-    'id'                    => 'ID',
-    'create_date'           => 'Fecha de creación',
-    'update_date'           => 'Fecha de modificación',
-    'balance_before'        => 'Balance antes de ',
-    'balance_after'         => 'Balance después de la',
-    'name'                  => 'Nombre',
-    'role'                  => 'Rol',
-    'currentBalance'        => 'Balance actual',
-    'active'                => '¿Está Activo?',
-    'lastActivity'          => 'Actividad más reciente',
-    'balanceDiff'           => 'Diferencia de saldo entre :start y :end',
-    'matchedOn'             => 'Encontrado en',
-    'matchesOn'             => 'Encontrado en',
-    'account_type'          => 'Tipo de cuenta',
-    'created_at'            => 'Fecha de creación',
-    'new_balance'           => 'Nuevo balance',
-    'account'               => 'Cuenta',
-    'matchingAmount'        => 'Monto',
-    'lastMatch'             => 'Última coincidencia',
-    'split_number'          => 'División #',
-    'destination'           => 'Destino',
-    'source'                => 'Origen',
-    'next_expected_match'   => 'Próxima coincidencia esperada',
-    'automatch'             => '¿Buscar coincidencia automaticamente?',
-    'repeat_freq'           => 'Repetición:',
-    'description'           => 'Descripción',
-    'amount'                => 'Monto',
-    'internal_reference'    => 'Referencia interna',
-    'date'                  => 'Fecha',
-    'interest_date'         => 'Tasa de interés',
-    'book_date'             => 'Libro fecha',
-    'process_date'          => 'Fecha de procesamiento',
-    'due_date'              => 'Fecha de vencimiento',
-    'payment_date'          => 'Fecha de pago',
-    'invoice_date'          => 'Fecha de facturación',
-    'interal_reference'     => 'Referencia interna',
-    'notes'                 => 'Notas',
-    'from'                  => 'Desde',
-    'piggy_bank'            => 'Alcancilla',
-    'to'                    => 'Hasta',
-    'budget'                => 'Presupuesto',
-    'category'              => 'Categoría',
-    'bill'                  => 'Factura',
-    'withdrawal'            => 'Retiro',
-    'deposit'               => 'Depósito',
-    'transfer'              => 'Trasferencia',
-    'type'                  => 'Tipo',
-    'completed'             => 'Completado',
-    'iban'                  => 'IBAN',
-    'paid_current_period'   => 'Pagado este período',
-    'email'                 => 'Email',
-    'registered_at'         => 'Registrado el',
-    'is_activated'          => 'Está activado',
-    'is_blocked'            => 'Está bloqueado',
-    'is_admin'              => '¿Es el administrador?',
-    'has_two_factor'        => 'Tiene 2FA',
-    'confirmed_from'        => 'Confirmado desde',
-    'registered_from'       => 'Registrado desde',
-    'blocked_code'          => 'Bloque de código',
-    'domain'                => 'Dominio',
-    'registration_attempts' => 'Intentos de registro',
-    'source_account'        => 'Cuenta origen',
-    'destination_account'   => 'Cuenta destino',
-
+    'buttons'                => 'Botones',
+    'icon'                   => 'Icono',
+    'id'                     => 'ID',
+    'create_date'            => 'Fecha de creación',
+    'update_date'            => 'Fecha de modificación',
+    'balance_before'         => 'Balance antes de ',
+    'balance_after'          => 'Balance después de la',
+    'name'                   => 'Nombre',
+    'role'                   => 'Rol',
+    'currentBalance'         => 'Balance actual',
+    'active'                 => '¿Está Activo?',
+    'lastActivity'           => 'Actividad más reciente',
+    'balanceDiff'            => 'Diferencia de saldo entre :start y :end',
+    'matchedOn'              => 'Encontrado en',
+    'matchesOn'              => 'Encontrado en',
+    'account_type'           => 'Tipo de cuenta',
+    'created_at'             => 'Fecha de creación',
+    'new_balance'            => 'Nuevo balance',
+    'account'                => 'Cuenta',
+    'matchingAmount'         => 'Monto',
+    'lastMatch'              => 'Última coincidencia',
+    'split_number'           => 'División #',
+    'destination'            => 'Destino',
+    'source'                 => 'Origen',
+    'next_expected_match'    => 'Próxima coincidencia esperada',
+    'automatch'              => '¿Buscar coincidencia automaticamente?',
+    'repeat_freq'            => 'Repetición:',
+    'description'            => 'Descripción',
+    'amount'                 => 'Monto',
+    'internal_reference'     => 'Referencia interna',
+    'date'                   => 'Fecha',
+    'interest_date'          => 'Tasa de interés',
+    'book_date'              => 'Libro fecha',
+    'process_date'           => 'Fecha de procesamiento',
+    'due_date'               => 'Fecha de vencimiento',
+    'payment_date'           => 'Fecha de pago',
+    'invoice_date'           => 'Fecha de facturación',
+    'interal_reference'      => 'Referencia interna',
+    'notes'                  => 'Notas',
+    'from'                   => 'Desde',
+    'piggy_bank'             => 'Alcancilla',
+    'to'                     => 'Hasta',
+    'budget'                 => 'Presupuesto',
+    'category'               => 'Categoría',
+    'bill'                   => 'Factura',
+    'withdrawal'             => 'Retiro',
+    'deposit'                => 'Depósito',
+    'transfer'               => 'Trasferencia',
+    'type'                   => 'Tipo',
+    'completed'              => 'Completado',
+    'iban'                   => 'IBAN',
+    'paid_current_period'    => 'Pagado este período',
+    'email'                  => 'Email',
+    'registered_at'          => 'Registrado el',
+    'is_activated'           => 'Está activado',
+    'is_blocked'             => 'Está bloqueado',
+    'is_admin'               => '¿Es el administrador?',
+    'has_two_factor'         => 'Tiene 2FA',
+    'confirmed_from'         => 'Confirmado desde',
+    'registered_from'        => 'Registrado desde',
+    'blocked_code'           => 'Bloque de código',
+    'domain'                 => 'Dominio',
+    'registration_attempts'  => 'Intentos de registro',
+    'source_account'         => 'Cuenta origen',
+    'destination_account'    => 'Cuenta destino',
     'accounts_count'         => 'Número de cuentas',
     'journals_count'         => 'Número de transacciones',
     'attachments_count'      => 'Núm. de datos adjuntos',

From 35d6db5e73de19222ccde2ef2b6cede18642bbfc Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Wed, 30 Aug 2017 07:20:17 +0200
Subject: [PATCH 417/668] New translations list.php (Slovenian)

---
 resources/lang/sl_SI/list.php | 131 +++++++++++++++++-----------------
 1 file changed, 65 insertions(+), 66 deletions(-)

diff --git a/resources/lang/sl_SI/list.php b/resources/lang/sl_SI/list.php
index e2cb94be16..6cacf51aeb 100644
--- a/resources/lang/sl_SI/list.php
+++ b/resources/lang/sl_SI/list.php
@@ -12,72 +12,71 @@ declare(strict_types=1);
  */
 
 return [
-    'buttons'               => 'Gumbi',
-    'icon'                  => 'Ikona',
-    'id'                    => 'ID',
-    'create_date'           => 'Ustvarjeno',
-    'update_date'           => 'Posodobljeno',
-    'balance_before'        => 'Stanje prej',
-    'balance_after'         => 'Stanje potem',
-    'name'                  => 'ime',
-    'role'                  => 'vloga',
-    'currentBalance'        => 'trenutno stanje',
-    'active'                => 'Aktiviran?',
-    'lastActivity'          => 'zadnja aktivnost',
-    'balanceDiff'           => 'Razlika stanja med :start in :end',
-    'matchedOn'             => 'Povezano',
-    'matchesOn'             => 'Povezano',
-    'account_type'          => 'vrsta računa',
-    'created_at'            => 'ustvarjeno',
-    'new_balance'           => 'novo stanje',
-    'account'               => 'račun',
-    'matchingAmount'        => 'znesek',
-    'lastMatch'             => 'Nazadnje povezano',
-    'split_number'          => 'Delitev #',
-    'destination'           => 'Ciljni račun',
-    'source'                => 'Izvor',
-    'next_expected_match'   => 'Naslenje pričakovano ujemanje',
-    'automatch'             => 'Samodejno poveži?',
-    'repeat_freq'           => 'Ponovitev',
-    'description'           => 'Opis',
-    'amount'                => 'Znesek',
-    'internal_reference'    => 'Notranji sklic',
-    'date'                  => 'datum',
-    'interest_date'         => 'datum obresti',
-    'book_date'             => 'datum knjiženja',
-    'process_date'          => 'datum izvedbe',
-    'due_date'              => 'rok plačila',
-    'payment_date'          => 'Datum plačila',
-    'invoice_date'          => 'datum računa',
-    'interal_reference'     => 'Notranji sklic',
-    'notes'                 => 'Zabeležke',
-    'from'                  => 'Pošiljatelj',
-    'piggy_bank'            => 'Pujsek',
-    'to'                    => 'Prejemnik',
-    'budget'                => 'Budžet',
-    'category'              => 'Kategorija',
-    'bill'                  => 'Trajnik',
-    'withdrawal'            => 'Odhodek',
-    'deposit'               => 'Prihodek',
-    'transfer'              => 'Prenos',
-    'type'                  => 'Vrsta',
-    'completed'             => 'Dokončano',
-    'iban'                  => 'IBAN',
-    'paid_current_period'   => 'Plačano v tem obdobju',
-    'email'                 => 'E-pošta',
-    'registered_at'         => 'Registriran pri',
-    'is_activated'          => 'Je aktiviran',
-    'is_blocked'            => 'Je blokiran',
-    'is_admin'              => 'Je administrator',
-    'has_two_factor'        => 'Ima dvostopenjsko overovitev',
-    'confirmed_from'        => 'Potrjen od',
-    'registered_from'       => 'Registriran',
-    'blocked_code'          => 'Koda vzroka blokade',
-    'domain'                => 'Domena',
-    'registration_attempts' => 'Poskusov registriranja',
-    'source_account'        => 'Izvorni račun',
-    'destination_account'   => 'Ciljni račun',
-
+    'buttons'                => 'Gumbi',
+    'icon'                   => 'Ikona',
+    'id'                     => 'ID',
+    'create_date'            => 'Ustvarjeno',
+    'update_date'            => 'Posodobljeno',
+    'balance_before'         => 'Stanje prej',
+    'balance_after'          => 'Stanje potem',
+    'name'                   => 'ime',
+    'role'                   => 'vloga',
+    'currentBalance'         => 'trenutno stanje',
+    'active'                 => 'Aktiviran?',
+    'lastActivity'           => 'zadnja aktivnost',
+    'balanceDiff'            => 'Razlika stanja med :start in :end',
+    'matchedOn'              => 'Povezano',
+    'matchesOn'              => 'Povezano',
+    'account_type'           => 'vrsta računa',
+    'created_at'             => 'ustvarjeno',
+    'new_balance'            => 'novo stanje',
+    'account'                => 'račun',
+    'matchingAmount'         => 'znesek',
+    'lastMatch'              => 'Nazadnje povezano',
+    'split_number'           => 'Delitev #',
+    'destination'            => 'Ciljni račun',
+    'source'                 => 'Izvor',
+    'next_expected_match'    => 'Naslenje pričakovano ujemanje',
+    'automatch'              => 'Samodejno poveži?',
+    'repeat_freq'            => 'Ponovitev',
+    'description'            => 'Opis',
+    'amount'                 => 'Znesek',
+    'internal_reference'     => 'Notranji sklic',
+    'date'                   => 'datum',
+    'interest_date'          => 'datum obresti',
+    'book_date'              => 'datum knjiženja',
+    'process_date'           => 'datum izvedbe',
+    'due_date'               => 'rok plačila',
+    'payment_date'           => 'Datum plačila',
+    'invoice_date'           => 'datum računa',
+    'interal_reference'      => 'Notranji sklic',
+    'notes'                  => 'Zabeležke',
+    'from'                   => 'Pošiljatelj',
+    'piggy_bank'             => 'Pujsek',
+    'to'                     => 'Prejemnik',
+    'budget'                 => 'Budžet',
+    'category'               => 'Kategorija',
+    'bill'                   => 'Trajnik',
+    'withdrawal'             => 'Odhodek',
+    'deposit'                => 'Prihodek',
+    'transfer'               => 'Prenos',
+    'type'                   => 'Vrsta',
+    'completed'              => 'Dokončano',
+    'iban'                   => 'IBAN',
+    'paid_current_period'    => 'Plačano v tem obdobju',
+    'email'                  => 'E-pošta',
+    'registered_at'          => 'Registriran pri',
+    'is_activated'           => 'Je aktiviran',
+    'is_blocked'             => 'Je blokiran',
+    'is_admin'               => 'Je administrator',
+    'has_two_factor'         => 'Ima dvostopenjsko overovitev',
+    'confirmed_from'         => 'Potrjen od',
+    'registered_from'        => 'Registriran',
+    'blocked_code'           => 'Koda vzroka blokade',
+    'domain'                 => 'Domena',
+    'registration_attempts'  => 'Poskusov registriranja',
+    'source_account'         => 'Izvorni račun',
+    'destination_account'    => 'Ciljni račun',
     'accounts_count'         => 'Število računov',
     'journals_count'         => 'Število transakcij',
     'attachments_count'      => 'Število prilog',

From 7aaddf2a60c38924459d154ba64070f0907051f2 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Wed, 30 Aug 2017 07:20:19 +0200
Subject: [PATCH 418/668] New translations list.php (Portuguese, Brazilian)

---
 resources/lang/pt_BR/list.php | 131 +++++++++++++++++-----------------
 1 file changed, 65 insertions(+), 66 deletions(-)

diff --git a/resources/lang/pt_BR/list.php b/resources/lang/pt_BR/list.php
index cf8d04a2f8..e23268f310 100644
--- a/resources/lang/pt_BR/list.php
+++ b/resources/lang/pt_BR/list.php
@@ -12,72 +12,71 @@ declare(strict_types=1);
  */
 
 return [
-    'buttons'               => 'Botões',
-    'icon'                  => 'Ícone',
-    'id'                    => 'ID',
-    'create_date'           => 'Criado em',
-    'update_date'           => 'Atualizado em',
-    'balance_before'        => 'Saldo Antes',
-    'balance_after'         => 'Saldo depois',
-    'name'                  => 'Nome',
-    'role'                  => 'Papel',
-    'currentBalance'        => 'Saldo atual',
-    'active'                => 'Está ativo?',
-    'lastActivity'          => 'Última atividade',
-    'balanceDiff'           => 'Saldo diferente entre :start e :end',
-    'matchedOn'             => 'Coincide',
-    'matchesOn'             => 'Correspondido em',
-    'account_type'          => 'Tipo de conta',
-    'created_at'            => 'Criado em',
-    'new_balance'           => 'Novo saldo',
-    'account'               => 'Conta',
-    'matchingAmount'        => 'Total',
-    'lastMatch'             => 'Último equivalente',
-    'split_number'          => 'Dividir #',
-    'destination'           => 'Destino',
-    'source'                => 'Fonte',
-    'next_expected_match'   => 'Próximo correspondente esperado',
-    'automatch'             => 'Auto match?',
-    'repeat_freq'           => 'Repetições',
-    'description'           => 'Descrição',
-    'amount'                => 'Total',
-    'internal_reference'    => 'Referência interna',
-    'date'                  => 'Data',
-    'interest_date'         => 'Data de interesse',
-    'book_date'             => 'Data reserva',
-    'process_date'          => 'Data de processamento',
-    'due_date'              => 'Prazo',
-    'payment_date'          => 'Data de pagamento',
-    'invoice_date'          => 'Data da Fatura',
-    'interal_reference'     => 'Referência interna',
-    'notes'                 => 'Notas',
-    'from'                  => 'De',
-    'piggy_bank'            => 'Cofrinho',
-    'to'                    => 'Até',
-    'budget'                => 'Orçamento',
-    'category'              => 'Categoria',
-    'bill'                  => 'Fatura',
-    'withdrawal'            => 'Retirada',
-    'deposit'               => 'Depósito',
-    'transfer'              => 'Transferência',
-    'type'                  => 'Tipo',
-    'completed'             => 'Completo',
-    'iban'                  => 'IBAN',
-    'paid_current_period'   => 'Pago este período',
-    'email'                 => 'Email',
-    'registered_at'         => 'Registrado em',
-    'is_activated'          => 'Está ativo',
-    'is_blocked'            => 'Está bloqueado',
-    'is_admin'              => 'É admin',
-    'has_two_factor'        => 'Tem 2FA',
-    'confirmed_from'        => 'Confirmado de',
-    'registered_from'       => 'Registrado de',
-    'blocked_code'          => 'Bloco de código',
-    'domain'                => 'Domínio',
-    'registration_attempts' => 'Tentativas de registo',
-    'source_account'        => 'Conta de origem',
-    'destination_account'   => 'Conta de destino',
-
+    'buttons'                => 'Botões',
+    'icon'                   => 'Ícone',
+    'id'                     => 'ID',
+    'create_date'            => 'Criado em',
+    'update_date'            => 'Atualizado em',
+    'balance_before'         => 'Saldo Antes',
+    'balance_after'          => 'Saldo depois',
+    'name'                   => 'Nome',
+    'role'                   => 'Papel',
+    'currentBalance'         => 'Saldo atual',
+    'active'                 => 'Está ativo?',
+    'lastActivity'           => 'Última atividade',
+    'balanceDiff'            => 'Saldo diferente entre :start e :end',
+    'matchedOn'              => 'Coincide',
+    'matchesOn'              => 'Correspondido em',
+    'account_type'           => 'Tipo de conta',
+    'created_at'             => 'Criado em',
+    'new_balance'            => 'Novo saldo',
+    'account'                => 'Conta',
+    'matchingAmount'         => 'Total',
+    'lastMatch'              => 'Último equivalente',
+    'split_number'           => 'Dividir #',
+    'destination'            => 'Destino',
+    'source'                 => 'Fonte',
+    'next_expected_match'    => 'Próximo correspondente esperado',
+    'automatch'              => 'Auto match?',
+    'repeat_freq'            => 'Repetições',
+    'description'            => 'Descrição',
+    'amount'                 => 'Total',
+    'internal_reference'     => 'Referência interna',
+    'date'                   => 'Data',
+    'interest_date'          => 'Data de interesse',
+    'book_date'              => 'Data reserva',
+    'process_date'           => 'Data de processamento',
+    'due_date'               => 'Prazo',
+    'payment_date'           => 'Data de pagamento',
+    'invoice_date'           => 'Data da Fatura',
+    'interal_reference'      => 'Referência interna',
+    'notes'                  => 'Notas',
+    'from'                   => 'De',
+    'piggy_bank'             => 'Cofrinho',
+    'to'                     => 'Até',
+    'budget'                 => 'Orçamento',
+    'category'               => 'Categoria',
+    'bill'                   => 'Fatura',
+    'withdrawal'             => 'Retirada',
+    'deposit'                => 'Depósito',
+    'transfer'               => 'Transferência',
+    'type'                   => 'Tipo',
+    'completed'              => 'Completo',
+    'iban'                   => 'IBAN',
+    'paid_current_period'    => 'Pago este período',
+    'email'                  => 'Email',
+    'registered_at'          => 'Registrado em',
+    'is_activated'           => 'Está ativo',
+    'is_blocked'             => 'Está bloqueado',
+    'is_admin'               => 'É admin',
+    'has_two_factor'         => 'Tem 2FA',
+    'confirmed_from'         => 'Confirmado de',
+    'registered_from'        => 'Registrado de',
+    'blocked_code'           => 'Bloco de código',
+    'domain'                 => 'Domínio',
+    'registration_attempts'  => 'Tentativas de registo',
+    'source_account'         => 'Conta de origem',
+    'destination_account'    => 'Conta de destino',
     'accounts_count'         => 'Número de Contas',
     'journals_count'         => 'Number of transactions',
     'attachments_count'      => 'Número de anexos',

From 0c88bea7720c5a4e37d722d012f15899491a33ef Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Wed, 30 Aug 2017 07:20:26 +0200
Subject: [PATCH 419/668] New translations list.php (Russian)

---
 resources/lang/ru_RU/list.php | 131 +++++++++++++++++-----------------
 1 file changed, 65 insertions(+), 66 deletions(-)

diff --git a/resources/lang/ru_RU/list.php b/resources/lang/ru_RU/list.php
index 95fe61c6bb..6d3da0d9bb 100644
--- a/resources/lang/ru_RU/list.php
+++ b/resources/lang/ru_RU/list.php
@@ -12,72 +12,71 @@ declare(strict_types=1);
  */
 
 return [
-    'buttons'               => 'Кнопки',
-    'icon'                  => 'Значок',
-    'id'                    => 'ID',
-    'create_date'           => 'Создан',
-    'update_date'           => 'Обновлён',
-    'balance_before'        => 'Баланс до',
-    'balance_after'         => 'Баланс после',
-    'name'                  => 'Имя',
-    'role'                  => 'Роль',
-    'currentBalance'        => 'Текущий баланс',
-    'active'                => 'Активен?',
-    'lastActivity'          => 'Последняя активность',
-    'balanceDiff'           => 'Разница баланса между :start и :end',
-    'matchedOn'             => 'Matched on',
-    'matchesOn'             => 'Matched on',
-    'account_type'          => 'Тип профиля',
-    'created_at'            => 'Created at',
-    'new_balance'           => 'New balance',
-    'account'               => 'Account',
-    'matchingAmount'        => 'Amount',
-    'lastMatch'             => 'Last match',
-    'split_number'          => 'Split #',
-    'destination'           => 'Destination',
-    'source'                => 'Source',
-    'next_expected_match'   => 'Next expected match',
-    'automatch'             => 'Auto match?',
-    'repeat_freq'           => 'Repeats',
-    'description'           => 'Описание',
-    'amount'                => 'Сумма',
-    'internal_reference'    => 'Internal reference',
-    'date'                  => 'Дата',
-    'interest_date'         => 'Interest date',
-    'book_date'             => 'Book date',
-    'process_date'          => 'Processing date',
-    'due_date'              => 'Due date',
-    'payment_date'          => 'Payment date',
-    'invoice_date'          => 'Invoice date',
-    'interal_reference'     => 'Internal reference',
-    'notes'                 => 'Заметки',
-    'from'                  => 'Откуда',
-    'piggy_bank'            => 'Копилка',
-    'to'                    => 'Куда',
-    'budget'                => 'Бюджет',
-    'category'              => 'Категория',
-    'bill'                  => 'Счет к оплате',
-    'withdrawal'            => 'Расход',
-    'deposit'               => 'Доход',
-    'transfer'              => 'Перевод',
-    'type'                  => 'Type',
-    'completed'             => 'Completed',
-    'iban'                  => 'IBAN',
-    'paid_current_period'   => 'Paid this period',
-    'email'                 => 'E-mail',
-    'registered_at'         => 'Дата регистрации',
-    'is_activated'          => 'Активен?',
-    'is_blocked'            => 'Заблокирован?',
-    'is_admin'              => 'Администратор?',
-    'has_two_factor'        => 'Защита (2FA)?',
-    'confirmed_from'        => 'Confirmed from',
-    'registered_from'       => 'Registered from',
-    'blocked_code'          => 'Block code',
-    'domain'                => 'Домен',
-    'registration_attempts' => 'Registration attempts',
-    'source_account'        => 'Source account',
-    'destination_account'   => 'Destination account',
-
+    'buttons'                => 'Кнопки',
+    'icon'                   => 'Значок',
+    'id'                     => 'ID',
+    'create_date'            => 'Создан',
+    'update_date'            => 'Обновлён',
+    'balance_before'         => 'Баланс до',
+    'balance_after'          => 'Баланс после',
+    'name'                   => 'Имя',
+    'role'                   => 'Роль',
+    'currentBalance'         => 'Текущий баланс',
+    'active'                 => 'Активен?',
+    'lastActivity'           => 'Последняя активность',
+    'balanceDiff'            => 'Разница баланса между :start и :end',
+    'matchedOn'              => 'Matched on',
+    'matchesOn'              => 'Matched on',
+    'account_type'           => 'Тип профиля',
+    'created_at'             => 'Created at',
+    'new_balance'            => 'New balance',
+    'account'                => 'Account',
+    'matchingAmount'         => 'Amount',
+    'lastMatch'              => 'Last match',
+    'split_number'           => 'Split #',
+    'destination'            => 'Destination',
+    'source'                 => 'Source',
+    'next_expected_match'    => 'Next expected match',
+    'automatch'              => 'Auto match?',
+    'repeat_freq'            => 'Repeats',
+    'description'            => 'Описание',
+    'amount'                 => 'Сумма',
+    'internal_reference'     => 'Internal reference',
+    'date'                   => 'Дата',
+    'interest_date'          => 'Interest date',
+    'book_date'              => 'Book date',
+    'process_date'           => 'Processing date',
+    'due_date'               => 'Due date',
+    'payment_date'           => 'Payment date',
+    'invoice_date'           => 'Invoice date',
+    'interal_reference'      => 'Internal reference',
+    'notes'                  => 'Заметки',
+    'from'                   => 'Откуда',
+    'piggy_bank'             => 'Копилка',
+    'to'                     => 'Куда',
+    'budget'                 => 'Бюджет',
+    'category'               => 'Категория',
+    'bill'                   => 'Счет к оплате',
+    'withdrawal'             => 'Расход',
+    'deposit'                => 'Доход',
+    'transfer'               => 'Перевод',
+    'type'                   => 'Type',
+    'completed'              => 'Completed',
+    'iban'                   => 'IBAN',
+    'paid_current_period'    => 'Paid this period',
+    'email'                  => 'E-mail',
+    'registered_at'          => 'Дата регистрации',
+    'is_activated'           => 'Активен?',
+    'is_blocked'             => 'Заблокирован?',
+    'is_admin'               => 'Администратор?',
+    'has_two_factor'         => 'Защита (2FA)?',
+    'confirmed_from'         => 'Confirmed from',
+    'registered_from'        => 'Registered from',
+    'blocked_code'           => 'Block code',
+    'domain'                 => 'Домен',
+    'registration_attempts'  => 'Registration attempts',
+    'source_account'         => 'Source account',
+    'destination_account'    => 'Destination account',
     'accounts_count'         => 'Всего счетов',
     'journals_count'         => 'Всего транзакций',
     'attachments_count'      => 'Всего вложений',

From b75849d4ab00722dc555c79ab726b587f1fdd006 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Wed, 30 Aug 2017 07:20:30 +0200
Subject: [PATCH 420/668] New translations form.php (Russian)

---
 resources/lang/ru_RU/form.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/resources/lang/ru_RU/form.php b/resources/lang/ru_RU/form.php
index 26228ed515..661ea8f44d 100644
--- a/resources/lang/ru_RU/form.php
+++ b/resources/lang/ru_RU/form.php
@@ -100,6 +100,7 @@ return [
     'code'                       => 'Код',
     'iban'                       => 'IBAN',
     'accountNumber'              => 'Номер счета',
+    'creditCardNumber'           => 'Credit card number',
     'has_headers'                => 'Заголовки',
     'date_format'                => 'Формат даты',
     'specifix'                   => 'Bank- or file specific fixes',

From a8f10bbb09cbd2ebc0eb3964cdd2896ec918f750 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Wed, 30 Aug 2017 07:20:33 +0200
Subject: [PATCH 421/668] New translations list.php (Polish)

---
 resources/lang/pl_PL/list.php | 131 +++++++++++++++++-----------------
 1 file changed, 65 insertions(+), 66 deletions(-)

diff --git a/resources/lang/pl_PL/list.php b/resources/lang/pl_PL/list.php
index 552981dcf6..1905cc9396 100644
--- a/resources/lang/pl_PL/list.php
+++ b/resources/lang/pl_PL/list.php
@@ -12,72 +12,71 @@ declare(strict_types=1);
  */
 
 return [
-    'buttons'               => 'Przyciski',
-    'icon'                  => 'Ikona',
-    'id'                    => 'ID',
-    'create_date'           => 'Utworzono',
-    'update_date'           => 'Zaktualizowano',
-    'balance_before'        => 'Saldo przed',
-    'balance_after'         => 'Saldo po',
-    'name'                  => 'Nazwa',
-    'role'                  => 'Rola',
-    'currentBalance'        => 'Bieżące saldo',
-    'active'                => 'Jest aktywny?',
-    'lastActivity'          => 'Ostatnia aktywność',
-    'balanceDiff'           => 'Różnica salda między :start oraz :end',
-    'matchedOn'             => 'Dopasowanie',
-    'matchesOn'             => 'Dopasowanie',
-    'account_type'          => 'Typ konta',
-    'created_at'            => 'Utworzono',
-    'new_balance'           => 'Nowe saldo',
-    'account'               => 'Konto',
-    'matchingAmount'        => 'Kwota',
-    'lastMatch'             => 'Ostatnie dopasowanie',
-    'split_number'          => '# podziału',
-    'destination'           => 'Cel',
-    'source'                => 'Źródło',
-    'next_expected_match'   => 'Następne oczekiwane dopasowanie',
-    'automatch'             => 'Auto dopasowanie?',
-    'repeat_freq'           => 'Powtarza się',
-    'description'           => 'Opis',
-    'amount'                => 'Kwota',
-    'internal_reference'    => 'Internal reference',
-    'date'                  => 'Data',
-    'interest_date'         => 'Stopa procentowa',
-    'book_date'             => 'Data księgowania',
-    'process_date'          => 'Przetworzono',
-    'due_date'              => 'Termin realizacji',
-    'payment_date'          => 'Data płatności',
-    'invoice_date'          => 'Data faktury',
-    'interal_reference'     => 'Internal reference',
-    'notes'                 => 'Notatki',
-    'from'                  => 'Z',
-    'piggy_bank'            => 'Skarbonka',
-    'to'                    => 'Do',
-    'budget'                => 'Budżet',
-    'category'              => 'Kategoria',
-    'bill'                  => 'Rachunek',
-    'withdrawal'            => 'Wypłata',
-    'deposit'               => 'Wpłata',
-    'transfer'              => 'Transfer',
-    'type'                  => 'Typ',
-    'completed'             => 'Zakończone',
-    'iban'                  => 'IBAN',
-    'paid_current_period'   => 'Zapłacono w tym okresie',
-    'email'                 => 'Adres E-Mail',
-    'registered_at'         => 'Zarejestrowano',
-    'is_activated'          => 'Jest aktywny',
-    'is_blocked'            => 'Jest zablokowany',
-    'is_admin'              => 'Jest administratorem',
-    'has_two_factor'        => 'Ma dwustopniową autoryzację',
-    'confirmed_from'        => 'Potwierdzone z',
-    'registered_from'       => 'Registered from',
-    'blocked_code'          => 'Kod blokady',
-    'domain'                => 'Domena',
-    'registration_attempts' => 'Próby rejestracji',
-    'source_account'        => 'Konto źródłowe',
-    'destination_account'   => 'Konto docelowe',
-
+    'buttons'                => 'Przyciski',
+    'icon'                   => 'Ikona',
+    'id'                     => 'ID',
+    'create_date'            => 'Utworzono',
+    'update_date'            => 'Zaktualizowano',
+    'balance_before'         => 'Saldo przed',
+    'balance_after'          => 'Saldo po',
+    'name'                   => 'Nazwa',
+    'role'                   => 'Rola',
+    'currentBalance'         => 'Bieżące saldo',
+    'active'                 => 'Jest aktywny?',
+    'lastActivity'           => 'Ostatnia aktywność',
+    'balanceDiff'            => 'Różnica salda między :start oraz :end',
+    'matchedOn'              => 'Dopasowanie',
+    'matchesOn'              => 'Dopasowanie',
+    'account_type'           => 'Typ konta',
+    'created_at'             => 'Utworzono',
+    'new_balance'            => 'Nowe saldo',
+    'account'                => 'Konto',
+    'matchingAmount'         => 'Kwota',
+    'lastMatch'              => 'Ostatnie dopasowanie',
+    'split_number'           => '# podziału',
+    'destination'            => 'Cel',
+    'source'                 => 'Źródło',
+    'next_expected_match'    => 'Następne oczekiwane dopasowanie',
+    'automatch'              => 'Auto dopasowanie?',
+    'repeat_freq'            => 'Powtarza się',
+    'description'            => 'Opis',
+    'amount'                 => 'Kwota',
+    'internal_reference'     => 'Internal reference',
+    'date'                   => 'Data',
+    'interest_date'          => 'Stopa procentowa',
+    'book_date'              => 'Data księgowania',
+    'process_date'           => 'Przetworzono',
+    'due_date'               => 'Termin realizacji',
+    'payment_date'           => 'Data płatności',
+    'invoice_date'           => 'Data faktury',
+    'interal_reference'      => 'Internal reference',
+    'notes'                  => 'Notatki',
+    'from'                   => 'Z',
+    'piggy_bank'             => 'Skarbonka',
+    'to'                     => 'Do',
+    'budget'                 => 'Budżet',
+    'category'               => 'Kategoria',
+    'bill'                   => 'Rachunek',
+    'withdrawal'             => 'Wypłata',
+    'deposit'                => 'Wpłata',
+    'transfer'               => 'Transfer',
+    'type'                   => 'Typ',
+    'completed'              => 'Zakończone',
+    'iban'                   => 'IBAN',
+    'paid_current_period'    => 'Zapłacono w tym okresie',
+    'email'                  => 'Adres E-Mail',
+    'registered_at'          => 'Zarejestrowano',
+    'is_activated'           => 'Jest aktywny',
+    'is_blocked'             => 'Jest zablokowany',
+    'is_admin'               => 'Jest administratorem',
+    'has_two_factor'         => 'Ma dwustopniową autoryzację',
+    'confirmed_from'         => 'Potwierdzone z',
+    'registered_from'        => 'Registered from',
+    'blocked_code'           => 'Kod blokady',
+    'domain'                 => 'Domena',
+    'registration_attempts'  => 'Próby rejestracji',
+    'source_account'         => 'Konto źródłowe',
+    'destination_account'    => 'Konto docelowe',
     'accounts_count'         => 'Liczba kont',
     'journals_count'         => 'Liczba transakcji',
     'attachments_count'      => 'Liczba załączników',

From cb3504642c95ff419b4ddd0edafa00ba6713bf34 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Wed, 30 Aug 2017 07:20:34 +0200
Subject: [PATCH 422/668] New translations list.php (German)

---
 resources/lang/de_DE/list.php | 131 +++++++++++++++++-----------------
 1 file changed, 65 insertions(+), 66 deletions(-)

diff --git a/resources/lang/de_DE/list.php b/resources/lang/de_DE/list.php
index 04d2833b59..43968fe04a 100644
--- a/resources/lang/de_DE/list.php
+++ b/resources/lang/de_DE/list.php
@@ -12,72 +12,71 @@ declare(strict_types=1);
  */
 
 return [
-    'buttons'               => 'Schaltfläche',
-    'icon'                  => 'Icon',
-    'id'                    => 'Id',
-    'create_date'           => 'Erstellt am',
-    'update_date'           => 'Aktualisiert am',
-    'balance_before'        => 'Bilanz vor',
-    'balance_after'         => 'Bilanz nach',
-    'name'                  => 'Name',
-    'role'                  => 'Rolle',
-    'currentBalance'        => 'Aktueller Kontostand',
-    'active'                => 'Aktiv?',
-    'lastActivity'          => 'Letzte Aktivität',
-    'balanceDiff'           => 'Differenz des Kontostandes zwischen :start und :end',
-    'matchedOn'             => 'Übereinstimmung am',
-    'matchesOn'             => 'Übereinstimmung am',
-    'account_type'          => 'Art des Kontos',
-    'created_at'            => 'Erstellt am',
-    'new_balance'           => 'Neue Bilanz',
-    'account'               => 'Konto',
-    'matchingAmount'        => 'Betrag',
-    'lastMatch'             => 'Letzte Übereinstimmung',
-    'split_number'          => 'Geteilt #',
-    'destination'           => 'Empfänger',
-    'source'                => 'Quelle',
-    'next_expected_match'   => 'Nächste erwartete Übereinstimmung',
-    'automatch'             => 'Automatisch erkennen?',
-    'repeat_freq'           => 'Wiederholungen',
-    'description'           => 'Beschreibung',
-    'amount'                => 'Betrag',
-    'internal_reference'    => 'Interne Referenz',
-    'date'                  => 'Datum',
-    'interest_date'         => 'Zinstermin',
-    'book_date'             => 'Buchungsdatum',
-    'process_date'          => 'Bearbeitungsdatum',
-    'due_date'              => 'Fälligkeitstermin',
-    'payment_date'          => 'Zahlungsdatum',
-    'invoice_date'          => 'Rechnungsdatum',
-    'interal_reference'     => 'Interner Verweis',
-    'notes'                 => 'Notizen',
-    'from'                  => 'Von',
-    'piggy_bank'            => 'Sparschwein',
-    'to'                    => 'An',
-    'budget'                => 'Budget',
-    'category'              => 'Kategorie',
-    'bill'                  => 'Rechnung',
-    'withdrawal'            => 'Ausgabe',
-    'deposit'               => 'Einlage',
-    'transfer'              => 'Überweisung',
-    'type'                  => 'Typ',
-    'completed'             => 'Abgeschlossen',
-    'iban'                  => 'IBAN',
-    'paid_current_period'   => 'Diese Periode bezahlt',
-    'email'                 => 'E-Mail',
-    'registered_at'         => 'Registriert am',
-    'is_activated'          => 'Ist aktiviert',
-    'is_blocked'            => 'Ist blockiert',
-    'is_admin'              => 'Ist Admin',
-    'has_two_factor'        => 'Hat 2FA',
-    'confirmed_from'        => 'Bestätigt von',
-    'registered_from'       => 'Registriert seit',
-    'blocked_code'          => 'Blockcode',
-    'domain'                => 'Domain',
-    'registration_attempts' => 'Registrierungsversuche',
-    'source_account'        => 'Quellkonto',
-    'destination_account'   => 'Zielkonto',
-
+    'buttons'                => 'Schaltfläche',
+    'icon'                   => 'Icon',
+    'id'                     => 'Id',
+    'create_date'            => 'Erstellt am',
+    'update_date'            => 'Aktualisiert am',
+    'balance_before'         => 'Bilanz vor',
+    'balance_after'          => 'Bilanz nach',
+    'name'                   => 'Name',
+    'role'                   => 'Rolle',
+    'currentBalance'         => 'Aktueller Kontostand',
+    'active'                 => 'Aktiv?',
+    'lastActivity'           => 'Letzte Aktivität',
+    'balanceDiff'            => 'Differenz des Kontostandes zwischen :start und :end',
+    'matchedOn'              => 'Übereinstimmung am',
+    'matchesOn'              => 'Übereinstimmung am',
+    'account_type'           => 'Art des Kontos',
+    'created_at'             => 'Erstellt am',
+    'new_balance'            => 'Neue Bilanz',
+    'account'                => 'Konto',
+    'matchingAmount'         => 'Betrag',
+    'lastMatch'              => 'Letzte Übereinstimmung',
+    'split_number'           => 'Geteilt #',
+    'destination'            => 'Empfänger',
+    'source'                 => 'Quelle',
+    'next_expected_match'    => 'Nächste erwartete Übereinstimmung',
+    'automatch'              => 'Automatisch erkennen?',
+    'repeat_freq'            => 'Wiederholungen',
+    'description'            => 'Beschreibung',
+    'amount'                 => 'Betrag',
+    'internal_reference'     => 'Interne Referenz',
+    'date'                   => 'Datum',
+    'interest_date'          => 'Zinstermin',
+    'book_date'              => 'Buchungsdatum',
+    'process_date'           => 'Bearbeitungsdatum',
+    'due_date'               => 'Fälligkeitstermin',
+    'payment_date'           => 'Zahlungsdatum',
+    'invoice_date'           => 'Rechnungsdatum',
+    'interal_reference'      => 'Interner Verweis',
+    'notes'                  => 'Notizen',
+    'from'                   => 'Von',
+    'piggy_bank'             => 'Sparschwein',
+    'to'                     => 'An',
+    'budget'                 => 'Budget',
+    'category'               => 'Kategorie',
+    'bill'                   => 'Rechnung',
+    'withdrawal'             => 'Ausgabe',
+    'deposit'                => 'Einlage',
+    'transfer'               => 'Überweisung',
+    'type'                   => 'Typ',
+    'completed'              => 'Abgeschlossen',
+    'iban'                   => 'IBAN',
+    'paid_current_period'    => 'Diese Periode bezahlt',
+    'email'                  => 'E-Mail',
+    'registered_at'          => 'Registriert am',
+    'is_activated'           => 'Ist aktiviert',
+    'is_blocked'             => 'Ist blockiert',
+    'is_admin'               => 'Ist Admin',
+    'has_two_factor'         => 'Hat 2FA',
+    'confirmed_from'         => 'Bestätigt von',
+    'registered_from'        => 'Registriert seit',
+    'blocked_code'           => 'Blockcode',
+    'domain'                 => 'Domain',
+    'registration_attempts'  => 'Registrierungsversuche',
+    'source_account'         => 'Quellkonto',
+    'destination_account'    => 'Zielkonto',
     'accounts_count'         => 'Anzahl Konten',
     'journals_count'         => 'Anzahl der Zahlungsvorgänge',
     'attachments_count'      => 'Anzahl Anhänge',

From b1ca56a2967205f5416f159b846821a35981c79e Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Wed, 30 Aug 2017 07:20:43 +0200
Subject: [PATCH 423/668] New translations form.php (Spanish)

---
 resources/lang/es_ES/form.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/resources/lang/es_ES/form.php b/resources/lang/es_ES/form.php
index 839788ad33..8be5f9f284 100644
--- a/resources/lang/es_ES/form.php
+++ b/resources/lang/es_ES/form.php
@@ -100,6 +100,7 @@ return [
     'code'                       => 'Código',
     'iban'                       => 'IBAN',
     'accountNumber'              => 'Número de cuenta',
+    'creditCardNumber'           => 'Credit card number',
     'has_headers'                => 'Encabezados',
     'date_format'                => 'Formato de fecha',
     'specifix'                   => 'Bank- or file specific fixes',

From 122467799fce60a3b62a1c5706c010adcdfcf079 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Wed, 30 Aug 2017 07:20:45 +0200
Subject: [PATCH 424/668] New translations form.php (Slovenian)

---
 resources/lang/sl_SI/form.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/resources/lang/sl_SI/form.php b/resources/lang/sl_SI/form.php
index 1166ab5444..81cdd6db74 100644
--- a/resources/lang/sl_SI/form.php
+++ b/resources/lang/sl_SI/form.php
@@ -100,6 +100,7 @@ return [
     'code'                       => 'Code',
     'iban'                       => 'IBAN',
     'accountNumber'              => 'Account number',
+    'creditCardNumber'           => 'Credit card number',
     'has_headers'                => 'Headers',
     'date_format'                => 'Date format',
     'specifix'                   => 'Bank- or file specific fixes',

From 40d3d9906a8d2a884ee54c93a2e7e4a3ed8535a8 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Wed, 30 Aug 2017 07:20:46 +0200
Subject: [PATCH 425/668] New translations list.php (French)

---
 resources/lang/fr_FR/list.php | 131 +++++++++++++++++-----------------
 1 file changed, 65 insertions(+), 66 deletions(-)

diff --git a/resources/lang/fr_FR/list.php b/resources/lang/fr_FR/list.php
index 786e6a801a..871a8f10ad 100644
--- a/resources/lang/fr_FR/list.php
+++ b/resources/lang/fr_FR/list.php
@@ -12,72 +12,71 @@ declare(strict_types=1);
  */
 
 return [
-    'buttons'               => 'Boutons',
-    'icon'                  => 'Icône',
-    'id'                    => 'Identifiant',
-    'create_date'           => 'Créé le',
-    'update_date'           => 'Mis à jour le',
-    'balance_before'        => 'Solde avant',
-    'balance_after'         => 'Solde après',
-    'name'                  => 'Nom',
-    'role'                  => 'Rôle',
-    'currentBalance'        => 'Solde courant',
-    'active'                => 'Actif ?',
-    'lastActivity'          => 'Activité récente',
-    'balanceDiff'           => 'Difference solde entre :start et :end',
-    'matchedOn'             => 'Correspond à',
-    'matchesOn'             => 'Correspond à',
-    'account_type'          => 'Type de compte',
-    'created_at'            => 'Créé le',
-    'new_balance'           => 'Nouveau solde',
-    'account'               => 'Compte',
-    'matchingAmount'        => 'Montant',
-    'lastMatch'             => 'Dernière correspondance',
-    'split_number'          => 'Segmenter en',
-    'destination'           => 'Destination',
-    'source'                => 'Source',
-    'next_expected_match'   => 'Prochaine association attendue',
-    'automatch'             => 'Correspondance automatique ?',
-    'repeat_freq'           => 'Répétitions',
-    'description'           => 'Description',
-    'amount'                => 'Montant',
-    'internal_reference'    => 'Référence interne',
-    'date'                  => 'Date',
-    'interest_date'         => 'Date des intérêts',
-    'book_date'             => 'Date de réservation',
-    'process_date'          => 'Date de traitement',
-    'due_date'              => 'Échéance',
-    'payment_date'          => 'Date de paiement',
-    'invoice_date'          => 'Date de facturation',
-    'interal_reference'     => 'Référence interne',
-    'notes'                 => 'Notes',
-    'from'                  => 'Depuis',
-    'piggy_bank'            => 'Tirelire',
-    'to'                    => 'À',
-    'budget'                => 'Budget',
-    'category'              => 'Catégorie',
-    'bill'                  => 'Facture',
-    'withdrawal'            => 'Retrait',
-    'deposit'               => 'Dépôt',
-    'transfer'              => 'Transfert',
-    'type'                  => 'Type',
-    'completed'             => 'Terminé',
-    'iban'                  => 'Numéro IBAN',
-    'paid_current_period'   => 'Payé cette période',
-    'email'                 => 'E-mail',
-    'registered_at'         => 'Enregistré le',
-    'is_activated'          => 'Est activé',
-    'is_blocked'            => 'Est bloqué',
-    'is_admin'              => 'Est admin',
-    'has_two_factor'        => 'A 2FA',
-    'confirmed_from'        => 'Confirmé à partir de',
-    'registered_from'       => 'Inscrit depuis le',
-    'blocked_code'          => 'Code de blocage',
-    'domain'                => 'Domaine',
-    'registration_attempts' => 'Tentatives d\'inscription',
-    'source_account'        => 'Compte d\'origine',
-    'destination_account'   => 'Compte destinataire',
-
+    'buttons'                => 'Boutons',
+    'icon'                   => 'Icône',
+    'id'                     => 'Identifiant',
+    'create_date'            => 'Créé le',
+    'update_date'            => 'Mis à jour le',
+    'balance_before'         => 'Solde avant',
+    'balance_after'          => 'Solde après',
+    'name'                   => 'Nom',
+    'role'                   => 'Rôle',
+    'currentBalance'         => 'Solde courant',
+    'active'                 => 'Actif ?',
+    'lastActivity'           => 'Activité récente',
+    'balanceDiff'            => 'Difference solde entre :start et :end',
+    'matchedOn'              => 'Correspond à',
+    'matchesOn'              => 'Correspond à',
+    'account_type'           => 'Type de compte',
+    'created_at'             => 'Créé le',
+    'new_balance'            => 'Nouveau solde',
+    'account'                => 'Compte',
+    'matchingAmount'         => 'Montant',
+    'lastMatch'              => 'Dernière correspondance',
+    'split_number'           => 'Segmenter en',
+    'destination'            => 'Destination',
+    'source'                 => 'Source',
+    'next_expected_match'    => 'Prochaine association attendue',
+    'automatch'              => 'Correspondance automatique ?',
+    'repeat_freq'            => 'Répétitions',
+    'description'            => 'Description',
+    'amount'                 => 'Montant',
+    'internal_reference'     => 'Référence interne',
+    'date'                   => 'Date',
+    'interest_date'          => 'Date des intérêts',
+    'book_date'              => 'Date de réservation',
+    'process_date'           => 'Date de traitement',
+    'due_date'               => 'Échéance',
+    'payment_date'           => 'Date de paiement',
+    'invoice_date'           => 'Date de facturation',
+    'interal_reference'      => 'Référence interne',
+    'notes'                  => 'Notes',
+    'from'                   => 'Depuis',
+    'piggy_bank'             => 'Tirelire',
+    'to'                     => 'À',
+    'budget'                 => 'Budget',
+    'category'               => 'Catégorie',
+    'bill'                   => 'Facture',
+    'withdrawal'             => 'Retrait',
+    'deposit'                => 'Dépôt',
+    'transfer'               => 'Transfert',
+    'type'                   => 'Type',
+    'completed'              => 'Terminé',
+    'iban'                   => 'Numéro IBAN',
+    'paid_current_period'    => 'Payé cette période',
+    'email'                  => 'E-mail',
+    'registered_at'          => 'Enregistré le',
+    'is_activated'           => 'Est activé',
+    'is_blocked'             => 'Est bloqué',
+    'is_admin'               => 'Est admin',
+    'has_two_factor'         => 'A 2FA',
+    'confirmed_from'         => 'Confirmé à partir de',
+    'registered_from'        => 'Inscrit depuis le',
+    'blocked_code'           => 'Code de blocage',
+    'domain'                 => 'Domaine',
+    'registration_attempts'  => 'Tentatives d\'inscription',
+    'source_account'         => 'Compte d\'origine',
+    'destination_account'    => 'Compte destinataire',
     'accounts_count'         => 'Nombre de comptes',
     'journals_count'         => 'Nombre d\'opérations',
     'attachments_count'      => 'Nombre de pièces jointes',

From 964d552d289daab3c74a5ff0218b8ace365de359 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Wed, 30 Aug 2017 07:20:47 +0200
Subject: [PATCH 426/668] New translations list.php (Dutch)

---
 resources/lang/nl_NL/list.php | 131 +++++++++++++++++-----------------
 1 file changed, 65 insertions(+), 66 deletions(-)

diff --git a/resources/lang/nl_NL/list.php b/resources/lang/nl_NL/list.php
index 38ccf0caba..c384da4c87 100644
--- a/resources/lang/nl_NL/list.php
+++ b/resources/lang/nl_NL/list.php
@@ -12,72 +12,71 @@ declare(strict_types=1);
  */
 
 return [
-    'buttons'               => 'Knoppen',
-    'icon'                  => 'Icoon',
-    'id'                    => 'ID',
-    'create_date'           => 'Aangemaakt op',
-    'update_date'           => 'Bijgewerkt op',
-    'balance_before'        => 'Saldo voor',
-    'balance_after'         => 'Saldo na',
-    'name'                  => 'Naam',
-    'role'                  => 'Rol',
-    'currentBalance'        => 'Huidig saldo',
-    'active'                => 'Actief?',
-    'lastActivity'          => 'Laatste activiteit',
-    'balanceDiff'           => 'Saldoverschil tussen :start en :end',
-    'matchedOn'             => 'Wordt herkend',
-    'matchesOn'             => 'Wordt herkend',
-    'account_type'          => 'Accounttype',
-    'created_at'            => 'Gemaakt op',
-    'new_balance'           => 'Nieuw saldo',
-    'account'               => 'Rekening',
-    'matchingAmount'        => 'Bedrag',
-    'lastMatch'             => 'Laatste keer gezien',
-    'split_number'          => 'Split #',
-    'destination'           => 'Doel',
-    'source'                => 'Bron',
-    'next_expected_match'   => 'Volgende verwachte match',
-    'automatch'             => 'Automatisch herkennen?',
-    'repeat_freq'           => 'Herhaling',
-    'description'           => 'Omschrijving',
-    'amount'                => 'Bedrag',
-    'internal_reference'    => 'Interne referentie',
-    'date'                  => 'Datum',
-    'interest_date'         => 'Rentedatum',
-    'book_date'             => 'Boekdatum',
-    'process_date'          => 'Verwerkingsdatum',
-    'due_date'              => 'Vervaldatum',
-    'payment_date'          => 'Betalingsdatum',
-    'invoice_date'          => 'Factuurdatum',
-    'interal_reference'     => 'Interne verwijzing',
-    'notes'                 => 'Notities',
-    'from'                  => 'Van',
-    'piggy_bank'            => 'Spaarpotje',
-    'to'                    => 'Naar',
-    'budget'                => 'Budget',
-    'category'              => 'Categorie',
-    'bill'                  => 'Contract',
-    'withdrawal'            => 'Uitgave',
-    'deposit'               => 'Inkomsten',
-    'transfer'              => 'Overschrijving',
-    'type'                  => 'Type',
-    'completed'             => 'Opgeslagen',
-    'iban'                  => 'IBAN',
-    'paid_current_period'   => 'Betaald deze periode',
-    'email'                 => 'E-mail',
-    'registered_at'         => 'Geregistreerd op',
-    'is_activated'          => 'Is geactiveerd',
-    'is_blocked'            => 'Is geblokkeerd',
-    'is_admin'              => 'Is beheerder',
-    'has_two_factor'        => 'Heeft 2FA',
-    'confirmed_from'        => 'Bevestigd vanaf',
-    'registered_from'       => 'Geregistreerd vanaf',
-    'blocked_code'          => 'Reden voor blokkade',
-    'domain'                => 'Domein',
-    'registration_attempts' => 'Registratiepogingen',
-    'source_account'        => 'Bronrekening',
-    'destination_account'   => 'Doelrekening',
-
+    'buttons'                => 'Knoppen',
+    'icon'                   => 'Icoon',
+    'id'                     => 'ID',
+    'create_date'            => 'Aangemaakt op',
+    'update_date'            => 'Bijgewerkt op',
+    'balance_before'         => 'Saldo voor',
+    'balance_after'          => 'Saldo na',
+    'name'                   => 'Naam',
+    'role'                   => 'Rol',
+    'currentBalance'         => 'Huidig saldo',
+    'active'                 => 'Actief?',
+    'lastActivity'           => 'Laatste activiteit',
+    'balanceDiff'            => 'Saldoverschil tussen :start en :end',
+    'matchedOn'              => 'Wordt herkend',
+    'matchesOn'              => 'Wordt herkend',
+    'account_type'           => 'Accounttype',
+    'created_at'             => 'Gemaakt op',
+    'new_balance'            => 'Nieuw saldo',
+    'account'                => 'Rekening',
+    'matchingAmount'         => 'Bedrag',
+    'lastMatch'              => 'Laatste keer gezien',
+    'split_number'           => 'Split #',
+    'destination'            => 'Doel',
+    'source'                 => 'Bron',
+    'next_expected_match'    => 'Volgende verwachte match',
+    'automatch'              => 'Automatisch herkennen?',
+    'repeat_freq'            => 'Herhaling',
+    'description'            => 'Omschrijving',
+    'amount'                 => 'Bedrag',
+    'internal_reference'     => 'Interne referentie',
+    'date'                   => 'Datum',
+    'interest_date'          => 'Rentedatum',
+    'book_date'              => 'Boekdatum',
+    'process_date'           => 'Verwerkingsdatum',
+    'due_date'               => 'Vervaldatum',
+    'payment_date'           => 'Betalingsdatum',
+    'invoice_date'           => 'Factuurdatum',
+    'interal_reference'      => 'Interne verwijzing',
+    'notes'                  => 'Notities',
+    'from'                   => 'Van',
+    'piggy_bank'             => 'Spaarpotje',
+    'to'                     => 'Naar',
+    'budget'                 => 'Budget',
+    'category'               => 'Categorie',
+    'bill'                   => 'Contract',
+    'withdrawal'             => 'Uitgave',
+    'deposit'                => 'Inkomsten',
+    'transfer'               => 'Overschrijving',
+    'type'                   => 'Type',
+    'completed'              => 'Opgeslagen',
+    'iban'                   => 'IBAN',
+    'paid_current_period'    => 'Betaald deze periode',
+    'email'                  => 'E-mail',
+    'registered_at'          => 'Geregistreerd op',
+    'is_activated'           => 'Is geactiveerd',
+    'is_blocked'             => 'Is geblokkeerd',
+    'is_admin'               => 'Is beheerder',
+    'has_two_factor'         => 'Heeft 2FA',
+    'confirmed_from'         => 'Bevestigd vanaf',
+    'registered_from'        => 'Geregistreerd vanaf',
+    'blocked_code'           => 'Reden voor blokkade',
+    'domain'                 => 'Domein',
+    'registration_attempts'  => 'Registratiepogingen',
+    'source_account'         => 'Bronrekening',
+    'destination_account'    => 'Doelrekening',
     'accounts_count'         => 'Aantal rekeningen',
     'journals_count'         => 'Aantal transacties',
     'attachments_count'      => 'Aantal bijlagen',

From 08db90f6069c5367a779162a8ec989f7b41aec60 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Wed, 30 Aug 2017 07:20:49 +0200
Subject: [PATCH 427/668] New translations form.php (Portuguese, Brazilian)

---
 resources/lang/pt_BR/form.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/resources/lang/pt_BR/form.php b/resources/lang/pt_BR/form.php
index f8d02b2be5..20a970b04b 100644
--- a/resources/lang/pt_BR/form.php
+++ b/resources/lang/pt_BR/form.php
@@ -100,6 +100,7 @@ return [
     'code'                       => 'Código',
     'iban'                       => 'IBAN',
     'accountNumber'              => 'Número de conta',
+    'creditCardNumber'           => 'Credit card number',
     'has_headers'                => 'Cabeçalhos',
     'date_format'                => 'Formato da Data',
     'specifix'                   => 'Banco- ou arquivo específico corrigídos',

From cb134a7e137d790898e3e6f45008180ad230cec0 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Wed, 30 Aug 2017 07:20:51 +0200
Subject: [PATCH 428/668] New translations form.php (Polish)

---
 resources/lang/pl_PL/form.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/resources/lang/pl_PL/form.php b/resources/lang/pl_PL/form.php
index 1061d0bc49..090ac6e5f7 100644
--- a/resources/lang/pl_PL/form.php
+++ b/resources/lang/pl_PL/form.php
@@ -100,6 +100,7 @@ return [
     'code'                       => 'Kod',
     'iban'                       => 'IBAN',
     'accountNumber'              => 'Numer konta',
+    'creditCardNumber'           => 'Credit card number',
     'has_headers'                => 'Nagłówki',
     'date_format'                => 'Format daty',
     'specifix'                   => 'Bank- or file specific fixes',

From 434e0653fe412045b57a5e19f9a35cb13aa4fe44 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Wed, 30 Aug 2017 07:21:10 +0200
Subject: [PATCH 429/668] New translations form.php (German)

---
 resources/lang/de_DE/form.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/resources/lang/de_DE/form.php b/resources/lang/de_DE/form.php
index eb43674b01..348117197c 100644
--- a/resources/lang/de_DE/form.php
+++ b/resources/lang/de_DE/form.php
@@ -100,6 +100,7 @@ return [
     'code'                       => 'Code',
     'iban'                       => 'IBAN',
     'accountNumber'              => 'Kontonummer',
+    'creditCardNumber'           => 'Credit card number',
     'has_headers'                => 'Kopfzeilen',
     'date_format'                => 'Datumsformat',
     'specifix'                   => 'Bank- oder Dateispezifischer Korrekturen',

From 211d136b7a5e790f94752af2a5bef09f546aa0f8 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Wed, 30 Aug 2017 07:21:12 +0200
Subject: [PATCH 430/668] New translations form.php (French)

---
 resources/lang/fr_FR/form.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/resources/lang/fr_FR/form.php b/resources/lang/fr_FR/form.php
index bb05999dff..61e05d3102 100644
--- a/resources/lang/fr_FR/form.php
+++ b/resources/lang/fr_FR/form.php
@@ -100,6 +100,7 @@ return [
     'code'                       => 'Code',
     'iban'                       => 'Numéro IBAN',
     'accountNumber'              => 'N° de compte',
+    'creditCardNumber'           => 'Credit card number',
     'has_headers'                => 'Entêtes ',
     'date_format'                => 'Format de la date',
     'specifix'                   => 'Banque - ou déposer des corrections spécifiques',

From 7c068afe05249b5923f97ee937f896d51694b99b Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Wed, 30 Aug 2017 07:21:13 +0200
Subject: [PATCH 431/668] New translations form.php (Dutch)

---
 resources/lang/nl_NL/form.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/resources/lang/nl_NL/form.php b/resources/lang/nl_NL/form.php
index 5bc5e1f559..feffb8fc20 100644
--- a/resources/lang/nl_NL/form.php
+++ b/resources/lang/nl_NL/form.php
@@ -100,6 +100,7 @@ return [
     'code'                       => 'Code',
     'iban'                       => 'IBAN',
     'accountNumber'              => 'Rekeningnummer',
+    'creditCardNumber'           => 'Credit card number',
     'has_headers'                => 'Kolomnamen op de eerste rij?',
     'date_format'                => 'Datumformaat',
     'specifix'                   => 'Bank- or of bestandsspecifieke opties',

From 7702ed027bf89eb2f55eb1ab5fe98c236d7125fd Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Wed, 30 Aug 2017 07:40:39 +0200
Subject: [PATCH 432/668] Expand view for #780

---
 .../Controllers/TransactionController.php     | 78 ++++++++++++-------
 app/Models/Transaction.php                    | 44 ++++++-----
 config/twigbridge.php                         |  1 +
 resources/views/transactions/index.twig       | 54 ++++++++-----
 4 files changed, 110 insertions(+), 67 deletions(-)

diff --git a/app/Http/Controllers/TransactionController.php b/app/Http/Controllers/TransactionController.php
index 8263a1f16f..7e042fbe7e 100644
--- a/app/Http/Controllers/TransactionController.php
+++ b/app/Http/Controllers/TransactionController.php
@@ -17,6 +17,7 @@ use Carbon\Carbon;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Helpers\Collector\JournalCollectorInterface;
 use FireflyIII\Helpers\Filter\InternalTransferFilter;
+use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
 use FireflyIII\Repositories\Journal\JournalTaskerInterface;
@@ -28,7 +29,6 @@ use Log;
 use Navigation;
 use Preferences;
 use Response;
-use Steam;
 use View;
 
 /**
@@ -168,7 +168,7 @@ class TransactionController extends Controller
         $what         = strtolower($journal->transaction_type_type ?? $journal->transactionType->type);
         $subTitle     = trans('firefly.' . $what) . ' "' . e($journal->description) . '"';
 
-        return view('transactions.show', compact('journal', 'events', 'subTitle', 'what', 'transactions', 'linkTypes','links'));
+        return view('transactions.show', compact('journal', 'events', 'subTitle', 'what', 'transactions', 'linkTypes', 'links'));
 
 
     }
@@ -198,7 +198,7 @@ class TransactionController extends Controller
         $cache->addProperty('transaction-list-entries');
 
         if ($cache->has()) {
-            return $cache->get(); // @codeCoverageIgnore
+            // return $cache->get(); // @codeCoverageIgnore
         }
 
         Log::debug(sprintf('Going to get period expenses and incomes between %s and %s.', $start->format('Y-m-d'), $end->format('Y-m-d')));
@@ -212,35 +212,24 @@ class TransactionController extends Controller
             $collector = app(JournalCollectorInterface::class);
             $collector->setAllAssetAccounts()->setRange($end, $currentEnd)->withOpposingAccount()->setTypes($types);
             $collector->removeFilter(InternalTransferFilter::class);
-            $set      = $collector->getJournals();
-            $sum      = $set->sum('transaction_amount');
-            $journals = $set->count();
+            $journals = $collector->getJournals();
+            $sum      = $journals->sum('transaction_amount');
+
+            // count per currency:
+            $sums     = $this->sumPerCurrency($journals);
             $dateStr  = $end->format('Y-m-d');
             $dateName = Navigation::periodShow($end, $range);
             $array    = [
-                'string'      => $dateStr,
-                'name'        => $dateName,
-                'count'       => $journals,
-                'spent'       => 0,
-                'earned'      => 0,
-                'transferred' => 0,
-                'date'        => clone $end,
+                'string' => $dateStr,
+                'name'   => $dateName,
+                'sum'    => $sum,
+                'sums'   => $sums,
+                'date'   => clone $end,
             ];
             Log::debug(sprintf('What is %s', $what));
-            switch ($what) {
-                case 'withdrawal':
-                    $array['spent'] = $sum;
-                    break;
-                case 'deposit':
-                    $array['earned'] = $sum;
-                    break;
-                case 'transfers':
-                case 'transfer':
-                    $array['transferred'] = Steam::positive($sum);
-                    break;
-
+            if ($journals->count() > 0) {
+                $entries->push($array);
             }
-            $entries->push($array);
             $end = Navigation::subtractPeriod($end, $range, 1);
         }
         Log::debug('End of loop');
@@ -249,4 +238,41 @@ class TransactionController extends Controller
         return $entries;
     }
 
+    /**
+     * @param Collection $collection
+     *
+     * @return array
+     */
+    private function sumPerCurrency(Collection $collection): array
+    {
+        $return = [];
+        /** @var Transaction $transaction */
+        foreach ($collection as $transaction) {
+            $currencyId = $transaction->transaction_currency_id;
+
+            // save currency information:
+            if (!isset($return[$currencyId])) {
+                $currencySymbol      = $transaction->transaction_currency_symbol;
+                $decimalPlaces       = $transaction->transaction_currency_dp;
+                $currencyCode        = $transaction->transaction_currency_code;
+                $return[$currencyId] = [
+                    'currency' => [
+                        'id'     => $currencyId,
+                        'code'   => $currencyCode,
+                        'symbol' => $currencySymbol,
+                        'dp'     => $decimalPlaces,
+                    ],
+                    'sum'      => '0',
+                    'count'    => 0,
+                ];
+            }
+            // save amount:
+            $return[$currencyId]['sum'] = bcadd($return[$currencyId]['sum'], $transaction->transaction_amount);
+            $return[$currencyId]['count']++;
+        }
+        asort($return);
+
+        return $return;
+    }
+
 }
diff --git a/app/Models/Transaction.php b/app/Models/Transaction.php
index 1437532083..cb3938ddde 100644
--- a/app/Models/Transaction.php
+++ b/app/Models/Transaction.php
@@ -22,43 +22,47 @@ use Watson\Validating\ValidatingTrait;
 /**
  * Class Transaction
  *
- * @property-read int $journal_id
+ * @property-read int    $journal_id
  * @property-read Carbon $date
  * @property-read string $transaction_description
  * @property-read string $transaction_amount
  * @property-read string $transaction_foreign_amount
  * @property-read string $transaction_type_type
  *
- * @property-read int $account_id
+ * @property-read int    $account_id
  * @property-read string $account_name
- * @property string $account_iban
- * @property string $account_number
- * @property string $account_bic
- * @property string $account_currency_code
+ * @property string      $account_iban
+ * @property string      $account_number
+ * @property string      $account_bic
+ * @property string      $account_currency_code
  *
- * @property-read int $opposing_account_id
- * @property string $opposing_account_name
- * @property string $opposing_account_iban
- * @property string $opposing_account_number
- * @property string $opposing_account_bic
- * @property string $opposing_currency_code
+ * @property-read int    $opposing_account_id
+ * @property string      $opposing_account_name
+ * @property string      $opposing_account_iban
+ * @property string      $opposing_account_number
+ * @property string      $opposing_account_bic
+ * @property string      $opposing_currency_code
  *
  *
- * @property-read int $transaction_budget_id
+ * @property-read int    $transaction_budget_id
  * @property-read string $transaction_budget_name
- * @property-read int $transaction_journal_budget_id
+ * @property-read int    $transaction_journal_budget_id
  * @property-read string $transaction_journal_budget_name
  *
- * @property-read int $transaction_category_id
+ * @property-read int    $transaction_category_id
  * @property-read string $transaction_category_name
- * @property-read int $transaction_journal_category_id
+ * @property-read int    $transaction_journal_category_id
  * @property-read string $transaction_journal_category_name
  *
- * @property-read int $bill_id
- * @property string $bill_name
+ * @property-read int    $bill_id
+ * @property string      $bill_name
  *
- * @property string $notes
- * @property string $tags
+ * @property string      $notes
+ * @property string      $tags
+ *
+ * @property string      $transaction_currency_symbol
+ * @property int         $transaction_currency_dp
+ * @property string      $transaction_currency_code
  *
  * @package FireflyIII\Models
  */
diff --git a/config/twigbridge.php b/config/twigbridge.php
index d438e9146a..3a64abd8c6 100644
--- a/config/twigbridge.php
+++ b/config/twigbridge.php
@@ -158,6 +158,7 @@ return [
             'Lang',
             'Preferences',
             'URL',
+            'Steam',
             'Config',
             'Request',
             'ExpandedForm' => [
diff --git a/resources/views/transactions/index.twig b/resources/views/transactions/index.twig
index e7de57948f..5c3ffcb511 100644
--- a/resources/views/transactions/index.twig
+++ b/resources/views/transactions/index.twig
@@ -15,6 +15,7 @@
         </div>
     {% endif %}
 
+    {# list with journals #}
     <div class="row">
         <div class="{% if periods.count > 0 %}col-lg-10 col-md-10 col-sm-12{% else %}col-lg-12 col-md-12 col-sm-12{% endif %}">
             <div class="box">
@@ -22,7 +23,10 @@
                     <h3 class="box-title">{{ subTitle }}</h3>
                 </div>
                 <div class="box-body ">
+                    {# actual list #}
                     {% include 'list.journals' with {'journals': journals} %}
+
+                    {# links for other views #}
                     {% if periods.count > 0 %}
                         <p>
                             <i class="fa fa-calendar"></i>
@@ -38,10 +42,13 @@
             </div>
         </div>
 
+        {# boxes with info #}
         {% if periods.count > 0 %}
             <div class="col-lg-2 col-md-2 col-sm-12 col-xs-12">
                 {% for period in periods %}
-                    {% if period.count > 0 %}
+
+                    {% if period.sum != 0 %}
+
                         <div class="box {% if period.date == start %}box-solid box-primary{% endif %}">
                             <div class="box-header with-border">
                                 <h3 class="box-title"><a href="{{ route('transactions.index',[what, period.string]) }}">{{ period.name }}</a>
@@ -49,29 +56,34 @@
                             </div>
                             <div class="box-body no-padding">
                                 <table class="table table-hover">
-                                    <tr>
-                                        <td style="width:33%;">{{ 'transactions'|_ }}</td>
-                                        <td style="text-align: right;">{{ period.count }}</td>
-                                    </tr>
-                                    {% if what == 'withdrawal' %}
+                                    <tbody>
+                                    {% for sum in period.sums %}
                                         <tr>
-                                            <td style="width:33%;">{{ 'spent'|_ }}</td>
-                                            <td style="text-align: right;">{{ period.spent|formatAmount }}</td>
+                                            <td style="width:33%;">
+                                                {% if what == 'withdrawal' %}
+                                                    {{ 'spent'|_ }}
+                                                {% endif %}
+                                                {% if what == 'deposit' %}
+                                                    {{ 'earned'|_ }}
+                                                {% endif %}
+                                                {% if what == 'transfers' or what == 'transfer' %}
+                                                    {{ 'transferred'|_ }}
+                                                {% endif %}
+                                            </td>
+                                            <td style="text-align: right;" title="{{ trans('list.number_of_transactions') }}: {{ sum.count }}">
+                                                {% if what == 'transfers' or what == 'transfer' %}
+                                                    <span class="text-info">
+                                                        {{ formatAmountBySymbol(Steam.positive(sum.sum), sum.currency.symbol, sum.currency.dp, false) }}
+                                                    </span>
+                                                {% else %}
+                                                    {{ formatAmountBySymbol(sum.sum, sum.currency.symbol, sum.currency.dp) }}
+                                                {% endif %}
+                                            </td>
                                         </tr>
-                                    {% endif %}
-                                    {% if what == 'deposit' %}
-                                        <tr>
-                                            <td style="width:33%;">{{ 'earned'|_ }}</td>
-                                            <td style="text-align: right;">{{ period.earned|formatAmount }}</td>
-                                        </tr>
-                                    {% endif %}
-                                    {% if what == 'transfers' or what == 'transfer' %}
-                                        <tr>
-                                            <td style="width:33%;">{{ 'transferred'|_ }}</td>
-                                            <td style="text-align: right;" class="text-info">{{ period.transferred|formatAmountPlain }}</td>
-                                        </tr>
-                                    {% endif %}
+                                    {% endfor %}
+                                    </tbody>
                                 </table>
+
                             </div>
                         </div>
                     {% endif %}

From 06ad37772948c61ba0171150bc1154c35f7e69a6 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Thu, 31 Aug 2017 06:20:07 +0200
Subject: [PATCH 433/668] New translations form.php (Dutch)

---
 resources/lang/nl_NL/form.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/lang/nl_NL/form.php b/resources/lang/nl_NL/form.php
index feffb8fc20..5c0a9b962c 100644
--- a/resources/lang/nl_NL/form.php
+++ b/resources/lang/nl_NL/form.php
@@ -100,7 +100,7 @@ return [
     'code'                       => 'Code',
     'iban'                       => 'IBAN',
     'accountNumber'              => 'Rekeningnummer',
-    'creditCardNumber'           => 'Credit card number',
+    'creditCardNumber'           => 'Creditcardnummer',
     'has_headers'                => 'Kolomnamen op de eerste rij?',
     'date_format'                => 'Datumformaat',
     'specifix'                   => 'Bank- or of bestandsspecifieke opties',
@@ -197,4 +197,4 @@ return [
 
     'inward'  => 'Binnenwaartse beschrijving',
     'outward' => 'Buitenwaartse beschrijving',
-];
\ No newline at end of file
+];

From 8dec769d64ccd6636c0b4b08fb77da90632ed319 Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Thu, 31 Aug 2017 06:47:18 +0200
Subject: [PATCH 434/668] Add newlines to files [skip ci]

---
 app/Export/ExpandedProcessor.php                              | 2 +-
 app/Http/Controllers/Admin/LinkController.php                 | 2 +-
 app/Http/Controllers/Json/AutoCompleteController.php          | 2 +-
 app/Http/Controllers/Transaction/LinkController.php           | 2 +-
 app/Import/Storage/ImportSupport.php                          | 2 +-
 app/Models/LinkType.php                                       | 2 +-
 app/Models/TransactionJournalLink.php                         | 2 +-
 app/Providers/AdminServiceProvider.php                        | 2 +-
 app/Repositories/LinkType/LinkTypeRepository.php              | 2 +-
 app/Repositories/LinkType/LinkTypeRepositoryInterface.php     | 2 +-
 app/Services/Bunq/Id/BunqId.php                               | 2 +-
 app/Services/Bunq/Id/DeviceServerId.php                       | 2 +-
 app/Services/Bunq/Id/DeviceSessionId.php                      | 2 +-
 app/Services/Bunq/Id/InstallationId.php                       | 2 +-
 app/Services/Bunq/Object/Alias.php                            | 2 +-
 app/Services/Bunq/Object/Amount.php                           | 2 +-
 app/Services/Bunq/Object/Avatar.php                           | 2 +-
 app/Services/Bunq/Object/BunqObject.php                       | 2 +-
 app/Services/Bunq/Object/DeviceServer.php                     | 2 +-
 app/Services/Bunq/Object/MonetaryAccountBank.php              | 2 +-
 app/Services/Bunq/Object/MonetaryAccountProfile.php           | 2 +-
 app/Services/Bunq/Object/MonetaryAccountSetting.php           | 2 +-
 app/Services/Bunq/Object/NotificationFilter.php               | 2 +-
 app/Services/Bunq/Object/ServerPublicKey.php                  | 2 +-
 app/Services/Bunq/Object/UserCompany.php                      | 2 +-
 app/Services/Bunq/Object/UserLight.php                        | 2 +-
 app/Services/Bunq/Object/UserPerson.php                       | 2 +-
 app/Services/Bunq/Request/BunqRequest.php                     | 2 +-
 app/Services/Bunq/Request/DeleteDeviceSessionRequest.php      | 2 +-
 app/Services/Bunq/Request/DeviceServerRequest.php             | 2 +-
 app/Services/Bunq/Request/DeviceSessionRequest.php            | 2 +-
 app/Services/Bunq/Request/InstallationTokenRequest.php        | 2 +-
 app/Services/Bunq/Request/ListDeviceServerRequest.php         | 2 +-
 app/Services/Bunq/Request/ListMonetaryAccountRequest.php      | 2 +-
 app/Services/Bunq/Request/ListUserRequest.php                 | 2 +-
 app/Services/Bunq/Token/BunqToken.php                         | 2 +-
 app/Services/Bunq/Token/InstallationToken.php                 | 2 +-
 app/Services/Bunq/Token/SessionToken.php                      | 2 +-
 app/Support/Import/Information/BunqInformation.php            | 2 +-
 app/Support/Import/Information/InformationInterface.php       | 2 +-
 database/migrations/2017_08_20_062014_changes_for_v470.php    | 2 ++
 resources/views/admin/link/index.twig                         | 2 +-
 resources/views/admin/link/show.twig                          | 2 +-
 resources/views/transactions/show.twig                        | 2 +-
 tests/Feature/Controllers/Json/AutoCompleteControllerTest.php | 2 +-
 45 files changed, 46 insertions(+), 44 deletions(-)

diff --git a/app/Export/ExpandedProcessor.php b/app/Export/ExpandedProcessor.php
index 569ff55d9d..8babc5b473 100644
--- a/app/Export/ExpandedProcessor.php
+++ b/app/Export/ExpandedProcessor.php
@@ -336,4 +336,4 @@ class ExpandedProcessor implements ProcessorInterface
 
         return $result;
     }
-}
\ No newline at end of file
+}
diff --git a/app/Http/Controllers/Admin/LinkController.php b/app/Http/Controllers/Admin/LinkController.php
index e4bdeff52b..569dd63121 100644
--- a/app/Http/Controllers/Admin/LinkController.php
+++ b/app/Http/Controllers/Admin/LinkController.php
@@ -220,4 +220,4 @@ class LinkController extends Controller
         return redirect($this->getPreviousUri('link_types.edit.uri'));
     }
 
-}
\ No newline at end of file
+}
diff --git a/app/Http/Controllers/Json/AutoCompleteController.php b/app/Http/Controllers/Json/AutoCompleteController.php
index 49a7fbc377..2a270da41a 100644
--- a/app/Http/Controllers/Json/AutoCompleteController.php
+++ b/app/Http/Controllers/Json/AutoCompleteController.php
@@ -166,4 +166,4 @@ class AutoCompleteController extends Controller
         return Response::json($return);
     }
 
-}
\ No newline at end of file
+}
diff --git a/app/Http/Controllers/Transaction/LinkController.php b/app/Http/Controllers/Transaction/LinkController.php
index 8fd296bfb0..4022e5fedc 100644
--- a/app/Http/Controllers/Transaction/LinkController.php
+++ b/app/Http/Controllers/Transaction/LinkController.php
@@ -134,4 +134,4 @@ class LinkController extends Controller
         return redirect(URL::previous());
     }
 
-}
\ No newline at end of file
+}
diff --git a/app/Import/Storage/ImportSupport.php b/app/Import/Storage/ImportSupport.php
index aa7b1dbf99..56e8f9393e 100644
--- a/app/Import/Storage/ImportSupport.php
+++ b/app/Import/Storage/ImportSupport.php
@@ -441,4 +441,4 @@ trait ImportSupport
         return;
     }
 
-}
\ No newline at end of file
+}
diff --git a/app/Models/LinkType.php b/app/Models/LinkType.php
index ced7c9a08f..94d5cf74a1 100644
--- a/app/Models/LinkType.php
+++ b/app/Models/LinkType.php
@@ -59,4 +59,4 @@ class LinkType extends Model
         return $this->hasMany(TransactionJournalLink::class);
     }
 
-}
\ No newline at end of file
+}
diff --git a/app/Models/TransactionJournalLink.php b/app/Models/TransactionJournalLink.php
index 5569091f5d..0d2bac9193 100644
--- a/app/Models/TransactionJournalLink.php
+++ b/app/Models/TransactionJournalLink.php
@@ -102,4 +102,4 @@ class TransactionJournalLink extends Model
     }
 
 
-}
\ No newline at end of file
+}
diff --git a/app/Providers/AdminServiceProvider.php b/app/Providers/AdminServiceProvider.php
index a325823f06..764953698f 100644
--- a/app/Providers/AdminServiceProvider.php
+++ b/app/Providers/AdminServiceProvider.php
@@ -60,4 +60,4 @@ class AdminServiceProvider extends ServiceProvider
         );
     }
 
-}
\ No newline at end of file
+}
diff --git a/app/Repositories/LinkType/LinkTypeRepository.php b/app/Repositories/LinkType/LinkTypeRepository.php
index 71227914f4..55f1bdb8fe 100644
--- a/app/Repositories/LinkType/LinkTypeRepository.php
+++ b/app/Repositories/LinkType/LinkTypeRepository.php
@@ -178,4 +178,4 @@ class LinkTypeRepository implements LinkTypeRepositoryInterface
         return $linkType;
 
     }
-}
\ No newline at end of file
+}
diff --git a/app/Repositories/LinkType/LinkTypeRepositoryInterface.php b/app/Repositories/LinkType/LinkTypeRepositoryInterface.php
index 2be29a4084..32042514e6 100644
--- a/app/Repositories/LinkType/LinkTypeRepositoryInterface.php
+++ b/app/Repositories/LinkType/LinkTypeRepositoryInterface.php
@@ -99,4 +99,4 @@ interface LinkTypeRepositoryInterface
      */
     public function update(LinkType $linkType, array $data): LinkType;
 
-}
\ No newline at end of file
+}
diff --git a/app/Services/Bunq/Id/BunqId.php b/app/Services/Bunq/Id/BunqId.php
index 9752d71ba3..a6b05054c8 100644
--- a/app/Services/Bunq/Id/BunqId.php
+++ b/app/Services/Bunq/Id/BunqId.php
@@ -40,4 +40,4 @@ class BunqId
     }
 
 
-}
\ No newline at end of file
+}
diff --git a/app/Services/Bunq/Id/DeviceServerId.php b/app/Services/Bunq/Id/DeviceServerId.php
index b8b845fd7e..aa24f4a884 100644
--- a/app/Services/Bunq/Id/DeviceServerId.php
+++ b/app/Services/Bunq/Id/DeviceServerId.php
@@ -22,4 +22,4 @@ namespace FireflyIII\Services\Bunq\Id;
 class DeviceServerId extends BunqId
 {
 
-}
\ No newline at end of file
+}
diff --git a/app/Services/Bunq/Id/DeviceSessionId.php b/app/Services/Bunq/Id/DeviceSessionId.php
index 2010ec1e9f..2c953f2030 100644
--- a/app/Services/Bunq/Id/DeviceSessionId.php
+++ b/app/Services/Bunq/Id/DeviceSessionId.php
@@ -21,4 +21,4 @@ namespace FireflyIII\Services\Bunq\Id;
 class DeviceSessionId extends BunqId
 {
 
-}
\ No newline at end of file
+}
diff --git a/app/Services/Bunq/Id/InstallationId.php b/app/Services/Bunq/Id/InstallationId.php
index 3716b1dab9..f08382d974 100644
--- a/app/Services/Bunq/Id/InstallationId.php
+++ b/app/Services/Bunq/Id/InstallationId.php
@@ -21,4 +21,4 @@ namespace FireflyIII\Services\Bunq\Id;
 class InstallationId extends BunqId
 {
 
-}
\ No newline at end of file
+}
diff --git a/app/Services/Bunq/Object/Alias.php b/app/Services/Bunq/Object/Alias.php
index 7b0ed84ea3..f2e45f2114 100644
--- a/app/Services/Bunq/Object/Alias.php
+++ b/app/Services/Bunq/Object/Alias.php
@@ -65,4 +65,4 @@ class Alias extends BunqObject
     }
 
 
-}
\ No newline at end of file
+}
diff --git a/app/Services/Bunq/Object/Amount.php b/app/Services/Bunq/Object/Amount.php
index cd7782a0ad..c1f647c496 100644
--- a/app/Services/Bunq/Object/Amount.php
+++ b/app/Services/Bunq/Object/Amount.php
@@ -54,4 +54,4 @@ class Amount extends BunqObject
     }
 
 
-}
\ No newline at end of file
+}
diff --git a/app/Services/Bunq/Object/Avatar.php b/app/Services/Bunq/Object/Avatar.php
index adfc41cde6..576ad8d660 100644
--- a/app/Services/Bunq/Object/Avatar.php
+++ b/app/Services/Bunq/Object/Avatar.php
@@ -20,4 +20,4 @@ namespace FireflyIII\Services\Bunq\Object;
 class Avatar extends BunqObject
 {
 
-}
\ No newline at end of file
+}
diff --git a/app/Services/Bunq/Object/BunqObject.php b/app/Services/Bunq/Object/BunqObject.php
index 069348169b..ae0ea65345 100644
--- a/app/Services/Bunq/Object/BunqObject.php
+++ b/app/Services/Bunq/Object/BunqObject.php
@@ -20,4 +20,4 @@ namespace FireflyIII\Services\Bunq\Object;
 class BunqObject
 {
 
-}
\ No newline at end of file
+}
diff --git a/app/Services/Bunq/Object/DeviceServer.php b/app/Services/Bunq/Object/DeviceServer.php
index 35d1dd712b..5818e209d6 100644
--- a/app/Services/Bunq/Object/DeviceServer.php
+++ b/app/Services/Bunq/Object/DeviceServer.php
@@ -60,4 +60,4 @@ class DeviceServer extends BunqObject
     }
 
 
-}
\ No newline at end of file
+}
diff --git a/app/Services/Bunq/Object/MonetaryAccountBank.php b/app/Services/Bunq/Object/MonetaryAccountBank.php
index 5082c858e0..858e0176a9 100644
--- a/app/Services/Bunq/Object/MonetaryAccountBank.php
+++ b/app/Services/Bunq/Object/MonetaryAccountBank.php
@@ -148,4 +148,4 @@ class MonetaryAccountBank extends BunqObject
         return $this->setting;
     }
 
-}
\ No newline at end of file
+}
diff --git a/app/Services/Bunq/Object/MonetaryAccountProfile.php b/app/Services/Bunq/Object/MonetaryAccountProfile.php
index a19d3403ee..187e9d772a 100644
--- a/app/Services/Bunq/Object/MonetaryAccountProfile.php
+++ b/app/Services/Bunq/Object/MonetaryAccountProfile.php
@@ -41,4 +41,4 @@ class MonetaryAccountProfile extends BunqObject
         return;
     }
 
-}
\ No newline at end of file
+}
diff --git a/app/Services/Bunq/Object/MonetaryAccountSetting.php b/app/Services/Bunq/Object/MonetaryAccountSetting.php
index 38fe8db75d..054d4e54e0 100644
--- a/app/Services/Bunq/Object/MonetaryAccountSetting.php
+++ b/app/Services/Bunq/Object/MonetaryAccountSetting.php
@@ -65,4 +65,4 @@ class MonetaryAccountSetting extends BunqObject
     }
 
 
-}
\ No newline at end of file
+}
diff --git a/app/Services/Bunq/Object/NotificationFilter.php b/app/Services/Bunq/Object/NotificationFilter.php
index 06bf96b01e..c6c89d1ada 100644
--- a/app/Services/Bunq/Object/NotificationFilter.php
+++ b/app/Services/Bunq/Object/NotificationFilter.php
@@ -30,4 +30,4 @@ class NotificationFilter extends BunqObject
         exit;
     }
 
-}
\ No newline at end of file
+}
diff --git a/app/Services/Bunq/Object/ServerPublicKey.php b/app/Services/Bunq/Object/ServerPublicKey.php
index 56aa17654b..11b9213d08 100644
--- a/app/Services/Bunq/Object/ServerPublicKey.php
+++ b/app/Services/Bunq/Object/ServerPublicKey.php
@@ -49,4 +49,4 @@ class ServerPublicKey extends BunqObject
     }
 
 
-}
\ No newline at end of file
+}
diff --git a/app/Services/Bunq/Object/UserCompany.php b/app/Services/Bunq/Object/UserCompany.php
index a0efcaf876..4529924969 100644
--- a/app/Services/Bunq/Object/UserCompany.php
+++ b/app/Services/Bunq/Object/UserCompany.php
@@ -103,4 +103,4 @@ class UserCompany extends BunqObject
     }
 
 
-}
\ No newline at end of file
+}
diff --git a/app/Services/Bunq/Object/UserLight.php b/app/Services/Bunq/Object/UserLight.php
index baed9d9620..cad3a8c6be 100644
--- a/app/Services/Bunq/Object/UserLight.php
+++ b/app/Services/Bunq/Object/UserLight.php
@@ -67,4 +67,4 @@ class UserLight extends BunqObject
         // aliases
     }
 
-}
\ No newline at end of file
+}
diff --git a/app/Services/Bunq/Object/UserPerson.php b/app/Services/Bunq/Object/UserPerson.php
index c9a29ebb4d..0fea94bd44 100644
--- a/app/Services/Bunq/Object/UserPerson.php
+++ b/app/Services/Bunq/Object/UserPerson.php
@@ -143,4 +143,4 @@ class UserPerson extends BunqObject
     }
 
 
-}
\ No newline at end of file
+}
diff --git a/app/Services/Bunq/Request/BunqRequest.php b/app/Services/Bunq/Request/BunqRequest.php
index 0046d2f35b..b54cbd8890 100644
--- a/app/Services/Bunq/Request/BunqRequest.php
+++ b/app/Services/Bunq/Request/BunqRequest.php
@@ -448,4 +448,4 @@ abstract class BunqRequest
 
         return true;
     }
-}
\ No newline at end of file
+}
diff --git a/app/Services/Bunq/Request/DeleteDeviceSessionRequest.php b/app/Services/Bunq/Request/DeleteDeviceSessionRequest.php
index 66c5d1eecc..cccb466c9b 100644
--- a/app/Services/Bunq/Request/DeleteDeviceSessionRequest.php
+++ b/app/Services/Bunq/Request/DeleteDeviceSessionRequest.php
@@ -46,4 +46,4 @@ class DeleteDeviceSessionRequest extends BunqRequest
     {
         $this->sessionToken = $sessionToken;
     }
-}
\ No newline at end of file
+}
diff --git a/app/Services/Bunq/Request/DeviceServerRequest.php b/app/Services/Bunq/Request/DeviceServerRequest.php
index d997064656..8b5c0a2d1a 100644
--- a/app/Services/Bunq/Request/DeviceServerRequest.php
+++ b/app/Services/Bunq/Request/DeviceServerRequest.php
@@ -79,4 +79,4 @@ class DeviceServerRequest extends BunqRequest
     {
         $this->permittedIps = $permittedIps;
     }
-}
\ No newline at end of file
+}
diff --git a/app/Services/Bunq/Request/DeviceSessionRequest.php b/app/Services/Bunq/Request/DeviceSessionRequest.php
index 66bc0dc768..c2658afb72 100644
--- a/app/Services/Bunq/Request/DeviceSessionRequest.php
+++ b/app/Services/Bunq/Request/DeviceSessionRequest.php
@@ -146,4 +146,4 @@ class DeviceSessionRequest extends BunqRequest
     }
 
 
-}
\ No newline at end of file
+}
diff --git a/app/Services/Bunq/Request/InstallationTokenRequest.php b/app/Services/Bunq/Request/InstallationTokenRequest.php
index d941e09a6c..829c5986e3 100644
--- a/app/Services/Bunq/Request/InstallationTokenRequest.php
+++ b/app/Services/Bunq/Request/InstallationTokenRequest.php
@@ -144,4 +144,4 @@ class InstallationTokenRequest extends BunqRequest
 
         return $serverPublicKey;
     }
-}
\ No newline at end of file
+}
diff --git a/app/Services/Bunq/Request/ListDeviceServerRequest.php b/app/Services/Bunq/Request/ListDeviceServerRequest.php
index ee9548b74a..fe0f33dec2 100644
--- a/app/Services/Bunq/Request/ListDeviceServerRequest.php
+++ b/app/Services/Bunq/Request/ListDeviceServerRequest.php
@@ -71,4 +71,4 @@ class ListDeviceServerRequest extends BunqRequest
     {
         $this->installationToken = $installationToken;
     }
-}
\ No newline at end of file
+}
diff --git a/app/Services/Bunq/Request/ListMonetaryAccountRequest.php b/app/Services/Bunq/Request/ListMonetaryAccountRequest.php
index 8022149b71..b2762de940 100644
--- a/app/Services/Bunq/Request/ListMonetaryAccountRequest.php
+++ b/app/Services/Bunq/Request/ListMonetaryAccountRequest.php
@@ -76,4 +76,4 @@ class ListMonetaryAccountRequest extends BunqRequest
         $this->userId = $userId;
     }
 
-}
\ No newline at end of file
+}
diff --git a/app/Services/Bunq/Request/ListUserRequest.php b/app/Services/Bunq/Request/ListUserRequest.php
index 06dbeb96de..06acb45647 100644
--- a/app/Services/Bunq/Request/ListUserRequest.php
+++ b/app/Services/Bunq/Request/ListUserRequest.php
@@ -87,4 +87,4 @@ class ListUserRequest extends BunqRequest
     {
         $this->sessionToken = $sessionToken;
     }
-}
\ No newline at end of file
+}
diff --git a/app/Services/Bunq/Token/BunqToken.php b/app/Services/Bunq/Token/BunqToken.php
index 7cb9ba486d..9f27fcbe92 100644
--- a/app/Services/Bunq/Token/BunqToken.php
+++ b/app/Services/Bunq/Token/BunqToken.php
@@ -86,4 +86,4 @@ class BunqToken
         return;
     }
 
-}
\ No newline at end of file
+}
diff --git a/app/Services/Bunq/Token/InstallationToken.php b/app/Services/Bunq/Token/InstallationToken.php
index 59777b0f3a..30bd7f5ac4 100644
--- a/app/Services/Bunq/Token/InstallationToken.php
+++ b/app/Services/Bunq/Token/InstallationToken.php
@@ -21,4 +21,4 @@ class InstallationToken extends BunqToken
 {
 
 
-}
\ No newline at end of file
+}
diff --git a/app/Services/Bunq/Token/SessionToken.php b/app/Services/Bunq/Token/SessionToken.php
index f6b1218f56..8dfb6da1c5 100644
--- a/app/Services/Bunq/Token/SessionToken.php
+++ b/app/Services/Bunq/Token/SessionToken.php
@@ -22,4 +22,4 @@ namespace FireflyIII\Services\Bunq\Token;
 class SessionToken extends BunqToken
 {
 
-}
\ No newline at end of file
+}
diff --git a/app/Support/Import/Information/BunqInformation.php b/app/Support/Import/Information/BunqInformation.php
index 6d0c955280..8f59243286 100644
--- a/app/Support/Import/Information/BunqInformation.php
+++ b/app/Support/Import/Information/BunqInformation.php
@@ -199,4 +199,4 @@ class BunqInformation implements InformationInterface
 
         return $sessionToken;
     }
-}
\ No newline at end of file
+}
diff --git a/app/Support/Import/Information/InformationInterface.php b/app/Support/Import/Information/InformationInterface.php
index 47dbf90ef4..9cf5106082 100644
--- a/app/Support/Import/Information/InformationInterface.php
+++ b/app/Support/Import/Information/InformationInterface.php
@@ -46,4 +46,4 @@ interface InformationInterface
      * @return array
      */
     public function getAccounts(): array;
-}
\ No newline at end of file
+}
diff --git a/database/migrations/2017_08_20_062014_changes_for_v470.php b/database/migrations/2017_08_20_062014_changes_for_v470.php
index c548d4fca3..942ef5e788 100644
--- a/database/migrations/2017_08_20_062014_changes_for_v470.php
+++ b/database/migrations/2017_08_20_062014_changes_for_v470.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
diff --git a/resources/views/admin/link/index.twig b/resources/views/admin/link/index.twig
index 72e7391e02..2cc8338ef7 100644
--- a/resources/views/admin/link/index.twig
+++ b/resources/views/admin/link/index.twig
@@ -63,4 +63,4 @@
 
 {% block styles %}
     <link rel="stylesheet" href="css/bootstrap-sortable.css" type="text/css" media="all"/>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/resources/views/admin/link/show.twig b/resources/views/admin/link/show.twig
index 06a834d683..813f53e534 100644
--- a/resources/views/admin/link/show.twig
+++ b/resources/views/admin/link/show.twig
@@ -59,4 +59,4 @@
 
 {% block styles %}
     <link rel="stylesheet" href="css/bootstrap-sortable.css" type="text/css" media="all"/>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/resources/views/transactions/show.twig b/resources/views/transactions/show.twig
index 0fe99308d4..b48745e424 100644
--- a/resources/views/transactions/show.twig
+++ b/resources/views/transactions/show.twig
@@ -490,4 +490,4 @@
     </script>
     <script type="text/javascript" src="js/lib/bootstrap3-typeahead.min.js"></script>
     <script type="text/javascript" src="js/ff/transactions/show.js"></script>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/tests/Feature/Controllers/Json/AutoCompleteControllerTest.php b/tests/Feature/Controllers/Json/AutoCompleteControllerTest.php
index e00cfb2c13..ccdea87a69 100644
--- a/tests/Feature/Controllers/Json/AutoCompleteControllerTest.php
+++ b/tests/Feature/Controllers/Json/AutoCompleteControllerTest.php
@@ -84,4 +84,4 @@ class AutoCompleteControllerTest extends TestCase
         $response->assertExactJson([$account->name]);
     }
 
-}
\ No newline at end of file
+}

From 8db9641480feededd051c9e65cb2689dc8134917 Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Thu, 31 Aug 2017 07:29:23 +0200
Subject: [PATCH 435/668] Experimental multi-budget overview.

---
 app/Http/Controllers/BudgetController.php | 50 ++++++++++++++++++++++-
 resources/views/budgets/index.twig        |  1 +
 resources/views/budgets/multi-period.twig | 50 +++++++++++++++++++++++
 routes/web.php                            |  5 ++-
 4 files changed, 104 insertions(+), 2 deletions(-)
 create mode 100644 resources/views/budgets/multi-period.twig

diff --git a/app/Http/Controllers/BudgetController.php b/app/Http/Controllers/BudgetController.php
index e0d7bd983e..d66781284e 100644
--- a/app/Http/Controllers/BudgetController.php
+++ b/app/Http/Controllers/BudgetController.php
@@ -246,6 +246,54 @@ class BudgetController extends Controller
         );
     }
 
+    public function multiPeriod()
+    {
+        $start = new Carbon;
+        $start->startOfYear();
+        $end = clone $start;
+        $end->endOfYear();
+        $current = clone $start;
+        $headers = [];
+        $range   = Preferences::get('viewRange', '1M')->data;
+        $budgets = $this->repository->getBudgets();
+        $limits  = [];
+        $defaultCurrency    = Amount::getDefaultCurrency();
+
+        while ($current < $end) {
+            $currentEnd = Navigation::endOfPeriod($current, $range);
+            $format     = Navigation::preferredCarbonLocalizedFormat($current, $currentEnd);
+            $name       = Navigation::periodShow($current, $range);
+            $headers[]  = [
+                'start'     => $current,
+                'end'       => $currentEnd,
+                'date_str'  => $current->format('Y_m_d'),
+                'start_str' => $current->formatLocalized($format),
+                'end_str'   => $currentEnd->formatLocalized($format),
+                'name'      => $name,
+                'key'       => $current->format('Y-m-d') . '-' . $currentEnd->format('Y-m-d'),
+            ];
+
+            $current = Navigation::addPeriod($current, $range, 0);
+        }
+
+        // for each budget, get the budget limits
+        /** @var Budget $budget */
+        foreach ($budgets as $budget) {
+            /** @var array $header */
+            foreach ($headers as $header) {
+                /** @var BudgetLimit $limit */
+                $limit = $budget->budgetlimits()
+                                ->where('start_date', $header['start']->format('Y-m-d'))
+                                ->where('end_date', $header['end']->format('Y-m-d'))->first(['budget_limits.*']);
+                $key   = $header['start']->format('Y-m-d') . '-' . $header['end']->format('Y-m-d');
+                if (!is_null($limit)) {
+                    $limits[$budget->id][$key] = round($limit->amount, $defaultCurrency->decimal_places);
+                }
+            }
+        }
+        return view('budgets.multi-period', compact('headers', 'budgets','limits'));
+    }
+
     /**
      * @param Request                    $request
      * @param JournalRepositoryInterface $repository
@@ -319,7 +367,7 @@ class BudgetController extends Controller
         $this->repository->setAvailableBudget($defaultCurrency, $start, $end, $amount);
         Preferences::mark();
 
-        return redirect(route('budgets.index',[$start->format('Y-m-d')]));
+        return redirect(route('budgets.index', [$start->format('Y-m-d')]));
     }
 
     /**
diff --git a/resources/views/budgets/index.twig b/resources/views/budgets/index.twig
index 030239feef..9a1d4446c3 100644
--- a/resources/views/budgets/index.twig
+++ b/resources/views/budgets/index.twig
@@ -111,6 +111,7 @@
                                 <a href="{{ route('budgets.index', [start.format('Y-m-d')]) }}" class="btn btn-default">{{ currentMonth }}</a>
                                 <a href="{{ route('budgets.index', [next.format('Y-m-d')]) }}" class="btn btn-default" title="{{ nextText }}">&rarr;</a>
                             </div>
+                            <div><a href="{{ route('budgets.multi-period') }}">{{ 'multi_period_overview'|_ }}</a></div>
                         </div>
                         <div class="col-lg-2 col-md-4 col-sm-12 col-xs-12 text-right">
                             <select class="form-control selectPeriod" name="next">
diff --git a/resources/views/budgets/multi-period.twig b/resources/views/budgets/multi-period.twig
new file mode 100644
index 0000000000..8d12b72723
--- /dev/null
+++ b/resources/views/budgets/multi-period.twig
@@ -0,0 +1,50 @@
+{% extends "./layout/default" %}
+
+{% block breadcrumbs %}
+    {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName) }}
+{% endblock %}
+
+{% block content %}
+    <div class="row">
+        <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
+            <div class="box">
+                <div class="box-header with-border">
+                    <h3 class="box-title">multi period table</h3>
+                </div>
+                <div class="box-body">
+                    <table class="table table-bordered">
+                        <thead>
+                        <tr>
+                            <th>Budget</th>
+                            {% for header in headers %}
+                                <th title="{{ header.start_str }} - {{ header.end_str }}">{{ header.name }}</th>
+                            {% endfor %}
+                        </tr>
+                        </thead>
+                        <tbody>
+                        {% for budget in budgets %}
+                            <tr>
+                                <th>{{ budget.name }}</th>
+                                {% for header in headers %}
+                                    <td>
+                                        <input name="{{ budget.id }}_{{ header.date_str }}" id="{{ budget.id }}_{{ header.date_str }}"
+                                               type="number" class="form-control budget-input" data-id="{{ budget.id }}" data-start="{{ budget.start_str }}"
+                                        data-end="{{ budget.end_str }}" value="{{ limits[budget.id][header.key] }}"
+                                        >
+                                    </td>
+                                {% endfor %}
+                            </tr>
+                        {% endfor %}
+                        </tbody>
+                    </table>
+                </div>
+            </div>
+        </div>
+    </div>
+{% endblock %}
+
+{% block styles %}
+{% endblock %}
+
+{% block scripts %}
+{% endblock %}
diff --git a/routes/web.php b/routes/web.php
index 7a952d5a0a..ca7caa511e 100755
--- a/routes/web.php
+++ b/routes/web.php
@@ -136,15 +136,18 @@ Route::group(
  */
 Route::group(
     ['middleware' => 'user-full-auth', 'prefix' => 'budgets', 'as' => 'budgets.'], function () {
-    Route::get('income/{start_date}/{end_date}', ['uses' => 'BudgetController@updateIncome', 'as' => 'income']);
+
+        Route::get('income/{start_date}/{end_date}', ['uses' => 'BudgetController@updateIncome', 'as' => 'income']);
     Route::get('create', ['uses' => 'BudgetController@create', 'as' => 'create']);
     Route::get('edit/{budget}', ['uses' => 'BudgetController@edit', 'as' => 'edit']);
     Route::get('delete/{budget}', ['uses' => 'BudgetController@delete', 'as' => 'delete']);
     Route::get('show/{budget}', ['uses' => 'BudgetController@show', 'as' => 'show']);
     Route::get('show/{budget}/{budgetlimit}', ['uses' => 'BudgetController@showByBudgetLimit', 'as' => 'show.limit']);
     Route::get('list/no-budget/{moment?}', ['uses' => 'BudgetController@noBudget', 'as' => 'no-budget']);
+    Route::get('multi-period', ['uses' => 'BudgetController@multiPeriod', 'as' => 'multi-period']);
     Route::get('{moment?}', ['uses' => 'BudgetController@index', 'as' => 'index']);
 
+
     Route::post('income', ['uses' => 'BudgetController@postUpdateIncome', 'as' => 'income.post']);
     Route::post('store', ['uses' => 'BudgetController@store', 'as' => 'store']);
     Route::post('update/{budget}', ['uses' => 'BudgetController@update', 'as' => 'update']);

From a429aaa6fdd17fecf6c3fc406d927ef6012f675a Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Thu, 31 Aug 2017 17:00:08 +0200
Subject: [PATCH 436/668] New translations intro.php (Spanish)

---
 resources/lang/es_ES/intro.php | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/resources/lang/es_ES/intro.php b/resources/lang/es_ES/intro.php
index c161cef362..673738cca4 100644
--- a/resources/lang/es_ES/intro.php
+++ b/resources/lang/es_ES/intro.php
@@ -11,22 +11,22 @@ declare(strict_types=1);
 
 return [
     // index
-    'index_intro'                           => 'Welcome to the index page of Firefly III. Please take the time to walk through this intro to get a feeling of how Firefly III works.',
-    'index_accounts-chart'                  => 'This chart shows the current balance of your asset accounts. You can select the accounts visible here in your preferences.',
-    'index_box_out_holder'                  => 'This little box and the boxes next to this one will give you a quick overview of your financial situation.',
-    'index_help'                            => 'If you ever need help with a page or a form, press this button.',
-    'index_outro'                           => 'Most pages of Firefly III will start with a little tour like this one. Please contact me when you have questions or comments. Enjoy!',
-    'index_sidebar-toggle'                  => 'To create new transactions, accounts or other things, use the menu under this icon.',
+    'index_intro'                           => 'Bienvenido a la página de índice de Firefly III. Por favor tómate tu tiempo para revisar esta guía y que puedas hacerte una idea de cómo funciona Firefly III.',
+    'index_accounts-chart'                  => 'Este gráfico muestra el saldo actual de tus cuentas. Puedes seleccionar las cuentas que se muestran en él desde tus preferencias.',
+    'index_box_out_holder'                  => 'Esta pequeña caja y las cajas a continuación te darán una visión rápida de tu situación financiera.',
+    'index_help'                            => 'Si alguna vez necesitas ayuda en una página o formulario, pulsa este botón.',
+    'index_outro'                           => 'La mayoría de las páginas de Firefly III comenzarán con una pequeña introducción como ésta. Por favor, ponte en contacto conmigo si tienes preguntas o comentarios. ¡Disfruta!',
+    'index_sidebar-toggle'                  => 'Para crear nuevas transacciones, cuentas u otros elementos, utiliza el menú bajo este icono.',
 
     // create account:
-    'accounts_create_iban'                  => 'Give your accounts a valid IBAN. This could make a data import very easy in the future.',
-    'accounts_create_asset_opening_balance' => 'Assets accounts may have an "opening balance", indicating the start of this account\'s history in Firefly.',
-    'accounts_create_asset_currency'        => 'Firefly III supports multiple currencies. Asset accounts have one main currency, which you must set here.',
-    'accounts_create_asset_virtual'         => 'It can sometimes help to give your account a virtual balance: an extra amount always added to or removed from the actual balance.',
+    'accounts_create_iban'                  => 'Indica un IBAN válido en tus cuentas. Esto facilitará la importación de datos en el futuro.',
+    'accounts_create_asset_opening_balance' => 'Las cuentas pueden tener un "saldo de apertura", que indica el saldo inicial de esta cuenta en Firefly.',
+    'accounts_create_asset_currency'        => 'Firefly III admite múltiples divisas. Las cuentas tienen una divisa principal, que debes indicar aquí.',
+    'accounts_create_asset_virtual'         => 'A veces puede ayudar el darle a tu cuenta un balance virtual: una cantidad extra que se añade o resta siempre del balance real.',
 
     // budgets index
-    'budgets_index_intro'                   => 'Budgets are used to manage your finances and form one of the core functions of Firefly III.',
-    'budgets_index_set_budget'              => 'Set your total budget for every period so Firefly can tell you if you have budgeted all available money.',
+    'budgets_index_intro'                   => 'Los presupuestos se utilizan para administrar sus finanzas y son una de las funciones básicas de Firefly III.',
+    'budgets_index_set_budget'              => 'Fija tu presupuesto total para cada período, de tal forma que Firefly pueda indicarte si has presupuestado todo el dinero disponible.',
     'budgets_index_see_expenses_bar'        => 'Spending money will slowly fill this bar.',
     'budgets_index_navigate_periods'        => 'Navigate through periods to easily set budgets ahead of time.',
     'budgets_index_new_budget'              => 'Create new budgets as you see fit.',
@@ -118,4 +118,4 @@ return [
 
     // create currency
     'currencies_create_code'                                  => 'This code should be ISO compliant (Google it for your new currency).',
-];
\ No newline at end of file
+];

From 808b405dd65705c286ea54ca6fd91f73be38793a Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Thu, 31 Aug 2017 17:10:12 +0200
Subject: [PATCH 437/668] New translations intro.php (Spanish)

---
 resources/lang/es_ES/intro.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/resources/lang/es_ES/intro.php b/resources/lang/es_ES/intro.php
index 673738cca4..dc1c7ed940 100644
--- a/resources/lang/es_ES/intro.php
+++ b/resources/lang/es_ES/intro.php
@@ -27,9 +27,9 @@ return [
     // budgets index
     'budgets_index_intro'                   => 'Los presupuestos se utilizan para administrar sus finanzas y son una de las funciones básicas de Firefly III.',
     'budgets_index_set_budget'              => 'Fija tu presupuesto total para cada período, de tal forma que Firefly pueda indicarte si has presupuestado todo el dinero disponible.',
-    'budgets_index_see_expenses_bar'        => 'Spending money will slowly fill this bar.',
-    'budgets_index_navigate_periods'        => 'Navigate through periods to easily set budgets ahead of time.',
-    'budgets_index_new_budget'              => 'Create new budgets as you see fit.',
+    'budgets_index_see_expenses_bar'        => 'Gastar dinero irá llenando poco a poco esta barra.',
+    'budgets_index_navigate_periods'        => 'Navega a través de períodos para configurar fácilmente presupuestos con anticipación.',
+    'budgets_index_new_budget'              => 'Crea nuevos presupuestos como mejor te parezca.',
     'budgets_index_list_of_budgets'         => 'Use this table to set the amounts for each budget and see how you are doing.',
 
     // reports (index)

From da4dbb73194605e443ba45165775b7aaed3990ea Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Thu, 31 Aug 2017 17:10:14 +0200
Subject: [PATCH 438/668] New translations form.php (Spanish)

---
 resources/lang/es_ES/form.php | 72 +++++++++++++++++------------------
 1 file changed, 36 insertions(+), 36 deletions(-)

diff --git a/resources/lang/es_ES/form.php b/resources/lang/es_ES/form.php
index 8be5f9f284..3837e72573 100644
--- a/resources/lang/es_ES/form.php
+++ b/resources/lang/es_ES/form.php
@@ -47,22 +47,22 @@ return [
     'split_journal'                  => 'Split this transaction',
     'split_journal_explanation'      => 'Split this transaction in multiple parts',
     'currency'                       => 'Divisa',
-    'account_id'                     => 'Asset account',
+    'account_id'                     => 'Cuenta',
     'budget_id'                      => 'Presupuesto',
     'openingBalance'                 => 'Saldo inicial',
-    'tagMode'                        => 'Tag mode',
-    'tagPosition'                    => 'Tag location',
+    'tagMode'                        => 'Modo de etiqueta',
+    'tagPosition'                    => 'Ubicación de la etiqueta',
     'virtualBalance'                 => 'Saldo virtual',
     'longitude_latitude'             => 'Ubicación',
     'targetamount'                   => 'Cantidad objetivo',
     'accountRole'                    => 'Tipo de cuenta',
     'openingBalanceDate'             => 'Fecha del saldo inicial',
-    'ccType'                         => 'Credit card payment plan',
-    'ccMonthlyPaymentDate'           => 'Credit card monthly payment date',
-    'piggy_bank_id'                  => 'Piggy bank',
-    'returnHere'                     => 'Return here',
-    'returnHereExplanation'          => 'After storing, return here to create another one.',
-    'returnHereUpdateExplanation'    => 'After updating, return here.',
+    'ccType'                         => 'Plan de pagos con tarjeta de crédito',
+    'ccMonthlyPaymentDate'           => 'Fecha de pago mensual de la tarjeta de crédito',
+    'piggy_bank_id'                  => 'Hucha',
+    'returnHere'                     => 'Volver aquí',
+    'returnHereExplanation'          => 'Después de guardar, vuelve aquí para crear otro.',
+    'returnHereUpdateExplanation'    => 'Después de actualizar, vuelve aquí.',
     'description'                    => 'Descripción',
     'expense_account'                => 'Cuenta de gastos',
     'revenue_account'                => 'Cuenta de ingresos',
@@ -87,7 +87,7 @@ return [
     'amount'                     => 'Importe',
     'date'                       => 'Fecha',
     'interest_date'              => 'Fecha de interés',
-    'book_date'                  => 'Book date',
+    'book_date'                  => 'Fecha de registro',
     'process_date'               => 'Fecha de procesamiento',
     'category'                   => 'Categoría',
     'tags'                       => 'Etiquetas',
@@ -100,32 +100,32 @@ return [
     'code'                       => 'Código',
     'iban'                       => 'IBAN',
     'accountNumber'              => 'Número de cuenta',
-    'creditCardNumber'           => 'Credit card number',
+    'creditCardNumber'           => 'Número de la tarjeta de crédito',
     'has_headers'                => 'Encabezados',
     'date_format'                => 'Formato de fecha',
     'specifix'                   => 'Bank- or file specific fixes',
     'attachments[]'              => 'Adjuntos',
-    'store_new_withdrawal'       => 'Store new withdrawal',
-    'store_new_deposit'          => 'Store new deposit',
-    'store_new_transfer'         => 'Store new transfer',
-    'add_new_withdrawal'         => 'Add a new withdrawal',
-    'add_new_deposit'            => 'Add a new deposit',
-    'add_new_transfer'           => 'Add a new transfer',
-    'noPiggybank'                => '(no piggy bank)',
+    'store_new_withdrawal'       => 'Guardar rueva retirada de efectivo',
+    'store_new_deposit'          => 'Guardar nuevo depósito',
+    'store_new_transfer'         => 'Guardar nueva transferencia',
+    'add_new_withdrawal'         => 'Añadir rueva retirada de efectivo',
+    'add_new_deposit'            => 'Añadir nuevo depósito',
+    'add_new_transfer'           => 'Añadir nueva transferencia',
+    'noPiggybank'                => '(sin hucha)',
     'title'                      => 'Título',
     'notes'                      => 'Notas',
     'filename'                   => 'Nombre de fichero',
     'mime'                       => 'Tipo Mime',
     'size'                       => 'Tamaño',
     'trigger'                    => 'Disparador',
-    'stop_processing'            => 'Stop processing',
-    'start_date'                 => 'Start of range',
-    'end_date'                   => 'End of range',
+    'stop_processing'            => 'Detener el procesamiento',
+    'start_date'                 => 'Inicio del rango',
+    'end_date'                   => 'Final del rango',
     'export_start_range'         => 'Start of export range',
     'export_end_range'           => 'End of export range',
-    'export_format'              => 'File format',
-    'include_attachments'        => 'Include uploaded attachments',
-    'include_old_uploads'        => 'Include imported data',
+    'export_format'              => 'Formato del archivo',
+    'include_attachments'        => 'Incluir archivos adjuntos subidos',
+    'include_old_uploads'        => 'Incluir datos importados',
     'accounts'                   => 'Export transactions from these accounts',
     'delete_account'             => 'Delete account ":name"',
     'delete_bill'                => 'Delete bill ":name"',
@@ -164,23 +164,23 @@ return [
     'category_keep_transactions' => 'The only transaction connected to this category will not be deleted.|All :count transactions connected to this category will spared deletion.',
     'tag_keep_transactions'      => 'The only transaction connected to this tag will not be deleted.|All :count transactions connected to this tag will spared deletion.',
 
-    'email'                 => 'Email address',
-    'password'              => 'Password',
-    'password_confirmation' => 'Password (again)',
-    'blocked'               => 'Is blocked?',
-    'blocked_code'          => 'Reason for block',
+    'email'                 => 'Correo electrónico',
+    'password'              => 'Contraseña',
+    'password_confirmation' => 'Contraseña (otra vez)',
+    'blocked'               => '¿Está bloqueado?',
+    'blocked_code'          => 'Razón del bloqueo',
 
 
     // admin
-    'domain'                => 'Domain',
-    'single_user_mode'      => 'Single user mode',
-    'must_confirm_account'  => 'New users must activate account',
-    'is_demo_site'          => 'Is demo site',
+    'domain'                => 'Dominio',
+    'single_user_mode'      => 'Modo de un solo usuario',
+    'must_confirm_account'  => 'Los nuevos usuarios deben activar su cuenta',
+    'is_demo_site'          => 'Está en modo demostración',
 
 
     // import
-    'import_file'           => 'Import file',
-    'configuration_file'    => 'Configuration file',
+    'import_file'           => 'Importar archivo',
+    'configuration_file'    => 'Archivo de configuración',
     'import_file_type'      => 'Import file type',
     'csv_comma'             => 'A comma (,)',
     'csv_semicolon'         => 'A semicolon (;)',
@@ -197,4 +197,4 @@ return [
 
     'inward'  => 'Inward description',
     'outward' => 'Outward description',
-];
\ No newline at end of file
+];

From 88d3db4dc8583abf56f3c86f37d64383381f37eb Mon Sep 17 00:00:00 2001
From: jleeong <jared.leeong13@gmail.com>
Date: Thu, 31 Aug 2017 12:05:43 -0700
Subject: [PATCH 439/668] Fixed dockerization

---
 Dockerfile                 |  22 +---
 docker/apache-firefly.conf |  15 +--
 docker/apache2.conf        | 221 +++++++++++++++++++++++++++++++++++++
 docker/entrypoint.sh       |  11 --
 4 files changed, 233 insertions(+), 36 deletions(-)
 create mode 100644 docker/apache2.conf

diff --git a/Dockerfile b/Dockerfile
index 794634fdb8..792f7b2c8d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -23,28 +23,18 @@ RUN docker-php-ext-install -j$(nproc) curl gd intl json mcrypt readline tidy zip
 # Generate locales supported by firefly
 RUN echo "en_US.UTF-8 UTF-8\nde_DE.UTF-8 UTF-8\nnl_NL.UTF-8 UTF-8\npt_BR.UTF-8 UTF-8" > /etc/locale.gen && locale-gen
 
+COPY docker/apache2.conf /etc/apache2/apache2.conf
 # Enable apache mod rewrite..
 RUN a2enmod rewrite
 
 # Setup the Composer installer
-RUN curl -o /tmp/composer-setup.php https://getcomposer.org/installer && \
-  curl -o /tmp/composer-setup.sig https://composer.github.io/installer.sig && \
-  php -r "if (hash('SHA384', file_get_contents('/tmp/composer-setup.php')) !== trim(file_get_contents('/tmp/composer-setup.sig'))) { unlink('/tmp/composer-setup.php'); echo 'Invalid installer' . PHP_EOL; exit(1); }" && \
-  chmod +x /tmp/composer-setup.php && \
-  php /tmp/composer-setup.php && \
-  mv composer.phar /usr/local/bin/composer && \
-  rm -f /tmp/composer-setup.{php,sig}
+run curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
 
-ADD . /var/www/firefly-iii
-RUN chown -R www-data:www-data /var/www/
+RUN cd /var/www && composer create-project grumpydictator/firefly-iii --no-dev --prefer-dist firefly-iii 4.6.4
+COPY docker/entrypoint.sh /var/www/firefly-iii/docker/entrypoint.sh
 ADD docker/apache-firefly.conf /etc/apache2/sites-available/000-default.conf
-
-USER www-data
+RUN chown -R www-data:www-data /var/www && chmod -R 775 /var/www/firefly-iii/storage
 
 WORKDIR /var/www/firefly-iii
-
-RUN composer install --no-scripts --no-dev
-
-USER root
-
+EXPOSE 80
 ENTRYPOINT ["/var/www/firefly-iii/docker/entrypoint.sh"]
diff --git a/docker/apache-firefly.conf b/docker/apache-firefly.conf
index 8d9a34c130..6c7db54550 100644
--- a/docker/apache-firefly.conf
+++ b/docker/apache-firefly.conf
@@ -12,13 +12,10 @@
         ErrorLog ${APACHE_LOG_DIR}/error.log
         CustomLog ${APACHE_LOG_DIR}/access.log combined
 
-	<Directory /var/www/firefly-iii/public>
-		Options -Indexes +FollowSymLinks
-		AllowOverride All
-		Order allow,deny
-		allow from all
-	</Directory>
+    <Directory /var/www/firefly-iii/public>
+        Options -Indexes +FollowSymLinks
+        AllowOverride All
+        Order allow,deny
+        allow from all
+    </Directory>
 </VirtualHost>
-
-
-
diff --git a/docker/apache2.conf b/docker/apache2.conf
new file mode 100644
index 0000000000..e00594817e
--- /dev/null
+++ b/docker/apache2.conf
@@ -0,0 +1,221 @@
+# This is the main Apache server configuration file.  It contains the
+# configuration directives that give the server its instructions.
+# See http://httpd.apache.org/docs/2.4/ for detailed information about
+# the directives and /usr/share/doc/apache2/README.Debian about Debian specific
+# hints.
+#
+#
+# Summary of how the Apache 2 configuration works in Debian:
+# The Apache 2 web server configuration in Debian is quite different to
+# upstream's suggested way to configure the web server. This is because Debian's
+# default Apache2 installation attempts to make adding and removing modules,
+# virtual hosts, and extra configuration directives as flexible as possible, in
+# order to make automating the changes and administering the server as easy as
+# possible.
+
+# It is split into several files forming the configuration hierarchy outlined
+# below, all located in the /etc/apache2/ directory:
+#
+#	/etc/apache2/
+#	|-- apache2.conf
+#	|	`--  ports.conf
+#	|-- mods-enabled
+#	|	|-- *.load
+#	|	`-- *.conf
+#	|-- conf-enabled
+#	|	`-- *.conf
+# 	`-- sites-enabled
+#	 	`-- *.conf
+#
+#
+# * apache2.conf is the main configuration file (this file). It puts the pieces
+#   together by including all remaining configuration files when starting up the
+#   web server.
+#
+# * ports.conf is always included from the main configuration file. It is
+#   supposed to determine listening ports for incoming connections which can be
+#   customized anytime.
+#
+# * Configuration files in the mods-enabled/, conf-enabled/ and sites-enabled/
+#   directories contain particular configuration snippets which manage modules,
+#   global configuration fragments, or virtual host configurations,
+#   respectively.
+#
+#   They are activated by symlinking available configuration files from their
+#   respective *-available/ counterparts. These should be managed by using our
+#   helpers a2enmod/a2dismod, a2ensite/a2dissite and a2enconf/a2disconf. See
+#   their respective man pages for detailed information.
+#
+# * The binary is called apache2. Due to the use of environment variables, in
+#   the default configuration, apache2 needs to be started/stopped with
+#   /etc/init.d/apache2 or apache2ctl. Calling /usr/bin/apache2 directly will not
+#   work with the default configuration.
+
+
+# Global configuration
+#
+
+#
+# ServerRoot: The top of the directory tree under which the server's
+# configuration, error, and log files are kept.
+#
+# NOTE!  If you intend to place this on an NFS (or otherwise network)
+# mounted filesystem then please read the Mutex documentation (available
+# at <URL:http://httpd.apache.org/docs/2.4/mod/core.html#mutex>);
+# you will save yourself a lot of trouble.
+#
+# Do NOT add a slash at the end of the directory path.
+#
+#ServerRoot "/etc/apache2"
+
+#
+# The accept serialization lock file MUST BE STORED ON A LOCAL DISK.
+#
+Mutex file:${APACHE_LOCK_DIR} default
+
+#
+# PidFile: The file in which the server should record its process
+# identification number when it starts.
+# This needs to be set in /etc/apache2/envvars
+#
+PidFile ${APACHE_PID_FILE}
+
+#
+# Timeout: The number of seconds before receives and sends time out.
+#
+Timeout 300
+
+#
+# KeepAlive: Whether or not to allow persistent connections (more than
+# one request per connection). Set to "Off" to deactivate.
+#
+KeepAlive On
+
+#
+# MaxKeepAliveRequests: The maximum number of requests to allow
+# during a persistent connection. Set to 0 to allow an unlimited amount.
+# We recommend you leave this number high, for maximum performance.
+#
+MaxKeepAliveRequests 100
+
+#
+# KeepAliveTimeout: Number of seconds to wait for the next request from the
+# same client on the same connection.
+#
+KeepAliveTimeout 5
+
+
+# These need to be set in /etc/apache2/envvars
+User ${APACHE_RUN_USER}
+Group ${APACHE_RUN_GROUP}
+
+#
+# HostnameLookups: Log the names of clients or just their IP addresses
+# e.g., www.apache.org (on) or 204.62.129.132 (off).
+# The default is off because it'd be overall better for the net if people
+# had to knowingly turn this feature on, since enabling it means that
+# each client request will result in AT LEAST one lookup request to the
+# nameserver.
+#
+HostnameLookups Off
+
+# ErrorLog: The location of the error log file.
+# If you do not specify an ErrorLog directive within a <VirtualHost>
+# container, error messages relating to that virtual host will be
+# logged here.  If you *do* define an error logfile for a <VirtualHost>
+# container, that host's errors will be logged there and not here.
+#
+ErrorLog ${APACHE_LOG_DIR}/error.log
+
+#
+# LogLevel: Control the severity of messages logged to the error_log.
+# Available values: trace8, ..., trace1, debug, info, notice, warn,
+# error, crit, alert, emerg.
+# It is also possible to configure the log level for particular modules, e.g.
+# "LogLevel info ssl:warn"
+#
+LogLevel warn
+
+# Include module configuration:
+IncludeOptional mods-enabled/*.load
+IncludeOptional mods-enabled/*.conf
+
+# Include list of ports to listen on
+Include ports.conf
+
+
+# Sets the default security model of the Apache2 HTTPD server. It does
+# not allow access to the root filesystem outside of /usr/share and /var/www.
+# The former is used by web applications packaged in Debian,
+# the latter may be used for local directories served by the web server. If
+# your system is serving content from a sub-directory in /srv you must allow
+# access here, or in any related virtual host.
+<Directory />
+	Options FollowSymLinks
+	AllowOverride None
+	Require all denied
+</Directory>
+
+<Directory /usr/share>
+	AllowOverride None
+	Require all granted
+</Directory>
+
+<Directory /var/www/>
+	Options Indexes FollowSymLinks
+	AllowOverride All
+	Require all granted
+</Directory>
+
+#<Directory /srv/>
+#	Options Indexes FollowSymLinks
+#	AllowOverride None
+#	Require all granted
+#</Directory>
+
+
+
+
+# AccessFileName: The name of the file to look for in each directory
+# for additional configuration directives.  See also the AllowOverride
+# directive.
+#
+AccessFileName .htaccess
+
+#
+# The following lines prevent .htaccess and .htpasswd files from being
+# viewed by Web clients.
+#
+<FilesMatch "^\.ht">
+	Require all denied
+</FilesMatch>
+
+
+#
+# The following directives define some format nicknames for use with
+# a CustomLog directive.
+#
+# These deviate from the Common Log Format definitions in that they use %O
+# (the actual bytes sent including headers) instead of %b (the size of the
+# requested file), because the latter makes it impossible to detect partial
+# requests.
+#
+# Note that the use of %{X-Forwarded-For}i instead of %h is not recommended.
+# Use mod_remoteip instead.
+#
+LogFormat "%v:%p %h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" vhost_combined
+LogFormat "%h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" combined
+LogFormat "%h %l %u %t \"%r\" %>s %O" common
+LogFormat "%{Referer}i -> %U" referer
+LogFormat "%{User-agent}i" agent
+
+# Include of directories ignores editors' and dpkg's backup files,
+# see README.Debian for details.
+
+# Include generic snippets of statements
+IncludeOptional conf-enabled/*.conf
+
+# Include the virtual host configurations:
+IncludeOptional sites-enabled/*.conf
+
+# vim: syntax=apache ts=4 sw=4 sts=4 sr noet
diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh
index 0baf22e862..2d7d479bfb 100755
--- a/docker/entrypoint.sh
+++ b/docker/entrypoint.sh
@@ -2,15 +2,4 @@
 
 cat .env.docker | envsubst > .env
 
-if [ "${INIT_DATABASE:="no"}" = "yes" ]; then
-	echo "Init database detected, checking mysql status"
-	# depends on your machine, but it may take a file to boot mysql container the first time
-	until php artisan firefly:verify &>/dev/null
-	do
-  		echo "waiting mysql"
-  		sleep 10 
-	done
-	php artisan migrate:refresh --seed
-fi
-
 exec apache2-foreground

From ab80803f0ffb9a667a0d75d71dcacbcbc7b3457a Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Fri, 1 Sep 2017 06:28:26 +0200
Subject: [PATCH 440/668] Fix order for bills.

---
 app/Repositories/Bill/BillRepository.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Repositories/Bill/BillRepository.php b/app/Repositories/Bill/BillRepository.php
index e6957abe4b..5d510c8e75 100644
--- a/app/Repositories/Bill/BillRepository.php
+++ b/app/Repositories/Bill/BillRepository.php
@@ -116,7 +116,7 @@ class BillRepository implements BillRepositoryInterface
         $set = $set->sortBy(
             function (Bill $bill) {
 
-                $int = $bill->active === 1 ? 0 : 1;
+                $int = $bill->active ? 0 : 1;
 
                 return $int . strtolower($bill->name);
             }

From 632d95f1fba324d511cb4ccd02edbd34e886fdc9 Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Fri, 1 Sep 2017 11:20:51 +0200
Subject: [PATCH 441/668] Should fix rule, category and other name checks. #793

---
 app/Models/Bill.php                 | 2 +-
 app/Validation/FireflyValidator.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Models/Bill.php b/app/Models/Bill.php
index 8659be7749..91a5600200 100644
--- a/app/Models/Bill.php
+++ b/app/Models/Bill.php
@@ -28,7 +28,7 @@ use Watson\Validating\ValidatingTrait;
 class Bill extends Model
 {
 
-    use ValidatingTrait;
+    use SoftDeletes, ValidatingTrait;
     /**
      * The attributes that should be casted to native types.
      *
diff --git a/app/Validation/FireflyValidator.php b/app/Validation/FireflyValidator.php
index 62f6747123..ef16f8787b 100644
--- a/app/Validation/FireflyValidator.php
+++ b/app/Validation/FireflyValidator.php
@@ -387,7 +387,7 @@ class FireflyValidator extends Validator
         $exclude = $parameters[2] ?? 0;
 
         // get entries from table
-        $set = DB::table($table)->where('user_id', auth()->user()->id)
+        $set = DB::table($table)->where('user_id', auth()->user()->id)->whereNull('deleted_at')
                  ->where('id', '!=', $exclude)->get([$field]);
 
         foreach ($set as $entry) {

From 5e08461385de8cfacbaa468c1616a8dc0740707b Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Fri, 1 Sep 2017 21:22:55 +0200
Subject: [PATCH 442/668] Fix broken dev installation.

---
 app/Models/Bill.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/Models/Bill.php b/app/Models/Bill.php
index 91a5600200..e3130d8962 100644
--- a/app/Models/Bill.php
+++ b/app/Models/Bill.php
@@ -17,6 +17,7 @@ use Crypt;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\HasMany;
+use Illuminate\Database\Eloquent\SoftDeletes;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use Watson\Validating\ValidatingTrait;
 

From 95e91b9af87382a5bb9a16fcecbcd0f9e97e02e5 Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Fri, 1 Sep 2017 21:54:17 +0200
Subject: [PATCH 443/668] Fix tests

---
 .../Json/AutoCompleteControllerTest.php       | 37 +++++++++++++++++++
 .../Controllers/JsonControllerTest.php        | 35 ------------------
 .../Controllers/TransactionControllerTest.php |  4 --
 3 files changed, 37 insertions(+), 39 deletions(-)

diff --git a/tests/Feature/Controllers/Json/AutoCompleteControllerTest.php b/tests/Feature/Controllers/Json/AutoCompleteControllerTest.php
index ccdea87a69..42f4b663ab 100644
--- a/tests/Feature/Controllers/Json/AutoCompleteControllerTest.php
+++ b/tests/Feature/Controllers/Json/AutoCompleteControllerTest.php
@@ -13,6 +13,7 @@ declare(strict_types=1);
 namespace Tests\Feature\Controllers\Json;
 
 
+use FireflyIII\Helpers\Collector\JournalCollectorInterface;
 use FireflyIII\Models\Account;
 use FireflyIII\Models\AccountType;
 use FireflyIII\Models\TransactionJournal;
@@ -29,6 +30,7 @@ use Tests\TestCase;
 class AutoCompleteControllerTest extends TestCase
 {
 
+
     /**
      * @covers \FireflyIII\Http\Controllers\Json\AutoCompleteController::allAccounts
      */
@@ -44,6 +46,21 @@ class AutoCompleteControllerTest extends TestCase
         $response->assertStatus(200);
     }
 
+    /**
+     * @covers \FireflyIII\Http\Controllers\Json\AutoCompleteController::allTransactionJournals
+     */
+    public function testAllTransactionJournals()
+    {
+        $collector = $this->mock(JournalCollectorInterface::class);
+        $collector->shouldReceive('setLimit')->withArgs([250])->andReturnSelf();
+        $collector->shouldReceive('setPage')->withArgs([1])->andReturnSelf();
+        $collector->shouldReceive('getJournals')->andReturn(new Collection);
+
+        $this->be($this->user());
+        $response = $this->get(route('json.all-transaction-journals'));
+        $response->assertStatus(200);
+    }
+
     /**
      * @covers \FireflyIII\Http\Controllers\Json\AutoCompleteController::expenseAccounts
      */
@@ -84,4 +101,24 @@ class AutoCompleteControllerTest extends TestCase
         $response->assertExactJson([$account->name]);
     }
 
+    /**
+     * @covers \FireflyIII\Http\Controllers\Json\AutoCompleteController::transactionJournals
+     */
+    public function testTransactionJournals()
+    {
+        // mock stuff
+        $collector    = $this->mock(JournalCollectorInterface::class);
+        $journalRepos = $this->mock(JournalRepositoryInterface::class);
+        $journalRepos->shouldReceive('first')->once()->andReturn(new TransactionJournal);
+        $collector->shouldReceive('setTypes')->andReturnSelf();
+        $collector->shouldReceive('setLimit')->andReturnSelf();
+        $collector->shouldReceive('setPage')->andReturnSelf();
+        $collector->shouldReceive('getJournals')->andReturn(new Collection);
+
+        $this->be($this->user());
+        $response = $this->get(route('json.transaction-journals', ['deposit']));
+        $response->assertStatus(200);
+        $response->assertExactJson([]);
+    }
+
 }
diff --git a/tests/Feature/Controllers/JsonControllerTest.php b/tests/Feature/Controllers/JsonControllerTest.php
index bef5b28839..72567af9a8 100644
--- a/tests/Feature/Controllers/JsonControllerTest.php
+++ b/tests/Feature/Controllers/JsonControllerTest.php
@@ -54,21 +54,6 @@ class JsonControllerTest extends TestCase
         $response->assertStatus(200);
     }
 
-    /**
-     * @covers \FireflyIII\Http\Controllers\JsonController::allTransactionJournals()
-     */
-    public function testAllTransactionJournals()
-    {
-        $collector = $this->mock(JournalCollectorInterface::class);
-        $collector->shouldReceive('setLimit')->withArgs([100])->andReturnSelf();
-        $collector->shouldReceive('setPage')->withArgs([1])->andReturnSelf();
-        $collector->shouldReceive('getJournals')->andReturn(new Collection);
-
-        $this->be($this->user());
-        $response = $this->get(route('json.all-transaction-journals'));
-        $response->assertStatus(200);
-    }
-
     /**
      * @covers \FireflyIII\Http\Controllers\JsonController::boxBillsPaid
      */
@@ -214,26 +199,6 @@ class JsonControllerTest extends TestCase
         $response->assertExactJson([$tag->tag]);
     }
 
-    /**
-     * @covers \FireflyIII\Http\Controllers\JsonController::transactionJournals
-     */
-    public function testTransactionJournals()
-    {
-        // mock stuff
-        $collector    = $this->mock(JournalCollectorInterface::class);
-        $journalRepos = $this->mock(JournalRepositoryInterface::class);
-        $journalRepos->shouldReceive('first')->once()->andReturn(new TransactionJournal);
-        $collector->shouldReceive('setTypes')->andReturnSelf();
-        $collector->shouldReceive('setLimit')->andReturnSelf();
-        $collector->shouldReceive('setPage')->andReturnSelf();
-        $collector->shouldReceive('getJournals')->andReturn(new Collection);
-
-        $this->be($this->user());
-        $response = $this->get(route('json.transaction-journals', ['deposit']));
-        $response->assertStatus(200);
-        $response->assertExactJson([]);
-    }
-
     /**
      * @covers \FireflyIII\Http\Controllers\JsonController::transactionTypes
      */
diff --git a/tests/Feature/Controllers/TransactionControllerTest.php b/tests/Feature/Controllers/TransactionControllerTest.php
index 43e705f369..3465d7c59e 100644
--- a/tests/Feature/Controllers/TransactionControllerTest.php
+++ b/tests/Feature/Controllers/TransactionControllerTest.php
@@ -58,8 +58,6 @@ class TransactionControllerTest extends TestCase
         $collector->shouldReceive('getPaginatedJournals')->andReturn(new LengthAwarePaginator([], 0, 10));
         $collector->shouldReceive('getJournals')->andReturn(new Collection);
 
-        Steam::shouldReceive('positive')->once()->andReturn('1');
-
         $this->be($this->user());
         $response = $this->get(route('transactions.index', ['transfer']));
         $response->assertStatus(200);
@@ -119,8 +117,6 @@ class TransactionControllerTest extends TestCase
         $collector->shouldReceive('getPaginatedJournals')->andReturn(new LengthAwarePaginator([], 0, 10));
         $collector->shouldReceive('getJournals')->andReturn(new Collection);
 
-        Steam::shouldReceive('positive')->once()->andReturn('1');
-
         $this->be($this->user());
         $response = $this->get(route('transactions.index', ['transfer', '2016-01-01']));
         $response->assertStatus(200);

From 7cab89a291e2dace52d8658d349a7b77a27a7e00 Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Sat, 2 Sep 2017 07:40:05 +0200
Subject: [PATCH 444/668] Remove experimental multi period thing.

---
 app/Http/Controllers/BudgetController.php | 48 ----------------------
 resources/views/budgets/multi-period.twig | 50 -----------------------
 2 files changed, 98 deletions(-)
 delete mode 100644 resources/views/budgets/multi-period.twig

diff --git a/app/Http/Controllers/BudgetController.php b/app/Http/Controllers/BudgetController.php
index d66781284e..8b89aaf4be 100644
--- a/app/Http/Controllers/BudgetController.php
+++ b/app/Http/Controllers/BudgetController.php
@@ -246,54 +246,6 @@ class BudgetController extends Controller
         );
     }
 
-    public function multiPeriod()
-    {
-        $start = new Carbon;
-        $start->startOfYear();
-        $end = clone $start;
-        $end->endOfYear();
-        $current = clone $start;
-        $headers = [];
-        $range   = Preferences::get('viewRange', '1M')->data;
-        $budgets = $this->repository->getBudgets();
-        $limits  = [];
-        $defaultCurrency    = Amount::getDefaultCurrency();
-
-        while ($current < $end) {
-            $currentEnd = Navigation::endOfPeriod($current, $range);
-            $format     = Navigation::preferredCarbonLocalizedFormat($current, $currentEnd);
-            $name       = Navigation::periodShow($current, $range);
-            $headers[]  = [
-                'start'     => $current,
-                'end'       => $currentEnd,
-                'date_str'  => $current->format('Y_m_d'),
-                'start_str' => $current->formatLocalized($format),
-                'end_str'   => $currentEnd->formatLocalized($format),
-                'name'      => $name,
-                'key'       => $current->format('Y-m-d') . '-' . $currentEnd->format('Y-m-d'),
-            ];
-
-            $current = Navigation::addPeriod($current, $range, 0);
-        }
-
-        // for each budget, get the budget limits
-        /** @var Budget $budget */
-        foreach ($budgets as $budget) {
-            /** @var array $header */
-            foreach ($headers as $header) {
-                /** @var BudgetLimit $limit */
-                $limit = $budget->budgetlimits()
-                                ->where('start_date', $header['start']->format('Y-m-d'))
-                                ->where('end_date', $header['end']->format('Y-m-d'))->first(['budget_limits.*']);
-                $key   = $header['start']->format('Y-m-d') . '-' . $header['end']->format('Y-m-d');
-                if (!is_null($limit)) {
-                    $limits[$budget->id][$key] = round($limit->amount, $defaultCurrency->decimal_places);
-                }
-            }
-        }
-        return view('budgets.multi-period', compact('headers', 'budgets','limits'));
-    }
-
     /**
      * @param Request                    $request
      * @param JournalRepositoryInterface $repository
diff --git a/resources/views/budgets/multi-period.twig b/resources/views/budgets/multi-period.twig
deleted file mode 100644
index 8d12b72723..0000000000
--- a/resources/views/budgets/multi-period.twig
+++ /dev/null
@@ -1,50 +0,0 @@
-{% extends "./layout/default" %}
-
-{% block breadcrumbs %}
-    {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName) }}
-{% endblock %}
-
-{% block content %}
-    <div class="row">
-        <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
-            <div class="box">
-                <div class="box-header with-border">
-                    <h3 class="box-title">multi period table</h3>
-                </div>
-                <div class="box-body">
-                    <table class="table table-bordered">
-                        <thead>
-                        <tr>
-                            <th>Budget</th>
-                            {% for header in headers %}
-                                <th title="{{ header.start_str }} - {{ header.end_str }}">{{ header.name }}</th>
-                            {% endfor %}
-                        </tr>
-                        </thead>
-                        <tbody>
-                        {% for budget in budgets %}
-                            <tr>
-                                <th>{{ budget.name }}</th>
-                                {% for header in headers %}
-                                    <td>
-                                        <input name="{{ budget.id }}_{{ header.date_str }}" id="{{ budget.id }}_{{ header.date_str }}"
-                                               type="number" class="form-control budget-input" data-id="{{ budget.id }}" data-start="{{ budget.start_str }}"
-                                        data-end="{{ budget.end_str }}" value="{{ limits[budget.id][header.key] }}"
-                                        >
-                                    </td>
-                                {% endfor %}
-                            </tr>
-                        {% endfor %}
-                        </tbody>
-                    </table>
-                </div>
-            </div>
-        </div>
-    </div>
-{% endblock %}
-
-{% block styles %}
-{% endblock %}
-
-{% block scripts %}
-{% endblock %}

From 78bae33433157083de74e698f17f9ffe6e3c8d44 Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Sat, 2 Sep 2017 07:40:39 +0200
Subject: [PATCH 445/668] Remove experimental multi period thing.

---
 resources/views/budgets/index.twig | 1 -
 routes/web.php                     | 1 -
 2 files changed, 2 deletions(-)

diff --git a/resources/views/budgets/index.twig b/resources/views/budgets/index.twig
index 9a1d4446c3..030239feef 100644
--- a/resources/views/budgets/index.twig
+++ b/resources/views/budgets/index.twig
@@ -111,7 +111,6 @@
                                 <a href="{{ route('budgets.index', [start.format('Y-m-d')]) }}" class="btn btn-default">{{ currentMonth }}</a>
                                 <a href="{{ route('budgets.index', [next.format('Y-m-d')]) }}" class="btn btn-default" title="{{ nextText }}">&rarr;</a>
                             </div>
-                            <div><a href="{{ route('budgets.multi-period') }}">{{ 'multi_period_overview'|_ }}</a></div>
                         </div>
                         <div class="col-lg-2 col-md-4 col-sm-12 col-xs-12 text-right">
                             <select class="form-control selectPeriod" name="next">
diff --git a/routes/web.php b/routes/web.php
index ca7caa511e..f24ac03f48 100755
--- a/routes/web.php
+++ b/routes/web.php
@@ -144,7 +144,6 @@ Route::group(
     Route::get('show/{budget}', ['uses' => 'BudgetController@show', 'as' => 'show']);
     Route::get('show/{budget}/{budgetlimit}', ['uses' => 'BudgetController@showByBudgetLimit', 'as' => 'show.limit']);
     Route::get('list/no-budget/{moment?}', ['uses' => 'BudgetController@noBudget', 'as' => 'no-budget']);
-    Route::get('multi-period', ['uses' => 'BudgetController@multiPeriod', 'as' => 'multi-period']);
     Route::get('{moment?}', ['uses' => 'BudgetController@index', 'as' => 'index']);
 
 

From f93d11643f146818ac00c6e56951fd7cbc48a918 Mon Sep 17 00:00:00 2001
From: koziolek <koziol.pawel@gmail.com>
Date: Sat, 2 Sep 2017 20:11:37 +0200
Subject: [PATCH 446/668] Fix formatting when currency symbol is separated and
 follows amount

---
 app/Support/Amount.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Support/Amount.php b/app/Support/Amount.php
index f1b6247cf8..62ad0b4a6b 100644
--- a/app/Support/Amount.php
+++ b/app/Support/Amount.php
@@ -130,7 +130,7 @@ class Amount
         $result    = $format->symbol . $space . $formatted;
 
         if (!$precedes) {
-            $result = $space . $formatted . $format->symbol;
+            $result = $formatted . $space . $format->symbol;
         }
 
         if ($coloured === true) {

From bbe8a979457397897e08bee96ff7ad9767aae413 Mon Sep 17 00:00:00 2001
From: koziolek <koziol.pawel@gmail.com>
Date: Sat, 2 Sep 2017 20:30:55 +0200
Subject: [PATCH 447/668] Fix reseting action type when editing rule

firefly-iii/firefly-iii#799
---
 app/Http/Controllers/RuleController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Http/Controllers/RuleController.php b/app/Http/Controllers/RuleController.php
index 46e1d3f8ed..d3c64d1d82 100644
--- a/app/Http/Controllers/RuleController.php
+++ b/app/Http/Controllers/RuleController.php
@@ -523,7 +523,7 @@ class RuleController extends Controller
             $actions[] = view(
                 'rules.partials.action',
                 [
-                    'oldTrigger' => $entry->action_type,
+                    'oldAction'  => $entry->action_type,
                     'oldValue'   => $entry->action_value,
                     'oldChecked' => $entry->stop_processing,
                     'count'      => $count,

From 682f9283a6ad3c7ea72c719f1c0e2c92c047708b Mon Sep 17 00:00:00 2001
From: koziolek <koziol.pawel@gmail.com>
Date: Sat, 2 Sep 2017 20:38:56 +0200
Subject: [PATCH 448/668] Fix search that worked only for lowercase queries

firefly-iii/firefly-iii#798
---
 app/Support/Search/Search.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Support/Search/Search.php b/app/Support/Search/Search.php
index 9d9a575928..d9a4d9bc1b 100644
--- a/app/Support/Search/Search.php
+++ b/app/Support/Search/Search.php
@@ -236,7 +236,7 @@ class Search implements SearchInterface
             return false;
         }
         foreach ($needle as $what) {
-            if (strpos($haystack, $what) !== false) {
+            if (stripos($haystack, $what) !== false) {
                 return true;
             }
         }

From bfd7e009cc96b7123ed562b05159b40dbd413162 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sat, 2 Sep 2017 21:50:06 +0200
Subject: [PATCH 449/668] New translations intro.php (French)

---
 resources/lang/fr_FR/intro.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/lang/fr_FR/intro.php b/resources/lang/fr_FR/intro.php
index c161cef362..17942161b6 100644
--- a/resources/lang/fr_FR/intro.php
+++ b/resources/lang/fr_FR/intro.php
@@ -70,7 +70,7 @@ return [
     'piggy-banks_index_accountStatus'                         => 'For each asset account with at least one piggy bank the status is listed in this table.',
 
     // create piggy
-    'piggy-banks_create_name'                                 => 'What is your goal? A new couch, a camera, money for emergencies?',
+    'piggy-banks_create_name'                                 => 'Quel est votre objectif ? Un nouveau divan, une caméra, de l\'argent pour les urgences ?',
     'piggy-banks_create_date'                                 => 'You can set a target date or a deadline for your piggy bank.',
 
     // show piggy
@@ -118,4 +118,4 @@ return [
 
     // create currency
     'currencies_create_code'                                  => 'This code should be ISO compliant (Google it for your new currency).',
-];
\ No newline at end of file
+];

From 159920296a000f71a2581f9569942b59586bc12d Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sat, 2 Sep 2017 22:00:14 +0200
Subject: [PATCH 450/668] New translations breadcrumbs.php (French)

---
 resources/lang/fr_FR/breadcrumbs.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/lang/fr_FR/breadcrumbs.php b/resources/lang/fr_FR/breadcrumbs.php
index a6d4c56e06..b94f581512 100644
--- a/resources/lang/fr_FR/breadcrumbs.php
+++ b/resources/lang/fr_FR/breadcrumbs.php
@@ -40,5 +40,5 @@ return [
     'createTag'           => 'Créer un nouveau tag',
     'edit_tag'            => 'Éditer le tag ":tag"',
     'delete_tag'          => 'Supprimer le tag ":tag"',
-    'delete_journal_link' => 'Delete link between transactions',
-];
\ No newline at end of file
+    'delete_journal_link' => 'Supprimer le lien entre les transactions',
+];

From d65d555d635ab05f92202205452856957e6c038d Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sat, 2 Sep 2017 22:00:15 +0200
Subject: [PATCH 451/668] New translations intro.php (French)

---
 resources/lang/fr_FR/intro.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/fr_FR/intro.php b/resources/lang/fr_FR/intro.php
index 17942161b6..0999619431 100644
--- a/resources/lang/fr_FR/intro.php
+++ b/resources/lang/fr_FR/intro.php
@@ -11,7 +11,7 @@ declare(strict_types=1);
 
 return [
     // index
-    'index_intro'                           => 'Welcome to the index page of Firefly III. Please take the time to walk through this intro to get a feeling of how Firefly III works.',
+    'index_intro'                           => 'Bienvenue sur la page index de Firefly III. Veuillez prendre le temps de parcourir l\'introduction pour comprendre comment Firefly III fonctionne.',
     'index_accounts-chart'                  => 'This chart shows the current balance of your asset accounts. You can select the accounts visible here in your preferences.',
     'index_box_out_holder'                  => 'This little box and the boxes next to this one will give you a quick overview of your financial situation.',
     'index_help'                            => 'If you ever need help with a page or a form, press this button.',

From df8207bd9fe9c71d4208cf2febedc99e9231f3ee Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sat, 2 Sep 2017 22:00:18 +0200
Subject: [PATCH 452/668] New translations firefly.php (French)

---
 resources/lang/fr_FR/firefly.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/resources/lang/fr_FR/firefly.php b/resources/lang/fr_FR/firefly.php
index 356f02ac77..32eafb312a 100644
--- a/resources/lang/fr_FR/firefly.php
+++ b/resources/lang/fr_FR/firefly.php
@@ -310,8 +310,8 @@ return [
     'no_location_set'                            => 'Aucun emplacement défini.',
     'meta_data'                                  => 'Meta-données',
     'location'                                   => 'Emplacement',
-    'without_date'                               => 'Without date',
-    'result'                                     => 'Result',
+    'without_date'                               => 'Sans date',
+    'result'                                     => 'Résultat',
 
     // preferences
     'pref_home_screen_accounts'                  => 'Comptes de l’écran d’accueil',
@@ -866,11 +866,11 @@ return [
     'setting_is_demo_site'                  => 'Site de démonstration',
     'setting_is_demo_site_explain'          => 'Si vous cochez cette case, cette installation se comportera comme si c\'était le site de démonstration, ce qui peut engendrer des effets secondaires étranges.',
     'block_code_bounced'                    => 'Email message(s) bounced',
-    'block_code_expired'                    => 'Demo account expired',
-    'no_block_code'                         => 'No reason for block or user not blocked',
+    'block_code_expired'                    => 'Compte démo expiré',
+    'no_block_code'                         => 'Aucune raison pour le blocage ou utilisateur non bloqué',
     // links
-    'journal_link_configuration'            => 'Transaction links configuration',
-    'create_new_link_type'                  => 'Create new link type',
+    'journal_link_configuration'            => 'Configuration des liens de transaction',
+    'create_new_link_type'                  => 'Créer un nouveau type de lien',
     'store_new_link_type'                   => 'Store new link type',
     'update_link_type'                      => 'Update link type',
     'edit_link_type'                        => 'Edit link type ":name"',
@@ -887,7 +887,7 @@ return [
     'link_transaction'                      => 'Link transaction',
     'link_to_other_transaction'             => 'Link this transaction to another transaction',
     'select_transaction_to_link'            => 'Select a transaction to link this transaction to',
-    'this_transaction'                      => 'This transaction',
+    'this_transaction'                      => 'Cette transaction',
     'transaction'                           => 'Transaction',
     'comments'                              => 'Comments',
     'to_link_not_found'                     => 'If the transaction you want to link to is not listed, simply enter its ID.',
@@ -1019,4 +1019,4 @@ return [
     'no_bills_create_default'               => 'Create a bill',
 
 
-];
\ No newline at end of file
+];

From cf0e0896169dc97bfce93ed56381dee6fa8a45e8 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sat, 2 Sep 2017 22:10:14 +0200
Subject: [PATCH 453/668] New translations firefly.php (French)

---
 resources/lang/fr_FR/firefly.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/resources/lang/fr_FR/firefly.php b/resources/lang/fr_FR/firefly.php
index 32eafb312a..f63e446690 100644
--- a/resources/lang/fr_FR/firefly.php
+++ b/resources/lang/fr_FR/firefly.php
@@ -889,11 +889,11 @@ return [
     'select_transaction_to_link'            => 'Select a transaction to link this transaction to',
     'this_transaction'                      => 'Cette transaction',
     'transaction'                           => 'Transaction',
-    'comments'                              => 'Comments',
+    'comments'                              => 'Commentaires',
     'to_link_not_found'                     => 'If the transaction you want to link to is not listed, simply enter its ID.',
     'invalid_link_data'                     => 'Invalid link type selected. Cannot link transaction.',
-    'journals_linked'                       => 'Transactions are linked.',
-    'journals_error_linked'                 => 'These transactions are already linked.',
+    'journals_linked'                       => 'Ces transactions sont liées.',
+    'journals_error_linked'                 => 'Ces transactions sont déjà liées.',
     'journal_links'                         => 'Transaction links',
     'this_withdrawal'                       => 'This withdrawal',
     'this_deposit'                          => 'This deposit',
@@ -926,14 +926,14 @@ return [
 
     // import bread crumbs and titles:
     'import'                                => 'Import',
-    'import_data'                           => 'Import data',
+    'import_data'                           => 'Importer des données',
 
     // import index page:
-    'import_index_title'                    => 'Import data into Firefly III',
+    'import_index_title'                    => 'Importer des données dans Firefly III',
     'import_index_sub_title'                => 'Index',
     'import_general_index_intro'            => 'Welcome to Firefly\'s import routine. There are a few ways of importing data into Firefly III, displayed here as buttons.',
     'import_index_intro'                    => 'This routine will help you import files from your bank into Firefly III. Please check out the help pages in the top right corner.',
-    'import_index_file'                     => 'Select your file',
+    'import_index_file'                     => 'Sélectionnez votre fichier',
     'import_index_config'                   => 'If you have previously imported data into Firefly III, you may have a configuration file, which will pre-set configuration values for you. For some banks, other users have kindly provided their <a href="https://github.com/firefly-iii/import-configurations/wiki">configuration file</a>.',
     'import_index_type'                     => 'Select the type of file you will upload',
     'import_index_start'                    => 'Start importing',
@@ -996,7 +996,7 @@ return [
     'no_tags_title_default'                 => 'Let\'s create a tag!',
     'no_tags_intro_default'                 => 'You have no tags yet. Tags are used to fine tune your transactions and label them with specific keywords.',
     'no_tags_imperative_default'            => 'Tags are created automatically when you create transactions, but you can create one manually too. Let\'s create one now:',
-    'no_tags_create_default'                => 'Create a tag',
+    'no_tags_create_default'                => 'Créer une étiquette',
     'no_transactions_title_withdrawal'      => 'Let\'s create an expense!',
     'no_transactions_intro_withdrawal'      => 'You have no expenses yet. You should create expenses to start managing your finances.',
     'no_transactions_imperative_withdrawal' => 'Have you spent some money? Then you should write it down:',

From 2a2a18f378c5206dfde4d5385e3e3c5d46b42d0e Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Sun, 3 Sep 2017 10:09:10 +0200
Subject: [PATCH 454/668] Add new triggers

---
 config/firefly.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/config/firefly.php b/config/firefly.php
index 2ecb8a3782..2d9364a054 100644
--- a/config/firefly.php
+++ b/config/firefly.php
@@ -194,6 +194,12 @@ return [
         'budget_is'             => 'FireflyIII\Rules\Triggers\BudgetIs',
         'tag_is'                => 'FireflyIII\Rules\Triggers\TagIs',
         'has_attachments'       => 'FireflyIII\Rules\Triggers\HasAttachment',
+        'has_no_category'       => 'FireflyIII\Rules\Triggers\HasNoCategory',
+        'has_any_category'      => 'FireflyIII\Rules\Triggers\HasAnyCategory',
+        'has_no_budget'         => 'FireflyIII\Rules\Triggers\HasNoBudget',
+        'has_any_budget'        => 'FireflyIII\Rules\Triggers\HasAnyBudget',
+        'has_no_tag'            => 'FireflyIII\Rules\Triggers\HasNoTag',
+        'has_any_tag'           => 'FireflyIII\Rules\Triggers\HasAnyTag',
     ],
     'rule-actions'               => [
         'set_category'        => 'FireflyIII\Rules\Actions\SetCategory',

From 523824225e7b5120ba1b598376cdbce481463a80 Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Sun, 3 Sep 2017 10:09:27 +0200
Subject: [PATCH 455/668] Fix test coverage

---
 tests/Feature/Controllers/BudgetControllerTest.php | 2 +-
 tests/Feature/Controllers/HelpControllerTest.php   | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/tests/Feature/Controllers/BudgetControllerTest.php b/tests/Feature/Controllers/BudgetControllerTest.php
index 24bb163aed..a345f04790 100644
--- a/tests/Feature/Controllers/BudgetControllerTest.php
+++ b/tests/Feature/Controllers/BudgetControllerTest.php
@@ -373,7 +373,7 @@ class BudgetControllerTest extends TestCase
         $journalRepos->shouldReceive('first')->once()->andReturn(new TransactionJournal);
         $repository->shouldReceive('setAvailableBudget');
 
-        $data = ['amount' => '200',];
+        $data = ['amount' => '200','start' => '2017-01-01','end' => '2017-01-31'];
         $this->be($this->user());
         $response = $this->post(route('budgets.income.post'), $data);
         $response->assertStatus(302);
diff --git a/tests/Feature/Controllers/HelpControllerTest.php b/tests/Feature/Controllers/HelpControllerTest.php
index 572a6a0112..eeb35a1de4 100644
--- a/tests/Feature/Controllers/HelpControllerTest.php
+++ b/tests/Feature/Controllers/HelpControllerTest.php
@@ -28,6 +28,7 @@ class HelpControllerTest extends TestCase
 
     /**
      * @covers \FireflyIII\Http\Controllers\HelpController::show
+     * @covers \FireflyIII\Http\Controllers\HelpController::getHelpText
      * @covers \FireflyIII\Http\Controllers\HelpController::__construct
      */
     public function testShow()
@@ -46,6 +47,7 @@ class HelpControllerTest extends TestCase
 
     /**
      * @covers \FireflyIII\Http\Controllers\HelpController::show
+     * @covers \FireflyIII\Http\Controllers\HelpController::getHelpText
      */
     public function testShowBackupFromCache()
     {
@@ -74,6 +76,7 @@ class HelpControllerTest extends TestCase
 
     /**
      * @covers \FireflyIII\Http\Controllers\HelpController::show
+     * @covers \FireflyIII\Http\Controllers\HelpController::getHelpText
      */
     public function testShowBackupFromGithub()
     {
@@ -102,6 +105,7 @@ class HelpControllerTest extends TestCase
 
     /**
      * @covers \FireflyIII\Http\Controllers\HelpController::show
+     * @covers \FireflyIII\Http\Controllers\HelpController::getHelpText
      */
     public function testShowCached()
     {
@@ -118,6 +122,7 @@ class HelpControllerTest extends TestCase
 
     /**
      * @covers \FireflyIII\Http\Controllers\HelpController::show
+     * @covers \FireflyIII\Http\Controllers\HelpController::getHelpText
      */
     public function testShowNoRoute()
     {

From aed5ef3fba66d7396ef4b2338b5110dbe2c95a8a Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Sun, 3 Sep 2017 10:16:45 +0200
Subject: [PATCH 456/668] Sort triggers and actions

---
 app/Http/Controllers/JsonController.php | 1 +
 app/Support/Twig/Rule.php               | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/app/Http/Controllers/JsonController.php b/app/Http/Controllers/JsonController.php
index f9162ed690..4805e620eb 100644
--- a/app/Http/Controllers/JsonController.php
+++ b/app/Http/Controllers/JsonController.php
@@ -240,6 +240,7 @@ class JsonController extends Controller
                 $triggers[$key] = trans('firefly.rule_trigger_' . $key . '_choice');
             }
         }
+        asort($triggers);
 
         $view = view('rules.partials.trigger', compact('triggers', 'count'))->render();
 
diff --git a/app/Support/Twig/Rule.php b/app/Support/Twig/Rule.php
index 9924e6f7a0..42efe5a2b6 100644
--- a/app/Support/Twig/Rule.php
+++ b/app/Support/Twig/Rule.php
@@ -39,6 +39,7 @@ class Rule extends Twig_Extension
                 $possibleActions[$key] = trans('firefly.rule_action_' . $key . '_choice');
             }
             unset($key, $ruleActions);
+            asort($possibleActions);
 
             return $possibleActions;
         }
@@ -75,6 +76,7 @@ class Rule extends Twig_Extension
                 }
             }
             unset($key, $ruleTriggers);
+            asort($possibleTriggers);
 
             return $possibleTriggers;
         }

From c87d7458fc2796cf6c67395ccaaea39fee169d71 Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Sun, 3 Sep 2017 10:16:53 +0200
Subject: [PATCH 457/668] New lines for triggers.

---
 resources/lang/en_US/firefly.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/resources/lang/en_US/firefly.php b/resources/lang/en_US/firefly.php
index 73f0f9434e..b7043932f7 100644
--- a/resources/lang/en_US/firefly.php
+++ b/resources/lang/en_US/firefly.php
@@ -279,6 +279,12 @@ return [
     'rule_trigger_has_attachments'               => 'Has at least :trigger_value attachment(s)',
     'rule_trigger_store_journal'                 => 'When a transaction is created',
     'rule_trigger_update_journal'                => 'When a transaction is updated',
+    'rule_trigger_has_no_category_choice'        => 'Has no category',
+    'rule_trigger_has_any_category_choice'       => 'Has a (any) category',
+    'rule_trigger_has_no_budget_choice'          => 'Has no budget',
+    'rule_trigger_has_any_budget_choice'         => 'Has a (any) budget',
+    'rule_trigger_has_no_tag_choice'             => 'Has no tag(s)',
+    'rule_trigger_has_any_tag_choice'            => 'Has one or more (any) tags',
     'rule_action_set_category'                   => 'Set category to ":action_value"',
     'rule_action_clear_category'                 => 'Clear category',
     'rule_action_set_budget'                     => 'Set budget to ":action_value"',

From b9f6119c68e8e4c7d9eca1aac6bfaf0f32aa09d2 Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Sun, 3 Sep 2017 10:38:41 +0200
Subject: [PATCH 458/668] Fix rule title.

---
 app/Http/Requests/RuleFormRequest.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Http/Requests/RuleFormRequest.php b/app/Http/Requests/RuleFormRequest.php
index 8206b53264..0a062a3c44 100644
--- a/app/Http/Requests/RuleFormRequest.php
+++ b/app/Http/Requests/RuleFormRequest.php
@@ -65,9 +65,9 @@ class RuleFormRequest extends Request
         // some actions require text:
         $contextActions = join(',', config('firefly.rule-actions-text'));
 
-        $titleRule = 'required|between:1,100|uniqueObjectForUser:rule_groups,title';
+        $titleRule = 'required|between:1,100|uniqueObjectForUser:rules,title';
         if (!is_null($repository->find(intval($this->get('id')))->id)) {
-            $titleRule = 'required|between:1,100|uniqueObjectForUser:rule_groups,title,' . intval($this->get('id'));
+            $titleRule = 'required|between:1,100|uniqueObjectForUser:rules,title,' . intval($this->get('id'));
         }
 
         $rules = [

From 816b291ed3a990cf947ebbbc30ccf545edebe768 Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Sun, 3 Sep 2017 10:39:05 +0200
Subject: [PATCH 459/668] Code for #805

---
 app/Repositories/Rule/RuleRepository.php |  2 +-
 app/Rules/Triggers/HasAnyBudget.php      | 65 ++++++++++++++++++++++++
 app/Rules/Triggers/HasAnyCategory.php    | 65 ++++++++++++++++++++++++
 app/Rules/Triggers/HasAnyTag.php         | 65 ++++++++++++++++++++++++
 app/Rules/Triggers/HasNoBudget.php       | 65 ++++++++++++++++++++++++
 app/Rules/Triggers/HasNoCategory.php     | 65 ++++++++++++++++++++++++
 app/Rules/Triggers/HasNoTag.php          | 65 ++++++++++++++++++++++++
 public/js/ff/rules/create-edit.js        | 10 ++++
 resources/lang/en_US/firefly.php         | 56 +++++++++++---------
 9 files changed, 433 insertions(+), 25 deletions(-)
 create mode 100644 app/Rules/Triggers/HasAnyBudget.php
 create mode 100644 app/Rules/Triggers/HasAnyCategory.php
 create mode 100644 app/Rules/Triggers/HasAnyTag.php
 create mode 100644 app/Rules/Triggers/HasNoBudget.php
 create mode 100644 app/Rules/Triggers/HasNoCategory.php
 create mode 100644 app/Rules/Triggers/HasNoTag.php

diff --git a/app/Repositories/Rule/RuleRepository.php b/app/Repositories/Rule/RuleRepository.php
index 8d40076c71..6fa0a2b2c7 100644
--- a/app/Repositories/Rule/RuleRepository.php
+++ b/app/Repositories/Rule/RuleRepository.php
@@ -286,7 +286,7 @@ class RuleRepository implements RuleRepositoryInterface
         $ruleTrigger->active          = 1;
         $ruleTrigger->stop_processing = $values['stopProcessing'];
         $ruleTrigger->trigger_type    = $values['action'];
-        $ruleTrigger->trigger_value   = $values['value'];
+        $ruleTrigger->trigger_value   = is_null($values['value']) ? '' : $values['value'];
         $ruleTrigger->save();
 
         return $ruleTrigger;
diff --git a/app/Rules/Triggers/HasAnyBudget.php b/app/Rules/Triggers/HasAnyBudget.php
new file mode 100644
index 0000000000..74d77eab01
--- /dev/null
+++ b/app/Rules/Triggers/HasAnyBudget.php
@@ -0,0 +1,65 @@
+<?php
+/**
+ * HasAnyBudget.php
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Rules\Triggers;
+
+use FireflyIII\Models\TransactionJournal;
+use Log;
+
+/**
+ * Class HasAnyBudget
+ *
+ * @package FireflyIII\Rules\Triggers
+ */
+final class HasAnyBudget extends AbstractTrigger implements TriggerInterface
+{
+
+    /**
+     * A trigger is said to "match anything", or match any given transaction,
+     * when the trigger value is very vague or has no restrictions. Easy examples
+     * are the "AmountMore"-trigger combined with an amount of 0: any given transaction
+     * has an amount of more than zero! Other examples are all the "Description"-triggers
+     * which have hard time handling empty trigger values such as "" or "*" (wild cards).
+     *
+     * If the user tries to create such a trigger, this method MUST return true so Firefly III
+     * can stop the storing / updating the trigger. If the trigger is in any way restrictive
+     * (even if it will still include 99.9% of the users transactions), this method MUST return
+     * false.
+     *
+     * @param null $value
+     *
+     * @return bool
+     */
+    public static function willMatchEverything($value = null)
+    {
+        return false;
+    }
+
+    /**
+     * @param TransactionJournal $journal
+     *
+     * @return bool
+     */
+    public function triggered(TransactionJournal $journal): bool
+    {
+        $count = $journal->budgets()->count();
+        if ($count > 0) {
+            Log::debug(sprintf('RuleTrigger HasAnyBudget for journal #%d: count is %d, return true.', $journal->id, $count));
+
+            return true;
+        }
+        Log::debug(sprintf('RuleTrigger HasAnyBudget for journal #%d: count is %d, return false.', $journal->id, $count));
+
+        return false;
+
+    }
+}
diff --git a/app/Rules/Triggers/HasAnyCategory.php b/app/Rules/Triggers/HasAnyCategory.php
new file mode 100644
index 0000000000..c7902e0e95
--- /dev/null
+++ b/app/Rules/Triggers/HasAnyCategory.php
@@ -0,0 +1,65 @@
+<?php
+/**
+ * HasAnyCategory.php
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Rules\Triggers;
+
+use FireflyIII\Models\TransactionJournal;
+use Log;
+
+/**
+ * Class HasAnyCategory
+ *
+ * @package FireflyIII\Rules\Triggers
+ */
+final class HasAnyCategory extends AbstractTrigger implements TriggerInterface
+{
+
+    /**
+     * A trigger is said to "match anything", or match any given transaction,
+     * when the trigger value is very vague or has no restrictions. Easy examples
+     * are the "AmountMore"-trigger combined with an amount of 0: any given transaction
+     * has an amount of more than zero! Other examples are all the "Description"-triggers
+     * which have hard time handling empty trigger values such as "" or "*" (wild cards).
+     *
+     * If the user tries to create such a trigger, this method MUST return true so Firefly III
+     * can stop the storing / updating the trigger. If the trigger is in any way restrictive
+     * (even if it will still include 99.9% of the users transactions), this method MUST return
+     * false.
+     *
+     * @param null $value
+     *
+     * @return bool
+     */
+    public static function willMatchEverything($value = null)
+    {
+        return false;
+    }
+
+    /**
+     * @param TransactionJournal $journal
+     *
+     * @return bool
+     */
+    public function triggered(TransactionJournal $journal): bool
+    {
+        $count = $journal->categories()->count();
+        if ($count > 0) {
+            Log::debug(sprintf('RuleTrigger HasAnyCategory for journal #%d: count is %d, return true.', $journal->id, $count));
+
+            return true;
+        }
+        Log::debug(sprintf('RuleTrigger HasAnyCategory for journal #%d: count is %d, return false.', $journal->id, $count));
+
+        return false;
+
+    }
+}
diff --git a/app/Rules/Triggers/HasAnyTag.php b/app/Rules/Triggers/HasAnyTag.php
new file mode 100644
index 0000000000..a7e2ecd5bd
--- /dev/null
+++ b/app/Rules/Triggers/HasAnyTag.php
@@ -0,0 +1,65 @@
+<?php
+/**
+ * HasAnyTag.php
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Rules\Triggers;
+
+use FireflyIII\Models\TransactionJournal;
+use Log;
+
+/**
+ * Class HasAnyTag
+ *
+ * @package FireflyIII\Rules\Triggers
+ */
+final class HasAnyTag extends AbstractTrigger implements TriggerInterface
+{
+
+    /**
+     * A trigger is said to "match anything", or match any given transaction,
+     * when the trigger value is very vague or has no restrictions. Easy examples
+     * are the "AmountMore"-trigger combined with an amount of 0: any given transaction
+     * has an amount of more than zero! Other examples are all the "Description"-triggers
+     * which have hard time handling empty trigger values such as "" or "*" (wild cards).
+     *
+     * If the user tries to create such a trigger, this method MUST return true so Firefly III
+     * can stop the storing / updating the trigger. If the trigger is in any way restrictive
+     * (even if it will still include 99.9% of the users transactions), this method MUST return
+     * false.
+     *
+     * @param null $value
+     *
+     * @return bool
+     */
+    public static function willMatchEverything($value = null)
+    {
+        return false;
+    }
+
+    /**
+     * @param TransactionJournal $journal
+     *
+     * @return bool
+     */
+    public function triggered(TransactionJournal $journal): bool
+    {
+        $count = $journal->tags()->count();
+        if ($count > 0) {
+            Log::debug(sprintf('RuleTrigger HasAnyTag for journal #%d: count is %d, return true.', $journal->id, $count));
+
+            return true;
+        }
+        Log::debug(sprintf('RuleTrigger HasAnyTag for journal #%d: count is %d, return false.', $journal->id, $count));
+
+        return false;
+
+    }
+}
diff --git a/app/Rules/Triggers/HasNoBudget.php b/app/Rules/Triggers/HasNoBudget.php
new file mode 100644
index 0000000000..9df4143805
--- /dev/null
+++ b/app/Rules/Triggers/HasNoBudget.php
@@ -0,0 +1,65 @@
+<?php
+/**
+ * HasNoBudget.php
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Rules\Triggers;
+
+use FireflyIII\Models\TransactionJournal;
+use Log;
+
+/**
+ * Class HasNoBudget
+ *
+ * @package FireflyIII\Rules\Triggers
+ */
+final class HasNoBudget extends AbstractTrigger implements TriggerInterface
+{
+
+    /**
+     * A trigger is said to "match anything", or match any given transaction,
+     * when the trigger value is very vague or has no restrictions. Easy examples
+     * are the "AmountMore"-trigger combined with an amount of 0: any given transaction
+     * has an amount of more than zero! Other examples are all the "Description"-triggers
+     * which have hard time handling empty trigger values such as "" or "*" (wild cards).
+     *
+     * If the user tries to create such a trigger, this method MUST return true so Firefly III
+     * can stop the storing / updating the trigger. If the trigger is in any way restrictive
+     * (even if it will still include 99.9% of the users transactions), this method MUST return
+     * false.
+     *
+     * @param null $value
+     *
+     * @return bool
+     */
+    public static function willMatchEverything($value = null)
+    {
+        return false;
+    }
+
+    /**
+     * @param TransactionJournal $journal
+     *
+     * @return bool
+     */
+    public function triggered(TransactionJournal $journal): bool
+    {
+        $count = $journal->budgets()->count();
+        if ($count === 0) {
+            Log::debug(sprintf('RuleTrigger HasNoBudget for journal #%d: count is %d, return true.', $journal->id, $count));
+
+            return true;
+        }
+        Log::debug(sprintf('RuleTrigger HasNoBudget for journal #%d: count is %d, return false.', $journal->id, $count));
+
+        return false;
+
+    }
+}
diff --git a/app/Rules/Triggers/HasNoCategory.php b/app/Rules/Triggers/HasNoCategory.php
new file mode 100644
index 0000000000..4f6e367b30
--- /dev/null
+++ b/app/Rules/Triggers/HasNoCategory.php
@@ -0,0 +1,65 @@
+<?php
+/**
+ * HasNoCategory.php
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Rules\Triggers;
+
+use FireflyIII\Models\TransactionJournal;
+use Log;
+
+/**
+ * Class HasNoCategory
+ *
+ * @package FireflyIII\Rules\Triggers
+ */
+final class HasNoCategory extends AbstractTrigger implements TriggerInterface
+{
+
+    /**
+     * A trigger is said to "match anything", or match any given transaction,
+     * when the trigger value is very vague or has no restrictions. Easy examples
+     * are the "AmountMore"-trigger combined with an amount of 0: any given transaction
+     * has an amount of more than zero! Other examples are all the "Description"-triggers
+     * which have hard time handling empty trigger values such as "" or "*" (wild cards).
+     *
+     * If the user tries to create such a trigger, this method MUST return true so Firefly III
+     * can stop the storing / updating the trigger. If the trigger is in any way restrictive
+     * (even if it will still include 99.9% of the users transactions), this method MUST return
+     * false.
+     *
+     * @param null $value
+     *
+     * @return bool
+     */
+    public static function willMatchEverything($value = null)
+    {
+        return false;
+    }
+
+    /**
+     * @param TransactionJournal $journal
+     *
+     * @return bool
+     */
+    public function triggered(TransactionJournal $journal): bool
+    {
+        $count = $journal->categories()->count();
+        if ($count === 0) {
+            Log::debug(sprintf('RuleTrigger HasNoCategory for journal #%d: count is %d, return true.', $journal->id, $count));
+
+            return true;
+        }
+        Log::debug(sprintf('RuleTrigger HasNoCategory for journal #%d: count is %d, return false.', $journal->id, $count));
+
+        return false;
+
+    }
+}
diff --git a/app/Rules/Triggers/HasNoTag.php b/app/Rules/Triggers/HasNoTag.php
new file mode 100644
index 0000000000..813aaf82ff
--- /dev/null
+++ b/app/Rules/Triggers/HasNoTag.php
@@ -0,0 +1,65 @@
+<?php
+/**
+ * HasNoTag.php
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Rules\Triggers;
+
+use FireflyIII\Models\TransactionJournal;
+use Log;
+
+/**
+ * Class HasNoTag
+ *
+ * @package FireflyIII\Rules\Triggers
+ */
+final class HasNoTag extends AbstractTrigger implements TriggerInterface
+{
+
+    /**
+     * A trigger is said to "match anything", or match any given transaction,
+     * when the trigger value is very vague or has no restrictions. Easy examples
+     * are the "AmountMore"-trigger combined with an amount of 0: any given transaction
+     * has an amount of more than zero! Other examples are all the "Description"-triggers
+     * which have hard time handling empty trigger values such as "" or "*" (wild cards).
+     *
+     * If the user tries to create such a trigger, this method MUST return true so Firefly III
+     * can stop the storing / updating the trigger. If the trigger is in any way restrictive
+     * (even if it will still include 99.9% of the users transactions), this method MUST return
+     * false.
+     *
+     * @param null $value
+     *
+     * @return bool
+     */
+    public static function willMatchEverything($value = null)
+    {
+        return false;
+    }
+
+    /**
+     * @param TransactionJournal $journal
+     *
+     * @return bool
+     */
+    public function triggered(TransactionJournal $journal): bool
+    {
+        $count = $journal->tags()->count();
+        if ($count === 0) {
+            Log::debug(sprintf('RuleTrigger HasNoTag for journal #%d: count is %d, return true.', $journal->id, $count));
+
+            return true;
+        }
+        Log::debug(sprintf('RuleTrigger HasNoTag for journal #%d: count is %d, return false.', $journal->id, $count));
+
+        return false;
+
+    }
+}
diff --git a/public/js/ff/rules/create-edit.js b/public/js/ff/rules/create-edit.js
index 3b8e871e04..24407d3987 100644
--- a/public/js/ff/rules/create-edit.js
+++ b/public/js/ff/rules/create-edit.js
@@ -229,6 +229,7 @@ function updateTriggerInput(selectList) {
     var parent = selectList.parent().parent();
     // the text input we're looking for:
     var input = parent.find('input[name^="rule-trigger-value["]');
+    input.prop('disabled', false);
     switch (selectList.val()) {
         case 'from_account_starts':
         case 'from_account_ends':
@@ -259,6 +260,15 @@ function updateTriggerInput(selectList) {
         case 'description_is':
             createAutoComplete(input, 'json/transaction-journals/all');
             break;
+        case 'has_no_category':
+        case 'has_any_category':
+        case 'has_no_budget':
+        case 'has_any_budget':
+        case 'has_no_tag':
+        case 'has_any_tag':
+            input.prop('disabled', true);
+            input.typeahead('destroy');
+            break;
         default:
             input.typeahead('destroy');
             break;
diff --git a/resources/lang/en_US/firefly.php b/resources/lang/en_US/firefly.php
index b7043932f7..133d3bb168 100644
--- a/resources/lang/en_US/firefly.php
+++ b/resources/lang/en_US/firefly.php
@@ -239,52 +239,60 @@ return [
 
     // actions and triggers
     'rule_trigger_user_action'                   => 'User action is ":trigger_value"',
-    'rule_trigger_from_account_starts'           => 'Source account starts with ":trigger_value"',
-    'rule_trigger_from_account_ends'             => 'Source account ends with ":trigger_value"',
-    'rule_trigger_from_account_is'               => 'Source account is ":trigger_value"',
-    'rule_trigger_from_account_contains'         => 'Source account contains ":trigger_value"',
-    'rule_trigger_to_account_starts'             => 'Destination account starts with ":trigger_value"',
-    'rule_trigger_to_account_ends'               => 'Destination account ends with ":trigger_value"',
-    'rule_trigger_to_account_is'                 => 'Destination account is ":trigger_value"',
-    'rule_trigger_to_account_contains'           => 'Destination account contains ":trigger_value"',
-    'rule_trigger_transaction_type'              => 'Transaction is of type ":trigger_value"',
-    'rule_trigger_category_is'                   => 'Category is ":trigger_value"',
-    'rule_trigger_amount_less'                   => 'Amount is less than :trigger_value',
-    'rule_trigger_amount_exactly'                => 'Amount is :trigger_value',
-    'rule_trigger_amount_more'                   => 'Amount is more than :trigger_value',
-    'rule_trigger_description_starts'            => 'Description starts with ":trigger_value"',
-    'rule_trigger_description_ends'              => 'Description ends with ":trigger_value"',
-    'rule_trigger_description_contains'          => 'Description contains ":trigger_value"',
-    'rule_trigger_description_is'                => 'Description is ":trigger_value"',
     'rule_trigger_from_account_starts_choice'    => 'Source account starts with..',
+    'rule_trigger_from_account_starts'           => 'Source account starts with ":trigger_value"',
     'rule_trigger_from_account_ends_choice'      => 'Source account ends with..',
+    'rule_trigger_from_account_ends'             => 'Source account ends with ":trigger_value"',
     'rule_trigger_from_account_is_choice'        => 'Source account is..',
+    'rule_trigger_from_account_is'               => 'Source account is ":trigger_value"',
     'rule_trigger_from_account_contains_choice'  => 'Source account contains..',
+    'rule_trigger_from_account_contains'         => 'Source account contains ":trigger_value"',
     'rule_trigger_to_account_starts_choice'      => 'Destination account starts with..',
+    'rule_trigger_to_account_starts'             => 'Destination account starts with ":trigger_value"',
     'rule_trigger_to_account_ends_choice'        => 'Destination account ends with..',
+    'rule_trigger_to_account_ends'               => 'Destination account ends with ":trigger_value"',
     'rule_trigger_to_account_is_choice'          => 'Destination account is..',
+    'rule_trigger_to_account_is'                 => 'Destination account is ":trigger_value"',
     'rule_trigger_to_account_contains_choice'    => 'Destination account contains..',
+    'rule_trigger_to_account_contains'           => 'Destination account contains ":trigger_value"',
     'rule_trigger_transaction_type_choice'       => 'Transaction is of type..',
-    'rule_trigger_amount_less_choice'            => 'Amount is less than..',
-    'rule_trigger_amount_exactly_choice'         => 'Amount is..',
-    'rule_trigger_amount_more_choice'            => 'Amount is more than..',
-    'rule_trigger_description_starts_choice'     => 'Description starts with..',
-    'rule_trigger_description_ends_choice'       => 'Description ends with..',
-    'rule_trigger_description_contains_choice'   => 'Description contains..',
-    'rule_trigger_description_is_choice'         => 'Description is..',
+    'rule_trigger_transaction_type'              => 'Transaction is of type ":trigger_value"',
     'rule_trigger_category_is_choice'            => 'Category is..',
+    'rule_trigger_category_is'                   => 'Category is ":trigger_value"',
+    'rule_trigger_amount_less_choice'            => 'Amount is less than..',
+    'rule_trigger_amount_less'                   => 'Amount is less than :trigger_value',
+    'rule_trigger_amount_exactly_choice'         => 'Amount is..',
+    'rule_trigger_amount_exactly'                => 'Amount is :trigger_value',
+    'rule_trigger_amount_more_choice'            => 'Amount is more than..',
+    'rule_trigger_amount_more'                   => 'Amount is more than :trigger_value',
+    'rule_trigger_description_starts_choice'     => 'Description starts with..',
+    'rule_trigger_description_starts'            => 'Description starts with ":trigger_value"',
+    'rule_trigger_description_ends_choice'       => 'Description ends with..',
+    'rule_trigger_description_ends'              => 'Description ends with ":trigger_value"',
+    'rule_trigger_description_contains_choice'   => 'Description contains..',
+    'rule_trigger_description_contains'          => 'Description contains ":trigger_value"',
+    'rule_trigger_description_is_choice'         => 'Description is..',
+    'rule_trigger_description_is'                => 'Description is ":trigger_value"',
     'rule_trigger_budget_is_choice'              => 'Budget is..',
+    'rule_trigger_budget_is'                     => 'Budget is ":trigger_value"',
     'rule_trigger_tag_is_choice'                 => '(A) tag is..',
+    'rule_trigger_tag_is'                        => 'A tag is ":trigger_value"',
     'rule_trigger_has_attachments_choice'        => 'Has at least this many attachments',
     'rule_trigger_has_attachments'               => 'Has at least :trigger_value attachment(s)',
     'rule_trigger_store_journal'                 => 'When a transaction is created',
     'rule_trigger_update_journal'                => 'When a transaction is updated',
     'rule_trigger_has_no_category_choice'        => 'Has no category',
+    'rule_trigger_has_no_category'               => 'Transaction has no category',
     'rule_trigger_has_any_category_choice'       => 'Has a (any) category',
+    'rule_trigger_has_any_category'              => 'Transaction has a (any) category',
     'rule_trigger_has_no_budget_choice'          => 'Has no budget',
+    'rule_trigger_has_no_budget'                 => 'Transaction has no budget',
     'rule_trigger_has_any_budget_choice'         => 'Has a (any) budget',
+    'rule_trigger_has_any_budget'                => 'Transaction has a (any) budget',
     'rule_trigger_has_no_tag_choice'             => 'Has no tag(s)',
+    'rule_trigger_has_no_tag'                    => 'Transaction has no tag(s)',
     'rule_trigger_has_any_tag_choice'            => 'Has one or more (any) tags',
+    'rule_trigger_has_any_tag'                   => 'Transaction has one or more (any) tags',
     'rule_action_set_category'                   => 'Set category to ":action_value"',
     'rule_action_clear_category'                 => 'Clear category',
     'rule_action_set_budget'                     => 'Set budget to ":action_value"',

From 71cb8fe038403dd290e6ed1b4ad068b95b1ad4af Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 10:40:10 +0200
Subject: [PATCH 460/668] New translations passwords.php (Spanish)

---
 resources/lang/es_ES/passwords.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/es_ES/passwords.php b/resources/lang/es_ES/passwords.php
index 851c0ebaf7..dc97a3f602 100644
--- a/resources/lang/es_ES/passwords.php
+++ b/resources/lang/es_ES/passwords.php
@@ -18,4 +18,4 @@ return [
     'sent'     => 'Te enviamos un correo con el link para reestablecer tu contraseña!',
     'reset'    => 'Tu contraseña fue reestablecida!',
     'blocked'  => 'Buen intento.',
-];
\ No newline at end of file
+];

From 491b3547b537fb557275e37af15d4b1cba778445 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 10:40:11 +0200
Subject: [PATCH 461/668] New translations validation.php (Dutch)

---
 resources/lang/nl_NL/validation.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/nl_NL/validation.php b/resources/lang/nl_NL/validation.php
index 043065ff1b..47e21e1802 100644
--- a/resources/lang/nl_NL/validation.php
+++ b/resources/lang/nl_NL/validation.php
@@ -91,4 +91,4 @@ return [
     'present'                        => 'Het :attribute veld moet aanwezig zijn.',
     'amount_zero'                    => 'Het totaalbedrag kan niet nul zijn',
     'secure_password'                => 'Dit is geen sterk wachtwoord. Probeer het nog een keer. Zie ook: https://goo.gl/NCh2tN',
-];
\ No newline at end of file
+];

From d29ebdbf2690ca1b3da46bb882c06ff4a15f9501 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 10:40:12 +0200
Subject: [PATCH 462/668] New translations passwords.php (Slovenian)

---
 resources/lang/sl_SI/passwords.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/sl_SI/passwords.php b/resources/lang/sl_SI/passwords.php
index 502ed29e20..5464c6a079 100644
--- a/resources/lang/sl_SI/passwords.php
+++ b/resources/lang/sl_SI/passwords.php
@@ -18,4 +18,4 @@ return [
     'sent'     => 'Poslali smo vam povezavo za ponastavitev gesla!',
     'reset'    => 'Vaše geslo je bilo ponastavljeno!',
     'blocked'  => 'Dober poskus...',
-];
\ No newline at end of file
+];

From ad2752a62c35251409e797e1e13d6d3554f73f8c Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 10:40:13 +0200
Subject: [PATCH 463/668] New translations passwords.php (Portuguese,
 Brazilian)

---
 resources/lang/pt_BR/passwords.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/pt_BR/passwords.php b/resources/lang/pt_BR/passwords.php
index c12bf24e16..a0e3322c53 100644
--- a/resources/lang/pt_BR/passwords.php
+++ b/resources/lang/pt_BR/passwords.php
@@ -18,4 +18,4 @@ return [
     'sent'     => 'Nós te enviamos um email com um link para trocar a senha!',
     'reset'    => 'Sua senha foi redefinida!',
     'blocked'  => 'Boa tentativa.',
-];
\ No newline at end of file
+];

From ce3478041af7ceb998669756aae1bbf3cec7f37c Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 10:40:15 +0200
Subject: [PATCH 464/668] New translations passwords.php (Polish)

---
 resources/lang/pl_PL/passwords.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/pl_PL/passwords.php b/resources/lang/pl_PL/passwords.php
index 248c68b5fd..519a6ccd14 100644
--- a/resources/lang/pl_PL/passwords.php
+++ b/resources/lang/pl_PL/passwords.php
@@ -18,4 +18,4 @@ return [
     'sent'     => 'Wysłaliśmy link do resetowania hasła na twój adres email!',
     'reset'    => 'Twoje hasło zostało zresetowane!',
     'blocked'  => 'Przynajmniej próbowałeś.',
-];
\ No newline at end of file
+];

From d31640734cdf9083fe38ddb3bedcf470d00bc9ee Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 10:40:16 +0200
Subject: [PATCH 465/668] New translations validation.php (French)

---
 resources/lang/fr_FR/validation.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/fr_FR/validation.php b/resources/lang/fr_FR/validation.php
index 6eacebc9f8..593409b980 100644
--- a/resources/lang/fr_FR/validation.php
+++ b/resources/lang/fr_FR/validation.php
@@ -91,4 +91,4 @@ return [
     'present'                        => 'Le champs :attribute doit être rempli.',
     'amount_zero'                    => 'Le montant total ne peut pas être zéro',
     'secure_password'                => 'Ce n’est pas un mot de passe sécurisé. S’il vous plaît essayer de nouveau. Pour plus d’informations, visitez https://goo.gl/NCh2tN',
-];
\ No newline at end of file
+];

From 1e3693101b2da1c0ddbd8b076956b8fa3473a819 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 10:40:17 +0200
Subject: [PATCH 466/668] New translations validation.php (German)

---
 resources/lang/de_DE/validation.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/de_DE/validation.php b/resources/lang/de_DE/validation.php
index b44eca6dfc..95fe9632b6 100644
--- a/resources/lang/de_DE/validation.php
+++ b/resources/lang/de_DE/validation.php
@@ -91,4 +91,4 @@ return [
     'present'                        => 'Das :attribute Feld muss vorhanden sein.',
     'amount_zero'                    => 'Der Gesamtbetrag darf nicht Null sein',
     'secure_password'                => 'Das ist kein sicheres Passwort. Bitte versuche es erneut. Weitere Informationen finden Sie unter https://goo.gl/NCh2tN',
-];
\ No newline at end of file
+];

From 7f747cd4ef2267f507697c4ed013ea84dfe0ad97 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 10:40:18 +0200
Subject: [PATCH 467/668] New translations validation.php (Spanish)

---
 resources/lang/es_ES/validation.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/es_ES/validation.php b/resources/lang/es_ES/validation.php
index cb5c33ed45..fdf2d902b0 100644
--- a/resources/lang/es_ES/validation.php
+++ b/resources/lang/es_ES/validation.php
@@ -91,4 +91,4 @@ return [
     'present'                        => 'El campo :attribute debe estar presente.',
     'amount_zero'                    => 'La cantidad total no puede ser cero',
     'secure_password'                => 'Esta contraseña no es segura. Por favor inténtalo de nuevo. Para más información, visita https://goo.gl/NCh2tN',
-];
\ No newline at end of file
+];

From 7667c0fa4ad4ff59585089ed76a6de58d8ca76e0 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 10:40:20 +0200
Subject: [PATCH 468/668] New translations demo.php (Dutch)

---
 resources/lang/nl_NL/demo.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/nl_NL/demo.php b/resources/lang/nl_NL/demo.php
index 91e456317f..01aa680497 100644
--- a/resources/lang/nl_NL/demo.php
+++ b/resources/lang/nl_NL/demo.php
@@ -23,4 +23,4 @@ return [
     'import-index'                   => 'Uiteraard kan je elk CSV bestand importeren in Firefly III ',
     'import-configure-security'      => 'Uit veiligheidsoverwegingen is je upload vervangen door een lokaal bestand.',
     'import-configure-configuration' => 'Deze configuratie is correct voor het lokale bestand.',
-];
\ No newline at end of file
+];

From dc21afe14a0e48dcbf86bed10f2268322c75b43f Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 10:40:21 +0200
Subject: [PATCH 469/668] New translations validation.php (Slovenian)

---
 resources/lang/sl_SI/validation.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/sl_SI/validation.php b/resources/lang/sl_SI/validation.php
index fff91fb426..66339e75dc 100644
--- a/resources/lang/sl_SI/validation.php
+++ b/resources/lang/sl_SI/validation.php
@@ -91,4 +91,4 @@ return [
     'present'                        => 'The :attribute field must be present.',
     'amount_zero'                    => 'The total amount cannot be zero',
     'secure_password'                => 'This is not a secure password. Please try again. For more information, visit https://goo.gl/NCh2tN',
-];
\ No newline at end of file
+];

From e46ef2f92c06ebad963156fb7f13abea29cb13c1 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 10:40:22 +0200
Subject: [PATCH 470/668] New translations validation.php (Portuguese,
 Brazilian)

---
 resources/lang/pt_BR/validation.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/pt_BR/validation.php b/resources/lang/pt_BR/validation.php
index ecf55dc8e6..5b7b263ccd 100644
--- a/resources/lang/pt_BR/validation.php
+++ b/resources/lang/pt_BR/validation.php
@@ -91,4 +91,4 @@ return [
     'present'                        => 'O campo :attribute deve estar presente.',
     'amount_zero'                    => 'A quantidade total não pode ser zero',
     'secure_password'                => 'This is not a secure password. Please try again. For more information, visit https://goo.gl/NCh2tN',
-];
\ No newline at end of file
+];

From 95098255523199535181742188b3702644bcb237 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 10:40:23 +0200
Subject: [PATCH 471/668] New translations validation.php (Polish)

---
 resources/lang/pl_PL/validation.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/pl_PL/validation.php b/resources/lang/pl_PL/validation.php
index 375a54465a..e4c573728d 100644
--- a/resources/lang/pl_PL/validation.php
+++ b/resources/lang/pl_PL/validation.php
@@ -91,4 +91,4 @@ return [
     'present'                        => 'Pole :attribute musi być obecne.',
     'amount_zero'                    => 'Całkowita kwota nie może być zerem',
     'secure_password'                => 'To nie jest bezpieczne hasło. Proszę spróbować ponownie. Aby uzyskać więcej informacji odwiedź https://goo.gl/NCh2tN',
-];
\ No newline at end of file
+];

From 15a13be329b25b461f1619dab0cd0dabcabd8172 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 10:40:24 +0200
Subject: [PATCH 472/668] New translations passwords.php (German)

---
 resources/lang/de_DE/passwords.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/de_DE/passwords.php b/resources/lang/de_DE/passwords.php
index 993adfee8f..272678f176 100644
--- a/resources/lang/de_DE/passwords.php
+++ b/resources/lang/de_DE/passwords.php
@@ -18,4 +18,4 @@ return [
     'sent'     => 'Wir haben Ihnen einen Link zum Zurücksetzen des Passworts zugesendet!',
     'reset'    => 'Ihr Passwort wurde zurückgesetzt!',
     'blocked'  => 'Netter Versuch.',
-];
\ No newline at end of file
+];

From 8037e4a4c4da582062bbf16176908dc93dce5e0e Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 10:40:26 +0200
Subject: [PATCH 473/668] New translations passwords.php (French)

---
 resources/lang/fr_FR/passwords.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/fr_FR/passwords.php b/resources/lang/fr_FR/passwords.php
index 72521478b3..e14a1018c8 100644
--- a/resources/lang/fr_FR/passwords.php
+++ b/resources/lang/fr_FR/passwords.php
@@ -18,4 +18,4 @@ return [
     'sent'     => 'Nous vous avons envoyé par e-mail un lien de réinitialisation de votre mot de passe !',
     'reset'    => 'Votre mot de passe a été réinitialisé !',
     'blocked'  => 'Bien essayé cependant.',
-];
\ No newline at end of file
+];

From 540c03670b259ad0e0adc0aa8e9b7cf6ce69926b Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 10:40:27 +0200
Subject: [PATCH 474/668] New translations pagination.php (Dutch)

---
 resources/lang/nl_NL/pagination.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/nl_NL/pagination.php b/resources/lang/nl_NL/pagination.php
index cb5dc72622..82de8727a0 100644
--- a/resources/lang/nl_NL/pagination.php
+++ b/resources/lang/nl_NL/pagination.php
@@ -16,4 +16,4 @@ return [
     'previous' => '&laquo; Vorige',
     'next'     => 'Volgende &raquo;',
 
-];
\ No newline at end of file
+];

From 46d3b7015442fc5547603748430ab903810f5a9a Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 10:40:28 +0200
Subject: [PATCH 475/668] New translations pagination.php (French)

---
 resources/lang/fr_FR/pagination.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/fr_FR/pagination.php b/resources/lang/fr_FR/pagination.php
index 1b9097ee0e..7d1b7f8bf6 100644
--- a/resources/lang/fr_FR/pagination.php
+++ b/resources/lang/fr_FR/pagination.php
@@ -16,4 +16,4 @@ return [
     'previous' => '&laquo; Précédent',
     'next'     => 'Suivant &raquo;',
 
-];
\ No newline at end of file
+];

From dd4995e02b7b82426abb20ebdba857e4ee2658ff Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 10:40:29 +0200
Subject: [PATCH 476/668] New translations list.php (Spanish)

---
 resources/lang/es_ES/list.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/es_ES/list.php b/resources/lang/es_ES/list.php
index dd936b736b..d4319f7d7e 100644
--- a/resources/lang/es_ES/list.php
+++ b/resources/lang/es_ES/list.php
@@ -90,4 +90,4 @@ return [
     'inward'                 => 'Descripción interna',
     'outward'                => 'Descripción externa',
     'number_of_transactions' => 'Número de transacciones',
-];
\ No newline at end of file
+];

From 70226a24c918b979dd9a38a4091c7126e76bac35 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 10:40:30 +0200
Subject: [PATCH 477/668] New translations list.php (Slovenian)

---
 resources/lang/sl_SI/list.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/sl_SI/list.php b/resources/lang/sl_SI/list.php
index 6cacf51aeb..898fa2e77c 100644
--- a/resources/lang/sl_SI/list.php
+++ b/resources/lang/sl_SI/list.php
@@ -90,4 +90,4 @@ return [
     'inward'                 => 'Inward description',
     'outward'                => 'Outward description',
     'number_of_transactions' => 'Number of transactions',
-];
\ No newline at end of file
+];

From bcd5b580cb47a0479593a1e41f9d15f3e814c15e Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 10:40:32 +0200
Subject: [PATCH 478/668] New translations list.php (Portuguese, Brazilian)

---
 resources/lang/pt_BR/list.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/pt_BR/list.php b/resources/lang/pt_BR/list.php
index e23268f310..a3a3d8d3df 100644
--- a/resources/lang/pt_BR/list.php
+++ b/resources/lang/pt_BR/list.php
@@ -90,4 +90,4 @@ return [
     'inward'                 => 'Inward description',
     'outward'                => 'Outward description',
     'number_of_transactions' => 'Number of transactions',
-];
\ No newline at end of file
+];

From 915321db61fefe7acc83b3ad9e828679df30321e Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 10:40:34 +0200
Subject: [PATCH 479/668] New translations pagination.php (German)

---
 resources/lang/de_DE/pagination.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/de_DE/pagination.php b/resources/lang/de_DE/pagination.php
index 245d3fd88b..93f901bbf6 100644
--- a/resources/lang/de_DE/pagination.php
+++ b/resources/lang/de_DE/pagination.php
@@ -16,4 +16,4 @@ return [
     'previous' => '&laquo; Vorherige',
     'next'     => 'Nächste &raquo;',
 
-];
\ No newline at end of file
+];

From 5ae49e8e3eeba75190d2c13d16113a725e3e96e5 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 10:40:35 +0200
Subject: [PATCH 480/668] New translations pagination.php (Polish)

---
 resources/lang/pl_PL/pagination.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/pl_PL/pagination.php b/resources/lang/pl_PL/pagination.php
index c240761f0f..478654dd97 100644
--- a/resources/lang/pl_PL/pagination.php
+++ b/resources/lang/pl_PL/pagination.php
@@ -16,4 +16,4 @@ return [
     'previous' => '&laquo; Poprzednia',
     'next'     => 'Następna &raquo;',
 
-];
\ No newline at end of file
+];

From 3a4869205d9222e4f380a3edc4a93e4fdcda52d9 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 10:40:36 +0200
Subject: [PATCH 481/668] New translations passwords.php (Dutch)

---
 resources/lang/nl_NL/passwords.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/nl_NL/passwords.php b/resources/lang/nl_NL/passwords.php
index ff60efa891..83ed725b7d 100644
--- a/resources/lang/nl_NL/passwords.php
+++ b/resources/lang/nl_NL/passwords.php
@@ -18,4 +18,4 @@ return [
     'sent'     => 'Je krijgt een mailtje met een linkje om je wachtwoord te herstellen!',
     'reset'    => 'Je wachtwoord is hersteld!',
     'blocked'  => 'Leuk geprobeerd wel.',
-];
\ No newline at end of file
+];

From 522d99477cea6b5fc8bc18f8a1514d2270fd3b11 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 10:40:37 +0200
Subject: [PATCH 482/668] New translations pagination.php (Spanish)

---
 resources/lang/es_ES/pagination.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/es_ES/pagination.php b/resources/lang/es_ES/pagination.php
index da56bb0d58..db77bd210e 100644
--- a/resources/lang/es_ES/pagination.php
+++ b/resources/lang/es_ES/pagination.php
@@ -16,4 +16,4 @@ return [
     'previous' => '&laquo; Anterior',
     'next'     => 'Siguiente &raquo;',
 
-];
\ No newline at end of file
+];

From a66541fd047fce055947d70f775906ce5b7e6b25 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 10:40:38 +0200
Subject: [PATCH 483/668] New translations pagination.php (Slovenian)

---
 resources/lang/sl_SI/pagination.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/sl_SI/pagination.php b/resources/lang/sl_SI/pagination.php
index 195d2fe50f..6ad8ba1520 100644
--- a/resources/lang/sl_SI/pagination.php
+++ b/resources/lang/sl_SI/pagination.php
@@ -16,4 +16,4 @@ return [
     'previous' => '&laquo; Prejšnja stran',
     'next'     => 'Naslednja stran &raquo;',
 
-];
\ No newline at end of file
+];

From 7502497827fd15aba2488017c7b2e9ef124da5a6 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 10:40:40 +0200
Subject: [PATCH 484/668] New translations pagination.php (Portuguese,
 Brazilian)

---
 resources/lang/pt_BR/pagination.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/pt_BR/pagination.php b/resources/lang/pt_BR/pagination.php
index b6069c775d..12485a0c33 100644
--- a/resources/lang/pt_BR/pagination.php
+++ b/resources/lang/pt_BR/pagination.php
@@ -16,4 +16,4 @@ return [
     'previous' => '&laquo; Anterior',
     'next'     => 'Próximo &raquo;',
 
-];
\ No newline at end of file
+];

From eae3bf4d0e9c4ce80c1799531999738a9abe1ed8 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 10:40:42 +0200
Subject: [PATCH 485/668] New translations demo.php (French)

---
 resources/lang/fr_FR/demo.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/fr_FR/demo.php b/resources/lang/fr_FR/demo.php
index 8b376c17a2..fbb7aaa450 100644
--- a/resources/lang/fr_FR/demo.php
+++ b/resources/lang/fr_FR/demo.php
@@ -23,4 +23,4 @@ return [
     'import-index'                   => 'Bien sûr, n’importe quel fichier CSV peut être importé dans Firefly III ',
     'import-configure-security'      => 'Pour des raisons de sécurité, votre téléchargement a été remplacé par un fichier local.',
     'import-configure-configuration' => 'La configuration que vous voyez ci-dessous est correcte pour le fichier local.',
-];
\ No newline at end of file
+];

From 1cbe63e293a10688dec9593ae10d89f87ed9b39c Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 10:40:42 +0200
Subject: [PATCH 486/668] New translations demo.php (German)

---
 resources/lang/de_DE/demo.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/de_DE/demo.php b/resources/lang/de_DE/demo.php
index b5c31f0146..07254c0b6b 100644
--- a/resources/lang/de_DE/demo.php
+++ b/resources/lang/de_DE/demo.php
@@ -23,4 +23,4 @@ return [
     'import-index'                   => 'Natürlich kann eine CSV-Datei in Firefly III importiert werden ',
     'import-configure-security'      => 'Aufgrund von Sicherheitsbedenken wurde der Upload mit einer lokalen Datei ersetzt.',
     'import-configure-configuration' => 'Die unten stehende Konfiguration für die lokale Datei ist korrekt.',
-];
\ No newline at end of file
+];

From ee337b9476b65c45fa4d8dcb6ecca97ac9439d66 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 10:40:44 +0200
Subject: [PATCH 487/668] New translations intro.php (Dutch)

---
 resources/lang/nl_NL/intro.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/nl_NL/intro.php b/resources/lang/nl_NL/intro.php
index 239af2976a..34c26c0755 100644
--- a/resources/lang/nl_NL/intro.php
+++ b/resources/lang/nl_NL/intro.php
@@ -118,4 +118,4 @@ return [
 
     // create currency
     'currencies_create_code'                                  => 'Deze code moet ISO-compatibel zijn (Google die code voor je nieuwe valuta).',
-];
\ No newline at end of file
+];

From 41f1bb1dbd7279846c9afc40eb84161901d5c1d1 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 10:40:45 +0200
Subject: [PATCH 488/668] New translations demo.php (Russian)

---
 resources/lang/ru_RU/demo.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/ru_RU/demo.php b/resources/lang/ru_RU/demo.php
index 91b0d75915..57e9277cdb 100644
--- a/resources/lang/ru_RU/demo.php
+++ b/resources/lang/ru_RU/demo.php
@@ -23,4 +23,4 @@ return [
     'import-index'                   => 'Of course, any CSV file can be imported into Firefly III ',
     'import-configure-security'      => 'Because of security concerns, your upload has been replaced with a local file.',
     'import-configure-configuration' => 'The configuration you see below is correct for the local file.',
-];
\ No newline at end of file
+];

From 07277b7282f48b098cd62f351b3a14334fe2374f Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 10:40:47 +0200
Subject: [PATCH 489/668] New translations validation.php (Russian)

---
 resources/lang/ru_RU/validation.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/ru_RU/validation.php b/resources/lang/ru_RU/validation.php
index 5a8fa83725..ae67c89342 100644
--- a/resources/lang/ru_RU/validation.php
+++ b/resources/lang/ru_RU/validation.php
@@ -91,4 +91,4 @@ return [
     'present'                        => 'The :attribute field must be present.',
     'amount_zero'                    => 'The total amount cannot be zero',
     'secure_password'                => 'This is not a secure password. Please try again. For more information, visit https://goo.gl/NCh2tN',
-];
\ No newline at end of file
+];

From 444c2af5b0dbdea23941397503fb9beb10e7f055 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 10:40:49 +0200
Subject: [PATCH 490/668] New translations passwords.php (Russian)

---
 resources/lang/ru_RU/passwords.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/ru_RU/passwords.php b/resources/lang/ru_RU/passwords.php
index 1153e9cd73..54df3b6a81 100644
--- a/resources/lang/ru_RU/passwords.php
+++ b/resources/lang/ru_RU/passwords.php
@@ -18,4 +18,4 @@ return [
     'sent'     => 'Мы отправили ссылку для сброса пароля на ваш e-mail!',
     'reset'    => 'Ваш пароль был успешно сброшен!',
     'blocked'  => 'Это была хорошая попытка.',
-];
\ No newline at end of file
+];

From abc71e4cd67e502aa1d60f99969e451de51aa54e Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 10:40:50 +0200
Subject: [PATCH 491/668] New translations intro.php (German)

---
 resources/lang/de_DE/intro.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/de_DE/intro.php b/resources/lang/de_DE/intro.php
index c161cef362..02a0eead23 100644
--- a/resources/lang/de_DE/intro.php
+++ b/resources/lang/de_DE/intro.php
@@ -118,4 +118,4 @@ return [
 
     // create currency
     'currencies_create_code'                                  => 'This code should be ISO compliant (Google it for your new currency).',
-];
\ No newline at end of file
+];

From de340130b8bbcb9dee08a1facf62c33d235fdf97 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 10:40:51 +0200
Subject: [PATCH 492/668] New translations intro.php (Polish)

---
 resources/lang/pl_PL/intro.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/pl_PL/intro.php b/resources/lang/pl_PL/intro.php
index c161cef362..02a0eead23 100644
--- a/resources/lang/pl_PL/intro.php
+++ b/resources/lang/pl_PL/intro.php
@@ -118,4 +118,4 @@ return [
 
     // create currency
     'currencies_create_code'                                  => 'This code should be ISO compliant (Google it for your new currency).',
-];
\ No newline at end of file
+];

From 2c787dd96d9528b17e8b26805a624fead955d46f Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 10:40:53 +0200
Subject: [PATCH 493/668] New translations intro.php (Slovenian)

---
 resources/lang/sl_SI/intro.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/sl_SI/intro.php b/resources/lang/sl_SI/intro.php
index c161cef362..02a0eead23 100644
--- a/resources/lang/sl_SI/intro.php
+++ b/resources/lang/sl_SI/intro.php
@@ -118,4 +118,4 @@ return [
 
     // create currency
     'currencies_create_code'                                  => 'This code should be ISO compliant (Google it for your new currency).',
-];
\ No newline at end of file
+];

From 47c0a2cf03565f5a0f09fa862a00a6927b052eab Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 10:40:54 +0200
Subject: [PATCH 494/668] New translations intro.php (Russian)

---
 resources/lang/ru_RU/intro.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/ru_RU/intro.php b/resources/lang/ru_RU/intro.php
index c161cef362..02a0eead23 100644
--- a/resources/lang/ru_RU/intro.php
+++ b/resources/lang/ru_RU/intro.php
@@ -118,4 +118,4 @@ return [
 
     // create currency
     'currencies_create_code'                                  => 'This code should be ISO compliant (Google it for your new currency).',
-];
\ No newline at end of file
+];

From 40a8a5a8e73d966d172405f88a04a58b18873776 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 10:40:55 +0200
Subject: [PATCH 495/668] New translations intro.php (Portuguese, Brazilian)

---
 resources/lang/pt_BR/intro.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/pt_BR/intro.php b/resources/lang/pt_BR/intro.php
index c161cef362..02a0eead23 100644
--- a/resources/lang/pt_BR/intro.php
+++ b/resources/lang/pt_BR/intro.php
@@ -118,4 +118,4 @@ return [
 
     // create currency
     'currencies_create_code'                                  => 'This code should be ISO compliant (Google it for your new currency).',
-];
\ No newline at end of file
+];

From 7d6bc09f18128e94c533aa021186f774f3ac2ddd Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 10:40:56 +0200
Subject: [PATCH 496/668] New translations pagination.php (Russian)

---
 resources/lang/ru_RU/pagination.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/ru_RU/pagination.php b/resources/lang/ru_RU/pagination.php
index 6de717808b..35797a8414 100644
--- a/resources/lang/ru_RU/pagination.php
+++ b/resources/lang/ru_RU/pagination.php
@@ -16,4 +16,4 @@ return [
     'previous' => '&laquo; Предыдущие',
     'next'     => 'Следующие &raquo;',
 
-];
\ No newline at end of file
+];

From 9ad0bea76ddb97b23623bb5ee96f237524686c04 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 10:40:57 +0200
Subject: [PATCH 497/668] New translations list.php (Russian)

---
 resources/lang/ru_RU/list.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/ru_RU/list.php b/resources/lang/ru_RU/list.php
index 6d3da0d9bb..44f35277ff 100644
--- a/resources/lang/ru_RU/list.php
+++ b/resources/lang/ru_RU/list.php
@@ -90,4 +90,4 @@ return [
     'inward'                 => 'Inward description',
     'outward'                => 'Outward description',
     'number_of_transactions' => 'Number of transactions',
-];
\ No newline at end of file
+];

From 533ea67278edeaeb55380ee90e1235fc1a46cf62 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 10:40:59 +0200
Subject: [PATCH 498/668] New translations demo.php (Spanish)

---
 resources/lang/es_ES/demo.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/es_ES/demo.php b/resources/lang/es_ES/demo.php
index 8c8557a2b8..dfb4fc04c7 100644
--- a/resources/lang/es_ES/demo.php
+++ b/resources/lang/es_ES/demo.php
@@ -23,4 +23,4 @@ return [
     'import-index'                   => 'Por supuesto, cualquier archivo CSV puede ser importado en Firefly III',
     'import-configure-security'      => 'Debido a problemas de seguridad, su subida se ha sustituido por un archivo local.',
     'import-configure-configuration' => 'La configuración que ves a continuación es correcta para el archivo local.',
-];
\ No newline at end of file
+];

From ffbe400e335e82b3f5c3adee46e2bab7ca6eb603 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 10:41:00 +0200
Subject: [PATCH 499/668] New translations auth.php (Russian)

---
 resources/lang/ru_RU/auth.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/ru_RU/auth.php b/resources/lang/ru_RU/auth.php
index 36b29dc87b..4f36be028b 100644
--- a/resources/lang/ru_RU/auth.php
+++ b/resources/lang/ru_RU/auth.php
@@ -27,4 +27,4 @@ return [
     'failed'   => 'Неправильный адрес электронной почты или пароль.',
     'throttle' => 'Слишком много попыток входа. Пожалуйста, попробуйте снова через :seconds секунд.',
 
-];
\ No newline at end of file
+];

From dd4b64042458f268493d02dfabc9d026d0e21938 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 10:41:01 +0200
Subject: [PATCH 500/668] New translations demo.php (Slovenian)

---
 resources/lang/sl_SI/demo.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/sl_SI/demo.php b/resources/lang/sl_SI/demo.php
index e6a07ca5c4..dca94a9aa7 100644
--- a/resources/lang/sl_SI/demo.php
+++ b/resources/lang/sl_SI/demo.php
@@ -24,4 +24,4 @@ Konti prihodkov so računi iz katerih dobivate denar, kot npr. vaš delodajalec,
     'import-index'                   => 'Of course, any CSV file can be imported into Firefly III ',
     'import-configure-security'      => 'Because of security concerns, your upload has been replaced with a local file.',
     'import-configure-configuration' => 'The configuration you see below is correct for the local file.',
-];
\ No newline at end of file
+];

From d7be6fc9f6cb61f87d77d631bd919e301e011d78 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 10:41:02 +0200
Subject: [PATCH 501/668] New translations demo.php (Portuguese, Brazilian)

---
 resources/lang/pt_BR/demo.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/pt_BR/demo.php b/resources/lang/pt_BR/demo.php
index 9ff797eb29..749f6d09b1 100644
--- a/resources/lang/pt_BR/demo.php
+++ b/resources/lang/pt_BR/demo.php
@@ -23,4 +23,4 @@ return [
     'import-index'                   => 'Claro, qualquer arquivo .CSV pode ser importado em Firefly III ',
     'import-configure-security'      => 'Por questões de segurança, seu upload foi substituído por um arquivo local.',
     'import-configure-configuration' => 'A configuração que você vê abaixo é a correta para o arquivo local.',
-];
\ No newline at end of file
+];

From 38f588da1d3351f08339b6df4be3f9ef2acc1e6c Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 10:41:04 +0200
Subject: [PATCH 502/668] New translations demo.php (Polish)

---
 resources/lang/pl_PL/demo.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/pl_PL/demo.php b/resources/lang/pl_PL/demo.php
index 84446f6be6..0ffd1b88bf 100644
--- a/resources/lang/pl_PL/demo.php
+++ b/resources/lang/pl_PL/demo.php
@@ -23,4 +23,4 @@ return [
     'import-index'                   => 'Of course, any CSV file can be imported into Firefly III ',
     'import-configure-security'      => 'Because of security concerns, your upload has been replaced with a local file.',
     'import-configure-configuration' => 'Konfiguracja, która widzisz poniżej jest prawidłowa dla lokalnego pliku.',
-];
\ No newline at end of file
+];

From f4deaf78e7e459302aaa83a3ae20544768a10893 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 10:41:05 +0200
Subject: [PATCH 503/668] New translations breadcrumbs.php (Russian)

---
 resources/lang/ru_RU/breadcrumbs.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/ru_RU/breadcrumbs.php b/resources/lang/ru_RU/breadcrumbs.php
index 40c55d9b63..7cd631ef0c 100644
--- a/resources/lang/ru_RU/breadcrumbs.php
+++ b/resources/lang/ru_RU/breadcrumbs.php
@@ -41,4 +41,4 @@ return [
     'edit_tag'            => 'Редактирование метки ":tag"',
     'delete_tag'          => 'Удаление метки ":tag"',
     'delete_journal_link' => 'Удалить связь между транзакциями',
-];
\ No newline at end of file
+];

From abfb47674c1a5083d54038f9bdb4bd3b511fa4a6 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 10:41:06 +0200
Subject: [PATCH 504/668] New translations config.php (Russian)

---
 resources/lang/ru_RU/config.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/ru_RU/config.php b/resources/lang/ru_RU/config.php
index b540bc9c7e..3c5e033366 100644
--- a/resources/lang/ru_RU/config.php
+++ b/resources/lang/ru_RU/config.php
@@ -22,4 +22,4 @@ return [
     'year'            => '%Y',
     'half_year'       => '%B %Y',
 
-];
\ No newline at end of file
+];

From 4437cb67b9b386ee05af3f0ee2331b1514ed57d2 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 10:41:08 +0200
Subject: [PATCH 505/668] New translations help.php (Russian)

---
 resources/lang/ru_RU/help.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/ru_RU/help.php b/resources/lang/ru_RU/help.php
index 248a46ca56..c1d78040c4 100644
--- a/resources/lang/ru_RU/help.php
+++ b/resources/lang/ru_RU/help.php
@@ -32,4 +32,4 @@ return [
     'main-content-end-text'  => 'Помните, что в правом верхнем углу любой страницы есть небольшой знак вопроса. Нажмите на него, чтобы получить справку о той странице, на которой вы находитесь.',
     'index'                  => 'оглавление',
     'home'                   => 'главная',
-];
\ No newline at end of file
+];

From f73a23db97cf601644849a744513c986ac2825f9 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 10:41:09 +0200
Subject: [PATCH 506/668] New translations form.php (Russian)

---
 resources/lang/ru_RU/form.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/ru_RU/form.php b/resources/lang/ru_RU/form.php
index 661ea8f44d..ef6703a722 100644
--- a/resources/lang/ru_RU/form.php
+++ b/resources/lang/ru_RU/form.php
@@ -197,4 +197,4 @@ return [
 
     'inward'  => 'Inward description',
     'outward' => 'Outward description',
-];
\ No newline at end of file
+];

From a968525d3fee8e365a67e0f2e7ff0aba3a3a80bb Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 10:41:12 +0200
Subject: [PATCH 507/668] New translations firefly.php (Russian)

---
 resources/lang/ru_RU/firefly.php | 64 +++++++++++++++++++-------------
 1 file changed, 39 insertions(+), 25 deletions(-)

diff --git a/resources/lang/ru_RU/firefly.php b/resources/lang/ru_RU/firefly.php
index e167a2b63c..984b99b5a8 100644
--- a/resources/lang/ru_RU/firefly.php
+++ b/resources/lang/ru_RU/firefly.php
@@ -239,46 +239,60 @@ return [
 
     // actions and triggers
     'rule_trigger_user_action'                   => 'User action is ":trigger_value"',
-    'rule_trigger_from_account_starts'           => 'Source account starts with ":trigger_value"',
-    'rule_trigger_from_account_ends'             => 'Source account ends with ":trigger_value"',
-    'rule_trigger_from_account_is'               => 'Source account is ":trigger_value"',
-    'rule_trigger_from_account_contains'         => 'Source account contains ":trigger_value"',
-    'rule_trigger_to_account_starts'             => 'Destination account starts with ":trigger_value"',
-    'rule_trigger_to_account_ends'               => 'Destination account ends with ":trigger_value"',
-    'rule_trigger_to_account_is'                 => 'Destination account is ":trigger_value"',
-    'rule_trigger_to_account_contains'           => 'Destination account contains ":trigger_value"',
-    'rule_trigger_transaction_type'              => 'Transaction is of type ":trigger_value"',
-    'rule_trigger_category_is'                   => 'Category is ":trigger_value"',
-    'rule_trigger_amount_less'                   => 'Amount is less than :trigger_value',
-    'rule_trigger_amount_exactly'                => 'Amount is :trigger_value',
-    'rule_trigger_amount_more'                   => 'Amount is more than :trigger_value',
-    'rule_trigger_description_starts'            => 'Description starts with ":trigger_value"',
-    'rule_trigger_description_ends'              => 'Description ends with ":trigger_value"',
-    'rule_trigger_description_contains'          => 'Description contains ":trigger_value"',
-    'rule_trigger_description_is'                => 'Description is ":trigger_value"',
     'rule_trigger_from_account_starts_choice'    => 'Source account starts with..',
+    'rule_trigger_from_account_starts'           => 'Source account starts with ":trigger_value"',
     'rule_trigger_from_account_ends_choice'      => 'Source account ends with..',
+    'rule_trigger_from_account_ends'             => 'Source account ends with ":trigger_value"',
     'rule_trigger_from_account_is_choice'        => 'Source account is..',
+    'rule_trigger_from_account_is'               => 'Source account is ":trigger_value"',
     'rule_trigger_from_account_contains_choice'  => 'Source account contains..',
+    'rule_trigger_from_account_contains'         => 'Source account contains ":trigger_value"',
     'rule_trigger_to_account_starts_choice'      => 'Destination account starts with..',
+    'rule_trigger_to_account_starts'             => 'Destination account starts with ":trigger_value"',
     'rule_trigger_to_account_ends_choice'        => 'Destination account ends with..',
+    'rule_trigger_to_account_ends'               => 'Destination account ends with ":trigger_value"',
     'rule_trigger_to_account_is_choice'          => 'Destination account is..',
+    'rule_trigger_to_account_is'                 => 'Destination account is ":trigger_value"',
     'rule_trigger_to_account_contains_choice'    => 'Destination account contains..',
+    'rule_trigger_to_account_contains'           => 'Destination account contains ":trigger_value"',
     'rule_trigger_transaction_type_choice'       => 'Transaction is of type..',
-    'rule_trigger_amount_less_choice'            => 'Amount is less than..',
-    'rule_trigger_amount_exactly_choice'         => 'Amount is..',
-    'rule_trigger_amount_more_choice'            => 'Amount is more than..',
-    'rule_trigger_description_starts_choice'     => 'Description starts with..',
-    'rule_trigger_description_ends_choice'       => 'Description ends with..',
-    'rule_trigger_description_contains_choice'   => 'Description contains..',
-    'rule_trigger_description_is_choice'         => 'Description is..',
+    'rule_trigger_transaction_type'              => 'Transaction is of type ":trigger_value"',
     'rule_trigger_category_is_choice'            => 'Category is..',
+    'rule_trigger_category_is'                   => 'Category is ":trigger_value"',
+    'rule_trigger_amount_less_choice'            => 'Amount is less than..',
+    'rule_trigger_amount_less'                   => 'Amount is less than :trigger_value',
+    'rule_trigger_amount_exactly_choice'         => 'Amount is..',
+    'rule_trigger_amount_exactly'                => 'Amount is :trigger_value',
+    'rule_trigger_amount_more_choice'            => 'Amount is more than..',
+    'rule_trigger_amount_more'                   => 'Amount is more than :trigger_value',
+    'rule_trigger_description_starts_choice'     => 'Description starts with..',
+    'rule_trigger_description_starts'            => 'Description starts with ":trigger_value"',
+    'rule_trigger_description_ends_choice'       => 'Description ends with..',
+    'rule_trigger_description_ends'              => 'Description ends with ":trigger_value"',
+    'rule_trigger_description_contains_choice'   => 'Description contains..',
+    'rule_trigger_description_contains'          => 'Description contains ":trigger_value"',
+    'rule_trigger_description_is_choice'         => 'Description is..',
+    'rule_trigger_description_is'                => 'Description is ":trigger_value"',
     'rule_trigger_budget_is_choice'              => 'Budget is..',
+    'rule_trigger_budget_is'                     => 'Budget is ":trigger_value"',
     'rule_trigger_tag_is_choice'                 => '(A) tag is..',
+    'rule_trigger_tag_is'                        => 'A tag is ":trigger_value"',
     'rule_trigger_has_attachments_choice'        => 'Has at least this many attachments',
     'rule_trigger_has_attachments'               => 'Has at least :trigger_value attachment(s)',
     'rule_trigger_store_journal'                 => 'When a transaction is created',
     'rule_trigger_update_journal'                => 'When a transaction is updated',
+    'rule_trigger_has_no_category_choice'        => 'Has no category',
+    'rule_trigger_has_no_category'               => 'Transaction has no category',
+    'rule_trigger_has_any_category_choice'       => 'Has a (any) category',
+    'rule_trigger_has_any_category'              => 'Transaction has a (any) category',
+    'rule_trigger_has_no_budget_choice'          => 'Has no budget',
+    'rule_trigger_has_no_budget'                 => 'Transaction has no budget',
+    'rule_trigger_has_any_budget_choice'         => 'Has a (any) budget',
+    'rule_trigger_has_any_budget'                => 'Transaction has a (any) budget',
+    'rule_trigger_has_no_tag_choice'             => 'Has no tag(s)',
+    'rule_trigger_has_no_tag'                    => 'Transaction has no tag(s)',
+    'rule_trigger_has_any_tag_choice'            => 'Has one or more (any) tags',
+    'rule_trigger_has_any_tag'                   => 'Transaction has one or more (any) tags',
     'rule_action_set_category'                   => 'Set category to ":action_value"',
     'rule_action_clear_category'                 => 'Clear category',
     'rule_action_set_budget'                     => 'Set budget to ":action_value"',
@@ -1019,4 +1033,4 @@ return [
     'no_bills_create_default'               => 'Create a bill',
 
 
-];
\ No newline at end of file
+];

From 4ff4ca642c35fa7d2377b5173ca92ccae32234ec Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 10:41:14 +0200
Subject: [PATCH 508/668] New translations csv.php (Russian)

---
 resources/lang/ru_RU/csv.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/ru_RU/csv.php b/resources/lang/ru_RU/csv.php
index 599cb9171f..1b3c320594 100644
--- a/resources/lang/ru_RU/csv.php
+++ b/resources/lang/ru_RU/csv.php
@@ -80,4 +80,4 @@ return [
     'column_tags-space'             => 'Tags (space separated)',
     'column_account-number'         => 'Asset account (account number)',
     'column_opposing-number'        => 'Opposing account (account number)',
-];
\ No newline at end of file
+];

From 923cdcde16af80ae332bb290411e40f65ba84ded Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 10:41:15 +0200
Subject: [PATCH 509/668] New translations list.php (Polish)

---
 resources/lang/pl_PL/list.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/pl_PL/list.php b/resources/lang/pl_PL/list.php
index 1905cc9396..9e7e975a1e 100644
--- a/resources/lang/pl_PL/list.php
+++ b/resources/lang/pl_PL/list.php
@@ -90,4 +90,4 @@ return [
     'inward'                 => 'Inward description',
     'outward'                => 'Outward description',
     'number_of_transactions' => 'Liczba transakcji',
-];
\ No newline at end of file
+];

From beb1ac4c9deb84af9f88d408bae00ced15a9f756 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 10:41:16 +0200
Subject: [PATCH 510/668] New translations list.php (German)

---
 resources/lang/de_DE/list.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/de_DE/list.php b/resources/lang/de_DE/list.php
index 43968fe04a..9402db0d28 100644
--- a/resources/lang/de_DE/list.php
+++ b/resources/lang/de_DE/list.php
@@ -90,4 +90,4 @@ return [
     'inward'                 => 'Inward description',
     'outward'                => 'Outward description',
     'number_of_transactions' => 'Anzahl der Zahlungsvorgänge',
-];
\ No newline at end of file
+];

From 2b6fe7cae7b70dd2bc9781bdd6388af3853046f9 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 10:41:18 +0200
Subject: [PATCH 511/668] New translations config.php (Polish)

---
 resources/lang/pl_PL/config.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/pl_PL/config.php b/resources/lang/pl_PL/config.php
index 0d0f130178..526668d33e 100644
--- a/resources/lang/pl_PL/config.php
+++ b/resources/lang/pl_PL/config.php
@@ -22,4 +22,4 @@ return [
     'year'            => '%Y',
     'half_year'       => '%B %Y',
 
-];
\ No newline at end of file
+];

From 0d4b971bd07a20508ee8938e72664076c8abe74d Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 10:41:18 +0200
Subject: [PATCH 512/668] New translations config.php (Portuguese, Brazilian)

---
 resources/lang/pt_BR/config.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/pt_BR/config.php b/resources/lang/pt_BR/config.php
index 11368605f7..396ead4031 100644
--- a/resources/lang/pt_BR/config.php
+++ b/resources/lang/pt_BR/config.php
@@ -22,4 +22,4 @@ return [
     'year'            => '%Y',
     'half_year'       => '%B %Y',
 
-];
\ No newline at end of file
+];

From a87b1fca1bddd473142aa10d76f8c0441cf61577 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 10:41:20 +0200
Subject: [PATCH 513/668] New translations config.php (German)

---
 resources/lang/de_DE/config.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/de_DE/config.php b/resources/lang/de_DE/config.php
index d303d9e308..0556b0f612 100644
--- a/resources/lang/de_DE/config.php
+++ b/resources/lang/de_DE/config.php
@@ -22,4 +22,4 @@ return [
     'year'            => '%Y',
     'half_year'       => '%B %Y',
 
-];
\ No newline at end of file
+];

From cb7466247cf2313a2b2f61c3d6065c96bd4b4edd Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 10:41:21 +0200
Subject: [PATCH 514/668] New translations config.php (French)

---
 resources/lang/fr_FR/config.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/fr_FR/config.php b/resources/lang/fr_FR/config.php
index 989a496b74..846407e08a 100644
--- a/resources/lang/fr_FR/config.php
+++ b/resources/lang/fr_FR/config.php
@@ -22,4 +22,4 @@ return [
     'year'            => '%Y',
     'half_year'       => '%B %Y',
 
-];
\ No newline at end of file
+];

From 22ab01c9fffd0f58e04802f2b5e985f691ff6c1b Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 10:41:22 +0200
Subject: [PATCH 515/668] New translations config.php (Dutch)

---
 resources/lang/nl_NL/config.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/nl_NL/config.php b/resources/lang/nl_NL/config.php
index 574ef549ad..c69f3c6fb3 100644
--- a/resources/lang/nl_NL/config.php
+++ b/resources/lang/nl_NL/config.php
@@ -22,4 +22,4 @@ return [
     'year'            => '%Y',
     'half_year'       => '%B %Y',
 
-];
\ No newline at end of file
+];

From 459c0fc13696b1a4d2b152226b994444aa938624 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 10:41:23 +0200
Subject: [PATCH 516/668] New translations config.php (Slovenian)

---
 resources/lang/sl_SI/config.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/sl_SI/config.php b/resources/lang/sl_SI/config.php
index a648c5ed3f..42e845a6ee 100644
--- a/resources/lang/sl_SI/config.php
+++ b/resources/lang/sl_SI/config.php
@@ -22,4 +22,4 @@ return [
     'year'            => '%Y',
     'half_year'       => '%B %Y',
 
-];
\ No newline at end of file
+];

From 136043bb23ee0f0ba009abc7451c408794fb1aa5 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 10:41:24 +0200
Subject: [PATCH 517/668] New translations config.php (Spanish)

---
 resources/lang/es_ES/config.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/es_ES/config.php b/resources/lang/es_ES/config.php
index 5b382a0cb8..fcf67a8a6a 100644
--- a/resources/lang/es_ES/config.php
+++ b/resources/lang/es_ES/config.php
@@ -22,4 +22,4 @@ return [
     'year'            => '%Y',
     'half_year'       => '%B %Y',
 
-];
\ No newline at end of file
+];

From ac2834954c5914987c11560ed38110a8413e1a91 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 10:41:26 +0200
Subject: [PATCH 518/668] New translations csv.php (Polish)

---
 resources/lang/pl_PL/csv.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/pl_PL/csv.php b/resources/lang/pl_PL/csv.php
index b6cea58e05..46b3c01136 100644
--- a/resources/lang/pl_PL/csv.php
+++ b/resources/lang/pl_PL/csv.php
@@ -80,4 +80,4 @@ return [
     'column_tags-space'             => 'Tagi (oddzielone spacjami)',
     'column_account-number'         => 'Konto aktywów (numer konta)',
     'column_opposing-number'        => 'Opposing account (account number)',
-];
\ No newline at end of file
+];

From 2194cd9da17a87e4300b4bab589c85fc3d17bf2c Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 10:41:27 +0200
Subject: [PATCH 519/668] New translations csv.php (German)

---
 resources/lang/de_DE/csv.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/de_DE/csv.php b/resources/lang/de_DE/csv.php
index 910478384f..74d253fcbf 100644
--- a/resources/lang/de_DE/csv.php
+++ b/resources/lang/de_DE/csv.php
@@ -80,4 +80,4 @@ return [
     'column_tags-space'             => 'Tags (durch Leerzeichen getrennt)',
     'column_account-number'         => 'Bestandskonto (Kontonr.)',
     'column_opposing-number'        => 'Zielkonto (Kontonr.)',
-];
\ No newline at end of file
+];

From 109b9000d2fe94a1cbabd18d5add71f53a7ed26e Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 10:41:30 +0200
Subject: [PATCH 520/668] New translations csv.php (French)

---
 resources/lang/fr_FR/csv.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/fr_FR/csv.php b/resources/lang/fr_FR/csv.php
index 7a3eb6206f..2c5ef5b3e6 100644
--- a/resources/lang/fr_FR/csv.php
+++ b/resources/lang/fr_FR/csv.php
@@ -80,4 +80,4 @@ return [
     'column_tags-space'             => 'Tags (séparé par des espaces)',
     'column_account-number'         => 'Compte d’actif (numéro de compte)',
     'column_opposing-number'        => 'Compte destination (numéro de compte)',
-];
\ No newline at end of file
+];

From 9c5c5b56efff5e52e936a4fff79136010a9aa101 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 10:41:32 +0200
Subject: [PATCH 521/668] New translations csv.php (Dutch)

---
 resources/lang/nl_NL/csv.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/nl_NL/csv.php b/resources/lang/nl_NL/csv.php
index debe7a0139..be68315716 100644
--- a/resources/lang/nl_NL/csv.php
+++ b/resources/lang/nl_NL/csv.php
@@ -80,4 +80,4 @@ return [
     'column_tags-space'             => 'Tags (spatiegescheiden)',
     'column_account-number'         => 'Betaalrekening (rekeningnummer)',
     'column_opposing-number'        => 'Tegenrekening (rekeningnummer)',
-];
\ No newline at end of file
+];

From a8ace43470cf51f42c2c97ef082ea841eba961fa Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 10:41:33 +0200
Subject: [PATCH 522/668] New translations breadcrumbs.php (Spanish)

---
 resources/lang/es_ES/breadcrumbs.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/es_ES/breadcrumbs.php b/resources/lang/es_ES/breadcrumbs.php
index 3c866039f5..be02ccc42a 100644
--- a/resources/lang/es_ES/breadcrumbs.php
+++ b/resources/lang/es_ES/breadcrumbs.php
@@ -41,4 +41,4 @@ return [
     'edit_tag'            => 'Editar etiqueta ":tag"',
     'delete_tag'          => 'Eliminar etiqueta ":tag"',
     'delete_journal_link' => 'Eliminar enlace entre transacciones',
-];
\ No newline at end of file
+];

From 2bbdd76ee1feaa5dd55f602cb6a9c17605b471c7 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 10:41:34 +0200
Subject: [PATCH 523/668] New translations breadcrumbs.php (Slovenian)

---
 resources/lang/sl_SI/breadcrumbs.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/sl_SI/breadcrumbs.php b/resources/lang/sl_SI/breadcrumbs.php
index 70672da530..9315ce140c 100644
--- a/resources/lang/sl_SI/breadcrumbs.php
+++ b/resources/lang/sl_SI/breadcrumbs.php
@@ -41,4 +41,4 @@ return [
     'edit_tag'            => 'uredi značko ":tag"',
     'delete_tag'          => 'izbriši značko ":tag"',
     'delete_journal_link' => 'Delete link between transactions',
-];
\ No newline at end of file
+];

From fe2bba2c40382fbf6cb730197850ec993cf6edea Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 10:41:35 +0200
Subject: [PATCH 524/668] New translations auth.php (Portuguese, Brazilian)

---
 resources/lang/pt_BR/auth.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/pt_BR/auth.php b/resources/lang/pt_BR/auth.php
index a6d1e98e31..5345cea939 100644
--- a/resources/lang/pt_BR/auth.php
+++ b/resources/lang/pt_BR/auth.php
@@ -27,4 +27,4 @@ return [
     'failed'   => 'Essas credenciais não correspondem aos nossos registros.',
     'throttle' => 'Muitas tentativas de login. Por favor, tente novamente em :seconds segundos.',
 
-];
\ No newline at end of file
+];

From 399cb3bc3f11a3fb079cda9b3d3f7332aedc6a48 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 10:41:37 +0200
Subject: [PATCH 525/668] New translations auth.php (Slovenian)

---
 resources/lang/sl_SI/auth.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/sl_SI/auth.php b/resources/lang/sl_SI/auth.php
index 59c683e316..f28aea4bd7 100644
--- a/resources/lang/sl_SI/auth.php
+++ b/resources/lang/sl_SI/auth.php
@@ -27,4 +27,4 @@ return [
     'failed'   => 'Podatki se ne ujemajo s podatki v naši bazi.',
     'throttle' => 'Prevečkrat ste se poskusili prijaviti. Poskusite ponovno čez :seconds sekunde.',
 
-];
\ No newline at end of file
+];

From ec40d91f8511c65b967473b7c7dc29ceb86db731 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 10:41:38 +0200
Subject: [PATCH 526/668] New translations auth.php (Polish)

---
 resources/lang/pl_PL/auth.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/pl_PL/auth.php b/resources/lang/pl_PL/auth.php
index ff4b564aee..a743bd1901 100644
--- a/resources/lang/pl_PL/auth.php
+++ b/resources/lang/pl_PL/auth.php
@@ -27,4 +27,4 @@ return [
     'failed'   => 'Te poświadczenia nie zgadzają się z naszymi danymi.',
     'throttle' => 'Zbyt wiele prób logowania. Spróbuj ponownie za :seconds sekund.',
 
-];
\ No newline at end of file
+];

From 3078adac2d41445727540c97b71bb8016f927a09 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 10:41:39 +0200
Subject: [PATCH 527/668] New translations auth.php (German)

---
 resources/lang/de_DE/auth.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/de_DE/auth.php b/resources/lang/de_DE/auth.php
index 89d1936fd1..2ed9237587 100644
--- a/resources/lang/de_DE/auth.php
+++ b/resources/lang/de_DE/auth.php
@@ -27,4 +27,4 @@ return [
     'failed'   => 'Falscher Benutzername und/oder falsches Passwort.',
     'throttle' => 'Zu viele Login-Versuche. Bitte versuchen Sie es in :seconds Sekunde(n) erneut.',
 
-];
\ No newline at end of file
+];

From 38872310512f03b95bfa1e66a50c4644f35390db Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 10:41:40 +0200
Subject: [PATCH 528/668] New translations auth.php (French)

---
 resources/lang/fr_FR/auth.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/fr_FR/auth.php b/resources/lang/fr_FR/auth.php
index 2e8e1c503f..67482eb063 100644
--- a/resources/lang/fr_FR/auth.php
+++ b/resources/lang/fr_FR/auth.php
@@ -27,4 +27,4 @@ return [
     'failed'   => 'Ces identifiants n\'ont aucune correspondance.',
     'throttle' => 'Trop de tentatives de connexion. Veuillez essayer à nouveau dans :seconds secondes.',
 
-];
\ No newline at end of file
+];

From 4749c854bc4d84c2e2a9ef30fb8f099fdcd873d0 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 10:41:41 +0200
Subject: [PATCH 529/668] New translations auth.php (Spanish)

---
 resources/lang/es_ES/auth.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/es_ES/auth.php b/resources/lang/es_ES/auth.php
index a5934d5e73..d7264e69be 100644
--- a/resources/lang/es_ES/auth.php
+++ b/resources/lang/es_ES/auth.php
@@ -27,4 +27,4 @@ return [
     'failed'   => 'Las credenciales no coinciden con los registros.',
     'throttle' => 'Demasiados intentos de inicio de sesión. Por favor reintente en :seconds segundos.',
 
-];
\ No newline at end of file
+];

From c7689490342d9276579854434be675f457bbfc35 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 10:41:42 +0200
Subject: [PATCH 530/668] New translations breadcrumbs.php (Dutch)

---
 resources/lang/nl_NL/breadcrumbs.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/nl_NL/breadcrumbs.php b/resources/lang/nl_NL/breadcrumbs.php
index ef303debe0..16694da0ea 100644
--- a/resources/lang/nl_NL/breadcrumbs.php
+++ b/resources/lang/nl_NL/breadcrumbs.php
@@ -41,4 +41,4 @@ return [
     'edit_tag'            => 'Wijzig tag ":tag"',
     'delete_tag'          => 'Verwijder tag ":tag"',
     'delete_journal_link' => 'Verwijder koppeling tussen transacties',
-];
\ No newline at end of file
+];

From ba3b82cc87e773846f1f66f48152ef82b9763721 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 10:41:43 +0200
Subject: [PATCH 531/668] New translations breadcrumbs.php (Portuguese,
 Brazilian)

---
 resources/lang/pt_BR/breadcrumbs.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/pt_BR/breadcrumbs.php b/resources/lang/pt_BR/breadcrumbs.php
index 6a62264463..1a97cb2988 100644
--- a/resources/lang/pt_BR/breadcrumbs.php
+++ b/resources/lang/pt_BR/breadcrumbs.php
@@ -41,4 +41,4 @@ return [
     'edit_tag'            => 'Editar etiqueta ":tag"',
     'delete_tag'          => 'Apagar etiqueta ":tag"',
     'delete_journal_link' => 'Delete link between transactions',
-];
\ No newline at end of file
+];

From 9a1e3701a3289f82db5d2631e413b79a72a68c93 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 10:41:44 +0200
Subject: [PATCH 532/668] New translations breadcrumbs.php (Polish)

---
 resources/lang/pl_PL/breadcrumbs.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/pl_PL/breadcrumbs.php b/resources/lang/pl_PL/breadcrumbs.php
index 924f6a1787..244b380690 100644
--- a/resources/lang/pl_PL/breadcrumbs.php
+++ b/resources/lang/pl_PL/breadcrumbs.php
@@ -41,4 +41,4 @@ return [
     'edit_tag'            => 'Modyfikuj tag ":tag"',
     'delete_tag'          => 'Usuń tag ":tag"',
     'delete_journal_link' => 'Delete link between transactions',
-];
\ No newline at end of file
+];

From fcad29580943b0f944a0d82fdf9767001864e489 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 10:41:45 +0200
Subject: [PATCH 533/668] New translations breadcrumbs.php (German)

---
 resources/lang/de_DE/breadcrumbs.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/de_DE/breadcrumbs.php b/resources/lang/de_DE/breadcrumbs.php
index cf71c1e008..5279222e16 100644
--- a/resources/lang/de_DE/breadcrumbs.php
+++ b/resources/lang/de_DE/breadcrumbs.php
@@ -41,4 +41,4 @@ return [
     'edit_tag'            => 'Bearbeite Tag ":tag"',
     'delete_tag'          => 'Lösche Tag ":tag"',
     'delete_journal_link' => 'Verbindung zwischen Transaktionen löschen',
-];
\ No newline at end of file
+];

From 6b6599eb7923ed6c4c33c9203b5236a9c6228431 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 10:41:47 +0200
Subject: [PATCH 534/668] New translations csv.php (Portuguese, Brazilian)

---
 resources/lang/pt_BR/csv.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/pt_BR/csv.php b/resources/lang/pt_BR/csv.php
index 2853590877..830d7cd73f 100644
--- a/resources/lang/pt_BR/csv.php
+++ b/resources/lang/pt_BR/csv.php
@@ -80,4 +80,4 @@ return [
     'column_tags-space'             => 'Tags (separadas por espaço)',
     'column_account-number'         => 'Conta de ativo (número da conta)',
     'column_opposing-number'        => 'Conta Contrária (número da conta)',
-];
\ No newline at end of file
+];

From 547db2f27beee825d2bbcc33332b1ae05b2557af Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 10:41:48 +0200
Subject: [PATCH 535/668] New translations csv.php (Slovenian)

---
 resources/lang/sl_SI/csv.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/sl_SI/csv.php b/resources/lang/sl_SI/csv.php
index dc35628e17..aa1b9f0ddb 100644
--- a/resources/lang/sl_SI/csv.php
+++ b/resources/lang/sl_SI/csv.php
@@ -80,4 +80,4 @@ return [
     'column_tags-space'             => 'značke (ločene s presledki)',
     'column_account-number'         => 'premoženjski račun (številka računa)',
     'column_opposing-number'        => 'protiračun (številka računa)',
-];
\ No newline at end of file
+];

From 69b82a5043abf6751e0d4c5ac3e8860db5c35dd8 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 10:41:50 +0200
Subject: [PATCH 536/668] New translations help.php (French)

---
 resources/lang/fr_FR/help.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/fr_FR/help.php b/resources/lang/fr_FR/help.php
index 8ff8379c9b..0f23bd7edd 100644
--- a/resources/lang/fr_FR/help.php
+++ b/resources/lang/fr_FR/help.php
@@ -32,4 +32,4 @@ return [
     'main-content-end-text'  => 'N\'oubliez pas que chaque page a un petit point d\'interrogation en haut à droite. Cliquez dessus pour obtenir de l\'aide concernant la page actuelle.',
     'index'                  => 'index',
     'home'                   => 'accueil',
-];
\ No newline at end of file
+];

From f24feb62c83c446be4f55baf82654aa9944d5d0c Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 10:41:51 +0200
Subject: [PATCH 537/668] New translations help.php (German)

---
 resources/lang/de_DE/help.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/de_DE/help.php b/resources/lang/de_DE/help.php
index 1701cdfc6f..3d3f47687f 100644
--- a/resources/lang/de_DE/help.php
+++ b/resources/lang/de_DE/help.php
@@ -32,4 +32,4 @@ return [
     'main-content-end-text'  => 'Denken Sie daran, dass jede Seite ein kleines Fragezeichen in der oberen rechten Ecke hat. Klicken Sie darauf um Hilfe zur aktuellen Seite zu erhalten.',
     'index'                  => 'index',
     'home'                   => 'home',
-];
\ No newline at end of file
+];

From 36b93d6d2bebab5c950dad3e9f58aa8151175f51 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 10:41:52 +0200
Subject: [PATCH 538/668] New translations help.php (Dutch)

---
 resources/lang/nl_NL/help.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/nl_NL/help.php b/resources/lang/nl_NL/help.php
index 217e867804..e60d763a5f 100644
--- a/resources/lang/nl_NL/help.php
+++ b/resources/lang/nl_NL/help.php
@@ -32,4 +32,4 @@ return [
     'main-content-end-text'  => 'Elke pagina heeft een vraagtekentje rechtsboven. Gebruik deze voor meer hulp. Veel plezier!',
     'index'                  => 'index',
     'home'                   => 'home',
-];
\ No newline at end of file
+];

From 473eeaa2065607a7fcd0ca7da778010b4513568f Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 10:41:54 +0200
Subject: [PATCH 539/668] New translations form.php (Slovenian)

---
 resources/lang/sl_SI/form.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/sl_SI/form.php b/resources/lang/sl_SI/form.php
index 81cdd6db74..c3930e8f0a 100644
--- a/resources/lang/sl_SI/form.php
+++ b/resources/lang/sl_SI/form.php
@@ -197,4 +197,4 @@ return [
 
     'inward'  => 'Inward description',
     'outward' => 'Outward description',
-];
\ No newline at end of file
+];

From b7e7c82bd73e03ad5cf485ac1ed2a9c3e7c3194d Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 10:41:55 +0200
Subject: [PATCH 540/668] New translations help.php (Polish)

---
 resources/lang/pl_PL/help.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/pl_PL/help.php b/resources/lang/pl_PL/help.php
index 49f482feda..1715bbe160 100644
--- a/resources/lang/pl_PL/help.php
+++ b/resources/lang/pl_PL/help.php
@@ -32,4 +32,4 @@ return [
     'main-content-end-text'  => 'Pamiętaj, że każda strona ma małą ikonkę ze znakiem zapytania w prawym górnym rogu. Kliknij ją aby otrzymać dodatkowe informacje o stronie, na której się znajdujesz.',
     'index'                  => 'indeks',
     'home'                   => 'początek',
-];
\ No newline at end of file
+];

From 39045fe2fc81682a312add6b651839a6c3a8b234 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 10:41:56 +0200
Subject: [PATCH 541/668] New translations help.php (Portuguese, Brazilian)

---
 resources/lang/pt_BR/help.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/pt_BR/help.php b/resources/lang/pt_BR/help.php
index bfd33e8fd4..92805b87ec 100644
--- a/resources/lang/pt_BR/help.php
+++ b/resources/lang/pt_BR/help.php
@@ -32,4 +32,4 @@ return [
     'main-content-end-text'  => 'Lembre-se que cada página tem um pequeno ponto de interrogação na parte superior direita. Clique nele para obter ajuda sobre a página que você está.',
     'index'                  => 'índice',
     'home'                   => 'casa',
-];
\ No newline at end of file
+];

From 3b8b45d12d9cd77a2f56763ed983c6706cd31645 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 10:41:57 +0200
Subject: [PATCH 542/668] New translations list.php (French)

---
 resources/lang/fr_FR/list.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/fr_FR/list.php b/resources/lang/fr_FR/list.php
index 871a8f10ad..93c5142686 100644
--- a/resources/lang/fr_FR/list.php
+++ b/resources/lang/fr_FR/list.php
@@ -90,4 +90,4 @@ return [
     'inward'                 => 'Description vers l’intérieur',
     'outward'                => 'Description de l’extérieur',
     'number_of_transactions' => 'Nombre de transactions',
-];
\ No newline at end of file
+];

From 09bd94d44eb5f46a6d83e3203dd141a0c4565e5f Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 10:41:58 +0200
Subject: [PATCH 543/668] New translations list.php (Dutch)

---
 resources/lang/nl_NL/list.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/nl_NL/list.php b/resources/lang/nl_NL/list.php
index c384da4c87..a9b49a2ae9 100644
--- a/resources/lang/nl_NL/list.php
+++ b/resources/lang/nl_NL/list.php
@@ -90,4 +90,4 @@ return [
     'inward'                 => 'Binnenwaartse beschrijving',
     'outward'                => 'Buitenwaartse beschrijving',
     'number_of_transactions' => 'Aantal transacties',
-];
\ No newline at end of file
+];

From d110fea710c6b840dc184ed9b9d9747fc2be2512 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 10:41:59 +0200
Subject: [PATCH 544/668] New translations help.php (Spanish)

---
 resources/lang/es_ES/help.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/es_ES/help.php b/resources/lang/es_ES/help.php
index e5ae3baf33..f630f2f78e 100644
--- a/resources/lang/es_ES/help.php
+++ b/resources/lang/es_ES/help.php
@@ -32,4 +32,4 @@ return [
     'main-content-end-text'  => 'Recuerde que cada página tiene un pequeño signo de interrogación en la parte superior derecha. Haz clic en él para obtener ayuda sobre la página en la que estás.',
     'index'                  => 'índice',
     'home'                   => 'inicio',
-];
\ No newline at end of file
+];

From 36ffa464415097518525b230c80d141579003af3 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 10:42:01 +0200
Subject: [PATCH 545/668] New translations help.php (Slovenian)

---
 resources/lang/sl_SI/help.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/sl_SI/help.php b/resources/lang/sl_SI/help.php
index d9b1d8d381..8ccfb5e470 100644
--- a/resources/lang/sl_SI/help.php
+++ b/resources/lang/sl_SI/help.php
@@ -32,4 +32,4 @@ return [
     'main-content-end-text'  => 'Remember that every page has a small question mark at the right top. Click it to get help about the page you\'re on.',
     'index'                  => 'index',
     'home'                   => 'home',
-];
\ No newline at end of file
+];

From 99b6eb3cd9e8bd2c8f3309c4f21f9fe60529bcb6 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 10:42:02 +0200
Subject: [PATCH 546/668] New translations form.php (Portuguese, Brazilian)

---
 resources/lang/pt_BR/form.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/pt_BR/form.php b/resources/lang/pt_BR/form.php
index 20a970b04b..f2e1a12925 100644
--- a/resources/lang/pt_BR/form.php
+++ b/resources/lang/pt_BR/form.php
@@ -197,4 +197,4 @@ return [
 
     'inward'  => 'Inward description',
     'outward' => 'Outward description',
-];
\ No newline at end of file
+];

From 8d76eaf6334e5a9f96b86059e899eb4d36c1dbd2 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 10:42:04 +0200
Subject: [PATCH 547/668] New translations form.php (Polish)

---
 resources/lang/pl_PL/form.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/pl_PL/form.php b/resources/lang/pl_PL/form.php
index 090ac6e5f7..cfb6fadcb6 100644
--- a/resources/lang/pl_PL/form.php
+++ b/resources/lang/pl_PL/form.php
@@ -197,4 +197,4 @@ return [
 
     'inward'  => 'Inward description',
     'outward' => 'Outward description',
-];
\ No newline at end of file
+];

From 8700393e615f292e6d7af31719cbf65c69de55bf Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 10:42:06 +0200
Subject: [PATCH 548/668] New translations firefly.php (German)

---
 resources/lang/de_DE/firefly.php | 64 +++++++++++++++++++-------------
 1 file changed, 39 insertions(+), 25 deletions(-)

diff --git a/resources/lang/de_DE/firefly.php b/resources/lang/de_DE/firefly.php
index 729d53502f..7ee795413e 100644
--- a/resources/lang/de_DE/firefly.php
+++ b/resources/lang/de_DE/firefly.php
@@ -239,46 +239,60 @@ return [
 
     // actions and triggers
     'rule_trigger_user_action'                   => 'Die Nutzeraktion ist ":trigger_value"',
-    'rule_trigger_from_account_starts'           => 'Das Quellkonto startet mit ":trigger_value"',
-    'rule_trigger_from_account_ends'             => 'Das Quellkonto endet mit ":trigger_value"',
-    'rule_trigger_from_account_is'               => 'Das Quellkonto ist ":trigger_value"',
-    'rule_trigger_from_account_contains'         => 'Das Quellkonto enthält ":trigger_value"',
-    'rule_trigger_to_account_starts'             => 'Das Zielkonto startet mit ":trigger_value"',
-    'rule_trigger_to_account_ends'               => 'Das Zielkonto endet mit ":trigger_value"',
-    'rule_trigger_to_account_is'                 => 'Das Zielkonto ist ":trigger_value"',
-    'rule_trigger_to_account_contains'           => 'Zielkonto enthält ":trigger_value"',
-    'rule_trigger_transaction_type'              => 'Transaktion ist vom Typ ": Trigger_value"',
-    'rule_trigger_category_is'                   => 'Kategorie ist ":trigger_value"',
-    'rule_trigger_amount_less'                   => 'Betrag ist kleiner als :trigger_value',
-    'rule_trigger_amount_exactly'                => 'Betrag ist :trigger_value',
-    'rule_trigger_amount_more'                   => 'Betrag ist größer als :trigger_value',
-    'rule_trigger_description_starts'            => 'Beschreibung beginnt mit ":trigger_value"',
-    'rule_trigger_description_ends'              => 'Beschreibung endet mit ":trigger_value"',
-    'rule_trigger_description_contains'          => 'Beschreibung enthält ":trigger_value"',
-    'rule_trigger_description_is'                => 'Beschreibung ist ":trigger_value"',
     'rule_trigger_from_account_starts_choice'    => 'Herkunftskonto beginnt mit..',
+    'rule_trigger_from_account_starts'           => 'Das Quellkonto startet mit ":trigger_value"',
     'rule_trigger_from_account_ends_choice'      => 'Herkunftskonto endet mit..',
+    'rule_trigger_from_account_ends'             => 'Das Quellkonto endet mit ":trigger_value"',
     'rule_trigger_from_account_is_choice'        => 'Herkunftskonto ist..',
+    'rule_trigger_from_account_is'               => 'Das Quellkonto ist ":trigger_value"',
     'rule_trigger_from_account_contains_choice'  => 'Herkunftskonto enthält..',
+    'rule_trigger_from_account_contains'         => 'Das Quellkonto enthält ":trigger_value"',
     'rule_trigger_to_account_starts_choice'      => 'Zielkonto beginnt mit..',
+    'rule_trigger_to_account_starts'             => 'Das Zielkonto startet mit ":trigger_value"',
     'rule_trigger_to_account_ends_choice'        => 'Zielkonto endet mit..',
+    'rule_trigger_to_account_ends'               => 'Das Zielkonto endet mit ":trigger_value"',
     'rule_trigger_to_account_is_choice'          => 'Zielkonto ist..',
+    'rule_trigger_to_account_is'                 => 'Das Zielkonto ist ":trigger_value"',
     'rule_trigger_to_account_contains_choice'    => 'Zielkonto enthält..',
+    'rule_trigger_to_account_contains'           => 'Zielkonto enthält ":trigger_value"',
     'rule_trigger_transaction_type_choice'       => 'Überweisung ist vom Typ..',
-    'rule_trigger_amount_less_choice'            => 'Betrag ist geringer als..',
-    'rule_trigger_amount_exactly_choice'         => 'Betrag ist..',
-    'rule_trigger_amount_more_choice'            => 'Betragn ist mehr als..',
-    'rule_trigger_description_starts_choice'     => 'Beschreibung beginnt mit..',
-    'rule_trigger_description_ends_choice'       => 'Beschreibung endet mit..',
-    'rule_trigger_description_contains_choice'   => 'Beschreibung enthält..',
-    'rule_trigger_description_is_choice'         => 'Beschreibung ist..',
+    'rule_trigger_transaction_type'              => 'Transaktion ist vom Typ ": Trigger_value"',
     'rule_trigger_category_is_choice'            => 'Kategorie ist..',
+    'rule_trigger_category_is'                   => 'Kategorie ist ":trigger_value"',
+    'rule_trigger_amount_less_choice'            => 'Betrag ist geringer als..',
+    'rule_trigger_amount_less'                   => 'Betrag ist kleiner als :trigger_value',
+    'rule_trigger_amount_exactly_choice'         => 'Betrag ist..',
+    'rule_trigger_amount_exactly'                => 'Betrag ist :trigger_value',
+    'rule_trigger_amount_more_choice'            => 'Betragn ist mehr als..',
+    'rule_trigger_amount_more'                   => 'Betrag ist größer als :trigger_value',
+    'rule_trigger_description_starts_choice'     => 'Beschreibung beginnt mit..',
+    'rule_trigger_description_starts'            => 'Beschreibung beginnt mit ":trigger_value"',
+    'rule_trigger_description_ends_choice'       => 'Beschreibung endet mit..',
+    'rule_trigger_description_ends'              => 'Beschreibung endet mit ":trigger_value"',
+    'rule_trigger_description_contains_choice'   => 'Beschreibung enthält..',
+    'rule_trigger_description_contains'          => 'Beschreibung enthält ":trigger_value"',
+    'rule_trigger_description_is_choice'         => 'Beschreibung ist..',
+    'rule_trigger_description_is'                => 'Beschreibung ist ":trigger_value"',
     'rule_trigger_budget_is_choice'              => 'Budget ist..',
+    'rule_trigger_budget_is'                     => 'Budget is ":trigger_value"',
     'rule_trigger_tag_is_choice'                 => '(A) Tag ist..',
+    'rule_trigger_tag_is'                        => 'A tag is ":trigger_value"',
     'rule_trigger_has_attachments_choice'        => 'Hat zumindest so viele Anhänge',
     'rule_trigger_has_attachments'               => 'Hat zumindest :trigger_value Anhäng(e)',
     'rule_trigger_store_journal'                 => 'Wenn eine Transaktion erstellt wird',
     'rule_trigger_update_journal'                => 'Wenn eine Transaktion aktualisiert wird',
+    'rule_trigger_has_no_category_choice'        => 'Has no category',
+    'rule_trigger_has_no_category'               => 'Transaction has no category',
+    'rule_trigger_has_any_category_choice'       => 'Has a (any) category',
+    'rule_trigger_has_any_category'              => 'Transaction has a (any) category',
+    'rule_trigger_has_no_budget_choice'          => 'Has no budget',
+    'rule_trigger_has_no_budget'                 => 'Transaction has no budget',
+    'rule_trigger_has_any_budget_choice'         => 'Has a (any) budget',
+    'rule_trigger_has_any_budget'                => 'Transaction has a (any) budget',
+    'rule_trigger_has_no_tag_choice'             => 'Has no tag(s)',
+    'rule_trigger_has_no_tag'                    => 'Transaction has no tag(s)',
+    'rule_trigger_has_any_tag_choice'            => 'Has one or more (any) tags',
+    'rule_trigger_has_any_tag'                   => 'Transaction has one or more (any) tags',
     'rule_action_set_category'                   => 'Kategorie zu ":action_value" festlegen',
     'rule_action_clear_category'                 => 'Bereinige Kategorie',
     'rule_action_set_budget'                     => 'Budget zu ":action_value" festlegen',
@@ -1020,4 +1034,4 @@ Sollen zusätzlich Ihre Girokonten angezeigt werden?',
     'no_bills_create_default'               => 'Create a bill',
 
 
-];
\ No newline at end of file
+];

From e9354e1b6a0dc9a47e0f1c6023c86cfff1ef0dc8 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 10:42:08 +0200
Subject: [PATCH 549/668] New translations firefly.php (Polish)

---
 resources/lang/pl_PL/firefly.php | 64 +++++++++++++++++++-------------
 1 file changed, 39 insertions(+), 25 deletions(-)

diff --git a/resources/lang/pl_PL/firefly.php b/resources/lang/pl_PL/firefly.php
index aaa8170eb6..82fc49c36a 100644
--- a/resources/lang/pl_PL/firefly.php
+++ b/resources/lang/pl_PL/firefly.php
@@ -239,46 +239,60 @@ return [
 
     // actions and triggers
     'rule_trigger_user_action'                   => 'Akcją użytkownika jest ":trigger_value"',
-    'rule_trigger_from_account_starts'           => 'Konto źródłowe się zaczyna od ":trigger_value"',
-    'rule_trigger_from_account_ends'             => 'Konto źródłowe się kończy na ":trigger_value"',
-    'rule_trigger_from_account_is'               => 'Kontem źródłowym jest ":trigger_value"',
-    'rule_trigger_from_account_contains'         => 'Konto źródłowe zawiera ":trigger_value"',
-    'rule_trigger_to_account_starts'             => 'Konto docelowe się zaczyna od ":trigger_value"',
-    'rule_trigger_to_account_ends'               => 'Konto docelowe się kończy na ":trigger_value"',
-    'rule_trigger_to_account_is'                 => 'Kontem docelowym jest ":trigger_value"',
-    'rule_trigger_to_account_contains'           => 'Konto docelowe zawiera ":trigger_value"',
-    'rule_trigger_transaction_type'              => 'Transakcja jest typu ":trigger_value"',
-    'rule_trigger_category_is'                   => 'Category is ":trigger_value"',
-    'rule_trigger_amount_less'                   => 'Kwota jest mniejsza niż :trigger_value',
-    'rule_trigger_amount_exactly'                => 'Kwota jest równa :trigger_value',
-    'rule_trigger_amount_more'                   => 'Kwota jest większa niż :trigger_value',
-    'rule_trigger_description_starts'            => 'Opis się zaczyna od ":trigger_value"',
-    'rule_trigger_description_ends'              => 'Opis się kończy na ":trigger_value"',
-    'rule_trigger_description_contains'          => 'Opis zawiera ":trigger_value"',
-    'rule_trigger_description_is'                => 'Opis jest ":trigger_value"',
     'rule_trigger_from_account_starts_choice'    => 'Konto źródłowe się zaczyna od..',
+    'rule_trigger_from_account_starts'           => 'Konto źródłowe się zaczyna od ":trigger_value"',
     'rule_trigger_from_account_ends_choice'      => 'Konto źródłowe się kończy na..',
+    'rule_trigger_from_account_ends'             => 'Konto źródłowe się kończy na ":trigger_value"',
     'rule_trigger_from_account_is_choice'        => 'Kontem źródłowym jest..',
+    'rule_trigger_from_account_is'               => 'Kontem źródłowym jest ":trigger_value"',
     'rule_trigger_from_account_contains_choice'  => 'Konto źródłowe zawiera..',
+    'rule_trigger_from_account_contains'         => 'Konto źródłowe zawiera ":trigger_value"',
     'rule_trigger_to_account_starts_choice'      => 'Konto docelowe zaczyna się od..',
+    'rule_trigger_to_account_starts'             => 'Konto docelowe się zaczyna od ":trigger_value"',
     'rule_trigger_to_account_ends_choice'        => 'Konto docelowe kończy się na..',
+    'rule_trigger_to_account_ends'               => 'Konto docelowe się kończy na ":trigger_value"',
     'rule_trigger_to_account_is_choice'          => 'Konto docelowe jest..',
+    'rule_trigger_to_account_is'                 => 'Kontem docelowym jest ":trigger_value"',
     'rule_trigger_to_account_contains_choice'    => 'Konto docelowe zawiera..',
+    'rule_trigger_to_account_contains'           => 'Konto docelowe zawiera ":trigger_value"',
     'rule_trigger_transaction_type_choice'       => 'Transakcja jest typu..',
-    'rule_trigger_amount_less_choice'            => 'Kwota jest mniejsza niż..',
-    'rule_trigger_amount_exactly_choice'         => 'Kwota jest..',
-    'rule_trigger_amount_more_choice'            => 'Kwota jest większa niż..',
-    'rule_trigger_description_starts_choice'     => 'Opis rozpoczyna się od..',
-    'rule_trigger_description_ends_choice'       => 'Opis kończy się na..',
-    'rule_trigger_description_contains_choice'   => 'Opis zawiera..',
-    'rule_trigger_description_is_choice'         => 'Opis jest..',
+    'rule_trigger_transaction_type'              => 'Transakcja jest typu ":trigger_value"',
     'rule_trigger_category_is_choice'            => 'Kategoria jest..',
+    'rule_trigger_category_is'                   => 'Category is ":trigger_value"',
+    'rule_trigger_amount_less_choice'            => 'Kwota jest mniejsza niż..',
+    'rule_trigger_amount_less'                   => 'Kwota jest mniejsza niż :trigger_value',
+    'rule_trigger_amount_exactly_choice'         => 'Kwota jest..',
+    'rule_trigger_amount_exactly'                => 'Kwota jest równa :trigger_value',
+    'rule_trigger_amount_more_choice'            => 'Kwota jest większa niż..',
+    'rule_trigger_amount_more'                   => 'Kwota jest większa niż :trigger_value',
+    'rule_trigger_description_starts_choice'     => 'Opis rozpoczyna się od..',
+    'rule_trigger_description_starts'            => 'Opis się zaczyna od ":trigger_value"',
+    'rule_trigger_description_ends_choice'       => 'Opis kończy się na..',
+    'rule_trigger_description_ends'              => 'Opis się kończy na ":trigger_value"',
+    'rule_trigger_description_contains_choice'   => 'Opis zawiera..',
+    'rule_trigger_description_contains'          => 'Opis zawiera ":trigger_value"',
+    'rule_trigger_description_is_choice'         => 'Opis jest..',
+    'rule_trigger_description_is'                => 'Opis jest ":trigger_value"',
     'rule_trigger_budget_is_choice'              => 'Budżet jest..',
+    'rule_trigger_budget_is'                     => 'Budget is ":trigger_value"',
     'rule_trigger_tag_is_choice'                 => 'Tag jest..',
+    'rule_trigger_tag_is'                        => 'A tag is ":trigger_value"',
     'rule_trigger_has_attachments_choice'        => 'Has at least this many attachments',
     'rule_trigger_has_attachments'               => 'Has at least :trigger_value attachment(s)',
     'rule_trigger_store_journal'                 => 'Po utworzeniu transakcji',
     'rule_trigger_update_journal'                => 'Po zmodyfikowaniu transakcji',
+    'rule_trigger_has_no_category_choice'        => 'Has no category',
+    'rule_trigger_has_no_category'               => 'Transaction has no category',
+    'rule_trigger_has_any_category_choice'       => 'Has a (any) category',
+    'rule_trigger_has_any_category'              => 'Transaction has a (any) category',
+    'rule_trigger_has_no_budget_choice'          => 'Has no budget',
+    'rule_trigger_has_no_budget'                 => 'Transaction has no budget',
+    'rule_trigger_has_any_budget_choice'         => 'Has a (any) budget',
+    'rule_trigger_has_any_budget'                => 'Transaction has a (any) budget',
+    'rule_trigger_has_no_tag_choice'             => 'Has no tag(s)',
+    'rule_trigger_has_no_tag'                    => 'Transaction has no tag(s)',
+    'rule_trigger_has_any_tag_choice'            => 'Has one or more (any) tags',
+    'rule_trigger_has_any_tag'                   => 'Transaction has one or more (any) tags',
     'rule_action_set_category'                   => 'Ustaw kategorię na ":action_value"',
     'rule_action_clear_category'                 => 'Wyczyść kategorię',
     'rule_action_set_budget'                     => 'Ustaw budżet na ":action_value"',
@@ -1019,4 +1033,4 @@ return [
     'no_bills_create_default'               => 'Utwórz rachunek',
 
 
-];
\ No newline at end of file
+];

From 5ac3dccb37d0cb309fdffdd020602ff22ab9ce2d Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 10:42:11 +0200
Subject: [PATCH 550/668] New translations firefly.php (French)

---
 resources/lang/fr_FR/firefly.php | 62 +++++++++++++++++++-------------
 1 file changed, 38 insertions(+), 24 deletions(-)

diff --git a/resources/lang/fr_FR/firefly.php b/resources/lang/fr_FR/firefly.php
index f63e446690..46eda5479b 100644
--- a/resources/lang/fr_FR/firefly.php
+++ b/resources/lang/fr_FR/firefly.php
@@ -239,46 +239,60 @@ return [
 
     // actions and triggers
     'rule_trigger_user_action'                   => 'L\'action de l’utilisateur est ": trigger_value"',
-    'rule_trigger_from_account_starts'           => 'Le compte source commence par ":trigger_value"',
-    'rule_trigger_from_account_ends'             => 'Le compte source se termine par ":trigger_value"',
-    'rule_trigger_from_account_is'               => 'Le compte source est ":trigger_value"',
-    'rule_trigger_from_account_contains'         => 'Le compte source contient ":trigger_value"',
-    'rule_trigger_to_account_starts'             => 'Le compte de destination commence par ":trigger_value"',
-    'rule_trigger_to_account_ends'               => 'Le compte de destination se termine par ":trigger_value"',
-    'rule_trigger_to_account_is'                 => 'Le compte de destination est ":trigger_value"',
-    'rule_trigger_to_account_contains'           => 'Le compte de destination contient ":trigger_value"',
-    'rule_trigger_transaction_type'              => 'L\'opération est du type ":trigger_value"',
-    'rule_trigger_category_is'                   => 'La catégorie est ":trigger_value"',
-    'rule_trigger_amount_less'                   => 'Le montant est inférieur à :trigger_value',
-    'rule_trigger_amount_exactly'                => 'Le montant est :trigger_value',
-    'rule_trigger_amount_more'                   => 'Le montant est supérieur à :trigger_value',
-    'rule_trigger_description_starts'            => 'La description commence par ":trigger_value"',
-    'rule_trigger_description_ends'              => 'La description se termine par ":trigger_value"',
-    'rule_trigger_description_contains'          => 'La description contient ":trigger_value"',
-    'rule_trigger_description_is'                => 'La description est ":trigger_value"',
     'rule_trigger_from_account_starts_choice'    => 'Le compte source commence par..',
+    'rule_trigger_from_account_starts'           => 'Le compte source commence par ":trigger_value"',
     'rule_trigger_from_account_ends_choice'      => 'Le compte source se termine par..',
+    'rule_trigger_from_account_ends'             => 'Le compte source se termine par ":trigger_value"',
     'rule_trigger_from_account_is_choice'        => 'Le compte source est..',
+    'rule_trigger_from_account_is'               => 'Le compte source est ":trigger_value"',
     'rule_trigger_from_account_contains_choice'  => 'Le compte source contient..',
+    'rule_trigger_from_account_contains'         => 'Le compte source contient ":trigger_value"',
     'rule_trigger_to_account_starts_choice'      => 'Le compte de destination commence par..',
+    'rule_trigger_to_account_starts'             => 'Le compte de destination commence par ":trigger_value"',
     'rule_trigger_to_account_ends_choice'        => 'Compte de destination se terminant par..',
+    'rule_trigger_to_account_ends'               => 'Le compte de destination se termine par ":trigger_value"',
     'rule_trigger_to_account_is_choice'          => 'Le compte de destination est..',
+    'rule_trigger_to_account_is'                 => 'Le compte de destination est ":trigger_value"',
     'rule_trigger_to_account_contains_choice'    => 'Le compte de destination est..',
+    'rule_trigger_to_account_contains'           => 'Le compte de destination contient ":trigger_value"',
     'rule_trigger_transaction_type_choice'       => 'L\'opération est du type..',
-    'rule_trigger_amount_less_choice'            => 'Le montant est inférieur à..',
-    'rule_trigger_amount_exactly_choice'         => 'Le montant est..',
-    'rule_trigger_amount_more_choice'            => 'Le montant est supérieur à..',
-    'rule_trigger_description_starts_choice'     => 'Le description commence par..',
-    'rule_trigger_description_ends_choice'       => 'La description se termine par..',
-    'rule_trigger_description_contains_choice'   => 'La description contient..',
-    'rule_trigger_description_is_choice'         => 'La description est..',
+    'rule_trigger_transaction_type'              => 'L\'opération est du type ":trigger_value"',
     'rule_trigger_category_is_choice'            => 'La catégorie est..',
+    'rule_trigger_category_is'                   => 'La catégorie est ":trigger_value"',
+    'rule_trigger_amount_less_choice'            => 'Le montant est inférieur à..',
+    'rule_trigger_amount_less'                   => 'Le montant est inférieur à :trigger_value',
+    'rule_trigger_amount_exactly_choice'         => 'Le montant est..',
+    'rule_trigger_amount_exactly'                => 'Le montant est :trigger_value',
+    'rule_trigger_amount_more_choice'            => 'Le montant est supérieur à..',
+    'rule_trigger_amount_more'                   => 'Le montant est supérieur à :trigger_value',
+    'rule_trigger_description_starts_choice'     => 'Le description commence par..',
+    'rule_trigger_description_starts'            => 'La description commence par ":trigger_value"',
+    'rule_trigger_description_ends_choice'       => 'La description se termine par..',
+    'rule_trigger_description_ends'              => 'La description se termine par ":trigger_value"',
+    'rule_trigger_description_contains_choice'   => 'La description contient..',
+    'rule_trigger_description_contains'          => 'La description contient ":trigger_value"',
+    'rule_trigger_description_is_choice'         => 'La description est..',
+    'rule_trigger_description_is'                => 'La description est ":trigger_value"',
     'rule_trigger_budget_is_choice'              => 'Le budget est..',
+    'rule_trigger_budget_is'                     => 'Budget is ":trigger_value"',
     'rule_trigger_tag_is_choice'                 => '(A) le tag est..',
+    'rule_trigger_tag_is'                        => 'A tag is ":trigger_value"',
     'rule_trigger_has_attachments_choice'        => 'À au moins autant de pièces jointes',
     'rule_trigger_has_attachments'               => 'À au moins :trigger_value pièce(s) jointe(s)',
     'rule_trigger_store_journal'                 => 'Lorsqu’une transaction est créée',
     'rule_trigger_update_journal'                => 'Lorsqu’une transaction est mise à jour',
+    'rule_trigger_has_no_category_choice'        => 'Has no category',
+    'rule_trigger_has_no_category'               => 'Transaction has no category',
+    'rule_trigger_has_any_category_choice'       => 'Has a (any) category',
+    'rule_trigger_has_any_category'              => 'Transaction has a (any) category',
+    'rule_trigger_has_no_budget_choice'          => 'Has no budget',
+    'rule_trigger_has_no_budget'                 => 'Transaction has no budget',
+    'rule_trigger_has_any_budget_choice'         => 'Has a (any) budget',
+    'rule_trigger_has_any_budget'                => 'Transaction has a (any) budget',
+    'rule_trigger_has_no_tag_choice'             => 'Has no tag(s)',
+    'rule_trigger_has_no_tag'                    => 'Transaction has no tag(s)',
+    'rule_trigger_has_any_tag_choice'            => 'Has one or more (any) tags',
+    'rule_trigger_has_any_tag'                   => 'Transaction has one or more (any) tags',
     'rule_action_set_category'                   => 'Définir la catégorie à ":action_value"',
     'rule_action_clear_category'                 => 'Supprimer la catégorie',
     'rule_action_set_budget'                     => 'Définir le budget à ":action_value"',

From 8e332119e323d0893ecb235b59be7aad212d78b0 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 10:42:13 +0200
Subject: [PATCH 551/668] New translations firefly.php (Dutch)

---
 resources/lang/nl_NL/firefly.php | 64 +++++++++++++++++++-------------
 1 file changed, 39 insertions(+), 25 deletions(-)

diff --git a/resources/lang/nl_NL/firefly.php b/resources/lang/nl_NL/firefly.php
index 52744a1745..d99063435c 100644
--- a/resources/lang/nl_NL/firefly.php
+++ b/resources/lang/nl_NL/firefly.php
@@ -239,46 +239,60 @@ return [
 
     // actions and triggers
     'rule_trigger_user_action'                   => 'Gebruikersactie is ":trigger_value"',
-    'rule_trigger_from_account_starts'           => 'Bronrekeningnaam begint met ":trigger_value"',
-    'rule_trigger_from_account_ends'             => 'Bronrekeningnaam eindigt op ":trigger_value"',
-    'rule_trigger_from_account_is'               => 'Bronrekeningnaam is ":trigger_value"',
-    'rule_trigger_from_account_contains'         => 'Bronrekeningnaam bevat ":trigger_value"',
-    'rule_trigger_to_account_starts'             => 'Doelrekeningnaam begint met ":trigger_value"',
-    'rule_trigger_to_account_ends'               => 'Doelrekeningnaam eindigt op ":trigger_value"',
-    'rule_trigger_to_account_is'                 => 'Doelrekeningnaam is ":trigger_value"',
-    'rule_trigger_to_account_contains'           => 'Doelrekeningnaam bevat ":trigger_value"',
-    'rule_trigger_transaction_type'              => 'Transactiesoort is ":trigger_value" (Engels)',
-    'rule_trigger_category_is'                   => 'Categorie is ":trigger_value"',
-    'rule_trigger_amount_less'                   => 'Bedrag is minder dan :trigger_value',
-    'rule_trigger_amount_exactly'                => 'Bedrag is :trigger_value',
-    'rule_trigger_amount_more'                   => 'Bedrag is meer dan :trigger_value',
-    'rule_trigger_description_starts'            => 'Omschrijving begint met ":trigger_value"',
-    'rule_trigger_description_ends'              => 'Omschrijving eindigt op ":trigger_value"',
-    'rule_trigger_description_contains'          => 'Omschrijving bevat ":trigger_value"',
-    'rule_trigger_description_is'                => 'Omschrijving is ":trigger_value"',
     'rule_trigger_from_account_starts_choice'    => 'Bronrekening naam begint met..',
+    'rule_trigger_from_account_starts'           => 'Bronrekeningnaam begint met ":trigger_value"',
     'rule_trigger_from_account_ends_choice'      => 'Bronrekening eindigt op..',
+    'rule_trigger_from_account_ends'             => 'Bronrekeningnaam eindigt op ":trigger_value"',
     'rule_trigger_from_account_is_choice'        => 'Bronrekening is..',
+    'rule_trigger_from_account_is'               => 'Bronrekeningnaam is ":trigger_value"',
     'rule_trigger_from_account_contains_choice'  => 'Bronrekening bevat..',
+    'rule_trigger_from_account_contains'         => 'Bronrekeningnaam bevat ":trigger_value"',
     'rule_trigger_to_account_starts_choice'      => 'Doelrekeningnaam begint met..',
+    'rule_trigger_to_account_starts'             => 'Doelrekeningnaam begint met ":trigger_value"',
     'rule_trigger_to_account_ends_choice'        => 'Doelrekeningnaam eindigt op..',
+    'rule_trigger_to_account_ends'               => 'Doelrekeningnaam eindigt op ":trigger_value"',
     'rule_trigger_to_account_is_choice'          => 'Doelrekeningnaam is..',
+    'rule_trigger_to_account_is'                 => 'Doelrekeningnaam is ":trigger_value"',
     'rule_trigger_to_account_contains_choice'    => 'Doelrekeningnaam bevat..',
+    'rule_trigger_to_account_contains'           => 'Doelrekeningnaam bevat ":trigger_value"',
     'rule_trigger_transaction_type_choice'       => 'Transactietype is..',
-    'rule_trigger_amount_less_choice'            => 'Bedrag is minder dan..',
-    'rule_trigger_amount_exactly_choice'         => 'Bedrag is..',
-    'rule_trigger_amount_more_choice'            => 'Bedrag is meer dan..',
-    'rule_trigger_description_starts_choice'     => 'Omschrijving begint met..',
-    'rule_trigger_description_ends_choice'       => 'Omschrijving eindigt op..',
-    'rule_trigger_description_contains_choice'   => 'Omschrijving bevat..',
-    'rule_trigger_description_is_choice'         => 'Omschrijving is..',
+    'rule_trigger_transaction_type'              => 'Transactiesoort is ":trigger_value" (Engels)',
     'rule_trigger_category_is_choice'            => 'Categorie is..',
+    'rule_trigger_category_is'                   => 'Categorie is ":trigger_value"',
+    'rule_trigger_amount_less_choice'            => 'Bedrag is minder dan..',
+    'rule_trigger_amount_less'                   => 'Bedrag is minder dan :trigger_value',
+    'rule_trigger_amount_exactly_choice'         => 'Bedrag is..',
+    'rule_trigger_amount_exactly'                => 'Bedrag is :trigger_value',
+    'rule_trigger_amount_more_choice'            => 'Bedrag is meer dan..',
+    'rule_trigger_amount_more'                   => 'Bedrag is meer dan :trigger_value',
+    'rule_trigger_description_starts_choice'     => 'Omschrijving begint met..',
+    'rule_trigger_description_starts'            => 'Omschrijving begint met ":trigger_value"',
+    'rule_trigger_description_ends_choice'       => 'Omschrijving eindigt op..',
+    'rule_trigger_description_ends'              => 'Omschrijving eindigt op ":trigger_value"',
+    'rule_trigger_description_contains_choice'   => 'Omschrijving bevat..',
+    'rule_trigger_description_contains'          => 'Omschrijving bevat ":trigger_value"',
+    'rule_trigger_description_is_choice'         => 'Omschrijving is..',
+    'rule_trigger_description_is'                => 'Omschrijving is ":trigger_value"',
     'rule_trigger_budget_is_choice'              => 'Budget is..',
+    'rule_trigger_budget_is'                     => 'Budget is ":trigger_value"',
     'rule_trigger_tag_is_choice'                 => '(Een) tag is..',
+    'rule_trigger_tag_is'                        => 'A tag is ":trigger_value"',
     'rule_trigger_has_attachments_choice'        => 'Heeft minstens zoveel bijlagen',
     'rule_trigger_has_attachments'               => 'Heeft minstens :trigger_value bijlage(n)',
     'rule_trigger_store_journal'                 => 'Als een transactie wordt gemaakt',
     'rule_trigger_update_journal'                => 'Als een transactie wordt bijgewerkt',
+    'rule_trigger_has_no_category_choice'        => 'Has no category',
+    'rule_trigger_has_no_category'               => 'Transaction has no category',
+    'rule_trigger_has_any_category_choice'       => 'Has a (any) category',
+    'rule_trigger_has_any_category'              => 'Transaction has a (any) category',
+    'rule_trigger_has_no_budget_choice'          => 'Has no budget',
+    'rule_trigger_has_no_budget'                 => 'Transaction has no budget',
+    'rule_trigger_has_any_budget_choice'         => 'Has a (any) budget',
+    'rule_trigger_has_any_budget'                => 'Transaction has a (any) budget',
+    'rule_trigger_has_no_tag_choice'             => 'Has no tag(s)',
+    'rule_trigger_has_no_tag'                    => 'Transaction has no tag(s)',
+    'rule_trigger_has_any_tag_choice'            => 'Has one or more (any) tags',
+    'rule_trigger_has_any_tag'                   => 'Transaction has one or more (any) tags',
     'rule_action_set_category'                   => 'Verander categorie naar ":action_value"',
     'rule_action_clear_category'                 => 'Maak categorie-veld leeg',
     'rule_action_set_budget'                     => 'Sla op onder budget ":action_value"',
@@ -1019,4 +1033,4 @@ return [
     'no_bills_create_default'               => 'Maak een contract',
 
 
-];
\ No newline at end of file
+];

From d515bda8682e0a386dc24bd64c332d04fb92c290 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 10:42:14 +0200
Subject: [PATCH 552/668] New translations csv.php (Spanish)

---
 resources/lang/es_ES/csv.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/es_ES/csv.php b/resources/lang/es_ES/csv.php
index 05fff74b06..42c5abf09a 100644
--- a/resources/lang/es_ES/csv.php
+++ b/resources/lang/es_ES/csv.php
@@ -80,4 +80,4 @@ return [
     'column_tags-space'             => 'Etiquetas (separadas por espacios)',
     'column_account-number'         => 'Caja de ahorro (número de cuenta)',
     'column_opposing-number'        => 'Cuenta opuesta (número de cuenta)',
-];
\ No newline at end of file
+];

From 2417224991916cad460e44467adb50c5132a5452 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 10:42:18 +0200
Subject: [PATCH 553/668] New translations firefly.php (Portuguese, Brazilian)

---
 resources/lang/pt_BR/firefly.php | 64 +++++++++++++++++++-------------
 1 file changed, 39 insertions(+), 25 deletions(-)

diff --git a/resources/lang/pt_BR/firefly.php b/resources/lang/pt_BR/firefly.php
index 4e3b0c51b6..ea6e934da2 100644
--- a/resources/lang/pt_BR/firefly.php
+++ b/resources/lang/pt_BR/firefly.php
@@ -239,46 +239,60 @@ return [
 
     // actions and triggers
     'rule_trigger_user_action'                   => 'Ação do usuário é ":trigger_value"',
-    'rule_trigger_from_account_starts'           => 'Conta de origem começa com ":trigger_value"',
-    'rule_trigger_from_account_ends'             => 'Conta de origem termina com ":trigger_value"',
-    'rule_trigger_from_account_is'               => 'É da conta de origem ":trigger_value"',
-    'rule_trigger_from_account_contains'         => 'Conta de origem contém ":trigger_value"',
-    'rule_trigger_to_account_starts'             => 'Conta destino começa com ":trigger_value"',
-    'rule_trigger_to_account_ends'               => 'Conta destino termina com ":trigger_value"',
-    'rule_trigger_to_account_is'                 => 'Conta de destino é ":trigger_value"',
-    'rule_trigger_to_account_contains'           => 'Conta de destino contém ":trigger_value"',
-    'rule_trigger_transaction_type'              => 'Transação é do tipo ":trigger_value"',
-    'rule_trigger_category_is'                   => 'Category is ":trigger_value"',
-    'rule_trigger_amount_less'                   => 'Quantia é inferior :trigger_value',
-    'rule_trigger_amount_exactly'                => 'Quantia é: trigger_value',
-    'rule_trigger_amount_more'                   => 'Quantia é mais de :trigger_value',
-    'rule_trigger_description_starts'            => 'Descrição começa com ":trigger_value"',
-    'rule_trigger_description_ends'              => 'Descrição termina com ":trigger_value"',
-    'rule_trigger_description_contains'          => 'Descrição contém ":trigger_value"',
-    'rule_trigger_description_is'                => 'Descrição é ":trigger_value"',
     'rule_trigger_from_account_starts_choice'    => 'Conta de origem começa com..',
+    'rule_trigger_from_account_starts'           => 'Conta de origem começa com ":trigger_value"',
     'rule_trigger_from_account_ends_choice'      => 'Conta de origem termina com..',
+    'rule_trigger_from_account_ends'             => 'Conta de origem termina com ":trigger_value"',
     'rule_trigger_from_account_is_choice'        => 'Conta de origem é..',
+    'rule_trigger_from_account_is'               => 'É da conta de origem ":trigger_value"',
     'rule_trigger_from_account_contains_choice'  => 'Conta de origem contém..',
+    'rule_trigger_from_account_contains'         => 'Conta de origem contém ":trigger_value"',
     'rule_trigger_to_account_starts_choice'      => 'Conta de destino começa com..',
+    'rule_trigger_to_account_starts'             => 'Conta destino começa com ":trigger_value"',
     'rule_trigger_to_account_ends_choice'        => 'Conta de destino termina com..',
+    'rule_trigger_to_account_ends'               => 'Conta destino termina com ":trigger_value"',
     'rule_trigger_to_account_is_choice'          => 'Conta de destino é..',
+    'rule_trigger_to_account_is'                 => 'Conta de destino é ":trigger_value"',
     'rule_trigger_to_account_contains_choice'    => 'Conta de destino contém..',
+    'rule_trigger_to_account_contains'           => 'Conta de destino contém ":trigger_value"',
     'rule_trigger_transaction_type_choice'       => 'Transação é do tipo..',
-    'rule_trigger_amount_less_choice'            => 'Quantia é inferior a..',
-    'rule_trigger_amount_exactly_choice'         => 'Quantia é..',
-    'rule_trigger_amount_more_choice'            => 'Quantia é mais do que..',
-    'rule_trigger_description_starts_choice'     => 'Descrição começa com..',
-    'rule_trigger_description_ends_choice'       => 'Descrição termina com..',
-    'rule_trigger_description_contains_choice'   => 'Descrição contém..',
-    'rule_trigger_description_is_choice'         => 'Descrição é..',
+    'rule_trigger_transaction_type'              => 'Transação é do tipo ":trigger_value"',
     'rule_trigger_category_is_choice'            => 'Category is..',
+    'rule_trigger_category_is'                   => 'Category is ":trigger_value"',
+    'rule_trigger_amount_less_choice'            => 'Quantia é inferior a..',
+    'rule_trigger_amount_less'                   => 'Quantia é inferior :trigger_value',
+    'rule_trigger_amount_exactly_choice'         => 'Quantia é..',
+    'rule_trigger_amount_exactly'                => 'Quantia é: trigger_value',
+    'rule_trigger_amount_more_choice'            => 'Quantia é mais do que..',
+    'rule_trigger_amount_more'                   => 'Quantia é mais de :trigger_value',
+    'rule_trigger_description_starts_choice'     => 'Descrição começa com..',
+    'rule_trigger_description_starts'            => 'Descrição começa com ":trigger_value"',
+    'rule_trigger_description_ends_choice'       => 'Descrição termina com..',
+    'rule_trigger_description_ends'              => 'Descrição termina com ":trigger_value"',
+    'rule_trigger_description_contains_choice'   => 'Descrição contém..',
+    'rule_trigger_description_contains'          => 'Descrição contém ":trigger_value"',
+    'rule_trigger_description_is_choice'         => 'Descrição é..',
+    'rule_trigger_description_is'                => 'Descrição é ":trigger_value"',
     'rule_trigger_budget_is_choice'              => 'Budget is..',
+    'rule_trigger_budget_is'                     => 'Budget is ":trigger_value"',
     'rule_trigger_tag_is_choice'                 => '(A) tag is..',
+    'rule_trigger_tag_is'                        => 'A tag is ":trigger_value"',
     'rule_trigger_has_attachments_choice'        => 'Has at least this many attachments',
     'rule_trigger_has_attachments'               => 'Has at least :trigger_value attachment(s)',
     'rule_trigger_store_journal'                 => 'When a transaction is created',
     'rule_trigger_update_journal'                => 'When a transaction is updated',
+    'rule_trigger_has_no_category_choice'        => 'Has no category',
+    'rule_trigger_has_no_category'               => 'Transaction has no category',
+    'rule_trigger_has_any_category_choice'       => 'Has a (any) category',
+    'rule_trigger_has_any_category'              => 'Transaction has a (any) category',
+    'rule_trigger_has_no_budget_choice'          => 'Has no budget',
+    'rule_trigger_has_no_budget'                 => 'Transaction has no budget',
+    'rule_trigger_has_any_budget_choice'         => 'Has a (any) budget',
+    'rule_trigger_has_any_budget'                => 'Transaction has a (any) budget',
+    'rule_trigger_has_no_tag_choice'             => 'Has no tag(s)',
+    'rule_trigger_has_no_tag'                    => 'Transaction has no tag(s)',
+    'rule_trigger_has_any_tag_choice'            => 'Has one or more (any) tags',
+    'rule_trigger_has_any_tag'                   => 'Transaction has one or more (any) tags',
     'rule_action_set_category'                   => 'Definir categoria para ":action_value"',
     'rule_action_clear_category'                 => 'Limpar categoria',
     'rule_action_set_budget'                     => 'Definir orçamento para ":action_value"',
@@ -1019,4 +1033,4 @@ return [
     'no_bills_create_default'               => 'Create a bill',
 
 
-];
\ No newline at end of file
+];

From d735c5d10b6e7c36a939f88068a7da4a97563b3b Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 10:42:20 +0200
Subject: [PATCH 554/668] New translations firefly.php (Slovenian)

---
 resources/lang/sl_SI/firefly.php | 64 +++++++++++++++++++-------------
 1 file changed, 39 insertions(+), 25 deletions(-)

diff --git a/resources/lang/sl_SI/firefly.php b/resources/lang/sl_SI/firefly.php
index 6570dac355..79377aef0c 100644
--- a/resources/lang/sl_SI/firefly.php
+++ b/resources/lang/sl_SI/firefly.php
@@ -239,46 +239,60 @@ return [
 
     // actions and triggers
     'rule_trigger_user_action'                   => 'User action is ":trigger_value"',
-    'rule_trigger_from_account_starts'           => 'Source account starts with ":trigger_value"',
-    'rule_trigger_from_account_ends'             => 'Source account ends with ":trigger_value"',
-    'rule_trigger_from_account_is'               => 'Source account is ":trigger_value"',
-    'rule_trigger_from_account_contains'         => 'Source account contains ":trigger_value"',
-    'rule_trigger_to_account_starts'             => 'Destination account starts with ":trigger_value"',
-    'rule_trigger_to_account_ends'               => 'Destination account ends with ":trigger_value"',
-    'rule_trigger_to_account_is'                 => 'Destination account is ":trigger_value"',
-    'rule_trigger_to_account_contains'           => 'Destination account contains ":trigger_value"',
-    'rule_trigger_transaction_type'              => 'Transaction is of type ":trigger_value"',
-    'rule_trigger_category_is'                   => 'Category is ":trigger_value"',
-    'rule_trigger_amount_less'                   => 'Amount is less than :trigger_value',
-    'rule_trigger_amount_exactly'                => 'Amount is :trigger_value',
-    'rule_trigger_amount_more'                   => 'Amount is more than :trigger_value',
-    'rule_trigger_description_starts'            => 'Description starts with ":trigger_value"',
-    'rule_trigger_description_ends'              => 'Description ends with ":trigger_value"',
-    'rule_trigger_description_contains'          => 'Description contains ":trigger_value"',
-    'rule_trigger_description_is'                => 'Description is ":trigger_value"',
     'rule_trigger_from_account_starts_choice'    => 'Source account starts with..',
+    'rule_trigger_from_account_starts'           => 'Source account starts with ":trigger_value"',
     'rule_trigger_from_account_ends_choice'      => 'Source account ends with..',
+    'rule_trigger_from_account_ends'             => 'Source account ends with ":trigger_value"',
     'rule_trigger_from_account_is_choice'        => 'Source account is..',
+    'rule_trigger_from_account_is'               => 'Source account is ":trigger_value"',
     'rule_trigger_from_account_contains_choice'  => 'Source account contains..',
+    'rule_trigger_from_account_contains'         => 'Source account contains ":trigger_value"',
     'rule_trigger_to_account_starts_choice'      => 'Destination account starts with..',
+    'rule_trigger_to_account_starts'             => 'Destination account starts with ":trigger_value"',
     'rule_trigger_to_account_ends_choice'        => 'Destination account ends with..',
+    'rule_trigger_to_account_ends'               => 'Destination account ends with ":trigger_value"',
     'rule_trigger_to_account_is_choice'          => 'Destination account is..',
+    'rule_trigger_to_account_is'                 => 'Destination account is ":trigger_value"',
     'rule_trigger_to_account_contains_choice'    => 'Destination account contains..',
+    'rule_trigger_to_account_contains'           => 'Destination account contains ":trigger_value"',
     'rule_trigger_transaction_type_choice'       => 'Transaction is of type..',
-    'rule_trigger_amount_less_choice'            => 'Amount is less than..',
-    'rule_trigger_amount_exactly_choice'         => 'Amount is..',
-    'rule_trigger_amount_more_choice'            => 'Amount is more than..',
-    'rule_trigger_description_starts_choice'     => 'Description starts with..',
-    'rule_trigger_description_ends_choice'       => 'Description ends with..',
-    'rule_trigger_description_contains_choice'   => 'Description contains..',
-    'rule_trigger_description_is_choice'         => 'Description is..',
+    'rule_trigger_transaction_type'              => 'Transaction is of type ":trigger_value"',
     'rule_trigger_category_is_choice'            => 'Category is..',
+    'rule_trigger_category_is'                   => 'Category is ":trigger_value"',
+    'rule_trigger_amount_less_choice'            => 'Amount is less than..',
+    'rule_trigger_amount_less'                   => 'Amount is less than :trigger_value',
+    'rule_trigger_amount_exactly_choice'         => 'Amount is..',
+    'rule_trigger_amount_exactly'                => 'Amount is :trigger_value',
+    'rule_trigger_amount_more_choice'            => 'Amount is more than..',
+    'rule_trigger_amount_more'                   => 'Amount is more than :trigger_value',
+    'rule_trigger_description_starts_choice'     => 'Description starts with..',
+    'rule_trigger_description_starts'            => 'Description starts with ":trigger_value"',
+    'rule_trigger_description_ends_choice'       => 'Description ends with..',
+    'rule_trigger_description_ends'              => 'Description ends with ":trigger_value"',
+    'rule_trigger_description_contains_choice'   => 'Description contains..',
+    'rule_trigger_description_contains'          => 'Description contains ":trigger_value"',
+    'rule_trigger_description_is_choice'         => 'Description is..',
+    'rule_trigger_description_is'                => 'Description is ":trigger_value"',
     'rule_trigger_budget_is_choice'              => 'Budget is..',
+    'rule_trigger_budget_is'                     => 'Budget is ":trigger_value"',
     'rule_trigger_tag_is_choice'                 => '(A) tag is..',
+    'rule_trigger_tag_is'                        => 'A tag is ":trigger_value"',
     'rule_trigger_has_attachments_choice'        => 'Has at least this many attachments',
     'rule_trigger_has_attachments'               => 'Has at least :trigger_value attachment(s)',
     'rule_trigger_store_journal'                 => 'When a transaction is created',
     'rule_trigger_update_journal'                => 'When a transaction is updated',
+    'rule_trigger_has_no_category_choice'        => 'Has no category',
+    'rule_trigger_has_no_category'               => 'Transaction has no category',
+    'rule_trigger_has_any_category_choice'       => 'Has a (any) category',
+    'rule_trigger_has_any_category'              => 'Transaction has a (any) category',
+    'rule_trigger_has_no_budget_choice'          => 'Has no budget',
+    'rule_trigger_has_no_budget'                 => 'Transaction has no budget',
+    'rule_trigger_has_any_budget_choice'         => 'Has a (any) budget',
+    'rule_trigger_has_any_budget'                => 'Transaction has a (any) budget',
+    'rule_trigger_has_no_tag_choice'             => 'Has no tag(s)',
+    'rule_trigger_has_no_tag'                    => 'Transaction has no tag(s)',
+    'rule_trigger_has_any_tag_choice'            => 'Has one or more (any) tags',
+    'rule_trigger_has_any_tag'                   => 'Transaction has one or more (any) tags',
     'rule_action_set_category'                   => 'Set category to ":action_value"',
     'rule_action_clear_category'                 => 'Clear category',
     'rule_action_set_budget'                     => 'Set budget to ":action_value"',
@@ -1019,4 +1033,4 @@ return [
     'no_bills_create_default'               => 'Create a bill',
 
 
-];
\ No newline at end of file
+];

From bbf923b849416a5b27e0eb7e4cae1abd9872907c Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 10:42:21 +0200
Subject: [PATCH 555/668] New translations form.php (German)

---
 resources/lang/de_DE/form.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/de_DE/form.php b/resources/lang/de_DE/form.php
index 348117197c..07e305d3d2 100644
--- a/resources/lang/de_DE/form.php
+++ b/resources/lang/de_DE/form.php
@@ -197,4 +197,4 @@ return [
 
     'inward'  => 'Inward description',
     'outward' => 'Outward description',
-];
\ No newline at end of file
+];

From 52770a970b609c52155084593621aef950156a2d Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 10:42:23 +0200
Subject: [PATCH 556/668] New translations form.php (French)

---
 resources/lang/fr_FR/form.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/fr_FR/form.php b/resources/lang/fr_FR/form.php
index 61e05d3102..8fbad6245f 100644
--- a/resources/lang/fr_FR/form.php
+++ b/resources/lang/fr_FR/form.php
@@ -197,4 +197,4 @@ return [
 
     'inward'  => 'Description vers l’intérieur',
     'outward' => 'Description de l’extérieur',
-];
\ No newline at end of file
+];

From 5d239b896cb11ef6ad32ff6602ee52d881da2fcf Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 10:42:26 +0200
Subject: [PATCH 557/668] New translations firefly.php (Spanish)

---
 resources/lang/es_ES/firefly.php | 64 +++++++++++++++++++-------------
 1 file changed, 39 insertions(+), 25 deletions(-)

diff --git a/resources/lang/es_ES/firefly.php b/resources/lang/es_ES/firefly.php
index 81d80ad9f1..3f74de30e0 100644
--- a/resources/lang/es_ES/firefly.php
+++ b/resources/lang/es_ES/firefly.php
@@ -239,46 +239,60 @@ return [
 
     // actions and triggers
     'rule_trigger_user_action'                   => 'User action is ":trigger_value"',
-    'rule_trigger_from_account_starts'           => 'Source account starts with ":trigger_value"',
-    'rule_trigger_from_account_ends'             => 'Source account ends with ":trigger_value"',
-    'rule_trigger_from_account_is'               => 'Source account is ":trigger_value"',
-    'rule_trigger_from_account_contains'         => 'Source account contains ":trigger_value"',
-    'rule_trigger_to_account_starts'             => 'Destination account starts with ":trigger_value"',
-    'rule_trigger_to_account_ends'               => 'Destination account ends with ":trigger_value"',
-    'rule_trigger_to_account_is'                 => 'Destination account is ":trigger_value"',
-    'rule_trigger_to_account_contains'           => 'Destination account contains ":trigger_value"',
-    'rule_trigger_transaction_type'              => 'Transaction is of type ":trigger_value"',
-    'rule_trigger_category_is'                   => 'Category is ":trigger_value"',
-    'rule_trigger_amount_less'                   => 'Amount is less than :trigger_value',
-    'rule_trigger_amount_exactly'                => 'Amount is :trigger_value',
-    'rule_trigger_amount_more'                   => 'Amount is more than :trigger_value',
-    'rule_trigger_description_starts'            => 'Description starts with ":trigger_value"',
-    'rule_trigger_description_ends'              => 'Description ends with ":trigger_value"',
-    'rule_trigger_description_contains'          => 'Description contains ":trigger_value"',
-    'rule_trigger_description_is'                => 'Description is ":trigger_value"',
     'rule_trigger_from_account_starts_choice'    => 'Source account starts with..',
+    'rule_trigger_from_account_starts'           => 'Source account starts with ":trigger_value"',
     'rule_trigger_from_account_ends_choice'      => 'Source account ends with..',
+    'rule_trigger_from_account_ends'             => 'Source account ends with ":trigger_value"',
     'rule_trigger_from_account_is_choice'        => 'Source account is..',
+    'rule_trigger_from_account_is'               => 'Source account is ":trigger_value"',
     'rule_trigger_from_account_contains_choice'  => 'Source account contains..',
+    'rule_trigger_from_account_contains'         => 'Source account contains ":trigger_value"',
     'rule_trigger_to_account_starts_choice'      => 'Destination account starts with..',
+    'rule_trigger_to_account_starts'             => 'Destination account starts with ":trigger_value"',
     'rule_trigger_to_account_ends_choice'        => 'Destination account ends with..',
+    'rule_trigger_to_account_ends'               => 'Destination account ends with ":trigger_value"',
     'rule_trigger_to_account_is_choice'          => 'Destination account is..',
+    'rule_trigger_to_account_is'                 => 'Destination account is ":trigger_value"',
     'rule_trigger_to_account_contains_choice'    => 'Destination account contains..',
+    'rule_trigger_to_account_contains'           => 'Destination account contains ":trigger_value"',
     'rule_trigger_transaction_type_choice'       => 'Transaction is of type..',
-    'rule_trigger_amount_less_choice'            => 'Amount is less than..',
-    'rule_trigger_amount_exactly_choice'         => 'Amount is..',
-    'rule_trigger_amount_more_choice'            => 'Amount is more than..',
-    'rule_trigger_description_starts_choice'     => 'Description starts with..',
-    'rule_trigger_description_ends_choice'       => 'Description ends with..',
-    'rule_trigger_description_contains_choice'   => 'Description contains..',
-    'rule_trigger_description_is_choice'         => 'Description is..',
+    'rule_trigger_transaction_type'              => 'Transaction is of type ":trigger_value"',
     'rule_trigger_category_is_choice'            => 'Category is..',
+    'rule_trigger_category_is'                   => 'Category is ":trigger_value"',
+    'rule_trigger_amount_less_choice'            => 'Amount is less than..',
+    'rule_trigger_amount_less'                   => 'Amount is less than :trigger_value',
+    'rule_trigger_amount_exactly_choice'         => 'Amount is..',
+    'rule_trigger_amount_exactly'                => 'Amount is :trigger_value',
+    'rule_trigger_amount_more_choice'            => 'Amount is more than..',
+    'rule_trigger_amount_more'                   => 'Amount is more than :trigger_value',
+    'rule_trigger_description_starts_choice'     => 'Description starts with..',
+    'rule_trigger_description_starts'            => 'Description starts with ":trigger_value"',
+    'rule_trigger_description_ends_choice'       => 'Description ends with..',
+    'rule_trigger_description_ends'              => 'Description ends with ":trigger_value"',
+    'rule_trigger_description_contains_choice'   => 'Description contains..',
+    'rule_trigger_description_contains'          => 'Description contains ":trigger_value"',
+    'rule_trigger_description_is_choice'         => 'Description is..',
+    'rule_trigger_description_is'                => 'Description is ":trigger_value"',
     'rule_trigger_budget_is_choice'              => 'Budget is..',
+    'rule_trigger_budget_is'                     => 'Budget is ":trigger_value"',
     'rule_trigger_tag_is_choice'                 => '(A) tag is..',
+    'rule_trigger_tag_is'                        => 'A tag is ":trigger_value"',
     'rule_trigger_has_attachments_choice'        => 'Has at least this many attachments',
     'rule_trigger_has_attachments'               => 'Has at least :trigger_value attachment(s)',
     'rule_trigger_store_journal'                 => 'When a transaction is created',
     'rule_trigger_update_journal'                => 'When a transaction is updated',
+    'rule_trigger_has_no_category_choice'        => 'Has no category',
+    'rule_trigger_has_no_category'               => 'Transaction has no category',
+    'rule_trigger_has_any_category_choice'       => 'Has a (any) category',
+    'rule_trigger_has_any_category'              => 'Transaction has a (any) category',
+    'rule_trigger_has_no_budget_choice'          => 'Has no budget',
+    'rule_trigger_has_no_budget'                 => 'Transaction has no budget',
+    'rule_trigger_has_any_budget_choice'         => 'Has a (any) budget',
+    'rule_trigger_has_any_budget'                => 'Transaction has a (any) budget',
+    'rule_trigger_has_no_tag_choice'             => 'Has no tag(s)',
+    'rule_trigger_has_no_tag'                    => 'Transaction has no tag(s)',
+    'rule_trigger_has_any_tag_choice'            => 'Has one or more (any) tags',
+    'rule_trigger_has_any_tag'                   => 'Transaction has one or more (any) tags',
     'rule_action_set_category'                   => 'Set category to ":action_value"',
     'rule_action_clear_category'                 => 'Clear category',
     'rule_action_set_budget'                     => 'Set budget to ":action_value"',
@@ -1019,4 +1033,4 @@ return [
     'no_bills_create_default'               => 'Crear una factura',
 
 
-];
\ No newline at end of file
+];

From b29c0f9d74ae044ae7a73dff492f2b73dd048377 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 10:42:27 +0200
Subject: [PATCH 558/668] New translations auth.php (Dutch)

---
 resources/lang/nl_NL/auth.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/nl_NL/auth.php b/resources/lang/nl_NL/auth.php
index 8c31982497..b89dee9b5b 100644
--- a/resources/lang/nl_NL/auth.php
+++ b/resources/lang/nl_NL/auth.php
@@ -27,4 +27,4 @@ return [
     'failed'   => 'Deze gegevens zijn niet correct.',
     'throttle' => 'Te veel inlogpogingen. Probeer opnieuw in: seconden seconden.',
 
-];
\ No newline at end of file
+];

From 6b0946681950218cb3013bb22e304c7284682409 Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Sun, 3 Sep 2017 10:51:02 +0200
Subject: [PATCH 559/668] Implement #803

---
 .../Transaction/SingleController.php          | 25 +++++++++++++++++--
 public/js/ff/transactions/single/create.js    |  2 ++
 resources/lang/en_US/firefly.php              |  5 ++++
 3 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/app/Http/Controllers/Transaction/SingleController.php b/app/Http/Controllers/Transaction/SingleController.php
index 1265b2c8c3..b02ca753fd 100644
--- a/app/Http/Controllers/Transaction/SingleController.php
+++ b/app/Http/Controllers/Transaction/SingleController.php
@@ -21,6 +21,7 @@ use FireflyIII\Events\UpdatedTransactionJournal;
 use FireflyIII\Helpers\Attachments\AttachmentHelperInterface;
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Http\Requests\JournalFormRequest;
+use FireflyIII\Models\Account;
 use FireflyIII\Models\AccountType;
 use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionJournal;
@@ -143,7 +144,7 @@ class SingleController extends Controller
     {
         $what           = strtolower($what);
         $uploadSize     = min(Steam::phpBytes(ini_get('upload_max_filesize')), Steam::phpBytes(ini_get('post_max_size')));
-        $assetAccounts  = ExpandedForm::makeSelectList($this->accounts->getActiveAccountsByType([AccountType::DEFAULT, AccountType::ASSET]));
+        $assetAccounts  = $this->groupedAccountList();
         $budgets        = ExpandedForm::makeSelectListWithEmpty($this->budgets->getActiveBudgets());
         $piggyBanks     = $this->piggyBanks->getPiggyBanksWithAmount();
         $piggies        = ExpandedForm::makeSelectListWithEmpty($piggyBanks);
@@ -239,7 +240,7 @@ class SingleController extends Controller
         }
 
         $what          = strtolower($journal->transactionTypeStr());
-        $assetAccounts = ExpandedForm::makeSelectList($this->accounts->getAccountsByType([AccountType::DEFAULT, AccountType::ASSET]));
+        $assetAccounts = $this->groupedAccountList();
         $budgetList    = ExpandedForm::makeSelectListWithEmpty($this->budgets->getBudgets());
 
         // view related code
@@ -409,6 +410,26 @@ class SingleController extends Controller
         return redirect($this->getPreviousUri('transactions.edit.uri'));
     }
 
+    /**
+     * @return array
+     */
+    private function groupedAccountList(): array
+    {
+        $accounts = $this->accounts->getActiveAccountsByType([AccountType::DEFAULT, AccountType::ASSET]);
+        $return   = [];
+        /** @var Account $account */
+        foreach ($accounts as $account) {
+            $type = $account->getMeta('accountRole');
+            if (strlen($type) === 0) {
+                $type = 'no_account_type';
+            }
+            $key                        = strval(trans('firefly.opt_group_' . $type));
+            $return[$key][$account->id] = $account->name;
+        }
+
+        return $return;
+    }
+
     /**
      * @param TransactionJournal $journal
      *
diff --git a/public/js/ff/transactions/single/create.js b/public/js/ff/transactions/single/create.js
index f1b375bb92..e1a0c04c9f 100644
--- a/public/js/ff/transactions/single/create.js
+++ b/public/js/ff/transactions/single/create.js
@@ -37,6 +37,7 @@ $(document).ready(function () {
 
     // when user selects different currency,
     $('.currency-option').on('click', selectsForeignCurrency);
+    $('#ffInput_description').focus();
 });
 
 /**
@@ -84,6 +85,7 @@ function updateDescription() {
     $.getJSON('json/transaction-journals/' + what).done(function (data) {
         $('input[name="description"]').typeahead('destroy').typeahead({source: data});
     });
+    $('#ffInput_description').focus();
 }
 
 /**
diff --git a/resources/lang/en_US/firefly.php b/resources/lang/en_US/firefly.php
index 133d3bb168..1976a06949 100644
--- a/resources/lang/en_US/firefly.php
+++ b/resources/lang/en_US/firefly.php
@@ -624,6 +624,11 @@ return [
     'perm-delete-many'                           => 'Deleting many items in one go can be very disruptive. Please be cautious.',
     'mass_deleted_transactions_success'          => 'Deleted :amount transaction(s).',
     'mass_edited_transactions_success'           => 'Updated :amount transaction(s)',
+    'opt_group_no_account_type'                  => '(no account type)',
+    'opt_group_defaultAsset'                     => 'Default asset accounts',
+    'opt_group_savingAsset'                      => 'Savings accounts',
+    'opt_group_sharedAsset'                      => 'Shared asset accounts',
+    'opt_group_ccAsset'                          => 'Credit cards',
 
 
     // new user:

From 733cee5c8cf88a326726057b8c323ee858a64ba9 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 11:00:23 +0200
Subject: [PATCH 560/668] New translations firefly.php (Russian)

---
 resources/lang/ru_RU/firefly.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/resources/lang/ru_RU/firefly.php b/resources/lang/ru_RU/firefly.php
index 984b99b5a8..e6b6a0276a 100644
--- a/resources/lang/ru_RU/firefly.php
+++ b/resources/lang/ru_RU/firefly.php
@@ -624,6 +624,11 @@ return [
     'perm-delete-many'                           => 'Deleting many items in one go can be very disruptive. Please be cautious.',
     'mass_deleted_transactions_success'          => 'Deleted :amount transaction(s).',
     'mass_edited_transactions_success'           => 'Updated :amount transaction(s)',
+    'opt_group_no_account_type'                  => '(no account type)',
+    'opt_group_defaultAsset'                     => 'Default asset accounts',
+    'opt_group_savingAsset'                      => 'Savings accounts',
+    'opt_group_sharedAsset'                      => 'Shared asset accounts',
+    'opt_group_ccAsset'                          => 'Credit cards',
 
 
     // new user:

From 65e0700f2c0e8da2362908f75db07e3722b92a55 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 11:00:36 +0200
Subject: [PATCH 561/668] New translations firefly.php (German)

---
 resources/lang/de_DE/firefly.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/resources/lang/de_DE/firefly.php b/resources/lang/de_DE/firefly.php
index 7ee795413e..f20a781957 100644
--- a/resources/lang/de_DE/firefly.php
+++ b/resources/lang/de_DE/firefly.php
@@ -625,6 +625,11 @@ Sollen zusätzlich Ihre Girokonten angezeigt werden?',
     'perm-delete-many'                           => 'Das Löschen von mehreren Elementen auf einmal kann sich störend auswirken. Bitte seien Sie vorsichtig.',
     'mass_deleted_transactions_success'          => ':amount Überweisung(en) gelöscht.',
     'mass_edited_transactions_success'           => ':amount Überweisung(en) aktualisiert',
+    'opt_group_no_account_type'                  => '(no account type)',
+    'opt_group_defaultAsset'                     => 'Default asset accounts',
+    'opt_group_savingAsset'                      => 'Savings accounts',
+    'opt_group_sharedAsset'                      => 'Shared asset accounts',
+    'opt_group_ccAsset'                          => 'Credit cards',
 
 
     // new user:

From ac3881779c77194a0136993b26fb1e4282de6fac Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 11:00:38 +0200
Subject: [PATCH 562/668] New translations firefly.php (Polish)

---
 resources/lang/pl_PL/firefly.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/resources/lang/pl_PL/firefly.php b/resources/lang/pl_PL/firefly.php
index 82fc49c36a..e6d7149cb4 100644
--- a/resources/lang/pl_PL/firefly.php
+++ b/resources/lang/pl_PL/firefly.php
@@ -624,6 +624,11 @@ return [
     'perm-delete-many'                           => 'Deleting many items in one go can be very disruptive. Please be cautious.',
     'mass_deleted_transactions_success'          => 'Usunięto :amount transakcję(i).',
     'mass_edited_transactions_success'           => 'Zaktualizowano :amount transakcję(i)',
+    'opt_group_no_account_type'                  => '(no account type)',
+    'opt_group_defaultAsset'                     => 'Default asset accounts',
+    'opt_group_savingAsset'                      => 'Savings accounts',
+    'opt_group_sharedAsset'                      => 'Shared asset accounts',
+    'opt_group_ccAsset'                          => 'Credit cards',
 
 
     // new user:

From c143d54c97416e5245a427b8dad5a1d0d6bf7c4c Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 11:00:41 +0200
Subject: [PATCH 563/668] New translations firefly.php (French)

---
 resources/lang/fr_FR/firefly.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/resources/lang/fr_FR/firefly.php b/resources/lang/fr_FR/firefly.php
index 46eda5479b..4eaa525b43 100644
--- a/resources/lang/fr_FR/firefly.php
+++ b/resources/lang/fr_FR/firefly.php
@@ -624,6 +624,11 @@ return [
     'perm-delete-many'                           => 'Supprimer de nombreux éléments en une seule fois peut être très problématique. Soyez prudent.',
     'mass_deleted_transactions_success'          => 'Montant des opérations supprimées : :amount.',
     'mass_edited_transactions_success'           => 'Montant des opérations mises à jour : :amount',
+    'opt_group_no_account_type'                  => '(no account type)',
+    'opt_group_defaultAsset'                     => 'Default asset accounts',
+    'opt_group_savingAsset'                      => 'Savings accounts',
+    'opt_group_sharedAsset'                      => 'Shared asset accounts',
+    'opt_group_ccAsset'                          => 'Credit cards',
 
 
     // new user:

From 52f1d96cfbf7cc14aac60eef29103c3f4f57ec02 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 11:00:44 +0200
Subject: [PATCH 564/668] New translations firefly.php (Dutch)

---
 resources/lang/nl_NL/firefly.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/resources/lang/nl_NL/firefly.php b/resources/lang/nl_NL/firefly.php
index d99063435c..037970781d 100644
--- a/resources/lang/nl_NL/firefly.php
+++ b/resources/lang/nl_NL/firefly.php
@@ -624,6 +624,11 @@ return [
     'perm-delete-many'                           => 'Veel items in één keer verwijderen kan zeer storend zijn. Wees voorzichtig.',
     'mass_deleted_transactions_success'          => 'Verwijder :amount transactie(s).',
     'mass_edited_transactions_success'           => 'Wijzig :amount transactie(s)',
+    'opt_group_no_account_type'                  => '(no account type)',
+    'opt_group_defaultAsset'                     => 'Default asset accounts',
+    'opt_group_savingAsset'                      => 'Savings accounts',
+    'opt_group_sharedAsset'                      => 'Shared asset accounts',
+    'opt_group_ccAsset'                          => 'Credit cards',
 
 
     // new user:

From b99c8dd32a4bb6d83b3b38f9db678c86b5e938e1 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 11:00:47 +0200
Subject: [PATCH 565/668] New translations firefly.php (Portuguese, Brazilian)

---
 resources/lang/pt_BR/firefly.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/resources/lang/pt_BR/firefly.php b/resources/lang/pt_BR/firefly.php
index ea6e934da2..92da3e95a6 100644
--- a/resources/lang/pt_BR/firefly.php
+++ b/resources/lang/pt_BR/firefly.php
@@ -624,6 +624,11 @@ return [
     'perm-delete-many'                           => 'Exclusão de muitos itens de uma só vez pode ser muito perturbador. Por favor, seja cauteloso.',
     'mass_deleted_transactions_success'          => 'Excluído :amount de transação(ões).',
     'mass_edited_transactions_success'           => 'Atualizado :amount de transação(ões)',
+    'opt_group_no_account_type'                  => '(no account type)',
+    'opt_group_defaultAsset'                     => 'Default asset accounts',
+    'opt_group_savingAsset'                      => 'Savings accounts',
+    'opt_group_sharedAsset'                      => 'Shared asset accounts',
+    'opt_group_ccAsset'                          => 'Credit cards',
 
 
     // new user:

From 18f8b102c3257040780ac9191c96338a009b2a9d Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 11:00:50 +0200
Subject: [PATCH 566/668] New translations firefly.php (Slovenian)

---
 resources/lang/sl_SI/firefly.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/resources/lang/sl_SI/firefly.php b/resources/lang/sl_SI/firefly.php
index 79377aef0c..d11ada51ca 100644
--- a/resources/lang/sl_SI/firefly.php
+++ b/resources/lang/sl_SI/firefly.php
@@ -624,6 +624,11 @@ return [
     'perm-delete-many'                           => 'Deleting many items in one go can be very disruptive. Please be cautious.',
     'mass_deleted_transactions_success'          => 'Deleted :amount transaction(s).',
     'mass_edited_transactions_success'           => 'Updated :amount transaction(s)',
+    'opt_group_no_account_type'                  => '(no account type)',
+    'opt_group_defaultAsset'                     => 'Default asset accounts',
+    'opt_group_savingAsset'                      => 'Savings accounts',
+    'opt_group_sharedAsset'                      => 'Shared asset accounts',
+    'opt_group_ccAsset'                          => 'Credit cards',
 
 
     // new user:

From 80a2fd485ed940298a81815f3e77bfc1d3280130 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 11:00:54 +0200
Subject: [PATCH 567/668] New translations firefly.php (Spanish)

---
 resources/lang/es_ES/firefly.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/resources/lang/es_ES/firefly.php b/resources/lang/es_ES/firefly.php
index 3f74de30e0..71d9fc30c6 100644
--- a/resources/lang/es_ES/firefly.php
+++ b/resources/lang/es_ES/firefly.php
@@ -624,6 +624,11 @@ return [
     'perm-delete-many'                           => 'Deleting many items in one go can be very disruptive. Please be cautious.',
     'mass_deleted_transactions_success'          => 'Deleted :amount transaction(s).',
     'mass_edited_transactions_success'           => 'Updated :amount transaction(s)',
+    'opt_group_no_account_type'                  => '(no account type)',
+    'opt_group_defaultAsset'                     => 'Default asset accounts',
+    'opt_group_savingAsset'                      => 'Savings accounts',
+    'opt_group_sharedAsset'                      => 'Shared asset accounts',
+    'opt_group_ccAsset'                          => 'Credit cards',
 
 
     // new user:

From 25ea1c8f5f625b914be2029304c4a785307eda7d Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Sun, 3 Sep 2017 11:02:18 +0200
Subject: [PATCH 568/668] Add text for empty box #800

---
 public/js/ff/reports/default/all.js       | 2 ++
 resources/lang/en_US/firefly.php          | 3 +++
 resources/views/reports/default/year.twig | 2 ++
 3 files changed, 7 insertions(+)

diff --git a/public/js/ff/reports/default/all.js b/public/js/ff/reports/default/all.js
index 6fc394d7dd..ad4bef22b0 100644
--- a/public/js/ff/reports/default/all.js
+++ b/public/js/ff/reports/default/all.js
@@ -109,6 +109,7 @@ function clickCategoryChart(e) {
     "use strict";
     var link = $(e.target);
     var categoryId = link.data('category');
+    $('#category_help').remove();
 
     var URL = 'chart/category/report-period/' + categoryId + '/' + accountIds + '/' + startDate + '/' + endDate;
     var container = 'category_chart';
@@ -120,6 +121,7 @@ function clickBudgetChart(e) {
     "use strict";
     var link = $(e.target);
     var budgetId = link.data('budget');
+    $('#budget_help').remove();
 
     var URL = 'chart/budget/period/' + budgetId + '/' + accountIds + '/' + startDate + '/' + endDate;
     var container = 'budget_chart';
diff --git a/resources/lang/en_US/firefly.php b/resources/lang/en_US/firefly.php
index 1976a06949..74211f65b9 100644
--- a/resources/lang/en_US/firefly.php
+++ b/resources/lang/en_US/firefly.php
@@ -782,6 +782,9 @@ return [
     'account_role_sharedAsset'                   => 'Shared asset account',
     'account_role_savingAsset'                   => 'Savings account',
     'account_role_ccAsset'                       => 'Credit card',
+    'budget_chart_click'                         => 'Please click on a budget name in the table above to see a chart.',
+    'category_chart_click'                       => 'Please click on a category name in the table above to see a chart.',
+
 
     // charts:
     'chart'                                      => 'Chart',
diff --git a/resources/views/reports/default/year.twig b/resources/views/reports/default/year.twig
index 38113de98d..90913db18d 100644
--- a/resources/views/reports/default/year.twig
+++ b/resources/views/reports/default/year.twig
@@ -129,6 +129,7 @@
                     <h3 class="box-title">{{ 'chart'|_ }}</h3>
                 </div>
                 <div class="box-body">
+                    <p id="budget_help" class="text-muted text-center">{{ 'budget_chart_click'|_ }}</p>
                     <canvas id="budget_chart" style="width:100%;height:400px;" height="400" width="100%"></canvas>
                 </div>
             </div>
@@ -177,6 +178,7 @@
                     <h3 class="box-title">{{ 'chart'|_ }}</h3>
                 </div>
                 <div class="box-body">
+                    <p id="category_help" class="text-muted text-center">{{ 'category_chart_click'|_ }}</p>
                     <canvas id="category_chart" style="width:100%;height:400px;" height="400" width="100%"></canvas>
                 </div>
             </div>

From fe9705d33e08cee3022fb9f6cc16cab6b7f135f3 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 11:10:24 +0200
Subject: [PATCH 569/668] New translations firefly.php (Russian)

---
 resources/lang/ru_RU/firefly.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/resources/lang/ru_RU/firefly.php b/resources/lang/ru_RU/firefly.php
index e6b6a0276a..7930c06ba2 100644
--- a/resources/lang/ru_RU/firefly.php
+++ b/resources/lang/ru_RU/firefly.php
@@ -782,6 +782,9 @@ return [
     'account_role_sharedAsset'                   => 'Shared asset account',
     'account_role_savingAsset'                   => 'Savings account',
     'account_role_ccAsset'                       => 'Credit card',
+    'budget_chart_click'                         => 'Please click on a budget name in the table above to see a chart.',
+    'category_chart_click'                       => 'Please click on a category name in the table above to see a chart.',
+
 
     // charts:
     'chart'                                      => 'Диаграмма',

From daeb06ede89aa61f4b00d77d51de65903daf4c6d Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 11:10:36 +0200
Subject: [PATCH 570/668] New translations firefly.php (German)

---
 resources/lang/de_DE/firefly.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/resources/lang/de_DE/firefly.php b/resources/lang/de_DE/firefly.php
index f20a781957..621125b000 100644
--- a/resources/lang/de_DE/firefly.php
+++ b/resources/lang/de_DE/firefly.php
@@ -783,6 +783,9 @@ Sollen zusätzlich Ihre Girokonten angezeigt werden?',
     'account_role_sharedAsset'                   => 'Shared asset account',
     'account_role_savingAsset'                   => 'Savings account',
     'account_role_ccAsset'                       => 'Kreditkarte',
+    'budget_chart_click'                         => 'Please click on a budget name in the table above to see a chart.',
+    'category_chart_click'                       => 'Please click on a category name in the table above to see a chart.',
+
 
     // charts:
     'chart'                                      => 'Diagram',

From 26f71400e9344fcf11d54510afbb21640df47060 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 11:10:39 +0200
Subject: [PATCH 571/668] New translations firefly.php (Polish)

---
 resources/lang/pl_PL/firefly.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/resources/lang/pl_PL/firefly.php b/resources/lang/pl_PL/firefly.php
index e6d7149cb4..db5a59cce5 100644
--- a/resources/lang/pl_PL/firefly.php
+++ b/resources/lang/pl_PL/firefly.php
@@ -782,6 +782,9 @@ return [
     'account_role_sharedAsset'                   => 'Współdzielone konto aktywów',
     'account_role_savingAsset'                   => 'Konto oszczędnościowe',
     'account_role_ccAsset'                       => 'Karta kredytowa',
+    'budget_chart_click'                         => 'Please click on a budget name in the table above to see a chart.',
+    'category_chart_click'                       => 'Please click on a category name in the table above to see a chart.',
+
 
     // charts:
     'chart'                                      => 'Wykres',

From 487c81eeb24babd8923d9575935d4ff9befe76da Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 11:10:41 +0200
Subject: [PATCH 572/668] New translations firefly.php (French)

---
 resources/lang/fr_FR/firefly.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/resources/lang/fr_FR/firefly.php b/resources/lang/fr_FR/firefly.php
index 4eaa525b43..180bbbada4 100644
--- a/resources/lang/fr_FR/firefly.php
+++ b/resources/lang/fr_FR/firefly.php
@@ -782,6 +782,9 @@ return [
     'account_role_sharedAsset'                   => 'Compte d\'actif partagé',
     'account_role_savingAsset'                   => 'Compte d’épargne',
     'account_role_ccAsset'                       => 'Carte de crédit',
+    'budget_chart_click'                         => 'Please click on a budget name in the table above to see a chart.',
+    'category_chart_click'                       => 'Please click on a category name in the table above to see a chart.',
+
 
     // charts:
     'chart'                                      => 'Diagramme',

From 4b03bc92c07e55a234605c1de21618c744a3c389 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 11:10:44 +0200
Subject: [PATCH 573/668] New translations firefly.php (Dutch)

---
 resources/lang/nl_NL/firefly.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/resources/lang/nl_NL/firefly.php b/resources/lang/nl_NL/firefly.php
index 037970781d..ddd85a5727 100644
--- a/resources/lang/nl_NL/firefly.php
+++ b/resources/lang/nl_NL/firefly.php
@@ -782,6 +782,9 @@ return [
     'account_role_sharedAsset'                   => 'Gedeelde betaalrekening',
     'account_role_savingAsset'                   => 'Spaarrekening',
     'account_role_ccAsset'                       => 'Credit card',
+    'budget_chart_click'                         => 'Please click on a budget name in the table above to see a chart.',
+    'category_chart_click'                       => 'Please click on a category name in the table above to see a chart.',
+
 
     // charts:
     'chart'                                      => 'Diagram',

From f031b6fa3f4d1bd2c64b867ed90b40540c5e88fa Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 11:10:47 +0200
Subject: [PATCH 574/668] New translations firefly.php (Portuguese, Brazilian)

---
 resources/lang/pt_BR/firefly.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/resources/lang/pt_BR/firefly.php b/resources/lang/pt_BR/firefly.php
index 92da3e95a6..15e7b8ff24 100644
--- a/resources/lang/pt_BR/firefly.php
+++ b/resources/lang/pt_BR/firefly.php
@@ -782,6 +782,9 @@ return [
     'account_role_sharedAsset'                   => 'Shared asset account',
     'account_role_savingAsset'                   => 'Savings account',
     'account_role_ccAsset'                       => 'Credit card',
+    'budget_chart_click'                         => 'Please click on a budget name in the table above to see a chart.',
+    'category_chart_click'                       => 'Please click on a category name in the table above to see a chart.',
+
 
     // charts:
     'chart'                                      => 'Gráfico',

From 9d283b85e285b4df229515d2dc3c0a37caaaea90 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 11:10:49 +0200
Subject: [PATCH 575/668] New translations firefly.php (Slovenian)

---
 resources/lang/sl_SI/firefly.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/resources/lang/sl_SI/firefly.php b/resources/lang/sl_SI/firefly.php
index d11ada51ca..fdc39bd3bb 100644
--- a/resources/lang/sl_SI/firefly.php
+++ b/resources/lang/sl_SI/firefly.php
@@ -782,6 +782,9 @@ return [
     'account_role_sharedAsset'                   => 'deljen premoženjski račun',
     'account_role_savingAsset'                   => 'varčevalni račun',
     'account_role_ccAsset'                       => 'kreditna kartica',
+    'budget_chart_click'                         => 'Please click on a budget name in the table above to see a chart.',
+    'category_chart_click'                       => 'Please click on a category name in the table above to see a chart.',
+
 
     // charts:
     'chart'                                      => 'Chart',

From 08408835465dee03758037261e50f2ba78f09c48 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 11:10:53 +0200
Subject: [PATCH 576/668] New translations firefly.php (Spanish)

---
 resources/lang/es_ES/firefly.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/resources/lang/es_ES/firefly.php b/resources/lang/es_ES/firefly.php
index 71d9fc30c6..3237ff791d 100644
--- a/resources/lang/es_ES/firefly.php
+++ b/resources/lang/es_ES/firefly.php
@@ -782,6 +782,9 @@ return [
     'account_role_sharedAsset'                   => 'Shared asset account',
     'account_role_savingAsset'                   => 'Savings account',
     'account_role_ccAsset'                       => 'Credit card',
+    'budget_chart_click'                         => 'Please click on a budget name in the table above to see a chart.',
+    'category_chart_click'                       => 'Please click on a category name in the table above to see a chart.',
+
 
     // charts:
     'chart'                                      => 'Chart',

From 1d87da774510ca1e63e16208ad0e65d622392228 Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Sun, 3 Sep 2017 11:13:45 +0200
Subject: [PATCH 577/668] Fix nullpointer

---
 app/Rules/Processor.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/Rules/Processor.php b/app/Rules/Processor.php
index 478c7bf0df..4ad14ea467 100644
--- a/app/Rules/Processor.php
+++ b/app/Rules/Processor.php
@@ -118,6 +118,7 @@ final class Processor
     {
         $self = new self;
         foreach ($triggers as $entry) {
+            $entry['value'] = is_null($entry['value']) ? '' : $entry['value'];
             $trigger = TriggerFactory::makeTriggerFromStrings($entry['type'], $entry['value'], $entry['stopProcessing']);
             $self->triggers->push($trigger);
         }

From 19e3a10a282903083436579892be8d22bb72a11a Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Sun, 3 Sep 2017 12:50:29 +0200
Subject: [PATCH 578/668] Fixed #801

---
 resources/views/reports/default/multi-year.twig | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/resources/views/reports/default/multi-year.twig b/resources/views/reports/default/multi-year.twig
index de28b637d7..a58cf2bb9d 100644
--- a/resources/views/reports/default/multi-year.twig
+++ b/resources/views/reports/default/multi-year.twig
@@ -58,10 +58,9 @@
                 </div>
             </div>
         </div>
-
-
     </div>
     <div class="row">
+        {# block with income #}
         <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
             <div class="box">
                 <div class="box-header with-border">
@@ -75,6 +74,7 @@
                 </div>
             </div>
         </div>
+        {# block with expenses #}
         <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
             <div class="box">
                 <div class="box-header with-border">
@@ -131,7 +131,8 @@
                     <h3 class="box-title">{{ 'chart'|_ }}</h3>
                 </div>
                 <div class="box-body">
-                    <canvas style="width:100%;height:400px;" height="400" width="100%"></canvas>
+                    <p id="budget_help" class="text-muted text-center">{{ 'budget_chart_click'|_ }}</p>
+                    <canvas id="budget_chart" style="width:100%;height:400px;" height="400" width="100%"></canvas>
                 </div>
             </div>
         </div>
@@ -179,6 +180,7 @@
                     <h3 class="box-title">{{ 'chart'|_ }}</h3>
                 </div>
                 <div class="box-body">
+                    <p id="category_help" class="text-muted text-center">{{ 'category_chart_click'|_ }}</p>
                     <canvas id="category_chart" style="width:100%;height:400px;" height="400" width="100%"></canvas>
                 </div>
             </div>

From b002635d1b321e8be897165f1d04b3c3da5ff86a Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Sun, 3 Sep 2017 12:56:45 +0200
Subject: [PATCH 579/668] Fixes #809

---
 app/Support/Search/Search.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Support/Search/Search.php b/app/Support/Search/Search.php
index d9a4d9bc1b..95f292def8 100644
--- a/app/Support/Search/Search.php
+++ b/app/Support/Search/Search.php
@@ -107,7 +107,7 @@ class Search implements SearchInterface
         do {
             /** @var JournalCollectorInterface $collector */
             $collector = app(JournalCollectorInterface::class);
-            $collector->setAllAssetAccounts()->setLimit($pageSize)->setPage($page);
+            $collector->setAllAssetAccounts()->setLimit($pageSize)->setPage($page)->withOpposingAccount();
             if ($this->hasModifiers()) {
                 $collector->withOpposingAccount()->withCategoryInformation()->withBudgetInformation();
             }

From d5bcaf42ac8e30522b8b6aeeb6ca37a3eed1206d Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 13:00:07 +0200
Subject: [PATCH 580/668] New translations firefly.php (German)

---
 resources/lang/de_DE/firefly.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/lang/de_DE/firefly.php b/resources/lang/de_DE/firefly.php
index 621125b000..284559874a 100644
--- a/resources/lang/de_DE/firefly.php
+++ b/resources/lang/de_DE/firefly.php
@@ -113,7 +113,7 @@ return [
     'transferred'                                => 'Überwiesen',
     'all_withdrawal'                             => 'Alle Ausgaben',
     'all_transactions'                           => 'Alle Transaktionen',
-    'title_withdrawal_between'                   => 'Alle Ausgabe zwischen :start und :end',
+    'title_withdrawal_between'                   => 'Alle Ausgaben zwischen :start und :end',
     'all_deposit'                                => 'Alle Einnahmen',
     'title_deposit_between'                      => 'Alle Einnahmen zwischen :start und :end',
     'all_transfers'                              => 'Alle Transfers',
@@ -449,7 +449,7 @@ Sollen zusätzlich Ihre Girokonten angezeigt werden?',
     'convert_options_TransferWithdrawal'         => 'Konvertieren Sie eine Überweisung in eine Ausgabe',
     'convert_options_TransferDeposit'            => 'Konvertieren Sie eine Überweisung in eine Einzahlung',
     'transaction_journal_convert_options'        => 'Diese Transaktion umwandeln',
-    'convert_Withdrawal_to_deposit'              => 'Konvertieren Sie eine Ausgabe zu einer Einzahlung',
+    'convert_Withdrawal_to_deposit'              => 'Konvertieren Sie diese Ausgabe zu einer Einzahlung',
     'convert_Withdrawal_to_transfer'             => 'Konvertieren Sie eine Ausgabe zu einer Übreweisung',
     'convert_Deposit_to_withdrawal'              => 'Konvertieren Sie eine Einzahlung zu einer Ausgabe',
     'convert_Deposit_to_transfer'                => 'Konvertieren Sie eine Einzahlung zu einer Überweisung',

From 693c6fb71b7371587d5515bf1ee201c8c8678025 Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Sun, 3 Sep 2017 13:00:36 +0200
Subject: [PATCH 581/668] Debug message for #797

---
 app/Import/Storage/ImportStorage.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/Import/Storage/ImportStorage.php b/app/Import/Storage/ImportStorage.php
index 598380a06b..66a212f0f1 100644
--- a/app/Import/Storage/ImportStorage.php
+++ b/app/Import/Storage/ImportStorage.php
@@ -204,8 +204,9 @@ class ImportStorage
             return false;
         }
 
-        $amount = app('steam')->positive($parameters['amount']);
-        $names  = [$parameters['asset'], $parameters['opposing']];
+        $amount   = app('steam')->positive($parameters['amount']);
+        $names    = [$parameters['asset'], $parameters['opposing']];
+        $transfer = [];
         sort($names);
 
         foreach ($this->transfers as $transfer) {
@@ -222,6 +223,7 @@ class ImportStorage
                 return false;
             }
         }
+        Log::debug('There already is a transfer imported with these properties. Compare existing with new. ', ['existing' => $transfer, 'new' => $parameters]);
 
         return true;
     }

From 0444ad5221cdcf8cf7a69583422716bc20d29d21 Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Sun, 3 Sep 2017 13:02:19 +0200
Subject: [PATCH 582/668] Debug message for #797

---
 app/Import/Storage/ImportSupport.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/Import/Storage/ImportSupport.php b/app/Import/Storage/ImportSupport.php
index 56e8f9393e..827150e31f 100644
--- a/app/Import/Storage/ImportSupport.php
+++ b/app/Import/Storage/ImportSupport.php
@@ -296,12 +296,15 @@ trait ImportSupport
      */
     private function hashAlreadyImported(string $hash): bool
     {
-        $json  = json_encode($hash);
+        $json = json_encode($hash);
+        /** @var TransactionJournalMeta $entry */
         $entry = TransactionJournalMeta::leftJoin('transaction_journals', 'transaction_journals.id', '=', 'journal_meta.transaction_journal_id')
                                        ->where('data', $json)
                                        ->where('name', 'importHash')
                                        ->first();
         if (!is_null($entry)) {
+            Log::debug(sprintf('A journal with hash %s has already been imported (spoiler: it\'s journal #%d)', $hash, $entry->transaction_journal_id));
+
             return true;
         }
 

From dccafee3838d44a37fbf800cbac2ee0427b9971c Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 13:10:07 +0200
Subject: [PATCH 583/668] New translations firefly.php (German)

---
 resources/lang/de_DE/firefly.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/resources/lang/de_DE/firefly.php b/resources/lang/de_DE/firefly.php
index 284559874a..76bb2c829a 100644
--- a/resources/lang/de_DE/firefly.php
+++ b/resources/lang/de_DE/firefly.php
@@ -443,18 +443,18 @@ Sollen zusätzlich Ihre Girokonten angezeigt werden?',
     'convert_to_Deposit'                         => '":description" zu einer Einzahlung konvertieren',
     'convert_to_Transfer'                        => '":description" zu einer Überweisung konvertieren',
     'convert_options_WithdrawalDeposit'          => 'Konvertieren Sie eine Ausgabe in eine Einzahlung',
-    'convert_options_WithdrawalTransfer'         => 'Konvertieren Sie eine Ausgabe in eine Übreweisung',
+    'convert_options_WithdrawalTransfer'         => 'Konvertieren Sie eine Ausgabe in eine Überweisung',
     'convert_options_DepositTransfer'            => 'Konvertieren Sie eine Einzahlung in eine Überweisung',
     'convert_options_DepositWithdrawal'          => 'Konvertieren Sie eine Einzahlung in eine Ausgabe',
     'convert_options_TransferWithdrawal'         => 'Konvertieren Sie eine Überweisung in eine Ausgabe',
     'convert_options_TransferDeposit'            => 'Konvertieren Sie eine Überweisung in eine Einzahlung',
     'transaction_journal_convert_options'        => 'Diese Transaktion umwandeln',
     'convert_Withdrawal_to_deposit'              => 'Konvertieren Sie diese Ausgabe zu einer Einzahlung',
-    'convert_Withdrawal_to_transfer'             => 'Konvertieren Sie eine Ausgabe zu einer Übreweisung',
-    'convert_Deposit_to_withdrawal'              => 'Konvertieren Sie eine Einzahlung zu einer Ausgabe',
-    'convert_Deposit_to_transfer'                => 'Konvertieren Sie eine Einzahlung zu einer Überweisung',
-    'convert_Transfer_to_deposit'                => 'Konvertieren Sie eine Überweisung zu einer Einzahlung',
-    'convert_Transfer_to_withdrawal'             => 'Konvertieren Sie eine Überweisung zu einer Ausgabe',
+    'convert_Withdrawal_to_transfer'             => 'Konvertieren Sie diese Ausgabe zu einer Überweisung',
+    'convert_Deposit_to_withdrawal'              => 'Konvertieren Sie diese Einzahlung zu einer Ausgabe',
+    'convert_Deposit_to_transfer'                => 'Konvertieren Sie diese Einzahlung zu einer Überweisung',
+    'convert_Transfer_to_deposit'                => 'Konvertieren Sie diese Überweisung zu einer Einzahlung',
+    'convert_Transfer_to_withdrawal'             => 'Konvertieren Sie diese Überweisung zu einer Ausgabe',
     'convert_please_set_revenue_source'          => 'Bitte ein Eingangskonto wählen, woher das Geld kommen wird.',
     'convert_please_set_asset_destination'       => 'Bitte wählen Sie ein Bestandskonto aus wo das Geld hingehen wird.',
     'convert_please_set_expense_destination'     => 'Bitte wählen Sie ein Spesenkonto wo das Geld hingehen wird.',

From 64979fd941e11bfd2d6b44bbd2900e6c05c460b8 Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Sun, 3 Sep 2017 13:11:40 +0200
Subject: [PATCH 584/668] Add missing ID field.

---
 resources/views/rules/rule/edit.twig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/resources/views/rules/rule/edit.twig b/resources/views/rules/rule/edit.twig
index ab9d727e58..862fe6849a 100644
--- a/resources/views/rules/rule/edit.twig
+++ b/resources/views/rules/rule/edit.twig
@@ -7,6 +7,7 @@
 {% block content %}
     {{ Form.model(rule, {'class' : 'form-horizontal','id' : 'store','url' : route('rules.update', rule.id)}) }}
     <input type="hidden" name="rule_group_id" value="{{ rule.rule_group_id }}"/>
+    <input type="hidden" name="id" value="{{ rule.id }}"/>
     <div class="row">
         <div class="col-lg-6 col-md-6 col-sm-12">
             <div class="box box-primary">

From 49c5c9ba1596fa3181e05e6eb0622b4cd9305d20 Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Sun, 3 Sep 2017 13:16:11 +0200
Subject: [PATCH 585/668] Include id in test.

---
 tests/Feature/Controllers/RuleControllerTest.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/Feature/Controllers/RuleControllerTest.php b/tests/Feature/Controllers/RuleControllerTest.php
index 17b3bd152f..4b29e478a5 100644
--- a/tests/Feature/Controllers/RuleControllerTest.php
+++ b/tests/Feature/Controllers/RuleControllerTest.php
@@ -385,6 +385,7 @@ class RuleControllerTest extends TestCase
 
         $data = [
             'rule_group_id'      => 1,
+            'id'                 => 1,
             'title'              => 'Your first default rule',
             'trigger'            => 'store-journal',
             'active'             => 1,

From 98cb74e00cf3af7bd82820a3097f01932281383d Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 13:20:07 +0200
Subject: [PATCH 586/668] New translations firefly.php (German)

---
 resources/lang/de_DE/firefly.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/resources/lang/de_DE/firefly.php b/resources/lang/de_DE/firefly.php
index 76bb2c829a..ea89f4a67c 100644
--- a/resources/lang/de_DE/firefly.php
+++ b/resources/lang/de_DE/firefly.php
@@ -28,7 +28,7 @@ return [
     'showEverything'                             => 'Alles anzeigen',
     'never'                                      => 'Nie',
     'no_results_for_empty_search'                => 'Ihre Suche war leer, also wurde nichts gefunden.',
-    'removed_amount'                             => ':amount enfernt',
+    'removed_amount'                             => ':amount entfernt',
     'added_amount'                               => ':amount hinzugefügt',
     'asset_account_role_help'                    => 'Alle zusätzlichen Optionen, welche aus ihren Entscheidung entstehen, können später eingestellt werden.',
     'Opening balance'                            => 'Eröffnungsbilanz',
@@ -61,7 +61,7 @@ return [
     'two_factor_lost_intro'                      => 'Leider ist dieses etwas, dass sie nicht über die Weboberfläche zurücksetzen können. Sie haben zwei Möglichkeiten.',
     'two_factor_lost_fix_self'                   => 'Wenn Sie Ihre eigene Instanz von Firefly III betreiben, überprüfen Sie die Logdatei unter <code>storage/logs</code> für weitere Anweisungen.',
     'two_factor_lost_fix_owner'                  => 'Ansonsten, mailen Sie dem Inhaber der Website, <a href="mailto::site_owner">:site_owner</a> und bitten Sie ihn, Ihre Zwei-Faktor Authentifizierung zurückzusetzen.',
-    'warning_much_data'                          => ':days Tage an Daten können eine Weile dauern zu laden.',
+    'warning_much_data'                          => ':days Tage Daten können eine Weile zu laden benötigen.',
     'registered'                                 => 'Sie haben sich erfolgreich registriert!',
     'Default asset account'                      => 'Standard-Anlagekonto',
     'no_budget_pointer'                          => 'Sie scheinen keine Budgets festgelegt zu haben. Sie sollten welche auf der <a href="/budgets">Budget</a>-Seite erstellen. Budgets können Ihnen helfen ihre Ausgaben zu verfolgen.',
@@ -71,7 +71,7 @@ return [
     'destination_accounts'                       => 'Zielkonto',
     'user_id_is'                                 => 'Ihre Benutzerkennung ist <strong>:user</strong>',
     'field_supports_markdown'                    => 'Diese Feld unterstützt <a href="https://en.support.wordpress.com/markdown-quick-reference/"> Abschlag </a>.',
-    'need_more_help'                             => 'Wenn du hilfe beim bedienen von Firefly III brauchst, <a href="https://github.com/firefly-iii/firefly-iii/issues">erstelle ein Ticket auf Github</a>.',
+    'need_more_help'                             => 'Wenn du Hilfe beim Bedienen von Firefly III brauchst, <a href="https://github.com/firefly-iii/firefly-iii/issues">erstelle ein Ticket auf Github</a>.',
     'reenable_intro_text'                        => 'Sie können auch <a href="#" id="reenableGuidance">die Einführung</a> wieder aktivieren.',
     'intro_boxes_after_refresh'                  => 'Die Einführungsfelder werden wieder angezeigt, wenn Sie die Seite aktualisieren.',
     'show_all_no_filter'                         => 'Alle Transaktionen anzeigen, ohne diese nach Datum zu gruppieren.',
@@ -127,8 +127,8 @@ return [
     'journals_in_period_for_category'            => 'Alle Transaktionen für Kategorie :name zwischen :start und :end',
     'journals_in_period_for_tag'                 => 'Alle Transaktionen für Tag :tag zwischen :start und :end',
     'not_available_demo_user'                    => 'Die Funktionen, auf welche sie zugreifen wollen, steht Demo-Benutzer nicht zur Verfügung.',
-    'exchange_rate_instructions'                 => 'Das Girokonto "@name" akzeptiert nur Transaktionen in @native_currency. Wenn Sie stattdessen @foreign_currency verwenden wollen, sollten Sie sicherstellen, dass der Betrag auch in @native_currency angengeben ist:',
-    'transfer_exchange_rate_instructions'        => 'Das Quellkonto "@source_name" akzeptiert nur Transaktionen in @source_currency. Das Zielkonto "@dest_name" akzeptiert nur Transaktionen in @dest_currency. Sie müssen den Betrag in beiden Währungen korrenkt angeben.',
+    'exchange_rate_instructions'                 => 'Das Girokonto "@name" akzeptiert nur Transaktionen in @native_currency. Wenn Sie stattdessen @foreign_currency verwenden wollen, sollten Sie sicherstellen, dass der Betrag auch in @native_currency angegeben ist:',
+    'transfer_exchange_rate_instructions'        => 'Das Quellkonto "@source_name" akzeptiert nur Transaktionen in @source_currency. Das Zielkonto "@dest_name" akzeptiert nur Transaktionen in @dest_currency. Sie müssen den Betrag in beiden Währungen korrekt angeben.',
     'transaction_data'                           => 'Transaktionsdaten',
 
     // search
@@ -154,7 +154,7 @@ return [
     'export_data_intro'                          => 'Zum Backup, zum Migrieren auf ein anderes System oder zum Migrieren in eine andere Firefly III Installation.',
     'export_format'                              => 'Export-Format',
     'export_format_csv'                          => 'Durch Komma getrennte Werte (CSV-Datei)',
-    'export_format_mt940'                        => 'MT940 kompatibeles Format',
+    'export_format_mt940'                        => 'MT940 kompatibles Format',
     'export_included_accounts'                   => 'Exportiere die Überweisungen von diesem Konto',
     'include_old_uploads_help'                   => 'Firefly III löscht nicht die originalen CSV-Dateien, welche zuvor importiert wurden. Sie können dem Export hinzugefügt werden.',
     'do_export'                                  => 'Export',
@@ -184,7 +184,7 @@ return [
     'rule_actions'                               => 'Regel wird',
     'new_rule'                                   => 'Neue Regel',
     'new_rule_group'                             => 'Neue Regelgruppe',
-    'rule_priority_up'                           => 'Regel eine höhrere Priorität zuweisen',
+    'rule_priority_up'                           => 'Regel eine höhere Priorität zuweisen',
     'rule_priority_down'                         => 'Regel eine geringere Priorität zuweisen',
     'make_new_rule_group'                        => 'Neue Regelgruppe erstellen',
     'store_new_rule_group'                       => 'Speichere neue Regelgruppe',
@@ -225,8 +225,8 @@ return [
     'delete_rule'                                => 'Lösche Regel ":title"',
     'update_rule'                                => 'Regel bearbeiten',
     'test_rule_triggers'                         => 'Zeige übereinstimmende Überweisungen',
-    'warning_transaction_subset'                 => 'Aus Kapazitätgründen ist diese Liste auf :max_num_transactions Überweisungen limitiert und zeigt möglicherweise nur einen Teil dieser an',
-    'warning_no_matching_transactions'           => 'Keine übereinstimmenden Überweisungen gefunden. Aus Kapazitätgründen werden nur die letzten :num_transactions Überweisungen überprüft.',
+    'warning_transaction_subset'                 => 'Aus Kapazitätsgründen ist diese Liste auf :max_num_transactions Überweisungen limitiert und zeigt möglicherweise nur einen Teil dieser an',
+    'warning_no_matching_transactions'           => 'Keine übereinstimmenden Überweisungen gefunden. Aus Kapazitätsgründen werden nur die letzten :num_transactions Überweisungen überprüft.',
     'warning_no_valid_triggers'                  => 'Keine gültigen Trigger gefunden.',
     'apply_rule_selection'                       => 'Übernehmen Sie die Regel ": title" auf eine Auswahl Ihrer Transaktionen',
     'apply_rule_selection_intro'                 => 'Regeln wie ": title" werden in der Regel nur auf neue oder aktualisierte Transaktionen angewandt, aber Sie können die Regel auch auf eine Auswahl Ihrer bestehenden Transaktionen anwenden. Dies kann nützlich sein, wenn Sie eine Regel aktualisiert haben und Sie die Änderungen benötigen, auf andere Transaktionen zu aktualisieren.',

From a8d69f850ac3a883aa1d5c686b53184eaacfa0bb Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 13:20:08 +0200
Subject: [PATCH 587/668] New translations csv.php (German)

---
 resources/lang/de_DE/csv.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/lang/de_DE/csv.php b/resources/lang/de_DE/csv.php
index 74d253fcbf..d411b3f33a 100644
--- a/resources/lang/de_DE/csv.php
+++ b/resources/lang/de_DE/csv.php
@@ -39,7 +39,7 @@ return [
 
     // map data
     'map_title'                     => 'Import Einrichten (3/3) - Import mit bereits vorhandenen Daten verknüpfen',
-    'map_text'                      => 'In den folgenden Tabellen zeigt der linke Wert Informationen, die sich in Ihrer hochgeladenen CSV-Datei befinden. Es ist Ihre Aufgabe, diesen Wert, wenn möglich, einem bereits in der Datenbank vorhandem zuzuordnen. Firefly wird sich an diese Zuordnung halten. Wenn kein Wert für die Zuordnung vorhanden ist oder Sie den bestimmten Wert nicht abbilden möchten, wählen Sie nichts aus.',
+    'map_text'                      => 'In den folgenden Tabellen zeigt der linke Wert Informationen, die sich in Ihrer hochgeladenen CSV-Datei befinden. Es ist Ihre Aufgabe, diesen Wert, wenn möglich, einem bereits in der Datenbank vorhandenen zuzuordnen. Firefly wird sich an diese Zuordnung halten. Wenn kein Wert für die Zuordnung vorhanden ist oder Sie den bestimmten Wert nicht abbilden möchten, wählen Sie nichts aus.',
     'map_field_value'               => 'Feldwert',
     'map_field_mapped_to'           => 'Zugeordnet zu',
     'map_do_not_map'                => '(keine Zuordnung)',
@@ -54,7 +54,7 @@ return [
     'column_amount-comma-separated' => 'Betrag (Komma als Dezimaltrennzeichen)',
     'column_bill-id'                => 'Rechnung (ID übereinstimmend mit Firefly)',
     'column_bill-name'              => 'Name der Rechnung',
-    'column_budget-id'              => 'Bidget (ID übereinstimmend mit Firefly)',
+    'column_budget-id'              => 'Budget (ID übereinstimmend mit Firefly)',
     'column_budget-name'            => 'Budgetname',
     'column_category-id'            => 'Kategorie (ID übereinstimmend mit Firefly)',
     'column_category-name'          => 'Name der Kategorie',

From 533398115d5ddb4d422be1a624af8bdfa70241e3 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 13:30:07 +0200
Subject: [PATCH 588/668] New translations firefly.php (German)

---
 resources/lang/de_DE/firefly.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/resources/lang/de_DE/firefly.php b/resources/lang/de_DE/firefly.php
index ea89f4a67c..e07e450794 100644
--- a/resources/lang/de_DE/firefly.php
+++ b/resources/lang/de_DE/firefly.php
@@ -263,7 +263,7 @@ return [
     'rule_trigger_amount_less'                   => 'Betrag ist kleiner als :trigger_value',
     'rule_trigger_amount_exactly_choice'         => 'Betrag ist..',
     'rule_trigger_amount_exactly'                => 'Betrag ist :trigger_value',
-    'rule_trigger_amount_more_choice'            => 'Betragn ist mehr als..',
+    'rule_trigger_amount_more_choice'            => 'Betrag ist mehr als..',
     'rule_trigger_amount_more'                   => 'Betrag ist größer als :trigger_value',
     'rule_trigger_description_starts_choice'     => 'Beschreibung beginnt mit..',
     'rule_trigger_description_starts'            => 'Beschreibung beginnt mit ":trigger_value"',
@@ -331,7 +331,7 @@ return [
     'pref_home_screen_accounts'                  => 'Konten auf dem Startbildschirm',
     'pref_home_screen_accounts_help'             => 'Welche Konten sollen auf dem Startbildschirm angezeigt werden?',
     'pref_view_range'                            => 'Sichtbare Zeiträume',
-    'pref_view_range_help'                       => 'Einige Grafiken werden automatisch nach Zeiträumen gruppiert. Welchen Zeitraum wollen Sie festlegen?',
+    'pref_view_range_help'                       => 'Einige Diagramme werden automatisch nach Zeiträumen gruppiert. Welchen Zeitraum wollen Sie festlegen?',
     'pref_1D'                                    => 'Ein Tag',
     'pref_1W'                                    => 'Eine Woche',
     'pref_1M'                                    => 'Ein Monat',
@@ -342,7 +342,7 @@ return [
     'pref_languages_help'                        => 'Firefly III unterstützt mehrere Sprachen. Welche möchten Sie nutzen?',
     'pref_custom_fiscal_year'                    => 'Einstellungen zum Geschäftsjahr',
     'pref_custom_fiscal_year_label'              => 'Aktiviert',
-    'pref_custom_fiscal_year_help'               => 'In Ländern, in denen ein Geschäftsjahr nicht vom 1. Januar bis 31. Dezemeber dauert, können Sie diese Option anstellen und Start / Ende des Geschäftsjahres angeben',
+    'pref_custom_fiscal_year_help'               => 'In Ländern, in denen ein Geschäftsjahr nicht vom 1. Januar bis 31. Dezember dauert, können Sie diese Option anstellen und Start / Ende des Geschäftsjahres angeben',
     'pref_fiscal_year_start_label'               => 'Startdatum des Geschäftsjahr',
     'pref_two_factor_auth'                       => 'Zwei-Faktor-Authentifizierung',
     'pref_two_factor_auth_help'                  => 'Wenn Sie die Zwei-Faktor-Authentifizierung aktivieren, fügen Sie ihrem Benutzerkonto eine zusätzliche Sicherheitsebene hinzu. Sie loggen sich ein mit etwas das Sie wissen (ihrem Passwort) und etwas das Sie besitzen (einem Bestätigungscode). Bestätigungscodes werden von Anwendungen auf ihrem Smartphone, wie Authy oder Google Authenticator, generiert.',
@@ -351,8 +351,8 @@ return [
     'pref_two_factor_auth_remove_it'             => 'Vergessen Sie nicht ihr Benutzerkonto aus ihrer Authentifizierungsapp zu entfernen!',
     'pref_two_factor_auth_code'                  => 'Code überprüfen',
     'pref_two_factor_auth_code_help'             => 'Scannen Sie den QR-Code mit einer Anwendung wie Authy oder Google Authenticator auf ihrem Handy und geben Sie den generierten Code ein.',
-    'pref_two_factor_auth_reset_code'            => 'Setze den Verfizierungskode zurück',
-    'pref_two_factor_auth_remove_code'           => 'Entferne den Verfizierungskode',
+    'pref_two_factor_auth_reset_code'            => 'Verifizierungscode zurücksetzen',
+    'pref_two_factor_auth_remove_code'           => 'Verifizierungscode entfernen',
     'pref_two_factor_auth_remove_will_disable'   => '(dies wird auch Zwei-Faktor-Authentifizierung deaktivieren)',
     'pref_save_settings'                         => 'Einstellungen speichern',
     'saved_preferences'                          => 'Einstellungen gespeichert!',
@@ -365,9 +365,9 @@ return [
 Sollen zusätzlich Ihre Girokonten angezeigt werden?',
     'pref_home_do_show_deposits'                 => 'Ja, zeige sie an',
     'successful_count'                           => 'davon :count erfolgreich',
-    'transaction_page_size_title'                => 'Seitengröße',
+    'transaction_page_size_title'                => 'Einträge pro Seite',
     'transaction_page_size_help'                 => 'Jede Liste von Transaktionen zeigt maximal folgende Anzahl an Transaktionen',
-    'transaction_page_size_label'                => 'Seitengröße',
+    'transaction_page_size_label'                => 'Einträge pro Seite',
     'between_dates'                              => '(:start und :end)',
     'pref_optional_fields_transaction'           => 'Optionale Felder für Überweisungen',
     'pref_optional_fields_transaction_help'      => 'Standardmäßig sind nicht alle Felder aktiviert, wenn eine neue Überweisung erstellt wird (wegen der Übersicht). Unten können Sie diese Felder aktivieren, wenn Sie glauben, dass Sie nützlich für Sie sind. Alle Felder die deaktiviert sind, aber bereits ausgefüllt sind, werden unabhängig von ihren Einstellung sichtbar sein.',
@@ -407,9 +407,9 @@ Sollen zusätzlich Ihre Girokonten angezeigt werden?',
     'invalid_password'                           => 'Ungültiges Passwort!',
     'what_is_pw_security'                        => 'Was ist "Kennwort Sicherheit überprüfen"?',
     'secure_pw_title'                            => 'So wählen Sie ein sicheres Passwort aus',
-    'secure_pw_history'                          => 'Im August 2017 veröffentlichte die bekannte Sicherheitsforscherin Troy Hunt eine Liste von 306 Millionen gestohlenen Passwörtern. Diese Passwörter wurden während der Einbrücje bei Firmen wie LinkedIn, Adobe und NeoPets (und vielen mehr) gestohlen.',
+    'secure_pw_history'                          => 'Im August 2017 veröffentlichte die bekannte Sicherheitsforscherin Troy Hunt eine Liste von 306 Millionen gestohlenen Passwörtern. Diese Passwörter wurden während der Einbrüche bei Firmen wie LinkedIn, Adobe und NeoPets (und vielen mehr) gestohlen.',
     'secure_pw_check_box'                        => 'By checking the box, Firefly III will send the SHA1 hash of your password to <a href="https://www.troyhunt.com/introducing-306-million-freely-downloadable-pwned-passwords/">the website of Troy Hunt</a> to see if it is on the list. This will stop you from using unsafe passwords as is recommended in the latest <a href="https://pages.nist.gov/800-63-3/sp800-63b.html">NIST Special Publication</a> on this subject.',
-    'secure_pw_sha1'                             => 'Aber ich dachte, dass SHA1 kaputt war?',
+    'secure_pw_sha1'                             => 'Aber ich dachte, dass SHA1 schon geknackt wurde?',
     'secure_pw_hash_speed'                       => 'Yes, but not in this context. As you can read on <a href="https://shattered.io/">the website detailing how they broke SHA1</a>, it is now slightly easier to find a "collision": another string that results in the same SHA1-hash. It now only takes 10,000 years using a single-GPU machine.',
     'secure_pw_hash_security'                    => 'This collision would not be equal to your password, nor would it be useful on (a site like) Firefly III. This application does not use SHA1 for password verification. So it is safe to check this box. Your password is hashed and sent over HTTPS.',
     'secure_pw_should'                           => 'Should I check the box?',

From 608aa5c31e8a4e71b183d481466165d5b3a12131 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 13:40:07 +0200
Subject: [PATCH 589/668] New translations firefly.php (Polish)

---
 resources/lang/pl_PL/firefly.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/resources/lang/pl_PL/firefly.php b/resources/lang/pl_PL/firefly.php
index db5a59cce5..7efadd8335 100644
--- a/resources/lang/pl_PL/firefly.php
+++ b/resources/lang/pl_PL/firefly.php
@@ -815,12 +815,12 @@ return [
     // piggy banks:
     'add_money_to_piggy'                         => 'Dodaj pieniądze do skarbonki ":name"',
     'piggy_bank'                                 => 'Skarbonka',
-    'new_piggy_bank'                             => 'New piggy bank',
+    'new_piggy_bank'                             => 'Nowa skarbonka',
     'store_piggy_bank'                           => 'Zapisz nową skarbonkę',
     'stored_piggy_bank'                          => 'Zapisz nową skarbonkę ":name"',
     'account_status'                             => 'Status konta',
-    'left_for_piggy_banks'                       => 'Left for piggy banks',
-    'sum_of_piggy_banks'                         => 'Sum of piggy banks',
+    'left_for_piggy_banks'                       => 'Dostępne dla skarbonek',
+    'sum_of_piggy_banks'                         => 'Suma skarbonek',
     'saved_so_far'                               => 'Zaoszczędzono do tej pory',
     'left_to_save'                               => 'Pozostało do zaoszczędzenia',
     'suggested_amount'                           => 'Suggested monthly amount to save',
@@ -843,10 +843,10 @@ return [
     'table'                     => 'Tabela',
     'delete_piggy_bank'         => 'Usuń skarbonkę ":name"',
     'cannot_add_amount_piggy'   => 'Nie można dodać :amount do ":name".',
-    'cannot_remove_from_piggy'  => 'Could not remove :amount from ":name".',
+    'cannot_remove_from_piggy'  => 'Nie można usunąć :amount z ":name".',
     'deleted_piggy_bank'        => 'Usunięto skarbonkę ":name"',
-    'added_amount_to_piggy'     => 'Added :amount to ":name"',
-    'removed_amount_from_piggy' => 'Removed :amount from ":name"',
+    'added_amount_to_piggy'     => 'Dodano :amount do ":name"',
+    'removed_amount_from_piggy' => 'Usunięto :amount z ":name"',
 
     // tags
     'regular_tag'               => 'Po prostu zwykły tag.',
@@ -1032,8 +1032,8 @@ return [
     'no_transactions_imperative_transfers'  => 'Have you moved some money around? Then you should write it down:',
     'no_transactions_create_transfers'      => 'Utwórz transfer',
     'no_piggies_title_default'              => 'Stwórzmy skarbonkę!',
-    'no_piggies_intro_default'              => 'You have no piggy banks yet. You can create piggy banks to divide your savings and keep track of what you\'re saving up for.',
-    'no_piggies_imperative_default'         => 'Do you have things you\'re saving money for? Create a piggy bank and keep track:',
+    'no_piggies_intro_default'              => 'Nie posiadasz jeszcze żadnych skarbonek. Możesz stworzyć skarbonki aby dzielić swoje oszczędności i śledzić na co oszczędzasz.',
+    'no_piggies_imperative_default'         => 'Oszczędzasz pieniądze na coś? Utwórz skarbonkę i śledź:',
     'no_piggies_create_default'             => 'Utwórz nową skarbonkę',
     'no_bills_title_default'                => 'Stwórzmy rachunek!',
     'no_bills_intro_default'                => 'You have no bills yet. You can create bills to keep track of regular expenses, like your rent of insurance.',

From e48d14e14aff184593f5d73baa02f1d23faba96f Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 13:40:10 +0200
Subject: [PATCH 590/668] New translations firefly.php (German)

---
 resources/lang/de_DE/firefly.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/resources/lang/de_DE/firefly.php b/resources/lang/de_DE/firefly.php
index e07e450794..fa4d8a73e4 100644
--- a/resources/lang/de_DE/firefly.php
+++ b/resources/lang/de_DE/firefly.php
@@ -414,11 +414,11 @@ Sollen zusätzlich Ihre Girokonten angezeigt werden?',
     'secure_pw_hash_security'                    => 'This collision would not be equal to your password, nor would it be useful on (a site like) Firefly III. This application does not use SHA1 for password verification. So it is safe to check this box. Your password is hashed and sent over HTTPS.',
     'secure_pw_should'                           => 'Should I check the box?',
     'secure_pw_long_password'                    => 'Wenn du gerade ein langes, Single-Use-Passwort für Firefly III mit einem Kennwortgenerator generiert hast: <strong>Nein</strong>.',
-    'secure_pw_short'                            => 'Wenn Sie gerade das Passwort eingegeben haben, verwenden Sie immer: <em>Bitte ja</em>.',
+    'secure_pw_short'                            => 'Wenn Sie gerade das Passwort eingegeben haben, welches Sie immer verwenden: <em>Bitte ja</em>.',
 
 
     // attachments
-    'nr_of_attachments'                          => 'Eine Anhang |:count Anhänge',
+    'nr_of_attachments'                          => 'Ein Anhang |:count Anhänge',
     'attachments'                                => 'Anhänge',
     'edit_attachment'                            => 'Anhang ":name" bearbeiten',
     'update_attachment'                          => 'Anhang aktualisieren',
@@ -523,7 +523,7 @@ Sollen zusätzlich Ihre Girokonten angezeigt werden?',
     'matching_on'                                => 'Reagiert auf',
     'between_amounts'                            => 'zwischen :low und :high.',
     'repeats'                                    => 'Wiederholungen',
-    'connected_journals'                         => 'Vernüpfte Überweisungen',
+    'connected_journals'                         => 'Verknüpfte Überweisungen',
     'auto_match_on'                              => 'Automatisch von Firefly abgestimmt',
     'auto_match_off'                             => 'Nicht automatisch gefunden von Firefly',
     'next_expected_match'                        => 'Nächste erwartete Übereinstimmung',
@@ -535,8 +535,8 @@ Sollen zusätzlich Ihre Girokonten angezeigt werden?',
     'update_bill'                                => 'Aktualisieren Sie eine Rechnung',
     'updated_bill'                               => 'Rechnung ":name" aktualisiert',
     'store_new_bill'                             => 'Neue Rechnung speichern',
-    'stored_new_bill'                            => 'Neue Rechung ":name" gespeichert',
-    'cannot_scan_inactive_bill'                  => 'Inaktive Rechnungen können nicht gesacannt werden.',
+    'stored_new_bill'                            => 'Neue Rechnung ":name" gespeichert',
+    'cannot_scan_inactive_bill'                  => 'Inaktive Rechnungen können nicht gescannt werden.',
     'rescanned_bill'                             => 'Alles gescannt.',
     'average_bill_amount_year'                   => 'Durchschnittliche Rechnungssumme (:year)',
     'average_bill_amount_overall'                => 'Durchschnittliche Rechnungssumme (gesamt)',

From e36302315c9fc5e388219852776fa65da4e68278 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 13:50:06 +0200
Subject: [PATCH 591/668] New translations form.php (German)

---
 resources/lang/de_DE/form.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/resources/lang/de_DE/form.php b/resources/lang/de_DE/form.php
index 07e305d3d2..3683f74ea6 100644
--- a/resources/lang/de_DE/form.php
+++ b/resources/lang/de_DE/form.php
@@ -80,7 +80,7 @@ return [
     'source_account_revenue'      => 'Quellkonto (Ertragskonto)',
     'type'                        => 'Type',
     'convert_Withdrawal'          => 'Ändere zu Abhebung',
-    'convert_Deposit'             => 'Ändere zu Einzahlng',
+    'convert_Deposit'             => 'Ändere zu Einzahlung',
     'convert_Transfer'            => 'Ändere zu Überweisung',
 
 
@@ -152,7 +152,7 @@ return [
     'journal_link_areYouSure'    => 'Bist du sicher, dass du die Verknüpfung zwischen <a href=":source_link">:source</a> und <a href=":destination_link">:destination</a> löschen möchtest?',
     'linkType_areYouSure'        => 'Are you sure you want to delete the link type ":name" (":inward" / ":outward")?',
     'permDeleteWarning'          => 'Das Löschen von Dingen in Firefly ist dauerhaft und kann nicht rückgängig gemacht werden.',
-    'mass_make_selection'        => 'Sie können das Löschen von Elementen verhinden, indem Sie die Checkbox entfernen.',
+    'mass_make_selection'        => 'Sie können das Löschen von Elementen verhindern, indem Sie die Checkbox entfernen.',
     'delete_all_permanently'     => 'Ausgewähltes dauerhaft löschen',
     'update_all_journals'        => 'Diese Transaktionen aktualisieren',
     'also_delete_transactions'   => 'Die einzige Überweisung, die mit diesem Konto verknüpft ist, wird ebenfalls gelöscht. | Alle :count Überweisungen, die mit diesem Konto verknüpft sind, werden ebenfalls gelöscht.',
@@ -164,7 +164,7 @@ return [
     'category_keep_transactions' => 'Die eine Überweisungen, die mit dieser Kategorie verknüpft ist, wird nicht gelöscht. | Keine der :count Kategorien, die mit dieser Rechnung verknüpft sind, werden gelöscht.',
     'tag_keep_transactions'      => 'Die einzige Überweisung, die mit diesem Tag verknüpft ist, wird nicht gelöscht. | Keiner der :count Tags, die mit dieser Rechnung verknüpft sind, werden gelöscht.',
 
-    'email'                 => 'Email-Addresse',
+    'email'                 => 'E-Mail Adresse',
     'password'              => 'Passwort',
     'password_confirmation' => 'Passwort (nochmal)',
     'blocked'               => 'Ist blockiert?',

From 2ac582cd186c2761abaeb6ef46dc6fdabf8a4f07 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 13:50:08 +0200
Subject: [PATCH 592/668] New translations firefly.php (German)

---
 resources/lang/de_DE/firefly.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/resources/lang/de_DE/firefly.php b/resources/lang/de_DE/firefly.php
index fa4d8a73e4..3297d794db 100644
--- a/resources/lang/de_DE/firefly.php
+++ b/resources/lang/de_DE/firefly.php
@@ -607,7 +607,7 @@ Sollen zusätzlich Ihre Girokonten angezeigt werden?',
     'update_transfer'                            => 'Überweisungen aktualisieren',
     'updated_withdrawal'                         => 'Ausgabe ":description" aktualisiert',
     'updated_deposit'                            => 'Einnahme ":description" aktualisiert',
-    'updated_transfer'                           => 'Überweisung ":description" aktualisert',
+    'updated_transfer'                           => 'Überweisung ":description" aktualisiert',
     'delete_withdrawal'                          => 'Ausgabe ":description" löschen',
     'delete_deposit'                             => 'Einnahme ":description" löschen',
     'delete_transfer'                            => 'Überweisung ":description" löschen',
@@ -873,7 +873,7 @@ Sollen zusätzlich Ihre Girokonten angezeigt werden?',
     'instance_configuration'                => 'Konfiguration',
     'firefly_instance_configuration'        => 'Konfigurationsoptionen für Firefly III',
     'setting_single_user_mode'              => 'Einzelnutzermodus',
-    'setting_single_user_mode_explain'      => 'Standardmäßig aktzeptiert Firefly III nur eine Registration: Sie. Diese Sicherheitsmaßnahme verhindert das Benutzen Ihrer Instanz durch andere, außer Sie erlauben es. Zukünftige Registrationen sind gesperrt. Wenn Sie dieses Kontrollkästchen deaktivieren können andere ihre Instanz ebenfalls benutzen, vorausgesetzt sie ist erreichbar (mit dem Internet verbunden).',
+    'setting_single_user_mode_explain'      => 'Standardmäßig akzeptiert Firefly III nur eine Registrierung: Sie. Diese Sicherheitsmaßnahme verhindert das Benutzen Ihrer Instanz durch andere, außer Sie erlauben es. Zukünftige Registrierungen sind gesperrt. Wenn Sie dieses Kontrollkästchen deaktivieren können andere ihre Instanz ebenfalls benutzen, vorausgesetzt sie ist erreichbar (mit dem Internet verbunden).',
     'store_configuration'                   => 'Konfiguration speichern',
     'single_user_administration'            => 'Benutzerverwaltung für :email',
     'edit_user'                             => 'Benutzer :email bearbeiten',
@@ -887,7 +887,7 @@ Sollen zusätzlich Ihre Girokonten angezeigt werden?',
     'rulegroup_or_groups'                   => 'Regelgruppe(n)',
     'configuration_updated'                 => 'Die Konfiguration wurde aktualisiert',
     'setting_is_demo_site'                  => 'Demonstrationsseite',
-    'setting_is_demo_site_explain'          => 'Wenn sie diese Option auswählen, wird sich diese Installation wie eine Demonstrationsseite verhalten, was ungwollte Auswirkungen haben kann.',
+    'setting_is_demo_site_explain'          => 'Wenn sie diese Option auswählen, wird sich diese Installation wie eine Demonstrationsseite verhalten, was ungewollte Auswirkungen haben kann.',
     'block_code_bounced'                    => 'Email message(s) bounced',
     'block_code_expired'                    => 'Demo-Konto abgelaufen',
     'no_block_code'                         => 'Kein Grund für Block oder Benutzer nicht blockiert',

From 1c72e742cfba04ba6087537148aaaf7894c71961 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 14:00:06 +0200
Subject: [PATCH 593/668] New translations validation.php (German)

---
 resources/lang/de_DE/validation.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/resources/lang/de_DE/validation.php b/resources/lang/de_DE/validation.php
index 95fe9632b6..b86d348f18 100644
--- a/resources/lang/de_DE/validation.php
+++ b/resources/lang/de_DE/validation.php
@@ -30,8 +30,8 @@ return [
     'after'                          => ':attribute muss ein Datum nach :date sein.',
     'alpha'                          => ':attribute darf nur Buchstaben enthalten.',
     'alpha_dash'                     => ':attribute darf nur Buchstaben, Zahlen und Bindestrichen enthalten.',
-    'alpha_num'                      => ':attribute darf nur Buchzahlen und Zahlen enthalten.',
-    'array'                          => ':attribute muss eine Reihe sein.',
+    'alpha_num'                      => ':attribute darf nur Buchstaben und Zahlen enthalten.',
+    'array'                          => ':attribute muss eine Liste sein.',
     'unique_for_user'                => 'Es gibt bereits einen Eintrag mit diesem :attribute.',
     'before'                         => ':attribute muss ein Datum vor dem :date sein.',
     'unique_object_for_user'         => 'Der Name wird bereits verwendet',
@@ -47,7 +47,7 @@ return [
     'different'                      => ':attribute und :other müssen sich unterscheiden.',
     'digits'                         => ':attribute muss :digits Stellen haben.',
     'digits_between'                 => ':attribute muss zwischen :min und :max Stellen haben.',
-    'email'                          => ':attribute muss eine gültige E-Mailadresse sein.',
+    'email'                          => ':attribute muss eine gültige E-Mail Adresse sein.',
     'filled'                         => ':attribute Feld muss ausgefüllt sein.',
     'exists'                         => ':attribute ist ungültig.',
     'image'                          => ':attribute muss ein Bild sein.',
@@ -72,8 +72,8 @@ return [
     'required_unless'                => ':attribute Feld ist notwendig, außer :other ist in :values enthalten.',
     'required_with'                  => ':attribute Feld ist notwendig falls :values vorhanden sind.',
     'required_with_all'              => ':attribute Feld ist notwendig falls :values vorhanden sind.',
-    'required_without'               => ':attribute Feld ist notwenidig, falls :values nicht vorhanden ist.',
-    'required_without_all'           => ':attribute Feld ist notwenidig, falls kein :values vorhanden ist.',
+    'required_without'               => ':attribute Feld ist notwendig, falls :values nicht vorhanden ist.',
+    'required_without_all'           => ':attribute Feld ist notwendig, falls kein :values vorhanden ist.',
     'same'                           => ':attribute und :other müssen übereinstimmen.',
     'size.numeric'                   => ':attribute muss :size sein.',
     'size.file'                      => ':attribute muss :size Kilobytes groß sein.',

From 3582d795304621c25f119af9dd5b05537fd591a1 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 14:00:07 +0200
Subject: [PATCH 594/668] New translations demo.php (German)

---
 resources/lang/de_DE/demo.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/resources/lang/de_DE/demo.php b/resources/lang/de_DE/demo.php
index 07254c0b6b..e790baf011 100644
--- a/resources/lang/de_DE/demo.php
+++ b/resources/lang/de_DE/demo.php
@@ -12,10 +12,10 @@ declare(strict_types=1);
 return [
     'no_demo_text'                   => 'Leider gibt es keine zusätzlichen Demoerklärungen für <abbr title=":route">diese Seite</abbr>.',
     'see_help_icon'                  => 'Trotzdem kann der <i class="fa fa-question-circle"></i>-Icon in der oberen rechten Ecke mehr erzählen.',
-    'index'                          => 'Wilkommen bei <strong>Firefly III</strong>! Auf dieser Seite erhalten Sie einen schnellen Überblick über Ihre Finanzen. Für weitere Informationen, besuchen Sie die Accounts &rarr; <a href=":asset">Girokonten</a> und natürlich <a href=":budgets">Budgets</a> und <a href=":reports">Berichte</a> Seiten. Oder sehen Sie sich einfach um und schauen wo Sie landen.',
+    'index'                          => 'Willkommen bei <strong>Firefly III</strong>! Auf dieser Seite erhalten Sie einen schnellen Überblick über Ihre Finanzen. Für weitere Informationen, besuchen Sie die Accounts &rarr; <a href=":asset">Girokonten</a> und natürlich <a href=":budgets">Budgets</a> und <a href=":reports">Berichte</a> Seiten. Oder sehen Sie sich einfach um und schauen wo Sie landen.',
     'accounts-index'                 => 'Vermögenskonten sind Ihre persönlichen Bank-Konten. Aufwandskonten sind Konten, denen Sie Geld zahlen, z. B. Läden und Freunde. Einnahmekonten sind Konten von denen Sie Geld erhalten, z. B. Ihr Arbeitgeber und andere Einkommensquellen. Auf dieser Seite können Sie diese bearbeiten oder entfernen.',
-    'budgets-index'                  => 'Diese Seite zeigt Ihnen einen Überblick über Ihre Budgets. Die obere Leiste zeigt den Betrag, der zur Verfügung steht. Dieser kann für einen Zeitraum angepasst werden, indem Sie auf den Betrag auf der rechten Seite klicken. Wieviel bisher ausgegeb wurde wird darunter angezeigt. Darunter sind die Aufwendungen pro Haushalt und wieviel dafür veranschlagt ist.',
-    'reports-index-start'            => 'Firefly III unterstützt vier Berichtarten. Mehr Informationen hirzu können durch ein Klick auf das <i class="fa fa-question-circle"></i> Symbol in der oberen rechten Ecke aufgerufen werden.',
+    'budgets-index'                  => 'Diese Seite zeigt Ihnen einen Überblick über Ihre Budgets. Die obere Leiste zeigt den Betrag, der zur Verfügung steht. Dieser kann für einen Zeitraum angepasst werden, indem Sie auf den Betrag auf der rechten Seite klicken. Wie viel bisher ausgegeben wurde wird darunter angezeigt. Darunter sind die Aufwendungen pro Haushalt und wie viel dafür veranschlagt ist.',
+    'reports-index-start'            => 'Firefly III unterstützt vier Berichtarten. Mehr Informationen hierzu können durch ein Klick auf das <i class="fa fa-question-circle"></i> Symbol in der oberen rechten Ecke aufgerufen werden.',
     'reports-index-examples'         => 'Achten Sie darauf, diese Beispiele anzusehen: <a href=":one"> eine monatliche Finanzübersicht</a>, <a href=":two"> eine jährliche Finanzübersicht</a> und <a href=":three"> eine Haushaltsübersicht</a>.',
     'currencies-index'               => 'Firefly III unterstützt mehrere Währungen. Obwohl es den Euro standardmäßig nutzt, ist es möglich US-Dollar oder viele andere Währungen zu verwenden. Wie Sie sehen können, ist eine kleine Auswahl an Währungen aufgenommen worden, aber Sie können Ihre Eigenen hinzufügen. Die Standardwährung zu ändern, wird die Währung der vorhandenen Buchungen jedoch nicht ändern: Firefly III unterstützt die Verwendung mehrerer Währungen zur gleichen Zeit.',
     'transactions-index'             => 'Diese Aufwendungen, Einzahlungen und Überweisungen sind nicht besonders einfallsreich. Sie wurden automatisch generiert.',

From 057e76acd0f62633158269a618d293969bde2877 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 14:00:08 +0200
Subject: [PATCH 595/668] New translations breadcrumbs.php (Polish)

---
 resources/lang/pl_PL/breadcrumbs.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/pl_PL/breadcrumbs.php b/resources/lang/pl_PL/breadcrumbs.php
index 244b380690..52019feac2 100644
--- a/resources/lang/pl_PL/breadcrumbs.php
+++ b/resources/lang/pl_PL/breadcrumbs.php
@@ -40,5 +40,5 @@ return [
     'createTag'           => 'Utwórz nowy tag',
     'edit_tag'            => 'Modyfikuj tag ":tag"',
     'delete_tag'          => 'Usuń tag ":tag"',
-    'delete_journal_link' => 'Delete link between transactions',
+    'delete_journal_link' => 'Usuń powiązanie między transakcjami',
 ];

From 20597c5ee1592fb7c069ad0a3d1d54a86f91bedc Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 14:00:09 +0200
Subject: [PATCH 596/668] New translations help.php (German)

---
 resources/lang/de_DE/help.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/de_DE/help.php b/resources/lang/de_DE/help.php
index 3d3f47687f..28bd88927c 100644
--- a/resources/lang/de_DE/help.php
+++ b/resources/lang/de_DE/help.php
@@ -17,7 +17,7 @@ return [
     'main-content-title'     => 'Willkommen bei Firefly III',
     'main-content-text'      => 'Tun Sie sich selbst einen Gefallen und folgen Sie dieser kurzen Tour, damit Sie wissen wie alles funktioniert.',
     'sidebar-toggle-title'   => 'Sidebar um neuen Dinge zu erstellen',
-    'sidebar-toggle-text'    => 'Versteckt unter dem Plus-Icon sind alle Schaltflächen zum Erstellen von neuen Dingen. Konten, Überweisungen, Alles!',
+    'sidebar-toggle-text'    => 'Versteckt hinter dem Plus-Icon sind alle Schaltflächen zum Erstellen von neuen Dingen. Konten, Überweisungen, Alles!',
     'account-menu-title'     => 'Alle Ihre Konten',
     'account-menu-text'      => 'Hier finden Sie alle Konten, die Sie erstellt haben.',
     'budget-menu-title'      => 'Budget',

From ef54e0a845137adfdefdc685be7b00ab2853ffde Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 14:00:11 +0200
Subject: [PATCH 597/668] New translations form.php (Polish)

---
 resources/lang/pl_PL/form.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/pl_PL/form.php b/resources/lang/pl_PL/form.php
index cfb6fadcb6..4e51afba10 100644
--- a/resources/lang/pl_PL/form.php
+++ b/resources/lang/pl_PL/form.php
@@ -149,7 +149,7 @@ return [
     'journal_areYouSure'         => 'Czy na pewno chcesz usunąć transakcję opisaną ":description"?',
     'mass_journal_are_you_sure'  => 'Czy na pewno chcesz usunąć te transakcje?',
     'tag_areYouSure'             => 'Czy na pewno chcesz usunąć tag ":tag"?',
-    'journal_link_areYouSure'    => 'Are you sure you want to delete the link between <a href=":source_link">:source</a> and <a href=":destination_link">:destination</a>?',
+    'journal_link_areYouSure'    => 'Czy na pewno chcesz usunąć powiązanie między <a href=":source_link">:source</a> a <a href=":destination_link">:destination</a>?',
     'linkType_areYouSure'        => 'Are you sure you want to delete the link type ":name" (":inward" / ":outward")?',
     'permDeleteWarning'          => 'Usuwanie rzeczy z Firefly jest trwałe i nie można tego cofnąć.',
     'mass_make_selection'        => 'You can still prevent items from being deleted by removing the checkbox.',

From 5946e4b9b5fab62d02ec9695fa24e0be2386f3de Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 14:00:14 +0200
Subject: [PATCH 598/668] New translations firefly.php (German)

---
 resources/lang/de_DE/firefly.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/de_DE/firefly.php b/resources/lang/de_DE/firefly.php
index 3297d794db..1f6538d707 100644
--- a/resources/lang/de_DE/firefly.php
+++ b/resources/lang/de_DE/firefly.php
@@ -41,7 +41,7 @@ return [
     'new_revenue_account'                        => 'Neuer Kreditor (Geldeingang)',
     'new_budget'                                 => 'Neues Budget',
     'new_bill'                                   => 'Neue Rechnung',
-    'block_account_logout'                       => 'Sie wurden ausgeloggt. Blockierte Benutzerkonten können diese Seite nicht nutzen. Haben Sie eine gültige E-Mailadresse registriert?',
+    'block_account_logout'                       => 'Sie wurden ausgeloggt. Blockierte Benutzerkonten können diese Seite nicht nutzen. Haben Sie sich mit einer gültigen E-Mail Adresse registriert?',
     'flash_success'                              => 'Geschafft!',
     'flash_info'                                 => 'Nachricht',
     'flash_warning'                              => 'Achtung!',

From 812e3d4a747637584510814aa052f70238b14b37 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 14:00:17 +0200
Subject: [PATCH 599/668] New translations firefly.php (Polish)

---
 resources/lang/pl_PL/firefly.php | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/resources/lang/pl_PL/firefly.php b/resources/lang/pl_PL/firefly.php
index 7efadd8335..8bf2074d84 100644
--- a/resources/lang/pl_PL/firefly.php
+++ b/resources/lang/pl_PL/firefly.php
@@ -906,23 +906,23 @@ return [
     'link_type_help_outward'                => 'Ie. "is duplicated by"',
     'save_connections_by_moving'            => 'Save the link between these transaction(s) by moving them to another link type:',
     'do_not_save_connection'                => '(do not save connection)',
-    'link_transaction'                      => 'Link transaction',
-    'link_to_other_transaction'             => 'Link this transaction to another transaction',
-    'select_transaction_to_link'            => 'Select a transaction to link this transaction to',
+    'link_transaction'                      => 'Powiąż transakcje',
+    'link_to_other_transaction'             => 'Powiąż aktualną transakcję z inną transakcją',
+    'select_transaction_to_link'            => 'Wybierz transakcję, którą chcesz powiązać z tą transakcją',
     'this_transaction'                      => 'This transaction',
     'transaction'                           => 'Transaction',
     'comments'                              => 'Komentarze',
-    'to_link_not_found'                     => 'If the transaction you want to link to is not listed, simply enter its ID.',
-    'invalid_link_data'                     => 'Invalid link type selected. Cannot link transaction.',
-    'journals_linked'                       => 'Transactions are linked.',
-    'journals_error_linked'                 => 'These transactions are already linked.',
-    'journal_links'                         => 'Transaction links',
+    'to_link_not_found'                     => 'Jeśli nie widzisz transakcji, którą chcesz powiązać, po prostu wpisz jej identyfikator.',
+    'invalid_link_data'                     => 'Wybrano błędny typ powiązania. Nie można powiązać transakcji.',
+    'journals_linked'                       => 'Transakcje są powiązane.',
+    'journals_error_linked'                 => 'Wybrane transakcje są już powiązane.',
+    'journal_links'                         => 'Powiązane transakcje',
     'this_withdrawal'                       => 'This withdrawal',
     'this_deposit'                          => 'This deposit',
     'this_transfer'                         => 'This transfer',
     'overview_for_link'                     => 'Overview for link type ":name"',
-    'delete_journal_link'                   => 'Delete the link between <a href=":source_link">:source</a> and <a href=":destination_link">:destination</a>',
-    'deleted_link'                          => 'Deleted link',
+    'delete_journal_link'                   => 'Usuń powiązanie między <a href=":source_link">:source</a> a <a href=":destination_link">:destination</a>',
+    'deleted_link'                          => 'Usunięto powiązanie',
     '1_outward'                             => 'relates to',
     '2_outward'                             => '(partially) refunds',
     '3_outward'                             => '(partially) pays for',

From 55cd717df425d818b0a5dcf37b72d9ac2b7973e9 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 14:10:05 +0200
Subject: [PATCH 600/668] New translations demo.php (German)

---
 resources/lang/de_DE/demo.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/lang/de_DE/demo.php b/resources/lang/de_DE/demo.php
index e790baf011..19d4a1bbf5 100644
--- a/resources/lang/de_DE/demo.php
+++ b/resources/lang/de_DE/demo.php
@@ -17,10 +17,10 @@ return [
     'budgets-index'                  => 'Diese Seite zeigt Ihnen einen Überblick über Ihre Budgets. Die obere Leiste zeigt den Betrag, der zur Verfügung steht. Dieser kann für einen Zeitraum angepasst werden, indem Sie auf den Betrag auf der rechten Seite klicken. Wie viel bisher ausgegeben wurde wird darunter angezeigt. Darunter sind die Aufwendungen pro Haushalt und wie viel dafür veranschlagt ist.',
     'reports-index-start'            => 'Firefly III unterstützt vier Berichtarten. Mehr Informationen hierzu können durch ein Klick auf das <i class="fa fa-question-circle"></i> Symbol in der oberen rechten Ecke aufgerufen werden.',
     'reports-index-examples'         => 'Achten Sie darauf, diese Beispiele anzusehen: <a href=":one"> eine monatliche Finanzübersicht</a>, <a href=":two"> eine jährliche Finanzübersicht</a> und <a href=":three"> eine Haushaltsübersicht</a>.',
-    'currencies-index'               => 'Firefly III unterstützt mehrere Währungen. Obwohl es den Euro standardmäßig nutzt, ist es möglich US-Dollar oder viele andere Währungen zu verwenden. Wie Sie sehen können, ist eine kleine Auswahl an Währungen aufgenommen worden, aber Sie können Ihre Eigenen hinzufügen. Die Standardwährung zu ändern, wird die Währung der vorhandenen Buchungen jedoch nicht ändern: Firefly III unterstützt die Verwendung mehrerer Währungen zur gleichen Zeit.',
+    'currencies-index'               => 'Firefly III unterstützt mehrere Währungen. Obwohl es den Euro standardmäßig nutzt, ist es möglich US-Dollar oder viele andere Währungen zu verwenden. Wie Sie sehen können, ist eine kleine Auswahl an Währungen aufgenommen worden, aber Sie können Ihre eigenen hinzufügen. Die Standardwährung zu ändern, wird die Währung der vorhandenen Buchungen jedoch nicht ändern: Firefly III unterstützt die Verwendung mehrerer Währungen zur gleichen Zeit.',
     'transactions-index'             => 'Diese Aufwendungen, Einzahlungen und Überweisungen sind nicht besonders einfallsreich. Sie wurden automatisch generiert.',
     'piggy-banks-index'              => 'Wie Sie sehen können, gibt es drei Sparschweine. Benutzen die Plus- und Minusknöpfe um die Menge des Geldes in den Sparschweinen zu beeinflussen. Klicken Sie auf den Namen des Sparschweins um Details einzusehen.',
-    'import-index'                   => 'Natürlich kann eine CSV-Datei in Firefly III importiert werden ',
+    'import-index'                   => 'Natürlich kann jede CSV-Datei in Firefly III importiert werden ',
     'import-configure-security'      => 'Aufgrund von Sicherheitsbedenken wurde der Upload mit einer lokalen Datei ersetzt.',
     'import-configure-configuration' => 'Die unten stehende Konfiguration für die lokale Datei ist korrekt.',
 ];

From 88ea2aad28e44b8ae6f6bf287b1a3f3e78fa6a01 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 14:10:06 +0200
Subject: [PATCH 601/668] New translations csv.php (Polish)

---
 resources/lang/pl_PL/csv.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/pl_PL/csv.php b/resources/lang/pl_PL/csv.php
index 46b3c01136..2bfdd059a3 100644
--- a/resources/lang/pl_PL/csv.php
+++ b/resources/lang/pl_PL/csv.php
@@ -33,7 +33,7 @@ return [
     'roles_column_role'             => 'Znaczenie danych w kolumnie',
     'roles_do_map_value'            => 'Zmapuj te wartości',
     'roles_column'                  => 'Kolumna',
-    'roles_no_example_data'         => 'Brak dostępnych danych przykładowych',
+    'roles_no_example_data'         => 'Brak przykładowych danych',
     'roles_submit'                  => 'Przejdź do kroku 3/3',
     'roles_warning'                 => 'At the very least, mark one column as the amount-column. It is advisable to also select a column for the description, date and the opposing account.',
 

From 05103c06769def86bc940ce6641fb8e48fee7e52 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 14:20:07 +0200
Subject: [PATCH 602/668] New translations firefly.php (Polish)

---
 resources/lang/pl_PL/firefly.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/resources/lang/pl_PL/firefly.php b/resources/lang/pl_PL/firefly.php
index 8bf2074d84..8347f049e1 100644
--- a/resources/lang/pl_PL/firefly.php
+++ b/resources/lang/pl_PL/firefly.php
@@ -61,7 +61,7 @@ return [
     'two_factor_lost_intro'                      => 'Niestety to nie jest coś, co można zresetować z poziomu strony www. Masz dwie możliwości.',
     'two_factor_lost_fix_self'                   => 'Jeśli jesteś właścicielem tej instalacji Firefly III, sprawdź pliki w katalogu <code>storage/logs</code> aby uzyskać instrukcje.',
     'two_factor_lost_fix_owner'                  => 'W przeciwnym razie, powiadom właściciela strony, <a href="mailto::site_owner">:site_owner</a> i poproś go o zresetowanie Twojego uwierzytelnienia dwuskładnikowego.',
-    'warning_much_data'                          => 'Załadowanie :days dni danych może trochę potrwać.',
+    'warning_much_data'                          => 'Załadowanie danych z :days dni może trochę potrwać.',
     'registered'                                 => 'Zarejestrowałeś się pomyślnie!',
     'Default asset account'                      => 'Domyślne konto aktywów',
     'no_budget_pointer'                          => 'Wygląda na to że nie masz jeszcze budżetów. Powinieneś utworzyć kilka na stronie <a href="/budgets">budżety</a>. Budżety mogą Ci pomóc śledzić wydatki.',
@@ -69,8 +69,8 @@ return [
     'Credit card'                                => 'Karta kredytowa',
     'source_accounts'                            => 'Konto(a) źródłowe',
     'destination_accounts'                       => 'Konto(a) docelowe',
-    'user_id_is'                                 => 'Twój id użytkownika to <strong>:user</strong>',
-    'field_supports_markdown'                    => 'To pole obsługuje <a href="https://en.support.wordpress.com/markdown-quick-reference/"> Markdown</a>.',
+    'user_id_is'                                 => 'Twój identyfikator użytkownika to <strong>:user</strong>',
+    'field_supports_markdown'                    => 'To pole obsługuje <a href="https://pl.wikipedia.org/wiki/Markdown"> Markdown</a>.',
     'need_more_help'                             => 'If you need more help using Firefly III, please <a href="https://github.com/firefly-iii/firefly-iii/issues">open a ticket on Github</a>.',
     'reenable_intro_text'                        => 'You can also reenable <a href="#" id="reenableGuidance">the introduction guidance</a>.',
     'intro_boxes_after_refresh'                  => 'The introduction boxes will reappear when you refresh the page.',
@@ -199,7 +199,7 @@ return [
     'move_rule_group_down'                       => 'Przenieś grupę reguł w dół',
     'save_rules_by_moving'                       => 'Zapisz te reguły, przenosząc je do innej grupy reguł:',
     'make_new_rule'                              => 'Utwórz nową regułę w grupie reguł ":title"',
-    'rule_help_stop_processing'                  => 'Gdy zaznaczysz ten checkbox, kolejne reguły w tej grupie nie będą wykonywane.',
+    'rule_help_stop_processing'                  => 'Gdy zaznaczysz to pole, kolejne reguły w tej grupie nie będą wykonywane.',
     'rule_help_active'                           => 'Nieaktywne reguły nigdy nie zostaną uruchomione.',
     'stored_new_rule'                            => 'Zapisano regułę o nazwie ":title"',
     'deleted_rule'                               => 'Usunięto regułę o nazwie ":title"',
@@ -224,7 +224,7 @@ return [
     'edit_rule'                                  => 'Modyfikuj regułę ":title"',
     'delete_rule'                                => 'Usuń regułę ":title"',
     'update_rule'                                => 'Modyfikuj regułę',
-    'test_rule_triggers'                         => 'Zobacz dopasowane transakcje',
+    'test_rule_triggers'                         => 'Zobacz pasujące transakcje',
     'warning_transaction_subset'                 => 'For performance reasons this list is limited to :max_num_transactions and may only show a subset of matching transactions',
     'warning_no_matching_transactions'           => 'No matching transactions found. Please note that for performance reasons, only the last :num_transactions transactions have been checked.',
     'warning_no_valid_triggers'                  => 'Nie dostarczono prawidłowych wyzwalaczy.',

From 560bd6a92b961d48fd015b530be1905db499c40b Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 14:30:07 +0200
Subject: [PATCH 603/668] New translations firefly.php (Polish)

---
 resources/lang/pl_PL/firefly.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/resources/lang/pl_PL/firefly.php b/resources/lang/pl_PL/firefly.php
index 8347f049e1..4f270ac91d 100644
--- a/resources/lang/pl_PL/firefly.php
+++ b/resources/lang/pl_PL/firefly.php
@@ -71,19 +71,19 @@ return [
     'destination_accounts'                       => 'Konto(a) docelowe',
     'user_id_is'                                 => 'Twój identyfikator użytkownika to <strong>:user</strong>',
     'field_supports_markdown'                    => 'To pole obsługuje <a href="https://pl.wikipedia.org/wiki/Markdown"> Markdown</a>.',
-    'need_more_help'                             => 'If you need more help using Firefly III, please <a href="https://github.com/firefly-iii/firefly-iii/issues">open a ticket on Github</a>.',
-    'reenable_intro_text'                        => 'You can also reenable <a href="#" id="reenableGuidance">the introduction guidance</a>.',
-    'intro_boxes_after_refresh'                  => 'The introduction boxes will reappear when you refresh the page.',
+    'need_more_help'                             => 'Jeśli potrzebujesz dodatkowej pomocy w korzystaniu z Firefly III, proszę <a href="https://github.com/firefly-iii/firefly-iii/issues">opisz go w zgłoszeniu na Githubie</a>.',
+    'reenable_intro_text'                        => 'Możesz także ponownie włączyć <a href="#" id="reenableGuidance">samouczek</a>.',
+    'intro_boxes_after_refresh'                  => 'Samouczek pojawi się po odświeżeniu strony.',
     'show_all_no_filter'                         => 'Pokaż wszystkie transakcje bez grupowania ich według daty.',
     'expenses_by_category'                       => 'Wydatki wg kategorii',
     'expenses_by_budget'                         => 'Wydatki wg budżetu',
     'income_by_category'                         => 'Dochody wg kategorii',
-    'expenses_by_asset_account'                  => 'Expenses by asset account',
-    'expenses_by_expense_account'                => 'Expenses by expense account',
-    'cannot_redirect_to_account'                 => 'Firefly III cannot redirect you to the correct page. Apologies.',
+    'expenses_by_asset_account'                  => 'Wydatki wg kont aktywów',
+    'expenses_by_expense_account'                => 'Wydatki wg kont wydatków',
+    'cannot_redirect_to_account'                 => 'Firefly III nie może Cię przekierować na właściwą stronę. Przepraszamy.',
     'sum_of_expenses'                            => 'Suma wydatków',
     'sum_of_income'                              => 'Suma dochodów',
-    'total_sum'                                  => 'Total sum',
+    'total_sum'                                  => 'Suma ogółem',
     'spent_in_specific_budget'                   => 'Wydatki w budżecie ":budget"',
     'sum_of_expenses_in_budget'                  => 'Wydano łącznie w budżecie ":budget"',
     'left_in_budget_limit'                       => 'Left to spend according to budgeting',

From ceaba5a11cbd454fdf87a3a400d2145c2411f1c0 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 15:10:08 +0200
Subject: [PATCH 604/668] New translations firefly.php (Polish)

---
 resources/lang/pl_PL/firefly.php | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/resources/lang/pl_PL/firefly.php b/resources/lang/pl_PL/firefly.php
index 4f270ac91d..a85add7360 100644
--- a/resources/lang/pl_PL/firefly.php
+++ b/resources/lang/pl_PL/firefly.php
@@ -86,16 +86,16 @@ return [
     'total_sum'                                  => 'Suma ogółem',
     'spent_in_specific_budget'                   => 'Wydatki w budżecie ":budget"',
     'sum_of_expenses_in_budget'                  => 'Wydano łącznie w budżecie ":budget"',
-    'left_in_budget_limit'                       => 'Left to spend according to budgeting',
+    'left_in_budget_limit'                       => 'Możliwe do wydania wg budżetu',
     'cannot_reset_demo_user'                     => 'Nie można zresetować hasła do konta demonstracyjnego',
     'current_period'                             => 'Bieżący okres',
     'show_the_current_period_and_overview'       => 'Pokaż bieżący okres oraz przegląd',
     'pref_languages_locale'                      => 'For a language other than English to work properly, your operating system must be equipped with the correct locale-information. If these are not present, currency data, dates and amounts may be formatted wrong.',
-    'budget_in_period'                           => 'All transactions for budget ":name" between :start and :end',
-    'chart_budget_in_period'                     => 'Chart for all transactions for budget ":name" between :start and :end',
-    'chart_account_in_period'                    => 'Chart for all transactions for account ":name" between :start and :end',
-    'chart_category_in_period'                   => 'Chart for all transactions for category ":name" between :start and :end',
-    'chart_category_all'                         => 'Chart for all transactions for category ":name"',
+    'budget_in_period'                           => 'Wszystkie transakcje dla budżetu ":name" od :start do :end',
+    'chart_budget_in_period'                     => 'Wykres wszystkich transakcji dla budżetu ":name" od :start do :end',
+    'chart_account_in_period'                    => 'Wykres wszystkich transakcji dla konta ":name" od :start do :end',
+    'chart_category_in_period'                   => 'Wykres wszystkich transakcji dla kategorii ":name" od :start do :end',
+    'chart_category_all'                         => 'Wykres wszystkich transakcji dla kategorii ":name"',
     'clone_withdrawal'                           => 'Zduplikuj tę wypłatę',
     'clone_deposit'                              => 'Zduplikuj tą wpłatę',
     'clone_transfer'                             => 'Zduplikuj ten transfer',
@@ -110,14 +110,14 @@ return [
     'all_journals_for_account'                   => 'Wszystkie transakcje dla konta :name',
     'chart_all_journals_for_account'             => 'Wykres wszystkich transakcji dla konta :name',
     'journals_in_period_for_account'             => 'Wszystkie transakcje dla konta :name od :start do :end',
-    'transferred'                                => 'Transferred',
+    'transferred'                                => 'Przesłano',
     'all_withdrawal'                             => 'Wszystkie wydatki',
     'all_transactions'                           => 'Wszystkie transakcje',
-    'title_withdrawal_between'                   => 'Wszystkie wydatki między :start a :koniec',
+    'title_withdrawal_between'                   => 'Wszystkie wydatki do :start do :koniec',
     'all_deposit'                                => 'Wszystkie przychody',
-    'title_deposit_between'                      => 'Wszystkie przychody między :start a :end',
+    'title_deposit_between'                      => 'Wszystkie przychody do :start do :end',
     'all_transfers'                              => 'Wszystkie transfery',
-    'title_transfers_between'                    => 'Wszystkie transfery między :start a :end',
+    'title_transfers_between'                    => 'Wszystkie transfery od :start do :end',
     'all_transfer'                               => 'Wszystkie transfery',
     'all_journals_for_tag'                       => 'Wszystkie transakcje dla tagu ":tag"',
     'title_transfer_between'                     => 'Wszystkie transfery od :start do :end',
@@ -793,7 +793,7 @@ return [
     'spent'                                      => 'Wydano',
     'spent_in_budget'                            => 'Wydano w budżecie',
     'left_to_spend'                              => 'Pozostało do wydania',
-    'earned'                                     => 'Zarobione',
+    'earned'                                     => 'Zarobiono',
     'overspent'                                  => 'Przepłacono',
     'left'                                       => 'Pozostało',
     'no_budget'                                  => '(bez budżetu)',

From ff0b1d0ec9cd6b175edcfc1a090453ac9e2e3c3f Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 15:20:09 +0200
Subject: [PATCH 605/668] New translations firefly.php (Polish)

---
 resources/lang/pl_PL/firefly.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/resources/lang/pl_PL/firefly.php b/resources/lang/pl_PL/firefly.php
index a85add7360..80b6caccd6 100644
--- a/resources/lang/pl_PL/firefly.php
+++ b/resources/lang/pl_PL/firefly.php
@@ -127,14 +127,14 @@ return [
     'journals_in_period_for_category'            => 'Wszystkie transakcje dla kategorii :name od :start do :end',
     'journals_in_period_for_tag'                 => 'Wszystkie transakcje dla tagu :name od :start do :end',
     'not_available_demo_user'                    => 'Funkcja, do której próbujesz uzyskać dostęp nie jest dostępna dla użytkowników demo.',
-    'exchange_rate_instructions'                 => 'Asset account "@name" only accepts transactions in @native_currency. If you wish to use @foreign_currency instead, make sure that the amount in @native_currency is known as well:',
-    'transfer_exchange_rate_instructions'        => 'Source asset account "@source_name" only accepts transactions in @source_currency. Destination asset account "@dest_name" only accepts transactions in @dest_currency. You must provide the transferred amount correctly in both currencies.',
+    'exchange_rate_instructions'                 => 'Konto aktywów "@name" obsługuje tylko transakcje w walucie @native_currency. Jeśli chcesz użyć waluty @foreign_currency, upewnij się, że kwota w @native_currency jest również znana:',
+    'transfer_exchange_rate_instructions'        => 'Konto źródłowe "@source_name" obsługuje tylko transakcje w walucie @source_currency. Konto docelowe "@dest_name" obsługuje tylko transakcje w walucie @dest_currency. Musisz podać przelewaną kwotę w obu walutach.',
     'transaction_data'                           => 'Dane transakcji',
 
     // search
     'search'                                     => 'Szukaj',
-    'search_found_transactions'                  => 'Number of transactions found:',
-    'general_search_error'                       => 'An error occured while searching. Please check the log files for more information.',
+    'search_found_transactions'                  => 'Liczba znalezionych transakcji:',
+    'general_search_error'                       => 'Wystąpił błąd podczas wyszukiwania. Aby uzyskać więcej informacji proszę sprawdzić logi aplikacji.',
     'search_box'                                 => 'Szukaj',
     'search_box_intro'                           => 'Witamy w funkcji wyszukiwania Firefly III. Wpisz zapytanie w polu. Upewnij się, że sprawdziłeś plik pomocy, ponieważ wyszukiwanie jest dość zaawansowane.',
     'search_error'                               => 'Błąd podczas wyszukiwania',
@@ -214,19 +214,19 @@ return [
     'default_rule_action_prepend'                => 'Kupił świat od ',
     'default_rule_action_set_category'           => 'Duże wydatki',
     'trigger'                                    => 'Wyzwalacz',
-    'trigger_value'                              => 'Trigger on value',
+    'trigger_value'                              => 'Uruchom dla wartości',
     'stop_processing_other_triggers'             => 'Zatrzymaj przetwarzanie innych wyzwalaczy',
     'add_rule_trigger'                           => 'Dodaj nowy wyzwalacz',
     'action'                                     => 'Akcja',
-    'action_value'                               => 'Action value',
+    'action_value'                               => 'Wartość akcji',
     'stop_executing_other_actions'               => 'Zatrzymaj wykonywanie innych akcji',
     'add_rule_action'                            => 'Dodaj nową akcję',
     'edit_rule'                                  => 'Modyfikuj regułę ":title"',
     'delete_rule'                                => 'Usuń regułę ":title"',
     'update_rule'                                => 'Modyfikuj regułę',
     'test_rule_triggers'                         => 'Zobacz pasujące transakcje',
-    'warning_transaction_subset'                 => 'For performance reasons this list is limited to :max_num_transactions and may only show a subset of matching transactions',
-    'warning_no_matching_transactions'           => 'No matching transactions found. Please note that for performance reasons, only the last :num_transactions transactions have been checked.',
+    'warning_transaction_subset'                 => 'Ze względów wydajnościowych ta lista ograniczona jest do :max_num_transactions i może zawierać tylko niektóre z pasujących transakcji',
+    'warning_no_matching_transactions'           => 'Nie znaleziono pasujących transakcji. Należy pamiętać, że ze względów wydajnościowych sprawdzono ostatnie :num_transactions transakcji.',
     'warning_no_valid_triggers'                  => 'Nie dostarczono prawidłowych wyzwalaczy.',
     'apply_rule_selection'                       => 'Apply rule ":title" to a selection of your transactions',
     'apply_rule_selection_intro'                 => 'Rules like ":title" are normally only applied to new or updated transactions, but you can tell Firefly III to run it on a selection of your existing transactions. This can be useful when you have updated a rule and you need the changes to be applied to all of your other transactions.',

From 6a48c354b79ebb5011958a2cfff072a9d0e61391 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 15:30:07 +0200
Subject: [PATCH 606/668] New translations firefly.php (Polish)

---
 resources/lang/pl_PL/firefly.php | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/resources/lang/pl_PL/firefly.php b/resources/lang/pl_PL/firefly.php
index 80b6caccd6..a1bf160f45 100644
--- a/resources/lang/pl_PL/firefly.php
+++ b/resources/lang/pl_PL/firefly.php
@@ -228,14 +228,14 @@ return [
     'warning_transaction_subset'                 => 'Ze względów wydajnościowych ta lista ograniczona jest do :max_num_transactions i może zawierać tylko niektóre z pasujących transakcji',
     'warning_no_matching_transactions'           => 'Nie znaleziono pasujących transakcji. Należy pamiętać, że ze względów wydajnościowych sprawdzono ostatnie :num_transactions transakcji.',
     'warning_no_valid_triggers'                  => 'Nie dostarczono prawidłowych wyzwalaczy.',
-    'apply_rule_selection'                       => 'Apply rule ":title" to a selection of your transactions',
-    'apply_rule_selection_intro'                 => 'Rules like ":title" are normally only applied to new or updated transactions, but you can tell Firefly III to run it on a selection of your existing transactions. This can be useful when you have updated a rule and you need the changes to be applied to all of your other transactions.',
+    'apply_rule_selection'                       => 'Zastosuj regułę ":title" do niektórych swoich transakcji',
+    'apply_rule_selection_intro'                 => 'Reguły takie jak ":title" są zwykle stosowane tylko do nowych lub modyfikowanych transakcji, ale możesz powiedzieć Firefly III aby uruchomił ją dla istniejących transakcji. Może to być przydatne, gdy zmodyfikowałeś regułę i potrzebujesz zastosować zmiany dla wszystkich pozostałych transakcji.',
     'include_transactions_from_accounts'         => 'Uwzględnij transakcje z tych kont',
-    'applied_rule_selection'                     => 'Rule ":title" has been applied to your selection.',
+    'applied_rule_selection'                     => 'Reguła ":title" została zastosowana do Twojego wyboru.',
     'execute'                                    => 'Wykonaj',
-    'apply_rule_group_selection'                 => 'Apply rule group ":title" to a selection of your transactions',
-    'apply_rule_group_selection_intro'           => 'Rule groups like ":title" are normally only applied to new or updated transactions, but you can tell Firefly III to run all the rules in this group on a selection of your existing transactions. This can be useful when you have updated a group of rules and you need the changes to be applied to all of your other transactions.',
-    'applied_rule_group_selection'               => 'Rule group ":title" has been applied to your selection.',
+    'apply_rule_group_selection'                 => 'Zastosuj grupę reguł ":title" do niektórych swoich transakcji',
+    'apply_rule_group_selection_intro'           => 'GRupy reguł takie jak ":title" są zwykle stosowane tylko do nowych lub modyfikowanych transakcji, ale możesz powiedzieć Firefly III aby uruchomił ją dla istniejących transakcji. Może to być przydatne, gdy zmodyfikowałeś grupę reguł i potrzebujesz zastosować zmiany dla wszystkich pozostałych transakcji.',
+    'applied_rule_group_selection'               => 'Grupa reguł ":title" została zastosowana do Twojego wyboru.',
 
     // actions and triggers
     'rule_trigger_user_action'                   => 'Akcją użytkownika jest ":trigger_value"',
@@ -244,28 +244,28 @@ return [
     'rule_trigger_from_account_ends_choice'      => 'Konto źródłowe się kończy na..',
     'rule_trigger_from_account_ends'             => 'Konto źródłowe się kończy na ":trigger_value"',
     'rule_trigger_from_account_is_choice'        => 'Kontem źródłowym jest..',
-    'rule_trigger_from_account_is'               => 'Kontem źródłowym jest ":trigger_value"',
+    'rule_trigger_from_account_is'               => 'Konto źródłowe to ":trigger_value"',
     'rule_trigger_from_account_contains_choice'  => 'Konto źródłowe zawiera..',
     'rule_trigger_from_account_contains'         => 'Konto źródłowe zawiera ":trigger_value"',
     'rule_trigger_to_account_starts_choice'      => 'Konto docelowe zaczyna się od..',
     'rule_trigger_to_account_starts'             => 'Konto docelowe się zaczyna od ":trigger_value"',
     'rule_trigger_to_account_ends_choice'        => 'Konto docelowe kończy się na..',
     'rule_trigger_to_account_ends'               => 'Konto docelowe się kończy na ":trigger_value"',
-    'rule_trigger_to_account_is_choice'          => 'Konto docelowe jest..',
-    'rule_trigger_to_account_is'                 => 'Kontem docelowym jest ":trigger_value"',
+    'rule_trigger_to_account_is_choice'          => 'Konto docelowe to..',
+    'rule_trigger_to_account_is'                 => 'Konto docelowe to ":trigger_value"',
     'rule_trigger_to_account_contains_choice'    => 'Konto docelowe zawiera..',
     'rule_trigger_to_account_contains'           => 'Konto docelowe zawiera ":trigger_value"',
     'rule_trigger_transaction_type_choice'       => 'Transakcja jest typu..',
     'rule_trigger_transaction_type'              => 'Transakcja jest typu ":trigger_value"',
-    'rule_trigger_category_is_choice'            => 'Kategoria jest..',
-    'rule_trigger_category_is'                   => 'Category is ":trigger_value"',
+    'rule_trigger_category_is_choice'            => 'Kategoria to..',
+    'rule_trigger_category_is'                   => 'Kategoria to ":trigger_value"',
     'rule_trigger_amount_less_choice'            => 'Kwota jest mniejsza niż..',
     'rule_trigger_amount_less'                   => 'Kwota jest mniejsza niż :trigger_value',
-    'rule_trigger_amount_exactly_choice'         => 'Kwota jest..',
+    'rule_trigger_amount_exactly_choice'         => 'Kwota jest równa..',
     'rule_trigger_amount_exactly'                => 'Kwota jest równa :trigger_value',
     'rule_trigger_amount_more_choice'            => 'Kwota jest większa niż..',
     'rule_trigger_amount_more'                   => 'Kwota jest większa niż :trigger_value',
-    'rule_trigger_description_starts_choice'     => 'Opis rozpoczyna się od..',
+    'rule_trigger_description_starts_choice'     => 'Opis zaczyna się od..',
     'rule_trigger_description_starts'            => 'Opis się zaczyna od ":trigger_value"',
     'rule_trigger_description_ends_choice'       => 'Opis kończy się na..',
     'rule_trigger_description_ends'              => 'Opis się kończy na ":trigger_value"',

From 386b069c8337fdd1dffd0c4575b49b206bdb167a Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 15:40:21 +0200
Subject: [PATCH 607/668] New translations firefly.php (Polish)

---
 resources/lang/pl_PL/firefly.php | 42 ++++++++++++++++----------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/resources/lang/pl_PL/firefly.php b/resources/lang/pl_PL/firefly.php
index a1bf160f45..fbfa5d5aa6 100644
--- a/resources/lang/pl_PL/firefly.php
+++ b/resources/lang/pl_PL/firefly.php
@@ -271,28 +271,28 @@ return [
     'rule_trigger_description_ends'              => 'Opis się kończy na ":trigger_value"',
     'rule_trigger_description_contains_choice'   => 'Opis zawiera..',
     'rule_trigger_description_contains'          => 'Opis zawiera ":trigger_value"',
-    'rule_trigger_description_is_choice'         => 'Opis jest..',
-    'rule_trigger_description_is'                => 'Opis jest ":trigger_value"',
-    'rule_trigger_budget_is_choice'              => 'Budżet jest..',
-    'rule_trigger_budget_is'                     => 'Budget is ":trigger_value"',
-    'rule_trigger_tag_is_choice'                 => 'Tag jest..',
-    'rule_trigger_tag_is'                        => 'A tag is ":trigger_value"',
-    'rule_trigger_has_attachments_choice'        => 'Has at least this many attachments',
-    'rule_trigger_has_attachments'               => 'Has at least :trigger_value attachment(s)',
+    'rule_trigger_description_is_choice'         => 'Opis to..',
+    'rule_trigger_description_is'                => 'Opis to ":trigger_value"',
+    'rule_trigger_budget_is_choice'              => 'Budżet to..',
+    'rule_trigger_budget_is'                     => 'Budżet to ":trigger_value"',
+    'rule_trigger_tag_is_choice'                 => 'Tag to..',
+    'rule_trigger_tag_is'                        => 'Tag to ":trigger_value"',
+    'rule_trigger_has_attachments_choice'        => 'Ma co najmniej podaną liczbę załączników',
+    'rule_trigger_has_attachments'               => 'Ma co najmniej :trigger_value załącznik(ów)',
     'rule_trigger_store_journal'                 => 'Po utworzeniu transakcji',
     'rule_trigger_update_journal'                => 'Po zmodyfikowaniu transakcji',
-    'rule_trigger_has_no_category_choice'        => 'Has no category',
-    'rule_trigger_has_no_category'               => 'Transaction has no category',
-    'rule_trigger_has_any_category_choice'       => 'Has a (any) category',
-    'rule_trigger_has_any_category'              => 'Transaction has a (any) category',
-    'rule_trigger_has_no_budget_choice'          => 'Has no budget',
-    'rule_trigger_has_no_budget'                 => 'Transaction has no budget',
-    'rule_trigger_has_any_budget_choice'         => 'Has a (any) budget',
-    'rule_trigger_has_any_budget'                => 'Transaction has a (any) budget',
-    'rule_trigger_has_no_tag_choice'             => 'Has no tag(s)',
-    'rule_trigger_has_no_tag'                    => 'Transaction has no tag(s)',
-    'rule_trigger_has_any_tag_choice'            => 'Has one or more (any) tags',
-    'rule_trigger_has_any_tag'                   => 'Transaction has one or more (any) tags',
+    'rule_trigger_has_no_category_choice'        => 'Brak kategorii',
+    'rule_trigger_has_no_category'               => 'Transakcje bez kategorii',
+    'rule_trigger_has_any_category_choice'       => 'Ma (dowolną) kategorię',
+    'rule_trigger_has_any_category'              => 'Transakcja ma (dowolną) kategorię',
+    'rule_trigger_has_no_budget_choice'          => 'Brak budżetu',
+    'rule_trigger_has_no_budget'                 => 'Transakcja bez budżetu',
+    'rule_trigger_has_any_budget_choice'         => 'Ma (dowolny) budżet',
+    'rule_trigger_has_any_budget'                => 'Transakcja ma (dowolny) budżet',
+    'rule_trigger_has_no_tag_choice'             => 'Brak tagów',
+    'rule_trigger_has_no_tag'                    => 'Transakcja bez tagów',
+    'rule_trigger_has_any_tag_choice'            => 'Ma (dowolny) tag (lub kilka)',
+    'rule_trigger_has_any_tag'                   => 'Transakcja ma (dowolny) tag (lub kilka)',
     'rule_action_set_category'                   => 'Ustaw kategorię na ":action_value"',
     'rule_action_clear_category'                 => 'Wyczyść kategorię',
     'rule_action_set_budget'                     => 'Ustaw budżet na ":action_value"',
@@ -305,7 +305,7 @@ return [
     'rule_action_prepend_description'            => 'Poprzedź opis wartością ":action_value"',
     'rule_action_set_category_choice'            => 'Ustaw kategorię na..',
     'rule_action_clear_category_choice'          => 'Wyczyść wszystkie kategorie',
-    'rule_action_set_budget_choice'              => 'Ustaw budżetu na..',
+    'rule_action_set_budget_choice'              => 'Ustaw budżet na..',
     'rule_action_clear_budget_choice'            => 'Wyczyść wszystkie budżety',
     'rule_action_add_tag_choice'                 => 'Dodaj tag..',
     'rule_action_remove_tag_choice'              => 'Usuń tag..',

From 62c4a9a7fcc91f34b306a6730672dccaab531cc8 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 15:50:06 +0200
Subject: [PATCH 608/668] New translations firefly.php (Polish)

---
 resources/lang/pl_PL/firefly.php | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/resources/lang/pl_PL/firefly.php b/resources/lang/pl_PL/firefly.php
index fbfa5d5aa6..bf65b7463a 100644
--- a/resources/lang/pl_PL/firefly.php
+++ b/resources/lang/pl_PL/firefly.php
@@ -319,13 +319,13 @@ return [
     'rule_action_set_destination_account'        => 'Ustaw konto docelowe na :action_value',
 
     // tags
-    'store_new_tag'                              => 'Zapisz nowy tag',
+    'store_new_tag'                              => 'Zachowaj nowy tag',
     'update_tag'                                 => 'Zmodyfikuj tag',
     'no_location_set'                            => 'Nie ustawiono lokalizacji.',
     'meta_data'                                  => 'Metadane',
     'location'                                   => 'Lokalizacja',
-    'without_date'                               => 'Without date',
-    'result'                                     => 'Result',
+    'without_date'                               => 'Bez daty',
+    'result'                                     => 'Wynik',
 
     // preferences
     'pref_home_screen_accounts'                  => 'Konta na stronie domowej',
@@ -345,12 +345,12 @@ return [
     'pref_custom_fiscal_year_help'               => 'W krajach, w których rok podatkowy nie zaczyna się 1 stycznia i nie kończy 31 grudnia, możesz włączyć tą opcję oraz podać początek / koniec roku podatkowego',
     'pref_fiscal_year_start_label'               => 'Początek roku podatkowego',
     'pref_two_factor_auth'                       => 'Weryfikacja dwuetapowa',
-    'pref_two_factor_auth_help'                  => 'When you enable 2-step verification (also known as two-factor authentication), you add an extra layer of security to your account. You sign in with something you know (your password) and something you have (a verification code). Verification codes are generated by an application on your phone, such as Authy or Google Authenticator.',
+    'pref_two_factor_auth_help'                  => 'Po włączeniu weryfikacji dwuetapowej (znanej również jako uwierzytelnianie dwuskładnikowe) dodajesz dodatkową warstwę zabezpieczeń do swojego konta. Logujesz się czymś, co znasz (hasło) i czymś masz coś (kod weryfikacyjny). Kody weryfikacyjne generowane są przez aplikację w telefonie, na przykład Authy lub Google Authenticator.',
     'pref_enable_two_factor_auth'                => 'Włącz weryfikację dwuetapową',
     'pref_two_factor_auth_disabled'              => 'Kod weryfikacji dwuetapowej został usunięty i wyłączony',
     'pref_two_factor_auth_remove_it'             => 'Nie zapomnij usunąć konta z aplikacji uwierzytelniajcej!',
     'pref_two_factor_auth_code'                  => 'Zweryfikuj kod',
-    'pref_two_factor_auth_code_help'             => 'Scan the QR code with an application on your phone such as Authy or Google Authenticator and enter the generated code.',
+    'pref_two_factor_auth_code_help'             => 'Zeskanuj kod QR za pomocą aplikacji w telefonie, takiej jak Authy lub Google Authenticator i wprowadź wygenerowany kod.',
     'pref_two_factor_auth_reset_code'            => 'Zresetuj kod weryfikacyjny',
     'pref_two_factor_auth_remove_code'           => 'Usuń kod weryfikacyjny',
     'pref_two_factor_auth_remove_will_disable'   => '(to również wyłączy uwierzytelnianie dwuskładnikowe)',
@@ -369,21 +369,21 @@ return [
     'transaction_page_size_label'                => 'Rozmiar strony',
     'between_dates'                              => '(:start i :end)',
     'pref_optional_fields_transaction'           => 'Opcjonalne pola dla transakcji',
-    'pref_optional_fields_transaction_help'      => 'By default not all fields are enabled when creating a new transaction (because of the clutter). Below, you can enable these fields if you think they could be useful for you. Of course, any field that is disabled, but already filled in, will be visible regardless of the setting.',
+    'pref_optional_fields_transaction_help'      => 'Domyślnie nie wszystkie pola są aktywne podczas tworzenia nowej transakcji (aby uniknąć bałaganu). Poniżej możesz włączyć te pola, jeśli uważasz, że mogą one być przydatne dla Ciebie. Oczywiście każde pole, które jest wyłączone, ale już wypełnione, będzie widoczne niezależnie od ustawienia.',
     'optional_tj_date_fields'                    => 'Pola dat',
     'optional_tj_business_fields'                => 'Pola biznesowe',
     'optional_tj_attachment_fields'              => 'Pola załączników',
-    'pref_optional_tj_interest_date'             => 'Interest date',
+    'pref_optional_tj_interest_date'             => 'Data odsetek',
     'pref_optional_tj_book_date'                 => 'Data księgowania',
-    'pref_optional_tj_process_date'              => 'Processing date',
+    'pref_optional_tj_process_date'              => 'Data przetworzenia',
     'pref_optional_tj_due_date'                  => 'Termin realizacji',
     'pref_optional_tj_payment_date'              => 'Data płatności',
     'pref_optional_tj_invoice_date'              => 'Data faktury',
-    'pref_optional_tj_internal_reference'        => 'Internal reference',
+    'pref_optional_tj_internal_reference'        => 'Wewnętrzny numer',
     'pref_optional_tj_notes'                     => 'Notatki',
     'pref_optional_tj_attachments'               => 'Załączniki',
     'optional_field_meta_dates'                  => 'Daty',
-    'optional_field_meta_business'               => 'Business',
+    'optional_field_meta_business'               => 'Biznesowe',
     'optional_field_attachments'                 => 'Załączniki',
     'optional_field_meta_data'                   => 'Opcjonalne metadane',
 

From d9dad4387efd341638cfbc456ed9c3052d610a18 Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Sun, 3 Sep 2017 15:57:13 +0200
Subject: [PATCH 609/668] Fix rule validation issues.

---
 app/Http/Requests/RuleFormRequest.php            |  7 +++----
 app/Repositories/Rule/RuleRepository.php         | 15 +++++++++++++++
 .../Rule/RuleRepositoryInterface.php             |  8 ++++++++
 tests/Feature/Controllers/RuleControllerTest.php | 16 +++++++---------
 4 files changed, 33 insertions(+), 13 deletions(-)

diff --git a/app/Http/Requests/RuleFormRequest.php b/app/Http/Requests/RuleFormRequest.php
index 0a062a3c44..3128100e4a 100644
--- a/app/Http/Requests/RuleFormRequest.php
+++ b/app/Http/Requests/RuleFormRequest.php
@@ -13,7 +13,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Http\Requests;
 
-use FireflyIII\Repositories\RuleGroup\RuleGroupRepositoryInterface;
+use FireflyIII\Repositories\Rule\RuleRepositoryInterface;
 
 /**
  * Class RuleFormRequest
@@ -57,8 +57,8 @@ class RuleFormRequest extends Request
      */
     public function rules()
     {
-        /** @var RuleGroupRepositoryInterface $repository */
-        $repository    = app(RuleGroupRepositoryInterface::class);
+        /** @var RuleRepositoryInterface $repository */
+        $repository    = app(RuleRepositoryInterface::class);
         $validTriggers = array_keys(config('firefly.rule-triggers'));
         $validActions  = array_keys(config('firefly.rule-actions'));
 
@@ -69,7 +69,6 @@ class RuleFormRequest extends Request
         if (!is_null($repository->find(intval($this->get('id')))->id)) {
             $titleRule = 'required|between:1,100|uniqueObjectForUser:rules,title,' . intval($this->get('id'));
         }
-
         $rules = [
             'title'                => $titleRule,
             'description'          => 'between:1,5000',
diff --git a/app/Repositories/Rule/RuleRepository.php b/app/Repositories/Rule/RuleRepository.php
index 6fa0a2b2c7..4d655484a7 100644
--- a/app/Repositories/Rule/RuleRepository.php
+++ b/app/Repositories/Rule/RuleRepository.php
@@ -56,6 +56,21 @@ class RuleRepository implements RuleRepositoryInterface
         return true;
     }
 
+    /**
+     * @param int $ruleId
+     *
+     * @return Rule
+     */
+    public function find(int $ruleId): Rule
+    {
+        $rule = $this->user->rules()->find($ruleId);
+        if (is_null($rule)) {
+            return new Rule;
+        }
+
+        return $rule;
+    }
+
     /**
      * FIxXME can return null
      *
diff --git a/app/Repositories/Rule/RuleRepositoryInterface.php b/app/Repositories/Rule/RuleRepositoryInterface.php
index 13fc6c3382..7a916d14a0 100644
--- a/app/Repositories/Rule/RuleRepositoryInterface.php
+++ b/app/Repositories/Rule/RuleRepositoryInterface.php
@@ -38,6 +38,14 @@ interface RuleRepositoryInterface
      */
     public function destroy(Rule $rule): bool;
 
+    /**
+     * @param int $ruleId
+     *
+     * @return Rule
+     */
+    public function find(int $ruleId): Rule;
+
+
     /**
      * @return RuleGroup
      */
diff --git a/tests/Feature/Controllers/RuleControllerTest.php b/tests/Feature/Controllers/RuleControllerTest.php
index 4b29e478a5..056606971d 100644
--- a/tests/Feature/Controllers/RuleControllerTest.php
+++ b/tests/Feature/Controllers/RuleControllerTest.php
@@ -243,13 +243,12 @@ class RuleControllerTest extends TestCase
     public function testStore()
     {
         // mock stuff
-        $repository     = $this->mock(RuleRepositoryInterface::class);
-        $journalRepos   = $this->mock(JournalRepositoryInterface::class);
-        $ruleGroupRepos = $this->mock(RuleGroupRepositoryInterface::class);
+        $repository   = $this->mock(RuleRepositoryInterface::class);
+        $journalRepos = $this->mock(JournalRepositoryInterface::class);
 
         $journalRepos->shouldReceive('first')->once()->andReturn(new TransactionJournal);
-        $ruleGroupRepos->shouldReceive('find')->andReturn(new RuleGroup)->once();
         $repository->shouldReceive('store')->andReturn(new Rule);
+        $repository->shouldReceive('find')->withArgs([0])->andReturn(new Rule)->once();
 
         $this->session(['rules.create.uri' => 'http://localhost']);
         $data = [
@@ -375,12 +374,11 @@ class RuleControllerTest extends TestCase
     public function testUpdate()
     {
         // mock stuff
-        $repository     = $this->mock(RuleRepositoryInterface::class);
-        $journalRepos   = $this->mock(JournalRepositoryInterface::class);
-        $ruleGroupRepos = $this->mock(RuleGroupRepositoryInterface::class);
-
+        $repository   = $this->mock(RuleRepositoryInterface::class);
+        $journalRepos = $this->mock(JournalRepositoryInterface::class);
+        $rule         = Rule::find(1);
         $journalRepos->shouldReceive('first')->once()->andReturn(new TransactionJournal);
-        $ruleGroupRepos->shouldReceive('find')->andReturn(new RuleGroup)->once();
+        $repository->shouldReceive('find')->withArgs([1])->andReturn($rule)->once();
         $repository->shouldReceive('update');
 
         $data = [

From 826dce324fb763c34deb7c10624e39f55a5fd14d Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 16:00:07 +0200
Subject: [PATCH 610/668] New translations form.php (Polish)

---
 resources/lang/pl_PL/form.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/pl_PL/form.php b/resources/lang/pl_PL/form.php
index 4e51afba10..44200520ee 100644
--- a/resources/lang/pl_PL/form.php
+++ b/resources/lang/pl_PL/form.php
@@ -34,7 +34,7 @@ return [
     'journal_source_account_name'    => 'Konto przychodów (źródło)',
     'journal_source_account_id'      => 'Konto aktywów (źródło)',
     'BIC'                            => 'BIC',
-    'verify_password'                => 'Verify password security',
+    'verify_password'                => 'Sprawdź bezpieczeństwo hasła',
     'account_from_id'                => 'Z konta',
     'account_to_id'                  => 'Na konto',
     'source_account'                 => 'Konto źródłowe',

From 0bccf0d73406de41068a0692464f6393b8c79c85 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 16:00:10 +0200
Subject: [PATCH 611/668] New translations firefly.php (Polish)

---
 resources/lang/pl_PL/firefly.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/resources/lang/pl_PL/firefly.php b/resources/lang/pl_PL/firefly.php
index bf65b7463a..be8908bdb9 100644
--- a/resources/lang/pl_PL/firefly.php
+++ b/resources/lang/pl_PL/firefly.php
@@ -400,16 +400,16 @@ return [
     'password'                                   => 'Hasło',
     'are_you_sure'                               => 'Jesteś pewny? Nie możesz tego cofnąć.',
     'delete_account_button'                      => 'USUŃ swoje konto',
-    'invalid_current_password'                   => 'Nieprawidłowe hasło bieżące!',
+    'invalid_current_password'                   => 'Nieprawidłowe bieżące hasło!',
     'password_changed'                           => 'Hasło zostało zmienione!',
     'should_change'                              => 'Chodzi o to, aby zmienić swoje hasło.',
     'invalid_password'                           => 'Nieprawidłowe hasło!',
-    'what_is_pw_security'                        => 'What is "verify password security"?',
-    'secure_pw_title'                            => 'How to choose a secure password',
-    'secure_pw_history'                          => 'In August 2017 well known security researcher Troy Hunt released a list of 306 million stolen passwords. These passwords were stolen during breakins at companies like LinkedIn, Adobe and NeoPets (and many more).',
-    'secure_pw_check_box'                        => 'By checking the box, Firefly III will send the SHA1 hash of your password to <a href="https://www.troyhunt.com/introducing-306-million-freely-downloadable-pwned-passwords/">the website of Troy Hunt</a> to see if it is on the list. This will stop you from using unsafe passwords as is recommended in the latest <a href="https://pages.nist.gov/800-63-3/sp800-63b.html">NIST Special Publication</a> on this subject.',
-    'secure_pw_sha1'                             => 'But I thought SHA1 was broken?',
-    'secure_pw_hash_speed'                       => 'Yes, but not in this context. As you can read on <a href="https://shattered.io/">the website detailing how they broke SHA1</a>, it is now slightly easier to find a "collision": another string that results in the same SHA1-hash. It now only takes 10,000 years using a single-GPU machine.',
+    'what_is_pw_security'                        => 'Co to jest "Sprawdź bezpieczeństwo hasła"?',
+    'secure_pw_title'                            => 'Jak wybrać bezpieczne hasło',
+    'secure_pw_history'                          => 'W sierpniu 2017 r. znany analityk ds. bezpieczeństwa Troy Hunt opublikował listę 306 milionów skradzionych haseł. Hasła zostały skradzione podczas włamań w firmach takich jak LinkedIn, Adobe i NeoPets (i wiele innych).',
+    'secure_pw_check_box'                        => 'Zaznaczając pole, Firefly III wysyła skrót SHA1 Twojego hasła do <a href="https://www.troyhunt.com/introducing-306-million-freely-downloadable-pwned-passwords/">strony internetowej Troy Hunt</a>, aby sprawdzić, czy znajduje się na liście. To powstrzyma Cię przed używaniem niebezpiecznych haseł, co jest zalecane w najnowszej <a href="https://pages.nist.gov/800-63-3/sp800-63b.html">specjalnej publikacji Narodowy Instytut Standaryzacji i Technologii (NIST)</a> na ten temat.',
+    'secure_pw_sha1'                             => 'Myślałem, że SHA1 zostało złamane?',
+    'secure_pw_hash_speed'                       => 'Tak, ale nie w tym kontekście. Jak można przeczytać na <a href="https://shattered.io/">stronie z wyszczególnieniem sposobu ich złamania SHA1</a>, teraz jest nieco łatwiej znaleźć "kolizję": inny ciąg znaków, który prowadzi do tego samego skrótu SHA1. Teraz trwa to tylko 10 000 lat przy użyciu maszyny z jedną kartą graficzną.',
     'secure_pw_hash_security'                    => 'This collision would not be equal to your password, nor would it be useful on (a site like) Firefly III. This application does not use SHA1 for password verification. So it is safe to check this box. Your password is hashed and sent over HTTPS.',
     'secure_pw_should'                           => 'Should I check the box?',
     'secure_pw_long_password'                    => 'If you just generated a long, single-use password for Firefly III using some kind of password generator: <strong>no</strong>.',

From 892f262261dc26fe2ce171a1d990cae72caaa75e Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Sun, 3 Sep 2017 16:06:37 +0200
Subject: [PATCH 612/668] Fix transaction controller tests

---
 .../Transaction/SingleController.php          | 24 +++++++++++++++++--
 .../Transaction/SingleControllerTest.php      |  8 +++++++
 2 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/app/Http/Controllers/Transaction/SingleController.php b/app/Http/Controllers/Transaction/SingleController.php
index b02ca753fd..ddace0e615 100644
--- a/app/Http/Controllers/Transaction/SingleController.php
+++ b/app/Http/Controllers/Transaction/SingleController.php
@@ -144,7 +144,7 @@ class SingleController extends Controller
     {
         $what           = strtolower($what);
         $uploadSize     = min(Steam::phpBytes(ini_get('upload_max_filesize')), Steam::phpBytes(ini_get('post_max_size')));
-        $assetAccounts  = $this->groupedAccountList();
+        $assetAccounts  = $this->groupedActiveAccountList();
         $budgets        = ExpandedForm::makeSelectListWithEmpty($this->budgets->getActiveBudgets());
         $piggyBanks     = $this->piggyBanks->getPiggyBanksWithAmount();
         $piggies        = ExpandedForm::makeSelectListWithEmpty($piggyBanks);
@@ -413,7 +413,7 @@ class SingleController extends Controller
     /**
      * @return array
      */
-    private function groupedAccountList(): array
+    private function groupedActiveAccountList(): array
     {
         $accounts = $this->accounts->getActiveAccountsByType([AccountType::DEFAULT, AccountType::ASSET]);
         $return   = [];
@@ -430,6 +430,26 @@ class SingleController extends Controller
         return $return;
     }
 
+    /**
+     * @return array
+     */
+    private function groupedAccountList(): array
+    {
+        $accounts = $this->accounts->getAccountsByType([AccountType::DEFAULT, AccountType::ASSET]);
+        $return   = [];
+        /** @var Account $account */
+        foreach ($accounts as $account) {
+            $type = $account->getMeta('accountRole');
+            if (strlen($type) === 0) {
+                $type = 'no_account_type';
+            }
+            $key                        = strval(trans('firefly.opt_group_' . $type));
+            $return[$key][$account->id] = $account->name;
+        }
+
+        return $return;
+    }
+
     /**
      * @param TransactionJournal $journal
      *
diff --git a/tests/Feature/Controllers/Transaction/SingleControllerTest.php b/tests/Feature/Controllers/Transaction/SingleControllerTest.php
index 2e0ac6f23d..1f4a3ec89a 100644
--- a/tests/Feature/Controllers/Transaction/SingleControllerTest.php
+++ b/tests/Feature/Controllers/Transaction/SingleControllerTest.php
@@ -107,6 +107,7 @@ class SingleControllerTest extends TestCase
 
     /**
      * @covers \FireflyIII\Http\Controllers\Transaction\SingleController::edit
+     * @covers \FireflyIII\Http\Controllers\Transaction\SingleController::groupedAccountList
      */
     public function testEdit()
     {
@@ -126,6 +127,7 @@ class SingleControllerTest extends TestCase
 
     /**
      * @covers \FireflyIII\Http\Controllers\Transaction\SingleController::edit
+     * @covers \FireflyIII\Http\Controllers\Transaction\SingleController::groupedAccountList
      */
     public function testEditCashDeposit()
     {
@@ -151,6 +153,7 @@ class SingleControllerTest extends TestCase
 
     /**
      * @covers \FireflyIII\Http\Controllers\Transaction\SingleController::edit
+     * @covers \FireflyIII\Http\Controllers\Transaction\SingleController::groupedAccountList
      */
     public function testEditCashWithdrawal()
     {
@@ -176,6 +179,7 @@ class SingleControllerTest extends TestCase
 
     /**
      * @covers \FireflyIII\Http\Controllers\Transaction\SingleController::edit
+     * @covers \FireflyIII\Http\Controllers\Transaction\SingleController::groupedAccountList
      */
     public function testEditRedirect()
     {
@@ -193,6 +197,7 @@ class SingleControllerTest extends TestCase
 
     /**
      * @covers \FireflyIII\Http\Controllers\Transaction\SingleController::edit
+     * @covers \FireflyIII\Http\Controllers\Transaction\SingleController::groupedAccountList
      */
     public function testEditTransferWithForeignAmount()
     {
@@ -221,6 +226,7 @@ class SingleControllerTest extends TestCase
 
     /**
      * @covers \FireflyIII\Http\Controllers\Transaction\SingleController::edit
+     * @covers \FireflyIII\Http\Controllers\Transaction\SingleController::groupedAccountList
      */
     public function testEditWithForeignAmount()
     {
@@ -249,6 +255,7 @@ class SingleControllerTest extends TestCase
 
     /**
      * @covers       \FireflyIII\Http\Controllers\Transaction\SingleController::store
+     * @covers       \FireflyIII\Http\Controllers\Transaction\SingleController::groupedActiveAccountList
      */
     public function testStoreError()
     {
@@ -277,6 +284,7 @@ class SingleControllerTest extends TestCase
 
     /**
      * @covers       \FireflyIII\Http\Controllers\Transaction\SingleController::store
+     * @covers \FireflyIII\Http\Controllers\Transaction\SingleController::groupedActiveAccountList
      */
     public function testStoreSuccess()
     {

From 83754960a645ae5bb476daec9c004a19a1865a6f Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Sun, 3 Sep 2017 16:09:27 +0200
Subject: [PATCH 613/668] Add messages for all levels.

---
 app/Http/Controllers/HomeController.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php
index 21a6e23de9..e29bb0d6f5 100644
--- a/app/Http/Controllers/HomeController.php
+++ b/app/Http/Controllers/HomeController.php
@@ -82,6 +82,14 @@ class HomeController extends Controller
      */
     public function displayError()
     {
+        Log::debug('This is a test message at the DEBUG level.');
+        Log::info('This is a test message at the INFO level.');
+        Log::notice('This is a test message at the NOTICE level.');
+        Log::warning('This is a test message at the WARNING level.');
+        Log::error('This is a test message at the ERROR level.');
+        Log::critical('This is a test message at the CRITICAL level.');
+        Log::alert('This is a test message at the ALERT level.');
+        Log::emergency('This is a test message at the EMERGENCY level.');
         throw new FireflyException('A very simple test error.');
     }
 

From b4e8bb1e0f979e37df58fcfe2cf6f19922b375a1 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 16:10:09 +0200
Subject: [PATCH 614/668] New translations firefly.php (Polish)

---
 resources/lang/pl_PL/firefly.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/resources/lang/pl_PL/firefly.php b/resources/lang/pl_PL/firefly.php
index be8908bdb9..fdc119a076 100644
--- a/resources/lang/pl_PL/firefly.php
+++ b/resources/lang/pl_PL/firefly.php
@@ -410,10 +410,10 @@ return [
     'secure_pw_check_box'                        => 'Zaznaczając pole, Firefly III wysyła skrót SHA1 Twojego hasła do <a href="https://www.troyhunt.com/introducing-306-million-freely-downloadable-pwned-passwords/">strony internetowej Troy Hunt</a>, aby sprawdzić, czy znajduje się na liście. To powstrzyma Cię przed używaniem niebezpiecznych haseł, co jest zalecane w najnowszej <a href="https://pages.nist.gov/800-63-3/sp800-63b.html">specjalnej publikacji Narodowy Instytut Standaryzacji i Technologii (NIST)</a> na ten temat.',
     'secure_pw_sha1'                             => 'Myślałem, że SHA1 zostało złamane?',
     'secure_pw_hash_speed'                       => 'Tak, ale nie w tym kontekście. Jak można przeczytać na <a href="https://shattered.io/">stronie z wyszczególnieniem sposobu ich złamania SHA1</a>, teraz jest nieco łatwiej znaleźć "kolizję": inny ciąg znaków, który prowadzi do tego samego skrótu SHA1. Teraz trwa to tylko 10 000 lat przy użyciu maszyny z jedną kartą graficzną.',
-    'secure_pw_hash_security'                    => 'This collision would not be equal to your password, nor would it be useful on (a site like) Firefly III. This application does not use SHA1 for password verification. So it is safe to check this box. Your password is hashed and sent over HTTPS.',
-    'secure_pw_should'                           => 'Should I check the box?',
-    'secure_pw_long_password'                    => 'If you just generated a long, single-use password for Firefly III using some kind of password generator: <strong>no</strong>.',
-    'secure_pw_short'                            => 'If you just entered the password you always use: <em>Please yes</em>.',
+    'secure_pw_hash_security'                    => 'Ta kolizja nie byłaby równa Twojemu hasłu ani nie byłaby użyteczna na stronie takiej jak Firefly III. Ta aplikacja nie używa algorytmu SHA1 do weryfikacji hasła. Można więc bezpiecznie zaznaczyć to pole. Twoje hasło jest skracane (mieszane, hashowane) i wysyłane szyfrowanym połączeniem (HTTPS).',
+    'secure_pw_should'                           => 'Czy powinienem zaznaczyć to pole?',
+    'secure_pw_long_password'                    => 'Jeśli wygenerowałeś długie, jednorazowe hasło dla Firefly III, używając pewnego rodzaju generatora haseł: <strong>no</strong>.',
+    'secure_pw_short'                            => 'Jeśli wpisałeś hasło, którego zawsze używasz: <em>tak, proszę</em>.',
 
 
     // attachments
@@ -458,9 +458,9 @@ return [
     'convert_please_set_asset_destination'       => 'Proszę wybierz konto aktywów, do którego będą wychodzić pieniądze.',
     'convert_please_set_expense_destination'     => 'Proszę wybierz konto wydatków, do którego będą wychodzić pieniądze.',
     'convert_please_set_asset_source'            => 'Proszę wybierz konto aktywów, z którego będą przychodzić pieniądze.',
-    'convert_explanation_withdrawal_deposit'     => 'If you convert this withdrawal into a deposit, :amount will be deposited into <a href=":sourceRoute">:sourceName</a> instead of taken from it.',
-    'convert_explanation_withdrawal_transfer'    => 'If you convert this withdrawal into a transfer, :amount will be transferred from <a href=":sourceRoute">:sourceName</a> to a new asset account, instead of being paid to <a href=":destinationRoute">:destinationName</a>.',
-    'convert_explanation_deposit_withdrawal'     => 'If you convert this deposit into a withdrawal, :amount will be removed from <a href=":destinationRoute">:destinationName</a> instead of added to it.',
+    'convert_explanation_withdrawal_deposit'     => 'Jeśli przekonwertujesz tę wypłatę na wpłatę, kwota :amount zostanie wpłacona na konto <a href=":sourceRoute">:sourceName</a> zamiast wypłacona z niego.',
+    'convert_explanation_withdrawal_transfer'    => 'Jeśli przekonwertujesz tę wypłatę na transfer, kwota :amount zostanie przelana z konta <a href=":sourceRoute">:sourceName</a> na nowe konto aktywów zamiast płatności dla <a href=":destinationRoute">:destinationName</a>.',
+    'convert_explanation_deposit_withdrawal'     => 'Jeśli przekonwertujesz tę wpłatę na wypłatę, kwota :amount zostanie wypłacone z konta <a href=":destinationRoute">:destinationName</a> zamiast wpłacone na nie.',
     'convert_explanation_deposit_transfer'       => 'If you convert this deposit into a transfer, :amount will be transferred from an asset account of your choice into <a href=":destinationRoute">:destinationName</a>.',
     'convert_explanation_transfer_withdrawal'    => 'If you convert this transfer into a withdrawal, :amount will go from <a href=":sourceRoute">:sourceName</a> to a new destination as an expense, instead of to <a href=":destinationRoute">:destinationName</a> as a transfer.',
     'convert_explanation_transfer_deposit'       => 'If you convert this transfer into a deposit, :amount will be deposited into account <a href=":destinationRoute">:destinationName</a> instead of being transferred there.',

From 6a20f3113a91e8a28e697319713faaf142957233 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 16:20:07 +0200
Subject: [PATCH 615/668] New translations firefly.php (Polish)

---
 resources/lang/pl_PL/firefly.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/resources/lang/pl_PL/firefly.php b/resources/lang/pl_PL/firefly.php
index fdc119a076..67fd3b1799 100644
--- a/resources/lang/pl_PL/firefly.php
+++ b/resources/lang/pl_PL/firefly.php
@@ -461,9 +461,9 @@ return [
     'convert_explanation_withdrawal_deposit'     => 'Jeśli przekonwertujesz tę wypłatę na wpłatę, kwota :amount zostanie wpłacona na konto <a href=":sourceRoute">:sourceName</a> zamiast wypłacona z niego.',
     'convert_explanation_withdrawal_transfer'    => 'Jeśli przekonwertujesz tę wypłatę na transfer, kwota :amount zostanie przelana z konta <a href=":sourceRoute">:sourceName</a> na nowe konto aktywów zamiast płatności dla <a href=":destinationRoute">:destinationName</a>.',
     'convert_explanation_deposit_withdrawal'     => 'Jeśli przekonwertujesz tę wpłatę na wypłatę, kwota :amount zostanie wypłacone z konta <a href=":destinationRoute">:destinationName</a> zamiast wpłacone na nie.',
-    'convert_explanation_deposit_transfer'       => 'If you convert this deposit into a transfer, :amount will be transferred from an asset account of your choice into <a href=":destinationRoute">:destinationName</a>.',
-    'convert_explanation_transfer_withdrawal'    => 'If you convert this transfer into a withdrawal, :amount will go from <a href=":sourceRoute">:sourceName</a> to a new destination as an expense, instead of to <a href=":destinationRoute">:destinationName</a> as a transfer.',
-    'convert_explanation_transfer_deposit'       => 'If you convert this transfer into a deposit, :amount will be deposited into account <a href=":destinationRoute">:destinationName</a> instead of being transferred there.',
+    'convert_explanation_deposit_transfer'       => 'Jeśli przekonwertujesz tę wpłatę na transfer, kwota :amount zostanie przelana z konta aktywów, które wybierzesz na konto <a href=":destinationRoute">:destinationName</a>.',
+    'convert_explanation_transfer_withdrawal'    => 'Jeśli przekonwertujesz ten transfer na wypłatę, kwota :amount zostanie przelana z konta <a href=":sourceRoute">:sourceName</a> na nowe konto docelowe jako wydatek, zamiast dla <a href=":destinationRoute">:destinationName</a> jako transfer.',
+    'convert_explanation_transfer_deposit'       => 'Jeśli przekonwertujesz ten transfer na wpłatę, kwota :amount zostanie zarejestrowana jako wpłata na konto <a href=":destinationRoute">:destinationName</a>, zamiast transferowana na nie.',
     'converted_to_Withdrawal'                    => 'Transakcja została przekonwertowana do wypłaty',
     'converted_to_Deposit'                       => 'Transakcja została przekonwertowana do wpłaty',
     'converted_to_Transfer'                      => 'Transakcja została przekonwertowana do transferu',
@@ -484,13 +484,13 @@ return [
     'store_currency'                             => 'Zapisz nową walutę',
     'update_currency'                            => 'Modyfikuj walutę',
     'new_default_currency'                       => ':name jest teraz domyślną walutą.',
-    'cannot_delete_currency'                     => 'Nie można usunąć :name, ponieważ jest on nadal używany.',
+    'cannot_delete_currency'                     => 'Nie można usunąć waluty :name, ponieważ jest ona nadal używana.',
     'deleted_currency'                           => 'Waluta :name została usunięta',
     'created_currency'                           => 'Waluta :name została utworzona',
     'updated_currency'                           => 'Waluta :name została zmodyfikowana',
     'ask_site_owner'                             => 'Poproś :owner aby dodał, usunął lub zmodyfikował waluty.',
     'currencies_intro'                           => 'Firefly III obsługuje różne waluty, które można ustawić i włączyć tutaj.',
-    'make_default_currency'                      => 'ustaw domyślną',
+    'make_default_currency'                      => 'ustaw jako domyślną',
     'default_currency'                           => 'domyślna',
 
     // forms:
@@ -519,7 +519,7 @@ return [
     'budget_period_navigator'                    => 'Period navigator',
 
     // bills:
-    'matching_on'                                => 'Matching on',
+    'matching_on'                                => 'Pasuje do',
     'between_amounts'                            => 'między :low i :high.',
     'repeats'                                    => 'Powtarza się',
     'connected_journals'                         => 'Powiązane transakcje',

From eb15d2bbd8af902e1465ab9e199661ef2b14171c Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 16:30:50 +0200
Subject: [PATCH 616/668] New translations firefly.php (Polish)

---
 resources/lang/pl_PL/firefly.php | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/resources/lang/pl_PL/firefly.php b/resources/lang/pl_PL/firefly.php
index 67fd3b1799..f1eb3ace0c 100644
--- a/resources/lang/pl_PL/firefly.php
+++ b/resources/lang/pl_PL/firefly.php
@@ -530,7 +530,7 @@ return [
     'deleted_bill'                               => 'Usunięto rachunek ":name"',
     'edit_bill'                                  => 'Modyfikuj rachunek ":name"',
     'more'                                       => 'Więcej',
-    'rescan_old'                                 => 'Rescan old transactions',
+    'rescan_old'                                 => 'Przeskanuj stare transakcje',
     'update_bill'                                => 'Aktualizuj rachunek',
     'updated_bill'                               => 'Zaktualizowano rachunek ":name"',
     'store_new_bill'                             => 'Zapisz nowy rachunek',
@@ -539,10 +539,10 @@ return [
     'rescanned_bill'                             => 'Zeskanowano wszystko.',
     'average_bill_amount_year'                   => 'Średnia kwota rachunku (:year)',
     'average_bill_amount_overall'                => 'Średnia kwota rachunku (ogólnie)',
-    'not_or_not_yet'                             => 'Not (yet)',
-    'not_expected_period'                        => 'Not expected this period',
-    'bill_is_active'                             => 'Bill is active',
-    'bill_will_automatch'                        => 'Bill will automatically linked to matching transactions',
+    'not_or_not_yet'                             => 'Nie (jeszcze)',
+    'not_expected_period'                        => 'Nie oczekiwany w tym okresie',
+    'bill_is_active'                             => 'Rachunek jest aktywny',
+    'bill_will_automatch'                        => 'Rachunek będzie automatycznie powiązany z pasującymi transakcjami',
     // accounts:
     'details_for_asset'                          => 'Szczegóły konta aktywów ":name"',
     'details_for_expense'                        => 'Szczegóły konta wydatków ":name"',
@@ -582,7 +582,7 @@ return [
     'select_more_than_one_category'              => 'Proszę wybierz więcej niż jedną kategorię',
     'select_more_than_one_budget'                => 'Proszę wybierz więcej niż jeden budżet',
     'select_more_than_one_tag'                   => 'Proszę wybierz więcej niż jeden tag',
-    'account_default_currency'                   => 'If you select another currency, new transactions from this account will have this currency pre-selected.',
+    'account_default_currency'                   => 'Jeśli wybierzesz inną walutę, nowe transakcje z tego konta będą miały tę walutę wstępnie wybraną.',
 
     // categories:
     'new_category'                               => 'Nowa kategoria',
@@ -615,18 +615,18 @@ return [
     'deleted_transfer'                           => 'Pomyślnie usunięto transfer ":description"',
     'stored_journal'                             => 'Pomyślnie utworzono nową transakcję ":description"',
     'select_transactions'                        => 'Wybierz transakcje',
-    'stop_selection'                             => 'Stop selecting transactions',
+    'stop_selection'                             => 'Przestań wybierać transakcje',
     'edit_selected'                              => 'Modyfikuj zaznaczone',
     'delete_selected'                            => 'Usuń zaznaczone',
     'mass_delete_journals'                       => 'Usuń wiele transakcji',
     'mass_edit_journals'                         => 'Modyfikuj wiele transakcji',
-    'cannot_edit_other_fields'                   => 'You cannot mass-edit other fields than the ones here, because there is no room to show them. Please follow the link and edit them by one-by-one, if you need to edit these fields.',
-    'perm-delete-many'                           => 'Deleting many items in one go can be very disruptive. Please be cautious.',
+    'cannot_edit_other_fields'                   => 'Nie możesz masowo modyfikować innych pól niż te tutaj, ponieważ nie ma miejsca, aby je pokazać. Proszę użyć ikony edycji i edytować je jedno po drugim, jeśli chcesz edytować te pola.',
+    'perm-delete-many'                           => 'Usuwanie wielu elementów jednocześnie może być bardzo destrukcyjne. Proszę zachować ostrożność.',
     'mass_deleted_transactions_success'          => 'Usunięto :amount transakcję(i).',
     'mass_edited_transactions_success'           => 'Zaktualizowano :amount transakcję(i)',
-    'opt_group_no_account_type'                  => '(no account type)',
-    'opt_group_defaultAsset'                     => 'Default asset accounts',
-    'opt_group_savingAsset'                      => 'Savings accounts',
+    'opt_group_no_account_type'                  => '(brak typu konta)',
+    'opt_group_defaultAsset'                     => 'Domyślne konto aktywów',
+    'opt_group_savingAsset'                      => 'Konto oszczędnościowe',
     'opt_group_sharedAsset'                      => 'Shared asset accounts',
     'opt_group_ccAsset'                          => 'Credit cards',
 

From 0346b09cb06f0b4453c0f3af2920e76e6b63b7fe Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 16:40:07 +0200
Subject: [PATCH 617/668] New translations firefly.php (Polish)

---
 resources/lang/pl_PL/firefly.php | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/resources/lang/pl_PL/firefly.php b/resources/lang/pl_PL/firefly.php
index f1eb3ace0c..61ca89b38a 100644
--- a/resources/lang/pl_PL/firefly.php
+++ b/resources/lang/pl_PL/firefly.php
@@ -625,10 +625,10 @@ return [
     'mass_deleted_transactions_success'          => 'Usunięto :amount transakcję(i).',
     'mass_edited_transactions_success'           => 'Zaktualizowano :amount transakcję(i)',
     'opt_group_no_account_type'                  => '(brak typu konta)',
-    'opt_group_defaultAsset'                     => 'Domyślne konto aktywów',
-    'opt_group_savingAsset'                      => 'Konto oszczędnościowe',
-    'opt_group_sharedAsset'                      => 'Shared asset accounts',
-    'opt_group_ccAsset'                          => 'Credit cards',
+    'opt_group_defaultAsset'                     => 'Domyślne konta aktywów',
+    'opt_group_savingAsset'                      => 'Konta oszczędnościowe',
+    'opt_group_sharedAsset'                      => 'Współdzielone konta aktywów',
+    'opt_group_ccAsset'                          => 'Karty kredytowe',
 
 
     // new user:
@@ -687,7 +687,7 @@ return [
     'no'                                         => 'Nie',
     'amount'                                     => 'Kwota',
     'overview'                                   => 'Przegląd',
-    'saveOnAccount'                              => 'Save on account',
+    'saveOnAccount'                              => 'Oszczędzaj na koncie',
     'unknown'                                    => 'Nieznane',
     'daily'                                      => 'Dziennie',
     'monthly'                                    => 'Miesięcznie',
@@ -697,17 +697,17 @@ return [
     // reports:
     'report_default'                             => 'Domyślny raport finansowy między :start i :end',
     'report_audit'                               => 'Przegląd historii transakcji między :start i :end',
-    'report_category'                            => 'Raport kategorii między :start i :end',
-    'report_budget'                              => 'Raport budżetów między :start i :end',
-    'report_tag'                                 => 'Tag report between :start and :end',
+    'report_category'                            => 'Raport kategorii między :start a :end',
+    'report_budget'                              => 'Raport budżetów między :start a :end',
+    'report_tag'                                 => 'Raport tagów między :start a :end',
     'quick_link_reports'                         => 'Szybkie linki',
     'quick_link_default_report'                  => 'Domyślny raport finansowy',
     'quick_link_audit_report'                    => 'Przegląd historii transakcji',
     'report_this_month_quick'                    => 'Bieżący miesiąc, wszystkie konta',
     'report_this_year_quick'                     => 'Bieżący rok, wszystkie konta',
     'report_this_fiscal_year_quick'              => 'Bieżący rok podatkowy, wszystkie konta',
-    'report_all_time_quick'                      => 'All-time, all accounts',
-    'reports_can_bookmark'                       => 'Remember that reports can be bookmarked.',
+    'report_all_time_quick'                      => 'Cały czas, wszystkie konta',
+    'reports_can_bookmark'                       => 'Pamiętaj, że raporty można dodać do zakładek.',
     'incomeVsExpenses'                           => 'Dochody a wydatki',
     'accountBalances'                            => 'Salda kont',
     'balanceStart'                               => 'Saldo na początku okresu',
@@ -799,7 +799,7 @@ return [
     'no_budget'                                  => '(bez budżetu)',
     'max-amount'                                 => 'Maksymalna kwota',
     'min-amount'                                 => 'Minimalna kwota',
-    'journal-amount'                             => 'Current bill entry',
+    'journal-amount'                             => 'Faktyczna kwota',
     'name'                                       => 'Nazwa',
     'date'                                       => 'Data',
     'paid'                                       => 'Zpłacone',
@@ -823,7 +823,7 @@ return [
     'sum_of_piggy_banks'                         => 'Suma skarbonek',
     'saved_so_far'                               => 'Zaoszczędzono do tej pory',
     'left_to_save'                               => 'Pozostało do zaoszczędzenia',
-    'suggested_amount'                           => 'Suggested monthly amount to save',
+    'suggested_amount'                           => 'Sugerowana miesięczna kwota do odłożenia',
     'add_money_to_piggy_title'                   => 'Dodaj pieniądze do skarbonki ":name"',
     'remove_money_from_piggy_title'              => 'Usuń pieniądze ze skarbonki ":name"',
     'add'                                        => 'Dodaj',
@@ -839,7 +839,7 @@ return [
     'target_amount'             => 'Kwota docelowa',
     'start_date'                => 'Data rozpoczęcia',
     'target_date'               => 'Data docelowa',
-    'no_target_date'            => 'No target date',
+    'no_target_date'            => 'Brak daty docelowej',
     'table'                     => 'Tabela',
     'delete_piggy_bank'         => 'Usuń skarbonkę ":name"',
     'cannot_add_amount_piggy'   => 'Nie można dodać :amount do ":name".',

From dd579cc19beb7719cba9232d6fcf0865c887bca4 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 16:50:06 +0200
Subject: [PATCH 618/668] New translations form.php (Polish)

---
 resources/lang/pl_PL/form.php | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/resources/lang/pl_PL/form.php b/resources/lang/pl_PL/form.php
index 44200520ee..332196104c 100644
--- a/resources/lang/pl_PL/form.php
+++ b/resources/lang/pl_PL/form.php
@@ -58,20 +58,20 @@ return [
     'accountRole'                    => 'Rola konta',
     'openingBalanceDate'             => 'Data salda otwarcia',
     'ccType'                         => 'Plan płatności kartą kredytową',
-    'ccMonthlyPaymentDate'           => 'Credit card monthly payment date',
+    'ccMonthlyPaymentDate'           => 'Miesięczny termin spłaty karty kredytowej',
     'piggy_bank_id'                  => 'Skarbonka',
     'returnHere'                     => 'Wróć tutaj',
-    'returnHereExplanation'          => 'After storing, return here to create another one.',
+    'returnHereExplanation'          => 'Po zapisaniu, wrócić tutaj.',
     'returnHereUpdateExplanation'    => 'Po aktualizacji, wróć tutaj.',
     'description'                    => 'Opis',
     'expense_account'                => 'Konto wydatków',
     'revenue_account'                => 'Konto przychodów',
     'decimal_places'                 => 'Miejsca dziesiętne',
-    'exchange_rate_instruction'      => 'Foreign currencies',
-    'exchanged_amount'               => 'Exchanged amount',
-    'source_amount'                  => 'Amount (source)',
-    'destination_amount'             => 'Amount (destination)',
-    'native_amount'                  => 'Native amount',
+    'exchange_rate_instruction'      => 'Zagraniczne waluty',
+    'exchanged_amount'               => 'Wymieniona kwota',
+    'source_amount'                  => 'Kwota (źródło)',
+    'destination_amount'             => 'Kwota (przeznaczenie)',
+    'native_amount'                  => 'Źródłowa kwota',
 
     'revenue_account_source'      => 'Konto przychodów (źródło)',
     'source_account_asset'        => 'Konto źródłowe (konto aktywów)',
@@ -86,9 +86,9 @@ return [
 
     'amount'                     => 'Kwota',
     'date'                       => 'Data',
-    'interest_date'              => 'Interest date',
+    'interest_date'              => 'Data odsetek',
     'book_date'                  => 'Data księgowania',
-    'process_date'               => 'Processing date',
+    'process_date'               => 'Data przetworzenia',
     'category'                   => 'Kategoria',
     'tags'                       => 'Tagi',
     'deletePermanently'          => 'Usuń trwale',
@@ -100,7 +100,7 @@ return [
     'code'                       => 'Kod',
     'iban'                       => 'IBAN',
     'accountNumber'              => 'Numer konta',
-    'creditCardNumber'           => 'Credit card number',
+    'creditCardNumber'           => 'Numer karty kredytowej',
     'has_headers'                => 'Nagłówki',
     'date_format'                => 'Format daty',
     'specifix'                   => 'Bank- or file specific fixes',

From 69a67ca977fc9878e89e352511d684af5cf7b87c Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 16:50:09 +0200
Subject: [PATCH 619/668] New translations firefly.php (Polish)

---
 resources/lang/pl_PL/firefly.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/resources/lang/pl_PL/firefly.php b/resources/lang/pl_PL/firefly.php
index 61ca89b38a..7f9e82f5a0 100644
--- a/resources/lang/pl_PL/firefly.php
+++ b/resources/lang/pl_PL/firefly.php
@@ -876,17 +876,17 @@ return [
     'store_configuration'                   => 'Zapisz konfigurację',
     'single_user_administration'            => 'User administration for :email',
     'edit_user'                             => 'Modyfikuj użytkownika :email',
-    'hidden_fields_preferences'             => 'Not all fields are visible right now. You must enable them in your <a href=":link">settings</a>.',
+    'hidden_fields_preferences'             => 'Nie wszystkie pola są teraz widoczne. Należy je włączyć w <a href=":link">ustawieniach</a>.',
     'user_data_information'                 => 'Dane użytkownika',
     'user_information'                      => 'Informacja o użytkowniku',
     'total_size'                            => 'łączny rozmiar',
     'budget_or_budgets'                     => 'budżet(y)',
-    'budgets_with_limits'                   => 'budget(s) with configured amount',
+    'budgets_with_limits'                   => 'budżet(y) z określoną kwotą',
     'rule_or_rules'                         => 'reguła(y)',
     'rulegroup_or_groups'                   => 'grupa(y) reguł',
     'configuration_updated'                 => 'Konfiguracja została zaktualizowana',
     'setting_is_demo_site'                  => 'Strona demonstracyjna',
-    'setting_is_demo_site_explain'          => 'If you check this box, this installation will behave as if it is the demo site, which can have weird side effects.',
+    'setting_is_demo_site_explain'          => 'Jeśli zaznaczysz to pole, ta instalacja będzie zachowywać się jak witryna demonstracyjna, co może mieć dziwne efekty uboczne.',
     'block_code_bounced'                    => 'Odrzucony e-mail potwierdzający',
     'block_code_expired'                    => 'Demonstracyjne konto wygasło',
     'no_block_code'                         => 'Brak powody blokady lub użytkownik niezablokowany',
@@ -909,17 +909,17 @@ return [
     'link_transaction'                      => 'Powiąż transakcje',
     'link_to_other_transaction'             => 'Powiąż aktualną transakcję z inną transakcją',
     'select_transaction_to_link'            => 'Wybierz transakcję, którą chcesz powiązać z tą transakcją',
-    'this_transaction'                      => 'This transaction',
-    'transaction'                           => 'Transaction',
+    'this_transaction'                      => 'Ta transakcja',
+    'transaction'                           => 'Transakcja',
     'comments'                              => 'Komentarze',
     'to_link_not_found'                     => 'Jeśli nie widzisz transakcji, którą chcesz powiązać, po prostu wpisz jej identyfikator.',
     'invalid_link_data'                     => 'Wybrano błędny typ powiązania. Nie można powiązać transakcji.',
     'journals_linked'                       => 'Transakcje są powiązane.',
     'journals_error_linked'                 => 'Wybrane transakcje są już powiązane.',
     'journal_links'                         => 'Powiązane transakcje',
-    'this_withdrawal'                       => 'This withdrawal',
-    'this_deposit'                          => 'This deposit',
-    'this_transfer'                         => 'This transfer',
+    'this_withdrawal'                       => 'Ta wypłata',
+    'this_deposit'                          => 'Ta wpłata',
+    'this_transfer'                         => 'Ten transfer',
     'overview_for_link'                     => 'Overview for link type ":name"',
     'delete_journal_link'                   => 'Usuń powiązanie między <a href=":source_link">:source</a> a <a href=":destination_link">:destination</a>',
     'deleted_link'                          => 'Usunięto powiązanie',

From 44a017db994d484dffddd86ea18c3a8b8a636af0 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 17:00:07 +0200
Subject: [PATCH 620/668] New translations list.php (Polish)

---
 resources/lang/pl_PL/list.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/lang/pl_PL/list.php b/resources/lang/pl_PL/list.php
index 9e7e975a1e..d7864b5248 100644
--- a/resources/lang/pl_PL/list.php
+++ b/resources/lang/pl_PL/list.php
@@ -41,7 +41,7 @@ return [
     'repeat_freq'            => 'Powtarza się',
     'description'            => 'Opis',
     'amount'                 => 'Kwota',
-    'internal_reference'     => 'Internal reference',
+    'internal_reference'     => 'Wewnętrzny numer',
     'date'                   => 'Data',
     'interest_date'          => 'Stopa procentowa',
     'book_date'              => 'Data księgowania',
@@ -49,7 +49,7 @@ return [
     'due_date'               => 'Termin realizacji',
     'payment_date'           => 'Data płatności',
     'invoice_date'           => 'Data faktury',
-    'interal_reference'      => 'Internal reference',
+    'interal_reference'      => 'Wewnętrzny numer',
     'notes'                  => 'Notatki',
     'from'                   => 'Z',
     'piggy_bank'             => 'Skarbonka',

From 1cb979404be42de82e2f594dbff98c25c874d0ed Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 17:00:09 +0200
Subject: [PATCH 621/668] New translations form.php (Polish)

---
 resources/lang/pl_PL/form.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/pl_PL/form.php b/resources/lang/pl_PL/form.php
index 332196104c..08f14827ea 100644
--- a/resources/lang/pl_PL/form.php
+++ b/resources/lang/pl_PL/form.php
@@ -193,7 +193,7 @@ return [
     'due_date'           => 'Termin realizacji',
     'payment_date'       => 'Data płatności',
     'invoice_date'       => 'Data faktury',
-    'internal_reference' => 'Internal reference',
+    'internal_reference' => 'Wewnętrzny numer',
 
     'inward'  => 'Inward description',
     'outward' => 'Outward description',

From 78c8680300a65c6d8b62ab4e9f9743db70cbf015 Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Sun, 3 Sep 2017 18:18:19 +0200
Subject: [PATCH 622/668] Expand log for #797

---
 app/Import/Storage/ImportStorage.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/Import/Storage/ImportStorage.php b/app/Import/Storage/ImportStorage.php
index 66a212f0f1..4c89b1ba02 100644
--- a/app/Import/Storage/ImportStorage.php
+++ b/app/Import/Storage/ImportStorage.php
@@ -144,7 +144,10 @@ class ImportStorage
         if ($this->isDoubleTransfer($parameters) || $this->hashAlreadyImported($importJournal->hash)) {
             $this->job->addStepsDone(3);
             // throw error
-            throw new FireflyException('Detected a possible duplicate, skip this one.');
+            $message = sprintf('Detected a possible duplicate, skip this one (hash: %s).', $importJournal->hash);
+            Log::error($message, $parameters);
+            throw new FireflyException($message);
+
         }
         unset($parameters);
 

From f2446d46aabfd137e6811ced4af337b70814ef0a Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Sun, 3 Sep 2017 18:19:58 +0200
Subject: [PATCH 623/668] Code for #797

---
 app/Import/Storage/ImportStorage.php | 2 +-
 app/Import/Storage/ImportSupport.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Import/Storage/ImportStorage.php b/app/Import/Storage/ImportStorage.php
index 4c89b1ba02..5f7af29db9 100644
--- a/app/Import/Storage/ImportStorage.php
+++ b/app/Import/Storage/ImportStorage.php
@@ -226,7 +226,7 @@ class ImportStorage
                 return false;
             }
         }
-        Log::debug('There already is a transfer imported with these properties. Compare existing with new. ', ['existing' => $transfer, 'new' => $parameters]);
+        Log::error('There already is a transfer imported with these properties. Compare existing with new. ', ['existing' => $transfer, 'new' => $parameters]);
 
         return true;
     }
diff --git a/app/Import/Storage/ImportSupport.php b/app/Import/Storage/ImportSupport.php
index 827150e31f..7c2f487e48 100644
--- a/app/Import/Storage/ImportSupport.php
+++ b/app/Import/Storage/ImportSupport.php
@@ -303,7 +303,7 @@ trait ImportSupport
                                        ->where('name', 'importHash')
                                        ->first();
         if (!is_null($entry)) {
-            Log::debug(sprintf('A journal with hash %s has already been imported (spoiler: it\'s journal #%d)', $hash, $entry->transaction_journal_id));
+            Log::error(sprintf('A journal with hash %s has already been imported (spoiler: it\'s journal #%d)', $hash, $entry->transaction_journal_id));
 
             return true;
         }

From a942313f85b0ee57fb5365ca898b17bf226e9c28 Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Sun, 3 Sep 2017 18:20:08 +0200
Subject: [PATCH 624/668] Remove obsolete strings.

---
 resources/lang/en_US/list.php       | 4 ----
 resources/lang/en_US/validation.php | 1 -
 2 files changed, 5 deletions(-)

diff --git a/resources/lang/en_US/list.php b/resources/lang/en_US/list.php
index b9055dc9f4..217b26ce20 100644
--- a/resources/lang/en_US/list.php
+++ b/resources/lang/en_US/list.php
@@ -70,11 +70,7 @@ return [
     'is_blocked'             => 'Is blocked',
     'is_admin'               => 'Is admin',
     'has_two_factor'         => 'Has 2FA',
-    'confirmed_from'         => 'Confirmed from',
-    'registered_from'        => 'Registered from',
     'blocked_code'           => 'Block code',
-    'domain'                 => 'Domain',
-    'registration_attempts'  => 'Registration attempts',
     'source_account'         => 'Source account',
     'destination_account'    => 'Destination account',
     'accounts_count'         => 'Number of accounts',
diff --git a/resources/lang/en_US/validation.php b/resources/lang/en_US/validation.php
index e266d67baa..9ea55191b5 100644
--- a/resources/lang/en_US/validation.php
+++ b/resources/lang/en_US/validation.php
@@ -17,7 +17,6 @@ return [
     'deleted_user'                   => 'Due to security constraints, you cannot register using this email address.',
     'rule_trigger_value'             => 'This value is invalid for the selected trigger.',
     'rule_action_value'              => 'This value is invalid for the selected action.',
-    'invalid_domain'                 => 'Due to security constraints, you cannot register from this domain.',
     'file_already_attached'          => 'Uploaded file ":name" is already attached to this object.',
     'file_attached'                  => 'Succesfully uploaded file ":name".',
     'file_invalid_mime'              => 'File ":name" is of type ":mime" which is not accepted as a new upload.',

From 88e0985776e8ee105be1ad6204e40850dacaad5d Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 18:30:08 +0200
Subject: [PATCH 625/668] New translations validation.php (Dutch)

---
 resources/lang/nl_NL/validation.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/resources/lang/nl_NL/validation.php b/resources/lang/nl_NL/validation.php
index 47e21e1802..de20c75a0c 100644
--- a/resources/lang/nl_NL/validation.php
+++ b/resources/lang/nl_NL/validation.php
@@ -17,7 +17,6 @@ return [
     'deleted_user'                   => 'Je kan je niet registreren met dit e-mailadres.',
     'rule_trigger_value'             => 'Deze waarde is niet geldig voor de geselecteerde trigger.',
     'rule_action_value'              => 'Deze waarde is niet geldig voor de geselecteerde actie.',
-    'invalid_domain'                 => 'Kan niet registereren vanaf dit domein.',
     'file_already_attached'          => 'Het geuploade bestand ":name" is al gelinkt aan deze transactie.',
     'file_attached'                  => 'Bestand met naam ":name" is met succes geuploaded.',
     'file_invalid_mime'              => 'Bestand ":name" is van het type ":mime", en die kan je niet uploaden.',

From 5ee071fdc73468ea8445665bea6d7a1e6dcab50b Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 18:30:11 +0200
Subject: [PATCH 626/668] New translations validation.php (French)

---
 resources/lang/fr_FR/validation.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/resources/lang/fr_FR/validation.php b/resources/lang/fr_FR/validation.php
index 593409b980..10dcb26b8a 100644
--- a/resources/lang/fr_FR/validation.php
+++ b/resources/lang/fr_FR/validation.php
@@ -17,7 +17,6 @@ return [
     'deleted_user'                   => 'Compte tenu des contraintes de sécurité, vous ne pouvez pas vous inscrire en utilisant cette adresse e-mail.',
     'rule_trigger_value'             => 'Cette valeur n’est pas valide pour le déclencheur sélectionné.',
     'rule_action_value'              => 'Cette valeur n’est pas valide pour l’action sélectionnée.',
-    'invalid_domain'                 => 'Compte tenu des contraintes de sécurité, vous ne pouvez pas vous enregistrer depuis ce domaine.',
     'file_already_attached'          => 'Le fichier téléchargé ":name" est déjà attaché à cet objet.',
     'file_attached'                  => 'Envoi du fichier ":name" avec succès.',
     'file_invalid_mime'              => 'Le fichier ":name" est du type ":mime" ce qui n\'est pas accepté pour un nouvel envoi.',

From 3f79ffecaf51dcd81451030587d02ff7d13a802b Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 18:30:12 +0200
Subject: [PATCH 627/668] New translations validation.php (German)

---
 resources/lang/de_DE/validation.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/resources/lang/de_DE/validation.php b/resources/lang/de_DE/validation.php
index b86d348f18..f9e52e740e 100644
--- a/resources/lang/de_DE/validation.php
+++ b/resources/lang/de_DE/validation.php
@@ -17,7 +17,6 @@ return [
     'deleted_user'                   => 'Aufgrund von Sicherheitsbeschränkungen ist eine Registrierung dieser Email-Adresse nicht zugelassen.',
     'rule_trigger_value'             => 'Dieser Wert ist für den ausgewählten Trigger ungültig.',
     'rule_action_value'              => 'Dieser Wert ist für die gewählte Aktion ungültig.',
-    'invalid_domain'                 => 'Aufgrund von Sicherheitsbeschränkungen ist eine Registrierung von dieser Domain nicht zugelassen.',
     'file_already_attached'          => 'Die hochgeladene Datei ":name" ist diesem Objekt bereits angehängt.',
     'file_attached'                  => 'Datei ":name" erfolgreich hochgeladen.',
     'file_invalid_mime'              => 'Die Datei ":name" ist vom Typ ":mime", welcher nicht zum Upload zugelassen ist.',

From fdec8ab6a27ba3a96fbf19dde5e43be066964b30 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 18:30:13 +0200
Subject: [PATCH 628/668] New translations validation.php (Spanish)

---
 resources/lang/es_ES/validation.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/resources/lang/es_ES/validation.php b/resources/lang/es_ES/validation.php
index fdf2d902b0..c81b390e7f 100644
--- a/resources/lang/es_ES/validation.php
+++ b/resources/lang/es_ES/validation.php
@@ -17,7 +17,6 @@ return [
     'deleted_user'                   => 'Debido a restricciones de seguridad, no se puede registrar utilizando esta dirección de correo electrónico.',
     'rule_trigger_value'             => 'Este valor es incorrecto para el disparador seleccionado.',
     'rule_action_value'              => 'Este valor es incorrecto para la acción seleccionada.',
-    'invalid_domain'                 => 'Debido a restricciones de seguridad, no se puede registrar utilizando este dominio.',
     'file_already_attached'          => 'El archivo ":name" ya ha sido añadido a este objeto.',
     'file_attached'                  => 'Archivo subido correctamente ": nombre".',
     'file_invalid_mime'              => 'El archivo ":name" es de tipo ": mime", el cual no se acepta.',

From 584f4fb2869cd4c720cc9a1e26170a5569516af1 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 18:30:14 +0200
Subject: [PATCH 629/668] New translations validation.php (Slovenian)

---
 resources/lang/sl_SI/validation.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/resources/lang/sl_SI/validation.php b/resources/lang/sl_SI/validation.php
index 66339e75dc..5061b70f84 100644
--- a/resources/lang/sl_SI/validation.php
+++ b/resources/lang/sl_SI/validation.php
@@ -17,7 +17,6 @@ return [
     'deleted_user'                   => 'Iz varnostnih razlogov ne morete ustvariti uporabnika s takim e-poštnim naslovom.',
     'rule_trigger_value'             => 'Ta vrednost je neveljavna za izbrani sprožilec.',
     'rule_action_value'              => 'This value is invalid for the selected action.',
-    'invalid_domain'                 => 'Due to security constraints, you cannot register from this domain.',
     'file_already_attached'          => 'Uploaded file ":name" is already attached to this object.',
     'file_attached'                  => 'Succesfully uploaded file ":name".',
     'file_invalid_mime'              => 'File ":name" is of type ":mime" which is not accepted as a new upload.',

From 141ae05cd6fb1cfce97028b2d420979e837ed6f9 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 18:30:16 +0200
Subject: [PATCH 630/668] New translations validation.php (Portuguese,
 Brazilian)

---
 resources/lang/pt_BR/validation.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/resources/lang/pt_BR/validation.php b/resources/lang/pt_BR/validation.php
index 5b7b263ccd..aec145511e 100644
--- a/resources/lang/pt_BR/validation.php
+++ b/resources/lang/pt_BR/validation.php
@@ -17,7 +17,6 @@ return [
     'deleted_user'                   => 'Devido a restrições de segurança, você não pode registrar usando este endereço de e-mail.',
     'rule_trigger_value'             => 'Este valor é inválido para o disparo selecionado.',
     'rule_action_value'              => 'Este valor é inválido para a ação selecionada.',
-    'invalid_domain'                 => 'Devido a restrições de segurança, você não pode registrar deste domínio.',
     'file_already_attached'          => 'Arquivo ":name" carregado já está anexado para este objeto.',
     'file_attached'                  => 'Arquivo carregado com sucesso ":name".',
     'file_invalid_mime'              => 'Arquivo ":name" é do tipo ":mime" que não é aceito como um novo upload.',

From dc8df37f5a61d620cd58002259a582895c453e75 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 18:30:17 +0200
Subject: [PATCH 631/668] New translations validation.php (Polish)

---
 resources/lang/pl_PL/validation.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/resources/lang/pl_PL/validation.php b/resources/lang/pl_PL/validation.php
index e4c573728d..84e7df6be6 100644
--- a/resources/lang/pl_PL/validation.php
+++ b/resources/lang/pl_PL/validation.php
@@ -17,7 +17,6 @@ return [
     'deleted_user'                   => 'Ze względu na zabezpieczenia nie możesz się zarejestrować używając tego adresu e-mail.',
     'rule_trigger_value'             => 'Ta wartość jest nieprawidłowa dla wybranego wyzwalacza.',
     'rule_action_value'              => 'Ta wartość jest nieprawidłowa dla wybranej akcji.',
-    'invalid_domain'                 => 'Ze względu na zabezpieczenia nie możesz się zarejestrować z tej domeny.',
     'file_already_attached'          => 'Przesłany plik ":name" jest już dołączony do tego obiektu.',
     'file_attached'                  => 'Pomyślnie wgrano plik ":name".',
     'file_invalid_mime'              => 'Plik ":name" jest typu ":mime", który nie jest akceptowany jako nowy plik do przekazania.',

From e3521692ca23210a159503076cd92273c9f24cbd Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 18:30:19 +0200
Subject: [PATCH 632/668] New translations list.php (Spanish)

---
 resources/lang/es_ES/list.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/resources/lang/es_ES/list.php b/resources/lang/es_ES/list.php
index d4319f7d7e..8e2b50c0f9 100644
--- a/resources/lang/es_ES/list.php
+++ b/resources/lang/es_ES/list.php
@@ -70,11 +70,7 @@ return [
     'is_blocked'             => 'Está bloqueado',
     'is_admin'               => '¿Es el administrador?',
     'has_two_factor'         => 'Tiene 2FA',
-    'confirmed_from'         => 'Confirmado desde',
-    'registered_from'        => 'Registrado desde',
     'blocked_code'           => 'Bloque de código',
-    'domain'                 => 'Dominio',
-    'registration_attempts'  => 'Intentos de registro',
     'source_account'         => 'Cuenta origen',
     'destination_account'    => 'Cuenta destino',
     'accounts_count'         => 'Número de cuentas',

From 8f3731dabecf680202f910d92ca67a219c1ec3ba Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 18:30:21 +0200
Subject: [PATCH 633/668] New translations list.php (Slovenian)

---
 resources/lang/sl_SI/list.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/resources/lang/sl_SI/list.php b/resources/lang/sl_SI/list.php
index 898fa2e77c..264d55d72a 100644
--- a/resources/lang/sl_SI/list.php
+++ b/resources/lang/sl_SI/list.php
@@ -70,11 +70,7 @@ return [
     'is_blocked'             => 'Je blokiran',
     'is_admin'               => 'Je administrator',
     'has_two_factor'         => 'Ima dvostopenjsko overovitev',
-    'confirmed_from'         => 'Potrjen od',
-    'registered_from'        => 'Registriran',
     'blocked_code'           => 'Koda vzroka blokade',
-    'domain'                 => 'Domena',
-    'registration_attempts'  => 'Poskusov registriranja',
     'source_account'         => 'Izvorni račun',
     'destination_account'    => 'Ciljni račun',
     'accounts_count'         => 'Število računov',

From fdf26905c67e097bae4b1e900fff765310f981f1 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 18:30:22 +0200
Subject: [PATCH 634/668] New translations list.php (Portuguese, Brazilian)

---
 resources/lang/pt_BR/list.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/resources/lang/pt_BR/list.php b/resources/lang/pt_BR/list.php
index a3a3d8d3df..a0cf6f88fb 100644
--- a/resources/lang/pt_BR/list.php
+++ b/resources/lang/pt_BR/list.php
@@ -70,11 +70,7 @@ return [
     'is_blocked'             => 'Está bloqueado',
     'is_admin'               => 'É admin',
     'has_two_factor'         => 'Tem 2FA',
-    'confirmed_from'         => 'Confirmado de',
-    'registered_from'        => 'Registrado de',
     'blocked_code'           => 'Bloco de código',
-    'domain'                 => 'Domínio',
-    'registration_attempts'  => 'Tentativas de registo',
     'source_account'         => 'Conta de origem',
     'destination_account'    => 'Conta de destino',
     'accounts_count'         => 'Número de Contas',

From 6b6132b91bb8cd1a179cf9c9e2b8c22ef9b91b97 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 18:30:26 +0200
Subject: [PATCH 635/668] New translations validation.php (Russian)

---
 resources/lang/ru_RU/validation.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/resources/lang/ru_RU/validation.php b/resources/lang/ru_RU/validation.php
index ae67c89342..8273315994 100644
--- a/resources/lang/ru_RU/validation.php
+++ b/resources/lang/ru_RU/validation.php
@@ -17,7 +17,6 @@ return [
     'deleted_user'                   => 'По соображениям безопасности, вы не можете зарегистрироваться, используя этот адрес электронной почты.',
     'rule_trigger_value'             => 'Это значение является недопустимым для выбранного триггера.',
     'rule_action_value'              => 'Это значение является недопустимым для выбранного действия.',
-    'invalid_domain'                 => 'По соображениям безопасности, вы не можете зарегистрироваться, используя почту на указанном домене.',
     'file_already_attached'          => 'Загруженный файл ":name" уже прикреплён к этому объекту.',
     'file_attached'                  => 'Файл ":name". успешно загружен.',
     'file_invalid_mime'              => 'Файл ":name" имеет тип ":mime". Загрузка файлов такого типа невозможна.',

From a1b9baae3031dcb89093c6f00bd3a460c740b3c2 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 18:30:28 +0200
Subject: [PATCH 636/668] New translations list.php (Russian)

---
 resources/lang/ru_RU/list.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/resources/lang/ru_RU/list.php b/resources/lang/ru_RU/list.php
index 44f35277ff..5df2d54bf5 100644
--- a/resources/lang/ru_RU/list.php
+++ b/resources/lang/ru_RU/list.php
@@ -70,11 +70,7 @@ return [
     'is_blocked'             => 'Заблокирован?',
     'is_admin'               => 'Администратор?',
     'has_two_factor'         => 'Защита (2FA)?',
-    'confirmed_from'         => 'Confirmed from',
-    'registered_from'        => 'Registered from',
     'blocked_code'           => 'Block code',
-    'domain'                 => 'Домен',
-    'registration_attempts'  => 'Registration attempts',
     'source_account'         => 'Source account',
     'destination_account'    => 'Destination account',
     'accounts_count'         => 'Всего счетов',

From 9bc53c6644c6c423b8664e31d1d2fd72fe696dc3 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 18:30:34 +0200
Subject: [PATCH 637/668] New translations list.php (Polish)

---
 resources/lang/pl_PL/list.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/resources/lang/pl_PL/list.php b/resources/lang/pl_PL/list.php
index d7864b5248..f4604f245d 100644
--- a/resources/lang/pl_PL/list.php
+++ b/resources/lang/pl_PL/list.php
@@ -70,11 +70,7 @@ return [
     'is_blocked'             => 'Jest zablokowany',
     'is_admin'               => 'Jest administratorem',
     'has_two_factor'         => 'Ma dwustopniową autoryzację',
-    'confirmed_from'         => 'Potwierdzone z',
-    'registered_from'        => 'Registered from',
     'blocked_code'           => 'Kod blokady',
-    'domain'                 => 'Domena',
-    'registration_attempts'  => 'Próby rejestracji',
     'source_account'         => 'Konto źródłowe',
     'destination_account'    => 'Konto docelowe',
     'accounts_count'         => 'Liczba kont',

From 3d32b8eb59d75eb36d8e4dfa63222533581efb4e Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 18:30:34 +0200
Subject: [PATCH 638/668] New translations list.php (German)

---
 resources/lang/de_DE/list.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/resources/lang/de_DE/list.php b/resources/lang/de_DE/list.php
index 9402db0d28..b3cd46d9b1 100644
--- a/resources/lang/de_DE/list.php
+++ b/resources/lang/de_DE/list.php
@@ -70,11 +70,7 @@ return [
     'is_blocked'             => 'Ist blockiert',
     'is_admin'               => 'Ist Admin',
     'has_two_factor'         => 'Hat 2FA',
-    'confirmed_from'         => 'Bestätigt von',
-    'registered_from'        => 'Registriert seit',
     'blocked_code'           => 'Blockcode',
-    'domain'                 => 'Domain',
-    'registration_attempts'  => 'Registrierungsversuche',
     'source_account'         => 'Quellkonto',
     'destination_account'    => 'Zielkonto',
     'accounts_count'         => 'Anzahl Konten',

From 158377a522cb64830b2857ebf9f245366189ea05 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 18:30:43 +0200
Subject: [PATCH 639/668] New translations list.php (French)

---
 resources/lang/fr_FR/list.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/resources/lang/fr_FR/list.php b/resources/lang/fr_FR/list.php
index 93c5142686..4df06cea40 100644
--- a/resources/lang/fr_FR/list.php
+++ b/resources/lang/fr_FR/list.php
@@ -70,11 +70,7 @@ return [
     'is_blocked'             => 'Est bloqué',
     'is_admin'               => 'Est admin',
     'has_two_factor'         => 'A 2FA',
-    'confirmed_from'         => 'Confirmé à partir de',
-    'registered_from'        => 'Inscrit depuis le',
     'blocked_code'           => 'Code de blocage',
-    'domain'                 => 'Domaine',
-    'registration_attempts'  => 'Tentatives d\'inscription',
     'source_account'         => 'Compte d\'origine',
     'destination_account'    => 'Compte destinataire',
     'accounts_count'         => 'Nombre de comptes',

From 6b82a8b29ab4d39802dd5d4d70a87590e467c273 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 18:30:44 +0200
Subject: [PATCH 640/668] New translations list.php (Dutch)

---
 resources/lang/nl_NL/list.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/resources/lang/nl_NL/list.php b/resources/lang/nl_NL/list.php
index a9b49a2ae9..6c5ced7dfe 100644
--- a/resources/lang/nl_NL/list.php
+++ b/resources/lang/nl_NL/list.php
@@ -70,11 +70,7 @@ return [
     'is_blocked'             => 'Is geblokkeerd',
     'is_admin'               => 'Is beheerder',
     'has_two_factor'         => 'Heeft 2FA',
-    'confirmed_from'         => 'Bevestigd vanaf',
-    'registered_from'        => 'Geregistreerd vanaf',
     'blocked_code'           => 'Reden voor blokkade',
-    'domain'                 => 'Domein',
-    'registration_attempts'  => 'Registratiepogingen',
     'source_account'         => 'Bronrekening',
     'destination_account'    => 'Doelrekening',
     'accounts_count'         => 'Aantal rekeningen',

From a697b0735f7c1584c583205f2df3ad9590006cfa Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 19:20:09 +0200
Subject: [PATCH 641/668] New translations firefly.php (Polish)

---
 resources/lang/pl_PL/firefly.php | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/resources/lang/pl_PL/firefly.php b/resources/lang/pl_PL/firefly.php
index 7f9e82f5a0..0a5051c4e0 100644
--- a/resources/lang/pl_PL/firefly.php
+++ b/resources/lang/pl_PL/firefly.php
@@ -753,20 +753,20 @@ return [
     'select_category'                            => 'Wybierz kategorię(e)',
     'select_budget'                              => 'Wybierz budżet(y).',
     'select_tag'                                 => 'Wybierz tag(i).',
-    'income_per_category'                        => 'Dochód wg kategorii',
-    'expense_per_category'                       => 'Wydatek wg kategorii',
-    'expense_per_budget'                         => 'Wydatek wg budżetu',
-    'income_per_account'                         => 'Dochód wg konta',
-    'expense_per_account'                        => 'Wydatek wg konta',
-    'expense_per_tag'                            => 'Wydatek wg tagu',
-    'income_per_tag'                             => 'Przychód wg tagu',
-    'include_expense_not_in_budget'              => 'Included expenses not in the selected budget(s)',
-    'include_expense_not_in_account'             => 'Included expenses not in the selected account(s)',
-    'include_expense_not_in_category'            => 'Included expenses not in the selected category(ies)',
-    'include_income_not_in_category'             => 'Included income not in the selected category(ies)',
-    'include_income_not_in_account'              => 'Included income not in the selected account(s)',
-    'include_income_not_in_tags'                 => 'Included income not in the selected tag(s)',
-    'include_expense_not_in_tags'                => 'Included expenses not in the selected tag(s)',
+    'income_per_category'                        => 'Dochody wg kategorii',
+    'expense_per_category'                       => 'Wydatki wg kategorii',
+    'expense_per_budget'                         => 'Wydatki wg budżetu',
+    'income_per_account'                         => 'Dochody wg konta',
+    'expense_per_account'                        => 'Wydatki wg konta',
+    'expense_per_tag'                            => 'Wydatki wg tagu',
+    'income_per_tag'                             => 'Dochody wg tagów',
+    'include_expense_not_in_budget'              => 'Uwzględnij wydatki spoza wybranych budżetów',
+    'include_expense_not_in_account'             => 'Uwzględnij wydatki spoza wybranych kont',
+    'include_expense_not_in_category'            => 'Uwzględnij wydatki spoza wybranych kategorii',
+    'include_income_not_in_category'             => 'Uwzględnij przychody spoza wybranych kategorii',
+    'include_income_not_in_account'              => 'Uwzględnij przychody spoza wybranych kont',
+    'include_income_not_in_tags'                 => 'Uwzględnij przychody spoza wybranych tagów',
+    'include_expense_not_in_tags'                => 'Uwzględnij wydatki spoza wybranych tagów',
     'everything_else'                            => 'Wszystko inne',
     'income_and_expenses'                        => 'Dochody i wydatki',
     'spent_average'                              => 'Wydano (średnia)',

From b9fc298a0a847aa2b93d7832f89958da0746b29d Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 19:30:10 +0200
Subject: [PATCH 642/668] New translations firefly.php (Polish)

---
 resources/lang/pl_PL/firefly.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/pl_PL/firefly.php b/resources/lang/pl_PL/firefly.php
index 0a5051c4e0..72ac536a05 100644
--- a/resources/lang/pl_PL/firefly.php
+++ b/resources/lang/pl_PL/firefly.php
@@ -759,7 +759,7 @@ return [
     'income_per_account'                         => 'Dochody wg konta',
     'expense_per_account'                        => 'Wydatki wg konta',
     'expense_per_tag'                            => 'Wydatki wg tagu',
-    'income_per_tag'                             => 'Dochody wg tagów',
+    'income_per_tag'                             => 'Dochody wg tagu',
     'include_expense_not_in_budget'              => 'Uwzględnij wydatki spoza wybranych budżetów',
     'include_expense_not_in_account'             => 'Uwzględnij wydatki spoza wybranych kont',
     'include_expense_not_in_category'            => 'Uwzględnij wydatki spoza wybranych kategorii',

From 615828829583ec140542eb424723652647bd3c60 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sun, 3 Sep 2017 21:00:07 +0200
Subject: [PATCH 643/668] New translations firefly.php (German)

---
 resources/lang/de_DE/firefly.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/resources/lang/de_DE/firefly.php b/resources/lang/de_DE/firefly.php
index 1f6538d707..cd0d5f1d31 100644
--- a/resources/lang/de_DE/firefly.php
+++ b/resources/lang/de_DE/firefly.php
@@ -626,8 +626,8 @@ Sollen zusätzlich Ihre Girokonten angezeigt werden?',
     'mass_deleted_transactions_success'          => ':amount Überweisung(en) gelöscht.',
     'mass_edited_transactions_success'           => ':amount Überweisung(en) aktualisiert',
     'opt_group_no_account_type'                  => '(no account type)',
-    'opt_group_defaultAsset'                     => 'Default asset accounts',
-    'opt_group_savingAsset'                      => 'Savings accounts',
+    'opt_group_defaultAsset'                     => 'Standard-Anlagekonto',
+    'opt_group_savingAsset'                      => 'Sparkonten',
     'opt_group_sharedAsset'                      => 'Shared asset accounts',
     'opt_group_ccAsset'                          => 'Credit cards',
 
@@ -779,9 +779,9 @@ Sollen zusätzlich Ihre Girokonten angezeigt werden?',
     'description'                                => 'Beschreibung',
     'sum_of_period'                              => 'Summe des Zeitraums',
     'average_in_period'                          => 'Durchschnitt im Zeitraum',
-    'account_role_defaultAsset'                  => 'Default asset account',
+    'account_role_defaultAsset'                  => 'Standard-Anlagekonto',
     'account_role_sharedAsset'                   => 'Shared asset account',
-    'account_role_savingAsset'                   => 'Savings account',
+    'account_role_savingAsset'                   => 'Sparkonto',
     'account_role_ccAsset'                       => 'Kreditkarte',
     'budget_chart_click'                         => 'Please click on a budget name in the table above to see a chart.',
     'category_chart_click'                       => 'Please click on a category name in the table above to see a chart.',

From 068b9e388fcdac9982fe850dcc04592d6a427e6f Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Tue, 5 Sep 2017 06:43:33 +0200
Subject: [PATCH 644/668] New code for double transfer routine. #797

---
 app/Import/Storage/ImportStorage.php | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/app/Import/Storage/ImportStorage.php b/app/Import/Storage/ImportStorage.php
index 5f7af29db9..66ba023c17 100644
--- a/app/Import/Storage/ImportStorage.php
+++ b/app/Import/Storage/ImportStorage.php
@@ -210,24 +210,29 @@ class ImportStorage
         $amount   = app('steam')->positive($parameters['amount']);
         $names    = [$parameters['asset'], $parameters['opposing']];
         $transfer = [];
+        $hit      = false;
         sort($names);
 
         foreach ($this->transfers as $transfer) {
-            if ($parameters['description'] !== $transfer['description']) {
-                return false;
+            if ($parameters['description'] === $transfer['description']) {
+                $hit = true;
             }
-            if ($names !== $transfer['names']) {
-                return false;
+            if ($names === $transfer['names']) {
+                $hit = true;
             }
-            if (bccomp($amount, $transfer['amount']) !== 0) {
-                return false;
+            if (bccomp($amount, $transfer['amount']) === 0) {
+                $hit = true;
             }
-            if ($parameters['date'] !== $transfer['date']) {
-                return false;
+            if ($parameters['date'] === $transfer['date']) {
+                $hit = true;
             }
         }
-        Log::error('There already is a transfer imported with these properties. Compare existing with new. ', ['existing' => $transfer, 'new' => $parameters]);
+        if ($hit === true) {
+            Log::error(
+                'There already is a transfer imported with these properties. Compare existing with new. ', ['existing' => $transfer, 'new' => $parameters]
+            );
+        }
 
-        return true;
+        return $hit;
     }
 }

From a50945ad53aba51f879106914323e67a13b12d83 Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Tue, 5 Sep 2017 20:50:19 +0200
Subject: [PATCH 645/668] Fix #814

---
 app/Helpers/Collector/JournalCollector.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/Helpers/Collector/JournalCollector.php b/app/Helpers/Collector/JournalCollector.php
index d892cefdf8..4d7f2c3bce 100644
--- a/app/Helpers/Collector/JournalCollector.php
+++ b/app/Helpers/Collector/JournalCollector.php
@@ -620,6 +620,8 @@ class JournalCollector implements JournalCollectorInterface
             $this->query->leftJoin('budgets as transaction_journal_budgets', 'transaction_journal_budgets.id', '=', 'budget_transaction_journal.budget_id');
             $this->query->leftJoin('budget_transaction', 'budget_transaction.transaction_id', '=', 'transactions.id');
             $this->query->leftJoin('budgets as transaction_budgets', 'transaction_budgets.id', '=', 'budget_transaction.budget_id');
+            $this->query->whereNull('transaction_journal_budgets.deleted_at');
+            $this->query->whereNull('transaction_budgets.deleted_at');
 
             $this->fields[] = 'budget_transaction_journal.budget_id as transaction_journal_budget_id';
             $this->fields[] = 'transaction_journal_budgets.encrypted as transaction_journal_budget_encrypted';

From 13834a276e279ddfca4ecb9b12d96eb7b53ae0b3 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Wed, 6 Sep 2017 08:50:12 +0200
Subject: [PATCH 646/668] New translations firefly.php (Dutch)

---
 resources/lang/nl_NL/firefly.php | 40 ++++++++++++++++----------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/resources/lang/nl_NL/firefly.php b/resources/lang/nl_NL/firefly.php
index ddd85a5727..c3b87b34a1 100644
--- a/resources/lang/nl_NL/firefly.php
+++ b/resources/lang/nl_NL/firefly.php
@@ -276,23 +276,23 @@ return [
     'rule_trigger_budget_is_choice'              => 'Budget is..',
     'rule_trigger_budget_is'                     => 'Budget is ":trigger_value"',
     'rule_trigger_tag_is_choice'                 => '(Een) tag is..',
-    'rule_trigger_tag_is'                        => 'A tag is ":trigger_value"',
+    'rule_trigger_tag_is'                        => 'Een tag is ":trigger_value"',
     'rule_trigger_has_attachments_choice'        => 'Heeft minstens zoveel bijlagen',
     'rule_trigger_has_attachments'               => 'Heeft minstens :trigger_value bijlage(n)',
     'rule_trigger_store_journal'                 => 'Als een transactie wordt gemaakt',
     'rule_trigger_update_journal'                => 'Als een transactie wordt bijgewerkt',
-    'rule_trigger_has_no_category_choice'        => 'Has no category',
-    'rule_trigger_has_no_category'               => 'Transaction has no category',
-    'rule_trigger_has_any_category_choice'       => 'Has a (any) category',
-    'rule_trigger_has_any_category'              => 'Transaction has a (any) category',
-    'rule_trigger_has_no_budget_choice'          => 'Has no budget',
-    'rule_trigger_has_no_budget'                 => 'Transaction has no budget',
-    'rule_trigger_has_any_budget_choice'         => 'Has a (any) budget',
-    'rule_trigger_has_any_budget'                => 'Transaction has a (any) budget',
-    'rule_trigger_has_no_tag_choice'             => 'Has no tag(s)',
-    'rule_trigger_has_no_tag'                    => 'Transaction has no tag(s)',
-    'rule_trigger_has_any_tag_choice'            => 'Has one or more (any) tags',
-    'rule_trigger_has_any_tag'                   => 'Transaction has one or more (any) tags',
+    'rule_trigger_has_no_category_choice'        => 'Heeft geen categorie',
+    'rule_trigger_has_no_category'               => 'Transactie heeft geen categorie',
+    'rule_trigger_has_any_category_choice'       => 'Heeft een (welke dan ook) categorie',
+    'rule_trigger_has_any_category'              => 'Transactie heeft een (welke dan ook) categorie',
+    'rule_trigger_has_no_budget_choice'          => 'Heeft geen budget',
+    'rule_trigger_has_no_budget'                 => 'Transactie heeft geen budget',
+    'rule_trigger_has_any_budget_choice'         => 'Heeft een (welke dan ook) budget',
+    'rule_trigger_has_any_budget'                => 'Transactie heeft een (welke dan ook) budget',
+    'rule_trigger_has_no_tag_choice'             => 'Heeft geen tag(s)',
+    'rule_trigger_has_no_tag'                    => 'Transactie heeft geen tag(s)',
+    'rule_trigger_has_any_tag_choice'            => 'Heeft een of meer tags',
+    'rule_trigger_has_any_tag'                   => 'Transactie heeft een of meer tags',
     'rule_action_set_category'                   => 'Verander categorie naar ":action_value"',
     'rule_action_clear_category'                 => 'Maak categorie-veld leeg',
     'rule_action_set_budget'                     => 'Sla op onder budget ":action_value"',
@@ -624,11 +624,11 @@ return [
     'perm-delete-many'                           => 'Veel items in één keer verwijderen kan zeer storend zijn. Wees voorzichtig.',
     'mass_deleted_transactions_success'          => 'Verwijder :amount transactie(s).',
     'mass_edited_transactions_success'           => 'Wijzig :amount transactie(s)',
-    'opt_group_no_account_type'                  => '(no account type)',
-    'opt_group_defaultAsset'                     => 'Default asset accounts',
-    'opt_group_savingAsset'                      => 'Savings accounts',
-    'opt_group_sharedAsset'                      => 'Shared asset accounts',
-    'opt_group_ccAsset'                          => 'Credit cards',
+    'opt_group_no_account_type'                  => '(geen rekeningtype)',
+    'opt_group_defaultAsset'                     => 'Standaard betaalrekeningen',
+    'opt_group_savingAsset'                      => 'Spaarrekeningen',
+    'opt_group_sharedAsset'                      => 'Gedeelde betaalrekeningen',
+    'opt_group_ccAsset'                          => 'Creditcards',
 
 
     // new user:
@@ -782,8 +782,8 @@ return [
     'account_role_sharedAsset'                   => 'Gedeelde betaalrekening',
     'account_role_savingAsset'                   => 'Spaarrekening',
     'account_role_ccAsset'                       => 'Credit card',
-    'budget_chart_click'                         => 'Please click on a budget name in the table above to see a chart.',
-    'category_chart_click'                       => 'Please click on a category name in the table above to see a chart.',
+    'budget_chart_click'                         => 'Klik op een budgetnaam in de tabel hierboven om een ​​grafiek te zien.',
+    'category_chart_click'                       => 'Klik op een categorienaam in de tabel hierboven om een ​​grafiek te zien.',
 
 
     // charts:

From 9960b063e796e1fc0a6d13a914c94632277453e9 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Wed, 6 Sep 2017 14:40:17 +0200
Subject: [PATCH 647/668] New translations firefly.php (French)

---
 resources/lang/fr_FR/firefly.php | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/resources/lang/fr_FR/firefly.php b/resources/lang/fr_FR/firefly.php
index 180bbbada4..5c45519929 100644
--- a/resources/lang/fr_FR/firefly.php
+++ b/resources/lang/fr_FR/firefly.php
@@ -281,16 +281,16 @@ return [
     'rule_trigger_has_attachments'               => 'À au moins :trigger_value pièce(s) jointe(s)',
     'rule_trigger_store_journal'                 => 'Lorsqu’une transaction est créée',
     'rule_trigger_update_journal'                => 'Lorsqu’une transaction est mise à jour',
-    'rule_trigger_has_no_category_choice'        => 'Has no category',
-    'rule_trigger_has_no_category'               => 'Transaction has no category',
-    'rule_trigger_has_any_category_choice'       => 'Has a (any) category',
-    'rule_trigger_has_any_category'              => 'Transaction has a (any) category',
-    'rule_trigger_has_no_budget_choice'          => 'Has no budget',
-    'rule_trigger_has_no_budget'                 => 'Transaction has no budget',
+    'rule_trigger_has_no_category_choice'        => 'N\'a pas de catégorie',
+    'rule_trigger_has_no_category'               => 'La transaction n\'a pas de catégorie',
+    'rule_trigger_has_any_category_choice'       => 'À une catégorie',
+    'rule_trigger_has_any_category'              => 'La transaction comporte une catégorie',
+    'rule_trigger_has_no_budget_choice'          => 'N\'a pas de budget',
+    'rule_trigger_has_no_budget'                 => 'La transaction n\'a pas de budget',
     'rule_trigger_has_any_budget_choice'         => 'Has a (any) budget',
     'rule_trigger_has_any_budget'                => 'Transaction has a (any) budget',
-    'rule_trigger_has_no_tag_choice'             => 'Has no tag(s)',
-    'rule_trigger_has_no_tag'                    => 'Transaction has no tag(s)',
+    'rule_trigger_has_no_tag_choice'             => 'N\'a pas de tag(s)',
+    'rule_trigger_has_no_tag'                    => 'La transaction n\'a pas de tag(s)',
     'rule_trigger_has_any_tag_choice'            => 'Has one or more (any) tags',
     'rule_trigger_has_any_tag'                   => 'Transaction has one or more (any) tags',
     'rule_action_set_category'                   => 'Définir la catégorie à ":action_value"',
@@ -624,11 +624,11 @@ return [
     'perm-delete-many'                           => 'Supprimer de nombreux éléments en une seule fois peut être très problématique. Soyez prudent.',
     'mass_deleted_transactions_success'          => 'Montant des opérations supprimées : :amount.',
     'mass_edited_transactions_success'           => 'Montant des opérations mises à jour : :amount',
-    'opt_group_no_account_type'                  => '(no account type)',
+    'opt_group_no_account_type'                  => '(aucun type de compte)',
     'opt_group_defaultAsset'                     => 'Default asset accounts',
-    'opt_group_savingAsset'                      => 'Savings accounts',
-    'opt_group_sharedAsset'                      => 'Shared asset accounts',
-    'opt_group_ccAsset'                          => 'Credit cards',
+    'opt_group_savingAsset'                      => 'Comptes d\'épargne',
+    'opt_group_sharedAsset'                      => 'Comptes d\'actifs partagés',
+    'opt_group_ccAsset'                          => 'Cartes de crédit',
 
 
     // new user:
@@ -782,8 +782,8 @@ return [
     'account_role_sharedAsset'                   => 'Compte d\'actif partagé',
     'account_role_savingAsset'                   => 'Compte d’épargne',
     'account_role_ccAsset'                       => 'Carte de crédit',
-    'budget_chart_click'                         => 'Please click on a budget name in the table above to see a chart.',
-    'category_chart_click'                       => 'Please click on a category name in the table above to see a chart.',
+    'budget_chart_click'                         => 'Cliquez sur le nom du budget dans le tableau ci-dessus pour voir un graphique.',
+    'category_chart_click'                       => 'Cliquez sur un nom de catégorie dans le tableau ci-dessus pour voir un graphique.',
 
 
     // charts:
@@ -887,7 +887,7 @@ return [
     'configuration_updated'                 => 'La configuration a été mise à jour',
     'setting_is_demo_site'                  => 'Site de démonstration',
     'setting_is_demo_site_explain'          => 'Si vous cochez cette case, cette installation se comportera comme si c\'était le site de démonstration, ce qui peut engendrer des effets secondaires étranges.',
-    'block_code_bounced'                    => 'Email message(s) bounced',
+    'block_code_bounced'                    => 'Rebond des messages emails',
     'block_code_expired'                    => 'Compte démo expiré',
     'no_block_code'                         => 'Aucune raison pour le blocage ou utilisateur non bloqué',
     // links

From 2dbdcf73ed25f951b5467f407e764176b1f2d25a Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Fri, 8 Sep 2017 20:07:22 +0200
Subject: [PATCH 648/668] Possible fix for #724

---
 app/Console/Commands/UpgradeDatabase.php | 116 ++++++++++++++++++++---
 1 file changed, 102 insertions(+), 14 deletions(-)

diff --git a/app/Console/Commands/UpgradeDatabase.php b/app/Console/Commands/UpgradeDatabase.php
index bf11fad82d..bcc8e2e43f 100644
--- a/app/Console/Commands/UpgradeDatabase.php
+++ b/app/Console/Commands/UpgradeDatabase.php
@@ -244,6 +244,8 @@ class UpgradeDatabase extends Command
      * For transfers, this is can be a destructive routine since we FORCE them into a currency setting whether they
      * like it or not. Previous routines MUST have set the currency setting for both accounts for this to work.
      *
+     * A transfer always has the
+     *
      * Both source and destination must match the respective currency preference. So FF3 must verify ALL
      * transactions.
      */
@@ -258,6 +260,7 @@ class UpgradeDatabase extends Command
 
         $set->each(
             function (TransactionJournal $transfer) use ($repository) {
+                // select all "source" transactions:
                 /** @var Collection $transactions */
                 $transactions = $transfer->transactions()->where('amount', '<', 0)->get();
                 $transactions->each(
@@ -268,13 +271,13 @@ class UpgradeDatabase extends Command
                 );
 
 
-                /** @var Collection $transactions */
-                $transactions = $transfer->transactions()->where('amount', '>', 0)->get();
-                $transactions->each(
-                    function (Transaction $transaction) {
-                        $this->updateTransactionCurrency($transaction);
-                    }
-                );
+                //                /** @var Collection $transactions */
+                //                $transactions = $transfer->transactions()->where('amount', '>', 0)->get();
+                //                $transactions->each(
+                //                    function (Transaction $transaction) {
+                //                        $this->updateTransactionCurrency($transaction);
+                //                    }
+                //                );
             }
         );
     }
@@ -353,9 +356,11 @@ class UpgradeDatabase extends Command
     }
 
     /**
-     * This method makes sure that the tranaction uses the same currency as the main account does.
+     * This method makes sure that the tranaction uses the same currency as the source account does.
      * If not, the currency is updated to include a reference to its original currency as the "foreign" currency.
      *
+     * The transaction that is sent to this function MUST be the source transaction (amount negative).
+     *
      * @param Transaction $transaction
      */
     private function updateTransactionCurrency(Transaction $transaction): void
@@ -364,19 +369,102 @@ class UpgradeDatabase extends Command
         $repository = app(CurrencyRepositoryInterface::class);
         $currency   = $repository->find(intval($transaction->account->getMeta('currency_id')));
 
+        // has no currency ID? Must have, so fill in using account preference:
         if (is_null($transaction->transaction_currency_id)) {
+            $transaction->transaction_currency_id = $currency->id;
+            Log::debug(sprintf('Transaction #%d has no currency setting, now set to %s', $transaction->id, $currency->code));
+            $transaction->save();
+        }
+
+        // does not match the source account (see above)? Can be fixed
+        // when mismatch in transaction and NO foreign amount is set:
+        if ($transaction->transaction_currency_id !== $currency->id && is_null($transaction->foreign_amount)) {
+            Log::debug(
+                sprintf(
+                    'Transaction #%d has a currency setting (#%d) that should be #%d. Amount remains %s, currency is changed.', $transaction->id,
+                    $transaction->transaction_currency_id, $currency->id, $transaction->amount
+                )
+            );
             $transaction->transaction_currency_id = $currency->id;
             $transaction->save();
         }
 
-        // when mismatch in transaction:
-        if ($transaction->transaction_currency_id !== $currency->id) {
-            $transaction->foreign_currency_id     = $transaction->transaction_currency_id;
-            $transaction->foreign_amount          = $transaction->amount;
-            $transaction->transaction_currency_id = $currency->id;
-            $transaction->save();
+        // grab opposing transaction:
+        /** @var TransactionJournal $journal */
+        $journal = $transaction->transactionJournal;
+        /** @var Transaction $opposing */
+        $opposing         = $journal->transactions()->where('amount', '>', 0)->where('identifier', $transaction->identifier)->first();
+        $opposingCurrency = $repository->find(intval($opposing->account->getMeta('currency_id')));
+
+        if (is_null($opposingCurrency->id)) {
+            Log::error(sprintf('Account #%d ("%s") must have currency preference but has none.', $opposing->account->id, $opposing->account->name));
+
+            return;
         }
 
+        // if the destination account currency is the same, both foreign_amount and foreign_currency_id must be NULL for both transactions:
+        if ($opposingCurrency->id === $currency->id) {
+            // update both transactions to match:
+            $transaction->foreign_amount       = null;
+            $transaction->foreign_currency_id  = null;
+            $opposing->foreign_amount          = null;
+            $opposing->foreign_currency_id     = null;
+            $opposing->transaction_currency_id = $currency->id;
+            $transaction->save();
+            $opposing->save();
+            Log::debug(sprintf('Cleaned up transaction #%d and #%d', $transaction->id, $opposing->id));
+
+            return;
+        }
+        // if destination account currency is different, both transactions must have this currency as foreign currency id.
+        if ($opposingCurrency->id !== $currency->id) {
+            $transaction->foreign_currency_id = $opposingCurrency->id;
+            $opposing->foreign_currency_id    = $opposingCurrency->id;
+            $transaction->save();
+            $opposing->save();
+            Log::debug(sprintf('Verified foreign currency ID of transaction #%d and #%d', $transaction->id, $opposing->id));
+        }
+
+        // if foreign amount of one is null and the other is not, use this to restore:
+        if (is_null($transaction->foreign_amount) && !is_null($opposing->foreign_amount)) {
+            $transaction->foreign_amount = bcmul(strval($opposing->foreign_amount), '-1');
+            $transaction->save();
+            Log::debug(sprintf('Restored foreign amount of transaction (1) #%d to %s', $transaction->id, $transaction->foreign_amount));
+        }
+
+        // if foreign amount of one is null and the other is not, use this to restore (other way around)
+        if (is_null($opposing->foreign_amount) && !is_null($transaction->foreign_amount)) {
+            $opposing->foreign_amount = bcmul(strval($transaction->foreign_amount), '-1');
+            $opposing->save();
+            Log::debug(sprintf('Restored foreign amount of transaction (2) #%d to %s', $opposing->id, $opposing->foreign_amount));
+        }
+
+        // when both are zero, try to grab it from journal:
+        if (is_null($opposing->foreign_amount) && is_null($transaction->foreign_amount)) {
+
+            $foreignAmount = $journal->getMeta('foreign_amount');
+            if (is_null($foreignAmount)) {
+                Log::debug(sprintf('Journal #%d has missing foreign currency data, forced to do 1:1 conversion :(.', $transaction->transaction_journal_id));
+                $transaction->foreign_amount = bcmul(strval($transaction->amount), '-1');
+                $opposing->foreign_amount    = bcmul(strval($opposing->amount), '-1');
+                $transaction->save();
+                $opposing->save();
+
+                return;
+            }
+            $foreignPositive = app('steam')->positive(strval($foreignAmount));
+            Log::debug(
+                sprintf(
+                    'Journal #%d has missing foreign currency info, try to restore from meta-data ("%s").', $transaction->transaction_journal_id, $foreignAmount
+                )
+            );
+            $transaction->foreign_amount = bcmul($foreignPositive, '-1');
+            $opposing->foreign_amount    = $foreignPositive;
+            $transaction->save();
+            $opposing->save();
+        }
+
+
         return;
     }
 }

From aae26c5da944043401da2abe8ef0c4af770ad3cb Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Fri, 8 Sep 2017 20:12:55 +0200
Subject: [PATCH 649/668] Can edit rule group #794

---
 app/Http/Controllers/RuleController.php  | 14 +++++++++-----
 app/Http/Requests/RuleFormRequest.php    |  1 +
 app/Repositories/Rule/RuleRepository.php |  1 +
 resources/views/rules/rule/edit.twig     |  2 +-
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/app/Http/Controllers/RuleController.php b/app/Http/Controllers/RuleController.php
index d3c64d1d82..4f90ca2bbc 100644
--- a/app/Http/Controllers/RuleController.php
+++ b/app/Http/Controllers/RuleController.php
@@ -166,10 +166,13 @@ class RuleController extends Controller
      */
     public function edit(Request $request, RuleRepositoryInterface $repository, Rule $rule)
     {
-        $oldTriggers  = $this->getCurrentTriggers($rule);
-        $triggerCount = count($oldTriggers);
-        $oldActions   = $this->getCurrentActions($rule);
-        $actionCount  = count($oldActions);
+        /** @var RuleGroupRepositoryInterface $ruleGroupRepository */
+        $ruleGroupRepository = app(RuleGroupRepositoryInterface::class);
+        $oldTriggers         = $this->getCurrentTriggers($rule);
+        $triggerCount        = count($oldTriggers);
+        $oldActions          = $this->getCurrentActions($rule);
+        $actionCount         = count($oldActions);
+        $ruleGroups          = ExpandedForm::makeSelectList($ruleGroupRepository->get());
 
         // has old input?
         if ($request->old()) {
@@ -191,7 +194,8 @@ class RuleController extends Controller
         Session::flash('gaEventCategory', 'rules');
         Session::flash('gaEventAction', 'edit-rule');
 
-        return view('rules.rule.edit', compact('rule', 'subTitle', 'primaryTrigger', 'oldTriggers', 'oldActions', 'triggerCount', 'actionCount'));
+        return view('rules.rule.edit', compact('rule', 'subTitle',
+                                               'primaryTrigger', 'oldTriggers', 'oldActions', 'triggerCount', 'actionCount','ruleGroups'));
     }
 
     /**
diff --git a/app/Http/Requests/RuleFormRequest.php b/app/Http/Requests/RuleFormRequest.php
index 3128100e4a..d2a965ca6d 100644
--- a/app/Http/Requests/RuleFormRequest.php
+++ b/app/Http/Requests/RuleFormRequest.php
@@ -39,6 +39,7 @@ class RuleFormRequest extends Request
     {
         return [
             'title'               => $this->string('title'),
+            'rule_group_id'       => $this->integer('rule_group_id'),
             'active'              => $this->boolean('active'),
             'trigger'             => $this->string('trigger'),
             'description'         => $this->string('description'),
diff --git a/app/Repositories/Rule/RuleRepository.php b/app/Repositories/Rule/RuleRepository.php
index 4d655484a7..98d922fa9d 100644
--- a/app/Repositories/Rule/RuleRepository.php
+++ b/app/Repositories/Rule/RuleRepository.php
@@ -316,6 +316,7 @@ class RuleRepository implements RuleRepositoryInterface
     public function update(Rule $rule, array $data): Rule
     {
         // update rule:
+        $rule->rule_group_id   = $data['rule_group_id'];
         $rule->active          = $data['active'];
         $rule->stop_processing = $data['stop_processing'];
         $rule->title           = $data['title'];
diff --git a/resources/views/rules/rule/edit.twig b/resources/views/rules/rule/edit.twig
index 862fe6849a..dbc112d439 100644
--- a/resources/views/rules/rule/edit.twig
+++ b/resources/views/rules/rule/edit.twig
@@ -6,7 +6,6 @@
 
 {% block content %}
     {{ Form.model(rule, {'class' : 'form-horizontal','id' : 'store','url' : route('rules.update', rule.id)}) }}
-    <input type="hidden" name="rule_group_id" value="{{ rule.rule_group_id }}"/>
     <input type="hidden" name="id" value="{{ rule.id }}"/>
     <div class="row">
         <div class="col-lg-6 col-md-6 col-sm-12">
@@ -16,6 +15,7 @@
                 </div>
                 <div class="box-body">
                     {{ ExpandedForm.text('title') }}
+                    {{ ExpandedForm.select('rule_group_id', ruleGroups) }}
                     {{ ExpandedForm.select('trigger',allJournalTriggers(), primaryTrigger) }}
                     {{ ExpandedForm.checkbox('active',1,rule.active, {helpText: trans('firefly.rule_help_active')}) }}
                     {{ ExpandedForm.checkbox('stop_processing',1,rule.stop_processing, {helpText: trans('firefly.rule_help_stop_processing')}) }}

From 2dff8aec69bebe01c23cd145d590086d214f6699 Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Fri, 8 Sep 2017 20:24:11 +0200
Subject: [PATCH 650/668] Code for #819

---
 app/Import/Converter/Amount.php           | 25 ++++++++++++++++-------
 app/Import/FileProcessor/CsvProcessor.php | 12 +++++++----
 2 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/app/Import/Converter/Amount.php b/app/Import/Converter/Amount.php
index 160c8c05e6..1177b86a2e 100644
--- a/app/Import/Converter/Amount.php
+++ b/app/Import/Converter/Amount.php
@@ -13,6 +13,8 @@ declare(strict_types=1);
 
 namespace FireflyIII\Import\Converter;
 
+use Log;
+
 /**
  * Class RabobankDebetCredit
  *
@@ -34,31 +36,40 @@ class Amount implements ConverterInterface
      */
     public function convert($value): string
     {
+        Log::debug(sprintf('Start with amount "%s"', $value));
         $len             = strlen($value);
         $decimalPosition = $len - 3;
         $decimal         = null;
 
         if (($len > 2 && $value{$decimalPosition} === '.') || ($len > 2 && strpos($value, '.') > $decimalPosition)) {
             $decimal = '.';
+            Log::debug(sprintf('Decimal character in "%s" seems to be a dot.', $value));
         }
         if ($len > 2 && $value{$decimalPosition} === ',') {
             $decimal = ',';
+            Log::debug(sprintf('Decimal character in "%s" seems to be a comma.', $value));
         }
 
         // if decimal is dot, replace all comma's and spaces with nothing. then parse as float (round to 4 pos)
         if ($decimal === '.') {
-            $search = [',', ' '];
-            $value  = str_replace($search, '', $value);
+            $search   = [',', ' '];
+            $oldValue = $value;
+            $value    = str_replace($search, '', $value);
+            Log::debug(sprintf('Converted amount from "%s" to "%s".', $oldValue, $value));
         }
         if ($decimal === ',') {
-            $search = ['.', ' '];
-            $value  = str_replace($search, '', $value);
-            $value  = str_replace(',', '.', $value);
+            $search   = ['.', ' '];
+            $oldValue = $value;
+            $value    = str_replace($search, '', $value);
+            $value    = str_replace(',', '.', $value);
+            Log::debug(sprintf('Converted amount from "%s" to "%s".', $oldValue, $value));
         }
         if (is_null($decimal)) {
             // replace all:
-            $search = ['.', ' ', ','];
-            $value  = str_replace($search, '', $value);
+            $search   = ['.', ' ', ','];
+            $oldValue = $value;
+            $value    = str_replace($search, '', $value);
+            Log::debug(sprintf('No decimal character found. Converted amount from "%s" to "%s".', $oldValue, $value));
         }
 
         return strval(round(floatval($value), 12));
diff --git a/app/Import/FileProcessor/CsvProcessor.php b/app/Import/FileProcessor/CsvProcessor.php
index e81ec8a87a..d671a65d63 100644
--- a/app/Import/FileProcessor/CsvProcessor.php
+++ b/app/Import/FileProcessor/CsvProcessor.php
@@ -151,10 +151,14 @@ class CsvProcessor implements FileProcessorInterface
      */
     private function getImportArray(): Iterator
     {
-        $content = $this->job->uploadFileContents();
-        $config  = $this->job->configuration;
-        $reader  = Reader::createFromString($content);
-        $reader->setDelimiter($config['delimiter']);
+        $content   = $this->job->uploadFileContents();
+        $config    = $this->job->configuration;
+        $reader    = Reader::createFromString($content);
+        $delimiter = $config['delimiter'];
+        if ($delimiter === 'tab') {
+            $delimiter = "\t";
+        }
+        $reader->setDelimiter($delimiter);
         $start   = $config['has-headers'] ? 1 : 0;
         $results = $reader->setOffset($start)->fetch();
         Log::debug(sprintf('Created a CSV reader starting at offset %d', $start));

From f704ade86b0c19094aac268d0b5337fca1926e7f Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Fri, 8 Sep 2017 20:37:46 +0200
Subject: [PATCH 651/668] Fix #818

---
 resources/lang/en_US/firefly.php            |  1 +
 resources/views/piggy-banks/add-mobile.twig | 32 ++++++++++++---------
 resources/views/piggy-banks/add.twig        | 31 +++++++++++++-------
 3 files changed, 39 insertions(+), 25 deletions(-)

diff --git a/resources/lang/en_US/firefly.php b/resources/lang/en_US/firefly.php
index 74211f65b9..843d2aef10 100644
--- a/resources/lang/en_US/firefly.php
+++ b/resources/lang/en_US/firefly.php
@@ -827,6 +827,7 @@ return [
     'add_money_to_piggy_title'                   => 'Add money to piggy bank ":name"',
     'remove_money_from_piggy_title'              => 'Remove money from piggy bank ":name"',
     'add'                                        => 'Add',
+    'no_money_for_piggy'                         => 'You have no money to put in this piggy bank.',
 
     'remove'                    => 'Remove',
     'max_amount_add'            => 'The maximum amount you can add is',
diff --git a/resources/views/piggy-banks/add-mobile.twig b/resources/views/piggy-banks/add-mobile.twig
index 1212641bf4..61e6a0d8d6 100644
--- a/resources/views/piggy-banks/add-mobile.twig
+++ b/resources/views/piggy-banks/add-mobile.twig
@@ -14,21 +14,25 @@
                         <h3 class="box-title">{{ trans('firefly.add_money_to_piggy', {name: piggyBank.name}) }}</h3>
                     </div>
                     <div class="box-body">
+                        {% if maxAmount > 0 %}
+                            <p>
+                                {{ 'max_amount_add'|_ }}: {{ maxAmount|formatAmount }}.
+                            </p>
 
-                        <p>
-                            {{ 'max_amount_add'|_ }}: {{ maxAmount|formatAmount }}.
-                        </p>
-
-                        <div class="input-group">
-                            <div class="input-group-addon">{{ getCurrencySymbol()|raw }}</div>
-                            <input step="any" class="form-control" id="amount" autocomplete="off" name="amount" max="{{ maxAmount|round(2) }}" type="number"/>
-                        </div>
-                        <p>
-                            &nbsp;
-                        </p>
-                        <button type="submit" class="btn btn-success pull-right">
-                            {{ 'add'|_ }}
-                        </button>
+                            <div class="input-group">
+                                <div class="input-group-addon">{{ getCurrencySymbol()|raw }}</div>
+                                <input step="any" class="form-control" id="amount" autocomplete="off" name="amount" max="{{ maxAmount|round(2) }}"
+                                       type="number"/>
+                            </div>
+                            <p>
+                                &nbsp;
+                            </p>
+                            <button type="submit" class="btn btn-success pull-right">
+                                {{ 'add'|_ }}
+                            </button>
+                        {% else %}
+                            <p class="text-danger">{{ 'no_money_for_piggy'|_ }}</p>
+                        {% endif %}
 
 
                     </div>
diff --git a/resources/views/piggy-banks/add.twig b/resources/views/piggy-banks/add.twig
index ccc37f9d00..78af5e46cc 100644
--- a/resources/views/piggy-banks/add.twig
+++ b/resources/views/piggy-banks/add.twig
@@ -5,24 +5,33 @@
             </button>
             <h4 class="modal-title">{{ trans('firefly.add_money_to_piggy_title', {name: piggyBank.name}) }}</h4>
         </div>
-        <form style="display: inline;" id="add" action="{{ route('piggy-banks.add', piggyBank.id) }}" method="POST">
-            <div class="modal-body">
-                <input type="hidden" name="_token" value="{{ csrf_token() }}"/>
+        {% if maxAmount > 0 %}
+            <form style="display: inline;" id="add" action="{{ route('piggy-banks.add', piggyBank.id) }}" method="POST">
+                <div class="modal-body">
+                    <input type="hidden" name="_token" value="{{ csrf_token() }}"/>
 
-                <p>
-                    {{ 'max_amount_add'|_ }}: {{ maxAmount|formatAmount }}.
-                </p>
+                    <p>
+                        {{ 'max_amount_add'|_ }}: {{ maxAmount|formatAmount }}.
+                    </p>
 
-                <div class="input-group">
-                    <div class="input-group-addon">{{ getCurrencySymbol()|raw }}</div>
-                    <input step="any" class="form-control" id="amount" autocomplete="off" name="amount" max="{{ maxAmount|round(2) }}" type="number"/>
+                    <div class="input-group">
+                        <div class="input-group-addon">{{ getCurrencySymbol()|raw }}</div>
+                        <input step="any" class="form-control" id="amount" autocomplete="off" name="amount" max="{{ maxAmount|round(2) }}" type="number"/>
+                    </div>
                 </div>
+                <div class="modal-footer">
+                    <button type="button" class="btn btn-default" data-dismiss="modal">{{ 'close'|_ }}</button>
+                    <button type="submit" class="btn btn-primary">{{ 'add'|_ }}</button>
+                </div>
+            </form>
+        {% else %}
+            <div class="modal-body">
+                <p class="text-danger">{{ 'no_money_for_piggy'|_ }}</p>
             </div>
             <div class="modal-footer">
                 <button type="button" class="btn btn-default" data-dismiss="modal">{{ 'close'|_ }}</button>
-                <button type="submit" class="btn btn-primary">{{ 'add'|_ }}</button>
             </div>
-        </form>
+        {% endif %}
     </div>
 </div>
 

From 1af68843b01bf90dcec30f6541bd0e0fafa3c34b Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Fri, 8 Sep 2017 20:40:33 +0200
Subject: [PATCH 652/668] New translations firefly.php (Russian)

---
 resources/lang/ru_RU/firefly.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/resources/lang/ru_RU/firefly.php b/resources/lang/ru_RU/firefly.php
index 7930c06ba2..0deba64ef5 100644
--- a/resources/lang/ru_RU/firefly.php
+++ b/resources/lang/ru_RU/firefly.php
@@ -827,6 +827,7 @@ return [
     'add_money_to_piggy_title'                   => 'Add money to piggy bank ":name"',
     'remove_money_from_piggy_title'              => 'Remove money from piggy bank ":name"',
     'add'                                        => 'Add',
+    'no_money_for_piggy'                         => 'You have no money to put in this piggy bank.',
 
     'remove'                    => 'Remove',
     'max_amount_add'            => 'The maximum amount you can add is',

From 88bc81b9f58c497e5d24e318f897f653028f4d16 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Fri, 8 Sep 2017 20:40:51 +0200
Subject: [PATCH 653/668] New translations firefly.php (German)

---
 resources/lang/de_DE/firefly.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/resources/lang/de_DE/firefly.php b/resources/lang/de_DE/firefly.php
index cd0d5f1d31..25a9468efb 100644
--- a/resources/lang/de_DE/firefly.php
+++ b/resources/lang/de_DE/firefly.php
@@ -828,6 +828,7 @@ Sollen zusätzlich Ihre Girokonten angezeigt werden?',
     'add_money_to_piggy_title'                   => 'Geld dem Sparschwein ":name" hinzufügen',
     'remove_money_from_piggy_title'              => 'Geld dem Sparschwein ":name" entnehmen',
     'add'                                        => 'Hinzufügen',
+    'no_money_for_piggy'                         => 'You have no money to put in this piggy bank.',
 
     'remove'                    => 'Entfernen',
     'max_amount_add'            => 'Der maximale Betrag, den Sie hinzufügen können ist',

From a118588fe71f225f6aa6582857dc6bb20e92462d Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Fri, 8 Sep 2017 20:40:55 +0200
Subject: [PATCH 654/668] New translations firefly.php (Polish)

---
 resources/lang/pl_PL/firefly.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/resources/lang/pl_PL/firefly.php b/resources/lang/pl_PL/firefly.php
index 72ac536a05..96657e49fd 100644
--- a/resources/lang/pl_PL/firefly.php
+++ b/resources/lang/pl_PL/firefly.php
@@ -827,6 +827,7 @@ return [
     'add_money_to_piggy_title'                   => 'Dodaj pieniądze do skarbonki ":name"',
     'remove_money_from_piggy_title'              => 'Usuń pieniądze ze skarbonki ":name"',
     'add'                                        => 'Dodaj',
+    'no_money_for_piggy'                         => 'You have no money to put in this piggy bank.',
 
     'remove'                    => 'Usuń',
     'max_amount_add'            => 'Maksymalną kwotą, którą możesz dodać jest',

From 7bdde6822bd8db898b56605a62b4424b57b2b96e Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Fri, 8 Sep 2017 20:40:59 +0200
Subject: [PATCH 655/668] New translations firefly.php (French)

---
 resources/lang/fr_FR/firefly.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/resources/lang/fr_FR/firefly.php b/resources/lang/fr_FR/firefly.php
index 5c45519929..3add5d33fb 100644
--- a/resources/lang/fr_FR/firefly.php
+++ b/resources/lang/fr_FR/firefly.php
@@ -827,6 +827,7 @@ return [
     'add_money_to_piggy_title'                   => 'Ajouter de l’argent à la tirelire ":name"',
     'remove_money_from_piggy_title'              => 'Retirer l’argent de la tirelire ":name"',
     'add'                                        => 'Ajouter',
+    'no_money_for_piggy'                         => 'You have no money to put in this piggy bank.',
 
     'remove'                    => 'Enlever',
     'max_amount_add'            => 'Le montant maximum que vous pouvez ajouter est',

From 4a18178a86e263146c565ebc527138a56e08b012 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Fri, 8 Sep 2017 20:41:03 +0200
Subject: [PATCH 656/668] New translations firefly.php (Dutch)

---
 resources/lang/nl_NL/firefly.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/resources/lang/nl_NL/firefly.php b/resources/lang/nl_NL/firefly.php
index c3b87b34a1..12435de778 100644
--- a/resources/lang/nl_NL/firefly.php
+++ b/resources/lang/nl_NL/firefly.php
@@ -827,6 +827,7 @@ return [
     'add_money_to_piggy_title'                   => 'Stop geld in spaarpotje ":name"',
     'remove_money_from_piggy_title'              => 'Haal geld uit spaarpotje ":name"',
     'add'                                        => 'Toevoegen',
+    'no_money_for_piggy'                         => 'You have no money to put in this piggy bank.',
 
     'remove'                    => 'Verwijderen',
     'max_amount_add'            => 'Hooguit toe te voegen',

From 94b18798ed08a941d716287a17dcb7203cde9c30 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Fri, 8 Sep 2017 20:41:07 +0200
Subject: [PATCH 657/668] New translations firefly.php (Portuguese, Brazilian)

---
 resources/lang/pt_BR/firefly.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/resources/lang/pt_BR/firefly.php b/resources/lang/pt_BR/firefly.php
index 15e7b8ff24..12bf305bd5 100644
--- a/resources/lang/pt_BR/firefly.php
+++ b/resources/lang/pt_BR/firefly.php
@@ -827,6 +827,7 @@ return [
     'add_money_to_piggy_title'                   => 'Adicionar dinheiro ao cofrinho ":name"',
     'remove_money_from_piggy_title'              => 'Retire o dinheiro do cofrinho ":name"',
     'add'                                        => 'Adicionar',
+    'no_money_for_piggy'                         => 'You have no money to put in this piggy bank.',
 
     'remove'                    => 'Remover',
     'max_amount_add'            => 'É a quantidade máxima que você pode adicionar é',

From 643248f9e4dc2905574f989ac6afbeeaa9be5865 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Fri, 8 Sep 2017 20:41:10 +0200
Subject: [PATCH 658/668] New translations firefly.php (Slovenian)

---
 resources/lang/sl_SI/firefly.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/resources/lang/sl_SI/firefly.php b/resources/lang/sl_SI/firefly.php
index fdc39bd3bb..43311d999c 100644
--- a/resources/lang/sl_SI/firefly.php
+++ b/resources/lang/sl_SI/firefly.php
@@ -827,6 +827,7 @@ return [
     'add_money_to_piggy_title'                   => 'Add money to piggy bank ":name"',
     'remove_money_from_piggy_title'              => 'Remove money from piggy bank ":name"',
     'add'                                        => 'Add',
+    'no_money_for_piggy'                         => 'You have no money to put in this piggy bank.',
 
     'remove'                    => 'Remove',
     'max_amount_add'            => 'The maximum amount you can add is',

From 45d2467772ff893bfe590615aae6bd2db5349f3c Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Fri, 8 Sep 2017 20:41:15 +0200
Subject: [PATCH 659/668] New translations firefly.php (Spanish)

---
 resources/lang/es_ES/firefly.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/resources/lang/es_ES/firefly.php b/resources/lang/es_ES/firefly.php
index 3237ff791d..280b2a9c4a 100644
--- a/resources/lang/es_ES/firefly.php
+++ b/resources/lang/es_ES/firefly.php
@@ -827,6 +827,7 @@ return [
     'add_money_to_piggy_title'                   => 'Add money to piggy bank ":name"',
     'remove_money_from_piggy_title'              => 'Remove money from piggy bank ":name"',
     'add'                                        => 'Add',
+    'no_money_for_piggy'                         => 'You have no money to put in this piggy bank.',
 
     'remove'                    => 'Remove',
     'max_amount_add'            => 'The maximum amount you can add is',

From 6d592d45b093b55187f5573fc4c39f11402ee9c4 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Fri, 8 Sep 2017 21:20:14 +0200
Subject: [PATCH 660/668] New translations firefly.php (Polish)

---
 resources/lang/pl_PL/firefly.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/pl_PL/firefly.php b/resources/lang/pl_PL/firefly.php
index 96657e49fd..432e2ab1ec 100644
--- a/resources/lang/pl_PL/firefly.php
+++ b/resources/lang/pl_PL/firefly.php
@@ -827,7 +827,7 @@ return [
     'add_money_to_piggy_title'                   => 'Dodaj pieniądze do skarbonki ":name"',
     'remove_money_from_piggy_title'              => 'Usuń pieniądze ze skarbonki ":name"',
     'add'                                        => 'Dodaj',
-    'no_money_for_piggy'                         => 'You have no money to put in this piggy bank.',
+    'no_money_for_piggy'                         => 'Nie masz pieniędzy, które mógłbyś umieścić w tej skarbonce.',
 
     'remove'                    => 'Usuń',
     'max_amount_add'            => 'Maksymalną kwotą, którą możesz dodać jest',

From 336fb5f5a6de96d1007bc07680498c7b2d1080c4 Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Sat, 9 Sep 2017 06:25:20 +0200
Subject: [PATCH 661/668] Fix #820

---
 .../Transaction/SplitController.php           | 51 +++++++++++++++----
 app/Http/Requests/JournalFormRequest.php      |  2 +-
 app/Http/Requests/SplitJournalFormRequest.php | 34 ++++++-------
 resources/views/transactions/split/edit.twig  |  1 +
 4 files changed, 61 insertions(+), 27 deletions(-)

diff --git a/app/Http/Controllers/Transaction/SplitController.php b/app/Http/Controllers/Transaction/SplitController.php
index 2f0b407cc9..a3ea3b0efc 100644
--- a/app/Http/Controllers/Transaction/SplitController.php
+++ b/app/Http/Controllers/Transaction/SplitController.php
@@ -18,6 +18,7 @@ use ExpandedForm;
 use FireflyIII\Events\UpdatedTransactionJournal;
 use FireflyIII\Helpers\Attachments\AttachmentHelperInterface;
 use FireflyIII\Http\Controllers\Controller;
+use FireflyIII\Http\Requests\SplitJournalFormRequest;
 use FireflyIII\Models\Account;
 use FireflyIII\Models\AccountType;
 use FireflyIII\Models\TransactionJournal;
@@ -126,25 +127,24 @@ class SplitController extends Controller
             compact(
                 'subTitleIcon', 'currencies', 'optionalFields',
                 'preFilled', 'subTitle', 'uploadSize', 'assetAccounts',
-                'budgets', 'journal', 'accountArray'
+                'budgets', 'journal', 'accountArray', 'previous'
             )
         );
     }
 
 
     /**
-     * @param Request                    $request
+     * @param SplitJournalFormRequest    $request
      * @param JournalRepositoryInterface $repository
      * @param TransactionJournal         $journal
      *
      * @return $this|\Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
      */
-    public function update(Request $request, JournalRepositoryInterface $repository, TransactionJournal $journal)
+    public function update(SplitJournalFormRequest $request, JournalRepositoryInterface $repository, TransactionJournal $journal)
     {
         if ($this->isOpeningBalance($journal)) {
             return $this->redirectToAccount($journal);
         }
-
         $data    = $this->arrayFromInput($request);
         $journal = $repository->updateSplitJournal($journal, $data);
         /** @var array $files */
@@ -178,11 +178,11 @@ class SplitController extends Controller
     }
 
     /**
-     * @param Request $request
+     * @param SplitJournalFormRequest $request
      *
      * @return array
      */
-    private function arrayFromInput(Request $request): array
+    private function arrayFromInput(SplitJournalFormRequest $request): array
     {
         $array = [
             'journal_description'            => $request->get('journal_description'),
@@ -211,8 +211,8 @@ class SplitController extends Controller
     }
 
     /**
-     * @param Request            $request
-     * @param TransactionJournal $journal
+     * @param SplitJournalFormRequest $request
+     * @param TransactionJournal      $journal
      *
      * @return array
      */
@@ -245,6 +245,8 @@ class SplitController extends Controller
             // transactions.
             'transactions'                   => $this->getTransactionDataFromJournal($journal),
         ];
+        // update transactions array with old request data.
+        $array['transactions'] = $this->updateWithPrevious($array['transactions'], $request->old());
 
         return $array;
     }
@@ -297,7 +299,7 @@ class SplitController extends Controller
      *
      * @return array
      */
-    private function getTransactionDataFromRequest(Request $request): array
+    private function getTransactionDataFromRequest(SplitJournalFormRequest $request): array
     {
         $return       = [];
         $transactions = $request->get('transactions');
@@ -323,5 +325,36 @@ class SplitController extends Controller
         return $return;
     }
 
+    /**
+     * @param $array
+     * @param $old
+     *
+     * @return array
+     */
+    private function updateWithPrevious($array, $old): array
+    {
+        if (count($old) === 0 || !isset($old['transactions'])) {
+            return $array;
+        }
+        $old = $old['transactions'];
+        foreach ($old as $index => $row) {
+            if (isset($array[$index])) {
+                $array[$index] = array_merge($array[$index], $row);
+                continue;
+            }
+            // take some info from first transaction, that should at least exist.
+            $array[$index]                                = $row;
+            $array[$index]['transaction_currency_id']     = $array[0]['transaction_currency_id'];
+            $array[$index]['transaction_currency_code']   = $array[0]['transaction_currency_code'];
+            $array[$index]['transaction_currency_symbol'] = $array[0]['transaction_currency_symbol'];
+            $array[$index]['foreign_amount']              = round($array[0]['foreign_destination_amount'] ?? '0', 12);
+            $array[$index]['foreign_currency_id']         = $array[0]['foreign_currency_id'];
+            $array[$index]['foreign_currency_code']       = $array[0]['foreign_currency_code'];
+            $array[$index]['foreign_currency_symbol']     = $array[0]['foreign_currency_symbol'];
+        }
+
+        return $array;
+    }
+
 
 }
diff --git a/app/Http/Requests/JournalFormRequest.php b/app/Http/Requests/JournalFormRequest.php
index 12d35d8617..f38acfbc4d 100644
--- a/app/Http/Requests/JournalFormRequest.php
+++ b/app/Http/Requests/JournalFormRequest.php
@@ -110,7 +110,7 @@ class JournalFormRequest extends Request
             // foreign currency amounts
             'native_amount'            => 'numeric|more:0',
             'source_amount'            => 'numeric|more:0',
-            'destination_amount'       => 'numeric|more:0',
+            'destination_amount'       => 'numeric',
         ];
 
         // some rules get an upgrade depending on the type of data:
diff --git a/app/Http/Requests/SplitJournalFormRequest.php b/app/Http/Requests/SplitJournalFormRequest.php
index 2c1fab0dac..1a2f0defa3 100644
--- a/app/Http/Requests/SplitJournalFormRequest.php
+++ b/app/Http/Requests/SplitJournalFormRequest.php
@@ -61,23 +61,23 @@ class SplitJournalFormRequest extends Request
     public function rules(): array
     {
         return [
-            'what'                          => 'required|in:withdrawal,deposit,transfer',
-            'journal_description'           => 'required|between:1,255',
-            'id'                            => 'numeric|belongsToUser:transaction_journals,id',
-            'journal_source_account_id'     => 'numeric|belongsToUser:accounts,id',
-            'journal_source_account_name.*' => 'between:1,255',
-            'journal_currency_id'           => 'required|exists:transaction_currencies,id',
-            'date'                          => 'required|date',
-            'interest_date'                 => 'date',
-            'book_date'                     => 'date',
-            'process_date'                  => 'date',
-            'description.*'                 => 'required|between:1,255',
-            'destination_account_id.*'      => 'numeric|belongsToUser:accounts,id',
-            'destination_account_name.*'    => 'between:1,255',
-            'amount.*'                      => 'required|numeric',
-            'budget_id.*'                   => 'belongsToUser:budgets,id',
-            'category.*'                    => 'between:1,255',
-            'piggy_bank_id.*'               => 'between:1,255',
+            'what'                                    => 'required|in:withdrawal,deposit,transfer',
+            'journal_description'                     => 'required|between:1,255',
+            'id'                                      => 'numeric|belongsToUser:transaction_journals,id',
+            'journal_source_account_id'               => 'numeric|belongsToUser:accounts,id',
+            'journal_source_account_name.*'           => 'between:1,255',
+            'journal_currency_id'                     => 'required|exists:transaction_currencies,id',
+            'date'                                    => 'required|date',
+            'interest_date'                           => 'date',
+            'book_date'                               => 'date',
+            'process_date'                            => 'date',
+            'transactions.*.description'              => 'required|between:1,255',
+            'transactions.*.destination_account_id'   => 'numeric|belongsToUser:accounts,id',
+            'transactions.*.destination_account_name' => 'between:1,255',
+            'transactions.*.amount'                   => 'required|numeric',
+            'transactions.*.budget_id'                => 'belongsToUser:budgets,id',
+            'transactions.*.category'                 => 'between:1,255',
+            'transactions.*.piggy_bank_id'            => 'between:1,255',
         ];
     }
 
diff --git a/resources/views/transactions/split/edit.twig b/resources/views/transactions/split/edit.twig
index 095202f46c..ddbbdd6c4a 100644
--- a/resources/views/transactions/split/edit.twig
+++ b/resources/views/transactions/split/edit.twig
@@ -10,6 +10,7 @@
         <input name="_token" type="hidden" value="{{ csrf_token() }}">
         <input type="hidden" name="id" value="{{ journal.id }}"/>
         <input type="hidden" name="what" value="{{ preFilled.what }}"/>
+        <input type="hidden" name="journal_currency_id" value="{{ journal.transaction_currency_id }}"/>
 
         {% if errors.all()|length > 0 %}
             <div class="row">

From 0543733e3d510a3a436d19cd250439b32d91289b Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Sat, 9 Sep 2017 06:28:21 +0200
Subject: [PATCH 662/668] Various code cleanup.

---
 app/Export/Entry/Entry.php                     | 4 ++--
 app/Http/Controllers/Import/BankController.php | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/Export/Entry/Entry.php b/app/Export/Entry/Entry.php
index b652d9ad66..bc8c52dd33 100644
--- a/app/Export/Entry/Entry.php
+++ b/app/Export/Entry/Entry.php
@@ -138,9 +138,9 @@ final class Entry
         $entry->foreign_currency_code = is_null($transaction->foreign_currency_id) ? null : $transaction->foreignCurrency->code;
         $entry->foreign_amount        = is_null($transaction->foreign_currency_id)
             ? null
-            : round(
+            : strval(round(
                 $transaction->transaction_foreign_amount, $transaction->foreignCurrency->decimal_places
-            );
+            ));
 
         $entry->transaction_type     = $transaction->transaction_type_type;
         $entry->asset_account_id     = $transaction->account_id;
diff --git a/app/Http/Controllers/Import/BankController.php b/app/Http/Controllers/Import/BankController.php
index 1e853620b5..6e46db2f78 100644
--- a/app/Http/Controllers/Import/BankController.php
+++ b/app/Http/Controllers/Import/BankController.php
@@ -55,7 +55,7 @@ class BankController extends Controller
      * @param Request $request
      * @param string  $bank
      *
-     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
+     * @return \Illuminate\Http\RedirectResponse|null
      */
     public function postForm(Request $request, string $bank)
     {

From c81955d84ade6f5cdf23ca0a83275ab4eba34b99 Mon Sep 17 00:00:00 2001
From: James Cole <JC5@users.noreply.github.com>
Date: Sat, 9 Sep 2017 06:30:07 +0200
Subject: [PATCH 663/668] New translations firefly.php (Dutch)

---
 resources/lang/nl_NL/firefly.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/nl_NL/firefly.php b/resources/lang/nl_NL/firefly.php
index 12435de778..40ad56db52 100644
--- a/resources/lang/nl_NL/firefly.php
+++ b/resources/lang/nl_NL/firefly.php
@@ -827,7 +827,7 @@ return [
     'add_money_to_piggy_title'                   => 'Stop geld in spaarpotje ":name"',
     'remove_money_from_piggy_title'              => 'Haal geld uit spaarpotje ":name"',
     'add'                                        => 'Toevoegen',
-    'no_money_for_piggy'                         => 'You have no money to put in this piggy bank.',
+    'no_money_for_piggy'                         => 'Er is geen geld voor dit spaarpotje.',
 
     'remove'                    => 'Verwijderen',
     'max_amount_add'            => 'Hooguit toe te voegen',

From 3a3eb4e84f0e746518f041771fdb902984d23039 Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Sat, 9 Sep 2017 06:41:45 +0200
Subject: [PATCH 664/668] Various code cleanup.

---
 app/Console/Commands/UpgradeDatabase.php      |  9 --
 app/Console/Commands/VerifyDatabase.php       |  1 +
 app/Export/Entry/Entry.php                    |  8 +-
 app/Helpers/Collector/JournalCollector.php    |  1 -
 app/Helpers/Report/BalanceReportHelper.php    |  8 +-
 app/Http/Controllers/Admin/LinkController.php |  8 +-
 app/Http/Controllers/ExportController.php     |  1 -
 .../Controllers/Import/BankController.php     |  8 +-
 .../Json/AutoCompleteController.php           |  2 +
 app/Http/Controllers/RuleController.php       |  8 +-
 .../Transaction/LinkController.php            | 10 +-
 .../Transaction/SingleController.php          |  8 +-
 .../Transaction/SplitController.php           |  6 +-
 .../Controllers/TransactionController.php     |  8 +-
 app/Http/Requests/ExportFormRequest.php       | 16 ++--
 app/Http/Requests/Request.php                 | 94 +++++++++----------
 app/Mail/RegisteredUser.php                   |  1 -
 app/Mail/RequestedNewPassword.php             |  1 -
 app/Models/PiggyBank.php                      |  1 +
 app/Models/TransactionJournal.php             | 15 +--
 .../LinkType/LinkTypeRepositoryInterface.php  | 28 +++---
 app/Repositories/Tag/TagRepository.php        | 63 +++++++------
 .../Tag/TagRepositoryInterface.php            | 10 +-
 app/Rules/Processor.php                       |  2 +-
 .../Bunq/Object/NotificationFilter.php        |  2 -
 app/Services/Bunq/Object/UserPerson.php       |  5 -
 .../Request/DeleteDeviceSessionRequest.php    |  2 +-
 .../Bunq/Request/ListDeviceServerRequest.php  | 17 ++--
 .../Request/ListMonetaryAccountRequest.php    | 16 ++--
 .../Import/Information/BunqInformation.php    |  1 -
 .../Information/InformationInterface.php      | 15 ++-
 .../Prerequisites/PrerequisitesInterface.php  | 14 +--
 app/Support/Search/Search.php                 |  2 +-
 app/Support/Twig/AmountFormat.php             | 15 +--
 app/Support/Twig/Translation.php              | 20 ++--
 .../Controllers/JsonControllerTest.php        |  2 -
 .../Feature/Controllers/TagControllerTest.php |  1 -
 .../Controllers/TransactionControllerTest.php |  1 -
 38 files changed, 212 insertions(+), 218 deletions(-)

diff --git a/app/Console/Commands/UpgradeDatabase.php b/app/Console/Commands/UpgradeDatabase.php
index bcc8e2e43f..7294a247e3 100644
--- a/app/Console/Commands/UpgradeDatabase.php
+++ b/app/Console/Commands/UpgradeDatabase.php
@@ -269,15 +269,6 @@ class UpgradeDatabase extends Command
                         $this->updateJournalCurrency($transaction);
                     }
                 );
-
-
-                //                /** @var Collection $transactions */
-                //                $transactions = $transfer->transactions()->where('amount', '>', 0)->get();
-                //                $transactions->each(
-                //                    function (Transaction $transaction) {
-                //                        $this->updateTransactionCurrency($transaction);
-                //                    }
-                //                );
             }
         );
     }
diff --git a/app/Console/Commands/VerifyDatabase.php b/app/Console/Commands/VerifyDatabase.php
index 4dd0848501..4f1ab1938f 100644
--- a/app/Console/Commands/VerifyDatabase.php
+++ b/app/Console/Commands/VerifyDatabase.php
@@ -292,6 +292,7 @@ class VerifyDatabase extends Command
 
     /**
      * Report on things with no linked journals.
+     *
      * @param string $name
      */
     private function reportObject(string $name)
diff --git a/app/Export/Entry/Entry.php b/app/Export/Entry/Entry.php
index bc8c52dd33..8aff206d47 100644
--- a/app/Export/Entry/Entry.php
+++ b/app/Export/Entry/Entry.php
@@ -138,9 +138,11 @@ final class Entry
         $entry->foreign_currency_code = is_null($transaction->foreign_currency_id) ? null : $transaction->foreignCurrency->code;
         $entry->foreign_amount        = is_null($transaction->foreign_currency_id)
             ? null
-            : strval(round(
-                $transaction->transaction_foreign_amount, $transaction->foreignCurrency->decimal_places
-            ));
+            : strval(
+                round(
+                    $transaction->transaction_foreign_amount, $transaction->foreignCurrency->decimal_places
+                )
+            );
 
         $entry->transaction_type     = $transaction->transaction_type_type;
         $entry->asset_account_id     = $transaction->account_id;
diff --git a/app/Helpers/Collector/JournalCollector.php b/app/Helpers/Collector/JournalCollector.php
index 4d7f2c3bce..939831be30 100644
--- a/app/Helpers/Collector/JournalCollector.php
+++ b/app/Helpers/Collector/JournalCollector.php
@@ -15,7 +15,6 @@ namespace FireflyIII\Helpers\Collector;
 
 
 use Carbon\Carbon;
-use Crypt;
 use DB;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Helpers\Filter\FilterInterface;
diff --git a/app/Helpers/Report/BalanceReportHelper.php b/app/Helpers/Report/BalanceReportHelper.php
index 63bb4114da..fdd7563ef5 100644
--- a/app/Helpers/Report/BalanceReportHelper.php
+++ b/app/Helpers/Report/BalanceReportHelper.php
@@ -14,16 +14,12 @@ declare(strict_types=1);
 namespace FireflyIII\Helpers\Report;
 
 use Carbon\Carbon;
-use DB;
 use FireflyIII\Helpers\Collection\Balance;
 use FireflyIII\Helpers\Collection\BalanceEntry;
 use FireflyIII\Helpers\Collection\BalanceHeader;
 use FireflyIII\Helpers\Collection\BalanceLine;
 use FireflyIII\Models\BudgetLimit;
-use FireflyIII\Models\Tag;
-use FireflyIII\Models\TransactionType;
 use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
-use Illuminate\Database\Query\JoinClause;
 use Illuminate\Support\Collection;
 use Log;
 
@@ -74,7 +70,7 @@ class BalanceReportHelper implements BalanceReportHelperInterface
             $line = $this->createBalanceLine($budgetLimit, $accounts);
             $balance->addBalanceLine($line);
         }
-        $noBudgetLine       = $this->createNoBudgetLine($accounts, $start, $end);
+        $noBudgetLine = $this->createNoBudgetLine($accounts, $start, $end);
 
         $balance->addBalanceLine($noBudgetLine);
         $balance->setBalanceHeader($header);
@@ -89,7 +85,6 @@ class BalanceReportHelper implements BalanceReportHelperInterface
     }
 
 
-
     /**
      * @param BudgetLimit $budgetLimit
      * @param Collection  $accounts
@@ -142,7 +137,6 @@ class BalanceReportHelper implements BalanceReportHelperInterface
     }
 
 
-
     /**
      * @param Balance $balance
      * @SuppressWarnings(PHPMD.CyclomaticComplexity) // it's exactly 5.
diff --git a/app/Http/Controllers/Admin/LinkController.php b/app/Http/Controllers/Admin/LinkController.php
index 569dd63121..93efc19d03 100644
--- a/app/Http/Controllers/Admin/LinkController.php
+++ b/app/Http/Controllers/Admin/LinkController.php
@@ -62,7 +62,9 @@ class LinkController extends Controller
     }
 
     /**
-     * @param LinkType $linkType
+     * @param Request                     $request
+     * @param LinkTypeRepositoryInterface $repository
+     * @param LinkType                    $linkType
      *
      * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector|View
      */
@@ -136,6 +138,8 @@ class LinkController extends Controller
     }
 
     /**
+     * @param LinkTypeRepositoryInterface $repository
+     *
      * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
      */
     public function index(LinkTypeRepositoryInterface $repository)
@@ -153,6 +157,8 @@ class LinkController extends Controller
     }
 
     /**
+     * @param LinkType $linkType
+     *
      * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
      */
     public function show(LinkType $linkType)
diff --git a/app/Http/Controllers/ExportController.php b/app/Http/Controllers/ExportController.php
index 0afaba639f..5cdd3bed06 100644
--- a/app/Http/Controllers/ExportController.php
+++ b/app/Http/Controllers/ExportController.php
@@ -17,7 +17,6 @@ namespace FireflyIII\Http\Controllers;
 use Carbon\Carbon;
 use ExpandedForm;
 use FireflyIII\Exceptions\FireflyException;
-use FireflyIII\Export\ExpandedProcessor;
 use FireflyIII\Export\ProcessorInterface;
 use FireflyIII\Http\Requests\ExportFormRequest;
 use FireflyIII\Models\AccountType;
diff --git a/app/Http/Controllers/Import/BankController.php b/app/Http/Controllers/Import/BankController.php
index 6e46db2f78..661da55a77 100644
--- a/app/Http/Controllers/Import/BankController.php
+++ b/app/Http/Controllers/Import/BankController.php
@@ -26,6 +26,10 @@ class BankController extends Controller
      * This method must ask the user all parameters necessary to start importing data. This may not be enough
      * to finish the import itself (ie. mapping) but it should be enough to begin: accounts to import from,
      * accounts to import into, data ranges, etc.
+     *
+     * @param string $bank
+     *
+     * @return \Illuminate\Contracts\View\Factory|\Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector|\Illuminate\View\View
      */
     public function form(string $bank)
     {
@@ -77,15 +81,11 @@ class BankController extends Controller
         $remoteAccounts = array_keys($remoteAccounts);
 
         $class = config(sprintf('firefly.import_pre.%s', $bank));
-
-        var_dump($remoteAccounts);exit;
-
         // get import file
 
         // get import config
 
 
-
     }
 
     /**
diff --git a/app/Http/Controllers/Json/AutoCompleteController.php b/app/Http/Controllers/Json/AutoCompleteController.php
index 2a270da41a..8f654d9f82 100644
--- a/app/Http/Controllers/Json/AutoCompleteController.php
+++ b/app/Http/Controllers/Json/AutoCompleteController.php
@@ -94,6 +94,8 @@ class AutoCompleteController extends Controller
     /**
      * @param JournalCollectorInterface $collector
      *
+     * @param TransactionJournal        $except
+     *
      * @return \Illuminate\Http\JsonResponse|mixed
      */
     public function journalsWithId(JournalCollectorInterface $collector, TransactionJournal $except)
diff --git a/app/Http/Controllers/RuleController.php b/app/Http/Controllers/RuleController.php
index 4f90ca2bbc..46de443874 100644
--- a/app/Http/Controllers/RuleController.php
+++ b/app/Http/Controllers/RuleController.php
@@ -194,8 +194,12 @@ class RuleController extends Controller
         Session::flash('gaEventCategory', 'rules');
         Session::flash('gaEventAction', 'edit-rule');
 
-        return view('rules.rule.edit', compact('rule', 'subTitle',
-                                               'primaryTrigger', 'oldTriggers', 'oldActions', 'triggerCount', 'actionCount','ruleGroups'));
+        return view(
+            'rules.rule.edit', compact(
+            'rule', 'subTitle',
+            'primaryTrigger', 'oldTriggers', 'oldActions', 'triggerCount', 'actionCount', 'ruleGroups'
+        )
+        );
     }
 
     /**
diff --git a/app/Http/Controllers/Transaction/LinkController.php b/app/Http/Controllers/Transaction/LinkController.php
index 4022e5fedc..98aaf10651 100644
--- a/app/Http/Controllers/Transaction/LinkController.php
+++ b/app/Http/Controllers/Transaction/LinkController.php
@@ -101,7 +101,7 @@ class LinkController extends Controller
         if ($alreadyLinked) {
             Session::flash('error', trans('firefly.journals_error_linked'));
 
-            return redirect(route('transactions.show', $journal->id));
+            return redirect(route('transactions.show', [$journal->id]));
         }
         Log::debug(sprintf('Journal is %d, opposing is %d', $journal->id, $other->id));
 
@@ -123,9 +123,15 @@ class LinkController extends Controller
         $journalLink->save();
         Session::flash('success', trans('firefly.journals_linked'));
 
-        return redirect(route('transactions.show', $journal->id));
+        return redirect(route('transactions.show', [$journal->id]));
     }
 
+    /**
+     * @param LinkTypeRepositoryInterface $repository
+     * @param TransactionJournalLink      $link
+     *
+     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
+     */
     public function switch(LinkTypeRepositoryInterface $repository, TransactionJournalLink $link)
     {
 
diff --git a/app/Http/Controllers/Transaction/SingleController.php b/app/Http/Controllers/Transaction/SingleController.php
index ddace0e615..4c40a76125 100644
--- a/app/Http/Controllers/Transaction/SingleController.php
+++ b/app/Http/Controllers/Transaction/SingleController.php
@@ -413,9 +413,9 @@ class SingleController extends Controller
     /**
      * @return array
      */
-    private function groupedActiveAccountList(): array
+    private function groupedAccountList(): array
     {
-        $accounts = $this->accounts->getActiveAccountsByType([AccountType::DEFAULT, AccountType::ASSET]);
+        $accounts = $this->accounts->getAccountsByType([AccountType::DEFAULT, AccountType::ASSET]);
         $return   = [];
         /** @var Account $account */
         foreach ($accounts as $account) {
@@ -433,9 +433,9 @@ class SingleController extends Controller
     /**
      * @return array
      */
-    private function groupedAccountList(): array
+    private function groupedActiveAccountList(): array
     {
-        $accounts = $this->accounts->getAccountsByType([AccountType::DEFAULT, AccountType::ASSET]);
+        $accounts = $this->accounts->getActiveAccountsByType([AccountType::DEFAULT, AccountType::ASSET]);
         $return   = [];
         /** @var Account $account */
         foreach ($accounts as $account) {
diff --git a/app/Http/Controllers/Transaction/SplitController.php b/app/Http/Controllers/Transaction/SplitController.php
index a3ea3b0efc..8f3783a476 100644
--- a/app/Http/Controllers/Transaction/SplitController.php
+++ b/app/Http/Controllers/Transaction/SplitController.php
@@ -211,8 +211,8 @@ class SplitController extends Controller
     }
 
     /**
-     * @param SplitJournalFormRequest $request
-     * @param TransactionJournal      $journal
+     * @param SplitJournalFormRequest|Request $request
+     * @param TransactionJournal              $journal
      *
      * @return array
      */
@@ -295,7 +295,7 @@ class SplitController extends Controller
     }
 
     /**
-     * @param Request $request
+     * @param SplitJournalFormRequest|Request $request
      *
      * @return array
      */
diff --git a/app/Http/Controllers/TransactionController.php b/app/Http/Controllers/TransactionController.php
index 7e042fbe7e..59465552e1 100644
--- a/app/Http/Controllers/TransactionController.php
+++ b/app/Http/Controllers/TransactionController.php
@@ -151,8 +151,10 @@ class TransactionController extends Controller
     }
 
     /**
-     * @param TransactionJournal     $journal
-     * @param JournalTaskerInterface $tasker
+     * @param TransactionJournal          $journal
+     * @param JournalTaskerInterface      $tasker
+     *
+     * @param LinkTypeRepositoryInterface $linkTypeRepository
      *
      * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector|View
      */
@@ -198,7 +200,7 @@ class TransactionController extends Controller
         $cache->addProperty('transaction-list-entries');
 
         if ($cache->has()) {
-            // return $cache->get(); // @codeCoverageIgnore
+            return $cache->get(); // @codeCoverageIgnore
         }
 
         Log::debug(sprintf('Going to get period expenses and incomes between %s and %s.', $start->format('Y-m-d'), $end->format('Y-m-d')));
diff --git a/app/Http/Requests/ExportFormRequest.php b/app/Http/Requests/ExportFormRequest.php
index fac7f1ee2c..7b02ec5520 100644
--- a/app/Http/Requests/ExportFormRequest.php
+++ b/app/Http/Requests/ExportFormRequest.php
@@ -43,14 +43,14 @@ class ExportFormRequest extends Request
         $formats      = join(',', array_keys(config('firefly.export_formats')));
 
         return [
-//            'export_start_range'  => 'required|date|after:' . $first,
-//            'export_end_range'    => 'required|date|before:' . $today,
-//            'accounts'            => 'required',
-//            'job'                 => 'required|belongsToUser:export_jobs,key',
-//            'accounts.*'          => 'required|exists:accounts,id|belongsToUser:accounts',
-//            'include_attachments' => 'in:0,1',
-//            'include_config'      => 'in:0,1',
-//            'exportFormat'        => 'in:' . $formats,
+            'export_start_range'  => 'required|date|after:' . $first,
+            'export_end_range'    => 'required|date|before:' . $today,
+            'accounts'            => 'required',
+            'job'                 => 'required|belongsToUser:export_jobs,key',
+            'accounts.*'          => 'required|exists:accounts,id|belongsToUser:accounts',
+            'include_attachments' => 'in:0,1',
+            'include_config'      => 'in:0,1',
+            'exportFormat'        => 'in:' . $formats,
         ];
     }
 }
diff --git a/app/Http/Requests/Request.php b/app/Http/Requests/Request.php
index 30906089c5..04fa99de73 100644
--- a/app/Http/Requests/Request.php
+++ b/app/Http/Requests/Request.php
@@ -33,53 +33,6 @@ class Request extends FormRequest
         return intval($this->input($field)) === 1;
     }
 
-    /**
-     * @param string $field
-     *
-     * @return Carbon|null
-     */
-    protected function date(string $field)
-    {
-        return $this->get($field) ? new Carbon($this->get($field)) : null;
-    }
-
-    /**
-     * @param string $field
-     *
-     * @return float
-     */
-    protected function float(string $field): float
-    {
-        return round($this->input($field), 12);
-    }
-
-    /**
-     * @param string $field
-     * @param string $type
-     *
-     * @return array
-     */
-    protected function getArray(string $field, string $type): array
-    {
-        $original = $this->get($field);
-        $return   = [];
-        foreach ($original as $index => $value) {
-            $return[$index] = $this->$type($value);
-        }
-
-        return $return;
-    }
-
-    /**
-     * @param string $field
-     *
-     * @return int
-     */
-    protected function integer(string $field): int
-    {
-        return intval($this->get($field));
-    }
-
     /**
      * @param string $field
      *
@@ -140,4 +93,51 @@ class Request extends FormRequest
 
         return trim($string);
     }
+
+    /**
+     * @param string $field
+     *
+     * @return Carbon|null
+     */
+    protected function date(string $field)
+    {
+        return $this->get($field) ? new Carbon($this->get($field)) : null;
+    }
+
+    /**
+     * @param string $field
+     *
+     * @return float
+     */
+    protected function float(string $field): float
+    {
+        return round($this->input($field), 12);
+    }
+
+    /**
+     * @param string $field
+     * @param string $type
+     *
+     * @return array
+     */
+    protected function getArray(string $field, string $type): array
+    {
+        $original = $this->get($field);
+        $return   = [];
+        foreach ($original as $index => $value) {
+            $return[$index] = $this->$type($value);
+        }
+
+        return $return;
+    }
+
+    /**
+     * @param string $field
+     *
+     * @return int
+     */
+    protected function integer(string $field): int
+    {
+        return intval($this->get($field));
+    }
 }
diff --git a/app/Mail/RegisteredUser.php b/app/Mail/RegisteredUser.php
index 3f820ed719..bb1468035a 100644
--- a/app/Mail/RegisteredUser.php
+++ b/app/Mail/RegisteredUser.php
@@ -12,7 +12,6 @@
 declare(strict_types=1);
 
 
-
 /**
  * RegisteredUser.php
  * Copyright (c) 2017 thegrumpydictator@gmail.com
diff --git a/app/Mail/RequestedNewPassword.php b/app/Mail/RequestedNewPassword.php
index 58b0a42f05..e638c04de2 100644
--- a/app/Mail/RequestedNewPassword.php
+++ b/app/Mail/RequestedNewPassword.php
@@ -12,7 +12,6 @@
 declare(strict_types=1);
 
 
-
 /**
  * RequestedNewPassword.php
  * Copyright (c) 2017 thegrumpydictator@gmail.com
diff --git a/app/Models/PiggyBank.php b/app/Models/PiggyBank.php
index 2c8d67539c..19bf7de6b2 100644
--- a/app/Models/PiggyBank.php
+++ b/app/Models/PiggyBank.php
@@ -84,6 +84,7 @@ class PiggyBank extends Model
             return $this->currentRep;
         }
         // repeating piggy banks are no longer supported.
+        /** @var PiggyBankRepetition $rep */
         $rep = $this->piggyBankRepetitions()->first(['piggy_bank_repetitions.*']);
         if (is_null($rep)) {
             return new PiggyBankRepetition();
diff --git a/app/Models/TransactionJournal.php b/app/Models/TransactionJournal.php
index d0f1e4ab8e..275ae35af2 100644
--- a/app/Models/TransactionJournal.php
+++ b/app/Models/TransactionJournal.php
@@ -140,6 +140,14 @@ class TransactionJournal extends Model
         return true;
     }
 
+    /**
+     * @return HasMany
+     */
+    public function destinationJournalLinks(): HasMany
+    {
+        return $this->hasMany(TransactionJournalLink::class, 'destination_id');
+    }
+
     /**
      *
      * @param $value
@@ -379,13 +387,6 @@ class TransactionJournal extends Model
     {
         return $this->hasMany(TransactionJournalLink::class, 'source_id');
     }
-    /**
-     * @return HasMany
-     */
-    public function destinationJournalLinks(): HasMany
-    {
-        return $this->hasMany(TransactionJournalLink::class, 'destination_id');
-    }
 
     /**
      * @return \Illuminate\Database\Eloquent\Relations\BelongsToMany
diff --git a/app/Repositories/LinkType/LinkTypeRepositoryInterface.php b/app/Repositories/LinkType/LinkTypeRepositoryInterface.php
index 32042514e6..a67fe34805 100644
--- a/app/Repositories/LinkType/LinkTypeRepositoryInterface.php
+++ b/app/Repositories/LinkType/LinkTypeRepositoryInterface.php
@@ -39,6 +39,13 @@ interface LinkTypeRepositoryInterface
      */
     public function destroy(LinkType $linkType, LinkType $moveTo): bool;
 
+    /**
+     * @param TransactionJournalLink $link
+     *
+     * @return bool
+     */
+    public function destroyLink(TransactionJournalLink $link): bool;
+
     /**
      * @param int $id
      *
@@ -46,20 +53,6 @@ interface LinkTypeRepositoryInterface
      */
     public function find(int $id): LinkType;
 
-    /**
-     * @param TransactionJournalLink $link
-     *
-     * @return bool
-     */
-    public function destroyLink(TransactionJournalLink $link):bool;
-
-    /**
-     * @param TransactionJournalLink $link
-     *
-     * @return bool
-     */
-    public function switchLink(TransactionJournalLink $link): bool;
-
     /**
      * Check if link exists between journals.
      *
@@ -91,6 +84,13 @@ interface LinkTypeRepositoryInterface
      */
     public function store(array $data): LinkType;
 
+    /**
+     * @param TransactionJournalLink $link
+     *
+     * @return bool
+     */
+    public function switchLink(TransactionJournalLink $link): bool;
+
     /**
      * @param LinkType $linkType
      * @param array    $data
diff --git a/app/Repositories/Tag/TagRepository.php b/app/Repositories/Tag/TagRepository.php
index 3f3218da19..bc0b780065 100644
--- a/app/Repositories/Tag/TagRepository.php
+++ b/app/Repositories/Tag/TagRepository.php
@@ -186,6 +186,34 @@ class TagRepository implements TagRepositoryInterface
         return new Carbon;
     }
 
+    /**
+     * Same as sum of tag but substracts income instead of adding it as well.
+     *
+     * @param Tag         $tag
+     * @param Carbon|null $start
+     * @param Carbon|null $end
+     *
+     * @return string
+     */
+    public function resultOfTag(Tag $tag, ?Carbon $start, ?Carbon $end): string
+    {
+        /** @var JournalCollectorInterface $collector */
+        $collector = app(JournalCollectorInterface::class);
+
+        if (!is_null($start) && !is_null($end)) {
+            $collector->setRange($start, $end);
+        }
+
+        $collector->setAllAssetAccounts()->setTag($tag);
+        $journals = $collector->getJournals();
+        $sum      = '0';
+        foreach ($journals as $journal) {
+            $sum = bcadd($sum, strval($journal->transaction_amount));
+        }
+
+        return strval($sum);
+    }
+
     /**
      * @param User $user
      */
@@ -262,34 +290,6 @@ class TagRepository implements TagRepositoryInterface
         return strval($sum);
     }
 
-    /**
-     * Same as sum of tag but substracts income instead of adding it as well.
-     *
-     * @param Tag         $tag
-     * @param Carbon|null $start
-     * @param Carbon|null $end
-     *
-     * @return string
-     */
-    public function resultOfTag(Tag $tag, ?Carbon $start, ?Carbon $end): string
-    {
-        /** @var JournalCollectorInterface $collector */
-        $collector = app(JournalCollectorInterface::class);
-
-        if (!is_null($start) && !is_null($end)) {
-            $collector->setRange($start, $end);
-        }
-
-        $collector->setAllAssetAccounts()->setTag($tag);
-        $journals = $collector->getJournals();
-        $sum      = '0';
-        foreach ($journals as $journal) {
-            $sum = bcadd($sum, strval($journal->transaction_amount));
-        }
-
-        return strval($sum);
-    }
-
     /**
      * Generates a tag cloud.
      *
@@ -380,13 +380,14 @@ class TagRepository implements TagRepositoryInterface
         Log::debug(sprintf('AmountDiff is %f', $amountDiff));
 
         // no difference? Every tag same range:
-        if($amountDiff === 0.0) {
+        if ($amountDiff === 0.0) {
             Log::debug(sprintf('AmountDiff is zero, return %d', $range[0]));
+
             return $range[0];
         }
 
-        $diff       = $range[1] - $range[0];
-        $step       = 1;
+        $diff = $range[1] - $range[0];
+        $step = 1;
         if ($diff != 0) {
             $step = $amountDiff / $diff;
         }
diff --git a/app/Repositories/Tag/TagRepositoryInterface.php b/app/Repositories/Tag/TagRepositoryInterface.php
index 85e54f58c7..688c71dd90 100644
--- a/app/Repositories/Tag/TagRepositoryInterface.php
+++ b/app/Repositories/Tag/TagRepositoryInterface.php
@@ -103,11 +103,6 @@ interface TagRepositoryInterface
      */
     public function lastUseDate(Tag $tag): Carbon;
 
-    /**
-     * @param User $user
-     */
-    public function setUser(User $user);
-
     /**
      * @param Tag         $tag
      * @param Carbon|null $start
@@ -117,6 +112,11 @@ interface TagRepositoryInterface
      */
     public function resultOfTag(Tag $tag, ?Carbon $start, ?Carbon $end): string;
 
+    /**
+     * @param User $user
+     */
+    public function setUser(User $user);
+
     /**
      * @param Tag    $tag
      * @param Carbon $start
diff --git a/app/Rules/Processor.php b/app/Rules/Processor.php
index 4ad14ea467..5916da22e5 100644
--- a/app/Rules/Processor.php
+++ b/app/Rules/Processor.php
@@ -119,7 +119,7 @@ final class Processor
         $self = new self;
         foreach ($triggers as $entry) {
             $entry['value'] = is_null($entry['value']) ? '' : $entry['value'];
-            $trigger = TriggerFactory::makeTriggerFromStrings($entry['type'], $entry['value'], $entry['stopProcessing']);
+            $trigger        = TriggerFactory::makeTriggerFromStrings($entry['type'], $entry['value'], $entry['stopProcessing']);
             $self->triggers->push($trigger);
         }
 
diff --git a/app/Services/Bunq/Object/NotificationFilter.php b/app/Services/Bunq/Object/NotificationFilter.php
index c6c89d1ada..16e24410c9 100644
--- a/app/Services/Bunq/Object/NotificationFilter.php
+++ b/app/Services/Bunq/Object/NotificationFilter.php
@@ -26,8 +26,6 @@ class NotificationFilter extends BunqObject
      */
     public function __construct(array $data)
     {
-        var_dump($data);
-        exit;
     }
 
 }
diff --git a/app/Services/Bunq/Object/UserPerson.php b/app/Services/Bunq/Object/UserPerson.php
index 0fea94bd44..7a3c865e6b 100644
--- a/app/Services/Bunq/Object/UserPerson.php
+++ b/app/Services/Bunq/Object/UserPerson.php
@@ -127,11 +127,6 @@ class UserPerson extends BunqObject
         // document front, back attachment
         // customer, customer_limit
         // billing contracts
-
-        //        echo '<pre>';
-        //        print_r($data);
-        //        var_dump($this);
-        //        echo '</pre>';
     }
 
     /**
diff --git a/app/Services/Bunq/Request/DeleteDeviceSessionRequest.php b/app/Services/Bunq/Request/DeleteDeviceSessionRequest.php
index cccb466c9b..cd70b833c9 100644
--- a/app/Services/Bunq/Request/DeleteDeviceSessionRequest.php
+++ b/app/Services/Bunq/Request/DeleteDeviceSessionRequest.php
@@ -12,7 +12,6 @@ declare(strict_types=1);
 
 namespace FireflyIII\Services\Bunq\Request;
 
-use FireflyIII\Services\Bunq\Token\InstallationToken;
 use FireflyIII\Services\Bunq\Token\SessionToken;
 use Log;
 
@@ -36,6 +35,7 @@ class DeleteDeviceSessionRequest extends BunqRequest
         $headers                                 = $this->getDefaultHeaders();
         $headers['X-Bunq-Client-Authentication'] = $this->sessionToken->getToken();
         $this->sendSignedBunqDelete($uri, $headers);
+
         return;
     }
 
diff --git a/app/Services/Bunq/Request/ListDeviceServerRequest.php b/app/Services/Bunq/Request/ListDeviceServerRequest.php
index fe0f33dec2..bfc7b7109f 100644
--- a/app/Services/Bunq/Request/ListDeviceServerRequest.php
+++ b/app/Services/Bunq/Request/ListDeviceServerRequest.php
@@ -34,15 +34,6 @@ class ListDeviceServerRequest extends BunqRequest
         $this->devices = new Collection;
     }
 
-    /**
-     * @return Collection
-     */
-    public function getDevices(): Collection
-    {
-        return $this->devices;
-    }
-
-
     /**
      *
      */
@@ -64,6 +55,14 @@ class ListDeviceServerRequest extends BunqRequest
         return;
     }
 
+    /**
+     * @return Collection
+     */
+    public function getDevices(): Collection
+    {
+        return $this->devices;
+    }
+
     /**
      * @param InstallationToken $installationToken
      */
diff --git a/app/Services/Bunq/Request/ListMonetaryAccountRequest.php b/app/Services/Bunq/Request/ListMonetaryAccountRequest.php
index b2762de940..6378edff8c 100644
--- a/app/Services/Bunq/Request/ListMonetaryAccountRequest.php
+++ b/app/Services/Bunq/Request/ListMonetaryAccountRequest.php
@@ -30,14 +30,6 @@ class ListMonetaryAccountRequest extends BunqRequest
     /** @var int */
     private $userId = 0;
 
-    /**
-     * @return Collection
-     */
-    public function getMonetaryAccounts(): Collection
-    {
-        return $this->monetaryAccounts;
-    }
-
     /**
      *
      */
@@ -60,6 +52,14 @@ class ListMonetaryAccountRequest extends BunqRequest
         return;
     }
 
+    /**
+     * @return Collection
+     */
+    public function getMonetaryAccounts(): Collection
+    {
+        return $this->monetaryAccounts;
+    }
+
     /**
      * @param SessionToken $sessionToken
      */
diff --git a/app/Support/Import/Information/BunqInformation.php b/app/Support/Import/Information/BunqInformation.php
index 8f59243286..dc1428e103 100644
--- a/app/Support/Import/Information/BunqInformation.php
+++ b/app/Support/Import/Information/BunqInformation.php
@@ -13,7 +13,6 @@ declare(strict_types=1);
 namespace FireflyIII\Support\Import\Information;
 
 use FireflyIII\Exceptions\FireflyException;
-use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
 use FireflyIII\Services\Bunq\Object\Alias;
 use FireflyIII\Services\Bunq\Object\MonetaryAccountBank;
 use FireflyIII\Services\Bunq\Request\DeleteDeviceSessionRequest;
diff --git a/app/Support/Import/Information/InformationInterface.php b/app/Support/Import/Information/InformationInterface.php
index 9cf5106082..980703e26a 100644
--- a/app/Support/Import/Information/InformationInterface.php
+++ b/app/Support/Import/Information/InformationInterface.php
@@ -13,7 +13,6 @@ declare(strict_types=1);
 namespace FireflyIII\Support\Import\Information;
 
 use FireflyIII\User;
-use Illuminate\Support\Collection;
 
 /**
  * Interface InformationInterface
@@ -23,13 +22,6 @@ use Illuminate\Support\Collection;
 interface InformationInterface
 {
 
-    /**
-     * Set the user for this Prerequisites-routine. Class is expected to implement and save this.
-     *
-     * @param User $user
-     */
-    public function setUser(User $user): void;
-
     /**
      * Returns a collection of accounts. Preferrably, these follow a uniform Firefly III format so they can be managed over banks.
      *
@@ -46,4 +38,11 @@ interface InformationInterface
      * @return array
      */
     public function getAccounts(): array;
+
+    /**
+     * Set the user for this Prerequisites-routine. Class is expected to implement and save this.
+     *
+     * @param User $user
+     */
+    public function setUser(User $user): void;
 }
diff --git a/app/Support/Import/Prerequisites/PrerequisitesInterface.php b/app/Support/Import/Prerequisites/PrerequisitesInterface.php
index 393a3d82a5..03c62fc910 100644
--- a/app/Support/Import/Prerequisites/PrerequisitesInterface.php
+++ b/app/Support/Import/Prerequisites/PrerequisitesInterface.php
@@ -32,13 +32,6 @@ interface PrerequisitesInterface
      */
     public function getViewParameters(): array;
 
-    /**
-     * @param Request $request
-     *
-     * @return MessageBag
-     */
-    public function storePrerequisites(Request $request): MessageBag;
-
     /**
      * Returns if this import method has any special prerequisites such as config
      * variables or other things.
@@ -53,4 +46,11 @@ interface PrerequisitesInterface
      * @param User $user
      */
     public function setUser(User $user): void;
+
+    /**
+     * @param Request $request
+     *
+     * @return MessageBag
+     */
+    public function storePrerequisites(Request $request): MessageBag;
 }
diff --git a/app/Support/Search/Search.php b/app/Support/Search/Search.php
index 95f292def8..55dea965d2 100644
--- a/app/Support/Search/Search.php
+++ b/app/Support/Search/Search.php
@@ -112,7 +112,7 @@ class Search implements SearchInterface
                 $collector->withOpposingAccount()->withCategoryInformation()->withBudgetInformation();
             }
             $collector->removeFilter(InternalTransferFilter::class);
-            $set   = $collector->getPaginatedJournals()->getCollection();
+            $set = $collector->getPaginatedJournals()->getCollection();
 
             Log::debug(sprintf('Found %d journals to check. ', $set->count()));
 
diff --git a/app/Support/Twig/AmountFormat.php b/app/Support/Twig/AmountFormat.php
index 5033388258..3f9cd2ebcf 100644
--- a/app/Support/Twig/AmountFormat.php
+++ b/app/Support/Twig/AmountFormat.php
@@ -114,14 +114,11 @@ class AmountFormat extends Twig_Extension
      *
      * @return Twig_SimpleFunction
      */
-    protected function formatAmountBySymbol(): Twig_SimpleFunction
+    protected function formatAmountByCurrency(): Twig_SimpleFunction
     {
         return new Twig_SimpleFunction(
-            'formatAmountBySymbol', function (string $amount, string $symbol, int $decimalPlaces = 2, bool $coloured = true): string {
+            'formatAmountByCurrency', function (TransactionCurrency $currency, string $amount, bool $coloured = true): string {
 
-                $currency = new TransactionCurrency;
-                $currency->symbol = $symbol;
-            $currency->decimal_places = $decimalPlaces;
             return app('amount')->formatAnything($currency, $amount, $coloured);
 
 
@@ -134,10 +131,14 @@ class AmountFormat extends Twig_Extension
      *
      * @return Twig_SimpleFunction
      */
-    protected function formatAmountByCurrency(): Twig_SimpleFunction
+    protected function formatAmountBySymbol(): Twig_SimpleFunction
     {
         return new Twig_SimpleFunction(
-            'formatAmountByCurrency', function (TransactionCurrency $currency, string $amount, bool $coloured = true): string {
+            'formatAmountBySymbol', function (string $amount, string $symbol, int $decimalPlaces = 2, bool $coloured = true): string {
+
+            $currency                 = new TransactionCurrency;
+            $currency->symbol         = $symbol;
+            $currency->decimal_places = $decimalPlaces;
 
             return app('amount')->formatAnything($currency, $amount, $coloured);
 
diff --git a/app/Support/Twig/Translation.php b/app/Support/Twig/Translation.php
index ef64b3aca7..40ce29ebdb 100644
--- a/app/Support/Twig/Translation.php
+++ b/app/Support/Twig/Translation.php
@@ -57,6 +57,14 @@ class Translation extends Twig_Extension
 
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    public function getName(): string
+    {
+        return 'FireflyIII\Support\Twig\Translation';
+    }
+
     /**
      * @return Twig_SimpleFunction
      */
@@ -64,9 +72,9 @@ class Translation extends Twig_Extension
     {
         return new Twig_SimpleFunction(
             'journalLinkTranslation', function (int $linkTypeId, string $direction, string $original) {
-            $key = sprintf('firefly.%d_%s', $linkTypeId, $direction);
+            $key         = sprintf('firefly.%d_%s', $linkTypeId, $direction);
             $translation = trans($key);
-            if($key === $translation) {
+            if ($key === $translation) {
                 return $original;
             }
 
@@ -76,12 +84,4 @@ class Translation extends Twig_Extension
         }, ['is_safe' => ['html']]
         );
     }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getName(): string
-    {
-        return 'FireflyIII\Support\Twig\Translation';
-    }
 }
diff --git a/tests/Feature/Controllers/JsonControllerTest.php b/tests/Feature/Controllers/JsonControllerTest.php
index 72567af9a8..a4a7c3cf94 100644
--- a/tests/Feature/Controllers/JsonControllerTest.php
+++ b/tests/Feature/Controllers/JsonControllerTest.php
@@ -13,14 +13,12 @@ namespace Tests\Feature\Controllers;
 
 use Amount;
 use FireflyIII\Helpers\Collector\JournalCollectorInterface;
-use FireflyIII\Models\AccountType;
 use FireflyIII\Models\Budget;
 use FireflyIII\Models\Category;
 use FireflyIII\Models\Tag;
 use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Models\TransactionType;
-use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Repositories\Bill\BillRepositoryInterface;
 use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
 use FireflyIII\Repositories\Category\CategoryRepositoryInterface;
diff --git a/tests/Feature/Controllers/TagControllerTest.php b/tests/Feature/Controllers/TagControllerTest.php
index 4846cd6136..ef7cd4286b 100644
--- a/tests/Feature/Controllers/TagControllerTest.php
+++ b/tests/Feature/Controllers/TagControllerTest.php
@@ -18,7 +18,6 @@ use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
 use FireflyIII\Repositories\Tag\TagRepositoryInterface;
 use Illuminate\Pagination\LengthAwarePaginator;
-use Illuminate\Support\Collection;
 use Tests\TestCase;
 
 
diff --git a/tests/Feature/Controllers/TransactionControllerTest.php b/tests/Feature/Controllers/TransactionControllerTest.php
index 3465d7c59e..711ea5bf50 100644
--- a/tests/Feature/Controllers/TransactionControllerTest.php
+++ b/tests/Feature/Controllers/TransactionControllerTest.php
@@ -19,7 +19,6 @@ use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
 use FireflyIII\Repositories\Journal\JournalTaskerInterface;
 use Illuminate\Pagination\LengthAwarePaginator;
 use Illuminate\Support\Collection;
-use Steam;
 use Tests\TestCase;
 
 /**

From 6f9b69a0327d49b5a7b8455affabd36de85b7913 Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Sat, 9 Sep 2017 06:42:09 +0200
Subject: [PATCH 665/668] Version upgrade.

---
 config/firefly.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/firefly.php b/config/firefly.php
index 2d9364a054..308ecb3a19 100644
--- a/config/firefly.php
+++ b/config/firefly.php
@@ -23,7 +23,7 @@ return [
         'is_demo_site'     => false,
     ],
     'encryption'                 => (is_null(env('USE_ENCRYPTION')) || env('USE_ENCRYPTION') === true),
-    'version'                    => '4.6.4',
+    'version'                    => '4.6.5',
     'maxUploadSize'              => 15242880,
     'allowedMimes'               => ['image/png', 'image/jpeg', 'application/pdf'],
     'list_length'                => 10,

From f2cb6752670c0a5212ddd22b15b63da5a63e6e81 Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Sat, 9 Sep 2017 06:57:03 +0200
Subject: [PATCH 666/668] New change log. [skip ci]

---
 CHANGELOG.md | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 04dd13ba14..6849b2014b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,43 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [4.6.5] - 2017-09-09
+
+### Added
+- #616, The ability to link transactions
+- #763, as suggested by @tannie
+- #770, as suggested by @skibbipl
+- #780, as suggested by @skibbipl
+- #784, as suggested by @SmilingWorlock
+- Lots of code for future support of automated Bunq imports
+
+### Changed
+- Rewrote the export routine
+- #782, as suggested by @NiceGuyIT
+- #800, as suggested by @jleeong
+
+### Fixed
+- #724, reported by @skibbipl
+- #738, reported by @skibbipl
+- #760, reported by @leander091
+- #764, reported by @tannie
+- #792, reported by @jleeong
+- #793, reported by @nicoschreiner
+- #797, reported by @leander091
+- #801, reported by @pkoziol
+- #803, reported by @pkoziol
+- #805, reported by @pkoziol
+- #806, reported by @pkoziol
+- #807, reported by @pkoziol
+- #808, reported by @pkoziol
+- #809, reported by @pkoziol
+- #814, reported by @nicoschreiner
+- #818, reported by @gavu
+- #819, reported by @DieBauer
+- #820, reported by @simonsmiley 
+- Various other fixes
+
+
 ## [4.6.4] - 2017-08-13
 ### Added
 - PHP7.1 support

From 66c13f35e76d4e55666faf216523b313cd06df59 Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Sat, 9 Sep 2017 07:03:43 +0200
Subject: [PATCH 667/668] Various code cleanup.

---
 app/Console/Commands/UpgradeDatabase.php     |  4 +---
 app/Http/Requests/TagFormRequest.php         |  7 +++----
 app/Import/Specifics/RabobankDescription.php |  3 ++-
 app/Support/Amount.php                       | 20 +++++++++-----------
 app/Support/FireflyConfig.php                | 13 ++++++-------
 5 files changed, 21 insertions(+), 26 deletions(-)

diff --git a/app/Console/Commands/UpgradeDatabase.php b/app/Console/Commands/UpgradeDatabase.php
index 7294a247e3..74abc4e465 100644
--- a/app/Console/Commands/UpgradeDatabase.php
+++ b/app/Console/Commands/UpgradeDatabase.php
@@ -251,15 +251,13 @@ class UpgradeDatabase extends Command
      */
     public function updateTransferCurrencies()
     {
-        /** @var CurrencyRepositoryInterface $repository */
-        $repository = app(CurrencyRepositoryInterface::class);
         $set        = TransactionJournal
             ::leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id')
             ->where('transaction_types.type', TransactionType::TRANSFER)
             ->get(['transaction_journals.*']);
 
         $set->each(
-            function (TransactionJournal $transfer) use ($repository) {
+            function (TransactionJournal $transfer) {
                 // select all "source" transactions:
                 /** @var Collection $transactions */
                 $transactions = $transfer->transactions()->where('amount', '<', 0)->get();
diff --git a/app/Http/Requests/TagFormRequest.php b/app/Http/Requests/TagFormRequest.php
index 00808beb34..71f1fdd796 100644
--- a/app/Http/Requests/TagFormRequest.php
+++ b/app/Http/Requests/TagFormRequest.php
@@ -37,14 +37,13 @@ class TagFormRequest extends Request
      */
     public function collectTagData(): array
     {
+        $latitude  = null;
+        $longitude = null;
+        $zoomLevel = null;
         if ($this->get('setTag') === 'true') {
             $latitude  = $this->string('latitude');
             $longitude = $this->string('longitude');
             $zoomLevel = $this->integer('zoomLevel');
-        } else {
-            $latitude  = null;
-            $longitude = null;
-            $zoomLevel = null;
         }
 
         $data = [
diff --git a/app/Import/Specifics/RabobankDescription.php b/app/Import/Specifics/RabobankDescription.php
index ec92580f74..5dd23cb512 100644
--- a/app/Import/Specifics/RabobankDescription.php
+++ b/app/Import/Specifics/RabobankDescription.php
@@ -59,7 +59,8 @@ class RabobankDescription implements SpecificInterface
             );
             $row[6]  = $alternateName;
             $row[10] = '';
-        } else {
+        }
+        if (!(strlen($oppositeAccount) < 1 && strlen($oppositeName) < 1)) {
             Log::debug('Rabobank specific: either opposite account or name are filled.');
         }
 
diff --git a/app/Support/Amount.php b/app/Support/Amount.php
index 62ad0b4a6b..4cf65c0519 100644
--- a/app/Support/Amount.php
+++ b/app/Support/Amount.php
@@ -137,10 +137,9 @@ class Amount
 
             if ($amount > 0) {
                 return sprintf('<span class="text-success">%s</span>', $result);
-            } else {
-                if ($amount < 0) {
-                    return sprintf('<span class="text-danger">%s</span>', $result);
-                }
+            }
+            if ($amount < 0) {
+                return sprintf('<span class="text-danger">%s</span>', $result);
             }
 
             return sprintf('<span style="color:#999">%s</span>', $result);
@@ -194,14 +193,13 @@ class Amount
         $cache->addProperty('getCurrencySymbol');
         if ($cache->has()) {
             return $cache->get(); // @codeCoverageIgnore
-        } else {
-            $currencyPreference = Prefs::get('currencyPreference', config('firefly.default_currency', 'EUR'));
-            $currency           = TransactionCurrency::where('code', $currencyPreference->data)->first();
-
-            $cache->store($currency->symbol);
-
-            return $currency->symbol;
         }
+        $currencyPreference = Prefs::get('currencyPreference', config('firefly.default_currency', 'EUR'));
+        $currency           = TransactionCurrency::where('code', $currencyPreference->data)->first();
+
+        $cache->store($currency->symbol);
+
+        return $currency->symbol;
     }
 
     /**
diff --git a/app/Support/FireflyConfig.php b/app/Support/FireflyConfig.php
index 68f2323396..0f6801f017 100644
--- a/app/Support/FireflyConfig.php
+++ b/app/Support/FireflyConfig.php
@@ -100,14 +100,13 @@ class FireflyConfig
             Cache::forget('ff-config-' . $name);
 
             return $item;
-        } else {
-            Log::debug('Exists already ', ['name' => $name]);
-            $config->data = $value;
-            $config->save();
-            Cache::forget('ff-config-' . $name);
-
-            return $config;
         }
+        Log::debug('Exists already ', ['name' => $name]);
+        $config->data = $value;
+        $config->save();
+        Cache::forget('ff-config-' . $name);
+
+        return $config;
 
     }
 

From d46ba4325fd4bb1224c92d87d5c46944b4c151fc Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Sat, 9 Sep 2017 07:21:20 +0200
Subject: [PATCH 668/668] Updated composer file

---
 app/Console/Commands/UpgradeDatabase.php |   2 +-
 composer.lock                            | 271 +++++++++++------------
 2 files changed, 136 insertions(+), 137 deletions(-)

diff --git a/app/Console/Commands/UpgradeDatabase.php b/app/Console/Commands/UpgradeDatabase.php
index 74abc4e465..27ab338d93 100644
--- a/app/Console/Commands/UpgradeDatabase.php
+++ b/app/Console/Commands/UpgradeDatabase.php
@@ -284,7 +284,7 @@ class UpgradeDatabase extends Command
         $currency   = $repository->find(intval($transaction->account->getMeta('currency_id')));
         $journal    = $transaction->transactionJournal;
 
-        if ($currency->id !== $journal->transaction_currency_id) {
+        if (!(intval($currency->id) === intval($journal->transaction_currency_id))) {
             $this->line(
                 sprintf(
                     'Transfer #%d ("%s") has been updated to use %s instead of %s.', $journal->id, $journal->description, $currency->code,
diff --git a/composer.lock b/composer.lock
index b3fdfc23cd..bac94be3f2 100644
--- a/composer.lock
+++ b/composer.lock
@@ -220,16 +220,16 @@
         },
         {
             "name": "doctrine/cache",
-            "version": "v1.7.0",
+            "version": "v1.7.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/cache.git",
-                "reference": "53d9518ffeb019c51d542ff60cb578f076d3ff16"
+                "reference": "b3217d58609e9c8e661cd41357a54d926c4a2a1a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/cache/zipball/53d9518ffeb019c51d542ff60cb578f076d3ff16",
-                "reference": "53d9518ffeb019c51d542ff60cb578f076d3ff16",
+                "url": "https://api.github.com/repos/doctrine/cache/zipball/b3217d58609e9c8e661cd41357a54d926c4a2a1a",
+                "reference": "b3217d58609e9c8e661cd41357a54d926c4a2a1a",
                 "shasum": ""
             },
             "require": {
@@ -290,7 +290,7 @@
                 "cache",
                 "caching"
             ],
-            "time": "2017-07-22T13:00:15+00:00"
+            "time": "2017-08-25T07:02:50+00:00"
         },
         {
             "name": "doctrine/collections",
@@ -361,16 +361,16 @@
         },
         {
             "name": "doctrine/common",
-            "version": "v2.8.0",
+            "version": "v2.8.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/common.git",
-                "reference": "ed349f953d443963c590b008b37b864b8a3c4b21"
+                "reference": "f68c297ce6455e8fd794aa8ffaf9fa458f6ade66"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/common/zipball/ed349f953d443963c590b008b37b864b8a3c4b21",
-                "reference": "ed349f953d443963c590b008b37b864b8a3c4b21",
+                "url": "https://api.github.com/repos/doctrine/common/zipball/f68c297ce6455e8fd794aa8ffaf9fa458f6ade66",
+                "reference": "f68c297ce6455e8fd794aa8ffaf9fa458f6ade66",
                 "shasum": ""
             },
             "require": {
@@ -430,20 +430,20 @@
                 "persistence",
                 "spl"
             ],
-            "time": "2017-07-22T09:01:43+00:00"
+            "time": "2017-08-31T08:43:38+00:00"
         },
         {
             "name": "doctrine/dbal",
-            "version": "v2.6.1",
+            "version": "v2.6.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/dbal.git",
-                "reference": "1a086f853425b1f5349775ce57e45a772d2d2ba5"
+                "reference": "1a4ee83a5a709555f2c6f9057a3aacf892451c7e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/dbal/zipball/1a086f853425b1f5349775ce57e45a772d2d2ba5",
-                "reference": "1a086f853425b1f5349775ce57e45a772d2d2ba5",
+                "url": "https://api.github.com/repos/doctrine/dbal/zipball/1a4ee83a5a709555f2c6f9057a3aacf892451c7e",
+                "reference": "1a4ee83a5a709555f2c6f9057a3aacf892451c7e",
                 "shasum": ""
             },
             "require": {
@@ -503,7 +503,7 @@
                 "persistence",
                 "queryobject"
             ],
-            "time": "2017-07-28T10:40:18+00:00"
+            "time": "2017-08-28T11:02:56+00:00"
         },
         {
             "name": "doctrine/inflector",
@@ -670,16 +670,16 @@
         },
         {
             "name": "laravel/framework",
-            "version": "v5.4.33",
+            "version": "v5.4.36",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/framework.git",
-                "reference": "e53a81a2bf406f501cdf818ad949f8d6c8dabfc0"
+                "reference": "1062a22232071c3e8636487c86ec1ae75681bbf9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/framework/zipball/e53a81a2bf406f501cdf818ad949f8d6c8dabfc0",
-                "reference": "e53a81a2bf406f501cdf818ad949f8d6c8dabfc0",
+                "url": "https://api.github.com/repos/laravel/framework/zipball/1062a22232071c3e8636487c86ec1ae75681bbf9",
+                "reference": "1062a22232071c3e8636487c86ec1ae75681bbf9",
                 "shasum": ""
             },
             "require": {
@@ -795,20 +795,20 @@
                 "framework",
                 "laravel"
             ],
-            "time": "2017-08-14T20:17:41+00:00"
+            "time": "2017-08-30T09:26:16+00:00"
         },
         {
             "name": "laravelcollective/html",
-            "version": "v5.4.8",
+            "version": "v5.4.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/LaravelCollective/html.git",
-                "reference": "9b8f51e7a2368911c896f5d42757886bae0717b5"
+                "reference": "f04965dc688254f4c77f684ab0b42264f9eb9634"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/LaravelCollective/html/zipball/9b8f51e7a2368911c896f5d42757886bae0717b5",
-                "reference": "9b8f51e7a2368911c896f5d42757886bae0717b5",
+                "url": "https://api.github.com/repos/LaravelCollective/html/zipball/f04965dc688254f4c77f684ab0b42264f9eb9634",
+                "reference": "f04965dc688254f4c77f684ab0b42264f9eb9634",
                 "shasum": ""
             },
             "require": {
@@ -849,7 +849,7 @@
             ],
             "description": "HTML and Form Builders for the Laravel Framework",
             "homepage": "http://laravelcollective.com",
-            "time": "2017-05-22T06:35:07+00:00"
+            "time": "2017-08-12T15:52:38+00:00"
         },
         {
             "name": "league/commonmark",
@@ -1475,21 +1475,21 @@
         },
         {
             "name": "rcrowe/twigbridge",
-            "version": "v0.9.4",
+            "version": "v0.9.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/rcrowe/TwigBridge.git",
-                "reference": "effda159c436b08eae1a9d9ba3d28bee8f7b0f3f"
+                "reference": "0a0784c6fb4d383bceebd7ee4f8a2dcac15df5cf"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/rcrowe/TwigBridge/zipball/effda159c436b08eae1a9d9ba3d28bee8f7b0f3f",
-                "reference": "effda159c436b08eae1a9d9ba3d28bee8f7b0f3f",
+                "url": "https://api.github.com/repos/rcrowe/TwigBridge/zipball/0a0784c6fb4d383bceebd7ee4f8a2dcac15df5cf",
+                "reference": "0a0784c6fb4d383bceebd7ee4f8a2dcac15df5cf",
                 "shasum": ""
             },
             "require": {
-                "illuminate/support": "5.0.*|5.1.*|5.2.*|5.3.*|5.4.*",
-                "illuminate/view": "5.0.*|5.1.*|5.2.*|5.3.*|5.4.*",
+                "illuminate/support": "5.0.*|5.1.*|5.2.*|5.3.*|5.4.*|5.5.*",
+                "illuminate/view": "5.0.*|5.1.*|5.2.*|5.3.*|5.4.*|5.5.*",
                 "php": ">=5.4.0",
                 "twig/twig": "~1.30"
             },
@@ -1535,7 +1535,7 @@
                 "laravel",
                 "twig"
             ],
-            "time": "2017-01-21T14:33:47+00:00"
+            "time": "2017-08-28T11:57:12+00:00"
         },
         {
             "name": "rmccue/requests",
@@ -1642,20 +1642,20 @@
         },
         {
             "name": "symfony/console",
-            "version": "v3.3.6",
+            "version": "v3.3.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "b0878233cb5c4391347e5495089c7af11b8e6201"
+                "reference": "d6596cb5022b6a0bd940eae54a1de78646a5fda6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/b0878233cb5c4391347e5495089c7af11b8e6201",
-                "reference": "b0878233cb5c4391347e5495089c7af11b8e6201",
+                "url": "https://api.github.com/repos/symfony/console/zipball/d6596cb5022b6a0bd940eae54a1de78646a5fda6",
+                "reference": "d6596cb5022b6a0bd940eae54a1de78646a5fda6",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.5.9",
+                "php": "^5.5.9|>=7.0.8",
                 "symfony/debug": "~2.8|~3.0",
                 "symfony/polyfill-mbstring": "~1.0"
             },
@@ -1668,7 +1668,6 @@
                 "symfony/dependency-injection": "~3.3",
                 "symfony/event-dispatcher": "~2.8|~3.0",
                 "symfony/filesystem": "~2.8|~3.0",
-                "symfony/http-kernel": "~2.8|~3.0",
                 "symfony/process": "~2.8|~3.0"
             },
             "suggest": {
@@ -1707,7 +1706,7 @@
             ],
             "description": "Symfony Console Component",
             "homepage": "https://symfony.com",
-            "time": "2017-07-29T21:27:59+00:00"
+            "time": "2017-08-27T14:52:21+00:00"
         },
         {
             "name": "symfony/css-selector",
@@ -1764,20 +1763,20 @@
         },
         {
             "name": "symfony/debug",
-            "version": "v3.3.6",
+            "version": "v3.3.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/debug.git",
-                "reference": "7c13ae8ce1e2adbbd574fc39de7be498e1284e13"
+                "reference": "084d804fe35808eb2ef596ec83d85d9768aa6c9d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/debug/zipball/7c13ae8ce1e2adbbd574fc39de7be498e1284e13",
-                "reference": "7c13ae8ce1e2adbbd574fc39de7be498e1284e13",
+                "url": "https://api.github.com/repos/symfony/debug/zipball/084d804fe35808eb2ef596ec83d85d9768aa6c9d",
+                "reference": "084d804fe35808eb2ef596ec83d85d9768aa6c9d",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.5.9",
+                "php": "^5.5.9|>=7.0.8",
                 "psr/log": "~1.0"
             },
             "conflict": {
@@ -1816,11 +1815,11 @@
             ],
             "description": "Symfony Debug Component",
             "homepage": "https://symfony.com",
-            "time": "2017-07-28T15:27:31+00:00"
+            "time": "2017-08-27T14:52:21+00:00"
         },
         {
             "name": "symfony/event-dispatcher",
-            "version": "v2.8.26",
+            "version": "v2.8.27",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher.git",
@@ -1880,20 +1879,20 @@
         },
         {
             "name": "symfony/finder",
-            "version": "v3.3.6",
+            "version": "v3.3.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/finder.git",
-                "reference": "baea7f66d30854ad32988c11a09d7ffd485810c4"
+                "reference": "b2260dbc80f3c4198f903215f91a1ac7fe9fe09e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/baea7f66d30854ad32988c11a09d7ffd485810c4",
-                "reference": "baea7f66d30854ad32988c11a09d7ffd485810c4",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/b2260dbc80f3c4198f903215f91a1ac7fe9fe09e",
+                "reference": "b2260dbc80f3c4198f903215f91a1ac7fe9fe09e",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.5.9"
+                "php": "^5.5.9|>=7.0.8"
             },
             "type": "library",
             "extra": {
@@ -1925,24 +1924,24 @@
             ],
             "description": "Symfony Finder Component",
             "homepage": "https://symfony.com",
-            "time": "2017-06-01T21:01:25+00:00"
+            "time": "2017-07-29T21:54:42+00:00"
         },
         {
             "name": "symfony/http-foundation",
-            "version": "v3.3.6",
+            "version": "v3.3.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-foundation.git",
-                "reference": "49e8cd2d59a7aa9bfab19e46de680c76e500a031"
+                "reference": "14bacad23a4f075bfd3fd456755236cb261320e3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/49e8cd2d59a7aa9bfab19e46de680c76e500a031",
-                "reference": "49e8cd2d59a7aa9bfab19e46de680c76e500a031",
+                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/14bacad23a4f075bfd3fd456755236cb261320e3",
+                "reference": "14bacad23a4f075bfd3fd456755236cb261320e3",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.5.9",
+                "php": "^5.5.9|>=7.0.8",
                 "symfony/polyfill-mbstring": "~1.1"
             },
             "require-dev": {
@@ -1978,7 +1977,7 @@
             ],
             "description": "Symfony HttpFoundation Component",
             "homepage": "https://symfony.com",
-            "time": "2017-07-21T11:04:46+00:00"
+            "time": "2017-08-10T07:07:06+00:00"
         },
         {
             "name": "symfony/http-kernel",
@@ -2234,20 +2233,20 @@
         },
         {
             "name": "symfony/process",
-            "version": "v3.3.6",
+            "version": "v3.3.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/process.git",
-                "reference": "07432804942b9f6dd7b7377faf9920af5f95d70a"
+                "reference": "b7666e9b438027a1ea0e1ee813ec5042d5d7f6f0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/process/zipball/07432804942b9f6dd7b7377faf9920af5f95d70a",
-                "reference": "07432804942b9f6dd7b7377faf9920af5f95d70a",
+                "url": "https://api.github.com/repos/symfony/process/zipball/b7666e9b438027a1ea0e1ee813ec5042d5d7f6f0",
+                "reference": "b7666e9b438027a1ea0e1ee813ec5042d5d7f6f0",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.5.9"
+                "php": "^5.5.9|>=7.0.8"
             },
             "type": "library",
             "extra": {
@@ -2279,24 +2278,24 @@
             ],
             "description": "Symfony Process Component",
             "homepage": "https://symfony.com",
-            "time": "2017-07-13T13:05:09+00:00"
+            "time": "2017-07-29T21:54:42+00:00"
         },
         {
             "name": "symfony/routing",
-            "version": "v3.3.6",
+            "version": "v3.3.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/routing.git",
-                "reference": "4aee1a917fd4859ff8b51b9fd1dfb790a5ecfa26"
+                "reference": "970326dcd04522e1cd1fe128abaee54c225e27f9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/routing/zipball/4aee1a917fd4859ff8b51b9fd1dfb790a5ecfa26",
-                "reference": "4aee1a917fd4859ff8b51b9fd1dfb790a5ecfa26",
+                "url": "https://api.github.com/repos/symfony/routing/zipball/970326dcd04522e1cd1fe128abaee54c225e27f9",
+                "reference": "970326dcd04522e1cd1fe128abaee54c225e27f9",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.5.9"
+                "php": "^5.5.9|>=7.0.8"
             },
             "conflict": {
                 "symfony/config": "<2.8",
@@ -2357,24 +2356,24 @@
                 "uri",
                 "url"
             ],
-            "time": "2017-07-21T17:43:13+00:00"
+            "time": "2017-07-29T21:54:42+00:00"
         },
         {
             "name": "symfony/translation",
-            "version": "v3.3.6",
+            "version": "v3.3.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/translation.git",
-                "reference": "35dd5fb003c90e8bd4d8cabdf94bf9c96d06fdc3"
+                "reference": "add53753d978f635492dfe8cd6953f6a7361ef90"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/translation/zipball/35dd5fb003c90e8bd4d8cabdf94bf9c96d06fdc3",
-                "reference": "35dd5fb003c90e8bd4d8cabdf94bf9c96d06fdc3",
+                "url": "https://api.github.com/repos/symfony/translation/zipball/add53753d978f635492dfe8cd6953f6a7361ef90",
+                "reference": "add53753d978f635492dfe8cd6953f6a7361ef90",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.5.9",
+                "php": "^5.5.9|>=7.0.8",
                 "symfony/polyfill-mbstring": "~1.0"
             },
             "conflict": {
@@ -2422,24 +2421,24 @@
             ],
             "description": "Symfony Translation Component",
             "homepage": "https://symfony.com",
-            "time": "2017-06-24T16:45:30+00:00"
+            "time": "2017-07-29T21:54:42+00:00"
         },
         {
             "name": "symfony/var-dumper",
-            "version": "v3.3.6",
+            "version": "v3.3.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/var-dumper.git",
-                "reference": "b2623bccb969ad595c2090f9be498b74670d0663"
+                "reference": "89fcb5a73e0ede2be2512234c4e40457bb22b35f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/b2623bccb969ad595c2090f9be498b74670d0663",
-                "reference": "b2623bccb969ad595c2090f9be498b74670d0663",
+                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/89fcb5a73e0ede2be2512234c4e40457bb22b35f",
+                "reference": "89fcb5a73e0ede2be2512234c4e40457bb22b35f",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.5.9",
+                "php": "^5.5.9|>=7.0.8",
                 "symfony/polyfill-mbstring": "~1.0"
             },
             "conflict": {
@@ -2490,7 +2489,7 @@
                 "debug",
                 "dump"
             ],
-            "time": "2017-07-28T06:06:09+00:00"
+            "time": "2017-08-27T14:52:21+00:00"
         },
         {
             "name": "tijsverkoyen/css-to-inline-styles",
@@ -2652,16 +2651,16 @@
         },
         {
             "name": "watson/validating",
-            "version": "3.0.1",
+            "version": "3.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/dwightwatson/validating.git",
-                "reference": "3cef5b4cd0af2dc26d2c7ca668bd12f4d4ab421b"
+                "reference": "c6e9194b034a24d3b6e447bbc7a94d88fad9a1fd"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/dwightwatson/validating/zipball/3cef5b4cd0af2dc26d2c7ca668bd12f4d4ab421b",
-                "reference": "3cef5b4cd0af2dc26d2c7ca668bd12f4d4ab421b",
+                "url": "https://api.github.com/repos/dwightwatson/validating/zipball/c6e9194b034a24d3b6e447bbc7a94d88fad9a1fd",
+                "reference": "c6e9194b034a24d3b6e447bbc7a94d88fad9a1fd",
                 "shasum": ""
             },
             "require": {
@@ -2698,7 +2697,7 @@
                 "laravel",
                 "validation"
             ],
-            "time": "2016-10-31T21:53:17+00:00"
+            "time": "2017-08-25T02:12:38+00:00"
         }
     ],
     "packages-dev": [
@@ -3342,22 +3341,22 @@
         },
         {
             "name": "phpdocumentor/reflection-docblock",
-            "version": "3.2.2",
+            "version": "4.1.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
-                "reference": "4aada1f93c72c35e22fb1383b47fee43b8f1d157"
+                "reference": "2d3d238c433cf69caeb4842e97a3223a116f94b2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/4aada1f93c72c35e22fb1383b47fee43b8f1d157",
-                "reference": "4aada1f93c72c35e22fb1383b47fee43b8f1d157",
+                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/2d3d238c433cf69caeb4842e97a3223a116f94b2",
+                "reference": "2d3d238c433cf69caeb4842e97a3223a116f94b2",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.5",
+                "php": "^7.0",
                 "phpdocumentor/reflection-common": "^1.0@dev",
-                "phpdocumentor/type-resolver": "^0.3.0",
+                "phpdocumentor/type-resolver": "^0.4.0",
                 "webmozart/assert": "^1.0"
             },
             "require-dev": {
@@ -3383,20 +3382,20 @@
                 }
             ],
             "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
-            "time": "2017-08-08T06:39:58+00:00"
+            "time": "2017-08-30T18:51:59+00:00"
         },
         {
             "name": "phpdocumentor/type-resolver",
-            "version": "0.3.0",
+            "version": "0.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpDocumentor/TypeResolver.git",
-                "reference": "fb3933512008d8162b3cdf9e18dba9309b7c3773"
+                "reference": "9c977708995954784726e25d0cd1dddf4e65b0f7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/fb3933512008d8162b3cdf9e18dba9309b7c3773",
-                "reference": "fb3933512008d8162b3cdf9e18dba9309b7c3773",
+                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/9c977708995954784726e25d0cd1dddf4e65b0f7",
+                "reference": "9c977708995954784726e25d0cd1dddf4e65b0f7",
                 "shasum": ""
             },
             "require": {
@@ -3430,26 +3429,26 @@
                     "email": "me@mikevanriel.com"
                 }
             ],
-            "time": "2017-06-03T08:32:36+00:00"
+            "time": "2017-07-14T14:27:02+00:00"
         },
         {
             "name": "phpspec/prophecy",
-            "version": "v1.7.0",
+            "version": "v1.7.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpspec/prophecy.git",
-                "reference": "93d39f1f7f9326d746203c7c056f300f7f126073"
+                "reference": "c9b8c6088acd19d769d4cc0ffa60a9fe34344bd6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/93d39f1f7f9326d746203c7c056f300f7f126073",
-                "reference": "93d39f1f7f9326d746203c7c056f300f7f126073",
+                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/c9b8c6088acd19d769d4cc0ffa60a9fe34344bd6",
+                "reference": "c9b8c6088acd19d769d4cc0ffa60a9fe34344bd6",
                 "shasum": ""
             },
             "require": {
                 "doctrine/instantiator": "^1.0.2",
                 "php": "^5.3|^7.0",
-                "phpdocumentor/reflection-docblock": "^2.0|^3.0.2",
+                "phpdocumentor/reflection-docblock": "^2.0|^3.0.2|^4.0",
                 "sebastian/comparator": "^1.1|^2.0",
                 "sebastian/recursion-context": "^1.0|^2.0|^3.0"
             },
@@ -3460,7 +3459,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.6.x-dev"
+                    "dev-master": "1.7.x-dev"
                 }
             },
             "autoload": {
@@ -3493,7 +3492,7 @@
                 "spy",
                 "stub"
             ],
-            "time": "2017-03-02T20:05:34+00:00"
+            "time": "2017-09-04T11:05:03+00:00"
         },
         {
             "name": "phpunit/php-code-coverage",
@@ -4458,20 +4457,20 @@
         },
         {
             "name": "symfony/class-loader",
-            "version": "v3.3.6",
+            "version": "v3.3.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/class-loader.git",
-                "reference": "386a294d621576302e7cc36965d6ed53b8c73c4f"
+                "reference": "9c69968ce57924e9e93550895cd2b0477edf0e19"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/class-loader/zipball/386a294d621576302e7cc36965d6ed53b8c73c4f",
-                "reference": "386a294d621576302e7cc36965d6ed53b8c73c4f",
+                "url": "https://api.github.com/repos/symfony/class-loader/zipball/9c69968ce57924e9e93550895cd2b0477edf0e19",
+                "reference": "9c69968ce57924e9e93550895cd2b0477edf0e19",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.5.9"
+                "php": "^5.5.9|>=7.0.8"
             },
             "require-dev": {
                 "symfony/finder": "~2.8|~3.0",
@@ -4510,24 +4509,24 @@
             ],
             "description": "Symfony ClassLoader Component",
             "homepage": "https://symfony.com",
-            "time": "2017-06-02T09:51:43+00:00"
+            "time": "2017-07-29T21:54:42+00:00"
         },
         {
             "name": "symfony/config",
-            "version": "v3.3.6",
+            "version": "v3.3.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/config.git",
-                "reference": "54ee12b0dd60f294132cabae6f5da9573d2e5297"
+                "reference": "6ac0cc1f047c1dbc058fc25b7a4d91b068ed4488"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/config/zipball/54ee12b0dd60f294132cabae6f5da9573d2e5297",
-                "reference": "54ee12b0dd60f294132cabae6f5da9573d2e5297",
+                "url": "https://api.github.com/repos/symfony/config/zipball/6ac0cc1f047c1dbc058fc25b7a4d91b068ed4488",
+                "reference": "6ac0cc1f047c1dbc058fc25b7a4d91b068ed4488",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.5.9",
+                "php": "^5.5.9|>=7.0.8",
                 "symfony/filesystem": "~2.8|~3.0"
             },
             "conflict": {
@@ -4572,7 +4571,7 @@
             ],
             "description": "Symfony Config Component",
             "homepage": "https://symfony.com",
-            "time": "2017-07-19T07:37:29+00:00"
+            "time": "2017-08-03T08:59:45+00:00"
         },
         {
             "name": "symfony/dom-crawler",
@@ -4632,20 +4631,20 @@
         },
         {
             "name": "symfony/filesystem",
-            "version": "v3.3.6",
+            "version": "v3.3.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/filesystem.git",
-                "reference": "427987eb4eed764c3b6e38d52a0f87989e010676"
+                "reference": "b32a0e5f928d0fa3d1dd03c78d020777e50c10cb"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/filesystem/zipball/427987eb4eed764c3b6e38d52a0f87989e010676",
-                "reference": "427987eb4eed764c3b6e38d52a0f87989e010676",
+                "url": "https://api.github.com/repos/symfony/filesystem/zipball/b32a0e5f928d0fa3d1dd03c78d020777e50c10cb",
+                "reference": "b32a0e5f928d0fa3d1dd03c78d020777e50c10cb",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.5.9"
+                "php": "^5.5.9|>=7.0.8"
             },
             "type": "library",
             "extra": {
@@ -4677,24 +4676,24 @@
             ],
             "description": "Symfony Filesystem Component",
             "homepage": "https://symfony.com",
-            "time": "2017-07-11T07:17:58+00:00"
+            "time": "2017-07-29T21:54:42+00:00"
         },
         {
             "name": "symfony/stopwatch",
-            "version": "v3.3.6",
+            "version": "v3.3.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/stopwatch.git",
-                "reference": "602a15299dc01556013b07167d4f5d3a60e90d15"
+                "reference": "9a5610a8d6a50985a7be485c0ba745c22607beeb"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/stopwatch/zipball/602a15299dc01556013b07167d4f5d3a60e90d15",
-                "reference": "602a15299dc01556013b07167d4f5d3a60e90d15",
+                "url": "https://api.github.com/repos/symfony/stopwatch/zipball/9a5610a8d6a50985a7be485c0ba745c22607beeb",
+                "reference": "9a5610a8d6a50985a7be485c0ba745c22607beeb",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.5.9"
+                "php": "^5.5.9|>=7.0.8"
             },
             "type": "library",
             "extra": {
@@ -4726,24 +4725,24 @@
             ],
             "description": "Symfony Stopwatch Component",
             "homepage": "https://symfony.com",
-            "time": "2017-04-12T14:14:56+00:00"
+            "time": "2017-07-29T21:54:42+00:00"
         },
         {
             "name": "symfony/yaml",
-            "version": "v3.3.6",
+            "version": "v3.3.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/yaml.git",
-                "reference": "ddc23324e6cfe066f3dd34a37ff494fa80b617ed"
+                "reference": "1d8c2a99c80862bdc3af94c1781bf70f86bccac0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/yaml/zipball/ddc23324e6cfe066f3dd34a37ff494fa80b617ed",
-                "reference": "ddc23324e6cfe066f3dd34a37ff494fa80b617ed",
+                "url": "https://api.github.com/repos/symfony/yaml/zipball/1d8c2a99c80862bdc3af94c1781bf70f86bccac0",
+                "reference": "1d8c2a99c80862bdc3af94c1781bf70f86bccac0",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.5.9"
+                "php": "^5.5.9|>=7.0.8"
             },
             "require-dev": {
                 "symfony/console": "~2.8|~3.0"
@@ -4781,7 +4780,7 @@
             ],
             "description": "Symfony Yaml Component",
             "homepage": "https://symfony.com",
-            "time": "2017-07-23T12:43:26+00:00"
+            "time": "2017-07-29T21:54:42+00:00"
         },
         {
             "name": "webmozart/assert",