Merge branch 'release-3.8.0'

.env.example

@@ -56,6 +56,9 @@ GOOGLE_MAPS_ENABLED=true
 # Create a cookie to stay logged in
 #REMEMBER_ME_ENABLED=true
 
+# Immediately expire cookie on the browser closing
+#SESSION_EXPIRE_ON_CLOSE=false
+
 # The app automatically logs the user out after this number of seconds
 #AUTO_LOGOUT_SECONDS=28800
 

.env.travis

@@ -1,5 +1,5 @@
 APP_ENV=development
-APP_DEBUG=true
+APP_DEBUG=false
 APP_URL=http://ninja.dev
 APP_KEY=SomeRandomStringSomeRandomString
 APP_CIPHER=AES-256-CBC

.travis.yml

@@ -93,7 +93,8 @@ script:
   #- php ./vendor/codeception/codeception/codecept run acceptance GoProCest.php
 
 after_script:
-  - php artisan ninja:check-data --no-interaction
+  - php artisan ninja:check-data --no-interaction --database='db-ninja-1'
+  - php artisan ninja:check-data --no-interaction --database='db-ninja-2'
   - php artisan ninja:init-lookup --validate=true --database='db-ninja-1'
   - php artisan ninja:init-lookup --validate=true --database='db-ninja-2'
   - cat .env

app/Console/Commands/CalculatePayouts.php

@@ -74,7 +74,8 @@ class CalculatePayouts extends Command
                 $this->info("User: $user");
 
                 foreach ($client->payments as $payment) {
-                    $this->info("Date: $payment->payment_date, Amount: $payment->amount, Reference: $payment->transaction_reference");
+                    $amount = $payment->getCompletedAmount();
+                    $this->info("Date: $payment->payment_date, Amount: $amount, Reference: $payment->transaction_reference");
                 }
             }
         }

app/Console/Commands/CreateTestData.php

@@ -8,6 +8,8 @@ use App\Ninja\Repositories\ExpenseRepository;
 use App\Ninja\Repositories\InvoiceRepository;
 use App\Ninja\Repositories\PaymentRepository;
 use App\Ninja\Repositories\VendorRepository;
+use App\Ninja\Repositories\TaskRepository;
+use App\Ninja\Repositories\ProjectRepository;
 use App\Models\Client;
 use App\Models\TaxRate;
 use App\Models\Project;
@@ -44,6 +46,7 @@ class CreateTestData extends Command
      * @param PaymentRepository $paymentRepo
      * @param VendorRepository  $vendorRepo
      * @param ExpenseRepository $expenseRepo
+     * @param TaskRepository $taskRepo
      * @param AccountRepository $accountRepo
      */
     public function __construct(
@@ -52,6 +55,8 @@ class CreateTestData extends Command
         PaymentRepository $paymentRepo,
         VendorRepository $vendorRepo,
         ExpenseRepository $expenseRepo,
+        TaskRepository $taskRepo,
+        ProjectRepository $projectRepo,
         AccountRepository $accountRepo)
     {
         parent::__construct();
@@ -63,6 +68,8 @@ class CreateTestData extends Command
         $this->paymentRepo = $paymentRepo;
         $this->vendorRepo = $vendorRepo;
         $this->expenseRepo = $expenseRepo;
+        $this->taskRepo = $taskRepo;
+        $this->projectRepo = $projectRepo;
         $this->accountRepo = $accountRepo;
     }
 
@@ -125,17 +132,20 @@ class CreateTestData extends Command
             $this->info('Client: ' . $client->name);
 
             $this->createInvoices($client);
+            $this->createInvoices($client, true);
+            $this->createTasks($client);
         }
     }
 
     /**
      * @param $client
      */
-    private function createInvoices($client)
+    private function createInvoices($client, $isQuote = false)
     {
         for ($i = 0; $i < $this->count; $i++) {
             $data = [
                 'is_public' => true,
+                'is_quote' => $isQuote,
                 'client_id' => $client->id,
                 'invoice_date_sql' => date_create()->modify(rand(-100, 100) . ' days')->format('Y-m-d'),
                 'due_date_sql' => date_create()->modify(rand(-100, 100) . ' days')->format('Y-m-d'),
@@ -150,7 +160,9 @@ class CreateTestData extends Command
             $invoice = $this->invoiceRepo->save($data);
             $this->info('Invoice: ' . $invoice->invoice_number);
 
-            $this->createPayment($client, $invoice);
+            if (! $isQuote) {
+                $this->createPayment($client, $invoice);
+            }
         }
     }
 
@@ -172,6 +184,31 @@ class CreateTestData extends Command
         $this->info('Payment: ' . $payment->amount);
     }
 
+    private function createTasks($client)
+    {
+        $data = [
+            'client_id' => $client->id,
+            'name' => $this->faker->sentence(3),
+        ];
+        $project = $this->projectRepo->save($data);
+
+        for ($i = 0; $i < $this->count; $i++) {
+            $startTime = date_create()->modify(rand(-100, 100) . ' days')->format('U');
+            $endTime = $startTime + (60 * 60 * 2);
+            $timeLog = "[[{$startTime},{$endTime}]]";
+            $data = [
+                'client_id' => $client->id,
+                'project_id' => $project->id,
+                'description' => $this->faker->text($this->faker->numberBetween(50, 300)),
+                'time_log' => $timeLog,
+            ];
+
+            $this->taskRepo->save(false, $data);
+        }
+    }
+
+
+
     private function createVendors()
     {
         for ($i = 0; $i < $this->count; $i++) {
@@ -206,7 +243,7 @@ class CreateTestData extends Command
             $data = [
                 'vendor_id' => $vendor->id,
                 'amount' => $this->faker->randomFloat(2, 1, 10),
-                'expense_date' => null,
+                'expense_date' => date_create()->modify(rand(-100, 100) . ' days')->format('Y-m-d'),
                 'public_notes' => '',
             ];
 

app/Console/Commands/SendRenewalInvoices.php

@@ -74,13 +74,6 @@ class SendRenewalInvoices extends Command
             $plan['num_users'] = $company->num_users;
             $plan['price'] = min($company->plan_price, Utils::getPlanPrice($plan));
 
-            if ($company->pending_plan) {
-                $plan['plan'] = $company->pending_plan;
-                $plan['term'] = $company->pending_term;
-                $plan['num_users'] = $company->pending_num_users;
-                $plan['price'] = min($company->pending_plan_price, Utils::getPlanPrice($plan));
-            }
-
             if ($plan['plan'] == PLAN_FREE || ! $plan['plan'] || ! $plan['term'] || ! $plan['price']) {
                 continue;
             }

app/Constants.php

@@ -309,7 +309,7 @@ if (! defined('APP_NAME')) {
     define('NINJA_APP_URL', env('NINJA_APP_URL', 'https://app.invoiceninja.com'));
     define('NINJA_DOCS_URL', env('NINJA_DOCS_URL', 'http://docs.invoiceninja.com/en/latest'));
     define('NINJA_DATE', '2000-01-01');
-    define('NINJA_VERSION', '3.7.2' . env('NINJA_VERSION_SUFFIX'));
+    define('NINJA_VERSION', '3.8.0' . env('NINJA_VERSION_SUFFIX'));
 
     define('SOCIAL_LINK_FACEBOOK', env('SOCIAL_LINK_FACEBOOK', 'https://www.facebook.com/invoiceninja'));
     define('SOCIAL_LINK_TWITTER', env('SOCIAL_LINK_TWITTER', 'https://twitter.com/invoiceninja'));
@@ -341,6 +341,8 @@ if (! defined('APP_NAME')) {
     define('MSBOT_STATE_URL', 'https://state.botframework.com/v3');
     define('INVOICEPLANE_IMPORT', 'https://github.com/turbo124/Plane2Ninja');
 
+    define('TIME_TRACKER_USER_AGENT', 'Time Tracker');
+
     define('BOT_PLATFORM_WEB_APP', 'WebApp');
     define('BOT_PLATFORM_SKYPE', 'Skype');
 
@@ -405,6 +407,7 @@ if (! defined('APP_NAME')) {
     define('PAYMENT_TYPE_SWITCH', 23);
     define('PAYMENT_TYPE_ALIPAY', 28);
     define('PAYMENT_TYPE_SOFORT', 29);
+    define('PAYMENT_TYPE_SEPA', 30);
 
     define('PAYMENT_METHOD_STATUS_NEW', 'new');
     define('PAYMENT_METHOD_STATUS_VERIFICATION_FAILED', 'verification_failed');
@@ -418,6 +421,7 @@ if (! defined('APP_NAME')) {
     define('GATEWAY_TYPE_CUSTOM', 6);
     define('GATEWAY_TYPE_ALIPAY', 7);
     define('GATEWAY_TYPE_SOFORT', 8);
+    define('GATEWAY_TYPE_SEPA', 9);
     define('GATEWAY_TYPE_TOKEN', 'token');
 
     define('TEMPLATE_INVOICE', 'invoice');

app/Http/Controllers/AccountController.php

@@ -431,9 +431,12 @@ class AccountController extends BaseController
      */
     private function showBankAccounts()
     {
+        $account = auth()->user()->account;
+
         return View::make('accounts.banks', [
             'title' => trans('texts.bank_accounts'),
             'advanced' => ! Auth::user()->hasFeature(FEATURE_EXPENSES),
+            'warnPaymentGateway' => ! $account->account_gateways->count(),
         ]);
     }
 

app/Http/Controllers/AccountGatewayController.php

@@ -254,7 +254,7 @@ class AccountGatewayController extends BaseController
                     if (! $value && in_array($field, ['testMode', 'developerMode', 'sandbox'])) {
                         // do nothing
                     } elseif ($gatewayId == GATEWAY_CUSTOM) {
-                        $config->$field = strip_tags($value);
+                        $config->$field = Utils::isNinjaProd() ? strip_tags($value) : $value;
                     } else {
                         $config->$field = $value;
                     }

app/Http/Controllers/BaseAPIController.php

@@ -74,10 +74,14 @@ class BaseAPIController extends Controller
         $entity = $request->entity();
         $action = $request->action;
 
-        if (! in_array($action, ['archive', 'delete', 'restore'])) {
+        if (! in_array($action, ['archive', 'delete', 'restore', 'mark_sent'])) {
             return $this->errorResponse("Action [$action] is not supported");
         }
 
+        if ($action == 'mark_sent') {
+            $action = 'markSent';
+        }
+
         $repo = Utils::toCamelCase($this->entityType) . 'Repo';
 
         $this->$repo->$action($entity);

app/Http/Controllers/CalendarController.php

@@ -0,0 +1,35 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Jobs\GenerateCalendarEvents;
+
+/**
+ * Class ReportController.
+ */
+class CalendarController extends BaseController
+{
+    /**
+     * @return \Illuminate\Contracts\View\View
+     */
+    public function showCalendar()
+    {
+        $data = [
+            'account' => auth()->user()->account,
+        ];
+
+        return view('calendar', $data);
+    }
+
+    public function loadEvents()
+    {
+        if (auth()->user()->account->hasFeature(FEATURE_REPORTS)) {
+            $events = dispatch(new GenerateCalendarEvents());
+        } else {
+            $events = [];
+        }
+
+        return response()->json($events);
+    }
+
+}

app/Http/Controllers/DashboardController.php

@@ -42,10 +42,14 @@ class DashboardController extends BaseController
         $expenses = $dashboardRepo->expenses($account, $userId, $viewAll);
         $tasks = $dashboardRepo->tasks($accountId, $userId, $viewAll);
 
-        $showBlueVinePromo = $user->is_admin
-            && env('BLUEVINE_PARTNER_UNIQUE_ID')
-            && ! $account->company->bluevine_status
-            && $account->created_at <= date('Y-m-d', strtotime('-1 month'));
+        $showBlueVinePromo = false;
+        if ($user->is_admin && env('BLUEVINE_PARTNER_UNIQUE_ID')) {
+            $showBlueVinePromo = ! $account->company->bluevine_status
+                && $account->created_at <= date('Y-m-d', strtotime('-1 month'));
+            if (request()->bluevine) {
+                $showBlueVinePromo = true;
+            }
+        }
 
         $showWhiteLabelExpired = Utils::isSelfHost() && $account->company->hasExpiredPlan(PLAN_WHITE_LABEL);
 

app/Http/Controllers/HomeController.php

@@ -126,6 +126,14 @@ class HomeController extends BaseController
         return RESULT_SUCCESS;
     }
 
+    /**
+     * @return mixed
+     */
+    public function loggedIn()
+    {
+        return RESULT_SUCCESS;
+    }
+
     /**
      * @return mixed
      */

app/Http/Controllers/InvoiceController.php

@@ -172,7 +172,7 @@ class InvoiceController extends BaseController
                             $contact->email_error = $invitation->email_error;
                             $contact->invitation_link = $invitation->getLink('view', $hasPassword, $hasPassword);
                             $contact->invitation_viewed = $invitation->viewed_date && $invitation->viewed_date != '0000-00-00 00:00:00' ? $invitation->viewed_date : false;
-                            $contact->invitation_openend = $invitation->opened_date && $invitation->opened_date != '0000-00-00 00:00:00' ? $invitation->opened_date : false;
+                            $contact->invitation_opened = $invitation->opened_date && $invitation->opened_date != '0000-00-00 00:00:00' ? $invitation->opened_date : false;
                             $contact->invitation_status = $contact->email_error ? false : $invitation->getStatus();
                             $contact->invitation_signature_svg = $invitation->signatureDiv();
                         }

app/Http/Controllers/TaskController.php

@@ -232,17 +232,22 @@ class TaskController extends BaseController
 
         $task = $this->taskRepo->save($publicId, $request->input());
 
-        if ($publicId) {
-            Session::flash('message', trans('texts.updated_task'));
-        } else {
-            Session::flash('message', trans('texts.created_task'));
-        }
-
         if (in_array($action, ['invoice', 'add_to_invoice'])) {
             return self::bulk();
         }
 
-        return Redirect::to("tasks/{$task->public_id}/edit");
+        if (request()->wantsJson()) {
+            $task->time_log = json_decode($task->time_log);
+            return $task->load(['client.contacts', 'project'])->toJson();
+        } else {
+            if ($publicId) {
+                Session::flash('message', trans('texts.updated_task'));
+            } else {
+                Session::flash('message', trans('texts.created_task'));
+            }
+
+            return Redirect::to("tasks/{$task->public_id}/edit");
+        }
     }
 
     /**
@@ -303,10 +308,14 @@ class TaskController extends BaseController
         } else {
             $count = $this->taskService->bulk($ids, $action);
 
-            $message = Utils::pluralize($action.'d_task', $count);
-            Session::flash('message', $message);
+            if (request()->wantsJson()) {
+                return response()->json($count);
+            } else {
+                $message = Utils::pluralize($action.'d_task', $count);
+                Session::flash('message', $message);
 
-            return $this->returnBulk($this->entityType, $action, $ids);
+                return $this->returnBulk($this->entityType, $action, $ids);
+            }
         }
     }
 

app/Http/Controllers/TimeTrackerController.php

@@ -0,0 +1,32 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use Illuminate\Http\Request;
+use App\Http\Requests;
+use App\Models\Task;
+use App\Models\Client;
+use App\Models\Project;
+
+class TimeTrackerController extends Controller
+{
+    public function index()
+    {
+        $user = auth()->user();
+        $account = $user->account;
+
+        if (! $account->hasFeature(FEATURE_TASKS)) {
+            return trans('texts.tasks_not_enabled');
+        }
+
+        $data = [
+            'title' => trans('texts.time_tracker'),
+            'tasks' => Task::scope()->with('project', 'client.contacts')->whereNull('invoice_id')->get(),
+            'clients' => Client::scope()->with('contacts')->orderBy('name')->get(),
+            'projects' => Project::scope()->with('client.contacts')->orderBy('name')->get(),
+            'account' => $account,
+        ];
+
+        return view('tasks.time_tracker', $data);
+    }
+}

app/Http/Requests/TaskRequest.php

@@ -13,11 +13,24 @@ class TaskRequest extends EntityRequest
     {
         $input = $this->all();
 
+        /*
+        // check if we're creating a new client
+        if ($this->client_id == '-1') {
+            $client = [
+                'name' => trim($this->client_name),
+            ];
+            if (Client::validate($client) === true) {
+                $client = app('App\Ninja\Repositories\ClientRepository')->save($client);
+                $input['client_id'] = $this->client_id = $client->public_id;
+            }
+        }
+        */
+        
         // check if we're creating a new project
         if ($this->project_id == '-1') {
             $project = [
                 'name' => trim($this->project_name),
-                'client_id' => Client::getPrivateId($this->client),
+                'client_id' => Client::getPrivateId($this->client_id ?: $this->client),
             ];
             if (Project::validate($project) === true) {
                 $project = app('App\Ninja\Repositories\ProjectRepository')->save($project);

app/Http/routes.php

@@ -121,6 +121,7 @@ if (Utils::isTravis()) {
 }
 
 Route::group(['middleware' => ['lookup:user', 'auth:user']], function () {
+    Route::get('logged_in', 'HomeController@loggedIn');
     Route::get('dashboard', 'DashboardController@index');
     Route::get('dashboard_chart_data/{group_by}/{start_date}/{end_date}/{currency_id}/{include_expenses}', 'DashboardController@chartData');
     Route::get('set_entity_filter/{entity_type}/{filter?}', 'AccountController@setEntityFilter');
@@ -147,6 +148,7 @@ Route::group(['middleware' => ['lookup:user', 'auth:user']], function () {
     Route::post('clients/bulk', 'ClientController@bulk');
     Route::get('clients/statement/{client_id}/{status_id?}/{start_date?}/{end_date?}', 'ClientController@statement');
 
+    Route::get('time_tracker', 'TimeTrackerController@index');
     Route::resource('tasks', 'TaskController');
     Route::get('api/tasks/{client_id?}', 'TaskController@getDatatable');
     Route::get('tasks/create/{client_id?}/{project_id?}', 'TaskController@create');
@@ -248,6 +250,8 @@ Route::group(['middleware' => ['lookup:user', 'auth:user']], function () {
 
     Route::get('reports', 'ReportController@showReports');
     Route::post('reports', 'ReportController@showReports');
+    Route::get('calendar', 'CalendarController@showCalendar');
+    Route::get('calendar_events', 'CalendarController@loadEvents');
 });
 
 Route::group([

app/Jobs/GenerateCalendarEvents.php

@@ -0,0 +1,52 @@
+<?php
+
+namespace App\Jobs;
+
+use App\Jobs\Job;
+use App\Models\Invoice;
+use App\Models\Payment;
+use App\Models\Expense;
+use App\Models\Task;
+
+class GenerateCalendarEvents extends Job
+{
+    /**
+     * Execute the job.
+     *
+     * @return void
+     */
+    public function handle()
+    {
+        $events = [];
+        $filter = request()->filter ?: [];
+
+        $data = [
+            ENTITY_INVOICE => Invoice::scope()->invoices(),
+            ENTITY_QUOTE => Invoice::scope()->quotes(),
+            ENTITY_TASK => Task::scope()->with(['project']),
+            ENTITY_PAYMENT => Payment::scope()->with(['invoice']),
+            ENTITY_EXPENSE => Expense::scope()->with(['expense_category']),
+        ];
+
+        foreach ($data as $type => $source) {
+            if (! count($filter) || in_array($type, $filter)) {
+                $source->where(function($query) use ($type) {
+                    $start = date_create(request()->start);
+                    $end = date_create(request()->end);
+                    return $query->dateRange($start, $end);
+                });
+
+                foreach ($source->with(['account', 'client.contacts'])->get() as $entity) {
+                    if ($entity->client && $entity->client->trashed()) {
+                        continue;
+                    }
+
+                    $subColors = count($filter) == 1;
+                    $events[] = $entity->present()->calendarEvent($subColors);
+                }
+            }
+        }
+
+        return $events;
+    }
+}

app/Libraries/Utils.php

@@ -1304,6 +1304,22 @@ class Utils
         return $r;
     }
 
+    public static function brewerColor($number) {
+        $colors = [
+            '#1c9f77',
+            '#d95d02',
+            '#716cb1',
+            '#e62a8b',
+            '#5fa213',
+            '#e6aa04',
+            '#a87821',
+            '#676767',
+        ];
+        $number = ($number-1) % count($colors);
+
+        return $colors[$number];
+    }
+
     /**
      * Replace language-specific characters by ASCII-equivalents.
      * @param string $s

app/Models/Expense.php

@@ -227,6 +227,16 @@ class Expense extends EntityModel
         return $array;
     }
 
+    /**
+     * @param $query
+     *
+     * @return mixed
+     */
+    public function scopeDateRange($query, $startDate, $endDate)
+    {
+        return $query->whereBetween('expense_date', [$startDate, $endDate]);
+    }
+
     /**
      * @param $query
      * @param null $bankdId

app/Models/Invoice.php

@@ -423,6 +423,20 @@ class Invoice extends EntityModel implements BalanceAffecting
                      ->where('is_recurring', '=', true);
     }
 
+    /**
+     * @param $query
+     *
+     * @return mixed
+     */
+    public function scopeDateRange($query, $startDate, $endDate)
+    {
+        return $query->where(function ($query) use ($startDate, $endDate) {
+            $query->whereBetween('invoice_date', [$startDate, $endDate]);
+        })->orWhere(function ($query) use ($startDate, $endDate) {
+            $query->whereBetween('due_date', [$startDate, $endDate]);
+        });
+    }
+
     /**
      * @param $query
      *

app/Models/Payment.php

@@ -146,6 +146,16 @@ class Payment extends EntityModel
         return $query;
     }
 
+    /**
+     * @param $query
+     *
+     * @return mixed
+     */
+    public function scopeDateRange($query, $startDate, $endDate)
+    {
+        return $query->whereBetween('payment_date', [$startDate, $endDate]);
+    }
+
     /**
      * @return mixed
      */

app/Ninja/Datatables/ClientDatatable.php

@@ -17,7 +17,8 @@ class ClientDatatable extends EntityDatatable
             [
                 'name',
                 function ($model) {
-                    return link_to("clients/{$model->public_id}", $model->name ?: '')->toHtml();
+                    $str = link_to("clients/{$model->public_id}", $model->name ?: '')->toHtml();
+                    return $this->addNote($str, $model->private_notes);
                 },
             ],
             [

app/Ninja/Datatables/EntityDatatable.php

@@ -90,4 +90,12 @@ class EntityDatatable
 
         return $indices;
     }
+
+    public function addNote($str, $note) {
+        if (! $note) {
+            return $str;
+        }
+
+        return $str . '&nbsp; <span class="fa fa-file-o" data-toggle="tooltip" data-placement="bottom" title="' . e($note) . '"></span>';
+    }
 }

app/Ninja/Datatables/ExpenseDatatable.php

@@ -52,7 +52,8 @@ class ExpenseDatatable extends EntityDatatable
                         return Utils::fromSqlDate($model->expense_date_sql);
                     }
 
-                    return link_to("expenses/{$model->public_id}/edit", Utils::fromSqlDate($model->expense_date_sql))->toHtml();
+                    $str = link_to("expenses/{$model->public_id}/edit", Utils::fromSqlDate($model->expense_date_sql))->toHtml();
+                    return $this->addNote($str, $model->private_notes);
                 },
             ],
             [

app/Ninja/Datatables/InvoiceDatatable.php

@@ -24,7 +24,8 @@ class InvoiceDatatable extends EntityDatatable
                         return $model->invoice_number;
                     }
 
-                    return link_to("{$entityType}s/{$model->public_id}/edit", $model->invoice_number, ['class' => Utils::getEntityRowClass($model)])->toHtml();
+                    $str = link_to("{$entityType}s/{$model->public_id}/edit", $model->invoice_number, ['class' => Utils::getEntityRowClass($model)])->toHtml();
+                    return $this->addNote($str, $model->private_notes);
                 },
             ],
             [

app/Ninja/Datatables/PaymentDatatable.php

@@ -46,7 +46,8 @@ class PaymentDatatable extends EntityDatatable
             [
                 'transaction_reference',
                 function ($model) {
-                    return $model->transaction_reference ? e($model->transaction_reference) : '<i>'.trans('texts.manual_entry').'</i>';
+                    $str = $model->transaction_reference ? e($model->transaction_reference) : '<i>'.trans('texts.manual_entry').'</i>';
+                    return $this->addNote($str, $model->private_notes);
                 },
             ],
             [

app/Ninja/Datatables/RecurringExpenseDatatable.php

@@ -57,6 +57,16 @@ class RecurringExpenseDatatable extends EntityDatatable
                 },
             ],
 */
+            [
+                'frequency',
+                function ($model) {
+                    $frequency = strtolower($model->frequency);
+                    $frequency = preg_replace('/\s/', '_', $frequency);
+
+                    $str = link_to("recurring_expenses/{$model->public_id}/edit", trans('texts.freq_'.$frequency))->toHtml();
+                    return $this->addNote($str, $model->private_notes);
+                },
+            ],
             [
                 'amount',
                 function ($model) {
@@ -91,15 +101,6 @@ class RecurringExpenseDatatable extends EntityDatatable
                     return $model->public_notes != null ? substr($model->public_notes, 0, 100) : '';
                 },
             ],
-            [
-                'frequency',
-                function ($model) {
-                    $frequency = strtolower($model->frequency);
-                    $frequency = preg_replace('/\s/', '_', $frequency);
-
-                    return link_to("recurring_expenses/{$model->public_id}/edit", trans('texts.freq_'.$frequency))->toHtml();
-                },
-            ],
         ];
     }
 

app/Ninja/Datatables/VendorDatatable.php

@@ -17,7 +17,8 @@ class VendorDatatable extends EntityDatatable
             [
                 'name',
                 function ($model) {
-                    return link_to("vendors/{$model->public_id}", $model->name ?: '')->toHtml();
+                    $str = link_to("vendors/{$model->public_id}", $model->name ?: '')->toHtml();
+                    return $this->addNote($str, $model->private_notes);
                 },
             ],
             [

app/Ninja/PaymentDrivers/AuthorizeNetAIMPaymentDriver.php

@@ -5,4 +5,12 @@ namespace App\Ninja\PaymentDrivers;
 class AuthorizeNetAIMPaymentDriver extends BasePaymentDriver
 {
     protected $transactionReferenceParam = 'refId';
+
+    protected function paymentDetails($paymentMethod = false)
+    {
+        $data = parent::paymentDetails();
+        $data['solutionId'] = $this->accountGateway->getConfigField('testMode') ? 'AAA100303' : 'AAA172036';
+
+        return $data;
+    }
 }

app/Ninja/PaymentDrivers/PagSeguroPaymentDriver.php

@@ -0,0 +1,17 @@
+<?php
+
+namespace App\Ninja\PaymentDrivers;
+
+class PagSeguroPaymentDriver extends BasePaymentDriver
+{
+
+    protected function paymentDetails($paymentMethod = false)
+    {
+        $data = parent::paymentDetails($paymentMethod);
+        $data['transactionReference'] = $this->invoice()->invoice_number;
+
+        return $data;
+    }
+
+
+}

app/Ninja/PaymentDrivers/PagarmePaymentDriver.php

@@ -0,0 +1,8 @@
+<?php
+
+namespace App\Ninja\PaymentDrivers;
+
+class PagarmePaymentDriver extends BasePaymentDriver
+{
+    protected $transactionReferenceParam = 'transactionReference';
+}

app/Ninja/Presenters/EntityPresenter.php

@@ -5,6 +5,7 @@ namespace App\Ninja\Presenters;
 use Laracasts\Presenter\Presenter;
 use URL;
 use Utils;
+use stdClass;
 
 class EntityPresenter extends Presenter
 {
@@ -49,6 +50,24 @@ class EntityPresenter extends Presenter
         return "<span style=\"font-size:13px\" class=\"label label-{$class}\">{$label}</span>";
     }
 
+    public function statusColor()
+    {
+        $class = $this->entity->statusClass();
+
+        switch ($class) {
+            case 'success':
+                return '#5cb85c';
+            case 'warning':
+                return '#f0ad4e';
+            case 'primary':
+                return '#337ab7';
+            case 'info':
+                return '#5bc0de';
+            default:
+                return '#777';
+        }
+    }
+
     /**
      * @return mixed
      */
@@ -67,4 +86,17 @@ class EntityPresenter extends Presenter
 
         return sprintf('%s: %s', trans('texts.' . $entityType), $entity->getDisplayName());
     }
+
+    public function calendarEvent($subColors = false)
+    {
+        $entity = $this->entity;
+
+        $data = new stdClass();
+        $data->id = $entity->getEntityType() . ':' . $entity->public_id;
+        $data->allDay = true;
+        $data->url = $this->url();
+
+        return $data;
+    }
+
 }

app/Ninja/Presenters/ExpensePresenter.php

@@ -48,4 +48,31 @@ class ExpensePresenter extends EntityPresenter
     {
         return $this->entity->expense_category ? $this->entity->expense_category->name : '';
     }
+
+    public function calendarEvent($subColors = false)
+    {
+        $data = parent::calendarEvent();
+        $expense = $this->entity;
+
+        $data->title = trans('texts.expense')  . ' ' . $this->amount() . ' | ' . $this->category();
+
+        $data->title = trans('texts.expense') . ' ' . $this->amount();
+        if ($category = $this->category()) {
+            $data->title .= ' | ' . $category;
+        }
+        if ($this->public_notes) {
+            $data->title .= ' | ' . $this->public_notes;
+        }
+
+
+        $data->start = $expense->expense_date;
+
+        if ($subColors && $expense->expense_category_id) {
+            $data->borderColor = $data->backgroundColor = Utils::brewerColor($expense->expense_category->public_id);
+        } else {
+            $data->borderColor = $data->backgroundColor = '#d95d02';
+        }
+
+        return $data;
+    }
 }

app/Ninja/Presenters/InvoicePresenter.php

@@ -323,4 +323,22 @@ class InvoicePresenter extends EntityPresenter
 
         return $link;
     }
+
+    public function calendarEvent($subColors = false)
+    {
+        $data = parent::calendarEvent();
+        $invoice = $this->entity;
+        $entityType = $invoice->getEntityType();
+
+        $data->title = trans("texts.{$entityType}") . ' ' . $invoice->invoice_number . ' | ' . $this->amount() . ' | ' . $this->client();
+        $data->start = $invoice->due_date ?: $invoice->invoice_date;
+
+        if ($subColors) {
+            $data->borderColor = $data->backgroundColor = $invoice->present()->statusColor();
+        } else {
+            $data->borderColor = $data->backgroundColor = $invoice->isQuote() ? '#716cb1' : '#377eb8';
+        }
+
+        return $data;
+    }
 }

app/Ninja/Presenters/PaymentPresenter.php

@@ -45,4 +45,22 @@ class PaymentPresenter extends EntityPresenter
             return trans('texts.payment_type_' . $this->entity->payment_type->name);
         }
     }
+
+    public function calendarEvent($subColors = false)
+    {
+        $data = parent::calendarEvent();
+        $payment = $this->entity;
+        $invoice = $payment->invoice;
+
+        $data->title = trans('texts.payment') . ' ' . $invoice->invoice_number . ' | ' . $this->completedAmount() . ' | ' . $this->client();
+        $data->start = $payment->payment_date;
+
+        if ($subColors) {
+            $data->borderColor = $data->backgroundColor = Utils::brewerColor($payment->payment_status_id);
+        } else {
+            $data->borderColor = $data->backgroundColor = '#5fa213';
+        }
+
+        return $data;
+    }
 }

app/Ninja/Presenters/TaskPresenter.php

@@ -2,6 +2,8 @@
 
 namespace App\Ninja\Presenters;
 
+use Utils;
+
 /**
  * Class TaskPresenter.
  */
@@ -70,4 +72,42 @@ class TaskPresenter extends EntityPresenter
 
         return $str . implode("\n", $times);
     }
+
+    public function calendarEvent($subColors = false)
+    {
+        $data = parent::calendarEvent();
+        $task = $this->entity;
+        $account = $task->account;
+        $date = $account->getDateTime();
+
+        $data->title = trans('texts.task');
+        if ($project = $this->project()) {
+            $data->title .= ' | ' . $project;
+        }
+        if ($description = $this->description()) {
+            $data->title .= ' | ' . $description;
+        }
+        $data->allDay = false;
+
+        if ($subColors && $task->project_id) {
+            $data->borderColor = $data->backgroundColor = Utils::brewerColor($task->project->public_id);
+        } else {
+            $data->borderColor = $data->backgroundColor = '#a87821';
+        }
+
+        $parts = json_decode($task->time_log) ?: [];
+        if (count($parts)) {
+            $first = $parts[0];
+            $start = $first[0];
+            $date->setTimestamp($start);
+            $data->start = $date->format('Y-m-d H:i:m');
+
+            $last = $parts[count($parts) - 1];
+            $end = count($last) == 2 ? $last[1] : $last[0];
+            $date->setTimestamp($end);
+            $data->end = $date->format('Y-m-d H:i:m');
+        }
+
+        return $data;
+    }
 }

app/Ninja/Repositories/AccountRepository.php

@@ -210,6 +210,7 @@ class AccountRepository
         $features = array_merge($features, [
             ['dashboard', '/dashboard'],
             ['reports', '/reports'],
+            ['calendar', '/calendar'],
             ['customize_design', '/settings/customize_design'],
             ['new_tax_rate', '/tax_rates/create'],
             ['new_product', '/products/create'],

app/Ninja/Repositories/ClientRepository.php

@@ -41,6 +41,7 @@ class ClientRepository extends BaseRepository
                         DB::raw("CONCAT(contacts.first_name, ' ', contacts.last_name) contact"),
                         'clients.public_id',
                         'clients.name',
+                        'clients.private_notes',
                         'contacts.first_name',
                         'contacts.last_name',
                         'clients.balance',

app/Ninja/Repositories/ExpenseRepository.php

@@ -81,6 +81,7 @@ class ExpenseRepository extends BaseRepository
                         'expenses.user_id',
                         'expenses.tax_rate1',
                         'expenses.tax_rate2',
+                        'expenses.private_notes',
                         'expenses.payment_date',
                         'expense_categories.name as category',
                         'expense_categories.user_id as category_user_id',

app/Ninja/Repositories/InvoiceRepository.php

@@ -89,7 +89,8 @@ class InvoiceRepository extends BaseRepository
                 'invoices.partial',
                 'invoices.user_id',
                 'invoices.is_public',
-                'invoices.is_recurring'
+                'invoices.is_recurring',
+                'invoices.private_notes'
             );
 
         $this->applyFilters($query, $entityType, ENTITY_INVOICE);

app/Ninja/Repositories/PaymentRepository.php

@@ -63,6 +63,7 @@ class PaymentRepository extends BaseRepository
                         'payments.email',
                         'payments.routing_number',
                         'payments.bank_name',
+                        'payments.private_notes',
                         'invoices.is_deleted as invoice_is_deleted',
                         'gateways.name as gateway_name',
                         'gateways.id as gateway_id',

app/Ninja/Repositories/RecurringExpenseRepository.php

@@ -60,6 +60,7 @@ class RecurringExpenseRepository extends BaseRepository
                         'recurring_expenses.user_id',
                         'recurring_expenses.tax_rate1',
                         'recurring_expenses.tax_rate2',
+                        'recurring_expenses.private_notes',
                         'frequencies.name as frequency',
                         'expense_categories.name as category',
                         'expense_categories.user_id as category_user_id',

app/Ninja/Repositories/TaskRepository.php

@@ -117,7 +117,10 @@ class TaskRepository extends BaseRepository
 
         if (isset($data['client'])) {
             $task->client_id = $data['client'] ? Client::getPrivateId($data['client']) : null;
+        } elseif (isset($data['client_id'])) {
+            $task->client_id = $data['client_id'] ? Client::getPrivateId($data['client_id']) : null;
         }
+
         if (isset($data['project_id'])) {
             $task->project_id = $data['project_id'] ? Project::getPrivateId($data['project_id']) : null;
         }
@@ -134,10 +137,6 @@ class TaskRepository extends BaseRepository
             $timeLog = [];
         }
 
-        if(isset($data['client_id'])) {
-            $task->client_id = Client::getPrivateId($data['client_id']);
-        }
-
         array_multisort($timeLog);
 
         if (isset($data['action'])) {
@@ -153,6 +152,8 @@ class TaskRepository extends BaseRepository
             } elseif ($data['action'] == 'offline'){
                 $task->is_running = $data['is_running'] ? 1 : 0;
             }
+        } elseif (isset($data['is_running'])) {
+            $task->is_running = $data['is_running'] ? 1 : 0;
         }
 
         $task->time_log = json_encode($timeLog);

app/Ninja/Repositories/VendorRepository.php

@@ -44,7 +44,8 @@ class VendorRepository extends BaseRepository
                         'vendor_contacts.email',
                         'vendors.deleted_at',
                         'vendors.is_deleted',
-                        'vendors.user_id'
+                        'vendors.user_id',
+                        'vendors.private_notes'
                     );
 
         $this->applyFilters($query, ENTITY_VENDOR);

bower.json

@@ -35,7 +35,10 @@
     "select2": "select2-dist#^4.0.3",
     "mousetrap": "^1.6.0",
     "tablesorter": "jquery.tablesorter#^2.28.4",
-    "card": "^2.1.1"
+    "card": "^2.1.1",
+    "fullcalendar": "^3.5.1",
+    "toastr": "^2.1.3",
+    "jt.timepicker": "jquery-timepicker-jt#^1.11.12"
   },
   "resolutions": {
     "jquery": "~1.11"

composer.json

@@ -86,8 +86,10 @@
         "webpatser/laravel-countries": "dev-master",
         "websight/l5-google-cloud-storage": "dev-master",
         "wepay/php-sdk": "^0.2",
-        "wildbit/laravel-postmark-provider": "3.0"
-    },
+        "wildbit/laravel-postmark-provider": "3.0",
+        "abdala/omnipay-pagseguro": "0.2",
+        "omnipay/authorizenet": "dev-solution-id as 2.5.0"
+	},
     "require-dev": {
         "codeception/c3": "~2.0",
         "codeception/codeception": "2.3.3",
@@ -166,6 +168,10 @@
         {
             "type": "vcs",
             "url": "https://github.com/hillelcoren/omnipay-gocardlessv2"
+        },
+        {
+            "type": "vcs",
+            "url": "https://github.com/hillelcoren/omnipay-authorizenet"
         }
     ]
 }

config/ninja.php

@@ -2,6 +2,9 @@
 
 return [
 
+    // Marketing links
+    'time_tracker_web_url' => env('TIME_TRACKER_WEB_URL'),
+
     // Hosted plan coupons
     'coupon_50_off' => env('COUPON_50_OFF', false),
     'coupon_75_off' => env('COUPON_75_OFF', false),

config/session.php

@@ -31,7 +31,7 @@ return [
 
 	'lifetime' => env('SESSION_LIFETIME', (60 * 8)),
 
-	'expire_on_close' => true,
+	'expire_on_close' => env('SESSION_EXPIRE_ON_CLOSE', true),
 
 	/*
 	|--------------------------------------------------------------------------

database/seeds/GatewayTypesSeeder.php

@@ -17,6 +17,7 @@ class GatewayTypesSeeder extends Seeder
             ['alias' => 'custom', 'name' => 'Custom'],
             ['alias' => 'alipay', 'name' => 'Alipay'],
             ['alias' => 'sofort', 'name' => 'Sofort'],
+            ['alias' => 'sepa', 'name' => 'SEPA'],
         ];
 
         foreach ($gateway_types as $gateway_type) {

database/seeds/PaymentLibrariesSeeder.php

@@ -73,6 +73,7 @@ class PaymentLibrariesSeeder extends Seeder
             ['name' => 'Custom', 'provider' => 'Custom', 'is_offsite' => true, 'sort_order' => 9],
             ['name' => 'FirstData Payeezy', 'provider' => 'FirstData_Payeezy'],
             ['name' => 'GoCardless', 'provider' => 'GoCardlessV2\Redirect', 'sort_order' => 8, 'is_offsite' => true],
+            ['name' => 'PagSeguro', 'provider' => 'PagSeguro'],
         ];
 
         foreach ($gateways as $gateway) {

database/seeds/PaymentTypesSeeder.php

@@ -38,6 +38,7 @@ class PaymentTypesSeeder extends Seeder
             ['name' => 'Money Order'],
             ['name' => 'Alipay', 'gateway_type_id' => GATEWAY_TYPE_ALIPAY],
             ['name' => 'Sofort', 'gateway_type_id' => GATEWAY_TYPE_SOFORT],
+            ['name' => 'SEPA', 'gateway_type_id' => GATEWAY_TYPE_SEPA],
         ];
 
         foreach ($paymentTypes as $paymentType) {

docs/api.rst

@@ -115,6 +115,8 @@ You can archive, delete or restore an entity by setting ``action`` in the reques
   curl -X PUT ninja.dev/api/v1/invoices/1?action=archive \
     -H "X-Ninja-Token: TOKEN"
 
+.. TIP:: For invoices use `mark_sent` to manually mark the invoice as sent
+
 Emailing Invoices
 """""""""""""""""
 

docs/conf.py

@@ -57,9 +57,9 @@ author = u'Invoice Ninja'
 # built documents.
 #
 # The short X.Y version.
-version = u'3.7'
+version = u'3.8'
 # The full version, including alpha/beta/rc tags.
-release = u'3.7.2'
+release = u'3.8.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

docs/configure.rst

@@ -101,6 +101,15 @@ You need to create a `Google Maps API <https://developers.google.com/maps/docume
 
 You can disable the feature by adding ``GOOGLE_MAPS_ENABLED=false`` to the .env file.
 
+Time Tracking App
+"""""""""""""""""
+
+You can create a Windows, MacOS or Linux desktop wrapper for the time tracking app by installing `Nativefier <https://github.com/jiahaog/nativefier>`_ and then running:
+
+.. code-block:: shell
+
+   nativefier --name "Invoice Ninja" --user-agent "Time Tracker" https://example.com/time_tracker
+
 Voice Commands
 """"""""""""""
 

docs/install.rst

@@ -64,7 +64,7 @@ You’ll need to create a new database along with a user to access it. Most host
 Step 4: Configure the web server
 """"""""""""""""""""""""""""""""
 
-Please see these guides for detailed information on configuring Apache or Nginx.
+See the guides listed above for detailed information on configuring Apache or Nginx.
 
 Once you can access the site the initial setup screen will enable you to configure the database and email settings as well as create the initial admin user.
 

docs/invoices.rst

@@ -3,9 +3,9 @@ Invoices
 
 Well, it’s time to bill, and the Invoices function of Invoice Ninja lets you get the job done fast and with perfect accuracy.
 
-With a bustling freelance business, you’re going to be sending out a lot of invoices. Creating an invoice is simple with the New Invoice page. Once you’ve entered the client, job and rates information, you’ll see a preview of your invoice, and you’ll have a range of actions at your fingertips – from saving a draft, to sending the invoice to the client via email, to printing a PDF hard copy.
+With a bustling freelance business, you’re going to be sending out a lot of invoices. Creating an invoice is simple with the New Invoice page. Once you’ve entered the client, job and rates information, you’ll see a live PDF preview of your invoice, and you’ll have a range of actions at your fingertips – from saving a draft, to sending the invoice to the client via email, to printing a PDF hard copy.
 
-List Invoices
+Invoices List page
 """""""""""""
 
 With numerous invoices to keep track of, the Invoices list page is your go-to guide for the entire history and status of all your invoices – including those that have been paid, those sent but unpaid, and those still in the drafting and editing stage.
@@ -20,22 +20,24 @@ The life of an invoice in the Invoice Ninja system is made up of a number of sta
 - **Viewed**: The client has opened the invoice email and viewed the invoice.
 - **Partial**: The invoice has been partially paid.
 - **Paid**: Congratulations! The client has paid the full invoice amount.
+- **Unpaid**: The invoice remains unpaid.
+- **Overdue**: The invoice has passed its due date.
 
 In order to understand exactly how the Invoices list page works, we’ll take you through it step by step.
 
-To view your Invoices list page, click the Invoices tab on the main taskbar. This will open the Invoices list page.
+To view your Invoices list page, click the Invoices tab on the main sidebar. This will open the Invoices list page.
 
-The Invoices list page displays a table of all your invoices, at every stage, from the moment you create a new invoice, to the moment you archive or delete an invoice.
+The Invoices list page displays a table of all your active invoices, at every stage, from the moment you create a new invoice, to the moment you archive or delete an invoice.
 
 Let's explore the invoices list according to the tabs on the main header bar of the table from left to right:
 
 - **Invoice #**: The number of the invoice
-- **Client**: The client name
-- **Invoice Date**: The date the invoice was issued
-- **Invoice Total**: The total amount of the invoice
-- **Balance Due**: The amount owed by the client (after credits and other adjustments are calculated)
+- **Client Name**: The name of the client
+- **Date**: The date the invoice was issued
+- **Amount**: The total amount of the invoice
+- **Balance**: The amount owed by the client (after credits and other adjustments are calculated)
 - **Due Date**: The date the payment is due
-- **Status**: The current status of the invoice (Gray = Draft, Blue = Sent, XX = Viewed, XX = Partial, Green = Paid)
+- **Status**: The current status of the invoice (Draft, Sent,  Viewed, Partial, Paid, Unpaid, Overdue)
 - **Action**: The Action button provides a range of possible actions, depending upon the status of the invoice.
 
 To view the actions, hover your mouse over the Action area of the relevant invoice entry and a gray Select button will appear. Click on the arrow at the right side of the button to open a drop-down list. For invoices with “Draft” status, the drop-down list presents the following action items:
@@ -43,14 +45,40 @@ To view the actions, hover your mouse over the Action area of the relevant invoi
 - **Edit Invoice**: Edit the invoice information on the Edit Invoice page.
 - **Clone Invoice**: Duplicate the invoice. Then you can make minor adjustments. This is a fast way to create a new invoice that is identical or similar to this invoice.
 - **View History**: You'll be redirected to the Invoices / History page, where you can view a history of all the actions taken from the time the invoice was created. The Invoices / History page displays a copy of the latest version of the invoice and a drop-down list of all actions and the corresponding version of the invoice. Select the version you wish to view. Click on the blue Edit Invoice button at the top right of the page to edit the invoice.
-- **Mark Sent**: When you have sent the invoice to your customer, mark as Sent. This will update the invoice status in the Invoices list, so you can keep track.
+- **Mark Sent**: When you mark an invoice as sent, only then is the invoice viewable to the client in the client portal, and the client balance is updated to reflect the invoice amount.
+- **Mark Paid**: Manually mark the invoice as paid. You may want to do this if you are not entering the payment directly into the system.
 - **Enter Payment**: Enter the payment relevant to this invoice. You'll be redirected to the Payments / Create page.
 - **Archive Invoice**: Click here to archive the invoice. It will be archived and removed from the Invoices list page.
 - **Delete Invoice**: Click here to delete the invoice. It will be deleted and removed from the Invoices list page.
 
-.. TIP:: For invoices with “Viewed”, “Sent”, “Partial” or “Paid” status, only the relevant and applicable options from the above list will show in the Action drop-down list.
+.. TIP:: For invoices with a status other than "Draft", only the relevant and applicable options from the above list will show in the Action drop-down list.
+
+.. TIP:: To sort the invoices list according to any of the columns, click on the column tab of your choice. A small arrow will appear. If the arrow is pointing up, data is sorted from lowest to highest value. If the arrow is pointing down, data is sorted from highest to lowest value. Click to change the arrow direction.
+
+Filtering Invoices
+^^^^^^^^^^^^^^^^^^
+
+You can easily filter your invoices list according to any state or status - Archived, Deleted, Draft, Viewed, Partial, Paid, Unpaid, Overdue. Go to the Filter field, located at the top left of the Invoices list page. Click inside the field. A drop down menu will open, displaying all the filter options. Click on the filter option or multiple options you want. The list will refresh automatically to display your chosen filters.
+
+.. TIP:: The default filter is Active, so all your current active invoices will be displayed in the list, no matter the status. Remove the Active filter by clicking on the X.
+
+Bulk Actions
+^^^^^^^^^^^^
+
+If you need to perform an action for a number of invoices, you can do it in one click with the bulk action feature. To use the bulk action feature, mark the relevant invoices in their checkbox at the far left of the invoices list. Once you've marked the invoices, click on the arrow of the gray Archive button, which is located at the top left of the invoices list. A drop down menu will open, featuring the following options:
+
+- **Download Invoice**: Download PDF versions of the marked invoices.
+- **Email Invoice**: Send invoices by email to the client(s).
+- **Mark Sent**: Mark invoices as sent. Only then are these invoices viewable to the client in the client portal, and the client's total balance updated with the amounts of these invoices.
+- **Mark Paid**: Mark invoices as paid.
+- **Archive Invoice**: Archive invoices.
+- **Delete Invoice**: Delete invoices.
+
+Select the relevant option. The action will be taken automatically and instantly for all the invoices you checked.
+
+.. TIP:: The number of invoices marked for bulk action will show on the Archive button. It is updated automatically when you check each invoice. This will help you keep track.
+
 
-.. TIP:: To sort the invoices list according to any of the columns, click on the orange column tab of your choice. A small arrow will appear. If the arrow is pointing up, data is sorted from lowest to highest value. If the arrow is pointing down, data is sorted from highest to lowest value. Click to change the arrow direction.
 
 Create Invoice
 """"""""""""""
@@ -59,7 +87,7 @@ Here, we’re going to focus on how to create a new invoice.
 
 **Let’s Begin**
 
-To create a new invoice, go to the Invoices tab on the main taskbar, open the drop-down menu, and click on New Invoice. This will open the Invoices / Create page.
+To create a new invoice, go to the Invoices tab on the main sidebar, and click on the + sign. This will open the Invoices / Create page.
 
 When you open the Invoices / Create page, the Invoice Ninja system will automatically create a new, empty invoice for you to complete. Note that each new invoice you create will be automatically numbered in chronological order. This will ensure your records are kept logical and organized. (You have the option to change the invoice number manually. We'll discuss that a little later.)
 
@@ -68,71 +96,83 @@ The top section of the invoice contains a range of important information specifi
 - **Client**: Click on the arrow at the right end of the Client field. Select the relevant client from the client list. TIP: You can create a new client while creating a new invoice. Simply click on the Create new client link, situated below the Client field on the Invoices / Create page. A pop-up window will open, enabling you to complete the new client’s details. Then continue creating the invoice for this new client.
 - **Invoice Date**: The date of creation of the invoice. Click the calendar icon to select the relevant date.
 - **Due Date**: The date the invoice payment is due. Click the calendar icon to select the relevant date.
-- **Partial**: In the event that you need to bill the client for a partial amount of the total amount due, enter the amount in the Partial field. This will be automatically applied to the invoice.
+- **Partial/Deposit**: In the event that you need to bill the client for a partial amount of the total amount due, enter the amount in the Partial/Deposit field. This will be automatically applied to the invoice.
 - **Invoice #**: The invoice number is assigned automatically when you create a new invoice, in order of chronology. TIP: You can manually override the default invoice number by entering a different number in the Invoice # field.
 - **PO #**: The purchase order number. Enter the purchase order number for easy reference.
 - **Discount**: If you wish to apply a discount to the invoice, you can choose one of two methods: a monetary amount, or a percentage of the total amount due. To choose a method, click on the arrow at the right side of the box next to the Discount field. Select Percent or Amount from the drop-down list. Then enter the relevant figure. For example, to apply a 20% discount, enter the number 20, and select “Percent” from the drop-down list. To apply a $50 discount, enter the number 50, and select “Amount” from the drop-down list.
-- **Taxes**: Manage the various tax rates that apply by clicking on the Manage rates link. The Tax Rates pop-up window will open. To apply a tax rate, enter the name of the tax in the Name field, and the percentage amount in the Rate field. For example, to apply a VAT of 17%, enter VAT in the Name field, and 17 in the Rate field. TIP: If you need to apply multiple taxes, add another Name and Rate to the new row. A new row will open automatically as soon as you begin typing in the current row.
+.. TIP: The currency of the invoice will be set according to the default currency specified for this client when you created the client.
 
-The Tax Rates pop-up box offers various settings for presentation of taxes on the invoice. Check the boxes of the settings you wish to apply.
+Now that we’ve completed the general invoice information, it’s time to finish creating your invoice by specifying the job/s you’re billing for, the amounts due for each job/line item, taxes, discounts and final balance due. Let's explore the various columns of the invoice, from left to right along the header bar:
 
-- **Enable specifying an invoice tax**: Check this box to apply the tax rate for the entire invoice. It will appear on the invoice above the Balance Due field.
-- **Enable specifying line item taxes**: Check this box to apply various tax rates to specific items of the same invoice. This setting enables you to apply different taxes to the different line items.
-- **Display line item taxes inline**: Check this box to include a Tax column on the invoice, so your customer can view the tax amounts that apply to each line item.
-
-After selecting the desired tax settings, you’ll need to choose a tax rate for the invoice, or for each line item. To select a tax rate, click on the arrow at the right side of each Tax field that appears on the invoice. A drop-down list will open, featuring all the tax rates you created. Choose the relevant tax rate from the list. It will automatically apply and the figures in the invoice will adjust accordingly.
-
-.. TIP:: The currency of the invoice will be according to the default currency specified for this client when you created the client.
-
-Now that we’ve completed the general invoice information, it’s time to finish creating your invoice by specifying the job/s you’re billing for, the amounts due for each job/line item, taxes, discounts and final balance due. Let's explore the various columns of the invoice, from left to right along the orange header bar:
-
-- **Item**: This is the name of the item you are billing for. You can either enter the details manually, or by selecting one of the set items created by you at the Product Settings stage. To select a set item, click on the arrow at the right side of the item bar and choose the relevant item from the drop-down list. To enter the item manually, click inside the field and enter the item. Here are some examples of an item: 1 hour programming services OR 5 pages translation OR 1 hour consulting.
+- **Item**: This is the name of the item you are billing for. You can either enter the details manually, or by selecting one of the set items created by you in the Product Library. To select an item from your product library, click on the arrow at the right side of the item bar and choose the relevant item from the drop-down list. To enter the item manually, click inside the field and enter the item. Here are some examples of an item: 1 hour programming services OR 5 pages translation OR 1 hour consulting.
 - **Description**: Add more information about the item. This will help the customer better understand the job completed, and is also useful for your own reference.
-- **Unit Cost**: The amount you charge per unit of items. For example, let's say your item is "1 hour consulting", and you charge $80 for an hour of consulting – that is, for 1 item unit. Then you'll enter 80 in the Unit Cost field. Note: If you have selected a set item, the unit cost that you pre-defined at the Product Settings stage will apply by default. You can manually override the default unit cost by clicking in the Unit Cost field and changing the value.
+- **Unit Cost**: The amount you charge per unit of items. For example, let's say your item is "1 hour consulting", and you charge $80 for an hour of consulting – that is, for 1 item unit. Then you'll enter 80 in the Unit Cost field.
+
+.. Note:: If you have selected a set item from the Product Library, the description and unit cost that you pre-defined in the Product Library will apply by default. You can manually override the default unit cost or description by clicking in field and changing the data.
+
 - **Quantity**: The number of units being charged. Continuing the above example, let's say you need to charge for 3 hours of consulting, enter the number 3 in the Quantity field.
-- **Tax**: This field will only appear if you selected "Enable specifying line item taxes." To apply tax to the line item, click on the arrow at the right side of the Tax field and select the relevant tax from the drop-down list.
+- **Tax**: Note: This field will only appear if you selected "Enable specifying line item taxes" in the Settings > Tax Rates section of your account. To apply tax to the line item, click on the arrow at the right side of the Tax field and select the relevant tax from the drop-down list.
 - **Line Total**: This is the amount due for the particular line item. Once you have entered the Unit Cost and Quantity, this figure will be calculated automatically. If you change either value at any time during creation of the invoice, the Line Total will adjust accordingly.
 
-.. TIP:: You can enter as many line items as you need in the invoice. As soon as you enter any data in a line item, a fresh, blank line item will open in the row below.
+.. TIP: You can enter as many line items as you need in the invoice. As soon as you enter any data in a line item, a fresh, blank line item will open in the row below.
 
 Beneath and to the right of the line item section, you'll find the Balance Due section. It's made up of a number of figures, all leading to the golden number – the final, total Balance Due.
 
 - **Subtotal**: This is the amount due before other figures are taken into calculation, such as Tax, Partial payments, Credits, etc.
-- **Tax**: The tax rate for the invoice. Here you can select the appropriate tax rate for the entire invoice by clicking the arrow at the right side of the Tax field and selecting the relevant tax from the drop-down list. Note: If you selected "Enable specifying line item taxes" in the Manage rates pop-up box, then the tax applied to each line item will appear here, listed individually.
+- **Tax**: The tax rate for the invoice. Note: To apply a tax rate to the entire invoice, you must enable it first. Go to Settings > Tax Rates, and check the box for "Enable specifying an invoice tax". Select the appropriate tax rate for the entire invoice by clicking the arrow at the right side of the Tax field and selecting the relevant tax from the drop-down list.
 - **Paid to Date**: The amount paid to date, including partial payments and credits.
-- **Balance Due**: The final balance owed to you by your customer, after taxes, partial payments and credits have been deducted from the charged amount.
+- **Balance Due**: The final balance owed to you, after taxes, partial payments and credits have been deducted from the charged amount.
 
-Directly to the left of the Balance Due section, you'll see a text box with three tabs to choose from:
+Directly to the left of the Balance Due section, you'll see a text box with a number of tabs to choose from:
 
-- **Note to Client**: Want to write a personal or explanatory note to the client? Enter it here.
-- **Invoice Terms**: Want to set terms to the invoice? Enter them here. The terms will appear on the invoice. If you want to make these the default terms for all invoices, check the Save as default terms box. Then these terms will automatically appear on each invoice you create. Need to change the default terms? Click Reset Terms, and the text box will clear. You can enter new terms or leave blank.
-- **Invoice Footer**: Want to enter information to appear as a footer on the invoice? Enter it here. The text will appear at the bottom of the invoice. If you want to make this the default footer for all invoices, check the Save as default footer box. Then this footer will automatically appear on each invoice you create. Need to change the default footer? Click Reset footer, and the text box will clear. You can enter a new footer or leave blank.
+- **Public Notes**: Want to write a personal or explanatory note to the client? Enter it here.
+- **Private Notes**: Want to include some notes or comments for your eyes only? Enter them here, and only you can see them.
+- Terms: Want to set terms to the invoice? Enter them here. The terms will appear on the invoice. If you want to make these the default terms for all invoices, check the Save as default terms box. Then these terms will automatically appear on each invoice you create.
+- **Footer**: Want to enter information to appear as a footer on the invoice? Enter it here. The text will appear at the bottom of the invoice. If you want to make this the default footer for all invoices, check the Save as default footer box. Then this footer will automatically appear on each invoice you create.
+- **Documents**: If you have an Enterprise account, you can attach 3rd party documents to send with your invoice. Click to upload files from your computer, or use the drag and drop feature to attach them. You can attach any type of file as long as it doesn't exceed 10 MB in size. Note: You must enable this feature in order to attach 3rd party documents. To enable, go to Advanced Settings > Email Settings and check Enable for Attach PDFs and Attach Documents. 
 
 .. TIP:: The Invoices page is rich in clickable links, providing you with a shortcut to relevant pages you may wish to view. For example, all invoice numbers are clickable, taking you directly to the specific invoice page, and all client names are clickable, taking you directly to the specific client summary page.
 
 Invoice Preview
 ^^^^^^^^^^^^^^^
 
-Did you know that all this time you've been creating the new invoice, a preview of the invoice appears below, and it changes in real time according to the data you've entered?
+Did you know that all this time you've been creating the new invoice, a live PDF preview of the invoice appears below, and it changes in real time according to the data you've entered?
 
 Scroll down below the invoice data fields to check out the invoice preview.
 
 But before we get there you'll see a row of colorful buttons, giving you a range of options:
 
 - **Blue button – Download PDF**: Download the invoice as a PDF file. You can then print or save to your PC or mobile device.
-- **Green button – Save Invoice**: Save the last version of the invoice. The data is saved in your Invoice Ninja account. You can return to the invoice at any time to continue working on it.
-- **Orange button – Email Invoice**: Email the invoice directly via the Invoice Ninja system to the email address specified for the client.
-- **Gray button – More Actions**
+- **Gray button – Save Draft**: Save the latest version of the invoice. The data is saved in your Invoice Ninja account. You can return to the invoice at any time to continue working on it. Note: An invoice in the Draft stage is not viewable to the client in the client portal, and the amount on the invoice is not reflected in the client's invoicing balance.
+- **Green button – Mark Sent**: If you mark the invoice as sent, then the invoice will be viewable to your client in the client portal. The amount on the invoice will also be calculated in the client's balance data.
+- **Orange button - Email Invoice**: Email the invoice directly via the Invoice Ninja system to the email address specified for the client.
+- **Gray button – More Actions**: Click on More Actions to open the following action list:
 
-Click on More Actions to open the following action list:
-
-- **Clone**: Invoice Duplicate the current invoice. Then you can make minor adjustments. This is a fast way to create a new invoice that is identical or similar to a previous invoice.
+- **Clone Invoice**: Duplicate the current invoice. Then you can make minor adjustments. This is a fast way to create a new invoice that is identical or similar to a previous invoice.
 - **View History**: You'll be redirected to the Invoices / History page, where you can view a history of all the actions taken from the time the invoice was created. The Invoices / History page displays a copy of the latest version of the invoice and a drop-down list of all actions and the corresponding version of the invoice. Select the version you wish to view. Click on the blue Edit Invoice button at the top right of the page to go back to the invoice page.
-- **Mark Sent**: When you have sent the invoice to your customer, mark as Sent. This will update the invoice status in the Invoices list, so you can keep track.
+- **Mark Paid**: The invoice status is changed to Paid.
 - **Enter Payment**: Enter the payment relevant to this invoice. You'll be redirected to the Payments / Create page.
 - **Archive Invoice**: Want to archive the invoice? Click here. The invoice will be archived and removed from the Invoices list page.
 - **Delete Invoice**: Want to delete the invoice? Click here. The invoice will be deleted and removed from the Invoices list page.
 
-.. TIP:: At the left of these colorful buttons, you'll see a field with an arrow that opens a drop-down menu. This field provides you with template options for the invoice design. Click on the arrow to select the desired template. When selected, the invoice preview will change to reflect the new template.
+.. TIP: At the left of these colorful buttons, you'll see a field with an arrow that opens a drop-down menu. This field provides you with template options for the invoice design. Click on the arrow to select the desired template. When selected, the live PDF invoice preview will change to reflect the new template.
 
-.. IMPORTANT:: Remember to click the green Save Invoice button every time you finish working on an invoice. If you don't click Save, you will lose the changes made. (But don't worry – if you forget to click Save, a dialog box with a reminder to save will open when you try to leave the page.)
+.. IMPORTANT: Remember to click the gray Save Draft button every time you finish working on an invoice. If you don't click Save, you will lose the changes made. (But don't worry – if you forget to click Save, a dialog box with a reminder to save will open when you try to leave the page.)
+
+Email Invoice preview
+^^^^^^^^^^^^^^^^^^^^^
+
+When you are ready to send an invoice to the client, click the orange Email Invoice button. Before the invoice email is sent, a pop-up box will open, displaying a preview of the email. Here, you can customize the email template, including the text, data fields, and formatting. You can also view the sent history of the email.
+
+Customizing the Invoice Email Template
+''''''''''''''''''''''''''''''''''''''
+
+To customize the email template, click the Customize tab. Add text or edit the default text, and use the formatting toolbar below to adjust the layout. Once you've finished customizing, click the Preview tab to see how the email looks.
+Note: The email contains variables that automatically insert the relevant data to the email, so you don't need to type it in. Examples include the client's name and invoice balance. To see a full list of the variables you can insert and how to write them, click the question mark icon at the right end of the email subject line header.
+
+.. TIP:: You can customize any type of email template from the Email Invoice box, including Initial Email, First Reminder, Second Reminder and Third Reminder emails. Go to Email Template and click to open the drop-down menu. Select the relevant template you want to work on.
+
+Viewing the Email History
+'''''''''''''''''''''''''
+
+To view a history of when the email invoice was last sent, click the History tab. A list of all instances the email was sent will be shown here, according to date.

docs/mobile_apps.rst

@@ -3,6 +3,8 @@ Mobile Applications
 
 The Invoice Ninja iPhone and Android applications allows a user to connect to their self-hosted Invoice Ninja web application.
 
+.. TIP:: If you're unable to access the Android app store you can download the APK here: https://download.invoiceninja.com/apk
+
 Connecting your to your self-hosted invoice ninja installation requires a couple of easy steps.
 
 Web App configuration

gulpfile.js

@@ -50,6 +50,7 @@ elixir(function(mix) {
         bowerDir + '/dropzone/dist/dropzone.css',
         bowerDir + '/spectrum/spectrum.css',
         bowerDir + '/sweetalert2/dist/sweetalert2.css',
+        bowerDir + '/toastr/toastr.css',
         'bootstrap-combobox.css',
         'typeahead.js-bootstrap.css',
         'style.css',
@@ -66,6 +67,10 @@ elixir(function(mix) {
         bowerDir + '/bootstrap-daterangepicker/daterangepicker.css'
     ], 'public/css/daterangepicker.css');
 
+    mix.styles([
+        bowerDir + '/jt.timepicker/jquery.timepicker.css'
+    ], 'public/css/jquery.timepicker.css');
+
     mix.styles([
         bowerDir + '/select2/dist/css/select2.css'
     ], 'public/css/select2.css');
@@ -76,6 +81,10 @@ elixir(function(mix) {
         bowerDir + '/tablesorter/dist/css/widget.grouping.min.css'
     ], 'public/css/tablesorter.css');
 
+    mix.styles([
+        bowerDir + '/fullcalendar/dist/fullcalendar.css'
+    ], 'public/css/fullcalendar.css');
+
 
     /**
      * JS configuration
@@ -94,6 +103,15 @@ elixir(function(mix) {
         bowerDir + '/bootstrap-daterangepicker/daterangepicker.js'
     ], 'public/js/daterangepicker.min.js');
 
+    mix.scripts([
+        bowerDir + '/jt.timepicker/jquery.timepicker.js'
+    ], 'public/js/jquery.timepicker.js');
+
+    mix.scripts([
+        bowerDir + '/fullcalendar/dist/fullcalendar.js',
+        bowerDir + '/fullcalendar/dist/locale-all.js',
+    ], 'public/js/fullcalendar.min.js');
+
     mix.scripts([
         bowerDir + '/card/dist/card.js',
     ], 'public/js/card.min.js');
@@ -141,12 +159,12 @@ elixir(function(mix) {
         bowerDir + '/spectrum/spectrum.js',
         bowerDir + '/moment/moment.js',
         bowerDir + '/moment-timezone/builds/moment-timezone-with-data.js',
-        //bowerDir + '/stacktrace-js/dist/stacktrace-with-polyfills.min.js',
+        bowerDir + '/stacktrace-js/stacktrace.js',
         bowerDir + '/es6-promise/es6-promise.auto.js',
         bowerDir + '/sweetalert2/dist/sweetalert2.js',
-        //bowerDir + '/sweetalert/dist/sweetalert-dev.js',
         bowerDir + '/nouislider/distribute/nouislider.js',
         bowerDir + '/mousetrap/mousetrap.js',
+        bowerDir + '/toastr/toastr.js',
         bowerDir + '/fuse.js/src/fuse.js',
         'bootstrap-combobox.js',
         'script.js',

public/css/jquery.timepicker.css

@@ -0,0 +1,2 @@
+.ui-timepicker-wrapper{overflow-y:auto;max-height:150px;width:6.5em;background:#fff;border:1px solid #ddd;-webkit-box-shadow:0 5px 10px rgba(0,0,0,.2);-moz-box-shadow:0 5px 10px rgba(0,0,0,.2);box-shadow:0 5px 10px rgba(0,0,0,.2);outline:0;z-index:10001;margin:0}.ui-timepicker-wrapper.ui-timepicker-with-duration{width:13em}.ui-timepicker-wrapper.ui-timepicker-with-duration.ui-timepicker-step-30,.ui-timepicker-wrapper.ui-timepicker-with-duration.ui-timepicker-step-60{width:11em}.ui-timepicker-list{margin:0;padding:0;list-style:none}.ui-timepicker-duration{margin-left:5px;color:#888}.ui-timepicker-list:hover .ui-timepicker-duration{color:#888}.ui-timepicker-list li{padding:3px 0 3px 5px;cursor:pointer;white-space:nowrap;color:#000;list-style:none;margin:0}.ui-timepicker-list:hover .ui-timepicker-selected{background:#fff;color:#000}.ui-timepicker-list .ui-timepicker-selected:hover,.ui-timepicker-list li:hover,li.ui-timepicker-selected{background:#1980EC;color:#fff}.ui-timepicker-list li:hover .ui-timepicker-duration,li.ui-timepicker-selected .ui-timepicker-duration{color:#ccc}.ui-timepicker-list li.ui-timepicker-disabled,.ui-timepicker-list li.ui-timepicker-disabled:hover,.ui-timepicker-list li.ui-timepicker-selected.ui-timepicker-disabled{color:#888;cursor:default}.ui-timepicker-list li.ui-timepicker-disabled:hover,.ui-timepicker-list li.ui-timepicker-selected.ui-timepicker-disabled{background:#f2f2f2}
+/*# sourceMappingURL=jquery.timepicker.css.map */

public/css/jquery.timepicker.css.map

@@ -0,0 +1 @@
+{"version":3,"sources":["jquery.timepicker.css"],"names":[],"mappings":"AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA","file":"jquery.timepicker.css","sourcesContent":[".ui-timepicker-wrapper {\n\toverflow-y: auto;\n\tmax-height: 150px;\n\twidth: 6.5em;\n\tbackground: #fff;\n\tborder: 1px solid #ddd;\n\t-webkit-box-shadow:0 5px 10px rgba(0,0,0,0.2);\n\t-moz-box-shadow:0 5px 10px rgba(0,0,0,0.2);\n\tbox-shadow:0 5px 10px rgba(0,0,0,0.2);\n\toutline: none;\n\tz-index: 10001;\n\tmargin: 0;\n}\n\n.ui-timepicker-wrapper.ui-timepicker-with-duration {\n\twidth: 13em;\n}\n\n.ui-timepicker-wrapper.ui-timepicker-with-duration.ui-timepicker-step-30,\n.ui-timepicker-wrapper.ui-timepicker-with-duration.ui-timepicker-step-60 {\n\twidth: 11em;\n}\n\n.ui-timepicker-list {\n\tmargin: 0;\n\tpadding: 0;\n\tlist-style: none;\n}\n\n.ui-timepicker-duration {\n\tmargin-left: 5px; color: #888;\n}\n\n.ui-timepicker-list:hover .ui-timepicker-duration {\n\tcolor: #888;\n}\n\n.ui-timepicker-list li {\n\tpadding: 3px 0 3px 5px;\n\tcursor: pointer;\n\twhite-space: nowrap;\n\tcolor: #000;\n\tlist-style: none;\n\tmargin: 0;\n}\n\n.ui-timepicker-list:hover .ui-timepicker-selected {\n\tbackground: #fff; color: #000;\n}\n\nli.ui-timepicker-selected,\n.ui-timepicker-list li:hover,\n.ui-timepicker-list .ui-timepicker-selected:hover {\n\tbackground: #1980EC; color: #fff;\n}\n\nli.ui-timepicker-selected .ui-timepicker-duration,\n.ui-timepicker-list li:hover .ui-timepicker-duration {\n\tcolor: #ccc;\n}\n\n.ui-timepicker-list li.ui-timepicker-disabled,\n.ui-timepicker-list li.ui-timepicker-disabled:hover,\n.ui-timepicker-list li.ui-timepicker-selected.ui-timepicker-disabled {\n\tcolor: #888;\n\tcursor: default;\n}\n\n.ui-timepicker-list li.ui-timepicker-disabled:hover,\n.ui-timepicker-list li.ui-timepicker-selected.ui-timepicker-disabled {\n\tbackground: #f2f2f2;\n}\n"]}

resources/assets/js/pdf.pdfmake.js

@@ -410,10 +410,10 @@ NINJA.invoiceColumns = function(invoice)
 
     columns.push("*")
 
-    if (invoice.features.invoice_settings && account.custom_invoice_item_label1) {
+    if (invoice.has_custom_item_value1) {
         columns.push("10%");
     }
-    if (invoice.features.invoice_settings && account.custom_invoice_item_label2) {
+    if (invoice.has_custom_item_value2) {
         columns.push("10%");
     }
 
@@ -476,10 +476,10 @@ NINJA.invoiceLines = function(invoice, isSecondTable) {
 
     grid[0].push({text: invoiceLabels.description, style: styles.concat('descriptionTableHeader')});
 
-    if (invoice.features.invoice_settings && account.custom_invoice_item_label1) {
+    if (invoice.has_custom_item_value1) {
         grid[0].push({text: account.custom_invoice_item_label1, style: styles.concat('custom1TableHeader')});
     }
-    if (invoice.features.invoice_settings && account.custom_invoice_item_label2) {
+    if (invoice.has_custom_item_value2) {
         grid[0].push({text: account.custom_invoice_item_label2, style: styles.concat('custom2TableHeader')});
     }
 
@@ -497,7 +497,7 @@ NINJA.invoiceLines = function(invoice, isSecondTable) {
 
         var row = [];
         var item = invoice.invoice_items[i];
-        var cost = formatMoneyInvoice(item.cost, invoice, 'none', getPrecision(item.cost));
+        var cost = formatMoneyInvoice(item.cost, invoice, null, getPrecision(item.cost));
         var qty = NINJA.parseFloat(item.qty) ? roundSignificant(NINJA.parseFloat(item.qty)) + '' : '';
         var notes = item.notes;
         var productKey = item.product_key;
@@ -526,7 +526,7 @@ NINJA.invoiceLines = function(invoice, isSecondTable) {
         }
 
         // show at most one blank line
-        if (shownItem && !notes && !productKey && (!cost || cost == '0' || cost == '0.00' || cost == '0,00')) {
+        if (shownItem && !notes && !productKey && !item.cost) {
             continue;
         }
 
@@ -560,10 +560,10 @@ NINJA.invoiceLines = function(invoice, isSecondTable) {
             row.push({style:["productKey", rowStyle], text:productKey || ' '}); // product key can be blank when selecting from a datalist
         }
         row.push({style:["notes", rowStyle], stack:[{text:notes || ' '}]});
-        if (invoice.features.invoice_settings && account.custom_invoice_item_label1) {
+        if (invoice.has_custom_item_value1) {
             row.push({style:["customValue1", rowStyle], text:custom_value1 || ' '});
         }
-        if (invoice.features.invoice_settings && account.custom_invoice_item_label2) {
+        if (invoice.has_custom_item_value2) {
             row.push({style:["customValue2", rowStyle], text:custom_value2 || ' '});
         }
         if (!hideQuantity) {

resources/assets/js/script.js

@@ -9,6 +9,8 @@ var isChromium = isChrome && navigator.userAgent.indexOf('Chromium') >= 0;
 var isChrome48 = isChrome && navigator.userAgent.indexOf('Chrome/48') >= 0;
 var isIE = /*@cc_on!@*/false || !!document.documentMode; // At least IE6
 var isMobile = /Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent);
+var isAndroid = /Android/i.test(navigator.userAgent);
+var isIPhone = /iPhone|iPad|iPod/i.test(navigator.userAgent);
 
 var refreshTimer;
 function generatePDF(invoice, javascript, force, cb) {
@@ -671,6 +673,8 @@ function calculateAmounts(invoice) {
   var hasTaxes = false;
   var taxes = {};
   invoice.has_product_key = false;
+  invoice.has_custom_item_value1 = false;
+  invoice.has_custom_item_value2 = false;
 
   // Bold designs currently breaks w/o the product column
   if (invoice.invoice_design_id == 2) {
@@ -715,6 +719,16 @@ function calculateAmounts(invoice) {
         invoice.has_product_key = true;
     }
 
+    if (invoice.features.invoice_settings) {
+        if (item.custom_value1) {
+            invoice.has_custom_item_value1 = true;
+        }
+
+        if (item.custom_value2) {
+            invoice.has_custom_item_value2 = true;
+        }
+    }
+
     if (parseFloat(item.tax_rate1) != 0) {
       taxRate1 = parseFloat(item.tax_rate1);
       taxName1 = item.tax_name1;
@@ -1259,3 +1273,19 @@ function pad(n, width, z) {
     n = n + '';
     return n.length >= width ? n : new Array(width - n.length + 1).join(z) + n;
 }
+
+function brewerColor(number) {
+    var colors = [
+        '#1c9f77',
+        '#d95d02',
+        '#716cb1',
+        '#e62a8b',
+        '#5fa213',
+        '#e6aa04',
+        '#a87821',
+        '#676767',
+    ];
+    var number = (number-1) % colors.length;
+
+    return colors[number];
+}

resources/lang/ca/texts.php

@@ -60,7 +60,7 @@ $LANG = array(
     'download_pdf' => 'Download PDF',
     'pay_now' => 'Pay Now',
     'save_invoice' => 'Save Invoice',
-    'clone_invoice' => 'Clone Invoice',
+    'clone_invoice' => 'Clone To Invoice',
     'archive_invoice' => 'Archive Invoice',
     'delete_invoice' => 'Delete Invoice',
     'email_invoice' => 'Email Invoice',
@@ -323,7 +323,7 @@ $LANG = array(
     'delete_quote' => 'Delete Quote',
     'save_quote' => 'Save Quote',
     'email_quote' => 'Email Quote',
-    'clone_quote' => 'Clone Quote',
+    'clone_quote' => 'Clone To Quote',
     'convert_to_invoice' => 'Convert to Invoice',
     'view_invoice' => 'View Invoice',
     'view_client' => 'View Client',
@@ -655,7 +655,7 @@ $LANG = array(
     'created_by_invoice' => 'Created by :invoice',
     'primary_user' => 'Primary User',
     'help' => 'Help',
-    'customize_help' => '<p>We use <a href="http://pdfmake.org/" target="_blank">pdfmake</a> to define the invoice designs declaratively. The pdfmake <a href="http://pdfmake.org/playground.html" target="_blank">playground</a> provide\'s a great way to see the library in action.</p>
+    'customize_help' => '<p>We use <a href="http://pdfmake.org/" target="_blank">pdfmake</a> to define the invoice designs declaratively. The pdfmake <a href="http://pdfmake.org/playground.html" target="_blank">playground</a> provides a great way to see the library in action.</p>
                         <p>You can access a child property using dot notation. For example to show the client name you could use <code>$client.name</code>.</p>
                         <p>If you need help figuring something out post a question to our <a href="https://www.invoiceninja.com/forums/forum/support/" target="_blank">support forum</a> with the design you\'re using.</p>',
     'invoice_due_date' => 'Due Date',
@@ -996,6 +996,7 @@ $LANG = array(
     'enable_https' => 'We strongly recommend using HTTPS to accept credit card details online.',
     'quote_issued_to' => 'Quote issued to',
     'show_currency_code' => 'Currency Code',
+    'free_year_message' => 'Your account has been upgraded to the pro plan for one year at no cost.',
     'trial_message' => 'Your account will receive a free two week trial of our pro plan.',
     'trial_footer' => 'Your free pro plan trial lasts :count more days, :link to upgrade now.',
     'trial_footer_last_day' => 'This is the last day of your free pro plan trial, :link to upgrade now.',
@@ -1016,7 +1017,7 @@ $LANG = array(
     'pro_plan_remove_logo' => ':link to remove the Invoice Ninja logo by joining the Pro Plan',
     'pro_plan_remove_logo_link' => 'Click here',
     'invitation_status_sent' => 'sent',
-    'invitation_status_opened' => 'Openend',
+    'invitation_status_opened' => 'Opened',
     'invitation_status_viewed' => 'Viewed',
     'email_error_inactive_client' => 'Emails can not be sent to inactive clients',
     'email_error_inactive_contact' => 'Emails can not be sent to inactive contacts',
@@ -1412,6 +1413,7 @@ $LANG = array(
     'payment_type_Swish' => 'Swish',
     'payment_type_Alipay' => 'Alipay',
     'payment_type_Sofort' => 'Sofort',
+    'payment_type_SEPA' => 'SEPA Direct Debit',
 
     // Industries
     'industry_Accounting & Legal' => 'Accounting & Legal',
@@ -1724,6 +1726,7 @@ $LANG = array(
     'lang_Turkish - Turkey' => 'Turkish - Turkey',
     'lang_Portuguese - Brazilian' => 'Portuguese - Brazilian',
     'lang_Portuguese - Portugal' => 'Portuguese - Portugal',
+    'lang_Thai' => 'Thai',
 
     // Frequencies
     'freq_weekly' => 'Weekly',
@@ -2391,6 +2394,7 @@ $LANG = array(
     'currency_jordanian_dinar' => 'Jordanian Dinar',
     'currency_myanmar_kyat' => 'Myanmar Kyat',
     'currency_peruvian_sol' => 'Peruvian Sol',
+    'currency_botswana_pula' => 'Botswana Pula',
     'review_app_help' => 'We hope you\'re enjoying using the app.<br/>If you\'d consider <a href="http://www.capterra.com/p/145215/Invoice-Ninja/" target="_blank">writing a review</a> we\'d greatly appreciate it!',
 
     'use_english_version' => 'Make sure to use the English version of the files.<br/>We use the column headers to match the fields.',
@@ -2441,11 +2445,43 @@ $LANG = array(
 
     'alipay' => 'Alipay',
     'sofort' => 'Sofort',
+    'sepa' => 'SEPA Direct Debit',
     'enable_alipay' => 'Accept Alipay',
     'enable_sofort' => 'Accept EU bank transfers',
     'stripe_alipay_help' => 'These gateways also need to be activated in :link.',
     'gocardless_webhook_help_link_text' => 'add this URL as an endpoint in GoCardless',
+    'calendar' => 'Calendar',
+    'pro_plan_calendar' => ':link to enable the calendar by joining the Pro Plan',
 
+    'what_are_you_working_on' => 'What are you working on?',
+    'time_tracker' => 'Time Tracker',
+    'refresh' => 'Refresh',
+    'filter_sort' => 'Filter/Sort',
+    'no_description' => 'No Description',
+    'time_tracker_login' => 'Time Tracker Login',
+    'save_or_discard' => 'Save or discard your changes',
+    'discard_changes' => 'Discard Changes',
+    'tasks_not_enabled' => 'Tasks are not enabled.',
+    'started_task' => 'Successfully started task',
+    'create_client' => 'Create Client',
+
+    'download_desktop_app' => 'Download the desktop app',
+    'download_iphone_app' => 'Download the iPhone app',
+    'download_android_app' => 'Download the Android app',
+    'time_tracker_mobile_help' => 'Double tap a task to select it',
+    'stopped' => 'Stopped',
+    'ascending' => 'Ascending',
+    'descending' => 'Descending',
+    'sort_field' => 'Sort By',
+    'sort_direction' => 'Direction',
+    'discard' => 'Discard',
+    'time_am' => 'AM',
+    'time_pm' => 'PM',
+    'time_mins' => 'mins',
+    'time_hr' => 'hr',
+    'time_hrs' => 'hrs',
+    'clear' => 'Clear',
+    'warn_payment_gateway' => 'Note: to accept online payments :link to add a payment gateway.',
 );
 
 return $LANG;

resources/lang/cs/texts.php

@@ -60,7 +60,7 @@ $LANG = array(
     'download_pdf' => 'Stáhnout PDF',
     'pay_now' => 'Zaplatit nyní',
     'save_invoice' => 'Uložit fakturu',
-    'clone_invoice' => 'Zduplikovat fakturu',
+    'clone_invoice' => 'Clone To Invoice',
     'archive_invoice' => 'Archivovat fakturu',
     'delete_invoice' => 'Smazat fakturu',
     'email_invoice' => 'Poslat fakturu emailem',
@@ -322,7 +322,7 @@ $LANG = array(
     'delete_quote' => 'Smazat nabídku',
     'save_quote' => 'Uložit nabídku',
     'email_quote' => 'Odeslat nabídku emailem',
-    'clone_quote' => 'Duplikovat nabídku',
+    'clone_quote' => 'Clone To Quote',
     'convert_to_invoice' => 'Změnit na fakturu',
     'view_invoice' => 'Zobrazit fakturu',
     'view_client' => 'Zobrazit klienta',
@@ -656,7 +656,7 @@ $LANG = array(
     'created_by_invoice' => 'Vytvořeno  :invoice',
     'primary_user' => 'Primární uživatel',
     'help' => 'Pomoc',
-    'customize_help' => '<p>We use <a href="http://pdfmake.org/" target="_blank">pdfmake</a> to define the invoice designs declaratively. The pdfmake <a href="http://pdfmake.org/playground.html" target="_blank">playground</a> provide\'s a great way to see the library in action.</p>
+    'customize_help' => '<p>We use <a href="http://pdfmake.org/" target="_blank">pdfmake</a> to define the invoice designs declaratively. The pdfmake <a href="http://pdfmake.org/playground.html" target="_blank">playground</a> provides a great way to see the library in action.</p>
                         <p>You can access a child property using dot notation. For example to show the client name you could use <code>$client.name</code>.</p>
                         <p>If you need help figuring something out post a question to our <a href="https://www.invoiceninja.com/forums/forum/support/" target="_blank">support forum</a> with the design you\'re using.</p>',
     'invoice_due_date' => 'Datum splatnosti',
@@ -998,6 +998,7 @@ $LANG = array(
     'enable_https' => 'Pro akceptování platebních karet online používejte vždy HTTPS.',
     'quote_issued_to' => 'Náklad je vystaven',
     'show_currency_code' => 'Kód měny',
+    'free_year_message' => 'Your account has been upgraded to the pro plan for one year at no cost.',
     'trial_message' => 'Váš účet získá zdarma 2 týdny zkušební verze Profi plánu.',
     'trial_footer' => 'Your free pro plan trial lasts :count more days, :link to upgrade now.',
     'trial_footer_last_day' => 'This is the last day of your free pro plan trial, :link to upgrade now.',
@@ -1018,7 +1019,7 @@ $LANG = array(
     'pro_plan_remove_logo' => ':link pro odstranění loga Invoice Ninja připojením se k profi plánu',
     'pro_plan_remove_logo_link' => 'Klikněte zde',
     'invitation_status_sent' => 'sent',
-    'invitation_status_opened' => 'Openend',
+    'invitation_status_opened' => 'Opened',
     'invitation_status_viewed' => 'Viewed',
     'email_error_inactive_client' => 'Emaily nemohou být odeslány neaktivním klientům',
     'email_error_inactive_contact' => 'Emaily nemohou být odeslány neaktivním kontaktům',
@@ -1414,6 +1415,7 @@ $LANG = array(
     'payment_type_Swish' => 'Swish',
     'payment_type_Alipay' => 'Alipay',
     'payment_type_Sofort' => 'Sofort',
+    'payment_type_SEPA' => 'SEPA Direct Debit',
 
     // Industries
     'industry_Accounting & Legal' => 'Accounting & Legal',
@@ -1726,6 +1728,7 @@ $LANG = array(
     'lang_Turkish - Turkey' => 'Turkish - Turkey',
     'lang_Portuguese - Brazilian' => 'Portuguese - Brazilian',
     'lang_Portuguese - Portugal' => 'Portuguese - Portugal',
+    'lang_Thai' => 'Thai',
 
     // Frequencies
     'freq_weekly' => 'Weekly',
@@ -2393,6 +2396,7 @@ $LANG = array(
     'currency_jordanian_dinar' => 'Jordanian Dinar',
     'currency_myanmar_kyat' => 'Myanmar Kyat',
     'currency_peruvian_sol' => 'Peruvian Sol',
+    'currency_botswana_pula' => 'Botswana Pula',
     'review_app_help' => 'We hope you\'re enjoying using the app.<br/>If you\'d consider <a href="http://www.capterra.com/p/145215/Invoice-Ninja/" target="_blank">writing a review</a> we\'d greatly appreciate it!',
 
     'use_english_version' => 'Make sure to use the English version of the files.<br/>We use the column headers to match the fields.',
@@ -2443,11 +2447,43 @@ $LANG = array(
 
     'alipay' => 'Alipay',
     'sofort' => 'Sofort',
+    'sepa' => 'SEPA Direct Debit',
     'enable_alipay' => 'Accept Alipay',
     'enable_sofort' => 'Accept EU bank transfers',
     'stripe_alipay_help' => 'These gateways also need to be activated in :link.',
     'gocardless_webhook_help_link_text' => 'add this URL as an endpoint in GoCardless',
+    'calendar' => 'Calendar',
+    'pro_plan_calendar' => ':link to enable the calendar by joining the Pro Plan',
 
+    'what_are_you_working_on' => 'What are you working on?',
+    'time_tracker' => 'Time Tracker',
+    'refresh' => 'Refresh',
+    'filter_sort' => 'Filter/Sort',
+    'no_description' => 'No Description',
+    'time_tracker_login' => 'Time Tracker Login',
+    'save_or_discard' => 'Save or discard your changes',
+    'discard_changes' => 'Discard Changes',
+    'tasks_not_enabled' => 'Tasks are not enabled.',
+    'started_task' => 'Successfully started task',
+    'create_client' => 'Create Client',
+
+    'download_desktop_app' => 'Download the desktop app',
+    'download_iphone_app' => 'Download the iPhone app',
+    'download_android_app' => 'Download the Android app',
+    'time_tracker_mobile_help' => 'Double tap a task to select it',
+    'stopped' => 'Stopped',
+    'ascending' => 'Ascending',
+    'descending' => 'Descending',
+    'sort_field' => 'Sort By',
+    'sort_direction' => 'Direction',
+    'discard' => 'Discard',
+    'time_am' => 'AM',
+    'time_pm' => 'PM',
+    'time_mins' => 'mins',
+    'time_hr' => 'hr',
+    'time_hrs' => 'hrs',
+    'clear' => 'Clear',
+    'warn_payment_gateway' => 'Note: to accept online payments :link to add a payment gateway.',
 );
 
 return $LANG;

resources/lang/da/texts.php

@@ -60,7 +60,7 @@ $LANG = array(
     'download_pdf' => 'Hent PDF',
     'pay_now' => 'Betal nu',
     'save_invoice' => 'Gem faktura',
-    'clone_invoice' => 'Kopier faktura',
+    'clone_invoice' => 'Clone To Invoice',
     'archive_invoice' => 'Arkiver faktura',
     'delete_invoice' => 'Slet faktura',
     'email_invoice' => 'Send faktura som e-mail',
@@ -323,7 +323,7 @@ $LANG = array(
     'delete_quote' => 'Slet tilbud',
     'save_quote' => 'Gem tilbud',
     'email_quote' => 'E-mail tilbudet',
-    'clone_quote' => 'Kopier tilbud',
+    'clone_quote' => 'Clone To Quote',
     'convert_to_invoice' => 'Konverter til en faktura',
     'view_invoice' => 'Se faktura',
     'view_client' => 'Vis klient',
@@ -655,7 +655,7 @@ $LANG = array(
     'created_by_invoice' => 'Oprettet fra :invoice',
     'primary_user' => 'Primær bruger',
     'help' => 'Hjælp',
-    'customize_help' => '<p>We use <a href="http://pdfmake.org/" target="_blank">pdfmake</a> to define the invoice designs declaratively. The pdfmake <a href="http://pdfmake.org/playground.html" target="_blank">playground</a> provide\'s a great way to see the library in action.</p>
+    'customize_help' => '<p>We use <a href="http://pdfmake.org/" target="_blank">pdfmake</a> to define the invoice designs declaratively. The pdfmake <a href="http://pdfmake.org/playground.html" target="_blank">playground</a> provides a great way to see the library in action.</p>
                         <p>You can access a child property using dot notation. For example to show the client name you could use <code>$client.name</code>.</p>
                         <p>If you need help figuring something out post a question to our <a href="https://www.invoiceninja.com/forums/forum/support/" target="_blank">support forum</a> with the design you\'re using.</p>',
     'invoice_due_date' => 'Due Date',
@@ -996,6 +996,7 @@ $LANG = array(
     'enable_https' => 'We strongly recommend using HTTPS to accept credit card details online.',
     'quote_issued_to' => 'Quote issued to',
     'show_currency_code' => 'Currency Code',
+    'free_year_message' => 'Your account has been upgraded to the pro plan for one year at no cost.',
     'trial_message' => 'Your account will receive a free two week trial of our pro plan.',
     'trial_footer' => 'Din gratis pro plan prøveperiode udløber om :count dage, :link for at opgradere nu.',
     'trial_footer_last_day' => 'Dette er den sidste dag i din gratis pro plan prøveperiode, :link for at opgradere nu.',
@@ -1016,7 +1017,7 @@ $LANG = array(
     'pro_plan_remove_logo' => ':link for at fjerne Invoice Ninja-logoet, opgrader til en Pro Plan',
     'pro_plan_remove_logo_link' => 'Klik her',
     'invitation_status_sent' => 'sent',
-    'invitation_status_opened' => 'Openend',
+    'invitation_status_opened' => 'Opened',
     'invitation_status_viewed' => 'Viewed',
     'email_error_inactive_client' => 'Emails can not be sent to inactive clients',
     'email_error_inactive_contact' => 'Emails can not be sent to inactive contacts',
@@ -1412,6 +1413,7 @@ $LANG = array(
     'payment_type_Swish' => 'Swish',
     'payment_type_Alipay' => 'Alipay',
     'payment_type_Sofort' => 'Sofort',
+    'payment_type_SEPA' => 'SEPA Direct Debit',
 
     // Industries
     'industry_Accounting & Legal' => 'Accounting & Legal',
@@ -1724,6 +1726,7 @@ $LANG = array(
     'lang_Turkish - Turkey' => 'Turkish - Turkey',
     'lang_Portuguese - Brazilian' => 'Portuguese - Brazilian',
     'lang_Portuguese - Portugal' => 'Portuguese - Portugal',
+    'lang_Thai' => 'Thai',
 
     // Frequencies
     'freq_weekly' => 'Ugentlig',
@@ -2391,6 +2394,7 @@ $LANG = array(
     'currency_jordanian_dinar' => 'Jordanian Dinar',
     'currency_myanmar_kyat' => 'Myanmar Kyat',
     'currency_peruvian_sol' => 'Peruvian Sol',
+    'currency_botswana_pula' => 'Botswana Pula',
     'review_app_help' => 'We hope you\'re enjoying using the app.<br/>If you\'d consider <a href="http://www.capterra.com/p/145215/Invoice-Ninja/" target="_blank">writing a review</a> we\'d greatly appreciate it!',
 
     'use_english_version' => 'Make sure to use the English version of the files.<br/>We use the column headers to match the fields.',
@@ -2441,11 +2445,43 @@ $LANG = array(
 
     'alipay' => 'Alipay',
     'sofort' => 'Sofort',
+    'sepa' => 'SEPA Direct Debit',
     'enable_alipay' => 'Accept Alipay',
     'enable_sofort' => 'Accept EU bank transfers',
     'stripe_alipay_help' => 'These gateways also need to be activated in :link.',
     'gocardless_webhook_help_link_text' => 'add this URL as an endpoint in GoCardless',
+    'calendar' => 'Calendar',
+    'pro_plan_calendar' => ':link to enable the calendar by joining the Pro Plan',
 
+    'what_are_you_working_on' => 'What are you working on?',
+    'time_tracker' => 'Time Tracker',
+    'refresh' => 'Refresh',
+    'filter_sort' => 'Filter/Sort',
+    'no_description' => 'No Description',
+    'time_tracker_login' => 'Time Tracker Login',
+    'save_or_discard' => 'Save or discard your changes',
+    'discard_changes' => 'Discard Changes',
+    'tasks_not_enabled' => 'Tasks are not enabled.',
+    'started_task' => 'Successfully started task',
+    'create_client' => 'Create Client',
+
+    'download_desktop_app' => 'Download the desktop app',
+    'download_iphone_app' => 'Download the iPhone app',
+    'download_android_app' => 'Download the Android app',
+    'time_tracker_mobile_help' => 'Double tap a task to select it',
+    'stopped' => 'Stopped',
+    'ascending' => 'Ascending',
+    'descending' => 'Descending',
+    'sort_field' => 'Sort By',
+    'sort_direction' => 'Direction',
+    'discard' => 'Discard',
+    'time_am' => 'AM',
+    'time_pm' => 'PM',
+    'time_mins' => 'mins',
+    'time_hr' => 'hr',
+    'time_hrs' => 'hrs',
+    'clear' => 'Clear',
+    'warn_payment_gateway' => 'Note: to accept online payments :link to add a payment gateway.',
 );
 
 return $LANG;

resources/lang/de/texts.php

@@ -60,7 +60,7 @@ $LANG = array(
     'download_pdf' => 'PDF herunterladen',
     'pay_now' => 'Jetzt bezahlen',
     'save_invoice' => 'Rechnung speichern',
-    'clone_invoice' => 'Rechnung duplizieren',
+    'clone_invoice' => 'Clone To Invoice',
     'archive_invoice' => 'Rechnung archivieren',
     'delete_invoice' => 'Rechnung löschen',
     'email_invoice' => 'Rechnung versenden',
@@ -323,7 +323,7 @@ $LANG = array(
     'delete_quote' => 'Angebot löschen',
     'save_quote' => 'Angebot speichern',
     'email_quote' => 'Angebot per E-Mail senden',
-    'clone_quote' => 'Angebot duplizieren',
+    'clone_quote' => 'Clone To Quote',
     'convert_to_invoice' => 'In Rechnung umwandeln',
     'view_invoice' => 'Rechnung anschauen',
     'view_client' => 'Kunde anschauen',
@@ -395,7 +395,7 @@ $LANG = array(
     'more_designs_self_host_text' => '',
     'buy' => 'Kaufen',
     'bought_designs' => 'Die zusätzliche Rechnungsdesigns wurden erfolgreich hinzugefügt',
-    'sent' => 'Sent',
+    'sent' => 'Versendet',
     'vat_number' => 'USt-IdNr.',
     'timesheets' => 'Zeittabellen',
     'payment_title' => 'Geben Sie Ihre Rechnungsadresse und Ihre Kreditkarteninformationen ein',
@@ -655,9 +655,9 @@ $LANG = array(
     'created_by_invoice' => 'Erstellt durch :invoice',
     'primary_user' => 'Primärer Benutzer',
     'help' => 'Hilfe',
-    'customize_help' => '<p>Wir nutzen <a href="http://pdfmake.org/" target="_blank">pdfmake</a> um Rechnungs-Designs zu erstellen. Der pdfmake <a href="http://pdfmake.org/playground.html" target="_blank">"Spielplatz"</a> bietet eine gute Möglichkeit diese Programmbibliothek im Einsatz zu sehen.</p>
-<p>Sie können per Punktnotation auf ein Kind-Attribut zugreifen. Beispielsweise können Sie <code>$client.name</code> nutzen, um den Kundennamen anzuzeigen.</p>
-<p>Sollten Sie Verständnisprobleme haben, hinterlassen Sie doch bitte einen Forenbeitrag in unserem <a href="https://www.invoiceninja.com/forums/forum/support/" target="_blank">Support Forum</a> mit dem Design, welches Sie verwenden.</p>',
+    'customize_help' => '<p>We use <a href="http://pdfmake.org/" target="_blank">pdfmake</a> to define the invoice designs declaratively. The pdfmake <a href="http://pdfmake.org/playground.html" target="_blank">playground</a> provides a great way to see the library in action.</p>
+                        <p>You can access a child property using dot notation. For example to show the client name you could use <code>$client.name</code>.</p>
+                        <p>If you need help figuring something out post a question to our <a href="https://www.invoiceninja.com/forums/forum/support/" target="_blank">support forum</a> with the design you\'re using.</p>',
     'invoice_due_date' => 'Fälligkeitsdatum',
     'quote_due_date' => 'Gültig bis',
     'valid_until' => 'Gültig bis',
@@ -670,7 +670,7 @@ $LANG = array(
     'status_viewed' => 'Angesehen',
     'status_partial' => 'Teilweise',
     'status_paid' => 'Bezahlt',
-    'status_unpaid' => 'Unpaid',
+    'status_unpaid' => 'Unbezahlt',
     'status_all' => 'All',
     'show_line_item_tax' => '<b>Steuern für Belegpositionen</b> in der jeweiligen Zeile anzeigen',
     'iframe_url' => 'Webseite',
@@ -996,6 +996,7 @@ $LANG = array(
     'enable_https' => 'Wir empfehlen dringend HTTPS zu verwenden, um Kreditkarten online zu akzeptieren.',
     'quote_issued_to' => 'Angebot ausgefertigt an',
     'show_currency_code' => 'Währungscode',
+    'free_year_message' => 'Your account has been upgraded to the pro plan for one year at no cost.',
     'trial_message' => 'Ihr Account erhält zwei Wochen Probemitgliedschaft für unseren Pro-Plan.',
     'trial_footer' => 'Your free pro plan trial lasts :count more days, :link to upgrade now.',
     'trial_footer_last_day' => 'This is the last day of your free pro plan trial, :link to upgrade now.',
@@ -1015,8 +1016,8 @@ $LANG = array(
 
     'pro_plan_remove_logo' => ':link, um das InvoiceNinja-Logo zu entfernen, indem du dem Pro Plan beitrittst',
     'pro_plan_remove_logo_link' => 'Klicke hier',
-    'invitation_status_sent' => 'sent',
-    'invitation_status_opened' => 'Geöffnet',
+    'invitation_status_sent' => 'versendet',
+    'invitation_status_opened' => 'Opened',
     'invitation_status_viewed' => 'Gesehen',
     'email_error_inactive_client' => 'Emails können nicht zu inaktiven Kunden gesendet werden',
     'email_error_inactive_contact' => 'Emails können nicht zu inaktiven Kontakten gesendet werden',
@@ -1176,7 +1177,7 @@ $LANG = array(
     'list_vendors' => 'Lieferanten anzeigen',
     'add_users_not_supported' => 'Führen Sie ein Upgrade auf den Enterprise-Plan durch, um zusätzliche Nutzer zu Ihrem Account hinzufügen zu können.',
     'enterprise_plan_features' => 'Der Enterprise-Plan fügt Unterstützung für mehrere Nutzer und Dateianhänge hinzu. :link um die vollständige Liste der Features zu sehen.',
-    'return_to_app' => 'Return To App',
+    'return_to_app' => 'Zurück zur App',
 
 
     // Payment updates
@@ -1411,7 +1412,8 @@ Sobald Sie die Beträge erhalten haben, kommen Sie bitte wieder zurück zu diese
     'payment_type_iZettle' => 'iZettle',
     'payment_type_Swish' => 'Swish',
     'payment_type_Alipay' => 'Alipay',
-    'payment_type_Sofort' => 'Sofort',
+    'payment_type_Sofort' => 'SOFORT-Überweisung',
+    'payment_type_SEPA' => 'SEPA Direct Debit',
 
     // Industries
     'industry_Accounting & Legal' => 'Buchhaltung und Rechnungswesen',
@@ -1724,6 +1726,7 @@ Sobald Sie die Beträge erhalten haben, kommen Sie bitte wieder zurück zu diese
     'lang_Turkish - Turkey' => 'Türkisch',
     'lang_Portuguese - Brazilian' => 'Portugiesisch - Brasilien',
     'lang_Portuguese - Portugal' => 'Portugiesisch - Portugal',
+    'lang_Thai' => 'Thai',
 
     // Frequencies
     'freq_weekly' => 'Wöchentlich',
@@ -2237,10 +2240,10 @@ Sobald Sie die Beträge erhalten haben, kommen Sie bitte wieder zurück zu diese
     'white_label_license_error' => 'Failed to validate the license, check storage/logs/laravel-error.log for more details.',
     'plan_price' => 'Plan Price',
     'wrong_confirmation' => 'Incorrect confirmation code',
-    'oauth_taken' => 'The account is already registered',
+    'oauth_taken' => 'Dieses Konto ist bereits registriert',
     'emailed_payment' => 'Zahlungs eMail erfolgreich gesendet',
     'email_payment' => 'Sende Zahlungs eMail',
-    'sent' => 'Sent',
+    'sent' => 'Versendet',
     'invoiceplane_import' => 'Use :link to migrate your data from InvoicePlane.',
     'duplicate_expense_warning' => 'Warning: This :link may be a duplicate',
     'expense_link' => 'Ausgabe',
@@ -2391,6 +2394,7 @@ Sobald Sie die Beträge erhalten haben, kommen Sie bitte wieder zurück zu diese
     'currency_jordanian_dinar' => 'Jordanian Dinar',
     'currency_myanmar_kyat' => 'Myanmar Kyat',
     'currency_peruvian_sol' => 'Peruvian Sol',
+    'currency_botswana_pula' => 'Botswana Pula',
     'review_app_help' => 'We hope you\'re enjoying using the app.<br/>If you\'d consider <a href="http://www.capterra.com/p/145215/Invoice-Ninja/" target="_blank">writing a review</a> we\'d greatly appreciate it!',
 
     'use_english_version' => 'Make sure to use the English version of the files.<br/>We use the column headers to match the fields.',
@@ -2440,12 +2444,44 @@ Sobald Sie die Beträge erhalten haben, kommen Sie bitte wieder zurück zu diese
     'deleted_account_details' => 'Your account (:account) has been successfully deleted.',
 
     'alipay' => 'Alipay',
-    'sofort' => 'Sofort',
+    'sofort' => 'SOFORT-Überweisung',
+    'sepa' => 'SEPA Direct Debit',
     'enable_alipay' => 'Accept Alipay',
     'enable_sofort' => 'Accept EU bank transfers',
     'stripe_alipay_help' => 'These gateways also need to be activated in :link.',
     'gocardless_webhook_help_link_text' => 'add this URL as an endpoint in GoCardless',
+    'calendar' => 'Calendar',
+    'pro_plan_calendar' => ':link to enable the calendar by joining the Pro Plan',
 
+    'what_are_you_working_on' => 'What are you working on?',
+    'time_tracker' => 'Time Tracker',
+    'refresh' => 'Refresh',
+    'filter_sort' => 'Filter/Sort',
+    'no_description' => 'No Description',
+    'time_tracker_login' => 'Time Tracker Login',
+    'save_or_discard' => 'Save or discard your changes',
+    'discard_changes' => 'Discard Changes',
+    'tasks_not_enabled' => 'Tasks are not enabled.',
+    'started_task' => 'Successfully started task',
+    'create_client' => 'Create Client',
+
+    'download_desktop_app' => 'Download the desktop app',
+    'download_iphone_app' => 'Download the iPhone app',
+    'download_android_app' => 'Download the Android app',
+    'time_tracker_mobile_help' => 'Double tap a task to select it',
+    'stopped' => 'Stopped',
+    'ascending' => 'Ascending',
+    'descending' => 'Descending',
+    'sort_field' => 'Sort By',
+    'sort_direction' => 'Direction',
+    'discard' => 'Discard',
+    'time_am' => 'AM',
+    'time_pm' => 'PM',
+    'time_mins' => 'mins',
+    'time_hr' => 'hr',
+    'time_hrs' => 'hrs',
+    'clear' => 'Clear',
+    'warn_payment_gateway' => 'Note: to accept online payments :link to add a payment gateway.',
 );
 
 return $LANG;

resources/lang/el/texts.php

@@ -60,7 +60,7 @@ $LANG = array(
     'download_pdf' => 'Κατέβασμα PDF',
     'pay_now' => 'Πληρώστε Τώρα',
     'save_invoice' => 'Αποθήκευση Τιμολογίου',
-    'clone_invoice' => 'Κλωνοποίηση Τιμολογίου',
+    'clone_invoice' => 'Clone To Invoice',
     'archive_invoice' => 'Αρχειοθέτηση Τιμολογίου',
     'delete_invoice' => 'Διαγραφή Τιμολογίου',
     'email_invoice' => 'Αποστολή Τιμολογίου με email',
@@ -323,7 +323,7 @@ email που είναι συνδεδεμένη με το λογαριασμό σ
     'delete_quote' => 'Διαγραφή Προσφοράς',
     'save_quote' => 'Αποθήκευση Προσφοράς',
     'email_quote' => 'Αποστολή Προσφοράς',
-    'clone_quote' => 'Κλωνοποίηση Προσφοράς',
+    'clone_quote' => 'Clone To Quote',
     'convert_to_invoice' => 'Μετατροπή σε Τιμολόγιο',
     'view_invoice' => 'Προβολή Τιμολογίου',
     'view_client' => 'Προβολή Πελάτη',
@@ -655,9 +655,9 @@ email που είναι συνδεδεμένη με το λογαριασμό σ
     'created_by_invoice' => 'Δημιουργήθηκε από :invoice',
     'primary_user' => 'Κύριος Χρήστης',
     'help' => 'Βοήθεια',
-    'customize_help' => '<p>Χρησιμοποιούμε την εφαρμογή <a href="http://pdfmake.org/" target="_blank">pdfmake</a> για να ορίσουμε τα σχέδια τιμολογίων ξεκάθαρα. Ο <a href="http://pdfmake.org/playground.html" target="_blank">πειραματικός χώρος</a> του pdfmake μας προσφέρει ένα πολύ καλό τρόπο να δούμε τη βιβλιοθήκη λογισμικού στην πράξη.</p>
-                        <p>Μπορείτε να έχετε πρόσβαση σε μία παιδική ιδιότητα χρησομοποιώντας την κωδικοποίηση τελείας. Για παράδειγμα για να εμφανίσετε το όνομα πελάτη μπορείτε να χρησιμοποιήσετε το <code>$client.name</code>.</p>
-                        <p>Αν χρειάζεστε βοήθεια στην κατανόηση, στείλτε μία ερώτηση στο <a href="https://www.invoiceninja.com/forums/forum/support/" target="_blank">forum υποστήριξης</a> με το σχεδιασμό που χρησιμοποιείτε.</p>',
+    'customize_help' => '<p>Χρησιμοποιούμε το <a href="http://pdfmake.org/" target="_blank">pdfmake</a> για να ορίσουμε τα σχέδια των τιμολογίων. Το pdfmake <a href="http://pdfmake.org/playground.html" target="_blank">playground</a> προσφέρει ένα υπέροχο τρόπο για να δείτε τη βιβλιοθήκη στην πράξη.</p>
+                        <p>Μπορείτε να έχετε πρόσβαση σε μία ιδιότητα χρησιμοποιώντας την  σήμανση τελείας. Για παράδειγμα για να εμφανίσετε τον όνομα του πελάτη μπορείτε να χρησιμοποιήσετε το <code>$client.name</code>.</p>
+                        <p>Εάν χρειάζεστε βοήθεια στην κατανόηση κάποιου θέματος μπορείτε να υποβάλετε μία ερώτηση στο  <a href="https://www.invoiceninja.com/forums/forum/support/" target="_blank">forum υποστήριξης</a> με την εμφάνιση που χρησιμοποιείτε.</p>',
     'invoice_due_date' => 'Ημερομηνία Πληρωμής',
     'quote_due_date' => 'Έγκυρο Έως',
     'valid_until' => 'Έγκυρο Έως',
@@ -996,6 +996,7 @@ email που είναι συνδεδεμένη με το λογαριασμό σ
     'enable_https' => 'Σας προτείνουμε να χρησιμοποιήσετε HTTPS για να δέχεστε πιστωτικές κάρτες online.',
     'quote_issued_to' => 'Έκδοση προσφοράς προς',
     'show_currency_code' => 'Κωδικός Νομίσματος',
+    'free_year_message' => 'Ο λογαριασμός σας αναβαθμίστηκε στο επαγγελματικό πακέτο για ένα χρόνο χωρίς κόστος.',
     'trial_message' => 'Ο λογαριασμός σας θα δεχθεί μια δωρεάν δοκιμαστική περίοδο δύο εβδομάδων στο επαγγελματικό μας πλάνο.',
     'trial_footer' => 'Η δωρεάν δοκιμαστική περίοδο ισχύει για :count ακόμα ημέρες, :link για να αναβαθμίσετε τώρα.',
     'trial_footer_last_day' => 'Αυτή είναι η τελευταία ημέρα της δωρεάν δοκιμαστικής περιόδου, :link για να αναβαθμίσετε τώρα.',
@@ -1016,7 +1017,7 @@ email που είναι συνδεδεμένη με το λογαριασμό σ
     'pro_plan_remove_logo' => ':link για να αφαιρέσετε το λογότυπο Invoice Ninja και να συμμετέχετε στο Επαγγελματικό Πλάνο',
     'pro_plan_remove_logo_link' => 'Πατήστε εδώ',
     'invitation_status_sent' => 'απεστάλη',
-    'invitation_status_opened' => 'Ανοιγμένα',
+    'invitation_status_opened' => 'Opened',
     'invitation_status_viewed' => 'Εμφανισμένα',
     'email_error_inactive_client' => 'Δεν μπορούν να αποσταλούν emails σε ανενεργούς πελάτες',
     'email_error_inactive_contact' => 'Δεν μπορούν να αποσταλούν emails σε ανενεργές επαφές',
@@ -1412,6 +1413,7 @@ email που είναι συνδεδεμένη με το λογαριασμό σ
     'payment_type_Swish' => 'Swish',
     'payment_type_Alipay' => 'Alipay',
     'payment_type_Sofort' => 'Sofort',
+    'payment_type_SEPA' => 'Απευθείας πίστωση SEPA',
 
     // Industries
     'industry_Accounting & Legal' => 'Λογιστικά & Νομικά',
@@ -1724,6 +1726,7 @@ email που είναι συνδεδεμένη με το λογαριασμό σ
     'lang_Turkish - Turkey' => 'Τουρκικά - Τουρκία',
     'lang_Portuguese - Brazilian' => 'Πορτογαλικά - Βραζιλία',
     'lang_Portuguese - Portugal' => 'Πορτογαλικά - Πορτογαλία',
+    'lang_Thai' => 'Ταϊλανδέζικα',
 
     // Frequencies
     'freq_weekly' => 'Εβδομάδα',
@@ -2391,6 +2394,7 @@ email που είναι συνδεδεμένη με το λογαριασμό σ
     'currency_jordanian_dinar' => 'Δηνάριο Ιορδανίας',
     'currency_myanmar_kyat' => 'Κιάτ Νιανμάρ',
     'currency_peruvian_sol' => 'Σολ Περού',
+    'currency_botswana_pula' => 'Πούλα Μποτσουάνας',
     'review_app_help' => 'Ελπίζουμε να απολαμβάνετε τη χρήση της εφαρμογής.<br/>Εάν θα θέλατε <a href="http://www.capterra.com/p/145215/Invoice-Ninja/" target="_blank">να γράψετε μια κριτική</a> θα το εκτιμούσαμε ιδιαίτερα!',
 
     'use_english_version' => 'Σιγουρευτείτε ότι χρησιμοποιείτε την Αγγλική έκδοση των αρχείων.<br/>Χρησιμοποιούμε τις κεφαλίδες των στηλών για να ταιριάξουμε τα πεδία.',
@@ -2441,11 +2445,43 @@ email που είναι συνδεδεμένη με το λογαριασμό σ
 
     'alipay' => 'Alipay',
     'sofort' => 'Sofort',
+    'sepa' => 'Απευθείας πίστωση SEPA',
     'enable_alipay' => 'Αποδοχή Alipay',
     'enable_sofort' => 'Αποδοχή τραπεζικών εμβασμάτων από τράπεζες της Ευρώπης',
     'stripe_alipay_help' => 'Αυτές οι πύλες πληρωμών πρέπει επίσης να ενεργοποιηθούν στο :link.',
     'gocardless_webhook_help_link_text' => 'προσθέστε αυτή τη διεύθυνση internet στο τέλος της διεύθυνσης internet στο GoCardless',
+    'calendar' => 'Ημερολόγιο',
+    'pro_plan_calendar' => ':link για να ενεργοποιήσετε το ημερολόγιο συμμετέχοντας στο Επαγγελματικό Πλάνο',
 
+    'what_are_you_working_on' => 'Σε τι εργάζεστε;',
+    'time_tracker' => 'Παρακολούθηση Χρόνου',
+    'refresh' => 'Ανανέωση',
+    'filter_sort' => 'Φιλτράρισμα/Ταξινόμηση',
+    'no_description' => 'Καμία Περιγραφή',
+    'time_tracker_login' => 'Εισαγωγή στην Παρακολούθηση Χρόνου',
+    'save_or_discard' => 'Αποθήκευση ή απόρριψη των αλλαγών σας',
+    'discard_changes' => 'Απόρριψη Αλλαγών',
+    'tasks_not_enabled' => 'Οι εργασίες δεν έχουν ενεργοποιηθεί.',
+    'started_task' => 'Επιτυχής έναρξη εργασίας',
+    'create_client' => 'Δημιουργία Πελάτη',
+
+    'download_desktop_app' => 'Λήψη της εφαρμογής για Desktop',
+    'download_iphone_app' => 'Λήψη της εφαρμογής για IPhone',
+    'download_android_app' => 'Λήψη της εφαρμογής για Android',
+    'time_tracker_mobile_help' => 'κάντε διπλό κλικ στην εργασία για να την επιλέξετε',
+    'stopped' => 'Διακόπηκε',
+    'ascending' => 'Αύξουσα σειρά',
+    'descending' => 'Φθίνουσα σειρά',
+    'sort_field' => 'Ταξινόμηση κατά',
+    'sort_direction' => 'Κατεύθυνση',
+    'discard' => 'Απόρριψη',
+    'time_am' => 'πμ',
+    'time_pm' => 'μμ',
+    'time_mins' => 'λ',
+    'time_hr' => 'ω',
+    'time_hrs' => 'ω',
+    'clear' => 'Καθαρισμός',
+    'warn_payment_gateway' => 'Note: to accept online payments :link to add a payment gateway.',
 );
 
 return $LANG;

resources/lang/en/texts.php

@@ -60,7 +60,7 @@ $LANG = array(
     'download_pdf' => 'Download PDF',
     'pay_now' => 'Pay Now',
     'save_invoice' => 'Save Invoice',
-    'clone_invoice' => 'Clone Invoice',
+    'clone_invoice' => 'Clone To Invoice',
     'archive_invoice' => 'Archive Invoice',
     'delete_invoice' => 'Delete Invoice',
     'email_invoice' => 'Email Invoice',
@@ -323,7 +323,7 @@ $LANG = array(
     'delete_quote' => 'Delete Quote',
     'save_quote' => 'Save Quote',
     'email_quote' => 'Email Quote',
-    'clone_quote' => 'Clone Quote',
+    'clone_quote' => 'Clone To Quote',
     'convert_to_invoice' => 'Convert to Invoice',
     'view_invoice' => 'View Invoice',
     'view_client' => 'View Client',
@@ -655,7 +655,7 @@ $LANG = array(
     'created_by_invoice' => 'Created by :invoice',
     'primary_user' => 'Primary User',
     'help' => 'Help',
-    'customize_help' => '<p>We use <a href="http://pdfmake.org/" target="_blank">pdfmake</a> to define the invoice designs declaratively. The pdfmake <a href="http://pdfmake.org/playground.html" target="_blank">playground</a> provide\'s a great way to see the library in action.</p>
+    'customize_help' => '<p>We use <a href="http://pdfmake.org/" target="_blank">pdfmake</a> to define the invoice designs declaratively. The pdfmake <a href="http://pdfmake.org/playground.html" target="_blank">playground</a> provides a great way to see the library in action.</p>
                         <p>You can access a child property using dot notation. For example to show the client name you could use <code>$client.name</code>.</p>
                         <p>If you need help figuring something out post a question to our <a href="https://www.invoiceninja.com/forums/forum/support/" target="_blank">support forum</a> with the design you\'re using.</p>',
     'invoice_due_date' => 'Due Date',
@@ -996,6 +996,7 @@ $LANG = array(
     'enable_https' => 'We strongly recommend using HTTPS to accept credit card details online.',
     'quote_issued_to' => 'Quote issued to',
     'show_currency_code' => 'Currency Code',
+    'free_year_message' => 'Your account has been upgraded to the pro plan for one year at no cost.',
     'trial_message' => 'Your account will receive a free two week trial of our pro plan.',
     'trial_footer' => 'Your free pro plan trial lasts :count more days, :link to upgrade now.',
     'trial_footer_last_day' => 'This is the last day of your free pro plan trial, :link to upgrade now.',
@@ -1016,7 +1017,7 @@ $LANG = array(
     'pro_plan_remove_logo' => ':link to remove the Invoice Ninja logo by joining the Pro Plan',
     'pro_plan_remove_logo_link' => 'Click here',
     'invitation_status_sent' => 'sent',
-    'invitation_status_opened' => 'Openend',
+    'invitation_status_opened' => 'Opened',
     'invitation_status_viewed' => 'Viewed',
     'email_error_inactive_client' => 'Emails can not be sent to inactive clients',
     'email_error_inactive_contact' => 'Emails can not be sent to inactive contacts',
@@ -1412,6 +1413,7 @@ $LANG = array(
     'payment_type_Swish' => 'Swish',
     'payment_type_Alipay' => 'Alipay',
     'payment_type_Sofort' => 'Sofort',
+    'payment_type_SEPA' => 'SEPA Direct Debit',
 
     // Industries
     'industry_Accounting & Legal' => 'Accounting & Legal',
@@ -1724,6 +1726,7 @@ $LANG = array(
     'lang_Turkish - Turkey' => 'Turkish - Turkey',
     'lang_Portuguese - Brazilian' => 'Portuguese - Brazilian',
     'lang_Portuguese - Portugal' => 'Portuguese - Portugal',
+    'lang_Thai' => 'Thai',
 
     // Frequencies
     'freq_weekly' => 'Weekly',
@@ -2391,6 +2394,7 @@ $LANG = array(
     'currency_jordanian_dinar' => 'Jordanian Dinar',
     'currency_myanmar_kyat' => 'Myanmar Kyat',
     'currency_peruvian_sol' => 'Peruvian Sol',
+    'currency_botswana_pula' => 'Botswana Pula',
     'review_app_help' => 'We hope you\'re enjoying using the app.<br/>If you\'d consider <a href="http://www.capterra.com/p/145215/Invoice-Ninja/" target="_blank">writing a review</a> we\'d greatly appreciate it!',
 
     'use_english_version' => 'Make sure to use the English version of the files.<br/>We use the column headers to match the fields.',
@@ -2441,11 +2445,43 @@ $LANG = array(
 
     'alipay' => 'Alipay',
     'sofort' => 'Sofort',
+    'sepa' => 'SEPA Direct Debit',
     'enable_alipay' => 'Accept Alipay',
     'enable_sofort' => 'Accept EU bank transfers',
     'stripe_alipay_help' => 'These gateways also need to be activated in :link.',
     'gocardless_webhook_help_link_text' => 'add this URL as an endpoint in GoCardless',
+    'calendar' => 'Calendar',
+    'pro_plan_calendar' => ':link to enable the calendar by joining the Pro Plan',
 
+    'what_are_you_working_on' => 'What are you working on?',
+    'time_tracker' => 'Time Tracker',
+    'refresh' => 'Refresh',
+    'filter_sort' => 'Filter/Sort',
+    'no_description' => 'No Description',
+    'time_tracker_login' => 'Time Tracker Login',
+    'save_or_discard' => 'Save or discard your changes',
+    'discard_changes' => 'Discard Changes',
+    'tasks_not_enabled' => 'Tasks are not enabled.',
+    'started_task' => 'Successfully started task',
+    'create_client' => 'Create Client',
+
+    'download_desktop_app' => 'Download the desktop app',
+    'download_iphone_app' => 'Download the iPhone app',
+    'download_android_app' => 'Download the Android app',
+    'time_tracker_mobile_help' => 'Double tap a task to select it',
+    'stopped' => 'Stopped',
+    'ascending' => 'Ascending',
+    'descending' => 'Descending',
+    'sort_field' => 'Sort By',
+    'sort_direction' => 'Direction',
+    'discard' => 'Discard',
+    'time_am' => 'AM',
+    'time_pm' => 'PM',
+    'time_mins' => 'mins',
+    'time_hr' => 'hr',
+    'time_hrs' => 'hrs',
+    'clear' => 'Clear',
+    'warn_payment_gateway' => 'Note: to accept online payments :link to add a payment gateway.',
 );
 
 return $LANG;

resources/lang/en_UK/texts.php

@@ -1014,7 +1014,7 @@ $LANG = array(
     'pro_plan_remove_logo' => ':link to remove the Invoice Ninja logo by joining the Pro Plan',
     'pro_plan_remove_logo_link' => 'Click here',
     'invitation_status_sent' => 'Sent',
-    'invitation_status_opened' => 'Openend',
+    'invitation_status_opened' => 'Opened',
     'invitation_status_viewed' => 'Viewed',
     'email_error_inactive_client' => 'Emails can not be sent to inactive clients',
     'email_error_inactive_contact' => 'Emails can not be sent to inactive contacts',

resources/lang/es/texts.php

@@ -60,7 +60,7 @@ $LANG = array(
     'download_pdf' => 'Descargar PDF',
     'pay_now' => 'Pagar ahora',
     'save_invoice' => 'Guardar factura',
-    'clone_invoice' => 'Clonar factura',
+    'clone_invoice' => 'Clone To Invoice',
     'archive_invoice' => 'Archivar factura',
     'delete_invoice' => 'Eliminar factura',
     'email_invoice' => 'Enviar factura por correo',
@@ -81,7 +81,7 @@ $LANG = array(
     'guest' => 'Invitado',
     'company_details' => 'Detalles de la Empresa',
     'online_payments' => 'Pagos Online',
-    'notifications' => 'Notifications',
+    'notifications' => 'Notificaciones',
     'import_export' => 'Importar/Exportar',
     'done' => 'Hecho',
     'save' => 'Guardar',
@@ -238,7 +238,7 @@ $LANG = array(
     'confirmation_subject' => 'Corfimación de tu cuenta en Invoice Ninja',
     'confirmation_header' => 'Confirmación de Cuenta',
     'confirmation_message' => 'Por favor, haz clic en el enlace abajo para confirmar tu cuenta.',
-    'invoice_subject' => 'New invoice :number from :account',
+    'invoice_subject' => 'Nueva factura :invoice de :account',
     'invoice_message' => 'Para visualizar tu factura por el valor de :amount, haga click en el enlace a continuación.',
     'payment_subject' => 'Pago recibido',
     'payment_message' => 'Gracias por su pago de :amount.',
@@ -317,7 +317,7 @@ $LANG = array(
     'delete_quote' => 'Eliminar Cotización',
     'save_quote' => 'Guardar Cotización',
     'email_quote' => 'Enviar Cotización',
-    'clone_quote' => 'Clonar Cotización',
+    'clone_quote' => 'Clone To Quote',
     'convert_to_invoice' => 'Convertir a Factura',
     'view_invoice' => 'Ver Factura',
     'view_client' => 'Ver Cliente',
@@ -331,7 +331,7 @@ $LANG = array(
     'deleted_quote' => 'Cotizaciónes eliminadas con éxito',
     'deleted_quotes' => ':count cotizaciones eliminadas con exito',
     'converted_to_invoice' => 'Cotización convertida a factura con éxito',
-    'quote_subject' => 'New quote :number from :account',
+    'quote_subject' => 'Nuevo presupuesto :quote de :account',
     'quote_message' => 'Para visualizar la cotización por valor de :amount, haz click en el enlace abajo.',
     'quote_link_message' => 'Para visualizar tu cotización haz click en el enlace abajo:',
     'notification_quote_sent_subject' => 'Cotización :invoice enviada a el cliente :client',
@@ -363,7 +363,7 @@ $LANG = array(
     'confirm_email_quote' => '¿Estás seguro que quieres enviar esta cotización?',
     'confirm_recurring_email_invoice' => 'Se ha marcado esta factura como recurrente, estás seguro que quieres enviar esta factura?',
     'cancel_account' => 'Cancelar Cuenta',
-    'cancel_account_message' => 'Warning: This will permanently delete your account, there is no undo.',
+    'cancel_account_message' => 'AVISO: Esta acción eliminará su cuenta de forma permanente.',
     'go_back' => 'Atrás',
     'data_visualizations' => 'Visualización de Datos',
     'sample_data' => 'Datos de Ejemplo',
@@ -389,7 +389,7 @@ $LANG = array(
     'more_designs_self_host_text' => '',
     'buy' => 'Comprar',
     'bought_designs' => 'Diseños adicionales de facturas agregados con éxito',
-    'sent' => 'Sent',
+    'sent' => 'Enviado',
     'vat_number' => 'Número de Impuesto',
     'timesheets' => 'Hojas de Tiempo',
     'payment_title' => 'Ingresa la Dirección de Facturación de tu Tareta de Crédito',
@@ -505,7 +505,7 @@ $LANG = array(
     'partial_remaining' => ':partial de :balance',
     'more_fields' => 'Más Campos',
     'less_fields' => 'Menos Campos',
-    'client_name' => 'Client Name',
+    'client_name' => 'Nombre del Cliente',
     'pdf_settings' => 'Configuración de PDF',
     'product_settings' => 'Configuración del Producto',
     'auto_wrap' => 'Ajuste Automático de Línea',
@@ -550,12 +550,12 @@ $LANG = array(
     'timer' => 'Temporizador',
     'manual' => 'Manual',
     'date_and_time' => 'Fecha y Hora',
-    'second' => 'Second',
-    'seconds' => 'Seconds',
-    'minute' => 'Minute',
-    'minutes' => 'Minutes',
-    'hour' => 'Hour',
-    'hours' => 'Hours',
+    'second' => 'Segundo',
+    'seconds' => 'Segundos',
+    'minute' => 'Minuto',
+    'minutes' => 'Minutos',
+    'hour' => 'Hora',
+    'hours' => 'Horas',
     'task_details' => 'Detalles de la Tarea',
     'duration' => 'Duración',
     'end_time' => 'Tiempo Final',
@@ -618,7 +618,7 @@ $LANG = array(
     'times' => 'Tiempos',
     'set_now' => 'Asignar ahora',
     'dark_mode' => 'Modo Oscuro',
-    'dark_mode_help' => 'Use a dark background for the sidebars',
+    'dark_mode_help' => 'Usar un fondo oscuro en la barra lateral',
     'add_to_invoice' => 'Agregar a cuenta :invoice',
     'create_new_invoice' => 'Crear Nueva Cuenta',
     'task_errors' => 'Por favor corrija cualquier tiempo que se sobreponga con otro',
@@ -649,7 +649,7 @@ $LANG = array(
     'created_by_invoice' => 'Creado por :invoice',
     'primary_user' => 'Usuario Principal',
     'help' => 'Ayuda',
-    'customize_help' => '<p>We use <a href="http://pdfmake.org/" target="_blank">pdfmake</a> to define the invoice designs declaratively. The pdfmake <a href="http://pdfmake.org/playground.html" target="_blank">playground</a> provide\'s a great way to see the library in action.</p>
+    'customize_help' => '<p>We use <a href="http://pdfmake.org/" target="_blank">pdfmake</a> to define the invoice designs declaratively. The pdfmake <a href="http://pdfmake.org/playground.html" target="_blank">playground</a> provides a great way to see the library in action.</p>
                         <p>You can access a child property using dot notation. For example to show the client name you could use <code>$client.name</code>.</p>
                         <p>If you need help figuring something out post a question to our <a href="https://www.invoiceninja.com/forums/forum/support/" target="_blank">support forum</a> with the design you\'re using.</p>',
     'invoice_due_date' => 'Fecha de Vencimiento',
@@ -657,15 +657,15 @@ $LANG = array(
     'valid_until' => 'Válida Hasta',
     'reset_terms' => 'Reiniciar términos',
     'reset_footer' => 'Reiniciar pie de página',
-    'invoice_sent' => ':count invoice sent',
-    'invoices_sent' => ':count invoices sent',
+    'invoice_sent' => ':count factura enviada',
+    'invoices_sent' => ':count facturas enviadas',
     'status_draft' => 'Borrador',
     'status_sent' => 'Enviado',
     'status_viewed' => 'Visto',
     'status_partial' => 'Parcial',
     'status_paid' => 'Pagado',
-    'status_unpaid' => 'Unpaid',
-    'status_all' => 'All',
+    'status_unpaid' => 'Sin pagar',
+    'status_all' => 'Todas',
     'show_line_item_tax' => ' Mostrar <b>impuestos por cada item</b> en línea.',
     'iframe_url' => 'Sitio Web',
     'iframe_url_help1' => 'Copia el siguiente código en una página de tu sitio web.',
@@ -697,7 +697,7 @@ $LANG = array(
     'oneclick_login' => 'Ingresar con un Click',
     'disable' => 'Deshabilitado',
     'invoice_quote_number' => 'Números de Cotización y Factura',
-    'invoice_charges' => 'Invoice Surcharges',
+    'invoice_charges' => 'Cargos de Factura',
     'notification_invoice_bounced' => 'No nos fue posible entregar la Factura :invoice a :contact.',
     'notification_invoice_bounced_subject' => 'No fue posible entregar la Factura :invoice',
     'notification_quote_bounced' => 'No nos fue posible entregar la Cotización :invoice a :contact.',
@@ -788,7 +788,7 @@ $LANG = array(
     'default_invoice_footer' => 'Asignar pie de página por defecto para la factura',
     'quote_footer' => 'Pie de la Cotización',
     'free' => 'Gratis',
-    'quote_is_approved' => 'The quote has been approved',
+    'quote_is_approved' => 'El presupuesto ha sido aprobado',
     'apply_credit' => 'Aplicar Crédito',
     'system_settings' => 'Configuración del Sistema',
     'archive_token' => 'Archivar Token',
@@ -828,7 +828,7 @@ $LANG = array(
     'disabled' => 'Deshabilitado',
     'show_archived_users' => 'Mostrar usuarios archivados',
     'notes' => 'Notas',
-    'invoice_will_create' => 'invoice will be created',
+    'invoice_will_create' => 'la factura será creada',
     'invoices_will_create' => 'facturas seran creadas',
     'failed_to_import' => 'Los siguientes registros fallaron al importar',
     'publishable_key' => 'Clave pública',
@@ -847,7 +847,7 @@ $LANG = array(
     'dark' => 'Oscuro',
     'industry_help' => 'Usado para proporcionar comparaciones de las medias de las empresas de tamaño y industria similar.',
     'subdomain_help' => 'Asigne el suubdominio o mostrar la factura en su propio sitio web.',
-    'website_help' => 'Display the invoice in an iFrame on your own website',
+    'website_help' => 'Mostrar la factura en un iFrame de su sitio web',
     'invoice_number_help' => 'Especifique un prefijo o utilice un patrón a medida para establecer dinámicamente el número de factura.',
     'quote_number_help' => 'Especifique un prefijo o utilice un patrón a medida para establecer dinámicamente el número de presupuesto.',
     'custom_client_fields_helps' => 'Add a field when creating a client and optionally display the label and value on the PDF.',
@@ -989,6 +989,7 @@ $LANG = array(
     'enable_https' => 'We strongly recommend using HTTPS to accept credit card details online.',
     'quote_issued_to' => 'Cotización emitida para',
     'show_currency_code' => 'Código de Divisa',
+    'free_year_message' => 'Your account has been upgraded to the pro plan for one year at no cost.',
     'trial_message' => 'Your account will receive a free two week trial of our pro plan.',
     'trial_footer' => 'Your free pro plan trial lasts :count more days, :link to upgrade now.',
     'trial_footer_last_day' => 'This is the last day of your free pro plan trial, :link to upgrade now.',
@@ -1008,8 +1009,8 @@ $LANG = array(
 
     'pro_plan_remove_logo' => ':link haz click para eliminar el logo de Invoice Ninja',
     'pro_plan_remove_logo_link' => 'Haz clic aquí',
-    'invitation_status_sent' => 'sent',
-    'invitation_status_opened' => 'Abierto',
+    'invitation_status_sent' => 'enviado',
+    'invitation_status_opened' => 'Opened',
     'invitation_status_viewed' => 'Visto',
     'email_error_inactive_client' => 'No se pueden enviar correos a Clientes inactivos',
     'email_error_inactive_contact' => 'No se pueden enviar correos a Contactos inactivos',
@@ -1169,7 +1170,7 @@ $LANG = array(
     'list_vendors' => 'List Vendors',
     'add_users_not_supported' => 'Upgrade to the Enterprise plan to add additional users to your account.',
     'enterprise_plan_features' => 'The Enterprise plan adds support for multiple users and file attachments, :link to see the full list of features.',
-    'return_to_app' => 'Return To App',
+    'return_to_app' => 'Regresar a la App',
 
 
     // Payment updates
@@ -1405,6 +1406,7 @@ $LANG = array(
     'payment_type_Swish' => 'Silbido',
     'payment_type_Alipay' => 'Alipay',
     'payment_type_Sofort' => 'Sofort',
+    'payment_type_SEPA' => 'SEPA Direct Debit',
 
     // Industries
     'industry_Accounting & Legal' => 'Accounting & Legal',
@@ -1649,7 +1651,7 @@ $LANG = array(
     'country_Somalia' => 'Somalia',
     'country_South Africa' => 'South Africa',
     'country_Zimbabwe' => 'Zimbabwe',
-    'country_Spain' => 'Spain',
+    'country_Spain' => 'España',
     'country_South Sudan' => 'South Sudan',
     'country_Sudan' => 'Sudan',
     'country_Western Sahara' => 'Western Sahara',
@@ -1707,7 +1709,7 @@ $LANG = array(
     'lang_Norwegian' => 'Norwegian',
     'lang_Polish' => 'Polish',
     'lang_Spanish' => 'Spanish',
-    'lang_Spanish - Spain' => 'Spanish - Spain',
+    'lang_Spanish - Spain' => 'Español - España',
     'lang_Swedish' => 'Swedish',
     'lang_Albanian' => 'Albanian',
     'lang_English - United Kingdom' => 'English - United Kingdom',
@@ -1717,6 +1719,7 @@ $LANG = array(
     'lang_Turkish - Turkey' => 'Turkish - Turkey',
     'lang_Portuguese - Brazilian' => 'Portuguese - Brazilian',
     'lang_Portuguese - Portugal' => 'Portuguese - Portugal',
+    'lang_Thai' => 'Thai',
 
     // Frequencies
     'freq_weekly' => 'Weekly',
@@ -1857,7 +1860,7 @@ $LANG = array(
     'week' => 'Week',
     'month' => 'Month',
     'inactive_logout' => 'You have been logged out due to inactivity',
-    'reports' => 'Reports',
+    'reports' => 'Informes',
     'total_profit' => 'Total Profit',
     'total_expenses' => 'Total Expenses',
     'quote_to' => 'Quote to',
@@ -2226,14 +2229,14 @@ $LANG = array(
     'custom_variables' => 'Custom Variables',
     'invalid_file' => 'Invalid file type',
     'add_documents_to_invoice' => 'Add documents to invoice',
-    'mark_expense_paid' => 'Mark paid',
+    'mark_expense_paid' => 'Marcar como Pagado',
     'white_label_license_error' => 'Failed to validate the license, check storage/logs/laravel-error.log for more details.',
     'plan_price' => 'Plan Price',
     'wrong_confirmation' => 'Incorrect confirmation code',
     'oauth_taken' => 'The account is already registered',
     'emailed_payment' => 'Successfully emailed payment',
     'email_payment' => 'Email Payment',
-    'sent' => 'Sent',
+    'sent' => 'Enviado',
     'invoiceplane_import' => 'Use :link to migrate your data from InvoicePlane.',
     'duplicate_expense_warning' => 'Warning: This :link may be a duplicate',
     'expense_link' => 'expense',
@@ -2304,7 +2307,7 @@ $LANG = array(
     'late_fee_amount' => 'Late Fee Amount',
     'late_fee_percent' => 'Late Fee Percent',
     'late_fee_added' => 'Late fee added on :date',
-    'download_invoice' => 'Download Invoice',
+    'download_invoice' => 'Descargar factura',
     'download_quote' => 'Download Quote',
     'invoices_are_attached' => 'Your invoice PDFs are attached.',
     'downloaded_invoice' => 'An email will be sent with the invoice PDF',
@@ -2384,6 +2387,7 @@ $LANG = array(
     'currency_jordanian_dinar' => 'Jordanian Dinar',
     'currency_myanmar_kyat' => 'Myanmar Kyat',
     'currency_peruvian_sol' => 'Peruvian Sol',
+    'currency_botswana_pula' => 'Botswana Pula',
     'review_app_help' => 'We hope you\'re enjoying using the app.<br/>If you\'d consider <a href="http://www.capterra.com/p/145215/Invoice-Ninja/" target="_blank">writing a review</a> we\'d greatly appreciate it!',
 
     'use_english_version' => 'Make sure to use the English version of the files.<br/>We use the column headers to match the fields.',
@@ -2434,11 +2438,43 @@ $LANG = array(
 
     'alipay' => 'Alipay',
     'sofort' => 'Sofort',
+    'sepa' => 'SEPA Direct Debit',
     'enable_alipay' => 'Accept Alipay',
     'enable_sofort' => 'Accept EU bank transfers',
     'stripe_alipay_help' => 'These gateways also need to be activated in :link.',
     'gocardless_webhook_help_link_text' => 'add this URL as an endpoint in GoCardless',
+    'calendar' => 'Calendar',
+    'pro_plan_calendar' => ':link to enable the calendar by joining the Pro Plan',
 
+    'what_are_you_working_on' => 'What are you working on?',
+    'time_tracker' => 'Time Tracker',
+    'refresh' => 'Refresh',
+    'filter_sort' => 'Filter/Sort',
+    'no_description' => 'No Description',
+    'time_tracker_login' => 'Time Tracker Login',
+    'save_or_discard' => 'Save or discard your changes',
+    'discard_changes' => 'Discard Changes',
+    'tasks_not_enabled' => 'Tasks are not enabled.',
+    'started_task' => 'Successfully started task',
+    'create_client' => 'Create Client',
+
+    'download_desktop_app' => 'Download the desktop app',
+    'download_iphone_app' => 'Download the iPhone app',
+    'download_android_app' => 'Download the Android app',
+    'time_tracker_mobile_help' => 'Double tap a task to select it',
+    'stopped' => 'Stopped',
+    'ascending' => 'Ascending',
+    'descending' => 'Descending',
+    'sort_field' => 'Sort By',
+    'sort_direction' => 'Direction',
+    'discard' => 'Discard',
+    'time_am' => 'AM',
+    'time_pm' => 'PM',
+    'time_mins' => 'mins',
+    'time_hr' => 'hr',
+    'time_hrs' => 'hrs',
+    'clear' => 'Clear',
+    'warn_payment_gateway' => 'Note: to accept online payments :link to add a payment gateway.',
 );
 
 return $LANG;

resources/lang/es_ES/texts.php

@@ -60,7 +60,7 @@ $LANG = array(
     'download_pdf' => 'Descargar PDF',
     'pay_now' => 'Pagar Ahora',
     'save_invoice' => 'Guardar factura',
-    'clone_invoice' => 'Clonar factura',
+    'clone_invoice' => 'Clone To Invoice',
     'archive_invoice' => 'Archivar factura',
     'delete_invoice' => 'Eliminar factura',
     'email_invoice' => 'Enviar factura por email',
@@ -200,7 +200,7 @@ $LANG = array(
     'limit_clients' => 'Lo sentimos, se ha pasado del límite de :count clientes',
     'payment_error' => 'Ha habido un error en el proceso de tu pago. Inténtalo de nuevo más tarde.',
     'registration_required' => 'Inscríbete para enviar una factura',
-    'confirmation_required' => 'Please confirm your email address, <a href=\'/resend_confirmation\'>click here</a> to resend the confirmation email.',
+    'confirmation_required' => 'Por favor confirma to email, <a href=\'/resend_confirmation\'>presiona aquí</a> para reenviar el email de confirmación.',
     'updated_client' => 'Cliente actualizado correctamente',
     'created_client' => 'cliente creado con éxito',
     'archived_client' => 'Cliente archivado correctamente',
@@ -238,7 +238,7 @@ $LANG = array(
     'confirmation_subject' => 'Corfimación de tu cuenta en Invoice Ninja',
     'confirmation_header' => 'Confirmación de Cuenta',
     'confirmation_message' => 'Por favor, haz clic en el enlace abajo para confirmar tu cuenta.',
-    'invoice_subject' => 'New invoice :number from :account',
+    'invoice_subject' => 'Nueva factura :number de :account',
     'invoice_message' => 'Para visualizar tu factura por el valor de :amount, haz click en el enlace de abajo.',
     'payment_subject' => 'Pago recibido',
     'payment_message' => 'Gracias por su pago de :amount.',
@@ -317,7 +317,7 @@ $LANG = array(
     'delete_quote' => 'Eliminar Presupuesto',
     'save_quote' => 'Guardar Presupuesto',
     'email_quote' => 'Enviar Presupuesto',
-    'clone_quote' => 'Clonar Presupuesto',
+    'clone_quote' => 'Clone To Quote',
     'convert_to_invoice' => 'Convertir a factura',
     'view_invoice' => 'Ver factura',
     'view_client' => 'Ver Cliente',
@@ -331,7 +331,7 @@ $LANG = array(
     'deleted_quote' => 'Presupuesto eliminado con éxito',
     'deleted_quotes' => ':count Presupuestos eliminados con exito',
     'converted_to_invoice' => 'Presupuesto convertido a factura con éxito',
-    'quote_subject' => 'New quote :number from :account',
+    'quote_subject' => 'Nuevo presupuesto :number de :account',
     'quote_message' => 'Para ver el presupuesto por un importe de :amount, haga click en el enlace de abajo.',
     'quote_link_message' => 'Para ver su presupuesto haga click en el enlace de abajo:',
     'notification_quote_sent_subject' => 'El presupuesto :invoice enviado al cliente :client',
@@ -363,7 +363,7 @@ $LANG = array(
     'confirm_email_quote' => '¿Estás seguro que quieres enviar este presupuesto?',
     'confirm_recurring_email_invoice' => 'Se ha marcado esta factura como recurrente, estás seguro que quieres enviar esta factura?',
     'cancel_account' => 'Cancelar Cuenta',
-    'cancel_account_message' => 'Warning: This will permanently delete your account, there is no undo.',
+    'cancel_account_message' => 'Atención: Esta acción eliminará permanentemente tu cuenta y no se podrá deshacer.',
     'go_back' => 'Atrás',
     'data_visualizations' => 'Visualización de Datos',
     'sample_data' => 'Datos de Ejemplo',
@@ -488,7 +488,7 @@ $LANG = array(
     'email_address' => 'Dirección de Email',
     'lets_go' => 'Acceder',
     'password_recovery' => 'Recuperar Contraseña',
-    'send_email' => 'Send Email',
+    'send_email' => 'Enviar Email',
     'set_password' => 'Establecer Contraseña',
     'converted' => 'Modificada',
     'email_approved' => 'Avísame por correo cuando un presupuesto sea <b>aprobado</b>',
@@ -505,7 +505,7 @@ $LANG = array(
     'partial_remaining' => ':partial de :balance',
     'more_fields' => 'Mas campos',
     'less_fields' => 'Menos campos',
-    'client_name' => 'Client Name',
+    'client_name' => 'Nombre del cliente',
     'pdf_settings' => 'Configuracion PDF',
     'product_settings' => 'Configuracion de Producto',
     'auto_wrap' => 'Auto ajuste de línea',
@@ -517,7 +517,7 @@ $LANG = array(
     'www' => 'www',
     'logo' => 'Logo',
     'subdomain' => 'Subdominio',
-    'provide_name_or_email' => 'Please provide a name or email',
+    'provide_name_or_email' => 'Por favor provea su nombre y correo',
     'charts_and_reports' => 'Gráficos e Informes',
     'chart' => 'gráfico',
     'report' => 'Informe',
@@ -619,7 +619,7 @@ Acceder a 10 hermosos diseños de Factura',
     'times' => 'Tiempos',
     'set_now' => 'Establecer ahora',
     'dark_mode' => 'Modo Oscuro',
-    'dark_mode_help' => 'Use a dark background for the sidebars',
+    'dark_mode_help' => 'Usar fondo oscuro en barras laterales',
     'add_to_invoice' => 'Añadir a la factura :invoice',
     'create_new_invoice' => 'Crear una nueva factura',
     'task_errors' => 'Por favor corrija los tiempos solapados',
@@ -638,7 +638,7 @@ Acceder a 10 hermosos diseños de Factura',
     'custom' => 'Personalizado',
     'invoice_to' => 'Factura para',
     'invoice_no' => 'N.º Factura',
-    'quote_no' => 'Quote No.',
+    'quote_no' => 'Nº de presupuesto',
     'recent_payments' => 'Pagos recientes',
     'outstanding' => 'Pendiente de Cobro',
     'manage_companies' => 'Gestionar compañías',
@@ -650,7 +650,7 @@ Acceder a 10 hermosos diseños de Factura',
     'created_by_invoice' => 'Creado por :invoice',
     'primary_user' => 'Usuario Principal',
     'help' => 'Ayuda',
-    'customize_help' => '<p>We use <a href="http://pdfmake.org/" target="_blank">pdfmake</a> to define the invoice designs declaratively. The pdfmake <a href="http://pdfmake.org/playground.html" target="_blank">playground</a> provide\'s a great way to see the library in action.</p>
+    'customize_help' => '<p>We use <a href="http://pdfmake.org/" target="_blank">pdfmake</a> to define the invoice designs declaratively. The pdfmake <a href="http://pdfmake.org/playground.html" target="_blank">playground</a> provides a great way to see the library in action.</p>
                         <p>You can access a child property using dot notation. For example to show the client name you could use <code>$client.name</code>.</p>
                         <p>If you need help figuring something out post a question to our <a href="https://www.invoiceninja.com/forums/forum/support/" target="_blank">support forum</a> with the design you\'re using.</p>',
     'invoice_due_date' => 'Fecha de Pago',
@@ -658,15 +658,15 @@ Acceder a 10 hermosos diseños de Factura',
     'valid_until' => 'Válido hasta',
     'reset_terms' => 'Reiniciar terminos',
     'reset_footer' => 'Reiniciar pie',
-    'invoice_sent' => ':count invoice sent',
-    'invoices_sent' => ':count invoices sent',
+    'invoice_sent' => 'Factura :count enviada',
+    'invoices_sent' => ':count facturas enviadas',
     'status_draft' => 'Borrador',
     'status_sent' => 'Enviada',
     'status_viewed' => 'Vista',
     'status_partial' => 'Parcial',
     'status_paid' => 'Pagada',
-    'status_unpaid' => 'Unpaid',
-    'status_all' => 'All',
+    'status_unpaid' => 'Impaga',
+    'status_all' => 'Todo',
     'show_line_item_tax' => 'Mostrar <b>impuesto para cada concepto de factura</b>',
     'iframe_url' => 'Website',
     'iframe_url_help1' => 'Copia el siguiente codigo para una pagina de si sitio web.',
@@ -992,6 +992,7 @@ Atención! tu password puede estar transmitida como texto plano, considera habil
     'enable_https' => 'Recomendamos encarecidamente usar HTTPS para aceptar detalles de tarjetas de credito online',
     'quote_issued_to' => 'Presupuesto emitido a',
     'show_currency_code' => 'Código de Moneda',
+    'free_year_message' => 'Your account has been upgraded to the pro plan for one year at no cost.',
     'trial_message' => 'Tu cuenta recibirá dos semanas gratuitas de nuestro  plan Pro.',
     'trial_footer' => 'Your free pro plan trial lasts :count more days, :link to upgrade now.',
     'trial_footer_last_day' => 'This is the last day of your free pro plan trial, :link to upgrade now.',
@@ -1012,7 +1013,7 @@ Atención! tu password puede estar transmitida como texto plano, considera habil
     'pro_plan_remove_logo' => ':link haz click para eliminar el logo de Invoice Ninja',
     'pro_plan_remove_logo_link' => 'Haz click aquí',
     'invitation_status_sent' => 'sent',
-    'invitation_status_opened' => 'Openend',
+    'invitation_status_opened' => 'Opened',
     'invitation_status_viewed' => 'Viewed',
     'email_error_inactive_client' => 'No se pueden enviar correos a Clientes inactivos',
     'email_error_inactive_contact' => 'No se pueden enviar correos a Contactos inactivos',
@@ -1119,7 +1120,7 @@ Atención! tu password puede estar transmitida como texto plano, considera habil
     'enable_client_portal_dashboard_help' => 'Show/hide the dashboard page in the client portal.',
 
     // Plans
-    'account_management' => 'Administración de la cuetna',
+    'account_management' => 'Administración de la cuenta',
     'plan_status' => 'Plan Status',
 
     'plan_upgrade' => 'Upgrade',
@@ -1203,7 +1204,7 @@ Atención! tu password puede estar transmitida como texto plano, considera habil
     'card_maestro' => 'Maestro',
     'card_mastercard' => 'MasterCard',
     'card_solo' => 'Solo',
-    'card_switch' => 'Switch',
+    'card_switch' => 'Cambiar',
     'card_visacard' => 'Visa',
     'card_ach' => 'ACH',
 
@@ -1213,17 +1214,17 @@ Atención! tu password puede estar transmitida como texto plano, considera habil
     'stripe_ach_help' => 'ACH support must also be enabled in :link.',
     'ach_disabled' => 'Ya existe otra pasarela configurada para débito directo.',
 
-    'plaid' => 'Plaid',
-    'client_id' => 'Client Id',
+    'plaid' => 'Pagado',
+    'client_id' => 'Id del cliente',
     'secret' => 'Secret',
-    'public_key' => 'Public Key',
-    'plaid_optional' => '(optional)',
+    'public_key' => 'Llave pública',
+    'plaid_optional' => '(opcional)',
     'plaid_environment_help' => 'When a Stripe test key is given, Plaid\'s development environement (tartan) will be used.',
     'other_providers' => 'Otros proveedores',
     'country_not_supported' => 'Este país no está soportado.',
     'invalid_routing_number' => 'The routing number is not valid.',
-    'invalid_account_number' => 'The account number is not valid.',
-    'account_number_mismatch' => 'The account numbers do not match.',
+    'invalid_account_number' => 'El número de cuenta no es valido',
+    'account_number_mismatch' => 'Los números de cuenta no coinciden.',
     'missing_account_holder_type' => 'Please select an individual or company account.',
     'missing_account_holder_name' => 'Please enter the account holder\'s name.',
     'routing_number' => 'Routing Number',
@@ -1234,8 +1235,8 @@ Atención! tu password puede estar transmitida como texto plano, considera habil
     'add_account' => 'Add Account',
     'payment_methods' => 'Payment Methods',
     'complete_verification' => 'Complete Verification',
-    'verification_amount1' => 'Amount 1',
-    'verification_amount2' => 'Amount 2',
+    'verification_amount1' => 'Cantidad 1',
+    'verification_amount2' => 'Cantidad 2',
     'payment_method_verified' => 'Verification completed successfully',
     'verification_failed' => 'Verification Failed',
     'remove_payment_method' => 'Remove Payment Method',
@@ -1408,6 +1409,7 @@ Atención! tu password puede estar transmitida como texto plano, considera habil
     'payment_type_Swish' => 'Swish',
     'payment_type_Alipay' => 'Alipay',
     'payment_type_Sofort' => 'Sofort',
+    'payment_type_SEPA' => 'SEPA Direct Debit',
 
     // Industries
     'industry_Accounting & Legal' => 'Contabilidad y legal',
@@ -1678,12 +1680,12 @@ Atención! tu password puede estar transmitida como texto plano, considera habil
     'country_Ukraine' => 'Ukraine',
     'country_Macedonia, the former Yugoslav Republic of' => 'Macedonia, the former Yugoslav Republic of',
     'country_Egypt' => 'Egypt',
-    'country_United Kingdom' => 'United Kingdom',
+    'country_United Kingdom' => 'Reino unido',
     'country_Guernsey' => 'Guernsey',
     'country_Jersey' => 'Jersey',
     'country_Isle of Man' => 'Isle of Man',
     'country_Tanzania, United Republic of' => 'Tanzania, United Republic of',
-    'country_United States' => 'United States',
+    'country_United States' => 'Estados unidos',
     'country_Virgin Islands, U.S.' => 'Virgin Islands, U.S.',
     'country_Burkina Faso' => 'Burkina Faso',
     'country_Uruguay' => 'Uruguay',
@@ -1720,6 +1722,7 @@ Atención! tu password puede estar transmitida como texto plano, considera habil
     'lang_Turkish - Turkey' => 'Turkish - Turkey',
     'lang_Portuguese - Brazilian' => 'Portuguese - Brazilian',
     'lang_Portuguese - Portugal' => 'Portuguese - Portugal',
+    'lang_Thai' => 'Thai',
 
     // Frequencies
     'freq_weekly' => 'Weekly',
@@ -1839,7 +1842,7 @@ Atención! tu password puede estar transmitida como texto plano, considera habil
     'update_invoiceninja_available' => 'Está disponible una nueva versión de Invoice Ninja.',
     'update_invoiceninja_unavailable' => 'No hay ninguna versión nueva de Invoice Ninja.',
     'update_invoiceninja_instructions' => 'Please install the new version <strong>:version</strong> by clicking the <em>Update now</em> button below. Afterwards you\'ll be redirected to the dashboard.',
-    'update_invoiceninja_update_start' => 'Update now',
+    'update_invoiceninja_update_start' => 'Actualizar ahora',
     'update_invoiceninja_download_start' => 'Download :version',
     'create_new' => 'Create New',
 
@@ -1873,22 +1876,22 @@ Atención! tu password puede estar transmitida como texto plano, considera habil
     'set_limits' => 'Set :gateway_type Limits',
     'enable_min' => 'Enable min',
     'enable_max' => 'Enable max',
-    'min' => 'Min',
-    'max' => 'Max',
+    'min' => 'Mínimo',
+    'max' => 'Máximo',
     'limits_not_met' => 'This invoice does not meet the limits for that payment type.',
 
-    'date_range' => 'Date Range',
+    'date_range' => 'Rango de fechas',
     'raw' => 'Raw',
     'raw_html' => 'Raw HTML',
-    'update' => 'Update',
-    'invoice_fields_help' => 'Drag and drop fields to change their order and location',
-    'new_category' => 'New Category',
-    'restore_product' => 'Restore Product',
+    'update' => 'Actualizar',
+    'invoice_fields_help' => 'Arrastre los campos para cambiarlos el orden y ubicación',
+    'new_category' => 'Nueva categoría',
+    'restore_product' => 'Restaurar Presupuesto',
     'blank' => 'Blank',
-    'invoice_save_error' => 'There was an error saving your invoice',
+    'invoice_save_error' => 'Ha habido un error guardando la factura',
     'enable_recurring' => 'Habilitar facturas periódicas',
     'disable_recurring' => 'Deshabilitar facturas periódicas',
-    'text' => 'Text',
+    'text' => 'Texto',
     'expense_will_create' => 'expense will be created',
     'expenses_will_create' => 'expenses will be created',
     'created_expenses' => 'Successfully created :count expense(s)',
@@ -1905,22 +1908,22 @@ Atención! tu password puede estar transmitida como texto plano, considera habil
     'pro_upgrade_feature2' => '¡Personaliza cada detalle de tu factura!',
     'enterprise_upgrade_feature1' => 'Set permissions for multiple-users',
     'enterprise_upgrade_feature2' => 'Attach 3rd party files to invoices & expenses',
-    'much_more' => 'Much More!',
+    'much_more' => '¡Mucho mas!',
 
     'currency_symbol' => 'Símbolo',
     'currency_code' => 'Código',
 
-    'buy_license' => 'Buy License',
-    'apply_license' => 'Apply License',
-    'submit' => 'Submit',
-    'white_label_license_key' => 'License Key',
+    'buy_license' => 'Comprar la licencia',
+    'apply_license' => 'Renovar licencia',
+    'submit' => 'Enviar',
+    'white_label_license_key' => 'Número de licencia',
     'invalid_white_label_license' => 'The white label license is not valid',
-    'created_by' => 'Created by :name',
+    'created_by' => 'Creado por :name',
     'modules' => 'Modules',
     'financial_year_start' => 'Primer mes del año',
     'authentication' => 'Authentication',
     'checkbox' => 'Checkbox',
-    'invoice_signature' => 'Signature',
+    'invoice_signature' => 'Firma',
     'show_accept_invoice_terms' => 'Invoice Terms Checkbox',
     'show_accept_invoice_terms_help' => 'Require client to confirm that they accept the invoice terms.',
     'show_accept_quote_terms' => 'Quote Terms Checkbox',
@@ -1929,10 +1932,10 @@ Atención! tu password puede estar transmitida como texto plano, considera habil
     'require_invoice_signature_help' => 'Require client to provide their signature.',
     'require_quote_signature' => 'Quote Signature',
     'require_quote_signature_help' => 'Require client to provide their signature.',
-    'i_agree' => 'I Agree To The Terms',
-    'sign_here' => 'Please sign here:',
+    'i_agree' => 'Estoy de acuerdo con los terminos',
+    'sign_here' => 'Por favor firme aquí:',
     'authorization' => 'Authorization',
-    'signed' => 'Signed',
+    'signed' => 'Frimado',
 
 	// BlueVine
 	'bluevine_promo' => 'Get flexible business lines of credit and invoice factoring using BlueVine.',
@@ -2011,7 +2014,7 @@ Atención! tu password puede estar transmitida como texto plano, considera habil
     'user_guide' => 'User Guide',
     'promo_message' => 'Upgrade before :expires and get :amount OFF your first year of our Pro or Enterprise packages.',
     'discount_message' => ':amount off expires :expires',
-    'mark_paid' => 'Mark Paid',
+    'mark_paid' => 'Marcar como pagado',
     'marked_sent_invoice' => 'Successfully marked invoice sent',
     'marked_sent_invoices' => 'Successfully marked invoices sent',
     'invoice_name' => 'Invoice',
@@ -2079,8 +2082,8 @@ Atención! tu password puede estar transmitida como texto plano, considera habil
     'profit_and_loss' => 'Profit and Loss',
     'revenue' => 'Revenue',
     'profit' => 'Profit',
-    'group_when_sorted' => 'Group When Sorted',
-    'group_dates_by' => 'Group Dates By',
+    'group_when_sorted' => 'Agrupar cuando estan ordenadas',
+    'group_dates_by' => 'Agrupar fechas por',
     'year' => 'Year',
     'view_statement' => 'View Statement',
     'statement' => 'Statement',
@@ -2218,7 +2221,7 @@ Atención! tu password puede estar transmitida como texto plano, considera habil
     'surcharge_label' => 'Surcharge Label',
     'contact_fields' => 'Contact Fields',
     'custom_contact_fields_help' => 'Add a field when creating a contact and optionally display the label and value on the PDF.',
-    'datatable_info' => 'Showing :start to :end of :total entries',
+    'datatable_info' => 'Mostrando de :start a :end de :total entradas',
     'credit_total' => 'Credit Total',
     'mark_billable' => 'Mark billable',
     'billed' => 'Billed',
@@ -2387,6 +2390,7 @@ Atención! tu password puede estar transmitida como texto plano, considera habil
     'currency_jordanian_dinar' => 'Jordanian Dinar',
     'currency_myanmar_kyat' => 'Myanmar Kyat',
     'currency_peruvian_sol' => 'Peruvian Sol',
+    'currency_botswana_pula' => 'Botswana Pula',
     'review_app_help' => 'We hope you\'re enjoying using the app.<br/>If you\'d consider <a href="http://www.capterra.com/p/145215/Invoice-Ninja/" target="_blank">writing a review</a> we\'d greatly appreciate it!',
 
     'use_english_version' => 'Make sure to use the English version of the files.<br/>We use the column headers to match the fields.',
@@ -2437,11 +2441,43 @@ Atención! tu password puede estar transmitida como texto plano, considera habil
 
     'alipay' => 'Alipay',
     'sofort' => 'Sofort',
+    'sepa' => 'SEPA Direct Debit',
     'enable_alipay' => 'Accept Alipay',
     'enable_sofort' => 'Accept EU bank transfers',
     'stripe_alipay_help' => 'These gateways also need to be activated in :link.',
     'gocardless_webhook_help_link_text' => 'add this URL as an endpoint in GoCardless',
+    'calendar' => 'Calendar',
+    'pro_plan_calendar' => ':link to enable the calendar by joining the Pro Plan',
 
+    'what_are_you_working_on' => 'What are you working on?',
+    'time_tracker' => 'Time Tracker',
+    'refresh' => 'Refresh',
+    'filter_sort' => 'Filter/Sort',
+    'no_description' => 'No Description',
+    'time_tracker_login' => 'Time Tracker Login',
+    'save_or_discard' => 'Save or discard your changes',
+    'discard_changes' => 'Discard Changes',
+    'tasks_not_enabled' => 'Tasks are not enabled.',
+    'started_task' => 'Successfully started task',
+    'create_client' => 'Create Client',
+
+    'download_desktop_app' => 'Download the desktop app',
+    'download_iphone_app' => 'Download the iPhone app',
+    'download_android_app' => 'Download the Android app',
+    'time_tracker_mobile_help' => 'Double tap a task to select it',
+    'stopped' => 'Stopped',
+    'ascending' => 'Ascending',
+    'descending' => 'Descending',
+    'sort_field' => 'Sort By',
+    'sort_direction' => 'Direction',
+    'discard' => 'Discard',
+    'time_am' => 'AM',
+    'time_pm' => 'PM',
+    'time_mins' => 'mins',
+    'time_hr' => 'hr',
+    'time_hrs' => 'hrs',
+    'clear' => 'Clear',
+    'warn_payment_gateway' => 'Note: to accept online payments :link to add a payment gateway.',
 );
 
 return $LANG;

resources/lang/fi/texts.php

@@ -60,7 +60,7 @@ $LANG = array(
     'download_pdf' => 'Lataa PDF',
     'pay_now' => 'Maksa nyt',
     'save_invoice' => 'Tallenna lasku',
-    'clone_invoice' => 'Kopioi lasku',
+    'clone_invoice' => 'Clone To Invoice',
     'archive_invoice' => 'Arkistoi lasku',
     'delete_invoice' => 'Poista lasku',
     'email_invoice' => 'Lähetä lasku sähköpostitse',
@@ -325,7 +325,7 @@ Lasku poistettiin (if only one, alternative)',
     'delete_quote' => 'Poista tarjous',
     'save_quote' => 'Tallenna tarjous',
     'email_quote' => 'Lähetä tarjous',
-    'clone_quote' => 'Kopioi tarjous',
+    'clone_quote' => 'Clone To Quote',
     'convert_to_invoice' => 'Muuta laskuksi',
     'view_invoice' => 'Katso lasku',
     'view_client' => 'Katso asiakasta',
@@ -657,7 +657,7 @@ Lasku poistettiin (if only one, alternative)',
     'created_by_invoice' => 'Luotu laskulla :invoice',
     'primary_user' => 'Pääasiallinen käyttäjä',
     'help' => 'Ohje',
-    'customize_help' => '<p>We use <a href="http://pdfmake.org/" target="_blank">pdfmake</a> to define the invoice designs declaratively. The pdfmake <a href="http://pdfmake.org/playground.html" target="_blank">playground</a> provide\'s a great way to see the library in action.</p>
+    'customize_help' => '<p>We use <a href="http://pdfmake.org/" target="_blank">pdfmake</a> to define the invoice designs declaratively. The pdfmake <a href="http://pdfmake.org/playground.html" target="_blank">playground</a> provides a great way to see the library in action.</p>
                         <p>You can access a child property using dot notation. For example to show the client name you could use <code>$client.name</code>.</p>
                         <p>If you need help figuring something out post a question to our <a href="https://www.invoiceninja.com/forums/forum/support/" target="_blank">support forum</a> with the design you\'re using.</p>',
     'invoice_due_date' => 'Eräpäivä',
@@ -998,6 +998,7 @@ Lasku poistettiin (if only one, alternative)',
     'enable_https' => 'We strongly recommend using HTTPS to accept credit card details online.',
     'quote_issued_to' => 'Quote issued to',
     'show_currency_code' => 'Currency Code',
+    'free_year_message' => 'Your account has been upgraded to the pro plan for one year at no cost.',
     'trial_message' => 'Your account will receive a free two week trial of our pro plan.',
     'trial_footer' => 'Your free pro plan trial lasts :count more days, :link to upgrade now.',
     'trial_footer_last_day' => 'This is the last day of your free pro plan trial, :link to upgrade now.',
@@ -1018,7 +1019,7 @@ Lasku poistettiin (if only one, alternative)',
     'pro_plan_remove_logo' => ':link to remove the Invoice Ninja logo by joining the Pro Plan',
     'pro_plan_remove_logo_link' => 'Click here',
     'invitation_status_sent' => 'sent',
-    'invitation_status_opened' => 'Openend',
+    'invitation_status_opened' => 'Opened',
     'invitation_status_viewed' => 'Viewed',
     'email_error_inactive_client' => 'Emails can not be sent to inactive clients',
     'email_error_inactive_contact' => 'Emails can not be sent to inactive contacts',
@@ -1414,6 +1415,7 @@ Lasku poistettiin (if only one, alternative)',
     'payment_type_Swish' => 'Swish',
     'payment_type_Alipay' => 'Alipay',
     'payment_type_Sofort' => 'Sofort',
+    'payment_type_SEPA' => 'SEPA Direct Debit',
 
     // Industries
     'industry_Accounting & Legal' => 'Accounting & Legal',
@@ -1726,6 +1728,7 @@ Lasku poistettiin (if only one, alternative)',
     'lang_Turkish - Turkey' => 'Turkish - Turkey',
     'lang_Portuguese - Brazilian' => 'Portuguese - Brazilian',
     'lang_Portuguese - Portugal' => 'Portuguese - Portugal',
+    'lang_Thai' => 'Thai',
 
     // Frequencies
     'freq_weekly' => 'Weekly',
@@ -2393,6 +2396,7 @@ Lasku poistettiin (if only one, alternative)',
     'currency_jordanian_dinar' => 'Jordanian Dinar',
     'currency_myanmar_kyat' => 'Myanmar Kyat',
     'currency_peruvian_sol' => 'Peruvian Sol',
+    'currency_botswana_pula' => 'Botswana Pula',
     'review_app_help' => 'We hope you\'re enjoying using the app.<br/>If you\'d consider <a href="http://www.capterra.com/p/145215/Invoice-Ninja/" target="_blank">writing a review</a> we\'d greatly appreciate it!',
 
     'use_english_version' => 'Make sure to use the English version of the files.<br/>We use the column headers to match the fields.',
@@ -2443,11 +2447,43 @@ Lasku poistettiin (if only one, alternative)',
 
     'alipay' => 'Alipay',
     'sofort' => 'Sofort',
+    'sepa' => 'SEPA Direct Debit',
     'enable_alipay' => 'Accept Alipay',
     'enable_sofort' => 'Accept EU bank transfers',
     'stripe_alipay_help' => 'These gateways also need to be activated in :link.',
     'gocardless_webhook_help_link_text' => 'add this URL as an endpoint in GoCardless',
+    'calendar' => 'Calendar',
+    'pro_plan_calendar' => ':link to enable the calendar by joining the Pro Plan',
 
+    'what_are_you_working_on' => 'What are you working on?',
+    'time_tracker' => 'Time Tracker',
+    'refresh' => 'Refresh',
+    'filter_sort' => 'Filter/Sort',
+    'no_description' => 'No Description',
+    'time_tracker_login' => 'Time Tracker Login',
+    'save_or_discard' => 'Save or discard your changes',
+    'discard_changes' => 'Discard Changes',
+    'tasks_not_enabled' => 'Tasks are not enabled.',
+    'started_task' => 'Successfully started task',
+    'create_client' => 'Create Client',
+
+    'download_desktop_app' => 'Download the desktop app',
+    'download_iphone_app' => 'Download the iPhone app',
+    'download_android_app' => 'Download the Android app',
+    'time_tracker_mobile_help' => 'Double tap a task to select it',
+    'stopped' => 'Stopped',
+    'ascending' => 'Ascending',
+    'descending' => 'Descending',
+    'sort_field' => 'Sort By',
+    'sort_direction' => 'Direction',
+    'discard' => 'Discard',
+    'time_am' => 'AM',
+    'time_pm' => 'PM',
+    'time_mins' => 'mins',
+    'time_hr' => 'hr',
+    'time_hrs' => 'hrs',
+    'clear' => 'Clear',
+    'warn_payment_gateway' => 'Note: to accept online payments :link to add a payment gateway.',
 );
 
 return $LANG;

resources/lang/fr/texts.php

@@ -60,7 +60,7 @@ $LANG = array(
     'download_pdf' => 'Télécharger le PDF',
     'pay_now' => 'Payer maintenant',
     'save_invoice' => 'Sauvegarder la facture',
-    'clone_invoice' => 'Dupliquer la facture',
+    'clone_invoice' => 'Clone To Invoice',
     'archive_invoice' => 'Archiver la facture',
     'delete_invoice' => 'Supprimer la facture',
     'email_invoice' => 'Envoyer la facture par courriel',
@@ -317,7 +317,7 @@ $LANG = array(
     'delete_quote' => 'Supprimer ce devis',
     'save_quote' => 'Enregistrer ce devis',
     'email_quote' => 'Envoyer ce devis par courriel',
-    'clone_quote' => 'Dupliquer ce devis',
+    'clone_quote' => 'Clone To Quote',
     'convert_to_invoice' => 'Convertir en facture',
     'view_invoice' => 'Voir la facture',
     'view_client' => 'Voir le client',
@@ -649,9 +649,9 @@ $LANG = array(
     'created_by_invoice' => 'Créé par :invoice',
     'primary_user' => 'Utilisateur principal',
     'help' => 'Aide',
-    'customize_help' => 'Nous utilisons <a href="http://pdfmake.org/" target="_blank">pdfmake</a> pour définir la présentation graphique des factures de manière déclarative. Pdfmake <a href="http://pdfmake.org/playground.html" target="_blank">playground</a> fournit une excellente façon de voir la bibliothèque en action.
-Vous pouvez accéder une propriété héritée en utilisant la notation par point. Par exemple, pour afficher le nom du client, vous pouvez utiliser <code>$client.name</code>.
-Si vous avez besoin d\'aide à ce sujet, vous pouvez publier une question sur notre <a href="https://www.invoiceninja.com/forums/forum/support/" target="_blank">forum d\'aide</a> en indiquant le modèle de facture que vous utilisez.</p>',
+    'customize_help' => '<p>We use <a href="http://pdfmake.org/" target="_blank">pdfmake</a> to define the invoice designs declaratively. The pdfmake <a href="http://pdfmake.org/playground.html" target="_blank">playground</a> provides a great way to see the library in action.</p>
+                        <p>You can access a child property using dot notation. For example to show the client name you could use <code>$client.name</code>.</p>
+                        <p>If you need help figuring something out post a question to our <a href="https://www.invoiceninja.com/forums/forum/support/" target="_blank">support forum</a> with the design you\'re using.</p>',
     'invoice_due_date' => 'Date limite',
     'quote_due_date' => 'Date limite',
     'valid_until' => 'Valide jusqu\'au',
@@ -990,6 +990,7 @@ Si vous avez besoin d\'aide à ce sujet, vous pouvez publier une question sur no
     'enable_https' => 'Nous vous recommandons fortement d\'activer le HTTPS si vous acceptez les paiements en ligne.',
     'quote_issued_to' => 'Devis à l\'attention de',
     'show_currency_code' => 'Code de la devise',
+    'free_year_message' => 'Your account has been upgraded to the pro plan for one year at no cost.',
     'trial_message' => 'Votre compte va être crédité d\'un essai gratuit de 2 semaines de notre Plan pro.',
     'trial_footer' => 'Il vous reste :count jours d\'essai sur notre offre Pro, :link modifiez votre abonnement maintenant.',
     'trial_footer_last_day' => 'C\'est votre dernier jour d\'essai sur notre offre Pro, :link modifiez votre abonnement maintenant.',
@@ -1010,7 +1011,7 @@ Si vous avez besoin d\'aide à ce sujet, vous pouvez publier une question sur no
     'pro_plan_remove_logo' => ':link pour supprimer le logo Invoice Ninja en souscrivant au Plan Pro',
     'pro_plan_remove_logo_link' => 'Cliquez ici',
     'invitation_status_sent' => 'sent',
-    'invitation_status_opened' => 'Ouvert',
+    'invitation_status_opened' => 'Opened',
     'invitation_status_viewed' => 'Consulté',
     'email_error_inactive_client' => 'Les mails ne peuvent être envoyés aux clients inactifs',
     'email_error_inactive_contact' => 'Les mails ne peuvent être envoyés aux contacts inactifs',
@@ -1406,6 +1407,7 @@ Lorsque les montant apparaîtront sur votre relevé, veuillez revenir sur cette
     'payment_type_Swish' => 'Swish',
     'payment_type_Alipay' => 'Alipay',
     'payment_type_Sofort' => 'Sofort',
+    'payment_type_SEPA' => 'SEPA Direct Debit',
 
     // Industries
     'industry_Accounting & Legal' => 'Comptabilité & Légal',
@@ -1718,6 +1720,7 @@ Lorsque les montant apparaîtront sur votre relevé, veuillez revenir sur cette
     'lang_Turkish - Turkey' => 'Turkish - Turkey',
     'lang_Portuguese - Brazilian' => 'Portugais - Brésil',
     'lang_Portuguese - Portugal' => 'Portugais - Portugal',
+    'lang_Thai' => 'Thai',
 
     // Frequencies
     'freq_weekly' => 'Hebdomadaire',
@@ -2385,6 +2388,7 @@ Lorsque les montant apparaîtront sur votre relevé, veuillez revenir sur cette
     'currency_jordanian_dinar' => 'Jordanian Dinar',
     'currency_myanmar_kyat' => 'Myanmar Kyat',
     'currency_peruvian_sol' => 'Peruvian Sol',
+    'currency_botswana_pula' => 'Botswana Pula',
     'review_app_help' => 'We hope you\'re enjoying using the app.<br/>If you\'d consider <a href="http://www.capterra.com/p/145215/Invoice-Ninja/" target="_blank">writing a review</a> we\'d greatly appreciate it!',
 
     'use_english_version' => 'Make sure to use the English version of the files.<br/>We use the column headers to match the fields.',
@@ -2435,11 +2439,43 @@ Lorsque les montant apparaîtront sur votre relevé, veuillez revenir sur cette
 
     'alipay' => 'Alipay',
     'sofort' => 'Sofort',
+    'sepa' => 'SEPA Direct Debit',
     'enable_alipay' => 'Accept Alipay',
     'enable_sofort' => 'Accept EU bank transfers',
     'stripe_alipay_help' => 'These gateways also need to be activated in :link.',
     'gocardless_webhook_help_link_text' => 'add this URL as an endpoint in GoCardless',
+    'calendar' => 'Calendar',
+    'pro_plan_calendar' => ':link to enable the calendar by joining the Pro Plan',
 
+    'what_are_you_working_on' => 'What are you working on?',
+    'time_tracker' => 'Time Tracker',
+    'refresh' => 'Refresh',
+    'filter_sort' => 'Filter/Sort',
+    'no_description' => 'No Description',
+    'time_tracker_login' => 'Time Tracker Login',
+    'save_or_discard' => 'Save or discard your changes',
+    'discard_changes' => 'Discard Changes',
+    'tasks_not_enabled' => 'Tasks are not enabled.',
+    'started_task' => 'Successfully started task',
+    'create_client' => 'Create Client',
+
+    'download_desktop_app' => 'Download the desktop app',
+    'download_iphone_app' => 'Download the iPhone app',
+    'download_android_app' => 'Download the Android app',
+    'time_tracker_mobile_help' => 'Double tap a task to select it',
+    'stopped' => 'Stopped',
+    'ascending' => 'Ascending',
+    'descending' => 'Descending',
+    'sort_field' => 'Sort By',
+    'sort_direction' => 'Direction',
+    'discard' => 'Discard',
+    'time_am' => 'AM',
+    'time_pm' => 'PM',
+    'time_mins' => 'mins',
+    'time_hr' => 'hr',
+    'time_hrs' => 'hrs',
+    'clear' => 'Clear',
+    'warn_payment_gateway' => 'Note: to accept online payments :link to add a payment gateway.',
 );
 
 return $LANG;

resources/lang/fr_CA/texts.php

@@ -60,7 +60,7 @@ $LANG = array(
     'download_pdf' => 'PDF',
     'pay_now' => 'Payer maintenant',
     'save_invoice' => 'Sauvegarder la facture',
-    'clone_invoice' => 'Dupliquer la facture',
+    'clone_invoice' => 'Clone To Invoice',
     'archive_invoice' => 'Archiver la facture',
     'delete_invoice' => 'Supprimer la facture',
     'email_invoice' => 'Envoyer par courriel',
@@ -317,7 +317,7 @@ $LANG = array(
     'delete_quote' => 'Supprimer la soumission',
     'save_quote' => 'Enregistrer la soumission',
     'email_quote' => 'Envoyer la soumission par courriel',
-    'clone_quote' => 'Dupliquer la soumission',
+    'clone_quote' => 'Clone To Quote',
     'convert_to_invoice' => 'Convertir en facture',
     'view_invoice' => 'Voir la facture',
     'view_client' => 'Voir le client',
@@ -649,9 +649,9 @@ $LANG = array(
     'created_by_invoice' => 'Créée par :invoice',
     'primary_user' => 'Utilisateur principal',
     'help' => 'Aide',
-    'customize_help' => '<p>Nous utilisons <a href="http://pdfmake.org/" target="_blank">pdfmake</a> pour définir la présentation graphique des factures de manière déclarative. Pdfmake <a href="http://pdfmake.org/playground.html" target="_blank">playground</a> fournit une excellente façon de voir la librairie en action.</p>
-                        <p>Vous pouvez accéder une propriété enfant en utilisant la notation par point. Par exemple, pour afficher le nom du client, vous pouvez utiliser <code>$client.name</code>.</p>
-                        <p>Si vous avez besoin d\'aide à ce sujet, vous pouvez publier une question sur notre <a href="https://www.invoiceninja.com/forums/forum/support/" target="_blank">forum d\'aide</a> avec la présentation graphique que vous utilisez.</p>',
+    'customize_help' => '<p>Nous utilisons <a href="http://pdfmake.org/" target="_blank">pdfmake</a> pour définir déclarativement le design des factures. L\'environnement <a href="http://pdfmake.org/playground.html" target="_blank">pdfmake</a> offre d\'intéressantes pistes pour voir la librairie en action.</p>
+                        <p>Vous pouvez accéder aux propriétés enfants en utilisant la notation par point. Par exemple, pour afficher le nom du client, vous pourriez utiliser <code>$client.name</code>.</p>
+                        <p>Si vous avez besoin d\'aide, consultez notre <a href="https://www.invoiceninja.com/forums/forum/support/" target="_blank">forum de support</a> avec le design que vous utilisez.</p>',
     'invoice_due_date' => 'Échéance',
     'quote_due_date' => 'Échéance',
     'valid_until' => 'Échéance',
@@ -987,6 +987,7 @@ $LANG = array(
     'enable_https' => 'Nous vous recommandons fortement d\'activer le HTTPS pour la réception de paiement par carte de crédit en ligne.',
     'quote_issued_to' => 'La soumission a été émise pour',
     'show_currency_code' => 'Code de devise',
+    'free_year_message' => 'Votre compte a été mis à niveau gratuitement vers le Plan Pro pour une année.',
     'trial_message' => 'Vous allez bénéficier d\'un essai gratuit de 2 semaines au Plan Pro.',
     'trial_footer' => 'Vous avez encore :count jours pour votre essai gratuit Pro Plan, :link pour s\'inscrire.',
     'trial_footer_last_day' => 'C\'est le dernier jour de votre essai gratuit Pro Plan, :link pour s\'inscrire.',
@@ -1403,6 +1404,7 @@ Lorsque les montant apparaîtront sur votre relevé, veuillez revenir sur cette
     'payment_type_Swish' => 'Swish',
     'payment_type_Alipay' => 'Alipay',
     'payment_type_Sofort' => 'Sofort',
+    'payment_type_SEPA' => 'SEPA Débit direct',
 
     // Industries
     'industry_Accounting & Legal' => 'Administration',
@@ -1715,6 +1717,7 @@ Lorsque les montant apparaîtront sur votre relevé, veuillez revenir sur cette
     'lang_Turkish - Turkey' => 'Turc - Turquie',
     'lang_Portuguese - Brazilian' => 'Portugais - Brésil',
     'lang_Portuguese - Portugal' => 'Portugais - Portugal',
+    'lang_Thai' => 'Baht thaïlandais',
 
     // Frequencies
     'freq_weekly' => 'Hebdomadaire',
@@ -1857,7 +1860,7 @@ Lorsque les montant apparaîtront sur votre relevé, veuillez revenir sur cette
     'inactive_logout' => 'Vous avez été déconnecté en raison de l\'inactivité.',
     'reports' => 'Rapports',
     'total_profit' => 'Total des profits',
-    'total_expenses' => 'Total des dépenses',
+    'total_expenses' => 'Dépenses',
     'quote_to' => 'Soumission pour',
 
     // Limits
@@ -1893,10 +1896,10 @@ Lorsque les montant apparaîtront sur votre relevé, veuillez revenir sur cette
 
     'go_ninja_pro' => 'Devenez Ninja Pro',
     'go_enterprise' => 'Devenez Entreprise!',
-    'upgrade_for_features' => 'Mettre à jour pour plus de fonctionnalités',
+    'upgrade_for_features' => 'Mise à jour pour plus de fonctionnalités',
     'pay_annually_discount' => 'Payez annuellement pour 10 mois + 2 gratuits',
     'pro_upgrade_title' => 'Ninja Pro',
-    'pro_upgrade_feature1' => 'VotreMarque.InvoiceNinja.com',
+    'pro_upgrade_feature1' => 'votrenom.invoiceninja.com',
     'pro_upgrade_feature2' => 'Personnalisez tous les aspects de votre facture',
     'enterprise_upgrade_feature1' => 'Définissez les permissions pour plusieurs utilisateurs',
     'enterprise_upgrade_feature2' => 'Ajoutez des fichiers joints aux factures et dépenses',
@@ -1932,7 +1935,7 @@ Lorsque les montant apparaîtront sur votre relevé, veuillez revenir sur cette
 	// BlueVine
 	'bluevine_promo' => 'Obtenez des marges de crédit et d\'affacturages d\'affaires flexible en utilisant BlueVIne.',
 	'bluevine_modal_label' => 'Inscrivez-vous avec BlueVine',
-	'bluevine_modal_text' => '<h3>Finacement rapide pour votre entreprise. Pas de paperasse.</h3>
+	'bluevine_modal_text' => '<h3>Financement rapide pour votre entreprise. Pas de paperasse.</h3>
 <ul><li>Marges de crédit et affacturage d\'affaires flexibles.</li></ul>',
 	'bluevine_create_account' => 'Créer un compte',
 	'quote_types' => 'Obtenir une soumission pour',
@@ -2383,6 +2386,7 @@ Lorsque les montant apparaîtront sur votre relevé, veuillez revenir sur cette
     'currency_jordanian_dinar' => 'Dinar jordanien',
     'currency_myanmar_kyat' => 'Kyat birman',
     'currency_peruvian_sol' => 'Nouveau sol péruvien',
+    'currency_botswana_pula' => 'Pula botswanais',
     'review_app_help' => 'Nous espérons que votre utilisation de cette application vous est agréable.<br/>Veuillez considérer <a href="http://www.capterra.com/p/145215/Invoice-Ninja/" target="_blank">de laisser un commentaire.</a> Ce serait grandement apprécié!',
 
     'use_english_version' => 'Veuillez vous assurer d\'utiliser la version anglaise des fichiers.<br/>Les entêtes de colonnes sont utilisées pour correspondre aux champs.',
@@ -2433,11 +2437,43 @@ Lorsque les montant apparaîtront sur votre relevé, veuillez revenir sur cette
 
     'alipay' => 'Alipay',
     'sofort' => 'Sofort',
+    'sepa' => 'SEPA Débit direct',
     'enable_alipay' => 'Accepter Alipay',
     'enable_sofort' => 'Accepter les tranferts de banques EU',
     'stripe_alipay_help' => 'Ces passerelles doivent aussi être activées dans :link.',
     'gocardless_webhook_help_link_text' => 'ajoute cette URL comme terminal dans GoCardless',
+    'calendar' => 'Calendrier',
+    'pro_plan_calendar' => ':link pour activer le calendrier en joignant le Plan Pro',
 
+    'what_are_you_working_on' => 'Sur quoi travaillez-vous ?',
+    'time_tracker' => 'Minuteur',
+    'refresh' => 'Actualiser',
+    'filter_sort' => 'Filtrer/trier',
+    'no_description' => 'Aucune description',
+    'time_tracker_login' => 'Connexion au minuteur',
+    'save_or_discard' => 'Sauvegarder ou annuler les changements',
+    'discard_changes' => 'Annuler les changements',
+    'tasks_not_enabled' => 'Les tâches ne sont pas activées.',
+    'started_task' => 'La tâche est démarée',
+    'create_client' => 'Créer un client',
+
+    'download_desktop_app' => 'Télécharger l\'app. de bureau',
+    'download_iphone_app' => 'Télécharger l\'app. iPhone',
+    'download_android_app' => 'Télécharger l\'app. Android',
+    'time_tracker_mobile_help' => 'Double-tapez une tâche pour la sélectionner',
+    'stopped' => 'Arrêtée',
+    'ascending' => 'Ascendant',
+    'descending' => 'Descendant',
+    'sort_field' => 'Trié par',
+    'sort_direction' => 'Direction',
+    'discard' => 'Annuler',
+    'time_am' => 'AM',
+    'time_pm' => 'PM',
+    'time_mins' => 'min',
+    'time_hr' => 'h',
+    'time_hrs' => 'hrs',
+    'clear' => 'Remettre à zéro',
+    'warn_payment_gateway' => 'Note: to accept online payments :link to add a payment gateway.',
 );
 
 return $LANG;

resources/lang/hr/texts.php

@@ -60,7 +60,7 @@ $LANG = array(
     'download_pdf' => 'Preuzmi PDF',
     'pay_now' => 'Plati odmah',
     'save_invoice' => 'Pohrani račun',
-    'clone_invoice' => 'Kloniraj račun',
+    'clone_invoice' => 'Clone To Invoice',
     'archive_invoice' => 'Arhiviraj račun',
     'delete_invoice' => 'Obriši račun',
     'email_invoice' => 'Pošalji e-poštom',
@@ -323,7 +323,7 @@ $LANG = array(
     'delete_quote' => 'Obriši ponudu',
     'save_quote' => 'Pohrani ponudu',
     'email_quote' => 'Šalji ponudu e-poštom',
-    'clone_quote' => 'Kloniraj ponudu',
+    'clone_quote' => 'Clone To Quote',
     'convert_to_invoice' => 'Konverzija računa',
     'view_invoice' => 'Pregled računa',
     'view_client' => 'Pregled klijenta',
@@ -655,7 +655,7 @@ $LANG = array(
     'created_by_invoice' => 'Kreiran od :invoice',
     'primary_user' => 'Primarni korisnik',
     'help' => 'Pomoć',
-    'customize_help' => '<p>We use <a href="http://pdfmake.org/" target="_blank">pdfmake</a> to define the invoice designs declaratively. The pdfmake <a href="http://pdfmake.org/playground.html" target="_blank">playground</a> provide\'s a great way to see the library in action.</p>
+    'customize_help' => '<p>We use <a href="http://pdfmake.org/" target="_blank">pdfmake</a> to define the invoice designs declaratively. The pdfmake <a href="http://pdfmake.org/playground.html" target="_blank">playground</a> provides a great way to see the library in action.</p>
                         <p>You can access a child property using dot notation. For example to show the client name you could use <code>$client.name</code>.</p>
                         <p>If you need help figuring something out post a question to our <a href="https://www.invoiceninja.com/forums/forum/support/" target="_blank">support forum</a> with the design you\'re using.</p>',
     'invoice_due_date' => 'Datum valute',
@@ -996,6 +996,7 @@ $LANG = array(
     'enable_https' => 'Snažno preporučujemo korištenje HTTPS za prihvat detalja kreditnih kartica online.',
     'quote_issued_to' => 'Ponuda napravljena za',
     'show_currency_code' => 'Kod valute',
+    'free_year_message' => 'Your account has been upgraded to the pro plan for one year at no cost.',
     'trial_message' => 'Vaš račun će primiti besplatni dvotjedni probni rok za naš pro plan.',
     'trial_footer' => 'Your free pro plan trial lasts :count more days, :link to upgrade now.',
     'trial_footer_last_day' => 'This is the last day of your free pro plan trial, :link to upgrade now.',
@@ -1016,7 +1017,7 @@ $LANG = array(
     'pro_plan_remove_logo' => ':link to remove the Invoice Ninja logo by joining the Pro Plan',
     'pro_plan_remove_logo_link' => 'Click here',
     'invitation_status_sent' => 'sent',
-    'invitation_status_opened' => 'Openend',
+    'invitation_status_opened' => 'Opened',
     'invitation_status_viewed' => 'Viewed',
     'email_error_inactive_client' => 'Emails can not be sent to inactive clients',
     'email_error_inactive_contact' => 'Emails can not be sent to inactive contacts',
@@ -1412,6 +1413,7 @@ $LANG = array(
     'payment_type_Swish' => 'Swish',
     'payment_type_Alipay' => 'Alipay',
     'payment_type_Sofort' => 'Sofort',
+    'payment_type_SEPA' => 'SEPA Direct Debit',
 
     // Industries
     'industry_Accounting & Legal' => 'Accounting & Legal',
@@ -1724,6 +1726,7 @@ $LANG = array(
     'lang_Turkish - Turkey' => 'Turkish - Turkey',
     'lang_Portuguese - Brazilian' => 'Portuguese - Brazilian',
     'lang_Portuguese - Portugal' => 'Portuguese - Portugal',
+    'lang_Thai' => 'Thai',
 
     // Frequencies
     'freq_weekly' => 'Weekly',
@@ -2391,6 +2394,7 @@ $LANG = array(
     'currency_jordanian_dinar' => 'Jordanian Dinar',
     'currency_myanmar_kyat' => 'Myanmar Kyat',
     'currency_peruvian_sol' => 'Peruvian Sol',
+    'currency_botswana_pula' => 'Botswana Pula',
     'review_app_help' => 'We hope you\'re enjoying using the app.<br/>If you\'d consider <a href="http://www.capterra.com/p/145215/Invoice-Ninja/" target="_blank">writing a review</a> we\'d greatly appreciate it!',
 
     'use_english_version' => 'Make sure to use the English version of the files.<br/>We use the column headers to match the fields.',
@@ -2441,11 +2445,43 @@ $LANG = array(
 
     'alipay' => 'Alipay',
     'sofort' => 'Sofort',
+    'sepa' => 'SEPA Direct Debit',
     'enable_alipay' => 'Accept Alipay',
     'enable_sofort' => 'Accept EU bank transfers',
     'stripe_alipay_help' => 'These gateways also need to be activated in :link.',
     'gocardless_webhook_help_link_text' => 'add this URL as an endpoint in GoCardless',
+    'calendar' => 'Calendar',
+    'pro_plan_calendar' => ':link to enable the calendar by joining the Pro Plan',
 
+    'what_are_you_working_on' => 'What are you working on?',
+    'time_tracker' => 'Time Tracker',
+    'refresh' => 'Refresh',
+    'filter_sort' => 'Filter/Sort',
+    'no_description' => 'No Description',
+    'time_tracker_login' => 'Time Tracker Login',
+    'save_or_discard' => 'Save or discard your changes',
+    'discard_changes' => 'Discard Changes',
+    'tasks_not_enabled' => 'Tasks are not enabled.',
+    'started_task' => 'Successfully started task',
+    'create_client' => 'Create Client',
+
+    'download_desktop_app' => 'Download the desktop app',
+    'download_iphone_app' => 'Download the iPhone app',
+    'download_android_app' => 'Download the Android app',
+    'time_tracker_mobile_help' => 'Double tap a task to select it',
+    'stopped' => 'Stopped',
+    'ascending' => 'Ascending',
+    'descending' => 'Descending',
+    'sort_field' => 'Sort By',
+    'sort_direction' => 'Direction',
+    'discard' => 'Discard',
+    'time_am' => 'AM',
+    'time_pm' => 'PM',
+    'time_mins' => 'mins',
+    'time_hr' => 'hr',
+    'time_hrs' => 'hrs',
+    'clear' => 'Clear',
+    'warn_payment_gateway' => 'Note: to accept online payments :link to add a payment gateway.',
 );
 
 return $LANG;

resources/lang/it/texts.php

@@ -60,7 +60,7 @@ $LANG = array(
     'download_pdf' => 'Scarica PDF',
     'pay_now' => 'Paga Adesso',
     'save_invoice' => 'Salva Fattura',
-    'clone_invoice' => 'Duplica Fattura',
+    'clone_invoice' => 'Clone To Invoice',
     'archive_invoice' => 'Archivia Fattura',
     'delete_invoice' => 'Elimina Fattura',
     'email_invoice' => 'Invia Fattura',
@@ -317,7 +317,7 @@ $LANG = array(
     'delete_quote' => 'Cancella Preventivo',
     'save_quote' => 'Salva Preventivo',
     'email_quote' => 'Invia Preventivo via Email',
-    'clone_quote' => 'Clona Preventivo',
+    'clone_quote' => 'Clone To Quote',
     'convert_to_invoice' => 'Converti a Fattura',
     'view_invoice' => 'Vedi Fattura',
     'view_client' => 'Vedi Cliente',
@@ -649,9 +649,9 @@ $LANG = array(
     'created_by_invoice' => 'Created by :invoice',
     'primary_user' => 'Primary User',
     'help' => 'Help',
-    'customize_help' => '<p>Noi usiamo <a href="http://pdfmake.org/" target="_blank">pdfmake</a>per definire il template della fattura in maniera dichiarativa.  Pdfmake <a href="http://pdfmake.org/playground.html" target="_blank">playground</a> provide\'s a great way to see the library in action.</p>
-<p>Puoi accedere  alla child property usando la "dot notation". Ad esempio per mostrare  il nome cliente puoi usare<code>$client.name</code>.</p>
-<p>If you need help figuring something out post a question to our <a href="https://www.invoiceninja.com/forums/forum/support/" target="_blank">support forum</a> with the design you\'re using.</p>',
+    'customize_help' => '<p>We use <a href="http://pdfmake.org/" target="_blank">pdfmake</a> to define the invoice designs declaratively. The pdfmake <a href="http://pdfmake.org/playground.html" target="_blank">playground</a> provides a great way to see the library in action.</p>
+                        <p>You can access a child property using dot notation. For example to show the client name you could use <code>$client.name</code>.</p>
+                        <p>If you need help figuring something out post a question to our <a href="https://www.invoiceninja.com/forums/forum/support/" target="_blank">support forum</a> with the design you\'re using.</p>',
     'invoice_due_date' => 'Scadenza fattura',
     'quote_due_date' => 'Validità preventivo',
     'valid_until' => 'Valido fino a',
@@ -990,6 +990,7 @@ $LANG = array(
     'enable_https' => 'We strongly recommend using HTTPS to accept credit card details online.',
     'quote_issued_to' => 'Quote issued to',
     'show_currency_code' => 'Currency Code',
+    'free_year_message' => 'Your account has been upgraded to the pro plan for one year at no cost.',
     'trial_message' => 'Your account will receive a free two week trial of our pro plan.',
     'trial_footer' => 'Your free pro plan trial lasts :count more days, :link to upgrade now.',
     'trial_footer_last_day' => 'This is the last day of your free pro plan trial, :link to upgrade now.',
@@ -1010,7 +1011,7 @@ $LANG = array(
     'pro_plan_remove_logo' => ':link per rimuovere il logo di Invoice Ninja aderendo al programma pro',
     'pro_plan_remove_logo_link' => 'Clicca qui',
     'invitation_status_sent' => 'sent',
-    'invitation_status_opened' => 'Aperto',
+    'invitation_status_opened' => 'Opened',
     'invitation_status_viewed' => 'Visto',
     'email_error_inactive_client' => 'Emails can not be sent to inactive clients',
     'email_error_inactive_contact' => 'Emails can not be sent to inactive contacts',
@@ -1405,6 +1406,7 @@ $LANG = array(
     'payment_type_Swish' => 'Swish',
     'payment_type_Alipay' => 'Alipay',
     'payment_type_Sofort' => 'Sofort',
+    'payment_type_SEPA' => 'SEPA Direct Debit',
 
     // Industries
     'industry_Accounting & Legal' => 'Accounting & Legal',
@@ -1717,6 +1719,7 @@ $LANG = array(
     'lang_Turkish - Turkey' => 'Turkish - Turkey',
     'lang_Portuguese - Brazilian' => 'Portuguese - Brazilian',
     'lang_Portuguese - Portugal' => 'Portuguese - Portugal',
+    'lang_Thai' => 'Thai',
 
     // Frequencies
     'freq_weekly' => 'Weekly',
@@ -2384,6 +2387,7 @@ $LANG = array(
     'currency_jordanian_dinar' => 'Jordanian Dinar',
     'currency_myanmar_kyat' => 'Myanmar Kyat',
     'currency_peruvian_sol' => 'Peruvian Sol',
+    'currency_botswana_pula' => 'Botswana Pula',
     'review_app_help' => 'We hope you\'re enjoying using the app.<br/>If you\'d consider <a href="http://www.capterra.com/p/145215/Invoice-Ninja/" target="_blank">writing a review</a> we\'d greatly appreciate it!',
 
     'use_english_version' => 'Make sure to use the English version of the files.<br/>We use the column headers to match the fields.',
@@ -2434,11 +2438,43 @@ $LANG = array(
 
     'alipay' => 'Alipay',
     'sofort' => 'Sofort',
+    'sepa' => 'SEPA Direct Debit',
     'enable_alipay' => 'Accept Alipay',
     'enable_sofort' => 'Accept EU bank transfers',
     'stripe_alipay_help' => 'These gateways also need to be activated in :link.',
     'gocardless_webhook_help_link_text' => 'add this URL as an endpoint in GoCardless',
+    'calendar' => 'Calendar',
+    'pro_plan_calendar' => ':link to enable the calendar by joining the Pro Plan',
 
+    'what_are_you_working_on' => 'What are you working on?',
+    'time_tracker' => 'Time Tracker',
+    'refresh' => 'Refresh',
+    'filter_sort' => 'Filter/Sort',
+    'no_description' => 'No Description',
+    'time_tracker_login' => 'Time Tracker Login',
+    'save_or_discard' => 'Save or discard your changes',
+    'discard_changes' => 'Discard Changes',
+    'tasks_not_enabled' => 'Tasks are not enabled.',
+    'started_task' => 'Successfully started task',
+    'create_client' => 'Create Client',
+
+    'download_desktop_app' => 'Download the desktop app',
+    'download_iphone_app' => 'Download the iPhone app',
+    'download_android_app' => 'Download the Android app',
+    'time_tracker_mobile_help' => 'Double tap a task to select it',
+    'stopped' => 'Stopped',
+    'ascending' => 'Ascending',
+    'descending' => 'Descending',
+    'sort_field' => 'Sort By',
+    'sort_direction' => 'Direction',
+    'discard' => 'Discard',
+    'time_am' => 'AM',
+    'time_pm' => 'PM',
+    'time_mins' => 'mins',
+    'time_hr' => 'hr',
+    'time_hrs' => 'hrs',
+    'clear' => 'Clear',
+    'warn_payment_gateway' => 'Note: to accept online payments :link to add a payment gateway.',
 );
 
 return $LANG;

resources/lang/ja/texts.php

@@ -60,7 +60,7 @@ $LANG = array(
     'download_pdf' => 'PDFダウンロード',
     'pay_now' => 'Pay Now',
     'save_invoice' => '請求書を保存',
-    'clone_invoice' => '請求書を複製',
+    'clone_invoice' => 'Clone To Invoice',
     'archive_invoice' => '請求書をアーカイブ',
     'delete_invoice' => '請求書を削除',
     'email_invoice' => '請求書をメールする',
@@ -323,7 +323,7 @@ $LANG = array(
     'delete_quote' => '見積書を削除',
     'save_quote' => '見積書を保存',
     'email_quote' => '見積書をメール',
-    'clone_quote' => '見積書を複製',
+    'clone_quote' => 'Clone To Quote',
     'convert_to_invoice' => '請求書に変換',
     'view_invoice' => '請求書を表示',
     'view_client' => '顧客を表示',
@@ -655,7 +655,7 @@ $LANG = array(
     'created_by_invoice' => 'Created by :invoice',
     'primary_user' => 'プライマリ・ユーザ',
     'help' => 'ヘルプ',
-    'customize_help' => '<p>We use <a href="http://pdfmake.org/" target="_blank">pdfmake</a> to define the invoice designs declaratively. The pdfmake <a href="http://pdfmake.org/playground.html" target="_blank">playground</a> provide\'s a great way to see the library in action.</p>
+    'customize_help' => '<p>We use <a href="http://pdfmake.org/" target="_blank">pdfmake</a> to define the invoice designs declaratively. The pdfmake <a href="http://pdfmake.org/playground.html" target="_blank">playground</a> provides a great way to see the library in action.</p>
                         <p>You can access a child property using dot notation. For example to show the client name you could use <code>$client.name</code>.</p>
                         <p>If you need help figuring something out post a question to our <a href="https://www.invoiceninja.com/forums/forum/support/" target="_blank">support forum</a> with the design you\'re using.</p>',
     'invoice_due_date' => '支払期日',
@@ -996,6 +996,7 @@ $LANG = array(
     'enable_https' => 'We strongly recommend using HTTPS to accept credit card details online.',
     'quote_issued_to' => 'Quote issued to',
     'show_currency_code' => '通貨コード',
+    'free_year_message' => 'Your account has been upgraded to the pro plan for one year at no cost.',
     'trial_message' => 'Your account will receive a free two week trial of our pro plan.',
     'trial_footer' => 'Your free pro plan trial lasts :count more days, :link to upgrade now.',
     'trial_footer_last_day' => 'This is the last day of your free pro plan trial, :link to upgrade now.',
@@ -1016,7 +1017,7 @@ $LANG = array(
     'pro_plan_remove_logo' => 'プロプランに加入して、Invoice Ninjaのロゴを消す。 :link',
     'pro_plan_remove_logo_link' => 'こちらをクリック',
     'invitation_status_sent' => 'sent',
-    'invitation_status_opened' => 'Openend',
+    'invitation_status_opened' => 'Opened',
     'invitation_status_viewed' => 'Viewed',
     'email_error_inactive_client' => 'Emails can not be sent to inactive clients',
     'email_error_inactive_contact' => 'Emails can not be sent to inactive contacts',
@@ -1412,6 +1413,7 @@ $LANG = array(
     'payment_type_Swish' => 'Swish',
     'payment_type_Alipay' => 'Alipay',
     'payment_type_Sofort' => 'Sofort',
+    'payment_type_SEPA' => 'SEPA Direct Debit',
 
     // Industries
     'industry_Accounting & Legal' => 'Accounting & Legal',
@@ -1724,6 +1726,7 @@ $LANG = array(
     'lang_Turkish - Turkey' => 'Turkish - Turkey',
     'lang_Portuguese - Brazilian' => 'Portuguese - Brazilian',
     'lang_Portuguese - Portugal' => 'Portuguese - Portugal',
+    'lang_Thai' => 'Thai',
 
     // Frequencies
     'freq_weekly' => 'Weekly',
@@ -2391,6 +2394,7 @@ $LANG = array(
     'currency_jordanian_dinar' => 'Jordanian Dinar',
     'currency_myanmar_kyat' => 'Myanmar Kyat',
     'currency_peruvian_sol' => 'Peruvian Sol',
+    'currency_botswana_pula' => 'Botswana Pula',
     'review_app_help' => 'We hope you\'re enjoying using the app.<br/>If you\'d consider <a href="http://www.capterra.com/p/145215/Invoice-Ninja/" target="_blank">writing a review</a> we\'d greatly appreciate it!',
 
     'use_english_version' => 'Make sure to use the English version of the files.<br/>We use the column headers to match the fields.',
@@ -2441,11 +2445,43 @@ $LANG = array(
 
     'alipay' => 'Alipay',
     'sofort' => 'Sofort',
+    'sepa' => 'SEPA Direct Debit',
     'enable_alipay' => 'Accept Alipay',
     'enable_sofort' => 'Accept EU bank transfers',
     'stripe_alipay_help' => 'These gateways also need to be activated in :link.',
     'gocardless_webhook_help_link_text' => 'add this URL as an endpoint in GoCardless',
+    'calendar' => 'Calendar',
+    'pro_plan_calendar' => ':link to enable the calendar by joining the Pro Plan',
 
+    'what_are_you_working_on' => 'What are you working on?',
+    'time_tracker' => 'Time Tracker',
+    'refresh' => 'Refresh',
+    'filter_sort' => 'Filter/Sort',
+    'no_description' => 'No Description',
+    'time_tracker_login' => 'Time Tracker Login',
+    'save_or_discard' => 'Save or discard your changes',
+    'discard_changes' => 'Discard Changes',
+    'tasks_not_enabled' => 'Tasks are not enabled.',
+    'started_task' => 'Successfully started task',
+    'create_client' => 'Create Client',
+
+    'download_desktop_app' => 'Download the desktop app',
+    'download_iphone_app' => 'Download the iPhone app',
+    'download_android_app' => 'Download the Android app',
+    'time_tracker_mobile_help' => 'Double tap a task to select it',
+    'stopped' => 'Stopped',
+    'ascending' => 'Ascending',
+    'descending' => 'Descending',
+    'sort_field' => 'Sort By',
+    'sort_direction' => 'Direction',
+    'discard' => 'Discard',
+    'time_am' => 'AM',
+    'time_pm' => 'PM',
+    'time_mins' => 'mins',
+    'time_hr' => 'hr',
+    'time_hrs' => 'hrs',
+    'clear' => 'Clear',
+    'warn_payment_gateway' => 'Note: to accept online payments :link to add a payment gateway.',
 );
 
 return $LANG;

resources/lang/lt/texts.php

@@ -60,7 +60,7 @@ $LANG = array(
     'download_pdf' => 'Atsisiųsti PDF',
     'pay_now' => 'Apmokėti dabar',
     'save_invoice' => 'Išsaugoti sąskaitą',
-    'clone_invoice' => 'Kopijuoti sąskaitą',
+    'clone_invoice' => 'Clone To Invoice',
     'archive_invoice' => 'Archyvuoti sąskaitą',
     'delete_invoice' => 'Ištrinti sąskaitą',
     'email_invoice' => 'Išsiųsti el. paštu sąskaitą',
@@ -323,7 +323,7 @@ $LANG = array(
     'delete_quote' => 'Delete Quote',
     'save_quote' => 'Save Quote',
     'email_quote' => 'Email Quote',
-    'clone_quote' => 'Clone Quote',
+    'clone_quote' => 'Clone To Quote',
     'convert_to_invoice' => 'Convert to Invoice',
     'view_invoice' => 'Rodyti sąskaitą',
     'view_client' => 'Rodyti klientą',
@@ -655,7 +655,7 @@ $LANG = array(
     'created_by_invoice' => 'Sukurta :invoice',
     'primary_user' => 'Primary User',
     'help' => 'Pagalba',
-    'customize_help' => '<p>We use <a href="http://pdfmake.org/" target="_blank">pdfmake</a> to define the invoice designs declaratively. The pdfmake <a href="http://pdfmake.org/playground.html" target="_blank">playground</a> provide\'s a great way to see the library in action.</p>
+    'customize_help' => '<p>We use <a href="http://pdfmake.org/" target="_blank">pdfmake</a> to define the invoice designs declaratively. The pdfmake <a href="http://pdfmake.org/playground.html" target="_blank">playground</a> provides a great way to see the library in action.</p>
                         <p>You can access a child property using dot notation. For example to show the client name you could use <code>$client.name</code>.</p>
                         <p>If you need help figuring something out post a question to our <a href="https://www.invoiceninja.com/forums/forum/support/" target="_blank">support forum</a> with the design you\'re using.</p>',
     'invoice_due_date' => 'Terminas',
@@ -996,6 +996,7 @@ $LANG = array(
     'enable_https' => 'We strongly recommend using HTTPS to accept credit card details online.',
     'quote_issued_to' => 'Quote issued to',
     'show_currency_code' => 'Valiutos kodas',
+    'free_year_message' => 'Your account has been upgraded to the pro plan for one year at no cost.',
     'trial_message' => 'Your account will receive a free two week trial of our pro plan.',
     'trial_footer' => 'Your free pro plan trial lasts :count more days, :link to upgrade now.',
     'trial_footer_last_day' => 'This is the last day of your free pro plan trial, :link to upgrade now.',
@@ -1016,7 +1017,7 @@ $LANG = array(
     'pro_plan_remove_logo' => ':link to remove the Invoice Ninja logo by joining the Pro Plan',
     'pro_plan_remove_logo_link' => 'Click here',
     'invitation_status_sent' => 'sent',
-    'invitation_status_opened' => 'Openend',
+    'invitation_status_opened' => 'Opened',
     'invitation_status_viewed' => 'Viewed',
     'email_error_inactive_client' => 'Emails can not be sent to inactive clients',
     'email_error_inactive_contact' => 'Emails can not be sent to inactive contacts',
@@ -1412,6 +1413,7 @@ $LANG = array(
     'payment_type_Swish' => 'Swish',
     'payment_type_Alipay' => 'Alipay',
     'payment_type_Sofort' => 'Sofort',
+    'payment_type_SEPA' => 'SEPA Direct Debit',
 
     // Industries
     'industry_Accounting & Legal' => 'Accounting & Legal',
@@ -1724,6 +1726,7 @@ $LANG = array(
     'lang_Turkish - Turkey' => 'Turkish - Turkey',
     'lang_Portuguese - Brazilian' => 'Portuguese - Brazilian',
     'lang_Portuguese - Portugal' => 'Portuguese - Portugal',
+    'lang_Thai' => 'Thai',
 
     // Frequencies
     'freq_weekly' => 'Weekly',
@@ -2391,6 +2394,7 @@ $LANG = array(
     'currency_jordanian_dinar' => 'Jordanian Dinar',
     'currency_myanmar_kyat' => 'Myanmar Kyat',
     'currency_peruvian_sol' => 'Peruvian Sol',
+    'currency_botswana_pula' => 'Botswana Pula',
     'review_app_help' => 'We hope you\'re enjoying using the app.<br/>If you\'d consider <a href="http://www.capterra.com/p/145215/Invoice-Ninja/" target="_blank">writing a review</a> we\'d greatly appreciate it!',
 
     'use_english_version' => 'Make sure to use the English version of the files.<br/>We use the column headers to match the fields.',
@@ -2441,11 +2445,43 @@ $LANG = array(
 
     'alipay' => 'Alipay',
     'sofort' => 'Sofort',
+    'sepa' => 'SEPA Direct Debit',
     'enable_alipay' => 'Accept Alipay',
     'enable_sofort' => 'Accept EU bank transfers',
     'stripe_alipay_help' => 'These gateways also need to be activated in :link.',
     'gocardless_webhook_help_link_text' => 'add this URL as an endpoint in GoCardless',
+    'calendar' => 'Calendar',
+    'pro_plan_calendar' => ':link to enable the calendar by joining the Pro Plan',
 
+    'what_are_you_working_on' => 'What are you working on?',
+    'time_tracker' => 'Time Tracker',
+    'refresh' => 'Refresh',
+    'filter_sort' => 'Filter/Sort',
+    'no_description' => 'No Description',
+    'time_tracker_login' => 'Time Tracker Login',
+    'save_or_discard' => 'Save or discard your changes',
+    'discard_changes' => 'Discard Changes',
+    'tasks_not_enabled' => 'Tasks are not enabled.',
+    'started_task' => 'Successfully started task',
+    'create_client' => 'Create Client',
+
+    'download_desktop_app' => 'Download the desktop app',
+    'download_iphone_app' => 'Download the iPhone app',
+    'download_android_app' => 'Download the Android app',
+    'time_tracker_mobile_help' => 'Double tap a task to select it',
+    'stopped' => 'Stopped',
+    'ascending' => 'Ascending',
+    'descending' => 'Descending',
+    'sort_field' => 'Sort By',
+    'sort_direction' => 'Direction',
+    'discard' => 'Discard',
+    'time_am' => 'AM',
+    'time_pm' => 'PM',
+    'time_mins' => 'mins',
+    'time_hr' => 'hr',
+    'time_hrs' => 'hrs',
+    'clear' => 'Clear',
+    'warn_payment_gateway' => 'Note: to accept online payments :link to add a payment gateway.',
 );
 
 return $LANG;

resources/lang/nb_NO/texts.php

@@ -60,7 +60,7 @@ $LANG = array(
     'download_pdf' => 'Last ned PDF',
     'pay_now' => 'Betal Nå',
     'save_invoice' => 'Lagre Faktura',
-    'clone_invoice' => 'Kopier Faktura',
+    'clone_invoice' => 'Clone To Invoice',
     'archive_invoice' => 'Arkiver Faktura',
     'delete_invoice' => 'Slett Faktura',
     'email_invoice' => 'E-post Faktura',
@@ -323,7 +323,7 @@ $LANG = array(
     'delete_quote' => 'Slett tilbud',
     'save_quote' => 'Lagre tilbud',
     'email_quote' => 'E-post tilbudet',
-    'clone_quote' => 'Kopier tilbud',
+    'clone_quote' => 'Clone To Quote',
     'convert_to_invoice' => 'Konverter til en faktura',
     'view_invoice' => 'Se faktura',
     'view_client' => 'Vis klient',
@@ -655,7 +655,7 @@ $LANG = array(
     'created_by_invoice' => 'Laget av :invoice',
     'primary_user' => 'Hovedbruker',
     'help' => 'Hjelp',
-    'customize_help' => '<p>We use <a href="http://pdfmake.org/" target="_blank">pdfmake</a> to define the invoice designs declaratively. The pdfmake <a href="http://pdfmake.org/playground.html" target="_blank">playground</a> provide\'s a great way to see the library in action.</p>
+    'customize_help' => '<p>We use <a href="http://pdfmake.org/" target="_blank">pdfmake</a> to define the invoice designs declaratively. The pdfmake <a href="http://pdfmake.org/playground.html" target="_blank">playground</a> provides a great way to see the library in action.</p>
                         <p>You can access a child property using dot notation. For example to show the client name you could use <code>$client.name</code>.</p>
                         <p>If you need help figuring something out post a question to our <a href="https://www.invoiceninja.com/forums/forum/support/" target="_blank">support forum</a> with the design you\'re using.</p>',
     'invoice_due_date' => 'Tidsfrist',
@@ -996,6 +996,7 @@ $LANG = array(
     'enable_https' => 'We strongly recommend using HTTPS to accept credit card details online.',
     'quote_issued_to' => 'Quote issued to',
     'show_currency_code' => 'Currency Code',
+    'free_year_message' => 'Your account has been upgraded to the pro plan for one year at no cost.',
     'trial_message' => 'Your account will receive a free two week trial of our pro plan.',
     'trial_footer' => 'Your free pro plan trial lasts :count more days, :link to upgrade now.',
     'trial_footer_last_day' => 'This is the last day of your free pro plan trial, :link to upgrade now.',
@@ -1016,7 +1017,7 @@ $LANG = array(
     'pro_plan_remove_logo' => ':link for å fjerne Invoice Ninja-logoen, oppgrader til en Pro Plan',
     'pro_plan_remove_logo_link' => 'Klikk her',
     'invitation_status_sent' => 'sent',
-    'invitation_status_opened' => 'Openend',
+    'invitation_status_opened' => 'Opened',
     'invitation_status_viewed' => 'Viewed',
     'email_error_inactive_client' => 'Emails can not be sent to inactive clients',
     'email_error_inactive_contact' => 'Emails can not be sent to inactive contacts',
@@ -1412,6 +1413,7 @@ $LANG = array(
     'payment_type_Swish' => 'Swish',
     'payment_type_Alipay' => 'Alipay',
     'payment_type_Sofort' => 'Sofort',
+    'payment_type_SEPA' => 'SEPA Direct Debit',
 
     // Industries
     'industry_Accounting & Legal' => 'Accounting & Legal',
@@ -1724,6 +1726,7 @@ $LANG = array(
     'lang_Turkish - Turkey' => 'Turkish - Turkey',
     'lang_Portuguese - Brazilian' => 'Portuguese - Brazilian',
     'lang_Portuguese - Portugal' => 'Portuguese - Portugal',
+    'lang_Thai' => 'Thai',
 
     // Frequencies
     'freq_weekly' => 'Weekly',
@@ -2391,6 +2394,7 @@ $LANG = array(
     'currency_jordanian_dinar' => 'Jordanian Dinar',
     'currency_myanmar_kyat' => 'Myanmar Kyat',
     'currency_peruvian_sol' => 'Peruvian Sol',
+    'currency_botswana_pula' => 'Botswana Pula',
     'review_app_help' => 'We hope you\'re enjoying using the app.<br/>If you\'d consider <a href="http://www.capterra.com/p/145215/Invoice-Ninja/" target="_blank">writing a review</a> we\'d greatly appreciate it!',
 
     'use_english_version' => 'Make sure to use the English version of the files.<br/>We use the column headers to match the fields.',
@@ -2441,11 +2445,43 @@ $LANG = array(
 
     'alipay' => 'Alipay',
     'sofort' => 'Sofort',
+    'sepa' => 'SEPA Direct Debit',
     'enable_alipay' => 'Accept Alipay',
     'enable_sofort' => 'Accept EU bank transfers',
     'stripe_alipay_help' => 'These gateways also need to be activated in :link.',
     'gocardless_webhook_help_link_text' => 'add this URL as an endpoint in GoCardless',
+    'calendar' => 'Calendar',
+    'pro_plan_calendar' => ':link to enable the calendar by joining the Pro Plan',
 
+    'what_are_you_working_on' => 'What are you working on?',
+    'time_tracker' => 'Time Tracker',
+    'refresh' => 'Refresh',
+    'filter_sort' => 'Filter/Sort',
+    'no_description' => 'No Description',
+    'time_tracker_login' => 'Time Tracker Login',
+    'save_or_discard' => 'Save or discard your changes',
+    'discard_changes' => 'Discard Changes',
+    'tasks_not_enabled' => 'Tasks are not enabled.',
+    'started_task' => 'Successfully started task',
+    'create_client' => 'Create Client',
+
+    'download_desktop_app' => 'Download the desktop app',
+    'download_iphone_app' => 'Download the iPhone app',
+    'download_android_app' => 'Download the Android app',
+    'time_tracker_mobile_help' => 'Double tap a task to select it',
+    'stopped' => 'Stopped',
+    'ascending' => 'Ascending',
+    'descending' => 'Descending',
+    'sort_field' => 'Sort By',
+    'sort_direction' => 'Direction',
+    'discard' => 'Discard',
+    'time_am' => 'AM',
+    'time_pm' => 'PM',
+    'time_mins' => 'mins',
+    'time_hr' => 'hr',
+    'time_hrs' => 'hrs',
+    'clear' => 'Clear',
+    'warn_payment_gateway' => 'Note: to accept online payments :link to add a payment gateway.',
 );
 
 return $LANG;

resources/lang/nl/texts.php

@@ -60,7 +60,7 @@ $LANG = array(
     'download_pdf' => 'Download PDF',
     'pay_now' => 'Betaal nu',
     'save_invoice' => 'Factuur opslaan',
-    'clone_invoice' => 'Kopieer factuur',
+    'clone_invoice' => 'Clone To Invoice',
     'archive_invoice' => 'Archiveer factuur',
     'delete_invoice' => 'Verwijder factuur',
     'email_invoice' => 'E-mail factuur',
@@ -317,7 +317,7 @@ $LANG = array(
     'delete_quote' => 'Verwijder offerte',
     'save_quote' => 'Bewaar offerte',
     'email_quote' => 'E-mail offerte',
-    'clone_quote' => 'Kloon offerte',
+    'clone_quote' => 'Clone To Quote',
     'convert_to_invoice' => 'Zet om naar factuur',
     'view_invoice' => 'Bekijk factuur',
     'view_client' => 'Bekijk klant',
@@ -649,9 +649,9 @@ $LANG = array(
     'created_by_invoice' => 'Aangemaakt door :invoice',
     'primary_user' => 'Primaire gebruiker',
     'help' => 'Help',
-    'customize_help' => '<p>We gebruiken <a href="http://pdfmake.org/" target="_blank">pdfmake</a> om de factuurontwerpen te definieren. De pdfmake <a href="http://pdfmake.org/playground.html" target="_blank">playground</a> is een interessante manier om de bibliotheek in actie te zien.</p>
-<p>Gebruik puntnotatie om een "dochter eigenschap" te gebruiken. Bijvoorbeeld: om de naam van een klant te tonen gebruik je <code>$client.name</code>.</p>
-<p>Als je ergens hulp bij nodig hebt, stel dan een vraag op ons <a href="https://www.invoiceninja.com/forums/forum/support/" target="_blank">support forum</a>.</p>',
+    'customize_help' => '<p>We use <a href="http://pdfmake.org/" target="_blank">pdfmake</a> to define the invoice designs declaratively. The pdfmake <a href="http://pdfmake.org/playground.html" target="_blank">playground</a> provides a great way to see the library in action.</p>
+                        <p>You can access a child property using dot notation. For example to show the client name you could use <code>$client.name</code>.</p>
+                        <p>If you need help figuring something out post a question to our <a href="https://www.invoiceninja.com/forums/forum/support/" target="_blank">support forum</a> with the design you\'re using.</p>',
     'invoice_due_date' => 'Vervaldatum',
     'quote_due_date' => 'Geldig tot',
     'valid_until' => 'Geldig tot',
@@ -987,6 +987,7 @@ $LANG = array(
     'enable_https' => 'We raden u dringend aan om HTTPS te gebruiken om creditcard informatie digitaal te accepteren.',
     'quote_issued_to' => 'Offerte uitgeschreven voor',
     'show_currency_code' => 'Valutacode',
+    'free_year_message' => 'Your account has been upgraded to the pro plan for one year at no cost.',
     'trial_message' => 'Uw account zal een gratis twee weken durende probeerversie van ons pro plan krijgen.',
     'trial_footer' => 'Uw gratis probeerversie duurt nog :count dagen, :link om direct te upgraden.',
     'trial_footer_last_day' => 'Dit is de laatste dag van uw gratis probeerversie, :link om direct te upgraden.',
@@ -1007,7 +1008,7 @@ $LANG = array(
     'pro_plan_remove_logo' => ':link om het InvoiceNinja logo te verwijderen door het pro plan te nemen',
     'pro_plan_remove_logo_link' => 'Klik hier',
     'invitation_status_sent' => 'sent',
-    'invitation_status_opened' => 'Geopend',
+    'invitation_status_opened' => 'Opened',
     'invitation_status_viewed' => 'Bekenen',
     'email_error_inactive_client' => 'E-mails kunnen niet worden verstuurd naar inactieve klanten',
     'email_error_inactive_contact' => 'E-mails kunnen niet worden verstuurd naar inactieve contactpersonen',
@@ -1403,6 +1404,7 @@ Kom terug naar deze betalingsmethode pagina zodra u de bedragen heeft ontvangen
     'payment_type_Swish' => 'Swish',
     'payment_type_Alipay' => 'Alipay',
     'payment_type_Sofort' => 'Sofort',
+    'payment_type_SEPA' => 'SEPA Direct Debit',
 
     // Industries
     'industry_Accounting & Legal' => 'Boekhouding & juridisch',
@@ -1716,6 +1718,7 @@ Kom terug naar deze betalingsmethode pagina zodra u de bedragen heeft ontvangen
     'lang_Turkish - Turkey' => 'Turks - Turkije',
     'lang_Portuguese - Brazilian' => 'Portugees - Braziliaans',
     'lang_Portuguese - Portugal' => 'Portugees - Portugal',
+    'lang_Thai' => 'Thai',
 
     // Frequencies
     'freq_weekly' => 'Wekelijks',
@@ -2383,6 +2386,7 @@ Kom terug naar deze betalingsmethode pagina zodra u de bedragen heeft ontvangen
     'currency_jordanian_dinar' => 'Jordaanse Dinar',
     'currency_myanmar_kyat' => 'Myanmar Kyat',
     'currency_peruvian_sol' => 'Peruaanse Sol',
+    'currency_botswana_pula' => 'Botswana Pula',
     'review_app_help' => 'We hope you\'re enjoying using the app.<br/>If you\'d consider <a href="http://www.capterra.com/p/145215/Invoice-Ninja/" target="_blank">writing a review</a> we\'d greatly appreciate it!',
 
     'use_english_version' => 'Zorg ervoor dat u de Engelse versie van de bestanden gebruikt.<br/>We gebruiken de kolomkoppen om de velden aan te passen.',
@@ -2433,11 +2437,43 @@ Kom terug naar deze betalingsmethode pagina zodra u de bedragen heeft ontvangen
 
     'alipay' => 'Alipay',
     'sofort' => 'Sofort',
+    'sepa' => 'SEPA Direct Debit',
     'enable_alipay' => 'Accept Alipay',
     'enable_sofort' => 'Accept EU bank transfers',
     'stripe_alipay_help' => 'These gateways also need to be activated in :link.',
     'gocardless_webhook_help_link_text' => 'add this URL as an endpoint in GoCardless',
+    'calendar' => 'Calendar',
+    'pro_plan_calendar' => ':link to enable the calendar by joining the Pro Plan',
 
+    'what_are_you_working_on' => 'What are you working on?',
+    'time_tracker' => 'Time Tracker',
+    'refresh' => 'Refresh',
+    'filter_sort' => 'Filter/Sort',
+    'no_description' => 'No Description',
+    'time_tracker_login' => 'Time Tracker Login',
+    'save_or_discard' => 'Save or discard your changes',
+    'discard_changes' => 'Discard Changes',
+    'tasks_not_enabled' => 'Tasks are not enabled.',
+    'started_task' => 'Successfully started task',
+    'create_client' => 'Create Client',
+
+    'download_desktop_app' => 'Download the desktop app',
+    'download_iphone_app' => 'Download the iPhone app',
+    'download_android_app' => 'Download the Android app',
+    'time_tracker_mobile_help' => 'Double tap a task to select it',
+    'stopped' => 'Stopped',
+    'ascending' => 'Ascending',
+    'descending' => 'Descending',
+    'sort_field' => 'Sort By',
+    'sort_direction' => 'Direction',
+    'discard' => 'Discard',
+    'time_am' => 'AM',
+    'time_pm' => 'PM',
+    'time_mins' => 'mins',
+    'time_hr' => 'hr',
+    'time_hrs' => 'hrs',
+    'clear' => 'Clear',
+    'warn_payment_gateway' => 'Note: to accept online payments :link to add a payment gateway.',
 );
 
 return $LANG;

resources/lang/pl/texts.php

@@ -60,7 +60,7 @@ $LANG = array(
     'download_pdf' => 'Pobierz PDF',
     'pay_now' => 'Zapłać teraz',
     'save_invoice' => 'Zapisz fakturę',
-    'clone_invoice' => 'Skopiuj fakturę',
+    'clone_invoice' => 'Clone To Invoice',
     'archive_invoice' => 'Zarchiwizuj fakturę',
     'delete_invoice' => 'Usuń fakturę',
     'email_invoice' => 'Wyślij fakturę',
@@ -323,7 +323,7 @@ $LANG = array(
     'delete_quote' => 'Usuń ofertę',
     'save_quote' => 'Zapisz ofertę',
     'email_quote' => 'Wyślij ofertę',
-    'clone_quote' => 'Skopiuj ofertę',
+    'clone_quote' => 'Clone To Quote',
     'convert_to_invoice' => 'Konwertuj do faktury',
     'view_invoice' => 'Zobacz fakturę',
     'view_client' => 'Zobacz klienta',
@@ -655,7 +655,7 @@ $LANG = array(
     'created_by_invoice' => 'Utworzona przez :invoice',
     'primary_user' => 'Główny użytkownik',
     'help' => 'Pomoc',
-    'customize_help' => '<p>We use <a href="http://pdfmake.org/" target="_blank">pdfmake</a> to define the invoice designs declaratively. The pdfmake <a href="http://pdfmake.org/playground.html" target="_blank">playground</a> provide\'s a great way to see the library in action.</p>
+    'customize_help' => '<p>We use <a href="http://pdfmake.org/" target="_blank">pdfmake</a> to define the invoice designs declaratively. The pdfmake <a href="http://pdfmake.org/playground.html" target="_blank">playground</a> provides a great way to see the library in action.</p>
                         <p>You can access a child property using dot notation. For example to show the client name you could use <code>$client.name</code>.</p>
                         <p>If you need help figuring something out post a question to our <a href="https://www.invoiceninja.com/forums/forum/support/" target="_blank">support forum</a> with the design you\'re using.</p>',
     'invoice_due_date' => 'Termin Płatności',
@@ -996,6 +996,7 @@ $LANG = array(
     'enable_https' => 'Zalecamy korzystanie z protokołu HTTPS do przetwarzania online danych kart kredytowych.',
     'quote_issued_to' => 'Oferta wydana do',
     'show_currency_code' => 'Kod waluty',
+    'free_year_message' => 'Your account has been upgraded to the pro plan for one year at no cost.',
     'trial_message' => 'Twoje konto otrzyma bezpłatny dwutygodniowy okres próbny naszego pro planu.',
     'trial_footer' => 'Your free pro plan trial lasts :count more days, :link to upgrade now.',
     'trial_footer_last_day' => 'This is the last day of your free pro plan trial, :link to upgrade now.',
@@ -1016,7 +1017,7 @@ $LANG = array(
     'pro_plan_remove_logo' => ':link to remove the Invoice Ninja logo by joining the Pro Plan',
     'pro_plan_remove_logo_link' => 'Kliknij tutaj',
     'invitation_status_sent' => 'sent',
-    'invitation_status_opened' => 'Otwarto',
+    'invitation_status_opened' => 'Opened',
     'invitation_status_viewed' => 'Wyświetlono',
     'email_error_inactive_client' => 'E-maile nie mogą być wysyłane do klientów nieaktywnych',
     'email_error_inactive_contact' => 'E-mail nie może zostać wysłany do nieaktywnych kontaktów',
@@ -1412,6 +1413,7 @@ Gdy przelewy zostaną zaksięgowane na Twoim koncie, wróć do tej strony i klik
     'payment_type_Swish' => 'Swish',
     'payment_type_Alipay' => 'Alipay',
     'payment_type_Sofort' => 'Sofort',
+    'payment_type_SEPA' => 'SEPA Direct Debit',
 
     // Industries
     'industry_Accounting & Legal' => 'Księgowość i prawo',
@@ -1724,6 +1726,7 @@ Gdy przelewy zostaną zaksięgowane na Twoim koncie, wróć do tej strony i klik
     'lang_Turkish - Turkey' => 'Turkish - Turkey',
     'lang_Portuguese - Brazilian' => 'Portuguese - Brazilian',
     'lang_Portuguese - Portugal' => 'Portuguese - Portugal',
+    'lang_Thai' => 'Thai',
 
     // Frequencies
     'freq_weekly' => 'Co tydzień',
@@ -2391,6 +2394,7 @@ Gdy przelewy zostaną zaksięgowane na Twoim koncie, wróć do tej strony i klik
     'currency_jordanian_dinar' => 'Jordanian Dinar',
     'currency_myanmar_kyat' => 'Myanmar Kyat',
     'currency_peruvian_sol' => 'Peruvian Sol',
+    'currency_botswana_pula' => 'Botswana Pula',
     'review_app_help' => 'We hope you\'re enjoying using the app.<br/>If you\'d consider <a href="http://www.capterra.com/p/145215/Invoice-Ninja/" target="_blank">writing a review</a> we\'d greatly appreciate it!',
 
     'use_english_version' => 'Make sure to use the English version of the files.<br/>We use the column headers to match the fields.',
@@ -2441,11 +2445,43 @@ Gdy przelewy zostaną zaksięgowane na Twoim koncie, wróć do tej strony i klik
 
     'alipay' => 'Alipay',
     'sofort' => 'Sofort',
+    'sepa' => 'SEPA Direct Debit',
     'enable_alipay' => 'Accept Alipay',
     'enable_sofort' => 'Accept EU bank transfers',
     'stripe_alipay_help' => 'These gateways also need to be activated in :link.',
     'gocardless_webhook_help_link_text' => 'add this URL as an endpoint in GoCardless',
+    'calendar' => 'Calendar',
+    'pro_plan_calendar' => ':link to enable the calendar by joining the Pro Plan',
 
+    'what_are_you_working_on' => 'What are you working on?',
+    'time_tracker' => 'Time Tracker',
+    'refresh' => 'Refresh',
+    'filter_sort' => 'Filter/Sort',
+    'no_description' => 'No Description',
+    'time_tracker_login' => 'Time Tracker Login',
+    'save_or_discard' => 'Save or discard your changes',
+    'discard_changes' => 'Discard Changes',
+    'tasks_not_enabled' => 'Tasks are not enabled.',
+    'started_task' => 'Successfully started task',
+    'create_client' => 'Create Client',
+
+    'download_desktop_app' => 'Download the desktop app',
+    'download_iphone_app' => 'Download the iPhone app',
+    'download_android_app' => 'Download the Android app',
+    'time_tracker_mobile_help' => 'Double tap a task to select it',
+    'stopped' => 'Stopped',
+    'ascending' => 'Ascending',
+    'descending' => 'Descending',
+    'sort_field' => 'Sort By',
+    'sort_direction' => 'Direction',
+    'discard' => 'Discard',
+    'time_am' => 'AM',
+    'time_pm' => 'PM',
+    'time_mins' => 'mins',
+    'time_hr' => 'hr',
+    'time_hrs' => 'hrs',
+    'clear' => 'Clear',
+    'warn_payment_gateway' => 'Note: to accept online payments :link to add a payment gateway.',
 );
 
 return $LANG;

resources/lang/pt_BR/texts.php

@@ -2,9 +2,9 @@
 
 $LANG = array(
 
-    'organization' => 'Organização',
+    'organization' => 'Empresa',
     'name' => 'Nome',
-    'website' => 'Website',
+    'website' => 'Site',
     'work_phone' => 'Telefone',
     'address' => 'Endereço',
     'address1' => 'Rua',
@@ -14,12 +14,12 @@ $LANG = array(
     'postal_code' => 'CEP',
     'country_id' => 'País',
     'contacts' => 'Contatos',
-    'first_name' => 'Primeiro Nome',
-    'last_name' => 'Último Nome',
+    'first_name' => 'Nome',
+    'last_name' => 'Sobrenome',
     'phone' => 'Telefone',
     'email' => 'E-mail',
     'additional_info' => 'Informações Adicionais',
-    'payment_terms' => 'Condições de Pagamento',
+    'payment_terms' => 'Forma de Pagamento',
     'currency_id' => 'Moeda',
     'size_id' => 'Tamanho',
     'industry_id' => 'Empresa',
@@ -29,20 +29,20 @@ $LANG = array(
     'invoice_date' => 'Data da Fatura',
     'due_date' => 'Data de Vencimento',
     'invoice_number' => 'Número da Fatura',
-    'invoice_number_short' => 'Fatura #',
-    'po_number' => 'Núm. Ordem de Serviço',
-    'po_number_short' => 'OS #',
+    'invoice_number_short' => 'Nº da Fatura',
+    'po_number' => 'Caixa Postal',
+    'po_number_short' => 'Caixa Postal',
     'frequency_id' => 'Frequência',
     'discount' => 'Desconto',
     'taxes' => 'Taxas',
     'tax' => 'Taxa',
     'item' => 'Item',
     'description' => 'Descrição',
-    'unit_cost' => 'Custo Unitário',
+    'unit_cost' => 'Preço Unitário',
     'quantity' => 'Quantidade',
     'line_total' => 'Total',
     'subtotal' => 'Subtotal',
-    'paid_to_date' => 'Pagamento até a data',
+    'paid_to_date' => 'Pagamentos até o momento',
     'balance_due' => 'Valor',
     'invoice_design_id' => 'Modelo',
     'terms' => 'Condições',
@@ -60,7 +60,7 @@ $LANG = array(
     'download_pdf' => 'Baixar PDF',
     'pay_now' => 'Pagar agora',
     'save_invoice' => 'Salvar Fatura',
-    'clone_invoice' => 'Clonar Fatura',
+    'clone_invoice' => 'Clone To Invoice',
     'archive_invoice' => 'Arquivar Fatura',
     'delete_invoice' => 'Apagar Fatura',
     'email_invoice' => 'Enviar Fatura',
@@ -238,7 +238,7 @@ $LANG = array(
     'confirmation_subject' => 'Confirmação de Conta do Invoice Ninja',
     'confirmation_header' => 'Confirmação de Conta',
     'confirmation_message' => 'Favor acessar o link abaixo para confirmar a sua conta.',
-    'invoice_subject' => 'New invoice :number from :account',
+    'invoice_subject' => 'Nova fatura :numer de :account',
     'invoice_message' => 'Para visualizar a sua fatura de :amount, clique no link abaixo.',
     'payment_subject' => 'Recebimento de pagamento de',
     'payment_message' => 'Obrigado, pagamento de :amount confirmado',
@@ -317,7 +317,7 @@ $LANG = array(
     'delete_quote' => 'Deletar Orçamento',
     'save_quote' => 'Salvar Oçamento',
     'email_quote' => 'Enviar Orçamento',
-    'clone_quote' => 'Clonar Orçamento',
+    'clone_quote' => 'Clone To Quote',
     'convert_to_invoice' => 'Faturar Orçamento',
     'view_invoice' => 'Visualizar fatura',
     'view_client' => 'Visualizar Cliente',
@@ -331,7 +331,7 @@ $LANG = array(
     'deleted_quote' => 'Orçamento deletado',
     'deleted_quotes' => ':count Orçamento(s) deletado(s)',
     'converted_to_invoice' => 'Orçamento faturado',
-    'quote_subject' => 'New quote :number from :account',
+    'quote_subject' => 'Novo orçamento :number de :account',
     'quote_message' => 'Para visualizar o oçamento de :amount, clique no link abaixo.',
     'quote_link_message' => 'Para visualizar o orçamento clique no link abaixo',
     'notification_quote_sent_subject' => 'Orçamento :invoice enviado para :client',
@@ -649,7 +649,7 @@ $LANG = array(
     'created_by_invoice' => 'Criada a partir da Fatura :invoice',
     'primary_user' => 'Usuário Principal',
     'help' => 'Ajuda',
-    'customize_help' => '<p>Utilizamos<a href="http://pdfmake.org/" target="_blank">pdfmake</a> configuração visual das faturas. O pdfmake <a href="http://pdfmake.org/playground.html" target="_blank">playground</a> permite visualizar e testar as configurações .</p>
+    'customize_help' => '<p>We use <a href="http://pdfmake.org/" target="_blank">pdfmake</a> to define the invoice designs declaratively. The pdfmake <a href="http://pdfmake.org/playground.html" target="_blank">playground</a> provides a great way to see the library in action.</p>
                         <p>You can access a child property using dot notation. For example to show the client name you could use <code>$client.name</code>.</p>
                         <p>If you need help figuring something out post a question to our <a href="https://www.invoiceninja.com/forums/forum/support/" target="_blank">support forum</a> with the design you\'re using.</p>',
     'invoice_due_date' => 'Data de vencimento',
@@ -987,6 +987,7 @@ $LANG = array(
     'enable_https' => 'Recomendamos a utilização de HTTPS para receber os detalhes do cartão de crédito online.',
     'quote_issued_to' => 'Orçamento emitido para',
     'show_currency_code' => 'Código da Moeda',
+    'free_year_message' => 'Your account has been upgraded to the pro plan for one year at no cost.',
     'trial_message' => 'Sua conta receberá duas semanas receberá duas semanas gratuitamente para testar nosso plano pro.',
     'trial_footer' => 'Your free pro plan trial lasts :count more days, :link to upgrade now.',
     'trial_footer_last_day' => 'This is the last day of your free pro plan trial, :link to upgrade now.',
@@ -1007,7 +1008,7 @@ $LANG = array(
     'pro_plan_remove_logo' => ':link para remover a logo do Invoice Ninja contratando o plano profissional',
     'pro_plan_remove_logo_link' => 'Clique aqui',
     'invitation_status_sent' => 'enviado',
-    'invitation_status_opened' => 'Aberto',
+    'invitation_status_opened' => 'Opened',
     'invitation_status_viewed' => 'Visto',
     'email_error_inactive_client' => 'Não é possível enviar e-mails para clientes intativos',
     'email_error_inactive_contact' => 'Não é possível enviar e-mails para contatos intativos',
@@ -1403,6 +1404,7 @@ Quando tiver os valores dos depósitos, volte a esta pagina e complete a verific
     'payment_type_Swish' => 'Swish',
     'payment_type_Alipay' => 'Alipay',
     'payment_type_Sofort' => 'Sofort',
+    'payment_type_SEPA' => 'SEPA Direct Debit',
 
     // Industries
     'industry_Accounting & Legal' => 'Accounting & Legal',
@@ -1715,6 +1717,7 @@ Quando tiver os valores dos depósitos, volte a esta pagina e complete a verific
     'lang_Turkish - Turkey' => 'Turkish - Turkey',
     'lang_Portuguese - Brazilian' => 'Portuguese - Brazilian',
     'lang_Portuguese - Portugal' => 'Portuguese - Portugal',
+    'lang_Thai' => 'Thai',
 
     // Frequencies
     'freq_weekly' => 'Weekly',
@@ -2382,6 +2385,7 @@ Quando tiver os valores dos depósitos, volte a esta pagina e complete a verific
     'currency_jordanian_dinar' => 'Jordanian Dinar',
     'currency_myanmar_kyat' => 'Myanmar Kyat',
     'currency_peruvian_sol' => 'Peruvian Sol',
+    'currency_botswana_pula' => 'Botswana Pula',
     'review_app_help' => 'We hope you\'re enjoying using the app.<br/>If you\'d consider <a href="http://www.capterra.com/p/145215/Invoice-Ninja/" target="_blank">writing a review</a> we\'d greatly appreciate it!',
 
     'use_english_version' => 'Make sure to use the English version of the files.<br/>We use the column headers to match the fields.',
@@ -2432,11 +2436,43 @@ Quando tiver os valores dos depósitos, volte a esta pagina e complete a verific
 
     'alipay' => 'Alipay',
     'sofort' => 'Sofort',
+    'sepa' => 'SEPA Direct Debit',
     'enable_alipay' => 'Accept Alipay',
     'enable_sofort' => 'Accept EU bank transfers',
     'stripe_alipay_help' => 'These gateways also need to be activated in :link.',
     'gocardless_webhook_help_link_text' => 'add this URL as an endpoint in GoCardless',
+    'calendar' => 'Calendar',
+    'pro_plan_calendar' => ':link to enable the calendar by joining the Pro Plan',
 
+    'what_are_you_working_on' => 'What are you working on?',
+    'time_tracker' => 'Time Tracker',
+    'refresh' => 'Refresh',
+    'filter_sort' => 'Filter/Sort',
+    'no_description' => 'No Description',
+    'time_tracker_login' => 'Time Tracker Login',
+    'save_or_discard' => 'Save or discard your changes',
+    'discard_changes' => 'Discard Changes',
+    'tasks_not_enabled' => 'Tasks are not enabled.',
+    'started_task' => 'Successfully started task',
+    'create_client' => 'Create Client',
+
+    'download_desktop_app' => 'Download the desktop app',
+    'download_iphone_app' => 'Download the iPhone app',
+    'download_android_app' => 'Download the Android app',
+    'time_tracker_mobile_help' => 'Double tap a task to select it',
+    'stopped' => 'Stopped',
+    'ascending' => 'Ascending',
+    'descending' => 'Descending',
+    'sort_field' => 'Sort By',
+    'sort_direction' => 'Direction',
+    'discard' => 'Discard',
+    'time_am' => 'AM',
+    'time_pm' => 'PM',
+    'time_mins' => 'mins',
+    'time_hr' => 'hr',
+    'time_hrs' => 'hrs',
+    'clear' => 'Clear',
+    'warn_payment_gateway' => 'Note: to accept online payments :link to add a payment gateway.',
 );
 
 return $LANG;

resources/lang/pt_PT/texts.php

@@ -60,7 +60,7 @@ $LANG = array(
     'download_pdf' => 'Download PDF',
     'pay_now' => 'Pagar agora',
     'save_invoice' => 'Guardar Nota Pag.',
-    'clone_invoice' => 'Clonar Nota Pag.',
+    'clone_invoice' => 'Clone To Invoice',
     'archive_invoice' => 'Arquivar Nota Pag.',
     'delete_invoice' => 'Apagar Nota Pag.',
     'email_invoice' => 'Enviar Nota Pag.',
@@ -317,7 +317,7 @@ $LANG = array(
     'delete_quote' => 'Apagar Orçamento',
     'save_quote' => 'Guardar Oçamento',
     'email_quote' => 'Enviar Orçamento',
-    'clone_quote' => 'Clonar Orçamento',
+    'clone_quote' => 'Clone To Quote',
     'convert_to_invoice' => 'Converter em Nota de Pag.',
     'view_invoice' => 'Visualizar nota de pag.',
     'view_client' => 'Visualizar Cliente',
@@ -649,7 +649,7 @@ $LANG = array(
     'created_by_invoice' => 'Criada a partir da Nota de Pagamento :invoice',
     'primary_user' => 'Utilizador Principal',
     'help' => 'Ajuda',
-    'customize_help' => '<p>Utilizamos<a href="http://pdfmake.org/" target="_blank">pdfmake</a> configuração visual das nota de pagamentos. O pdfmake <a href="http://pdfmake.org/playground.html" target="_blank">playground</a> permite visualizar e testar as configurações .</p>
+    'customize_help' => '<p>We use <a href="http://pdfmake.org/" target="_blank">pdfmake</a> to define the invoice designs declaratively. The pdfmake <a href="http://pdfmake.org/playground.html" target="_blank">playground</a> provides a great way to see the library in action.</p>
                         <p>You can access a child property using dot notation. For example to show the client name you could use <code>$client.name</code>.</p>
                         <p>If you need help figuring something out post a question to our <a href="https://www.invoiceninja.com/forums/forum/support/" target="_blank">support forum</a> with the design you\'re using.</p>',
     'invoice_due_date' => 'Data de vencimento',
@@ -987,6 +987,7 @@ $LANG = array(
     'enable_https' => 'Recomendamos a utilização de HTTPS para receber os detalhes do cartão de crédito online.',
     'quote_issued_to' => 'Orçamento emitido para',
     'show_currency_code' => 'Código da Moeda',
+    'free_year_message' => 'Your account has been upgraded to the pro plan for one year at no cost.',
     'trial_message' => 'A sua conta receberá gratuitamente duas semanas para testar nosso plano pro.',
     'trial_footer' => 'Your free pro plan trial lasts :count more days, :link to upgrade now.',
     'trial_footer_last_day' => 'This is the last day of your free pro plan trial, :link to upgrade now.',
@@ -1007,7 +1008,7 @@ $LANG = array(
     'pro_plan_remove_logo' => ':link para remover a logo do Invoice Ninja contratando o plano profissional',
     'pro_plan_remove_logo_link' => 'Clique aqui',
     'invitation_status_sent' => 'sent',
-    'invitation_status_opened' => 'Aberto',
+    'invitation_status_opened' => 'Opened',
     'invitation_status_viewed' => 'Visto',
     'email_error_inactive_client' => 'Não é possível enviar e-mails para clientes inativos',
     'email_error_inactive_contact' => 'Não é possível enviar e-mails para contatos inativos',
@@ -1403,6 +1404,7 @@ Quando tiver os valores dos depósitos, volte a esta página e conclua a verific
     'payment_type_Swish' => 'Swish',
     'payment_type_Alipay' => 'Alipay',
     'payment_type_Sofort' => 'Sofort',
+    'payment_type_SEPA' => 'SEPA Direct Debit',
 
     // Industries
     'industry_Accounting & Legal' => 'Contabilidade & Legislação',
@@ -1715,6 +1717,7 @@ Quando tiver os valores dos depósitos, volte a esta página e conclua a verific
     'lang_Turkish - Turkey' => 'Turkish - Turkey',
     'lang_Portuguese - Brazilian' => 'Portuguese - Brazilian',
     'lang_Portuguese - Portugal' => 'Portuguese - Portugal',
+    'lang_Thai' => 'Thai',
 
     // Frequencies
     'freq_weekly' => 'Semanal',
@@ -2383,6 +2386,7 @@ Quando tiver os valores dos depósitos, volte a esta página e conclua a verific
     'currency_jordanian_dinar' => 'Jordanian Dinar',
     'currency_myanmar_kyat' => 'Myanmar Kyat',
     'currency_peruvian_sol' => 'Peruvian Sol',
+    'currency_botswana_pula' => 'Botswana Pula',
     'review_app_help' => 'We hope you\'re enjoying using the app.<br/>If you\'d consider <a href="http://www.capterra.com/p/145215/Invoice-Ninja/" target="_blank">writing a review</a> we\'d greatly appreciate it!',
 
     'use_english_version' => 'Make sure to use the English version of the files.<br/>We use the column headers to match the fields.',
@@ -2433,11 +2437,43 @@ Quando tiver os valores dos depósitos, volte a esta página e conclua a verific
 
     'alipay' => 'Alipay',
     'sofort' => 'Sofort',
+    'sepa' => 'SEPA Direct Debit',
     'enable_alipay' => 'Accept Alipay',
     'enable_sofort' => 'Accept EU bank transfers',
     'stripe_alipay_help' => 'These gateways also need to be activated in :link.',
     'gocardless_webhook_help_link_text' => 'add this URL as an endpoint in GoCardless',
+    'calendar' => 'Calendar',
+    'pro_plan_calendar' => ':link to enable the calendar by joining the Pro Plan',
 
+    'what_are_you_working_on' => 'What are you working on?',
+    'time_tracker' => 'Time Tracker',
+    'refresh' => 'Refresh',
+    'filter_sort' => 'Filter/Sort',
+    'no_description' => 'No Description',
+    'time_tracker_login' => 'Time Tracker Login',
+    'save_or_discard' => 'Save or discard your changes',
+    'discard_changes' => 'Discard Changes',
+    'tasks_not_enabled' => 'Tasks are not enabled.',
+    'started_task' => 'Successfully started task',
+    'create_client' => 'Create Client',
+
+    'download_desktop_app' => 'Download the desktop app',
+    'download_iphone_app' => 'Download the iPhone app',
+    'download_android_app' => 'Download the Android app',
+    'time_tracker_mobile_help' => 'Double tap a task to select it',
+    'stopped' => 'Stopped',
+    'ascending' => 'Ascending',
+    'descending' => 'Descending',
+    'sort_field' => 'Sort By',
+    'sort_direction' => 'Direction',
+    'discard' => 'Discard',
+    'time_am' => 'AM',
+    'time_pm' => 'PM',
+    'time_mins' => 'mins',
+    'time_hr' => 'hr',
+    'time_hrs' => 'hrs',
+    'clear' => 'Clear',
+    'warn_payment_gateway' => 'Note: to accept online payments :link to add a payment gateway.',
 );
 
 return $LANG;

resources/lang/ro/texts.php

@@ -60,7 +60,7 @@ $LANG = array(
     'download_pdf' => 'Descarca PDF',
     'pay_now' => 'Plateste acum',
     'save_invoice' => 'Salveaza factura',
-    'clone_invoice' => 'Dubleaza factura',
+    'clone_invoice' => 'Clone To Invoice',
     'archive_invoice' => 'Arhiveaza factura',
     'delete_invoice' => 'Sterge factura',
     'email_invoice' => 'Trimite email',
@@ -323,7 +323,7 @@ $LANG = array(
     'delete_quote' => 'Sterge Proforma',
     'save_quote' => 'Salveaza Proforma',
     'email_quote' => 'Trimite Proforma',
-    'clone_quote' => 'Multiplică Ofertă',
+    'clone_quote' => 'Clone To Quote',
     'convert_to_invoice' => 'Transformă în Factură',
     'view_invoice' => 'Vizualizare Factură',
     'view_client' => 'Vizualizare Client',
@@ -657,7 +657,7 @@ Atentie: Folosește Legacy API Key, nu Token API',
     'created_by_invoice' => 'Created by :invoice',
     'primary_user' => 'Primary User',
     'help' => 'Help',
-    'customize_help' => '<p>We use <a href="http://pdfmake.org/" target="_blank">pdfmake</a> to define the invoice designs declaratively. The pdfmake <a href="http://pdfmake.org/playground.html" target="_blank">playground</a> provide\'s a great way to see the library in action.</p>
+    'customize_help' => '<p>We use <a href="http://pdfmake.org/" target="_blank">pdfmake</a> to define the invoice designs declaratively. The pdfmake <a href="http://pdfmake.org/playground.html" target="_blank">playground</a> provides a great way to see the library in action.</p>
                         <p>You can access a child property using dot notation. For example to show the client name you could use <code>$client.name</code>.</p>
                         <p>If you need help figuring something out post a question to our <a href="https://www.invoiceninja.com/forums/forum/support/" target="_blank">support forum</a> with the design you\'re using.</p>',
     'invoice_due_date' => 'Due Date',
@@ -998,6 +998,7 @@ Atentie: Folosește Legacy API Key, nu Token API',
     'enable_https' => 'We strongly recommend using HTTPS to accept credit card details online.',
     'quote_issued_to' => 'Quote issued to',
     'show_currency_code' => 'Currency Code',
+    'free_year_message' => 'Your account has been upgraded to the pro plan for one year at no cost.',
     'trial_message' => 'Your account will receive a free two week trial of our pro plan.',
     'trial_footer' => 'Your free pro plan trial lasts :count more days, :link to upgrade now.',
     'trial_footer_last_day' => 'This is the last day of your free pro plan trial, :link to upgrade now.',
@@ -1018,7 +1019,7 @@ Atentie: Folosește Legacy API Key, nu Token API',
     'pro_plan_remove_logo' => ':link to remove the Invoice Ninja logo by joining the Pro Plan',
     'pro_plan_remove_logo_link' => 'Click here',
     'invitation_status_sent' => 'sent',
-    'invitation_status_opened' => 'Openend',
+    'invitation_status_opened' => 'Opened',
     'invitation_status_viewed' => 'Viewed',
     'email_error_inactive_client' => 'Emails can not be sent to inactive clients',
     'email_error_inactive_contact' => 'Emails can not be sent to inactive contacts',
@@ -1414,6 +1415,7 @@ Atentie: Folosește Legacy API Key, nu Token API',
     'payment_type_Swish' => 'Swish',
     'payment_type_Alipay' => 'Alipay',
     'payment_type_Sofort' => 'Sofort',
+    'payment_type_SEPA' => 'SEPA Direct Debit',
 
     // Industries
     'industry_Accounting & Legal' => 'Accounting & Legal',
@@ -1726,6 +1728,7 @@ Atentie: Folosește Legacy API Key, nu Token API',
     'lang_Turkish - Turkey' => 'Turkish - Turkey',
     'lang_Portuguese - Brazilian' => 'Portuguese - Brazilian',
     'lang_Portuguese - Portugal' => 'Portuguese - Portugal',
+    'lang_Thai' => 'Thai',
 
     // Frequencies
     'freq_weekly' => 'Săptămânal',
@@ -2393,6 +2396,7 @@ Atentie: Folosește Legacy API Key, nu Token API',
     'currency_jordanian_dinar' => 'Jordanian Dinar',
     'currency_myanmar_kyat' => 'Myanmar Kyat',
     'currency_peruvian_sol' => 'Peruvian Sol',
+    'currency_botswana_pula' => 'Botswana Pula',
     'review_app_help' => 'We hope you\'re enjoying using the app.<br/>If you\'d consider <a href="http://www.capterra.com/p/145215/Invoice-Ninja/" target="_blank">writing a review</a> we\'d greatly appreciate it!',
 
     'use_english_version' => 'Make sure to use the English version of the files.<br/>We use the column headers to match the fields.',
@@ -2443,11 +2447,43 @@ Atentie: Folosește Legacy API Key, nu Token API',
 
     'alipay' => 'Alipay',
     'sofort' => 'Sofort',
+    'sepa' => 'SEPA Direct Debit',
     'enable_alipay' => 'Accept Alipay',
     'enable_sofort' => 'Accept EU bank transfers',
     'stripe_alipay_help' => 'These gateways also need to be activated in :link.',
     'gocardless_webhook_help_link_text' => 'add this URL as an endpoint in GoCardless',
+    'calendar' => 'Calendar',
+    'pro_plan_calendar' => ':link to enable the calendar by joining the Pro Plan',
 
+    'what_are_you_working_on' => 'What are you working on?',
+    'time_tracker' => 'Time Tracker',
+    'refresh' => 'Refresh',
+    'filter_sort' => 'Filter/Sort',
+    'no_description' => 'No Description',
+    'time_tracker_login' => 'Time Tracker Login',
+    'save_or_discard' => 'Save or discard your changes',
+    'discard_changes' => 'Discard Changes',
+    'tasks_not_enabled' => 'Tasks are not enabled.',
+    'started_task' => 'Successfully started task',
+    'create_client' => 'Create Client',
+
+    'download_desktop_app' => 'Download the desktop app',
+    'download_iphone_app' => 'Download the iPhone app',
+    'download_android_app' => 'Download the Android app',
+    'time_tracker_mobile_help' => 'Double tap a task to select it',
+    'stopped' => 'Stopped',
+    'ascending' => 'Ascending',
+    'descending' => 'Descending',
+    'sort_field' => 'Sort By',
+    'sort_direction' => 'Direction',
+    'discard' => 'Discard',
+    'time_am' => 'AM',
+    'time_pm' => 'PM',
+    'time_mins' => 'mins',
+    'time_hr' => 'hr',
+    'time_hrs' => 'hrs',
+    'clear' => 'Clear',
+    'warn_payment_gateway' => 'Note: to accept online payments :link to add a payment gateway.',
 );
 
 return $LANG;

resources/lang/sl/texts.php

@@ -60,7 +60,7 @@ $LANG = array(
     'download_pdf' => 'Prenesi PDF',
     'pay_now' => 'Plačaj Sedaj',
     'save_invoice' => 'Shrani Račun',
-    'clone_invoice' => 'Kloniraj Račun',
+    'clone_invoice' => 'Clone To Invoice',
     'archive_invoice' => 'Arhiviraj Račun',
     'delete_invoice' => 'Zbriši Račun',
     'email_invoice' => 'Pošlji Račun na Email',
@@ -321,7 +321,7 @@ Ne morete najti računa? Potrebujete dodatno pomoč? Z veseljem bomo pomagali. P
     'delete_quote' => 'Odstrani Ponudbo',
     'save_quote' => 'Shrani Ponudbo',
     'email_quote' => 'E-pošlji Ponudbo',
-    'clone_quote' => 'Kloniraj Ponudbo',
+    'clone_quote' => 'Clone To Quote',
     'convert_to_invoice' => 'Pretvori v Račun',
     'view_invoice' => 'Ogled Računa',
     'view_client' => 'Ogled Stranke',
@@ -654,7 +654,7 @@ Prijava v račun',
     'created_by_invoice' => 'Naredil: :invoice',
     'primary_user' => 'Primarni Uporabnik',
     'help' => 'Pomoč',
-    'customize_help' => '<p>We use <a href="http://pdfmake.org/" target="_blank">pdfmake</a> to define the invoice designs declaratively. The pdfmake <a href="http://pdfmake.org/playground.html" target="_blank">playground</a> provide\'s a great way to see the library in action.</p>
+    'customize_help' => '<p>We use <a href="http://pdfmake.org/" target="_blank">pdfmake</a> to define the invoice designs declaratively. The pdfmake <a href="http://pdfmake.org/playground.html" target="_blank">playground</a> provides a great way to see the library in action.</p>
                         <p>You can access a child property using dot notation. For example to show the client name you could use <code>$client.name</code>.</p>
                         <p>If you need help figuring something out post a question to our <a href="https://www.invoiceninja.com/forums/forum/support/" target="_blank">support forum</a> with the design you\'re using.</p>',
     'invoice_due_date' => 'Veljavnost',
@@ -995,6 +995,7 @@ Prijava v račun',
     'enable_https' => 'Pri spletnem sprejemanju kreditnih kartic močno priporočamo uporabo HTTPS.',
     'quote_issued_to' => 'Ponudba izdana za',
     'show_currency_code' => 'Valuta',
+    'free_year_message' => 'Your account has been upgraded to the pro plan for one year at no cost.',
     'trial_message' => 'Vaš račun bo prejel dva tedna brezplačne uporabe našega pro načrta.',
     'trial_footer' => 'Your free pro plan trial lasts :count more days, :link to upgrade now.',
     'trial_footer_last_day' => 'This is the last day of your free pro plan trial, :link to upgrade now.',
@@ -1015,7 +1016,7 @@ Prijava v račun',
     'pro_plan_remove_logo' => ':link za odstranitev logotipa Invoice Ninja z vstopom v Pro Plan',
     'pro_plan_remove_logo_link' => 'Klikni tu',
     'invitation_status_sent' => 'sent',
-    'invitation_status_opened' => 'Odprto',
+    'invitation_status_opened' => 'Opened',
     'invitation_status_viewed' => 'Ogledano',
     'email_error_inactive_client' => 'E-pošte se ne more pošiljati neaktivnim strankam',
     'email_error_inactive_contact' => 'E-pošte se ne more pošiljati neaktivnim kontaktom',
@@ -1413,6 +1414,7 @@ Ko imate zneske, se vrnite na to stran plačilnega sredstva in kliknite na "Comp
     'payment_type_Swish' => 'Swish',
     'payment_type_Alipay' => 'Alipay',
     'payment_type_Sofort' => 'Sofort',
+    'payment_type_SEPA' => 'SEPA Direct Debit',
 
     // Industries
     'industry_Accounting & Legal' => 'Računovodstvo in Pravosodje',
@@ -1726,6 +1728,7 @@ Biotehnologija',
     'lang_Turkish - Turkey' => 'Turkish - Turkey',
     'lang_Portuguese - Brazilian' => 'Portuguese - Brazilian',
     'lang_Portuguese - Portugal' => 'Portuguese - Portugal',
+    'lang_Thai' => 'Thai',
 
     // Frequencies
     'freq_weekly' => 'Tedensko',
@@ -2396,6 +2399,7 @@ Nekaj ​​je šlo narobe',
     'currency_jordanian_dinar' => 'Jordanian Dinar',
     'currency_myanmar_kyat' => 'Myanmar Kyat',
     'currency_peruvian_sol' => 'Peruvian Sol',
+    'currency_botswana_pula' => 'Botswana Pula',
     'review_app_help' => 'We hope you\'re enjoying using the app.<br/>If you\'d consider <a href="http://www.capterra.com/p/145215/Invoice-Ninja/" target="_blank">writing a review</a> we\'d greatly appreciate it!',
 
     'use_english_version' => 'Make sure to use the English version of the files.<br/>We use the column headers to match the fields.',
@@ -2446,11 +2450,43 @@ Nekaj ​​je šlo narobe',
 
     'alipay' => 'Alipay',
     'sofort' => 'Sofort',
+    'sepa' => 'SEPA Direct Debit',
     'enable_alipay' => 'Accept Alipay',
     'enable_sofort' => 'Accept EU bank transfers',
     'stripe_alipay_help' => 'These gateways also need to be activated in :link.',
     'gocardless_webhook_help_link_text' => 'add this URL as an endpoint in GoCardless',
+    'calendar' => 'Calendar',
+    'pro_plan_calendar' => ':link to enable the calendar by joining the Pro Plan',
 
+    'what_are_you_working_on' => 'What are you working on?',
+    'time_tracker' => 'Time Tracker',
+    'refresh' => 'Refresh',
+    'filter_sort' => 'Filter/Sort',
+    'no_description' => 'No Description',
+    'time_tracker_login' => 'Time Tracker Login',
+    'save_or_discard' => 'Save or discard your changes',
+    'discard_changes' => 'Discard Changes',
+    'tasks_not_enabled' => 'Tasks are not enabled.',
+    'started_task' => 'Successfully started task',
+    'create_client' => 'Create Client',
+
+    'download_desktop_app' => 'Download the desktop app',
+    'download_iphone_app' => 'Download the iPhone app',
+    'download_android_app' => 'Download the Android app',
+    'time_tracker_mobile_help' => 'Double tap a task to select it',
+    'stopped' => 'Stopped',
+    'ascending' => 'Ascending',
+    'descending' => 'Descending',
+    'sort_field' => 'Sort By',
+    'sort_direction' => 'Direction',
+    'discard' => 'Discard',
+    'time_am' => 'AM',
+    'time_pm' => 'PM',
+    'time_mins' => 'mins',
+    'time_hr' => 'hr',
+    'time_hrs' => 'hrs',
+    'clear' => 'Clear',
+    'warn_payment_gateway' => 'Note: to accept online payments :link to add a payment gateway.',
 );
 
 return $LANG;

resources/lang/sq/texts.php

@@ -60,7 +60,7 @@ $LANG = array(
     'download_pdf' => 'Shkarko PDF',
     'pay_now' => 'Paguaj Tani',
     'save_invoice' => 'Ruaj faturën',
-    'clone_invoice' => 'Klono faturën',
+    'clone_invoice' => 'Clone To Invoice',
     'archive_invoice' => 'Arkivo faturën',
     'delete_invoice' => 'Fshi faturën',
     'email_invoice' => 'Dërgo faturën me email',
@@ -320,7 +320,7 @@ $LANG = array(
     'delete_quote' => 'Fshi Ofertën',
     'save_quote' => 'Ruaj Ofertën',
     'email_quote' => 'Dërgo me email Ofertën',
-    'clone_quote' => 'Klono Ofertën',
+    'clone_quote' => 'Clone To Quote',
     'convert_to_invoice' => 'Ktheje Ofertën në Faturë',
     'view_invoice' => 'Shiko Faturën',
     'view_client' => 'Shiko Klientin',
@@ -652,9 +652,9 @@ $LANG = array(
     'created_by_invoice' => 'Krijuar nga :invoice',
     'primary_user' => 'Përdoruesi kryesor',
     'help' => 'Ndihmë',
-    'customize_help' => '<p>Ne përdorim <a href="http://pdfmake.org/" target="_blank">pdfmake</a> për të krijuar faturat PDF dhe dizajnin e tyre. pdfmake <a href="http://pdfmake.org/playground.html" target="_blank">playground</a> ofron mundësi të mirë për të parë librarinë në veprim. </p>
-                        <p>Ju mund t\'i qaseni të dhënave duke përdorur kodet. Për shembull për të parë emrin e klientit ju mund të përdorni <code>$client.name</code>.</p>
-                        <p>Nëse ju duhet ndihmë për të qartësuar diçka ose për të bërë ndonjë pytje mund të na shkruani në <a href="https://www.invoiceninja.com/forums/forum/support/" target="_blank">forumin tonë</a> me dizajnin që jeni duke përdorur.</p>',
+    'customize_help' => '<p>We use <a href="http://pdfmake.org/" target="_blank">pdfmake</a> to define the invoice designs declaratively. The pdfmake <a href="http://pdfmake.org/playground.html" target="_blank">playground</a> provides a great way to see the library in action.</p>
+                        <p>You can access a child property using dot notation. For example to show the client name you could use <code>$client.name</code>.</p>
+                        <p>If you need help figuring something out post a question to our <a href="https://www.invoiceninja.com/forums/forum/support/" target="_blank">support forum</a> with the design you\'re using.</p>',
     'invoice_due_date' => 'Deri më datë',
     'quote_due_date' => 'Valide deri',
     'valid_until' => 'Valide deri',
@@ -993,6 +993,7 @@ $LANG = array(
     'enable_https' => 'Ju rekomandojmë të përdorni HTTPS për të pranuar detajet e kredit kartave online.',
     'quote_issued_to' => 'Oferta i është lëshuar',
     'show_currency_code' => 'Kodi i valutës',
+    'free_year_message' => 'Your account has been upgraded to the pro plan for one year at no cost.',
     'trial_message' => 'Llogaria juaj do të pranojë një periudhë testuese dyjavore të Pro planit që ofrojmë.',
     'trial_footer' => 'Your free pro plan trial lasts :count more days, :link to upgrade now.',
     'trial_footer_last_day' => 'This is the last day of your free pro plan trial, :link to upgrade now.',
@@ -1013,7 +1014,7 @@ $LANG = array(
     'pro_plan_remove_logo' => ':link për të larguar Invoice Ninja logo duke iu bashkangjitur Pro Planit',
     'pro_plan_remove_logo_link' => 'Kliko këtu',
     'invitation_status_sent' => 'sent',
-    'invitation_status_opened' => 'Openend',
+    'invitation_status_opened' => 'Opened',
     'invitation_status_viewed' => 'Viewed',
     'email_error_inactive_client' => 'Emailat nuk mund t\'i dërgohen klientëve joaktiv',
     'email_error_inactive_contact' => 'Emailat nuk mund t\'i dërgohen kontakteve joaktiv',
@@ -1410,6 +1411,7 @@ Pasi të keni pranuar shumat, kthehuni në faqen e metodave të pagesës dhe kli
     'payment_type_Swish' => 'Swish',
     'payment_type_Alipay' => 'Alipay',
     'payment_type_Sofort' => 'Sofort',
+    'payment_type_SEPA' => 'SEPA Direct Debit',
 
     // Industries
     'industry_Accounting & Legal' => 'Kontabilitet & Ligjore',
@@ -1722,6 +1724,7 @@ Pasi të keni pranuar shumat, kthehuni në faqen e metodave të pagesës dhe kli
     'lang_Turkish - Turkey' => 'Turkish - Turkey',
     'lang_Portuguese - Brazilian' => 'Portuguese - Brazilian',
     'lang_Portuguese - Portugal' => 'Portuguese - Portugal',
+    'lang_Thai' => 'Thai',
 
     // Frequencies
     'freq_weekly' => 'Javore',
@@ -2389,6 +2392,7 @@ Pasi të keni pranuar shumat, kthehuni në faqen e metodave të pagesës dhe kli
     'currency_jordanian_dinar' => 'Jordanian Dinar',
     'currency_myanmar_kyat' => 'Myanmar Kyat',
     'currency_peruvian_sol' => 'Peruvian Sol',
+    'currency_botswana_pula' => 'Botswana Pula',
     'review_app_help' => 'We hope you\'re enjoying using the app.<br/>If you\'d consider <a href="http://www.capterra.com/p/145215/Invoice-Ninja/" target="_blank">writing a review</a> we\'d greatly appreciate it!',
 
     'use_english_version' => 'Make sure to use the English version of the files.<br/>We use the column headers to match the fields.',
@@ -2439,11 +2443,43 @@ Pasi të keni pranuar shumat, kthehuni në faqen e metodave të pagesës dhe kli
 
     'alipay' => 'Alipay',
     'sofort' => 'Sofort',
+    'sepa' => 'SEPA Direct Debit',
     'enable_alipay' => 'Accept Alipay',
     'enable_sofort' => 'Accept EU bank transfers',
     'stripe_alipay_help' => 'These gateways also need to be activated in :link.',
     'gocardless_webhook_help_link_text' => 'add this URL as an endpoint in GoCardless',
+    'calendar' => 'Calendar',
+    'pro_plan_calendar' => ':link to enable the calendar by joining the Pro Plan',
 
+    'what_are_you_working_on' => 'What are you working on?',
+    'time_tracker' => 'Time Tracker',
+    'refresh' => 'Refresh',
+    'filter_sort' => 'Filter/Sort',
+    'no_description' => 'No Description',
+    'time_tracker_login' => 'Time Tracker Login',
+    'save_or_discard' => 'Save or discard your changes',
+    'discard_changes' => 'Discard Changes',
+    'tasks_not_enabled' => 'Tasks are not enabled.',
+    'started_task' => 'Successfully started task',
+    'create_client' => 'Create Client',
+
+    'download_desktop_app' => 'Download the desktop app',
+    'download_iphone_app' => 'Download the iPhone app',
+    'download_android_app' => 'Download the Android app',
+    'time_tracker_mobile_help' => 'Double tap a task to select it',
+    'stopped' => 'Stopped',
+    'ascending' => 'Ascending',
+    'descending' => 'Descending',
+    'sort_field' => 'Sort By',
+    'sort_direction' => 'Direction',
+    'discard' => 'Discard',
+    'time_am' => 'AM',
+    'time_pm' => 'PM',
+    'time_mins' => 'mins',
+    'time_hr' => 'hr',
+    'time_hrs' => 'hrs',
+    'clear' => 'Clear',
+    'warn_payment_gateway' => 'Note: to accept online payments :link to add a payment gateway.',
 );
 
 return $LANG;