More code. Forgot to push.

.env.example

@@ -2,6 +2,7 @@ APP_ENV=production
 APP_DEBUG=false
 APP_KEY=SomeRandomStringOf32CharsExactly
 
+
 DB_CONNECTION=mysql
 DB_HOST=localhost
 DB_DATABASE=homestead
@@ -20,6 +21,8 @@ EMAIL_USERNAME=
 EMAIL_PASSWORD=
 EMAIL_PRETEND=false
 
+SHOW_INCOMPLETE_TRANSLATIONS=false
+
 ANALYTICS_ID=
 RUNCLEANUP=true
 SITE_OWNER=mail@example.com

README.md

@@ -19,7 +19,6 @@ their current cashflow. There are tons of ways to save and earn money.
 
 Firefly works on the principle that if you know where you're money is going, you can stop it from going there.
 
- 
 To get to know Firefly, and to see if it fits you, check out these resources:
 
 - The screenshots below on this very page.
@@ -88,7 +87,13 @@ This site always runs the latest version of Firefly III. If you want to use it,
 
 You should always run Firefly III on a site with TLS enabled (https://). Please note that although some parts of the
 database are encrypted (transaction descriptions, names, etc.) some parts are _not_ (amounts, dates, etc). If you need
-more security, you must enable transparent database encryption or a comparable technology.
+more security, you must enable transparent database encryption or a comparable technology. Please remember that this
+is open source software under active development, and it is in no way guaranteed to be safe or secure.
+
+## Translations
+
+Firefly III is currently available in Dutch and English. Support for other languages is being worked on. I can use
+your help. Checkout [Crowdin](https://crowdin.com/project/firefly-iii) for more information.
 
 ## Credits
 

app/Generator/Chart/Account/ChartJsAccountChartGenerator.php

@@ -105,8 +105,7 @@ class ChartJsAccountChartGenerator implements AccountChartGenerator
     public function frontpage(Collection $accounts, Carbon $start, Carbon $end)
     {
         // language:
-        $language = Preferences::get('language', env('DEFAULT_LANGUAGE','en_US'))->data;
+        $format   = trans('config.month_and_day');
-        $format   = Config::get('firefly.monthAndDay.' . $language);
         $data     = [
             'count'    => 0,
             'labels'   => [],
@@ -151,8 +150,7 @@ class ChartJsAccountChartGenerator implements AccountChartGenerator
     public function single(Account $account, Carbon $start, Carbon $end)
     {
         // language:
-        $language = Preferences::get('language', env('DEFAULT_LANGUAGE','en_US'))->data;
+        $format   = trans('config.month_and_day');
-        $format   = Config::get('firefly.monthAndDay.' . $language);
 
         $data = [
             'count'    => 1,

app/Generator/Chart/Bill/ChartJsBillChartGenerator.php

@@ -71,8 +71,7 @@ class ChartJsBillChartGenerator implements BillChartGenerator
     public function single(Bill $bill, Collection $entries)
     {
         // language:
-        $language = Preferences::get('language', env('DEFAULT_LANGUAGE','en_US'))->data;
+        $format   = trans('config.month');
-        $format   = Config::get('firefly.month.' . $language);
 
         $data = [
             'count'    => 3,

app/Generator/Chart/Budget/ChartJsBudgetChartGenerator.php

@@ -24,7 +24,7 @@ class ChartJsBudgetChartGenerator implements BudgetChartGenerator
     public function budget(Collection $entries, $dateFormat = 'month')
     {
         // language:
-        $language = Preferences::get('language', env('DEFAULT_LANGUAGE','en_US'))->data;
+        $language = Preferences::get('language', env('DEFAULT_LANGUAGE', 'en_US'))->data;
         $format   = Config::get('firefly.' . $dateFormat . '.' . $language);
 
         $data = [
@@ -33,7 +33,7 @@ class ChartJsBudgetChartGenerator implements BudgetChartGenerator
                 [
                     'label' => 'Amount',
                     'data'  => [],
-                ]
+                ],
             ],
         ];
 
@@ -115,8 +115,7 @@ class ChartJsBudgetChartGenerator implements BudgetChartGenerator
     public function year(Collection $budgets, Collection $entries)
     {
         // language:
-        $language = Preferences::get('language', env('DEFAULT_LANGUAGE','en_US'))->data;
+        $format = trans('config.month');
-        $format   = Config::get('firefly.month.' . $language);
 
         $data = [
             'labels'   => [],

app/Generator/Chart/Category/ChartJsCategoryChartGenerator.php

@@ -101,8 +101,7 @@ class ChartJsCategoryChartGenerator implements CategoryChartGenerator
     {
 
         // language:
-        $language = Preferences::get('language', env('DEFAULT_LANGUAGE','en_US'))->data;
+        $format   = trans('config.month');
-        $format   = Config::get('firefly.month.' . $language);
 
         $data = [
             'count'    => 0,
@@ -135,8 +134,7 @@ class ChartJsCategoryChartGenerator implements CategoryChartGenerator
     {
 
         // language:
-        $language = Preferences::get('language', env('DEFAULT_LANGUAGE','en_US'))->data;
+        $format   = trans('config.month');
-        $format   = Config::get('firefly.month.' . $language);
 
         $data = [
             'count'    => 0,

app/Generator/Chart/PiggyBank/ChartJsPiggyBankChartGenerator.php

@@ -25,8 +25,7 @@ class ChartJsPiggyBankChartGenerator implements PiggyBankChartGenerator
     {
 
         // language:
-        $language = Preferences::get('language', env('DEFAULT_LANGUAGE','en_US'))->data;
+        $format   = trans('config.month_and_day');
-        $format   = Config::get('firefly.monthAndDay.' . $language);
 
         $data = [
             'count'    => 1,

app/Generator/Chart/Report/ChartJsReportChartGenerator.php

@@ -22,8 +22,7 @@ class ChartJsReportChartGenerator implements ReportChartGenerator
     public function yearInOut(Collection $entries)
     {
         // language:
-        $language = Preferences::get('language', env('DEFAULT_LANGUAGE','en_US'))->data;
+        $format   = trans('config.month');
-        $format   = Config::get('firefly.month.' . $language);
 
         $data = [
             'count'    => 2,

app/Helpers/Report/ReportHelper.php

@@ -63,7 +63,7 @@ class ReportHelper implements ReportHelperInterface
         $repository = app('FireflyIII\Repositories\Category\CategoryRepositoryInterface');
         $set        = $repository->getCategories();
         foreach ($set as $category) {
-            $spent           = $repository->balanceInPeriodForList($category, $start, $end, $accounts);
+            $spent           = $repository->balanceInPeriod($category, $start, $end, $accounts);
             $category->spent = $spent;
             $object->addCategory($category);
         }
@@ -222,7 +222,7 @@ class ReportHelper implements ReportHelperInterface
 
             // no repetition(s) for this budget:
             if ($repetitions->count() == 0) {
-                $spent      = $repository->balanceInPeriodForList($budget, $start, $end, $accounts);
+                $spent      = $repository->balanceInPeriod($budget, $start, $end, $accounts);
                 $budgetLine = new BudgetLine;
                 $budgetLine->setBudget($budget);
                 $budgetLine->setOverspent($spent);
@@ -237,7 +237,7 @@ class ReportHelper implements ReportHelperInterface
                 $budgetLine = new BudgetLine;
                 $budgetLine->setBudget($budget);
                 $budgetLine->setRepetition($repetition);
-                $expenses = $repository->balanceInPeriodForList($budget, $start, $end, $accounts);
+                $expenses = $repository->balanceInPeriod($budget, $start, $end, $accounts);
 
                 // 200 en -100 is 100, vergeleken met 0 === 1
                 // 200 en -200 is 0, vergeleken met 0 === 0

app/Http/Controllers/BudgetController.php

@@ -159,7 +159,7 @@ class BudgetController extends Controller
         // loop the budgets:
         /** @var Budget $budget */
         foreach ($budgets as $budget) {
-            $budget->spent      = $repository->balanceInPeriodForList($budget, $start, $end, $accounts);
+            $budget->spent      = $repository->balanceInPeriod($budget, $start, $end, $accounts);
             $budget->currentRep = $repository->getCurrentRepetition($budget, $start, $end);
             if ($budget->currentRep) {
                 $budgeted = bcadd($budgeted, $budget->currentRep->amount);

app/Http/Controllers/Chart/BudgetController.php

@@ -86,7 +86,7 @@ class BudgetController extends Controller
                     $budgeted = 0;
                 } else {
                     $name     = $budget->name;
-                    $sum      = $repository->balanceInPeriodForList($budget, $currentStart, $currentEnd, $accounts);
+                    $sum      = $repository->balanceInPeriod($budget, $currentStart, $currentEnd, $accounts);
                     $budgeted = $repository->getBudgetLimitRepetitions($budget, $currentStart, $currentEnd)->sum('amount');
                 }
 
@@ -144,7 +144,7 @@ class BudgetController extends Controller
             $end->subDay();
             $chartDate = clone $end;
             $chartDate->startOfMonth();
-            $spent = $repository->balanceInPeriodForList($budget, $first, $end, $accounts) * -1;
+            $spent = $repository->balanceInPeriod($budget, $first, $end, $accounts) * -1;
             $entries->push([$chartDate, $spent]);
             $first = Navigation::addPeriod($first, $range, 0);
         }
@@ -233,13 +233,13 @@ class BudgetController extends Controller
         foreach ($budgets as $budget) {
             $repetitions = $repository->getBudgetLimitRepetitions($budget, $start, $end);
             if ($repetitions->count() == 0) {
-                $expenses = $repository->balanceInPeriodForList($budget, $start, $end, $accounts) * -1;
+                $expenses = $repository->balanceInPeriod($budget, $start, $end, $accounts) * -1;
                 $allEntries->push([$budget->name, 0, 0, $expenses, 0, 0]);
                 continue;
             }
             /** @var LimitRepetition $repetition */
             foreach ($repetitions as $repetition) {
-                $expenses = $repository->balanceInPeriodForList($budget, $repetition->startdate, $repetition->enddate, $accounts) * -1;
+                $expenses = $repository->balanceInPeriod($budget, $repetition->startdate, $repetition->enddate, $accounts) * -1;
                 // $left can be less than zero.
                 // $overspent can be more than zero ( = overspending)
 
@@ -283,16 +283,17 @@ class BudgetController extends Controller
         $cache = new CacheProperties();
         $cache->addProperty($start);
         $cache->addProperty($end);
+        $cache->addProperty($report_type);
+        $cache->addProperty($accounts);
         $cache->addProperty('budget');
         $cache->addProperty('year');
         if ($cache->has()) {
             return Response::json($cache->get()); // @codeCoverageIgnore
         }
 
-        // filter empty budgets:
+//         filter empty budgets:
-
         foreach ($allBudgets as $budget) {
-            $spent = $repository->balanceInPeriodForList($budget, $start, $end, $accounts);
+            $spent = $repository->balanceInPeriod($budget, $start, $end, $accounts);
             if ($spent != 0) {
                 $budgets->push($budget);
             }
@@ -308,14 +309,14 @@ class BudgetController extends Controller
 
             // each budget, fill the row:
             foreach ($budgets as $budget) {
-                $spent = $repository->balanceInPeriodForList($budget, $start, $month, $accounts);
+                $spent = $repository->balanceInPeriod($budget, $start, $month, $accounts);
                 $row[] = $spent * -1;
             }
             $entries->push($row);
             $start->endOfMonth()->addDay();
         }
 
-        $data = $this->generator->year($allBudgets, $entries);
+        $data = $this->generator->year($budgets, $entries);
         $cache->store($data);
 
         return Response::json($data);

app/Http/Controllers/Chart/CategoryController.php

@@ -303,7 +303,9 @@ class CategoryController extends Controller
 
         $cache = new CacheProperties; // chart properties for cache:
         $cache->addProperty($start);
+        $cache->addProperty($report_type);
         $cache->addProperty($end);
+        $cache->addProperty($accounts);
         $cache->addProperty('category');
         $cache->addProperty('spent-in-year');
         if ($cache->has()) {
@@ -314,7 +316,7 @@ class CategoryController extends Controller
         $entries       = new Collection;
         $categories    = $allCategories->filter(
             function (Category $category) use ($repository, $start, $end, $accounts) {
-                $spent = $repository->balanceInPeriodForList($category, $start, $end, $accounts);
+                $spent = $repository->balanceInPeriod($category, $start, $end, $accounts);
                 if ($spent < 0) {
                     return $category;
                 }
@@ -329,7 +331,7 @@ class CategoryController extends Controller
             $row = [clone $start]; // make a row:
 
             foreach ($categories as $category) { // each budget, fill the row
-                $spent = $repository->balanceInPeriodForList($category, $start, $month, $accounts);
+                $spent = $repository->balanceInPeriod($category, $start, $month, $accounts);
                 if ($spent < 0) {
                     $row[] = $spent * -1;
                 } else {
@@ -361,6 +363,8 @@ class CategoryController extends Controller
         $cache = new CacheProperties; // chart properties for cache:
         $cache->addProperty($start);
         $cache->addProperty($end);
+        $cache->addProperty($report_type);
+        $cache->addProperty($accounts);
         $cache->addProperty('category');
         $cache->addProperty('earned-in-year');
         if ($cache->has()) {
@@ -371,7 +375,7 @@ class CategoryController extends Controller
         $allEntries    = new Collection;
         $categories    = $allCategories->filter(
             function (Category $category) use ($repository, $start, $end, $accounts) {
-                $spent = $repository->balanceInPeriodForList($category, $start, $end, $accounts);
+                $spent = $repository->balanceInPeriod($category, $start, $end, $accounts);
                 if ($spent > 0) {
                     return $category;
                 }
@@ -386,7 +390,7 @@ class CategoryController extends Controller
             $row = [clone $start]; // make a row:
 
             foreach ($categories as $category) { // each budget, fill the row
-                $spent = $repository->balanceInPeriodForList($category, $start, $month, $accounts);
+                $spent = $repository->balanceInPeriod($category, $start, $month, $accounts);
                 if ($spent > 0) {
                     $row[] = $spent;
                 } else {

app/Http/Controllers/Controller.php

@@ -36,8 +36,8 @@ abstract class Controller extends BaseController
         if (Auth::check()) {
             $pref                    = Preferences::get('language', env('DEFAULT_LANGUAGE', 'en_US'));
             $lang                    = $pref->data;
-            $this->monthFormat       = Config::get('firefly.month.' . $lang);
+            $this->monthFormat       = trans('config.month');
-            $this->monthAndDayFormat = Config::get('firefly.monthAndDay.' . $lang);
+            $this->monthAndDayFormat = trans('config.month_and_day');
 
             View::share('monthFormat', $this->monthFormat);
             View::share('monthAndDayFormat', $this->monthAndDayFormat);

app/Http/Controllers/PreferencesController.php

@@ -37,10 +37,12 @@ class PreferencesController extends Controller
         $viewRange         = $viewRangePref->data;
         $frontPageAccounts = Preferences::get('frontPageAccounts', []);
         $budgetMax         = Preferences::get('budgetMaximum', 1000);
-        $language          = Preferences::get('language', env('DEFAULT_LANGUAGE','en_US'))->data;
+        $language          = Preferences::get('language', env('DEFAULT_LANGUAGE', 'en_US'))->data;
         $budgetMaximum     = $budgetMax->data;
 
-        return view('preferences.index', compact('budgetMaximum', 'language', 'accounts', 'frontPageAccounts', 'viewRange'));
+        $showIncomplete = env('SHOW_INCOMPLETE_TRANSLATIONS', 'false') == 'true';
+
+        return view('preferences.index', compact('budgetMaximum', 'language', 'accounts', 'frontPageAccounts', 'viewRange', 'showIncomplete'));
     }
 
     /**
@@ -70,7 +72,7 @@ class PreferencesController extends Controller
 
         // language:
         $lang = Input::get('language');
-        if (in_array($lang, array_keys(Config::get('firefly.lang')))) {
+        if (in_array($lang, array_keys(Config::get('firefly.languages')))) {
             Preferences::set('language', $lang);
         }
 

app/Http/Middleware/Authenticate.php

@@ -64,9 +64,11 @@ class Authenticate
         $pref = Preferences::get('language', env('DEFAULT_LANGUAGE','en_US'));
         App::setLocale($pref->data);
         Carbon::setLocale(substr($pref->data,0,2));
+        $locale = explode(',', trans('config.locale'));
+        $locale = array_map('trim', $locale);
 
-        setlocale(LC_TIME, Config::get('firefly.locales.' . $pref->data));
+        setlocale(LC_TIME, $locale);
-        setlocale(LC_MONETARY, Config::get('firefly.locales.' . $pref->data));
+        setlocale(LC_MONETARY, $locale);
 
         return $next($request);
     }

app/Http/breadcrumbs.php

@@ -354,8 +354,7 @@ Breadcrumbs::register(
     'reports.report', function (Generator $breadcrumbs, Carbon $start, Carbon $end, $reportType, $accountIds) {
     $breadcrumbs->parent('reports.index');
 
-    $pref        = Preferences::get('language', env('DEFAULT_LANGUAGE','en_US'))->data;
+    $monthFormat = trans('config.month_and_day');
-    $monthFormat = Config::get('firefly.monthAndDay.' . $pref);
     $title       = trans('firefly.report_default', ['start' => $start->formatLocalized($monthFormat), 'end' => $end->formatLocalized($monthFormat)]);
 
     $breadcrumbs->push($title, route('reports.report', ['url' => 'abcde']));

app/Http/routes.php

@@ -284,7 +284,6 @@ Route::group(
     Route::get('/home', ['uses' => 'HomeController@index', 'as' => 'home']);
     Route::post('/daterange', ['uses' => 'HomeController@dateRange', 'as' => 'daterange']);
     Route::get('/flush', ['uses' => 'HomeController@flush', 'as' => 'flush']);
-    Route::get('/routes', ['uses' => 'HomeController@routes']);
     /**
      * Account Controller
      */

app/Repositories/Budget/BudgetRepository.php

@@ -320,22 +320,9 @@ class BudgetRepository extends ComponentRepository implements BudgetRepositoryIn
      *
      * @return string
      */
-    public function balanceInPeriodForList(Budget $budget, Carbon $start, Carbon $end, Collection $accounts)
+    public function balanceInPeriod(Budget $budget, Carbon $start, Carbon $end, Collection $accounts)
     {
-        return $this->commonBalanceInPeriodForList($budget, $start, $end, $accounts);
+        return $this->commonBalanceInPeriod($budget, $start, $end, $accounts);
-    }
-
-    /**
-     * @param Budget $budget
-     * @param Carbon $start
-     * @param Carbon $end
-     * @param bool   $shared
-     *
-     * @return string
-     */
-    public function balanceInPeriod(Budget $budget, Carbon $start, Carbon $end, $shared = true)
-    {
-        return $this->commonBalanceInPeriod($budget, $start, $end, $shared);
     }
 
     /**

app/Repositories/Budget/BudgetRepositoryInterface.php

@@ -126,19 +126,6 @@ interface BudgetRepositoryInterface
      */
     public function getWithoutBudgetSum(Carbon $start, Carbon $end);
 
-    /**
-     *
-     * Same as ::spentInPeriod but corrects journals for their amount (tags).
-     *
-     * @param Budget  $budget
-     * @param Carbon  $start
-     * @param Carbon  $end
-     * @param boolean $shared
-     *
-     * @return string
-     */
-    public function balanceInPeriod(Budget $budget, Carbon $start, Carbon $end, $shared = true);
-
     /**
      *
      * Same as ::spentInPeriod but corrects journals for a set of accounts
@@ -150,7 +137,7 @@ interface BudgetRepositoryInterface
      *
      * @return string
      */
-    public function balanceInPeriodForList(Budget $budget, Carbon $start, Carbon $end, Collection $accounts);
+    public function balanceInPeriod(Budget $budget, Carbon $start, Carbon $end, Collection $accounts);
 
     /**
      * @param array $data

app/Repositories/Category/CategoryRepository.php

@@ -242,20 +242,6 @@ class CategoryRepository extends ComponentRepository implements CategoryReposito
                    ->get(['transaction_journals.*']);
     }
 
-    /**
-     * @param Category $category
-     * @param Carbon   $start
-     * @param Carbon   $end
-     *
-     * @param bool     $shared
-     *
-     * @return string
-     */
-    public function balanceInPeriod(Category $category, Carbon $start, Carbon $end, $shared = false)
-    {
-        return $this->commonBalanceInPeriod($category, $start, $end, $shared);
-    }
-
     /**
      * @param Category   $category
      * @param Carbon     $start
@@ -264,9 +250,9 @@ class CategoryRepository extends ComponentRepository implements CategoryReposito
      *
      * @return string
      */
-    public function balanceInPeriodForList(Category $category, Carbon $start, Carbon $end, Collection $accounts)
+    public function balanceInPeriod(Category $category, Carbon $start, Carbon $end, Collection $accounts)
     {
-        return $this->commonBalanceInPeriodForList($category, $start, $end, $accounts);
+        return $this->commonBalanceInPeriod($category, $start, $end, $accounts);
     }
 
     /**

app/Repositories/Category/CategoryRepositoryInterface.php

@@ -147,21 +147,7 @@ interface CategoryRepositoryInterface
     public function getWithoutCategory(Carbon $start, Carbon $end);
 
     /**
-     * Corrected for tags.
+     * Corrected for tags and list of accounts.
-     *
-     * @param Category       $category
-     * @param \Carbon\Carbon $start
-     * @param \Carbon\Carbon $end
-     *
-     * @param bool           $shared
-     *
-     * @return string
-     */
-    public function balanceInPeriod(Category $category, Carbon $start, Carbon $end, $shared = false);
-
-
-    /**
-     * Corrected for tags.
      *
      * @param Category       $category
      * @param \Carbon\Carbon $start
@@ -170,7 +156,7 @@ interface CategoryRepositoryInterface
      *
      * @return string
      */
-    public function balanceInPeriodForList(Category $category, Carbon $start, Carbon $end, Collection $accounts);
+    public function balanceInPeriod(Category $category, Carbon $start, Carbon $end, Collection $accounts);
 
     /**
      * @param Category       $category

app/Repositories/Shared/ComponentRepository.php

@@ -17,55 +17,6 @@ use Illuminate\Support\Collection;
 class ComponentRepository
 {
 
-
-    /**
-     * @param        $object
-     * @param Carbon $start
-     * @param Carbon $end
-     *
-     * @param bool   $shared
-     *
-     * @return string
-     */
-    protected function commonBalanceInPeriod($object, Carbon $start, Carbon $end, $shared = false)
-    {
-        $cache = new CacheProperties; // we must cache this.
-        $cache->addProperty($object->id);
-        $cache->addProperty(get_class($object));
-        $cache->addProperty($start);
-        $cache->addProperty($end);
-        $cache->addProperty($shared);
-        $cache->addProperty('balanceInPeriod');
-
-        if ($cache->has()) {
-            return $cache->get(); // @codeCoverageIgnore
-        }
-
-        if ($shared === true) { // shared is true: always ignore transfers between accounts!
-            $sum = $object->transactionjournals()
-                          ->transactionTypes([TransactionType::WITHDRAWAL, TransactionType::DEPOSIT, TransactionType::OPENING_BALANCE])
-                          ->before($end)
-                          ->after($start)
-                          ->get(['transaction_journals.*'])->sum('amount');
-        } else {
-            // do something else, SEE budgets.
-            // get all journals in this month where the asset account is NOT shared.
-            $sum = $object->transactionjournals()->before($end)->after($start)
-                          ->leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
-                          ->leftJoin('accounts', 'accounts.id', '=', 'transactions.account_id')
-                          ->transactionTypes([TransactionType::WITHDRAWAL, TransactionType::DEPOSIT, TransactionType::OPENING_BALANCE])
-                          ->leftJoin(
-                              'account_meta', function (JoinClause $join) {
-                              $join->on('account_meta.account_id', '=', 'accounts.id')->where('account_meta.name', '=', 'accountRole');
-                          }
-                          )->where('account_meta.data', '!=', '"sharedAsset"')->get(['transaction_journals.*'])->sum('amount');
-        }
-
-        $cache->store($sum);
-
-        return $sum;
-    }
-
     /**
      * @param            $object
      * @param Carbon     $start
@@ -74,7 +25,7 @@ class ComponentRepository
      *
      * @return string
      */
-    protected function commonBalanceInPeriodForList($object, Carbon $start, Carbon $end, Collection $accounts)
+    protected function commonBalanceInPeriod($object, Carbon $start, Carbon $end, Collection $accounts)
     {
         $cache = new CacheProperties; // we must cache this.
         $cache->addProperty($object->id);

config/firefly.php

@@ -98,6 +98,12 @@ return [
             'Revenue account'     => 'revenue',
             'Cash account'        => 'cash',
         ],
+    'languages' => [
+        'en_US' => ['name_locale' => 'English', 'name_english' => 'English', 'complete' => true],
+        'nl_NL' => ['name_locale' => 'Nederlands', 'name_english' => 'Dutch', 'complete' => true],
+        'pt_BR' => ['name_locale' => 'Português do Brasil', 'name_english' => 'Portugese (Brazil)', 'complete' => false],
+        'fr_FR' => ['name_locale' => 'Français', 'name_english' => 'French', 'complete' => false],
+    ],
     'lang'                     => [
         'en_US' => 'English',
         'nl_NL' => 'Nederlands',

resources/lang/en_US/breadcrumbs.php

@@ -27,8 +27,8 @@ return [
 
     // reports
     'reports'               => 'Reports',
-    'monthly_report'        => 'Montly report for :date',
+    'monthly_report'        => 'Monthly report for :date',
-    'monthly_report_shared' => 'Montly report for :date (including shared accounts)',
+    'monthly_report_shared' => 'Monthly report for :date (including shared accounts)',
     'yearly_report'         => 'Yearly report for :date',
     'yearly_report_shared'  => 'Yearly report for :date (including shared accounts)',
     'budget_report'         => 'Budget report for :date',

resources/lang/en_US/config.php

@@ -0,0 +1,8 @@
+<?php
+
+return [
+    'locale'        => 'en, English, en_US, en_US.utf8',
+    'month'         => '%B %Y',
+    'month_and_day' => '%B %e, %Y',
+
+];

resources/lang/en_US/firefly.php

@@ -2,6 +2,7 @@
 
 return [
     // general stuff:
+    'language_incomplete'              => 'This language is not yet fully translated',
     'test'                             => 'You have selected English.',
     'close'                            => 'Close',
     'pleaseHold'                       => 'Please hold...',
@@ -67,8 +68,7 @@ return [
     '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' .
+    '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.',
-                                          ' 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.',
@@ -109,23 +109,15 @@ return [
     'csv_define_column_roles'          => 'Define column roles',
     'csv_map_values'                   => 'Map found values to existing values',
     'csv_download_config'              => 'Download CSV configuration file.',
-    'csv_index_text'                   => 'This form allows you to import a CSV file with transactions into Firefly. It is based on the excellent CSV' .
+    'csv_index_text'                   => 'This form allows you to import a CSV file with transactions into Firefly. It is based on the excellent CSV importer made by the folks at <a href="https://www.atlassian.com/">Atlassian</a>. Simply upload your CSV file and follow the instructions. If you would like to learn more, please click on the <i class="fa fa-question-circle"></i> button at the top of this page.',
-                                          ' importer made by the folks at <a href="https://www.atlassian.com/">Atlassian</a>. Simply upload your CSV' .
-                                          ' file and follow the instructions. If you would like to learn more, please click on the <i ' .
-                                          'class="fa fa-question-circle"></i> button at the top of this page.',
     'csv_index_beta_warning'           => 'This tool is very much in beta. Please proceed with caution',
     'csv_header_help'                  => 'Check this box when your CSV file\'s first row consists of column names, not actual data',
-    'csv_date_help'                    => 'Date time format in your CSV. Follow the format like <a href="https://secure.php.net/manual/en/' .
+    'csv_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.',
-                                          'datetime.createfromformat.php#refsect1-datetime.createfromformat-parameters">this page</a> ' .
-                                          'indicates. The default value will parse dates that look like this: ' . date('Ymd'),
     'csv_csv_file_help'                => 'Select the CSV file here. You can only upload one file at a time',
     'csv_csv_config_file_help'         => 'Select your CSV import configuration here. If you do not know what this is, ignore it. It will be explained later.',
     'csv_upload_button'                => 'Start importing CSV',
     'csv_column_roles_title'           => 'Define column roles',
-    'csv_column_roles_text'            => 'Firefly does not know what each column means. You need to indicate what every column is. ' .
+    'csv_column_roles_text'            => 'Firefly does not know what each column means. You need to indicate what every column is. Please check out the example data if you\'re not sure yourself. Click on the question mark (top right of the page) to learn what each column means. If you want to map imported data onto existing data in Firefly, use the checkbox. The next step will show you what this button does.',
-                                          'Please check out the example data if you\'re not sure yourself. Click on the question mark ' .
-                                          '(top right of the page) to learn what each column means. If you want to map imported data ' .
-                                          'onto existing data in Firefly, use the checkbox. The next step will show you what this button does.',
     'csv_column_roles_table'           => 'Column roles',
     'csv_column'                       => 'CSV column',
     'csv_column_name'                  => 'CSV column name',
@@ -135,15 +127,13 @@ return [
     'csv_continue'                     => 'Continue to the next step',
     'csv_go_back'                      => 'Go back to the previous step',
     'csv_map_title'                    => 'Map found values to existing values',
-    'csv_map_text'                     => 'This page allows you to map the values from the CSV file to existing entries in your ' .
+    'csv_map_text'                     => 'This page allows you to map the values from the CSV file to existing entries in your database. This ensures that accounts and other things won\'t be created twice.',
-                                          'database. This ensures that accounts and other things won\'t be created twice.',
     'csv_field_value'                  => 'Field value from CSV',
     'csv_field_mapped_to'              => 'Must be mapped to...',
     'csv_do_not_map'                   => 'Do not map this value',
     'csv_download_config_title'        => 'Download CSV configuration',
     'csv_download_config_text'         => 'Everything you\'ve just set up can be downloaded as a configuration file. Click the button to do so.',
-    'csv_more_information_text'        => 'If the import fails, you can use this configuration file so you don\'t have to start all ' .
+    'csv_more_information_text'        => 'If the import fails, you can use this configuration file so you don\'t have to start all over again. But, if the import succeeds, it will be easier to upload similar CSV files.',
-                                          'over again. But, if the import succeeds, it will be easier to upload similar CSV files.',
     'csv_do_download_config'           => 'Download configuration file.',
     'csv_empty_description'            => '(empty description)',
     'csv_upload_form'                  => 'CSV upload form',
@@ -189,11 +179,9 @@ return [
     'csv_column_tags-space'            => 'Tags (space separated)',
     'csv_specifix_RabobankDescription' => 'Select this when you\'re importing Rabobank CSV export files.',
     'csv_specifix_Dummy'               => 'Checking this has no effect whatsoever.',
-    'csv_import_account_help'          => 'If your CSV file does NOT contain information about your asset account(s), use this dropdown to select to which'
+    'csv_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.',
-                                          . ' account the transactions in the CSV belong to.',
     'csv_date_parse_error'             => 'Could not parse a valid date from ":value", using the format ":format". Are you sure your CSV is correct?',
 
-
     // create new stuff:
     'create_new_withdrawal'            => 'Create new withdrawal',
     'create_new_deposit'               => 'Create new deposit',
@@ -204,7 +192,6 @@ return [
     'create_new_piggy_bank'            => 'Create new piggy bank',
     'create_new_bill'                  => 'Create new bill',
 
-
     // currencies:
     'create_currency'                  => 'Create a new currency',
     'edit_currency'                    => 'Edit currency ":name"',
@@ -476,7 +463,6 @@ return [
     '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"',
     'new_tag'                          => 'Make new tag',
     'edit_tag'                         => 'Edit tag ":tag"',
@@ -485,17 +471,8 @@ return [
     'tag_title_nothing'                => 'Default tags',
     'tag_title_balancingAct'           => 'Balancing act tags',
     'tag_title_advancePayment'         => 'Advance payment tags',
-    'tags_introduction'        => 'Usually tags are singular words, designed to quickly band items together using things like' .
+    'tags_introduction'                => 'Usually tags are singular words, designed to quickly band items together using things like <span class="label label-info">expensive</span>, <span class="label label-info">bill</span> or <span class="label label-info">for-party</span>. In Firefly III, tags can have more properties such as a date, description and location. This allows you to join transactions together in a more meaningful way. For example, you could make a tag called <span class="label label-success"> Christmas dinner with friends</span> and add information about the restaurant. Such tags are "singular", you would only use them for a single occasion, perhaps with multiple transactions.',
-                                  ' <span class="label label-info">expensive</span>, <span class="label label-info">bill</span>' .
+    'tags_group'                       => 'Tags group transactions together, which makes it possible to store reimbursements (in case you front money for others) and other "balancing acts" where expenses are summed up (the payments on your new TV) or where expenses and deposits are cancelling each other out (buying something with saved money). It\'s all up to you. Using tags the old-fashioned way is of course always possible.',
-                                  ' or <span class="label label-info">for-party</span>. In Firefly III, tags can have more properties' .
-                                  ' such as a date, description and location. This allows you to join transactions together in a more' .
-                                  ' meaningful way. For example, you could make a tag called <span class="label label-success">' .
-                                  'Christmas dinner with friends</span> and add information about the restaurant. Such tags are "singular",' .
-                                  ' you would only use them for a single occasion, perhaps with multiple transactions.',
-    'tags_group'               => 'Tags group transactions together, which makes it possible to store reimbursements (in case you front money' .
-                                  ' for others) and other "balancing acts" where expenses are summed up (the payments on your new TV) or where ' .
-                                  'expenses and deposits are cancelling each other out (buying something with saved money). It\'s all up to you.' .
-                                  ' Using tags the old-fashioned way is of course always possible. ',
     'tags_start'                       => 'Create a tag to get started or enter tags when creating new transactions.',
 
 ];

resources/lang/en_US/form.php

@@ -88,16 +88,10 @@ return [
     'tag_areYouSure'        => 'Are you sure you want to delete the tag ":tag"?',
 
     'permDeleteWarning'          => 'Deleting stuff from Firely is permanent and cannot be undone.',
-    'also_delete_transactions'   => 'The only transaction connected to this account will be deleted as well.' .
+    '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.',
-                                    '|All :count transactions connected to this account 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.',
-    'also_delete_piggyBanks'     => 'The only 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.',
-                                    '|All :count piggy bank connected to this account will be deleted as well.',
+    'budget_keep_transactions'   => 'The only transaction connected to this budget will not be deleted.|All :count transactions connected to this budget will spared deletion.',
-    'bill_keep_transactions'     => 'The only transaction connected to this bill will not be deleted.' .
+    'category_keep_transactions' => 'The only transaction connected to this category will not be deleted.|All :count transactions connected to this category will spared deletion.',
-                                    '|All :count transactions connected to this bill 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.',
-    '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.',
 ];

resources/lang/en_US/help.php

@@ -20,23 +20,23 @@ 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.',
 
 
-    'register'                => 'register',
+    'index'                    => 'index',
-    'index'                   => 'The main index',
     'home'                     => 'home',
-    'flush'                   => 'flush',
     'accounts-index'           => 'accounts.index',
     'accounts-create'          => 'accounts.create',
     'accounts-edit'            => 'accounts.edit',
     'accounts-delete'          => 'accounts.delete',
     'accounts-show'            => 'accounts.show',
+    'attachments-edit'         => 'attachments.edit',
+    'attachments-delete'       => 'attachments.delete',
+    'attachments-show'         => 'attachments.show',
+    'attachments-preview'      => 'attachments.preview',
     'bills-index'              => 'bills.index',
-    'bills-rescan'            => 'bills.rescan',
     'bills-create'             => 'bills.create',
     'bills-edit'               => 'bills.edit',
     'bills-delete'             => 'bills.delete',
     'bills-show'               => 'bills.show',
     'budgets-index'            => 'budgets.index',
-    'budgets-income'          => 'budgets.income',
     'budgets-create'           => 'budgets.create',
     'budgets-edit'             => 'budgets.edit',
     'budgets-delete'           => 'budgets.delete',
@@ -47,26 +47,19 @@ return [
     'categories-edit'          => 'categories.edit',
     'categories-delete'        => 'categories.delete',
     'categories-show'          => 'categories.show',
+    'categories-show-date'     => 'categories.show.date',
     'categories-noCategory'    => 'categories.noCategory',
-    'csv-index'               => 'Upload and import a CSV file',
+    'csv-index'                => 'csv.index',
+    'csv-column-roles'         => 'csv.column-roles',
+    'csv-map'                  => 'csv.map',
+    'csv-download-config-page' => 'csv.download-config-page',
+    'csv-process'              => 'csv.process',
     'currency-index'           => 'currency.index',
     'currency-create'          => 'currency.create',
     'currency-edit'            => 'currency.edit',
     'currency-delete'          => 'currency.delete',
-    'currency-default'        => 'currency.default',
-    'help-show'               => 'help.show',
-    'json-expense-accounts'   => 'json.expense-accounts',
-    'json-revenue-accounts'   => 'json.revenue-accounts',
-    'json-categories'         => 'json.categories',
-    'json-tags'               => 'json.tags',
-    'json-box-in'             => 'json.box.in',
-    'json-box-out'            => 'json.box.out',
-    'json-box-paid'           => 'json.box.paid',
-    'json-box-unpaid'         => 'json.box.unpaid',
     'new-user-index'           => 'new-user.index',
     'piggy-banks-index'        => 'piggy-banks.index',
-    'piggy-banks-addMoney'    => 'piggy-banks.addMoney',
-    'piggy-banks-removeMoney' => 'piggy-banks.removeMoney',
     'piggy-banks-create'       => 'piggy-banks.create',
     'piggy-banks-edit'         => 'piggy-banks.edit',
     'piggy-banks-delete'       => 'piggy-banks.delete',
@@ -76,8 +69,7 @@ return [
     'profile-change-password'  => 'profile.change-password',
     'profile-delete-account'   => 'profile.delete-account',
     'reports-index'            => 'reports.index',
-    'reports-year'            => 'reports.year',
+    'reports-report'           => 'reports.report',
-    'reports-month'           => 'reports.month',
     'search'                   => 'search',
     'tags-index'               => 'tags.index',
     'tags-create'              => 'tags.create',
@@ -89,5 +81,4 @@ return [
     'transactions-edit'        => 'transactions.edit',
     'transactions-delete'      => 'transactions.delete',
     'transactions-show'        => 'transactions.show',
-    'logout'                  => 'logout',
 ];

resources/lang/en_US/list.php

@@ -14,7 +14,7 @@ return [
     'matchingAmount' => 'Amount',
     'lastMatch'      => 'Last match',
     'expectedMatch'  => 'Expected match',
-    'automatch'      => 'Automatch?',
+    'automatch'      => 'Auto match?',
     'repeat_freq'    => 'Repeats',
     'description'    => 'Description',
     'amount'         => 'Amount',

resources/lang/fr_FR/config.php

@@ -0,0 +1,8 @@
+<?php
+
+return [
+    'locale'        => 'fr, French, fr_FR, fr_FR.utf8',
+    'month'         => '%B %Y',
+    'month_and_day' => '%e %B %Y',
+
+];

resources/lang/fr_FR/list.php

@@ -14,7 +14,7 @@ return [
     'matchingAmount' => 'Amount',
     'lastMatch'      => 'Last match',
     'expectedMatch'  => 'Expected match',
-    'automatch'      => 'Automatch?',
+    'automatch'      => 'Auto match?',
     'repeat_freq'    => 'Repeats',
     'description'    => 'Description',
     'amount'         => 'Amount',

resources/lang/nl_NL/config.php

@@ -0,0 +1,8 @@
+<?php
+
+return [
+    'locale'        => 'nl, Dutch, nl_NL, nl_NL.utf8',
+    'month'         => '%B %Y',
+    'month_and_day' => '%e %B %Y',
+
+];

resources/lang/nl_NL/firefly.php

@@ -41,8 +41,8 @@ return [
     'store_new_tag'                    => 'Sla tag op',
     'update_tag'                       => 'Sla wijzigingen op',
     'no_location_set'                  => 'Zonder plaats',
-    'location'                         => 'Plaats',
     'meta_data'                        => 'Metagegevens',
+    'location'                         => 'Plaats',
 
     // preferences
     'pref_home_screen_accounts'        => 'Voorpaginarekeningen',
@@ -67,8 +67,7 @@ return [
     'new_password'                     => 'Nieuw wachtwoord',
     'new_password_again'               => 'Nieuw wachtwoord (bevestiging)',
     'delete_your_account'              => 'Verwijder je account',
-    'delete_your_account_help'         => 'Als je je account verwijderd worden ook al je rekeningen, transacties en <em>alle andere zaken</em> verwijderd.' .
+    'delete_your_account_help'         => 'Als je je account verwijdert worden ook al je rekeningen, transacties en <em>alle andere zaken</em> verwijderd. Alles is dan WEG.',
-                                          ' Alles is dan WEG.',
     'delete_your_account_password'     => 'Voer je wachtwoord in om door te gaan.',
     'password'                         => 'Wachtwoord',
     'are_you_sure'                     => 'Zeker weten? Je kan niet meer terug!',
@@ -78,7 +77,8 @@ return [
     'should_change'                    => 'Vul ook echt een ander wachtwoord in.',
     'invalid_password'                 => 'Ongeldig wachtwoord!',
 
-    // attach
+
+    // attachments
     'nr_of_attachments'                => 'Eén bijlage|:count bijlagen',
     'attachments'                      => 'Bijlagen',
     'edit_attachment'                  => 'Wijzig bijlage ":name"',
@@ -108,25 +108,15 @@ return [
     'csv_define_column_roles'          => 'Bepaal kolominhoud',
     'csv_map_values'                   => 'Leg relaties met kolomwaardes',
     'csv_download_config'              => 'Download CSV configuratiebestand.',
-    'csv_index_text'                   => 'Met deze (en de komende) pagina\'s kan je kommagescheiden tekstbestanden importeren. Deze tool is gebaseerd '
+    'csv_index_text'                   => 'Met deze (en de komende) pagina\'s kan je kommagescheiden tekstbestanden importeren. Deze tool is gebaseerd op de prachtige tool van <a href="https://www.atlassian.com/">Atlassian</a>. Om te beginnen selecteer je jouw tekstbestand bij "CSV-bestand". Als je hulp nodig hebt, klik dan op het <i class="fa fa-question-circle"></i>-icoontje rechtsboven.',
-                                          . 'op de prachtige tool van <a href="https://www.atlassian.com/">Atlassian</a>. Om te beginnen selecteer'
-                                          . ' je jouw tekstbestand bij "CSV-bestand". '
-                                          . 'Als je hulp nodig hebt, klik dan op het <i class="fa fa-question-circle"></i>-icoontje rechtsboven.',
     'csv_index_beta_warning'           => 'Deze tool is nog erg experimenteel. Wees dus voorzichtig.',
-    'csv_header_help'                  => 'Zet hier een vinkje als de eerste rij van je tekstbestand bestaat uit kolomnamen,'
+    'csv_header_help'                  => 'Zet hier een vinkje als de eerste rij van het CSV-bestand de namen van de kolommen bevat',
-                                          . 'en niet uit daadwerkelijke gegevens.',
+    'csv_date_help'                    => 'Het gebruikte datumformaat in jouw bestand. Gebruik het formaat zoals <a href="https://secure.php.net/manual/en/datetime.createfromformat.php#refsect1-datetime.createfromformat-parameters">deze pagina</a> het uitlegt (Engels). Het standaardformaat kan omgaan met data zoals deze: :dateExample.',
-    'csv_date_help'                    => 'Het gebruikte datumformaat in jouw bestand. Gebruik het formaat zoals <a href="https://secure.'
-                                          . 'php.net/manual/en/datetime.createfromformat.php#refsect1-datetime.createfromformat-parameters">deze'
-                                          . ' pagina</a> het uitlegt (Engels). Het standaardformaat kan omgaan met data zoals deze: ' . date('Ymd'),
     'csv_csv_file_help'                => 'Voer hier je kommagescheiden tekstbestand in. Je kan er maar één tegelijkertijd invoeren.',
     'csv_csv_config_file_help'         => 'Voer hier je configuratiebestand in. Als je deze niet hebt, geen zorgen. Latere stappen leggen dit uit.',
     'csv_upload_button'                => 'Begin de import',
     'csv_column_roles_title'           => 'Bepaal de inhoud van elke kolom',
-    'csv_column_roles_text'            => 'Firefly kan niet automatisch ontdekken wat elke kolom betekent. Je moet het zelf aangeven. Gebruik de'
+    'csv_column_roles_text'            => 'Firefly kan niet automatisch ontdekken wat elke kolom betekent. Je moet het zelf aangeven. Gebruik de voorbeeldgegevens als je het ook niet zeker weet. Klik op het vraagteken-icoontje (rechtsboven) om te ontdekken wat elke kolomsoort precies is. Als de kolominhoud een directe relatie heeft met gegevens die al in Firefly staan, gebruik dan het vinkje. Tijdens de volgende stap komt Firefly hier dan op terug.',
-                                          . ' voorbeeldgegevens als je het ook niet zeker weet. Klik op het <i class="fa fa-question-circle"></i>-icoontje '
-                                          . 'rechtsboven om te ontdekken wat elke kolomsoort precies is. Als de kolominhoud een directe'
-                                          . ' relatie heeft met gegevens'
-                                          . ' die al in Firefly staan, gebruik dan het vinkje. Tijdens de volgende stap komt Firefly hier dan op terug.',
     'csv_column_roles_table'           => 'Kolominhoud',
     'csv_column'                       => 'CSV-kolom',
     'csv_column_name'                  => 'CSV-kolomnaam',
@@ -136,29 +126,24 @@ return [
     'csv_continue'                     => 'Naar de volgende stap',
     'csv_go_back'                      => 'Terug naar de vorige stap',
     'csv_map_title'                    => 'Leg relaties met kolomwaardes',
-    'csv_map_text'                     => 'Sommige kolommen bevatten waardes die misschien al in Firefly bestaan. Selecteer hier de juiste combinaties'
+    'csv_map_text'                     => 'Sommige kolommen bevatten waardes die misschien al in Firefly bestaan. Selecteer hier de juiste combinaties zodat het importeren netjes aansluit bij je huidige gegevens.',
-                                          . 'zodat het importeren netjes aansluit bij je huidige gegevens.',
     'csv_field_value'                  => 'Veldwaarde',
     'csv_field_mapped_to'              => 'Is gelijk aan',
     'csv_do_not_map'                   => 'Geen relatie',
     'csv_download_config_title'        => 'Download importconfiguratie',
-    'csv_download_config_text'         => 'Firefly is klaar om je bestand te importeren. De instellingen en selecties die je zojuist hebt gemaakt' .
+    'csv_download_config_text'         => 'Alles wat je nu hebt zitten instellen kan je downloaden als configuratiebestand voor de volgende keer. Klik op de knop om dit te doen.',
-                                          ' kan je downloaden en opslaan. Bij de volgende keer kan je dit bestand ook uploaden. Als je' .
+    'csv_more_information_text'        => 'Ook als het importeren fout gaat is dit bestand handig. Na het importeren krijg je nogmaals de gelegenheid dit bestand te downloaden.',
-                                          ' kommagescheiden bestand dezelfde indeling heeft, zullen alle selecties goed staan. Dat scheelt weer!',
-    'csv_more_information_text'        => 'Ook als het importeren fout gaat is dit bestand handig. Na het importeren krijg je nogmaals' .
-                                          ' de gelegenheid dit bestand te downloaden.',
     'csv_do_download_config'           => 'Download het configuratiebestand',
     'csv_empty_description'            => '(geen beschrijving)',
     'csv_upload_form'                  => 'CSV upload formulier',
     'csv_index_unsupported_warning'    => 'Het volgende wordt nog niet ondersteund:',
-    'csv_unsupported_map'              => 'The importer cannot map the column ":columnRole" to existing values in the database.',
+    'csv_unsupported_map'              => 'De tool kan de kolom ":columnRole" niet koppelen aan bestaande gegevens in de database.',
-    'csv_unsupported_value'            => 'The importer does not know how to handle values in columns marked as ":columnRole".',
+    'csv_unsupported_value'            => 'Firefly kan niet omgaan met kolommen gemarkeerd als ":columnRole".',
-    'csv_cannot_store_value'           => 'The importer has not reserved space for columns marked ":columnRole" and will be incapable of processing them.',
+    'csv_cannot_store_value'           => 'Firefly heeft geen ruimte gereserveerd voor kolommen gemarkeert als ":columnRole" en kan ze helaas niet verwerken.',
     'csv_process_title'                => 'Het importeren is klaar',
     'csv_process_text'                 => ':rows rijen zijn verwerkt.',
     'csv_row'                          => 'Rij',
-    'csv_import_with_errors'           => 'Er was één fout. Deze foutmelding is mogelijk in het Engels.|Er zijn :errors fouten opgetreden. De foutmeldingen'
+    'csv_import_with_errors'           => 'Er ging één ding fout.|Er gingen :errors dingen fout.',
-                                          . ' zijn mogelijk in het Engels.',
     'csv_error_see_logs'               => 'De logboeken bevatten mogelijk meer details.',
     'csv_process_new_entries'          => 'Firefly heeft :imported nieuwe transactie(s) gemaakt.',
     'csv_start_over'                   => 'Begin opnieuw',
@@ -194,8 +179,7 @@ return [
     'csv_specifix_RabobankDescription' => 'Vink dit aan als je Rabobank bestanden importeert.',
     'csv_specifix_Dummy'               => 'Dit vinkje doet niks (dummy).',
     'csv_import_account_help'          => 'Als jouw CSV bestand geen referenties bevat naar jouw rekening(en), geef dan hier aan om welke rekening het gaat.',
-    'csv_date_parse_error'             => 'Kan geen chocola maken van ":value" (met hulp van configuratie ":format").' .
+    'csv_date_parse_error'             => 'Firefly kan van ":value" geen datum maken, gegeven het formaat ":format". Weet je zeker dat je CSV goed is?',
-                                          ' Weet je zeker dat je CSV bestand geen fouten bevat?',
 
     // create new stuff:
     'create_new_withdrawal'            => 'Nieuwe uitgave',
@@ -235,7 +219,7 @@ return [
     'createBudget'                     => 'Maak nieuw budget',
     'inactiveBudgets'                  => 'Inactieve budgetten',
     'without_budget_between'           => 'Transacties zonder budget tussen :start en :end',
-    'budget_in_month'                  => ':name in :month',
+    'budget_in_month'                  => ':naam in :maand',
     'delete_budget'                    => 'Verwijder budget ":name"',
     'edit_budget'                      => 'Wijzig budget ":name"',
     'update_amount'                    => 'Bedrag bijwerken',
@@ -243,8 +227,8 @@ return [
 
     // bills:
     'delete_bill'                      => 'Verwijder contract ":name"',
-    'update_bill'                      => 'Wijzig contract',
     'edit_bill'                        => 'Wijzig contract ":name"',
+    'update_bill'                      => 'Wijzig contract',
     'store_new_bill'                   => 'Sla nieuw contract op',
 
     // accounts:
@@ -252,48 +236,31 @@ return [
     'details_for_expense'              => 'Overzicht voor crediteur ":name"',
     'details_for_revenue'              => 'Overzicht voor debiteur ":name"',
     'details_for_cash'                 => 'Overzicht voor contant geldrekening ":name"',
-
     'store_new_asset_account'          => 'Sla nieuwe betaalrekening op',
     'store_new_expense_account'        => 'Sla nieuwe crediteur op',
     'store_new_revenue_account'        => 'Sla nieuwe debiteur op',
-
     'edit_asset_account'               => 'Wijzig betaalrekening ":name"',
     'edit_expense_account'             => 'Wijzig crediteur ":name"',
     'edit_revenue_account'             => 'Wijzig debiteur ":name"',
-
     'delete_asset_account'             => 'Verwijder betaalrekening ":name"',
     'delete_expense_account'           => 'Verwijder crediteur ":name"',
     'delete_revenue_account'           => 'Verwijder debiteur ":name"',
-
     'asset_deleted'                    => 'Betaalrekening ":name" is verwijderd.',
     'expense_deleted'                  => 'Crediteur ":name" is verwijderd.',
     'revenue_deleted'                  => 'Debiteur ":name" is verwijderd.',
-
     'update_asset_account'             => 'Wijzig betaalrekening',
     'update_expense_account'           => 'Wijzig crediteur',
     'update_revenue_account'           => 'Wijzig debiteur',
-
     'make_new_asset_account'           => 'Nieuwe betaalrekening',
     'make_new_expense_account'         => 'Nieuwe crediteur',
     'make_new_revenue_account'         => 'Nieuwe debiteur',
-
     'asset_accounts'                   => 'Betaalrekeningen',
     'expense_accounts'                 => 'Crediteuren',
     'revenue_accounts'                 => 'Debiteuren',
-    'account_type'                  => 'Account type',
-
-    // some extra help:
     'accountExtraHelp_asset'           => '',
-    'accountExtraHelp_expense'      =>
+    'accountExtraHelp_expense'         => '',
-        'Een crediteur is een persoon of een bedrijf waar je geld aan moet betalen. Je staat bij ze in het krijt. Een verwarrende' .
+    'accountExtraHelp_revenue'         => '',
-        ' term misschien, maar zo werkt het nou eenmaal. De supermarkt, je huurbaas of de bank zijn crediteuren. Jouw ' .
+    'account_type'                     => 'Rekeningtype',
-        'geld (krediet) gaat naar hen toe. De term komt uit de wereld van de boekhouding. De uitgaves die je hier ziet zijn ' .
-        'positief, want je kijkt uit hun perspectief. Zodra jij afrekent in een winkel, komt het geld er bij hen bij (positief).',
-    'accountExtraHelp_revenue'      => 'Als je geld krijgt van een bedrijf of een persoon is dat een debiteur. ' .
-                                       'Dat kan salaris zijn, of een andere betaling. ' .
-                                       ' Ze hebben een schuld (debet) aan jou. De term komt uit de wereld van de boekhouding.' .
-                                       ' De inkomsten die je hier ziet zijn negatief, want je kijkt uit hun perspectief. Zodra een debiteur geld naar jou ' .
-                                       'overmaakt gaat het er bij hen af (negatief).',
     'save_transactions_by_moving'      => 'Bewaar deze transacties door ze aan een andere rekening te koppelen:',
 
     // categories:
@@ -301,8 +268,8 @@ return [
     'create_new_category'              => 'Nieuwe categorie',
     'without_category'                 => 'Zonder categorie',
     'update_category'                  => 'Wijzig categorie',
-    'edit_category'                 => 'Wijzig categorie ":name"',
     'categories'                       => 'Categorieën',
+    'edit_category'                    => 'Wijzig categorie ":name"',
     'no_category'                      => '(geen categorie)',
     'category'                         => 'Categorie',
     'delete_category'                  => 'Verwijder categorie ":name"',
@@ -318,10 +285,10 @@ return [
 
     // new user:
     'welcome'                          => 'Welkom bij Firefly!',
-    'createNewAsset'                => 'Maak om te beginnen een nieuwe betaalrekening. Dit is je start van je financiële beheer.',
+    'createNewAsset'                   => 'Maak om te beginnen een nieuwe betaalrekening .' .
+                                          'Hiermee kan je nieuwe transacties opslaan en beginnen met het beheren van je geld',
     'createNewAssetButton'             => 'Maak een nieuwe betaalrekening',
 
-
     // home page:
     'yourAccounts'                     => 'Je betaalrekeningen',
     'budgetsAndSpending'               => 'Budgetten en uitgaven',
@@ -371,7 +338,6 @@ return [
     'Withdrawal'                       => 'Uitgave',
     'Deposit'                          => 'Inkomsten',
     'Transfer'                         => 'Overschrijving',
-    'profile'                       => 'Profiel',
     'bill'                             => 'Contract',
     'yes'                              => 'Ja',
     'no'                               => 'Nee',
@@ -386,10 +352,7 @@ return [
     'quarterly'                        => 'Elk kwartaal',
     'half-year'                        => 'Elk half jaar',
     'yearly'                           => 'Jaarlijks',
-    'sum_of_year'                   => 'Som van jaar',
+    'profile'                          => 'Profiel',
-    'average_of_year'               => 'Gemiddelde in jaar',
-    'sum_of_years'                  => 'Som van jaren',
-    'average_of_years'              => 'Gemiddelde in jaren',
 
     // reports:
     'report_default'                   => 'Standaard financieel rapport (:start tot :end)',
@@ -426,6 +389,10 @@ return [
     'topX'                             => 'top :number',
     'showTheRest'                      => 'Laat alles zien',
     'hideTheRest'                      => 'Laat alleen de top :number zien',
+    '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',
@@ -436,7 +403,6 @@ return [
     'report_preset_ranges'             => 'Standaardbereik',
     'shared'                           => 'Gedeeld',
 
-
     // charts:
     'dayOfMonth'                       => 'Dag vd maand',
     'month'                            => 'Maand',
@@ -504,13 +470,8 @@ return [
     'tag_title_nothing'                => 'Standaard tags',
     'tag_title_balancingAct'           => 'Balancerende tags',
     'tag_title_advancePayment'         => 'Vooruitbetaalde tags',
-    'tags_introduction'             => 'Normaal gesproken zijn tags enkele woorden, gebruikt om gerelateerde zaken snel aan elkaar te plakken. ' .
+    'tags_introduction'                => 'Normaal gesproken zijn tags enkele woorden, gebruikt om gerelateerde zaken snel aan elkaar te plakken. <span class="label label-info">dure-aanschaf</span>, <span class="label label-info">rekening</span>, <span class="label label-info">feestje</span>. In Firefly III hebben tags meer betekenis en kan je er een datum, beschrijving en locatie aan geven. Daarmee kan je je transacties op een wat zinvollere manier aan elkaar koppelen. Je kan bijvoorbeeld een tag <span class="label label-success">Kerstdiner</span> maken en informatie over het restaurant meenemen. Zulke tags zijn enkelvoudig; je gebruikt ze maar bij één gelegenheid.',
-                                       '<span class="label label-info">dure-aanschaf</span>, <span class="label label-info">rekening</span>, ' .
+    'tags_group'                       => 'Omdat tags transacties groeperen kan je er teruggaves, vergoedingen en andere geldzaken mee aanduiden, zolang de transacties elkaar "opheffen". Hoe je dit aanpakt is aan jou. De gewone manier kan natuurlijk ook.',
-                                       '<span class="label label-info">feestje</span>. In Firefly III hebben tags meer betekenis en kan je er een datum' .
-                                       ', beschrijving en locatie aan geven. Daarmee kan je je transacties op een wat zinvollere manier aan elkaar ' .
-                                       'koppelen. Je kan bijvoorbeeld een tag <span class="label label-success">Kerstdiner</span> maken en informatie over' .
-                                       ' het restaurant meenemen. Zulke tags zijn enkelvoudig; je gebruikt ze maar bij één gelegenheid.',
-    'tags_group'                    => 'Omdat tags transacties groeperen kan je er teruggaves, vergoedingen en andere geldzaken mee aanduiden, zolang' .
-                                       ' de transacties elkaar "opheffen". Hoe je dit aanpakt is aan jou. De gewone manier kan natuurlijk ook.',
     'tags_start'                       => 'Maak hieronder een tag, of voer nieuwe tags in als je nieuwe transacties maakt.',
+
 ];

resources/lang/nl_NL/form.php

@@ -54,13 +54,6 @@ return [
     'specifix'                    => 'Bank- or of bestandsspecifieke opties',
     'csv_import_account'          => 'Standaard rekening voor importeren',
     'attachments[]'               => 'Bijlagen',
-
-    'title'    => 'Titel',
-    'notes'    => 'Notities',
-    'filename' => 'Bestandsnaam',
-    'mime'     => 'Bestandstype',
-    'size'     => 'Grootte',
-
     'store_new_withdrawal'        => 'Nieuwe uitgave opslaan',
     'store_new_deposit'           => 'Nieuwe inkomsten opslaan',
     'store_new_transfer'          => 'Nieuwe overschrijving opslaan',
@@ -69,6 +62,12 @@ return [
     'add_new_transfer'            => 'Maak nieuwe overschrijving',
     'noPiggybank'                 => '(geen spaarpotje)',
     'noBudget'                    => '(geen budget)',
+    'title'                       => 'Titel',
+    'notes'                       => 'Notities',
+    'filename'                    => 'Bestandsnaam',
+    'mime'                        => 'Bestandstype',
+    'size'                        => 'Grootte',
+
 
     'delete_account'    => 'Verwijder rekening ":name"',
     'delete_bill'       => 'Verwijder contract ":name"',
@@ -78,7 +77,6 @@ return [
     'delete_journal'    => 'Verwijder transactie met omschrijving ":description"',
     'delete_attachment' => 'Verwijder bijlage ":name"',
 
-    'tag_areYouSure'        => 'Weet je zeker dat je de tag met naam ":tag" wilt verwijderen?',
     '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?',
@@ -87,18 +85,13 @@ return [
     'currency_areYouSure'   => 'Weet je zeker dat je de valuta met naam ":name" wilt verwijderen?',
     'piggyBank_areYouSure'  => 'Weet je zeker dat je het spaarpotje met naam ":name" wilt verwijderen?',
     'journal_areYouSure'    => 'Weet je zeker dat je de transactie met naam ":description" wilt verwijderen?',
+    'tag_areYouSure'        => 'Weet je zeker dat je de tag met naam ":tag" wilt verwijderen?',
 
     'permDeleteWarning'          => 'Dingen verwijderen uit Firefly is permanent en kan niet ongedaan gemaakt worden.',
-    'also_delete_transactions'   => 'Ook de enige transactie verbonden aan deze rekening wordt verwijderd.' .
+    'also_delete_transactions'   => 'Ook de enige transactie verbonden aan deze rekening wordt verwijderd.|Ook alle :count transacties verbonden aan deze rekening worden verwijderd.',
-                                    '|Ook alle :count transacties verbonden aan deze rekening worden verwijderd.',
+    'also_delete_piggyBanks'     => 'Ook het spaarpotje verbonden aan deze rekening wordt verwijderd.|Ook alle :count spaarpotjes verbonden aan deze rekening worden verwijderd.',
-    'also_delete_piggyBanks'     => 'Ook het spaarpotje verbonden aan deze rekening wordt verwijderd.' .
+    'bill_keep_transactions'     => 'De transactie verbonden aan dit contract blijft bewaard.|De :count transacties verbonden aan dit contract blijven bewaard.',
-                                    '|Ook alle :count spaarpotjes verbonden aan deze rekening worden verwijderd.',
+    'budget_keep_transactions'   => 'De transactie verbonden aan dit budget blijft bewaard.|De :count transacties verbonden aan dit budget blijven bewaard.',
-    'bill_keep_transactions'     => 'De transactie verbonden aan dit contract blijft bewaard.' .
+    'category_keep_transactions' => 'De transactie verbonden aan deze categorie blijft bewaard.|De :count transacties verbonden aan deze categorie blijven bewaard.',
-                                    '|De :count transacties verbonden aan dit contract blijven bewaard.',
+    'tag_keep_transactions'      => 'De transactie verbonden aan deze tag blijft bewaard.|De :count transacties verbonden aan deze tag blijven bewaard.',
-    'budget_keep_transactions'   => 'De transactie verbonden aan dit budget blijft bewaard.' .
-                                    '|De :count transacties verbonden aan dit budget blijven bewaard.',
-    'category_keep_transactions' => 'De transactie verbonden aan deze categorie blijft bewaard.' .
-                                    '|De :count transacties verbonden aan deze categorie blijven bewaard.',
-    'tag_keep_transactions'      => 'De transactie verbonden aan deze tag blijft bewaard.' .
-                                    '|De :count transacties verbonden aan deze tag blijven bewaard.',
 ];

resources/lang/nl_NL/help.php

@@ -19,7 +19,7 @@ return [
     'main-content-end-title' => 'Einde!',
     'main-content-end-text'  => 'Elke pagina heeft een vraagtekentje rechtsboven. Gebruik deze voor meer hulp. Veel plezier!',
 
-    'csv-index'               => 'csv-index',
+
     'register'                => 'register',
     'index'                   => 'index',
     'home'                    => 'home',
@@ -48,6 +48,7 @@ return [
     'categories-delete'       => 'categories.delete',
     'categories-show'         => 'categories.show',
     'categories-noCategory'   => 'categories.noCategory',
+    'csv-index'               => 'csv-index',
     'currency-index'          => 'currency.index',
     'currency-create'         => 'currency.create',
     'currency-edit'           => 'currency.edit',

resources/lang/nl_NL/validation.php

@@ -1,80 +1,67 @@
 <?php
 
 return [
-
-    /*
-    |--------------------------------------------------------------------------
-    | Validation Language Lines
-    |--------------------------------------------------------------------------
-    |
-    | The following language lines contain the default error messages used by
-    | the validator class. Some of these rules have multiple versions such
-    | as the size rules. Feel free to tweak each of these messages here.
-    |
-    */
-
     '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.',
     'file_too_large'          => 'Bestand ":name" is te groot.',
-    "accepted"                => "The :attribute must be accepted.",
+    "accepted"                => ":attribute moet geaccepteerd zijn.",
-    "active_url"              => "The :attribute is not a valid URL.",
+    "active_url"              => ":attribute is geen geldige URL.",
-    "after"                   => "The :attribute must be a date after :date.",
+    "after"                   => ":attribute moet een datum na :date zijn.",
-    "alpha"                   => "The :attribute may only contain letters.",
+    "alpha"                   => ":attribute mag alleen letters bevatten.",
-    "alpha_dash"              => "The :attribute may only contain letters, numbers, and dashes.",
+    "alpha_dash"              => ":attribute mag alleen letters, nummers, onderstreep(_) en strepen(-) bevatten.",
-    "alpha_num"               => "The :attribute may only contain letters and numbers.",
+    "alpha_num"               => ":attribute mag alleen letters en nummers bevatten.",
-    "array"                   => "The :attribute must be an array.",
+    "array"                   => ":attribute moet geselecteerde elementen bevatten.",
-    "unique_for_user"         => "There already is an entry with this :attribute.",
+    "unique_for_user"         => "Er is al een entry met deze :attribute.",
-    "before"                  => "The :attribute must be a date before :date.",
+    "before"                  => ":attribute moet een datum voor :date zijn.",
     'unique_object_for_user'  => 'Deze naam is al in gebruik',
     'unique_account_for_user' => 'This rekeningnaam is already in use',
-    "between.numeric"         => "The :attribute must be between :min and :max.",
+    "between.numeric"         => ":attribute moet tussen :min en :max zijn.",
-    "between.file"            => "The :attribute must be between :min and :max kilobytes.",
+    "between.file"            => ":attribute moet tussen :min en :max kilobytes zijn.",
-    "between.string"          => "The :attribute must be between :min and :max characters.",
+    "between.string"          => ":attribute moet tussen :min en :max karakters zijn.",
-    "between.array"           => "The :attribute must have between :min and :max items.",
+    "between.array"           => ":attribute moet tussen :min en :max items bevatten.",
-    "boolean"                 => "The :attribute field must be true or false.",
+    "boolean"                 => ":attribute moet true of false zijn.",
-    "confirmed"               => "The :attribute confirmation does not match.",
+    "confirmed"               => ":attribute bevestiging komt niet overeen.",
-    "date"                    => "The :attribute is not a valid date.",
+    "date"                    => ":attribute moet een datum bevatten.",
-    "date_format"             => "The :attribute does not match the format :format.",
+    "date_format"             => ":attribute moet een geldig datum formaat bevatten.",
-    "different"               => "The :attribute and :other must be different.",
+    "different"               => ":attribute en :other moeten verschillend zijn.",
-    "digits"                  => "The :attribute must be :digits digits.",
+    "digits"                  => ":attribute moet bestaan uit :digits cijfers.",
-    "digits_between"          => "The :attribute must be between :min and :max digits.",
+    "digits_between"          => ":attribute moet bestaan uit minimaal :min en maximaal :max cijfers.",
-    "email"                   => "The :attribute must be a valid email address.",
+    "email"                   => ":attribute is geen geldig e-mailadres.",
-    "filled"                  => "The :attribute field is required.",
+    "filled"                  => ":attribute is verplicht.",
-    "exists"                  => "The selected :attribute is invalid.",
+    "exists"                  => ":attribute bestaat niet.",
-    "image"                   => "The :attribute must be an image.",
+    "image"                   => ":attribute moet een afbeelding zijn.",
-    "in"                      => "The selected :attribute is invalid.",
+    "in"                      => ":attribute is ongeldig.",
-    "integer"                 => "The :attribute must be an integer.",
+    "integer"                 => ":attribute moet een getal zijn.",
-    "ip"                      => "The :attribute must be a valid IP address.",
+    "ip"                      => ":attribute moet een geldig IP-adres zijn.",
-    'json'                    => 'The :attribute must be a valid JSON string.',
+    'json'                 => 'De :attribute moet een JSON tekst zijn.',
-    "max.numeric"             => "The :attribute may not be greater than :max.",
+    "max.numeric"             => ":attribute mag niet hoger dan :max zijn.",
-    "max.file"                => "The :attribute may not be greater than :max kilobytes.",
+    "max.file"                => ":attribute mag niet meer dan :max kilobytes zijn.",
-    "max.string"              => "The :attribute may not be greater than :max characters.",
+    "max.string"              => ":attribute mag niet uit meer dan :max karakters bestaan.",
-    "max.array"               => "The :attribute may not have more than :max items.",
+    "max.array"               => ":attribute mag niet meer dan :max items bevatten.",
-    "mimes"                   => "The :attribute must be a file of type: :values.",
+    "mimes"                   => ":attribute moet een bestand zijn van het bestandstype :values.",
-    "min.numeric"             => "The :attribute must be at least :min.",
+    "min.numeric"             => ":attribute moet minimaal :min zijn.",
-    "min.file"                => "The :attribute must be at least :min kilobytes.",
+    "min.file"                => ":attribute moet minimaal :min kilobytes zijn.",
-    "min.string"              => "The :attribute must be at least :min characters.",
+    "min.string"              => ":attribute moet minimaal :min karakters zijn.",
-    "min.array"               => "The :attribute must have at least :min items.",
+    "min.array"               => ":attribute moet minimaal :min items bevatten.",
-    "not_in"                  => "The selected :attribute is invalid.",
+    "not_in"                  => "Het formaat van :attribute is ongeldig.",
-    "numeric"                 => "The :attribute must be a number.",
+    "numeric"                 => ":attribute moet een nummer zijn.",
-    "regex"                   => "The :attribute format is invalid.",
+    "regex"                   => ":attribute formaat is ongeldig.",
-    "required"                => "The :attribute field is required.",
+    "required"                => ":attribute is verplicht.",
-    "required_if"             => "The :attribute field is required when :other is :value.",
+    "required_if"             => ":attribute is verplicht indien :other gelijk is aan :value.",
-    'required_unless'         => 'The :attribute field is required unless :other is in :values.',
+    'required_unless'      => ':attribute is verplicht tenzij :other gelijk is aan :values.',
-    "required_with"           => "The :attribute field is required when :values is present.",
+    "required_with"           => ":attribute is verplicht i.c.m. :values",
-    "required_with_all"       => "The :attribute field is required when :values is present.",
+    "required_with_all"       => ":attribute is verplicht i.c.m. :values",
-    "required_without"        => "The :attribute field is required when :values is not present.",
+    "required_without"        => ":attribute is verplicht als :values niet ingevuld is.",
-    "required_without_all"    => "The :attribute field is required when none of :values are present.",
+    "required_without_all"    => ":attribute is verplicht als :values niet ingevuld zijn.",
-    "same"                    => "The :attribute and :other must match.",
+    "same"                    => ":attribute en :other moeten overeenkomen.",
-    "size.numeric"            => "The :attribute must be :size.",
+    "size.numeric"            => ":attribute moet :size zijn.",
-    "size.file"               => "The :attribute must be :size kilobytes.",
+    "size.file"               => ":attribute moet :size kilobyte zijn.",
-    "size.string"             => "The :attribute must be :size characters.",
+    "size.string"             => ":attribute moet :size karakters zijn.",
-    "size.array"              => "The :attribute must contain :size items.",
+    "size.array"              => ":attribute moet :size items bevatten.",
-    "unique"                  => "The :attribute has already been taken.",
+    "unique"                  => ":attribute is al in gebruik.",
-    "url"                     => "The :attribute format is invalid.",
+    'string'                  => 'Het :attribute moet een tekenreeks zijn.',
-    'string'                  => 'The :attribute must be a string.',
+    "url"                     => ":attribute is geen geldige URL.",
-    "timezone"                => "The :attribute must be a valid zone.",
+    "timezone"                => "Het :attribute moet een geldige zone zijn.",
-
 ];

resources/lang/pt_BR/config.php

@@ -0,0 +1,8 @@
+<?php
+
+return [
+    'locale'        => 'pt_BR, pt_BR.utf8',
+    'month'         => '%B %Y',
+    'month_and_day' => '%e de %B de %Y',
+
+];

resources/lang/pt_BR/firefly.php

@@ -1,7 +1,7 @@
 <?php
 
 return [
-    // general stuff
+    // general stuff:
     'test'                             => 'Você selecionou Inglês',
     'close'                            => 'Fechar',
     'pleaseHold'                       => 'Por favor espere...',
@@ -60,14 +60,14 @@ return [
     'pref_languages_help'              => 'Firefly III suporta muitos idiomas. Qual você prefere?',
     'pref_save_settings'               => 'Salvar definições',
 
-    // profile
+    // profile:
     'change_your_password'             => 'Alterar sua senha',
     'delete_account'                   => 'Apagar conta',
     'current_password'                 => 'Senha atual',
     'new_password'                     => 'Nova senha',
     'new_password_again'               => 'Nova senha (novamente)',
     'delete_your_account'              => 'Apagar sua conta',
-    'delete_your_account_help'         => 'Exclusão da conta também excluirá todas as contas, transações, <em>qualquer coisa</em> que você poderia ter salvo em Firefly III. Tudo será perdido.',
+    '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'     => 'Coloque sua senha para continuar.',
     'password'                         => 'Senha',
     'are_you_sure'                     => 'Você tem certeza? Você não poderá desfazer isso.',
@@ -87,7 +87,7 @@ return [
     'attachment_deleted'               => 'Anexo apagado ":name"',
     'upload_max_file_size'             => 'Tamanho máximo do arquivo: :size',
 
-    // tour
+    // tour:
     'prev'                             => 'Anterior',
     'next'                             => 'Próximo',
     'end-tour'                         => 'Fim do Tour',
@@ -101,7 +101,7 @@ return [
     'title_transfer'                   => 'Transferências',
     'title_transfers'                  => 'Transferências',
 
-    // csv import
+    // csv import:
     'csv_import'                       => 'Importar arquivo CSV',
     'csv'                              => 'CSV',
     'csv_index_title'                  => 'Carregar e importar um arquivo CSV',
@@ -111,7 +111,7 @@ return [
     'csv_index_text'                   => 'This form allows you to import a CSV file with transactions into Firefly. It is based on the excellent CSV importer made by the folks at <a href="https://www.atlassian.com/">Atlassian</a>. Simply upload your CSV file and follow the instructions. If you would like to learn more, please click on the <i class="fa fa-question-circle"></i> button at the top of this page.',
     'csv_index_beta_warning'           => 'Esta ferramenta está em beta. Por favor proceder com cautela',
     'csv_header_help'                  => 'Check this box when your CSV file\'s first row consists of column names, not actual data',
-    'csv_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: 20151201',
+    'csv_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.',
     'csv_csv_file_help'                => 'Select the CSV file here. You can only upload one file at a time',
     'csv_csv_config_file_help'         => 'Select your CSV import configuration here. If you do not know what this is, ignore it. It will be explained later.',
     'csv_upload_button'                => 'Iniciando importação do CSV',
@@ -181,8 +181,7 @@ return [
     'csv_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.',
     'csv_date_parse_error'             => 'Could not parse a valid date from ":value", using the format ":format". Are you sure your CSV is correct?',
 
-
+    // create new stuff:
-    // create new stuff
     'create_new_withdrawal'            => 'Criar nova retirada',
     'create_new_deposit'               => 'Criar um novo depósito',
     'create_new_transfer'              => 'Criar nova  transferência',
@@ -192,27 +191,26 @@ return [
     'create_new_piggy_bank'            => 'Criar novo cofrinho',
     'create_new_bill'                  => 'Criar nova fatura',
 
-
+    // currencies:
-    // currencies
     'create_currency'                  => 'Criar uma nova moeda',
     'edit_currency'                    => 'Editar moeda ":name"',
     'store_currency'                   => 'Armazenar nova moeda',
     'update_currency'                  => 'Atualizar moeda',
 
-    // new user
+    // new user:
     'submit'                           => 'Enviar',
     'getting_started'                  => 'Iniciar',
     'to_get_started'                   => 'To get started with Firefly, please enter your current bank\'s name, and the balance of your checking account:',
     'savings_balance_text'             => 'If you have a savings account, please enter the current balance of your savings account:',
     'cc_balance_text'                  => 'If you have a credit card, please enter your credit card\'s limit.',
 
-    // forms
+    // forms:
     'mandatoryFields'                  => 'Campos obrigatórios',
     'optionalFields'                   => 'Campos opcionais',
     'options'                          => 'Opções',
     'something'                        => 'Qualquer coisa!',
 
-    // budgets
+    // budgets:
     'create_new_budget'                => 'Criar um novo orçamento',
     'store_new_budget'                 => 'Armazenar novo orçamento',
     'availableIn'                      => 'Disponível em :date',
@@ -227,53 +225,45 @@ return [
     'update_amount'                    => 'Update amount',
     'update_budget'                    => 'Update budget',
 
-    // bills
+    // bills:
     'delete_bill'                      => 'Delete bill ":name"',
     'edit_bill'                        => 'Edit bill ":name"',
     'update_bill'                      => 'Update bill',
     'store_new_bill'                   => 'Store new bill',
 
-    // accounts
+    // 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',
-
     'accountExtraHelp_asset'           => '',
     'accountExtraHelp_expense'         => '',
     'accountExtraHelp_revenue'         => '',
     'account_type'                     => 'Account type',
     'save_transactions_by_moving'      => 'Save these transaction(s) by moving them to another account:',
 
-    // categories
+    // categories:
     'new_category'                     => 'New category',
     'create_new_category'              => 'Create a new category',
     'without_category'                 => 'Without a category',
@@ -285,7 +275,7 @@ return [
     'delete_category'                  => 'Delete category ":name"',
     'store_category'                   => 'Store new category',
 
-    // transactions
+    // transactions:
     'update_withdrawal'                => 'Update withdrawal',
     'update_deposit'                   => 'Update deposit',
     'update_transfer'                  => 'Update transfer',
@@ -293,12 +283,13 @@ return [
     'delete_deposit'                   => 'Delete deposit ":description"',
     'delete_transfer'                  => 'Delete transfer ":description"',
 
-    // new user
+    // new user:
     'welcome'                          => 'Welcome to Firefly!',
-    'createNewAsset'                => 'Create a new asset account to get started. This will allow you to create transactions and start your financial management',
+    'createNewAsset'                   => 'Create a new asset account to get started. ' .
+                                          'This will allow you to create transactions and start your financial management',
     'createNewAssetButton'             => 'Criar nova conta de ativo',
 
-    // home page
+    // home page:
     'yourAccounts'                     => 'Your accounts',
     'budgetsAndSpending'               => 'Budgets and spending',
     'savings'                          => 'Savings',
@@ -315,7 +306,7 @@ return [
     'divided'                          => 'divided',
     'toDivide'                         => 'left to divide',
 
-    // menu and titles, should be recycled as often as possible
+    // menu and titles, should be recycled as often as possible:
     'toggleNavigation'                 => 'Toggle navigation',
     'currency'                         => 'Currency',
     'preferences'                      => 'Preferences',
@@ -363,7 +354,7 @@ return [
     'yearly'                           => 'Anual',
     'profile'                          => 'Perfil',
 
-    // reports
+    // reports:
     'report_default'                   => 'Default financial report for :start until :end',
     'quick_link_reports'               => 'Quick links',
     'quick_link_default_report'        => 'Default financial report',
@@ -412,7 +403,7 @@ return [
     'report_preset_ranges'             => 'Pre-set ranges',
     'shared'                           => 'Shared',
 
-    // charts
+    // charts:
     'dayOfMonth'                       => 'Dia do mês',
     'month'                            => 'Mês',
     'budget'                           => 'Orçamento',
@@ -437,7 +428,7 @@ return [
     'average'                          => 'Média',
     'balanceFor'                       => 'Saldo para ":name"',
 
-    // piggy banks
+    // piggy banks:
     'piggy_bank'                       => 'Cofrinho',
     'new_piggy_bank'                   => 'Criar novo cofrinho',
     'store_piggy_bank'                 => 'Store new piggy bank',
@@ -471,7 +462,6 @@ return [
     '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'                       => 'Apagar tag ":tag"',
     'new_tag'                          => 'Fazer nova tag',
     'edit_tag'                         => 'Editar tag ":tag"',
@@ -480,7 +470,7 @@ return [
     'tag_title_nothing'                => 'Tags padrões',
     'tag_title_balancingAct'           => 'Balancing act tags',
     'tag_title_advancePayment'         => 'Advance payment tags',
-    'tags_introduction'        => 'Usually tags are singular words, designed to quickly band items together using things like <span class="label label-info">expensive</span>, <span class="label label-info">bill</span> or <span class="label label-info">for-party</span>. In Firefly III, tags can have more properties such as a date, description and location. This allows you to join transactions together in a more meaningful way. For example, you could make a tag called <span class="label label-success">Christmas dinner with friends</span> and add information about the restaurant. Such tags are "singular", you would only use them for a single occasion, perhaps with multiple transactions.',
+    'tags_introduction'                => 'Usually tags are singular words, designed to quickly band items together using things like <span class="label label-info">expensive</span>, <span class="label label-info">bill</span> or <span class="label label-info">for-party</span>. In Firefly III, tags can have more properties such as a date, description and location. This allows you to join transactions together in a more meaningful way. For example, you could make a tag called <span class="label label-success"> Christmas dinner with friends</span> and add information about the restaurant. Such tags are "singular", you would only use them for a single occasion, perhaps with multiple transactions.',
     'tags_group'                       => 'Tags group transactions together, which makes it possible to store reimbursements (in case you front money for others) and other "balancing acts" where expenses are summed up (the payments on your new TV) or where expenses and deposits are cancelling each other out (buying something with saved money). It\'s all up to you. Using tags the old-fashioned way is of course always possible. ',
     'tags_start'                       => 'Create a tag to get started or enter tags when creating new transactions.',
 

resources/lang/pt_BR/form.php

@@ -68,6 +68,7 @@ return [
     'mime'                        => 'Mime type',
     'size'                        => 'Tamanho',
 
+
     'delete_account'    => 'Apagar conta ":name"',
     'delete_bill'       => 'Apagar fatura ":name"',
     'delete_budget'     => 'Delete budget ":name"',
@@ -89,7 +90,7 @@ return [
     'permDeleteWarning'          => 'Deleting stuff from Firely is permanent and cannot be undone.',
     '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_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'     => 'A única transação vinculada para esta fatura não será apagada.|Todas :count transações vinculadas a esta fatura não serão apagadas.',
+    '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.',

resources/lang/pt_BR/list.php

@@ -14,7 +14,7 @@ return [
     'matchingAmount' => 'Total',
     'lastMatch'      => 'Último equivalente',
     'expectedMatch'  => 'Equivalente esperado',
-    'automatch'      => 'Auto equivale?',
+    'automatch'      => 'Auto match?',
     'repeat_freq'    => 'Repetições',
     'description'    => 'Descrição',
     'amount'         => 'Total',

resources/lang/pt_BR/validation.php

@@ -6,63 +6,62 @@ return [
     '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.',
-    'accepted'                => 'O campo :attribute deve ser aceito.',
+    "accepted"                => "O campo :attribute deve ser aceito.",
-    'active_url'              => 'O campo :attribute não contém um URL válido.',
+    "active_url"              => "O campo :attribute não contém um URL válido.",
-    'after'                   => 'O campo :attribute deverá conter uma data posterior a :date.',
+    "after"                   => "O campo :attribute deverá conter uma data posterior a :date.",
-    'alpha'                   => 'O campo :attribute deverá conter apenas letras.',
+    "alpha"                   => "O campo :attribute deverá conter apenas letras.",
-    'alpha_dash'              => 'O campo :attribute deverá conter apenas letras, números e traços.',
+    "alpha_dash"              => "O campo :attribute deverá conter apenas letras, números e traços.",
-    'alpha_num'               => 'O campo :attribute deverá conter apenas letras e números .',
+    "alpha_num"               => "O campo :attribute deverá conter apenas letras e números .",
-    'array'                   => 'O campo :attribute precisa ser um conjunto.',
+    "array"                   => "O campo :attribute precisa ser um conjunto.",
     "unique_for_user"         => "There already is an entry with this :attribute.",
-    'before'                  => 'O campo :attribute deverá conter uma data anterior a :date.',
+    "before"                  => "O campo :attribute deverá conter uma data anterior a :date.",
     'unique_object_for_user'  => 'This name is already in use',
     'unique_account_for_user' => 'This account name is already in use',
-    'between.numeric'         => 'O campo :attribute deverá ter um valor entre :min - :max.',
+    "between.numeric"         => "O campo :attribute deverá ter um valor entre :min - :max.",
-    'between.file'            => 'O campo :attribute deverá ter um tamanho entre :min - :max kilobytes.',
+    "between.file"            => "O campo :attribute deverá ter um tamanho entre :min - :max kilobytes.",
-    'between.string'          => 'O campo :attribute deverá conter entre :min - :max caracteres.',
+    "between.string"          => "O campo :attribute deverá conter entre :min - :max caracteres.",
-    'between.array'           => 'O campo :attribute precisar ter entre :min - :max itens.',
+    "between.array"           => "O campo :attribute precisar ter entre :min - :max itens.",
-    'boolean'                 => 'O campo :attribute deverá ter o valor verdadeiro ou falso.',
+    "boolean"                 => "O campo :attribute deverá ter o valor verdadeiro ou falso.",
-    'confirmed'               => 'A confirmação para o campo :attribute não coincide.',
+    "confirmed"               => "A confirmação para o campo :attribute não coincide.",
-    'date'                    => 'O campo :attribute não contém uma data válida.',
+    "date"                    => "O campo :attribute não contém uma data válida.",
-    'date_format'             => 'A data indicada para o campo :attribute não respeita o formato :format.',
+    "date_format"             => "A data indicada para o campo :attribute não respeita o formato :format.",
-    'different'               => 'Os campos :attribute e :other deverão conter valores diferentes.',
+    "different"               => "Os campos :attribute e :other deverão conter valores diferentes.",
-    'digits'                  => 'O campo :attribute deverá conter :digits dígitos.',
+    "digits"                  => "O campo :attribute deverá conter :digits dígitos.",
-    'digits_between'          => 'O campo :attribute deverá conter entre :min a :max dígitos.',
+    "digits_between"          => "O campo :attribute deverá conter entre :min a :max dígitos.",
-    'email'                   => 'O campo :attribute não contém um endereço de email válido.',
+    "email"                   => "O campo :attribute não contém um endereço de email válido.",
-    'exists'                  => 'O valor selecionado para o campo :attribute é inválido.',
+    "filled"                  => "O campo :attribute é obrigatório.",
-    'filled'                  => 'O campo :attribute é obrigatório.',
+    "exists"                  => "O valor selecionado para o campo :attribute é inválido.",
-    'image'                   => 'O campo :attribute deverá conter uma imagem.',
+    "image"                   => "O campo :attribute deverá conter uma imagem.",
-    'in'                      => 'O campo :attribute não contém um valor válido.',
+    "in"                      => "O campo :attribute não contém um valor válido.",
-    'integer'                 => 'O campo :attribute deverá conter um número inteiro.',
+    "integer"                 => "O campo :attribute deverá conter um número inteiro.",
-    'ip'                      => 'O campo :attribute deverá conter um IP válido.',
+    "ip"                      => "O campo :attribute deverá conter um IP válido.",
     'json'                 => 'O campo :attribute deverá conter uma string JSON válida.',
-    'max.numeric'             => 'O campo :attribute não deverá conter um valor superior a :max.',
+    "max.numeric"             => "O campo :attribute não deverá conter um valor superior a :max.",
-    'max.file'                => 'O campo :attribute não deverá ter um tamanho superior a :max kilobytes.',
+    "max.file"                => "O campo :attribute não deverá ter um tamanho superior a :max kilobytes.",
-    'max.string'              => 'O campo :attribute não deverá conter mais de :max caracteres.',
+    "max.string"              => "O campo :attribute não deverá conter mais de :max caracteres.",
-    'max.array'               => 'O campo :attribute deve ter no máximo :max itens.',
+    "max.array"               => "O campo :attribute deve ter no máximo :max itens.",
-    'mimes'                   => 'O campo :attribute deverá conter um arquivo do tipo: :values.',
+    "mimes"                   => "O campo :attribute deverá conter um arquivo do tipo: :values.",
-    'min.numeric'             => 'O campo :attribute deverá ter um valor superior ou igual a :min.',
+    "min.numeric"             => "O campo :attribute deverá ter um valor superior ou igual a :min.",
-    'min.file'                => 'O campo :attribute deverá ter no mínimo :min kilobytes.',
+    "min.file"                => "O campo :attribute deverá ter no mínimo :min kilobytes.",
-    'min.string'              => 'O campo :attribute deverá conter no mínimo :min caracteres.',
+    "min.string"              => "O campo :attribute deverá conter no mínimo :min caracteres.",
-    'min.array'               => 'O campo :attribute deve ter no mínimo :min itens.',
+    "min.array"               => "O campo :attribute deve ter no mínimo :min itens.",
-    'not_in'                  => 'O campo :attribute contém um valor inválido.',
+    "not_in"                  => "O campo :attribute contém um valor inválido.",
-    'numeric'                 => 'O campo :attribute deverá conter um valor numérico.',
+    "numeric"                 => "O campo :attribute deverá conter um valor numérico.",
-    'regex'                   => 'O formato do valor para o campo :attribute é inválido.',
+    "regex"                   => "O formato do valor para o campo :attribute é inválido.",
-    'required'                => 'O campo :attribute é obrigatório.',
+    "required"                => "O campo :attribute é obrigatório.",
-    'required_if'             => 'O campo :attribute é obrigatório quando o valor do campo :other é igual a :value.',
+    "required_if"             => "O campo :attribute é obrigatório quando o valor do campo :other é igual a :value.",
     'required_unless'      => 'O campo :attribute é obrigatório a menos que :other esteja presente em :values.',
-    'required_with'           => 'O campo :attribute é obrigatório quando :values está presente.',
+    "required_with"           => "O campo :attribute é obrigatório quando :values está presente.",
-    'required_with_all'       => 'O campo :attribute é obrigatório quando um dos :values está presente.',
+    "required_with_all"       => "O campo :attribute é obrigatório quando um dos :values está presente.",
-    'required_without'        => 'O campo :attribute é obrigatório quanto :values não está presente.',
+    "required_without"        => "O campo :attribute é obrigatório quanto :values não está presente.",
-    'required_without_all'    => 'O campo :attribute é obrigatório quando nenhum dos :values está presente.',
+    "required_without_all"    => "O campo :attribute é obrigatório quando nenhum dos :values está presente.",
-    'same'                    => 'Os campos :attribute e :other deverão conter valores iguais.',
+    "same"                    => "Os campos :attribute e :other deverão conter valores iguais.",
-    'size.numeric'            => 'O campo :attribute deverá conter o valor :size.',
+    "size.numeric"            => "O campo :attribute deverá conter o valor :size.",
-    'size.file'               => 'O campo :attribute deverá ter o tamanho de :size kilobytes.',
+    "size.file"               => "O campo :attribute deverá ter o tamanho de :size kilobytes.",
-    'size.string'             => 'O campo :attribute deverá conter :size caracteres.',
+    "size.string"             => "O campo :attribute deverá conter :size caracteres.",
-    'size.array'              => 'O campo :attribute deve ter :size itens.',
+    "size.array"              => "O campo :attribute deve ter :size itens.",
+    "unique"                  => "O valor indicado para o campo :attribute já se encontra utilizado.",
     'string'                  => 'O campo :attribute deve ser uma string.',
-    'timezone'                => 'O campo :attribute deverá ter um fuso horário válido.',
+    "url"                     => "O formato do URL indicado para o campo :attribute é inválido.",
-    'unique'                  => 'O valor indicado para o campo :attribute já se encontra utilizado.',
+    "timezone"                => "O campo :attribute deverá ter um fuso horário válido.",
-    'url'                     => 'O formato do URL indicado para o campo :attribute é inválido.',
-
 ];

resources/twig/preferences/index.twig

@@ -21,9 +21,11 @@
                                 <div class="checkbox">
                                     <label>
                                         {% if account.id in frontPageAccounts.data or frontPageAccounts.data|length == 0 %}
-                                            <input type="checkbox" name="frontPageAccounts[]" value="{{ account.id }}" checked> {{ account.name }}
+                                            <input type="checkbox" name="frontPageAccounts[]" value="{{ account.id }}"
+                                                   checked> {{ account.name }}
                                         {% else %}
-                                            <input type="checkbox" name="frontPageAccounts[]" value="{{ account.id }}"> {{ account.name }}
+                                            <input type="checkbox" name="frontPageAccounts[]"
+                                                   value="{{ account.id }}"> {{ account.name }}
                                         {% endif %}
                                     </label>
                                 </div>
@@ -55,35 +57,40 @@
 
                     <div class="radio">
                         <label>
-                            <input type="radio" name="viewRange" value="1D" {% if viewRange == '1D' %} checked {% endif %}>
+                            <input type="radio" name="viewRange"
+                                   value="1D" {% if viewRange == '1D' %} checked {% endif %}>
                             {{ 'pref_1D'|_ }}
                         </label>
                     </div>
 
                     <div class="radio">
                         <label>
-                            <input type="radio" name="viewRange" value="1W" {% if viewRange == '1W' %} checked {% endif %}>
+                            <input type="radio" name="viewRange"
+                                   value="1W" {% if viewRange == '1W' %} checked {% endif %}>
                             {{ 'pref_1W'|_ }}
                         </label>
                     </div>
 
                     <div class="radio">
                         <label>
-                            <input type="radio" name="viewRange" value="1M" {% if viewRange == '1M' %} checked {% endif %}>
+                            <input type="radio" name="viewRange"
+                                   value="1M" {% if viewRange == '1M' %} checked {% endif %}>
                             {{ 'pref_1M'|_ }}
                         </label>
                     </div>
 
                     <div class="radio">
                         <label>
-                            <input type="radio" name="viewRange" value="3M" {% if viewRange == '3M' %} checked {% endif %}>
+                            <input type="radio" name="viewRange"
+                                   value="3M" {% if viewRange == '3M' %} checked {% endif %}>
                             {{ 'pref_3M'|_ }}
                         </label>
                     </div>
 
                     <div class="radio">
                         <label>
-                            <input type="radio" name="viewRange" value="6M" {% if viewRange == '6M' %} checked {% endif %}>
+                            <input type="radio" name="viewRange"
+                                   value="6M" {% if viewRange == '6M' %} checked {% endif %}>
                             {{ 'pref_6M'|_ }}
                         </label>
                     </div>
@@ -97,7 +104,8 @@
                 </div>
                 <div class="box-body">
                     <p class="text-info">{{ 'pref_languages_help'|_ }}</p>
-                    {% for key, lang in Config.get('firefly.lang') %}
+                    {% for key, lang in Config.get('firefly.languages') %}
+                        {% if lang.complete == true or (lang.complete == false and showIncomplete) %}
                             <div class="radio">
                                 <label>
                                     <input type="radio" name="language" value="{{ key }}"
@@ -105,9 +113,13 @@
                                                 checked
                                             {% endif %}
                                     />
-                                {{ lang }}
+                                    {{ lang.name_locale }} ({{ lang.name_english }})
+                                    {% if lang.complete == false %}
+                                        <span class="small text-danger">({{ 'language_incomplete'|_ }})</span>
+                                    {% endif %}
                                 </label>
                             </div>
+                        {% endif %}
                     {% endfor %}
 
                 </div>