Various translation updates.

Signed-off-by: James Cole <thegrumpydictator@gmail.com>

app/Http/Controllers/BudgetController.php

@@ -252,8 +252,7 @@ class BudgetController extends Controller
         $count    = $journals->count();
         $journals = $journals->slice($offset, $pageSize);
         $list     = new LengthAwarePaginator($journals, $count, $pageSize);
-        $subTitle = trans(
+        $subTitle = trans('firefly.without_budget_between',
-            'firefly.without_budget_between',
             ['start' => $start->formatLocalized($this->monthAndDayFormat), 'end' => $end->formatLocalized($this->monthAndDayFormat)]
         );
         $list->setPath('/budgets/list/noBudget');

app/Http/Controllers/Chart/BudgetController.php

@@ -350,8 +350,7 @@ class BudgetController extends Controller
             $expenses = $this->repository->spentInPeriod(new Collection([$budget]), new Collection, $repetition->startdate, $repetition->enddate);
 
             if ($repetitions->count() > 1) {
-                $name = $budget->name . ' ' . trans(
+                $name = $budget->name . ' ' . trans('firefly.between_dates',
-                        'firefly.between_dates',
                         ['start' => $repetition->startdate->formatLocalized($format), 'end' => $repetition->enddate->formatLocalized($format)]
                     );
             }

app/Http/Controllers/CurrencyController.php

@@ -134,7 +134,7 @@ class CurrencyController extends Controller
     public function edit(TransactionCurrency $currency)
     {
         $subTitleIcon     = 'fa-pencil';
-        $subTitle         = trans('firefly.edit_currency', ['name' => $currency->name]);
+        $subTitle         = trans('breadcrumbs.edit_currency', ['name' => $currency->name]);
         $currency->symbol = htmlentities($currency->symbol);
 
         // put previous url in session if not redirect from store (not "return_to_edit").

app/Http/Controllers/NewUserController.php

@@ -43,7 +43,7 @@ class NewUserController extends Controller
     public function index(ARI $repository)
     {
 
-        View::share('title', 'Welcome to Firefly!');
+        View::share('title', trans('firefly.welcome'));
         View::share('mainTitleIcon', 'fa-fire');
 
 

resources/lang/en_US/breadcrumbs.php

@@ -10,10 +10,8 @@
 
 return [
     'home'                  => 'Home',
-    'cash_accounts'         => 'Cash accounts',
+    'edit_currency'         => 'Edit currency ":name"',
-    'edit_account'          => 'Edit account ":name"',
+    'delete_currency'       => 'Delete currency ":name"',
-    'edit_currency'         => 'Edit currencies ":name"',
-    'delete_currency'       => 'Delete currencies ":name"',
     'newPiggyBank'          => 'Create a new piggy bank',
     'edit_piggyBank'        => 'Edit piggy bank ":name"',
     'preferences'           => 'Preferences',
@@ -24,11 +22,6 @@ return [
     'edit_bill'             => 'Edit bill ":name"',
     'delete_bill'           => 'Delete bill ":name"',
     'reports'               => 'Reports',
-    'monthly_report'        => 'Monthly report for :date',
-    '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',
     'searchResult'          => 'Search for ":query"',
     'withdrawal_list'       => 'Expenses',
     'deposit_list'          => 'Revenue, income and deposits',

resources/lang/en_US/csv.php

@@ -17,7 +17,6 @@ return [
     'header_help'            => 'Check this if the first row of your CSV file are the column titles',
     '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.',
     'delimiter_help'         => 'Choose the field delimiter that is used in your input file. If not sure, comma is the safest option.',
-    'config_file_help'       => 'Select your CSV import configuration here. If you do not know what this is, ignore it. It will be explained later.',
     '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.',
     'upload_not_writeable'   => 'The grey box contains a file path. It should be writeable. Please make sure it is.',
 

resources/lang/en_US/firefly.php

@@ -9,10 +9,7 @@
 
 return [
     // general stuff:
-    'language_incomplete'                       => 'This language is not yet fully translated',
-    'test'                                      => 'You have selected English.',
     'close'                                     => 'Close',
-    'pleaseHold'                                => 'Please hold...',
     'actions'                                   => 'Actions',
     'edit'                                      => 'Edit',
     'delete'                                    => 'Delete',
@@ -23,8 +20,6 @@ return [
     'cancel'                                    => 'Cancel',
     'from'                                      => 'From',
     'to'                                        => 'To',
-    'total_sum'                                 => 'Total sum',
-    'period_sum'                                => 'Sum for period',
     'showEverything'                            => 'Show everything',
     'never'                                     => 'Never',
     'search_results_for'                        => 'Search results for ":query"',
@@ -32,7 +27,6 @@ return [
     'deleted_error'                             => 'These credentials do not match our records.',
     'general_blocked_error'                     => 'Your account has been disabled, so you cannot login.',
     'expired_error'                             => 'Your account has expired, and can no longer be used.',
-    'unbalanced_error'                          => 'Your transactions are unbalanced. This means a withdrawal, deposit or transfer was not stored properly. Please check your accounts and transactions for errors (unbalanced amount :amount).',
     'removed_amount'                            => 'Removed :amount',
     'added_amount'                              => 'Added :amount',
     'asset_account_role_help'                   => 'Any extra options resulting from your choice can be set later.',
@@ -250,8 +244,6 @@ return [
     // preferences
     'pref_home_screen_accounts'                 => 'Home screen accounts',
     'pref_home_screen_accounts_help'            => 'Which accounts should be displayed on the home page?',
-    'pref_budget_settings'                      => 'Budget settings',
-    'pref_budget_settings_help'                 => 'What\'s the maximum amount of money a budget envelope may contain?',
     'pref_view_range'                           => 'View range',
     'pref_view_range_help'                      => 'Some charts are automatically grouped in periods. What period would you prefer?',
     'pref_1D'                                   => 'One day',
@@ -281,7 +273,6 @@ return [
     'transaction_page_size_title'               => 'Page size',
     'transaction_page_size_help'                => 'Any list of transactions shows at most this many transactions',
     'transaction_page_size_label'               => 'Page size',
-    'budget_maximum'                            => 'Budget maximum',
     'between_dates'                             => '(:start and :end)',
     'pref_optional_fields_transaction'          => 'Optional fields for transactions',
     'pref_optional_fields_transaction_help'     => 'By default not all fields are enabled when creating a new transaction (because of the clutter). Below, you can enable these fields if you think they could be useful for you. Of course, any field that is disabled, but already filled in, will be visible regardless of the setting.',
@@ -299,6 +290,7 @@ return [
     'optional_field_meta_dates'                 => 'Dates',
     'optional_field_meta_business'              => 'Business',
     'optional_field_attachments'                => 'Attachments',
+    'optional_field_meta_data'                  => 'Optional meta data',
 
 
     // profile:
@@ -355,7 +347,6 @@ return [
 
     // currencies:
     'create_currency'                           => 'Create a new currency',
-    'edit_currency'                             => 'Edit currency ":name"',
     'store_currency'                            => 'Store new currency',
     'update_currency'                           => 'Update currency',
     'new_default_currency'                      => ':name is now the default currency.',
@@ -381,16 +372,13 @@ return [
     'mandatoryFields'                           => 'Mandatory fields',
     'optionalFields'                            => 'Optional fields',
     'options'                                   => 'Options',
-    'something'                                 => 'Something!',
 
     // budgets:
     'create_new_budget'                         => 'Create a new budget',
     'store_new_budget'                          => 'Store new budget',
     'stored_new_budget'                         => 'Stored new budget ":name"',
-    'availableIn'                               => 'Available in :date',
     'available_between'                         => 'Available between :start and :end',
     'transactionsWithoutBudget'                 => 'Expenses without budget',
-    'transactionsWithoutBudgetDate'             => 'Expenses without budget in :date',
     'transactions_no_budget'                    => 'Expenses without budget between :start and :end',
     'spent_between'                             => 'Spent between :start and :end',
     'createBudget'                              => 'New budget',
@@ -456,9 +444,6 @@ return [
     'revenue_accounts'                          => 'Revenue accounts',
     'cash_accounts'                             => 'Cash accounts',
     'Cash account'                              => 'Cash account',
-    'accountExtraHelp_asset'                    => '',
-    'accountExtraHelp_expense'                  => '',
-    'accountExtraHelp_revenue'                  => '',
     'account_type'                              => 'Account type',
     'save_transactions_by_moving'               => 'Save these transaction(s) by moving them to another account:',
     'stored_new_account'                        => 'New account ":name" stored!',
@@ -509,9 +494,6 @@ return [
 
     // 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',
-    'createNewAssetButton'                      => 'Create new asset account',
 
     // home page:
     'yourAccounts'                              => 'Your accounts',
@@ -526,12 +508,10 @@ return [
     'moneyOut'                                  => 'Money out',
     'billsToPay'                                => 'Bills to pay',
     'billsPaid'                                 => 'Bills paid',
-    'viewDetails'                               => 'View details',
     'divided'                                   => 'divided',
     'toDivide'                                  => 'left to divide',
 
     // menu and titles, should be recycled as often as possible:
-    'toggleNavigation'                          => 'Toggle navigation',
     'currency'                                  => 'Currency',
     'preferences'                               => 'Preferences',
     'logout'                                    => 'Logout',
@@ -554,7 +534,6 @@ return [
     'moneyManagement'                           => 'Money management',
     'piggyBanks'                                => 'Piggy banks',
     'bills'                                     => 'Bills',
-    'createNew'                                 => 'Create new',
     'withdrawal'                                => 'Withdrawal',
     'deposit'                                   => 'Deposit',
     'account'                                   => 'Account',
@@ -566,7 +545,6 @@ return [
     'yes'                                       => 'Yes',
     'no'                                        => 'No',
     'amount'                                    => 'Amount',
-    'newBalance'                                => 'New balance',
     'overview'                                  => 'Overview',
     'saveOnAccount'                             => 'Save on account',
     'unknown'                                   => 'Unknown',

resources/lang/en_US/list.php

@@ -39,6 +39,9 @@ return [
     'interest_date'         => 'Interest date',
     'book_date'             => 'Book date',
     'process_date'          => 'Processing date',
+    'due_date'              => 'Due date',
+    'payment_date'          => 'Payment date',
+    'notes'                 => 'Notes',
     'from'                  => 'From',
     'piggy_bank'            => 'Piggy bank',
     'to'                    => 'To',

resources/views/attachments/edit.twig

@@ -47,7 +47,7 @@
                     </div>
                     <div class="box-footer">
                         <button type="submit" class="btn pull-right btn-success">
-                            {{ ('update_attachment')|_ }}
+                            {{ 'update_attachment'|_ }}
                         </button>
                     </div>
                 </div>

resources/views/layout/default.twig

@@ -91,7 +91,7 @@
             <!-- search form -->
             <form action="{{ route('search') }}" method="get" class="sidebar-form">
                 <div class="input-group">
-                    <input type="text" name="q" class="form-control" placeholder="Search..." value="{{ query }}"/>
+                    <input type="text" name="q" class="form-control" placeholder="{{ 'searchPlaceholder'|_ }}" value="{{ query }}"/>
                     <span class="input-group-btn">
                 <button type='submit' name='search' id='search-btn' class="btn btn-flat"><i class="fa fa-search"></i></button>
               </span>