Merge branch 'release-2.6.4'

Conflicts:
	app/Http/Controllers/AccountController.php
	app/Http/routes.php
	app/Models/User.php
	resources/lang/en/texts.php

.env.example

@@ -2,6 +2,7 @@ APP_ENV=production
 APP_DEBUG=false
 APP_URL=http://ninja.dev
 APP_KEY=SomeRandomString
+APP_CIPHER=AES-256-CBC
 
 DB_TYPE=mysql
 DB_STRICT=false

CHANGELOG.md

@@ -2,7 +2,16 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
-## [2.6] - 2016-07-08
+## [Unreleased]
+
+### Added
+- Added 'Buy Now' buttons
+
+### Fixed
+- Setting default tax rate breaks invoice creation #974
+
+
+## [2.6] - 2016-07-12
 
 ### Added
 - Configuration for first day of the week #950
@@ -17,3 +26,4 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 ### Fixed
 - "Manual entry" untranslatable #562
 - Using a database table prefix breaks the dashboard #203
+- Request statically called in StartupCheck.php #977

app/Console/Commands/ChargeRenewalInvoices.php

@@ -5,6 +5,7 @@ use App\Ninja\Mailers\ContactMailer as Mailer;
 use App\Ninja\Repositories\AccountRepository;
 use App\Services\PaymentService;
 use App\Models\Invoice;
+use App\Models\Account;
 
 /**
  * Class ChargeRenewalInvoices
@@ -55,8 +56,8 @@ class ChargeRenewalInvoices extends Command
     {
         $this->info(date('Y-m-d').' ChargeRenewalInvoices...');
 
-        $account = $this->accountRepo->getNinjaAccount();
-        $invoices = Invoice::whereAccountId($account->id)
+        $ninjaAccount = $this->accountRepo->getNinjaAccount();
+        $invoices = Invoice::whereAccountId($ninjaAccount->id)
                         ->whereDueDate(date('Y-m-d'))
                         ->with('client')
                         ->orderBy('id')
@@ -65,6 +66,14 @@ class ChargeRenewalInvoices extends Command
         $this->info(count($invoices).' invoices found');
 
         foreach ($invoices as $invoice) {
+
+            // check if account has switched to free since the invoice was created 
+            $account = Account::find($invoice->client->public_id);
+            $company = $account->company;
+            if ( ! $company->plan || $company->plan == PLAN_FREE) {
+                continue;
+            }
+
             $this->info("Charging invoice {$invoice->invoice_number}");
             $this->paymentService->autoBillInvoice($invoice);
         }

app/Console/Commands/SendRenewalInvoices.php

@@ -53,7 +53,7 @@ class SendRenewalInvoices extends Command
         $companies = Company::whereRaw('datediff(plan_expires, curdate()) = 10')
                         ->orderBy('id')
                         ->get();
-        $this->info(count($companies).' companies found');
+        $this->info(count($companies).' companies found renewing in 10 days');
 
         foreach ($companies as $company) {
             if (!count($company->accounts)) {

app/Http/Controllers/AccountApiController.php

@@ -34,12 +34,12 @@ class AccountApiController extends BaseAPIController
     public function register(RegisterRequest $request)
     {
 
-        $account = $this->accountRepo->create($request->first_name, $request->last_name, $request->email, $request->password);        
+        $account = $this->accountRepo->create($request->first_name, $request->last_name, $request->email, $request->password);
         $user = $account->users()->first();
-        
+
         Auth::login($user, true);
         event(new UserSignedUp());
-        
+
         return $this->processLogin($request);
     }
 
@@ -71,9 +71,8 @@ class AccountApiController extends BaseAPIController
         $account = Auth::user()->account;
         $updatedAt = $request->updated_at ? date('Y-m-d H:i:s', $request->updated_at) : false;
 
-        $account->loadAllData($updatedAt);
-
         $transformer = new AccountTransformer(null, $request->serializer);
+        $account->load($transformer->getDefaultIncludes());
         $account = $this->createItem($account, $transformer, 'account');
 
         return $this->response($account);

app/Http/Controllers/AccountController.php

@@ -25,6 +25,7 @@ use App\Models\Document;
 use App\Models\Gateway;
 use App\Models\InvoiceDesign;
 use App\Models\TaxRate;
+use App\Models\Product;
 use App\Models\PaymentTerm;
 use App\Ninja\Repositories\AccountRepository;
 use App\Ninja\Repositories\ReferralRepository;
@@ -160,126 +161,74 @@ class AccountController extends BaseController
     public function changePlan() {
         $user = Auth::user();
         $account = $user->account;
+        $company = $account->company;
 
         $plan = Input::get('plan');
         $term = Input::get('plan_term');
+        $numUsers = Input::get('num_users');
 
         $planDetails = $account->getPlanDetails(false, false);
 
+        $newPlan = [
+            'plan' => $plan,
+            'term' => $term,
+            'num_users' => $numUsers,
+        ];
+        $newPlan['price'] = Utils::getPlanPrice($newPlan);
         $credit = 0;
-        if ($planDetails) {
-            if ($planDetails['plan'] == PLAN_PRO && $plan == PLAN_ENTERPRISE) {
-                // Upgrade from pro to enterprise
-                if($planDetails['term'] == PLAN_TERM_YEARLY && $term == PLAN_TERM_MONTHLY) {
-                    // Upgrade to yearly for now; switch to monthly in a year
-                    $pending_monthly = true;
-                    $term = PLAN_TERM_YEARLY;
-                }
 
-                $new_plan = [
-                    'plan' => PLAN_ENTERPRISE,
-                    'term' => $term,
-                ];
-            } elseif ($planDetails['plan'] == $plan) {
-                // Term switch
-                if ($planDetails['term'] == PLAN_TERM_YEARLY && $term == PLAN_TERM_MONTHLY) {
-                    $pending_change = [
-                        'plan' => $plan,
-                        'term' => $term
-                    ];
-                } elseif ($planDetails['term'] == PLAN_TERM_MONTHLY && $term == PLAN_TERM_YEARLY
-                    || $planDetails['num_users'] != Input::get('num_users')) {
-                    $new_plan = [
-                        'plan' => $plan,
-                        'term' => $term,
-                    ];
+        if (!empty($planDetails['started']) && $plan == PLAN_FREE) {
+            // Downgrade
+            $refund_deadline = clone $planDetails['started'];
+            $refund_deadline->modify('+30 days');
+
+            if ($plan == PLAN_FREE && $refund_deadline >= date_create()) {
+                if ($payment = $account->company->payment) {
+                    $ninjaAccount = $this->accountRepo->getNinjaAccount();
+                    $paymentDriver = $ninjaAccount->paymentDriver();
+                    $paymentDriver->refundPayment($payment);
+                    Session::flash('message', trans('texts.plan_refunded'));
+                    \Log::info("Refunded Plan Payment: {$account->name} - {$user->email}");
                 } else {
-                    // Cancel the pending change
-                    $account->company->pending_plan = null;
-                    $account->company->pending_term = null;
-                    $account->company->save();
                     Session::flash('message', trans('texts.updated_plan'));
                 }
-            } elseif (!empty($planDetails['started'])) {
-                // Downgrade
-                $refund_deadline = clone $planDetails['started'];
-                $refund_deadline->modify('+30 days');
+            }
+        }
 
-                if ($plan == PLAN_FREE && $refund_deadline >= date_create()) {
-                    // Refund
-                    $account->company->plan = null;
-                    $account->company->plan_term = null;
-                    $account->company->plan_started = null;
-                    $account->company->plan_expires = null;
-                    $account->company->plan_paid = null;
-                    $account->company->pending_plan = null;
-                    $account->company->pending_term = null;
+        if (!empty($planDetails['paid']) && $plan != PLAN_FREE) {
+            $time_used = $planDetails['paid']->diff(date_create());
+            $days_used = $time_used->days;
 
-                    if ($payment = $account->company->payment) {
-                        $ninjaAccount = $this->accountRepo->getNinjaAccount();
-                        $paymentDriver = $ninjaAccount->paymentDriver();
-                        $paymentDriver->refundPayment($payment);
-                        Session::flash('message', trans('texts.plan_refunded'));
-                        \Log::info("Refunded Plan Payment: {$account->name} - {$user->email}");
-                    } else {
-                        Session::flash('message', trans('texts.updated_plan'));
-                    }
-
-                    $account->company->save();
-
-                } else {
-                    $pending_change = [
-                        'plan' => $plan,
-                        'term' => $plan == PLAN_FREE ? null : $term,
-                    ];
-                }
+            if ($time_used->invert) {
+                // They paid in advance
+                $days_used *= -1;
             }
 
-            if (!empty($new_plan) && $new_plan['plan'] != PLAN_FREE) {
-                $time_used = $planDetails['paid']->diff(date_create());
-                $days_used = $time_used->days;
+            $days_total = $planDetails['paid']->diff($planDetails['expires'])->days;
+            $percent_used = $days_used / $days_total;
+            $credit = $planDetails['plan_price'] * (1 - $percent_used);
+        }
 
-                if ($time_used->invert) {
-                    // They paid in advance
-                    $days_used *= -1;
-                }
-
-                $days_total = $planDetails['paid']->diff($planDetails['expires'])->days;
-
-                $percent_used = $days_used / $days_total;
-                $credit = $planDetails['plan_price'] * (1 - $percent_used);
-            }
+        if ($newPlan['price'] > $credit) {
+            $invitation = $this->accountRepo->enablePlan($newPlan, $credit);
+            return Redirect::to('view/' . $invitation->invitation_key);
         } else {
-             $new_plan = [
-                'plan' => $plan,
-                'term' => $term,
-            ];
-        }
 
-        if (!empty($pending_change) && empty($new_plan)) {
-            $pending_change['num_users'] = Input::get('num_users');
-            $account->company->pending_plan = $pending_change['plan'];
-            $account->company->pending_term = $pending_change['term'];
-            $account->company->pending_num_users = $pending_change['num_users'];
-            $account->company->pending_plan_price = Utils::getPlanPrice($pending_change);
-            $account->company->save();
-
-            Session::flash('message', trans('texts.updated_plan'));
-        }
-
-        if (!empty($new_plan) && $new_plan['plan'] != PLAN_FREE) {
-            $new_plan['num_users'] = 1;
-            if ($new_plan['plan'] == PLAN_ENTERPRISE) {
-                $new_plan['num_users'] = Input::get('num_users');
+            if ($plan != PLAN_FREE) {
+                $company->plan_term = $term;
+                $company->plan_price = $newPlan['price'];
+                $company->num_users = $numUsers;
+                $company->plan_expires = date_create()->modify($term == PLAN_TERM_MONTHLY ? '+1 month' : '+1 year')->format('Y-m-d');
             }
-            $new_plan['price'] = Utils::getPlanPrice($new_plan);
-            $invitation = $this->accountRepo->enablePlan($new_plan, $credit, !empty($pending_monthly));
-            return Redirect::to('view/'.$invitation->invitation_key);
-        }
 
-        return Redirect::to('/settings/'.ACCOUNT_MANAGEMENT, 301);
+            $company->plan = $plan;
+            $company->save();
+
+            return Redirect::to('settings/account_management');
+        }
     }
 
+
     /**
      * @param $entityType
      * @param $visible
@@ -714,6 +663,14 @@ class AccountController extends BaseController
             );
         }
 
+        $types = [GATEWAY_TYPE_CREDIT_CARD, GATEWAY_TYPE_BANK_TRANSFER, GATEWAY_TYPE_PAYPAL, GATEWAY_TYPE_BITCOIN, GATEWAY_TYPE_DWOLLA];
+        $options = [];
+        foreach ($types as $type) {
+            if ($account->getGatewayByType($type)) {
+                $options[$type] = trans("texts.{$type}");
+            }
+        }
+
         $data = [
             'client_view_css' => $css,
             'enable_portal_password' => $account->enable_portal_password,
@@ -721,6 +678,8 @@ class AccountController extends BaseController
             'title' => trans('texts.client_portal'),
             'section' => ACCOUNT_CLIENT_PORTAL,
             'account' => $account,
+            'products' => Product::scope()->orderBy('product_key')->get(),
+            'gateway_types' => $options,
         ];
 
         return View::make('accounts.client_portal', $data);
@@ -816,6 +775,7 @@ class AccountController extends BaseController
         $account->enable_client_portal_dashboard = !!Input::get('enable_client_portal_dashboard');
         $account->enable_portal_password = !!Input::get('enable_portal_password');
         $account->send_portal_password = !!Input::get('send_portal_password');
+        $account->enable_buy_now_buttons = !!Input::get('enable_buy_now_buttons');
 
         // Only allowed for pro Invoice Ninja users or white labeled self-hosted users
         if (Auth::user()->account->hasFeature(FEATURE_CLIENT_PORTAL_CSS)) {
@@ -1408,10 +1368,6 @@ class AccountController extends BaseController
 
             $subject = 'Invoice Ninja - Canceled Account';
 
-            if (Auth::user()->isPaidPro()) {
-                $subject .= ' [PRO]';
-            }
-
             $this->userMailer->sendTo(CONTACT_EMAIL, $email, $name, $subject, 'contact', $data);
         }
 

app/Http/Controllers/AccountGatewayController.php

@@ -87,7 +87,7 @@ class AccountGatewayController extends BaseController
         $accountGatewaysIds = $account->gatewayIds();
         $otherProviders = Input::get('other_providers');
 
-        if ( ! Utils::isNinja() || Gateway::hasStandardGateway($accountGatewaysIds)) {
+        if ( ! Utils::isNinja() || ! env('WEPAY_CLIENT_ID') || Gateway::hasStandardGateway($accountGatewaysIds)) {
             $otherProviders = true;
         }
 
@@ -346,7 +346,6 @@ class AccountGatewayController extends BaseController
 
         $rules = [
             'company_name' => 'required',
-            'description' => 'required',
             'tos_agree' => 'required',
             'first_name' => 'required',
             'last_name' => 'required',
@@ -390,7 +389,7 @@ class AccountGatewayController extends BaseController
 
             $accountDetails = [
                 'name'         => Input::get('company_name'),
-                'description'  => Input::get('description'),
+                'description'  => trans('texts.wepay_account_description'),
                 'theme_object' => json_decode(WEPAY_THEME),
                 'callback_uri' => $accountGateway->getWebhookUrl(),
             ];

app/Http/Controllers/AppController.php

@@ -85,6 +85,7 @@ class AppController extends BaseController
         $_ENV['APP_DEBUG'] = $app['debug'];
         $_ENV['APP_URL'] = $app['url'];
         $_ENV['APP_KEY'] = $app['key'];
+        $_ENV['APP_CIPHER'] = env('APP_CIPHER', 'AES-256-CBC');
         $_ENV['DB_TYPE'] = $dbType;
         $_ENV['DB_HOST'] = $database['type']['host'];
         $_ENV['DB_DATABASE'] = $database['type']['database'];
@@ -277,6 +278,13 @@ class AppController extends BaseController
                 Artisan::call('db:seed', ['--force' => true, '--class' => 'UpdateSeeder']);
                 Event::fire(new UserSettingsChanged());
 
+                // legacy fix: check cipher is in .env file
+                if ( ! env('APP_CIPHER')) {
+                    $fp = fopen(base_path().'/.env', 'a');
+                    fwrite($fp, "\nAPP_CIPHER=rijndael-128");
+                    fclose($fp);
+                }
+
                 // show message with link to Trello board
                 $message = trans('texts.see_whats_new', ['version' => NINJA_VERSION]);
                 $message = link_to(RELEASES_URL, $message, ['target' => '_blank']);

app/Http/Controllers/BaseAPIController.php

@@ -87,16 +87,8 @@ class BaseAPIController extends Controller
 
         $query->with($includes);
 
-        if ($updatedAt = Input::get('updated_at')) {
-            $updatedAt = date('Y-m-d H:i:s', $updatedAt);
-            $query->where(function($query) use ($includes, $updatedAt) {
-                $query->where('updated_at', '>=', $updatedAt);
-                foreach ($includes as $include) {
-                    $query->orWhereHas($include, function($query) use ($updatedAt) {
-                        $query->where('updated_at', '>=', $updatedAt);
-                    });
-                }
-            });
+        if ($updatedAt = intval(Input::get('updated_at'))) {
+            $query->where('updated_at', '>=', date('Y-m-d H:i:s', $updatedAt));
         }
 
         if ($clientPublicId = Input::get('client_id')) {
@@ -147,8 +139,10 @@ class BaseAPIController extends Controller
 
         if (is_a($query, "Illuminate\Database\Eloquent\Builder")) {
             $limit = min(MAX_API_PAGE_SIZE, Input::get('per_page', DEFAULT_API_PAGE_SIZE));
-            $resource = new Collection($query->get(), $transformer, $entityType);
-            $resource->setPaginator(new IlluminatePaginatorAdapter($query->paginate($limit)));
+            $paginator = $query->paginate($limit);
+            $query = $paginator->getCollection();
+            $resource = new Collection($query, $transformer, $entityType);
+            $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
         } else {
             $resource = new Collection($query, $transformer, $entityType);
         }

app/Http/Controllers/OnlinePaymentController.php

@@ -4,14 +4,21 @@ use Session;
 use Input;
 use Utils;
 use View;
+use Auth;
+use URL;
 use Exception;
+use Validator;
 use App\Models\Invitation;
 use App\Models\Account;
 use App\Models\Payment;
+use App\Models\Product;
 use App\Models\PaymentMethod;
 use App\Services\PaymentService;
 use App\Ninja\Mailers\UserMailer;
 use App\Http\Requests\CreateOnlinePaymentRequest;
+use App\Ninja\Repositories\ClientRepository;
+use App\Ninja\Repositories\InvoiceRepository;
+use App\Services\InvoiceService;
 
 /**
  * Class OnlinePaymentController
@@ -28,16 +35,22 @@ class OnlinePaymentController extends BaseController
      */
     protected $userMailer;
 
+    /**
+     * @var InvoiceRepository
+     */
+    protected $invoiceRepo;
+
     /**
      * OnlinePaymentController constructor.
      *
      * @param PaymentService $paymentService
      * @param UserMailer $userMailer
      */
-    public function __construct(PaymentService $paymentService, UserMailer $userMailer)
+    public function __construct(PaymentService $paymentService, UserMailer $userMailer, InvoiceRepository $invoiceRepo)
     {
         $this->paymentService = $paymentService;
         $this->userMailer = $userMailer;
+        $this->invoiceRepo = $invoiceRepo;
     }
 
     /**
@@ -48,8 +61,18 @@ class OnlinePaymentController extends BaseController
      */
     public function showPayment($invitationKey, $gatewayType = false, $sourceId = false)
     {
-        $invitation = Invitation::with('invoice.invoice_items', 'invoice.client.currency', 'invoice.client.account.account_gateways.gateway')
-                        ->where('invitation_key', '=', $invitationKey)->firstOrFail();
+        if ( ! $invitation = $this->invoiceRepo->findInvoiceByInvitation($invitationKey)) {
+            return response()->view('error', [
+                'error' => trans('texts.invoice_not_found'),
+                'hideHeader' => true,
+            ]);
+        }
+
+        if ( ! floatval($invitation->invoice->balance)) {
+            return redirect()->to('view/' . $invitation->invitation_key);
+        }
+
+        $invitation = $invitation->load('invoice.client.account.account_gateways.gateway');
 
         if ( ! $gatewayType) {
             $gatewayType = Session::get($invitation->id . 'gateway_type');
@@ -203,4 +226,58 @@ class OnlinePaymentController extends BaseController
         }
     }
 
+    public function handleBuyNow(ClientRepository $clientRepo, InvoiceService $invoiceService, $gatewayType = false)
+    {
+        $account = Account::whereAccountKey(Input::get('account_key'))->first();
+        $redirectUrl = Input::get('redirect_url', URL::previous());
+
+        if ( ! $account || ! $account->enable_buy_now_buttons || ! $account->hasFeature(FEATURE_BUY_NOW_BUTTONS)) {
+            return redirect()->to("{$redirectUrl}/?error=invalid account");
+        }
+
+        Auth::onceUsingId($account->users[0]->id);
+        $product = Product::scope(Input::get('product_id'))->first();
+
+        if ( ! $product) {
+            return redirect()->to("{$redirectUrl}/?error=invalid product");
+        }
+
+        $rules = [
+            'first_name' => 'string|max:100',
+            'last_name' => 'string|max:100',
+            'email' => 'email|string|max:100',
+        ];
+
+        $validator = Validator::make(Input::all(), $rules);
+        if ($validator->fails()) {
+            return redirect()->to("{$redirectUrl}/?error=" . $validator->errors()->first());
+        }
+
+        $data = [
+            'currency_id' => $account->currency_id,
+            'contact' => Input::all()
+        ];
+        $client = $clientRepo->save($data);
+
+        $data = [
+            'client_id' => $client->id,
+            'invoice_items' => [[
+                'product_key' => $product->product_key,
+                'notes' => $product->notes,
+                'cost' => $product->cost,
+                'qty' => 1,
+                'tax_rate1' => $product->default_tax_rate ? $product->default_tax_rate->rate : 0,
+                'tax_name1' => $product->default_tax_rate ? $product->default_tax_rate->name : '',
+            ]]
+        ];
+        $invoice = $invoiceService->save($data);
+        $invitation = $invoice->invitations[0];
+        $link = $invitation->getLink();
+
+        if ($gatewayType) {
+            return redirect()->to($invitation->getLink('payment') . "/{$gatewayType}");
+        } else {
+            return redirect()->to($invitation->getLink());
+        }
+    }
 }

app/Http/Controllers/UserController.php

@@ -243,9 +243,8 @@ class UserController extends BaseController
             $user->save();
 
             if ($user->public_id) {
-                //Auth::login($user);
+                Auth::logout();
                 $token = Password::getRepository()->create($user);
-
                 return Redirect::to("/password/reset/{$token}");
             } else {
                 if (Auth::check()) {

app/Http/Middleware/StartupCheck.php

@@ -33,12 +33,12 @@ class StartupCheck
         // TRUSTED_PROXIES accepts a comma delimited list of subnets
         // ie, TRUSTED_PROXIES='10.0.0.0/8,172.16.0.0/12,192.168.0.0/16'
         if (isset($_ENV['TRUSTED_PROXIES'])) {
-            Request::setTrustedProxies(array_map('trim', explode(',', env('TRUSTED_PROXIES'))));
+            $request->setTrustedProxies(array_map('trim', explode(',', env('TRUSTED_PROXIES'))));
         }
 
         // Ensure all request are over HTTPS in production
-        if (Utils::requireHTTPS() && !Request::secure()) {
-            return Redirect::secure(Request::path());
+        if (Utils::requireHTTPS() && !$request->secure()) {
+            return Redirect::secure($request->path());
         }
 
         // If the database doens't yet exist we'll skip the rest

app/Http/Middleware/VerifyCsrfToken.php

@@ -30,6 +30,7 @@ class VerifyCsrfToken extends BaseVerifier
         'hook/email_bounced',
         'reseller_stats',
         'payment_hook/*',
+        'buy_now/*',
     ];
 
     /**
@@ -42,7 +43,6 @@ class VerifyCsrfToken extends BaseVerifier
     public function handle($request, Closure $next)
     {
         foreach ($this->openRoutes as $route) {
-
             if ($request->is($route)) {
                 return $next($request);
             }

app/Http/Requests/CreatePaymentAPIRequest.php

@@ -27,14 +27,16 @@ class CreatePaymentAPIRequest extends PaymentRequest
                 'amount' => 'required',
             ];
         }
-        
-        $invoice = Invoice::scope($this->invoice_id)->firstOrFail();
+
+        $invoice = Invoice::scope($this->invoice_id)
+            ->invoices()
+            ->firstOrFail();
 
         $this->merge([
-            'invoice_id' => $invoice->id, 
+            'invoice_id' => $invoice->id,
             'client_id' => $invoice->client->id,
         ]);
-            
+
         $rules = [
             'amount' => "required|less_than:{$invoice->balance}|positive",
         ];

app/Http/Requests/CreatePaymentRequest.php

@@ -22,7 +22,9 @@ class CreatePaymentRequest extends PaymentRequest
     public function rules()
     {
         $input = $this->input();
-        $invoice = Invoice::scope($input['invoice'])->firstOrFail();
+        $invoice = Invoice::scope($input['invoice'])
+            ->invoices()
+            ->firstOrFail();
 
         $rules = [
             'client' => 'required', // TODO: change to client_id once views are updated

app/Http/routes.php

@@ -81,6 +81,7 @@ Route::post('signup/submit', 'AccountController@submitSignup');
 
 Route::get('/auth/{provider}', 'Auth\AuthController@authLogin');
 Route::get('/auth_unlink', 'Auth\AuthController@authUnlink');
+Route::match(['GET', 'POST'], '/buy_now/{gateway_type?}', 'OnlinePaymentController@handleBuyNow');
 
 Route::post('/hook/email_bounced', 'AppController@emailBounced');
 Route::post('/hook/email_opened', 'AppController@emailOpened');
@@ -474,6 +475,7 @@ if (!defined('CONTACT_EMAIL')) {
     define('LOGGED_ERROR_LIMIT', 100);
     define('RANDOM_KEY_LENGTH', 32);
     define('MAX_NUM_USERS', 20);
+    define('MAX_IMPORT_ROWS', 500);
     define('MAX_SUBDOMAIN_LENGTH', 30);
     define('MAX_IFRAME_URL_LENGTH', 250);
     define('MAX_LOGO_FILE_SIZE', 200); // KB
@@ -606,7 +608,7 @@ if (!defined('CONTACT_EMAIL')) {
     define('NINJA_WEB_URL', env('NINJA_WEB_URL', 'https://www.invoiceninja.com'));
     define('NINJA_APP_URL', env('NINJA_APP_URL', 'https://app.invoiceninja.com'));
     define('NINJA_DATE', '2000-01-01');
-    define('NINJA_VERSION', '2.6.3' . env('NINJA_VERSION_SUFFIX'));
+    define('NINJA_VERSION', '2.6.4' . 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'));
@@ -651,7 +653,7 @@ if (!defined('CONTACT_EMAIL')) {
     define('TEST_PASSWORD', 'password');
     define('API_SECRET', 'API_SECRET');
     define('DEFAULT_API_PAGE_SIZE', 15);
-    define('MAX_API_PAGE_SIZE', 100);
+    define('MAX_API_PAGE_SIZE', 500);
 
     define('IOS_PUSH_CERTIFICATE', env('IOS_PUSH_CERTIFICATE', ''));
 
@@ -752,6 +754,7 @@ if (!defined('CONTACT_EMAIL')) {
     define('FEATURE_TASKS', 'tasks');
     define('FEATURE_EXPENSES', 'expenses');
     define('FEATURE_REPORTS', 'reports');
+    define('FEATURE_BUY_NOW_BUTTONS', 'buy_now_buttons');
     define('FEATURE_API', 'api');
     define('FEATURE_CLIENT_PORTAL_PASSWORD', 'client_portal_password');
     define('FEATURE_CUSTOM_URL', 'custom_url');

app/Models/Account.php

@@ -95,8 +95,8 @@ class Account extends Eloquent
         ACCOUNT_CLIENT_PORTAL,
         ACCOUNT_CHARTS_AND_REPORTS,
         ACCOUNT_DATA_VISUALIZATIONS,
-        ACCOUNT_USER_MANAGEMENT,
         ACCOUNT_API_TOKENS,
+        ACCOUNT_USER_MANAGEMENT,
     ];
 
     /**
@@ -998,32 +998,6 @@ class Account extends Eloquent
         $this->save();
     }
 
-    /**
-     * @param null $updatedAt
-     */
-    public function loadAllData($updatedAt = null)
-    {
-        $map = [
-            'users' => [],
-            'clients' => ['contacts'],
-            'invoices' => ['invoice_items', 'user', 'client', 'payments'],
-            'products' => [],
-            'tax_rates' => [],
-            'expenses' => ['client', 'invoice', 'vendor'],
-            'payments' => ['invoice'],
-            'expense_categories' => [],
-        ];
-
-        foreach ($map as $key => $values) {
-            $this->load([$key => function($query) use ($values, $updatedAt) {
-                $query->withTrashed()->with($values);
-                if ($updatedAt) {
-                    $query->where('updated_at', '>=', $updatedAt);
-                }
-            }]);
-        }
-    }
-
     /**
      * @param bool $client
      */
@@ -1170,6 +1144,7 @@ class Account extends Eloquent
             case FEATURE_MORE_INVOICE_DESIGNS:
             case FEATURE_QUOTES:
             case FEATURE_REPORTS:
+            case FEATURE_BUY_NOW_BUTTONS:
             case FEATURE_API:
             case FEATURE_CLIENT_PORTAL_PASSWORD:
             case FEATURE_CUSTOM_URL:
@@ -1265,7 +1240,7 @@ class Account extends Eloquent
         $price = $this->company->plan_price;
         $trial_plan = $this->company->trial_plan;
 
-        if(!$plan && (!$trial_plan || !$include_trial)) {
+        if((!$plan || $plan == PLAN_FREE) && (!$trial_plan || !$include_trial)) {
             return null;
         }
 

app/Models/User.php

@@ -149,14 +149,6 @@ class User extends Model implements AuthenticatableContract, AuthorizableContrac
         return $this->account->hasFeature($feature);
     }
 
-    /**
-     * @return bool
-     */
-    public function isPaidPro()
-    {
-        return $this->isPro($accountDetails) && !$accountDetails['trial'];
-    }
-
     /**
      * @return mixed
      */
@@ -432,7 +424,8 @@ class User extends Model implements AuthenticatableContract, AuthorizableContrac
     }
 
 
-    public function caddAddUsers() {
+    public function caddAddUsers()
+    {
         if ( ! Utils::isNinja()) {
             return true;
         } elseif ( ! $this->hasFeature(FEATURE_USERS)) {

app/Ninja/Datatables/AccountGatewayDatatable.php

@@ -59,14 +59,6 @@ class AccountGatewayDatatable extends EntityDatatable
                 function($model) {
                     return !$model->deleted_at && $model->gateway_id == GATEWAY_WEPAY && !empty($model->resendConfirmationUrl);
                 }
-            ], [
-                uctrans('texts.finish_setup'),
-                function ($model) {
-                    return $model->setupUrl;
-                },
-                function($model) {
-                    return !$model->deleted_at && $model->gateway_id == GATEWAY_WEPAY && !empty($model->setupUrl);
-                }
             ] , [
                 uctrans('texts.edit_gateway'),
                 function ($model) {
@@ -76,7 +68,15 @@ class AccountGatewayDatatable extends EntityDatatable
                     return !$model->deleted_at;
                 }
             ], [
-                uctrans('texts.manage_wepay_account'),
+                uctrans('texts.finish_setup'),
+                function ($model) {
+                    return $model->setupUrl;
+                },
+                function($model) {
+                    return !$model->deleted_at && $model->gateway_id == GATEWAY_WEPAY && !empty($model->setupUrl);
+                }
+            ], [
+                uctrans('texts.manage_account'),
                 function ($model) {
                     $accountGateway = AccountGateway::find($model->id);
                     $endpoint = WEPAY_ENVIRONMENT == WEPAY_STAGE ? 'https://stage.wepay.com/' : 'https://www.wepay.com/';
@@ -88,6 +88,14 @@ class AccountGatewayDatatable extends EntityDatatable
                 function($model) {
                     return !$model->deleted_at && $model->gateway_id == GATEWAY_WEPAY;
                 }
+            ], [
+                uctrans('texts.terms_of_service'),
+                function ($model) {
+                    return 'https://go.wepay.com/terms-of-service-us';
+                },
+                function($model) {
+                    return $model->gateway_id == GATEWAY_WEPAY;
+                }
             ]
         ];
     }

app/Ninja/PaymentDrivers/BasePaymentDriver.php

@@ -227,7 +227,7 @@ class BasePaymentDriver
         $gateway = $this->gateway();
 
         if ($input) {
-            $this->updateAddress();
+            $this->updateClient();
         }
 
         // load or create token
@@ -280,16 +280,31 @@ class BasePaymentDriver
         }
     }
 
-    private function updateAddress()
+    private function updateClient()
     {
         if ( ! $this->isGatewayType(GATEWAY_TYPE_CREDIT_CARD)) {
             return;
         }
 
+        // update the contact info
+        if ( ! $this->contact()->getFullName()) {
+            $this->contact()->first_name = $this->input['first_name'];
+            $this->contact()->last_name = $this->input['last_name'];
+        }
+
+        if ( ! $this->contact()->email) {
+            $this->contact()->email = $this->input['email'];
+        }
+
+        if ($this->contact()->isDirty()) {
+            $this->contact()->save();
+        }
+
         if ( ! $this->accountGateway->show_address || ! $this->accountGateway->update_address) {
             return;
         }
 
+        // update the address info
         $client = $this->client();
         $client->address1 = trim($this->input['address1']);
         $client->address2 = trim($this->input['address2']);
@@ -577,57 +592,49 @@ class BasePaymentDriver
                 if (1 == preg_match('/^Plan - (.+) \((.+)\)$/', $invoice_item->product_key, $matches)) {
                     $plan = strtolower($matches[1]);
                     $term = strtolower($matches[2]);
+                    $price = $invoice_item->cost;
                     if ($plan == PLAN_ENTERPRISE) {
                         preg_match('/###[\d] [\w]* (\d*)/', $invoice_item->notes, $matches);
                         $numUsers = $matches[1];
                     } else {
                         $numUsers = 1;
                     }
-                } elseif ($invoice_item->product_key == 'Pending Monthly') {
-                    $pending_monthly = true;
                 }
             }
 
             if (!empty($plan)) {
                 $account = Account::with('users')->find($invoice->client->public_id);
+                $company = $account->company;
 
                 if(
-                    $account->company->plan != $plan
+                    $company->plan != $plan
                     || DateTime::createFromFormat('Y-m-d', $account->company->plan_expires) >= date_create('-7 days')
                 ) {
                     // Either this is a different plan, or the subscription expired more than a week ago
                     // Reset any grandfathering
-                    $account->company->plan_started = date_create()->format('Y-m-d');
+                    $company->plan_started = date_create()->format('Y-m-d');
                 }
 
                 if (
-                    $account->company->plan == $plan
-                    && $account->company->plan_term == $term
-                    && DateTime::createFromFormat('Y-m-d', $account->company->plan_expires) >= date_create()
+                    $company->plan == $plan
+                    && $company->plan_term == $term
+                    && DateTime::createFromFormat('Y-m-d', $company->plan_expires) >= date_create()
                 ) {
                     // This is a renewal; mark it paid as of when this term expires
-                    $account->company->plan_paid = $account->company->plan_expires;
+                    $company->plan_paid = $company->plan_expires;
                 } else {
-                    $account->company->plan_paid = date_create()->format('Y-m-d');
+                    $company->plan_paid = date_create()->format('Y-m-d');
                 }
 
-                $account->company->payment_id = $payment->id;
-                $account->company->plan = $plan;
-                $account->company->plan_term = $term;
-                $account->company->plan_price = $payment->amount;
-                $account->company->num_users = $numUsers;
-                $account->company->plan_expires = DateTime::createFromFormat('Y-m-d', $account->company->plan_paid)
+                $company->payment_id = $payment->id;
+                $company->plan = $plan;
+                $company->plan_term = $term;
+                $company->plan_price = $price;
+                $company->num_users = $numUsers;
+                $company->plan_expires = DateTime::createFromFormat('Y-m-d', $account->company->plan_paid)
                     ->modify($term == PLAN_TERM_MONTHLY ? '+1 month' : '+1 year')->format('Y-m-d');
 
-                if (!empty($pending_monthly)) {
-                    $account->company->pending_plan = $plan;
-                    $account->company->pending_term = PLAN_TERM_MONTHLY;
-                } else {
-                    $account->company->pending_plan = null;
-                    $account->company->pending_term = null;
-                }
-
-                $account->company->save();
+                $company->save();
             }
         }
 
@@ -708,6 +715,18 @@ class BasePaymentDriver
             }
         }
 
+        // check invoice still has balance
+        if ( ! floatval($this->invoice()->balance)) {
+            throw new Exception(trans('texts.payment_error_code', ['code' => 'NB']));
+        }
+
+        // check this isn't a duplicate transaction reference
+        if (Payment::whereAccountId($this->invitation->account_id)
+                ->whereTransactionReference($ref)
+                ->first()) {
+            throw new Exception(trans('texts.payment_error_code', ['code' => 'DT']));
+        }
+
         return $this->createPayment($ref);
     }
 

app/Ninja/PaymentDrivers/WePayPaymentDriver.php

@@ -53,7 +53,7 @@ class WePayPaymentDriver extends BasePaymentDriver
             $data['transaction_id'] = $transactionId;
         }
 
-        $data['applicationFee'] = $this->calculateApplicationFee($data['amount']);
+        $data['applicationFee'] = (WEPAY_APP_FEE_MULTIPLIER * $data['amount']) + WEPAY_APP_FEE_FIXED;
         $data['feePayer'] = WEPAY_FEE_PAYER;
         $data['callbackUri'] = $this->accountGateway->getWebhookUrl();
 
@@ -191,13 +191,6 @@ class WePayPaymentDriver extends BasePaymentDriver
         return $response->getCode() == 4004;
     }
 
-    private function calculateApplicationFee($amount)
-    {
-        $fee = (WEPAY_APP_FEE_MULTIPLIER * $amount) + WEPAY_APP_FEE_FIXED;
-
-        return floor(min($fee, $amount * 0.2));// Maximum fee is 20% of the amount.
-    }
-
     public function handleWebHook($input)
     {
         $accountGateway = $this->accountGateway;

app/Ninja/Repositories/AccountRepository.php

@@ -13,6 +13,7 @@ use App\Models\Invitation;
 use App\Models\Invoice;
 use App\Models\InvoiceItem;
 use App\Models\Client;
+use App\Models\Credit;
 use App\Models\Language;
 use App\Models\Contact;
 use App\Models\Account;
@@ -202,6 +203,7 @@ class AccountRepository
             ['new_user', '/users/create'],
             ['custom_fields', '/settings/invoice_settings'],
             ['invoice_number', '/settings/invoice_settings'],
+            ['buy_now_buttons', '/settings/client_portal#buyNow']
         ]);
 
         $settings = array_merge(Account::$basicSettings, Account::$advancedSettings);
@@ -228,16 +230,34 @@ class AccountRepository
         return $data;
     }
 
-    public function enablePlan($plan, $credit = 0, $pending_monthly = false)
+    public function enablePlan($plan, $credit = 0)
     {
         $account = Auth::user()->account;
         $client = $this->getNinjaClient($account);
-        $invitation = $this->createNinjaInvoice($client, $account, $plan, $credit, $pending_monthly);
+        $invitation = $this->createNinjaInvoice($client, $account, $plan, $credit);
 
         return $invitation;
     }
 
-    public function createNinjaInvoice($client, $clientAccount, $plan, $credit = 0, $pending_monthly = false)
+    public function createNinjaCredit($client, $amount)
+    {
+        $account = $this->getNinjaAccount();
+
+        $lastCredit = Credit::withTrashed()->whereAccountId($account->id)->orderBy('public_id', 'DESC')->first();
+        $publicId = $lastCredit ? ($lastCredit->public_id + 1) : 1;
+
+        $credit = new Credit();
+        $credit->public_id = $publicId;
+        $credit->account_id = $account->id;
+        $credit->user_id = $account->users()->first()->id;
+        $credit->client_id = $client->id;
+        $credit->amount = $amount;
+        $credit->save();
+
+        return $credit;
+    }
+
+    public function createNinjaInvoice($client, $clientAccount, $plan, $credit = 0)
     {
         $term = $plan['term'];
         $plan_cost = $plan['price'];
@@ -284,19 +304,6 @@ class AccountRepository
         $item->product_key = 'Plan - '.ucfirst($plan).' ('.ucfirst($term).')';
         $invoice->invoice_items()->save($item);
 
-        if ($pending_monthly) {
-            $term_end = $term == PLAN_MONTHLY ? date_create('+1 month') : date_create('+1 year');
-            $pending_monthly_item = InvoiceItem::createNew($invoice);
-            $item->qty = 1;
-            $pending_monthly_item->cost = 0;
-            $pending_monthly_item->notes = trans('texts.plan_pending_monthly', ['date', Utils::dateToString($term_end)]);
-
-            // Don't change this without updating the text in PaymentService->createPayment()
-            $pending_monthly_item->product_key = 'Pending Monthly';
-            $invoice->invoice_items()->save($pending_monthly_item);
-        }
-
-
         $invitation = new Invitation();
         $invitation->account_id = $account->id;
         $invitation->user_id = $account->users()->first()->id;

app/Ninja/Repositories/ActivityRepository.php

@@ -6,6 +6,7 @@ use Utils;
 use Request;
 use App\Models\Activity;
 use App\Models\Client;
+use App\Models\Invitation;
 
 class ActivityRepository
 {

app/Ninja/Transformers/AccountTransformer.php

@@ -13,7 +13,7 @@ class AccountTransformer extends EntityTransformer
     protected $defaultIncludes = [
         'users',
         'products',
-        'taxRates',
+        'tax_rates',
         'expense_categories'
     ];
 

app/Ninja/Transformers/InvitationTransformer.php

@@ -6,6 +6,8 @@ class InvitationTransformer extends EntityTransformer
 {
     public function transform(Invitation $invitation)
     {
+        $invitation->setRelation('account', $this->account);
+
         return [
             'id' => (int) $invitation->public_id,
             'key' => $invitation->getName(),
@@ -15,4 +17,4 @@ class InvitationTransformer extends EntityTransformer
             'viewed_date' => $invitation->sent_date,
         ];
     }
-}
+}

app/Ninja/Transformers/InvoiceItemTransformer.php

@@ -17,8 +17,8 @@ class InvoiceItemTransformer extends EntityTransformer
             'qty' => (float) $item->qty,
             'tax_name1' => $item->tax_name1 ? $item->tax_name1 : '',
             'tax_rate1' => (float) $item->tax_rate1,
-            'tax_name2' => $item->tax_name2 ? $item->tax_name1 : '',
+            'tax_name2' => $item->tax_name2 ? $item->tax_name2 : '',
             'tax_rate2' => (float) $item->tax_rate2,
         ]);
     }
-}
+}

app/Ninja/Transformers/UserAccountTransformer.php

@@ -32,6 +32,7 @@ class UserAccountTransformer extends EntityTransformer
             'token' => $user->account->getToken($user->id, $this->tokenName),
             'default_url' => SITE_URL,
             'logo' => $user->account->logo,
+            'logo_url' => $user->account->getLogoURL(),
         ];
     }
 }

app/Policies/DocumentPolicy.php

@@ -2,7 +2,6 @@
 
 namespace App\Policies;
 
-use App\Models\Document;
 use App\Models\User;
 
 /**

app/Services/ImportService.php

@@ -6,6 +6,7 @@ use Excel;
 use Cache;
 use Exception;
 use Auth;
+use Utils;
 use parsecsv;
 use Session;
 use Validator;
@@ -332,6 +333,10 @@ class ImportService
      */
     private function checkData($entityType, $count)
     {
+        if (Utils::isNinja() && $count > MAX_IMPORT_ROWS) {
+            throw new Exception(trans('texts.limit_import_rows', ['count' => MAX_IMPORT_ROWS]));
+        }
+
         if ($entityType === ENTITY_CLIENT) {
             $this->checkClientCount($count);
         }

app/Services/PaymentService.php

@@ -12,21 +12,6 @@ use App\Ninja\Datatables\PaymentDatatable;
 
 class PaymentService extends BaseService
 {
-    /**
-     * @var DatatableService
-     */
-    protected $datatableService;
-
-    /**
-     * @var PaymentRepository
-     */
-    protected $paymentRepo;
-
-    /**
-     * @var AccountRepository
-     */
-    protected $accountRepo;
-
     /**
      * PaymentService constructor.
      *
@@ -157,5 +142,4 @@ class PaymentService extends BaseService
             return parent::bulk($ids, $action);
         }
     }
-
 }

database/migrations/2016_07_13_083821_add_buy_now_buttons.php

@@ -0,0 +1,55 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddBuyNowButtons extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('accounts', function($table)
+        {
+            $table->boolean('enable_buy_now_buttons')->default(false);
+            $table->dropColumn('invoice_design');
+        });
+
+        Schema::table('datetime_formats', function($table)
+        {
+            $table->dropColumn('label');
+        });
+
+        Schema::table('date_formats', function($table)
+        {
+            $table->dropColumn('label');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('accounts', function($table)
+        {
+            $table->dropColumn('enable_buy_now_buttons');
+            $table->text('invoice_design')->nullable();
+        });
+
+        Schema::table('datetime_formats', function($table)
+        {
+            $table->string('label');
+        });
+
+        Schema::table('date_formats', function($table)
+        {
+            $table->string('label');
+        });
+    }
+}

public/built.js

@@ -30395,7 +30395,11 @@ function populateInvoiceComboboxes(clientId, invoiceId) {
   $clientSelect.append(new Option('', ''));
   for (var i=0; i<clients.length; i++) {
     var client = clients[i];
-    $clientSelect.append(new Option(getClientDisplayName(client), client.public_id));
+    var clientName = getClientDisplayName(client);
+    if (!clientName) {
+        continue;
+    }
+    $clientSelect.append(new Option(clientName, client.public_id));
   }
 
   if (clientId) {
@@ -30419,7 +30423,7 @@ function populateInvoiceComboboxes(clientId, invoiceId) {
     for (var i=0; i<list.length; i++) {
       var invoice = list[i];
       var client = clientMap[invoice.client.public_id];
-      if (!client) continue; // client is deleted/archived
+      if (!client || !getClientDisplayName(client)) continue; // client is deleted/archived
       $invoiceCombobox.append(new Option(invoice.invoice_number + ' - ' + invoice.invoice_status.name + ' - ' +
                 getClientDisplayName(client) + ' - ' + formatMoneyInvoice(invoice.amount, invoice) + ' | ' +
                 formatMoneyInvoice(invoice.balance, invoice),  invoice.public_id));
@@ -31121,7 +31125,7 @@ function GetPdfMake(invoice, javascript, callback) {
     // Add ninja logo to the footer
     var dd = JSON.parse(javascript, jsonCallBack);
     var designId = invoice.invoice_design_id;
-    if (!invoice.features.remove_created_by) {
+    if (!invoice.features.remove_created_by && ! isEdge) {
         var footer = (typeof dd.footer === 'function') ? dd.footer() : dd.footer;
         if (footer) {
             if (footer.hasOwnProperty('columns')) {
@@ -31190,14 +31194,14 @@ NINJA.decodeJavascript = function(invoice, javascript)
     // search/replace variables
     var json = {
         'accountName': account.name || ' ',
-        'accountLogo': window.accountLogo || blankImage,
+        'accountLogo': ( ! isEdge && window.accountLogo) ? window.accountLogo : blankImage,
         'accountDetails': NINJA.accountDetails(invoice),
         'accountAddress': NINJA.accountAddress(invoice),
         'invoiceDetails': NINJA.invoiceDetails(invoice),
         'invoiceDetailsHeight': (NINJA.invoiceDetails(invoice).length * 16) + 16,
         'invoiceLineItems': NINJA.invoiceLines(invoice),
         'invoiceLineItemColumns': NINJA.invoiceColumns(invoice),
-        'invoiceDocuments' : NINJA.invoiceDocuments(invoice),
+        'invoiceDocuments' : isEdge ? [] : NINJA.invoiceDocuments(invoice),
         'quantityWidth': NINJA.quantityWidth(invoice),
         'taxWidth': NINJA.taxWidth(invoice),
         'clientDetails': NINJA.clientDetails(invoice),

public/js/pdf.pdfmake.js

@@ -85,7 +85,7 @@ function GetPdfMake(invoice, javascript, callback) {
     // Add ninja logo to the footer
     var dd = JSON.parse(javascript, jsonCallBack);
     var designId = invoice.invoice_design_id;
-    if (!invoice.features.remove_created_by) {
+    if (!invoice.features.remove_created_by && ! isEdge) {
         var footer = (typeof dd.footer === 'function') ? dd.footer() : dd.footer;
         if (footer) {
             if (footer.hasOwnProperty('columns')) {
@@ -154,14 +154,14 @@ NINJA.decodeJavascript = function(invoice, javascript)
     // search/replace variables
     var json = {
         'accountName': account.name || ' ',
-        'accountLogo': window.accountLogo || blankImage,
+        'accountLogo': ( ! isEdge && window.accountLogo) ? window.accountLogo : blankImage,
         'accountDetails': NINJA.accountDetails(invoice),
         'accountAddress': NINJA.accountAddress(invoice),
         'invoiceDetails': NINJA.invoiceDetails(invoice),
         'invoiceDetailsHeight': (NINJA.invoiceDetails(invoice).length * 16) + 16,
         'invoiceLineItems': NINJA.invoiceLines(invoice),
         'invoiceLineItemColumns': NINJA.invoiceColumns(invoice),
-        'invoiceDocuments' : NINJA.invoiceDocuments(invoice),
+        'invoiceDocuments' : isEdge ? [] : NINJA.invoiceDocuments(invoice),
         'quantityWidth': NINJA.quantityWidth(invoice),
         'taxWidth': NINJA.taxWidth(invoice),
         'clientDetails': NINJA.clientDetails(invoice),

public/js/script.js

@@ -501,7 +501,11 @@ function populateInvoiceComboboxes(clientId, invoiceId) {
   $clientSelect.append(new Option('', ''));
   for (var i=0; i<clients.length; i++) {
     var client = clients[i];
-    $clientSelect.append(new Option(getClientDisplayName(client), client.public_id));
+    var clientName = getClientDisplayName(client);
+    if (!clientName) {
+        continue;
+    }
+    $clientSelect.append(new Option(clientName, client.public_id));
   }
 
   if (clientId) {
@@ -525,7 +529,7 @@ function populateInvoiceComboboxes(clientId, invoiceId) {
     for (var i=0; i<list.length; i++) {
       var invoice = list[i];
       var client = clientMap[invoice.client.public_id];
-      if (!client) continue; // client is deleted/archived
+      if (!client || !getClientDisplayName(client)) continue; // client is deleted/archived
       $invoiceCombobox.append(new Option(invoice.invoice_number + ' - ' + invoice.invoice_status.name + ' - ' +
                 getClientDisplayName(client) + ' - ' + formatMoneyInvoice(invoice.amount, invoice) + ' | ' +
                 formatMoneyInvoice(invoice.balance, invoice),  invoice.public_id));

resources/lang/ca/texts.php

@@ -1,6 +1,7 @@
 <?php
 
 $LANG = array(
+
     'organization' => 'Organization',
     'name' => 'Name',
     'website' => 'Website',
@@ -386,7 +387,7 @@ $LANG = array(
     'gateway_help_1' => ':link to sign up for Authorize.net.',
     'gateway_help_2' => ':link to sign up for Authorize.net.',
     'gateway_help_17' => ':link to get your PayPal API signature.',
-    'gateway_help_27' => ':link to sign up for TwoCheckout.',
+    'gateway_help_27' => ':link to sign up for 2Checkout.com. To ensure payments are tracked set :complete_link as the redirect URL under Account > Site Management in the 2Checkout portal.',
     'more_designs' => 'More designs',
     'more_designs_title' => 'Additional Invoice Designs',
     'more_designs_cloud_header' => 'Go Pro for more invoice designs',
@@ -773,6 +774,8 @@ $LANG = array(
     'activity_35' => ':user created :vendor',
     'activity_36' => ':user created :vendor',
     'activity_37' => ':user created :vendor',
+    'activity_42' => ':user created task ":task"',
+    'activity_43' => ':user updated task ":task"',
     'payment' => 'Payment',
     'system' => 'System',
     'signature' => 'Email Signature',
@@ -992,7 +995,7 @@ $LANG = array(
     'overdue' => 'Overdue',
 
 
-    'white_label_text' => 'Purchase a ONE YEAR white label license for $:price to remove the Invoice Ninja branding from the client portal and help support our project.',
+    'white_label_text' => 'Purchase a ONE YEAR white label license for $:price to remove the Invoice Ninja branding and help support our project.',
     'user_email_footer' => 'To adjust your email notification settings please visit :link',
     'reset_password_footer' => 'If you did not request this password reset please email our support: :email',
     'limit_users' => 'Sorry, this will exceed the limit of :limit users',
@@ -1293,7 +1296,7 @@ $LANG = array(
     'wepay_tos_agree' => 'I agree to the :link.',
     'wepay_tos_link_text' => 'WePay Terms of Service',
     'resend_confirmation_email' => 'Resend Confirmation Email',
-    'manage_wepay_account' => 'Manage WePay Account',
+    'manage_account' => 'Manage Account',
     'action_required' => 'Action Required',
     'finish_setup' => 'Finish Setup',
     'created_wepay_confirmation_required' => 'Please check your email and confirm your email address with WePay.',
@@ -1361,6 +1364,686 @@ $LANG = array(
     'failed_remove_payment_method' => 'Failed to remove the payment method',
     'gateway_exists' => 'This gateway already exists',
     'manual_entry' => 'Manual entry',
+    'start_of_week' => 'First day of the week',
+
+    // Frequencies
+    'freq_weekly' => 'Weekly',
+    'freq_two_weeks' => 'Two weeks',
+    'freq_four_weeks' => 'Four weeks',
+    'freq_monthly' => 'Monthly',
+    'freq_three_months' => 'Three months',
+    'freq_six_months' => 'Six months',
+    'freq_annually' => 'Annually',
+
+    // Payment types
+    'payment_type_Apply Credit' => 'Apply Credit',
+    'payment_type_Bank Transfer' => 'Bank Transfer',
+    'payment_type_Cash' => 'Cash',
+    'payment_type_Debit' => 'Debit',
+    'payment_type_ACH' => 'ACH',
+    'payment_type_Visa Card' => 'Visa Card',
+    'payment_type_MasterCard' => 'MasterCard',
+    'payment_type_American Express' => 'American Express',
+    'payment_type_Discover Card' => 'Discover Card',
+    'payment_type_Diners Card' => 'Diners Card',
+    'payment_type_EuroCard' => 'EuroCard',
+    'payment_type_Nova' => 'Nova',
+    'payment_type_Credit Card Other' => 'Credit Card Other',
+    'payment_type_PayPal' => 'PayPal',
+    'payment_type_Google Wallet' => 'Google Wallet',
+    'payment_type_Check' => 'Check',
+
+    // Industries
+    'industry_Accounting & Legal' => 'Accounting & Legal',
+    'industry_Advertising' => 'Advertising',
+    'industry_Aerospace' => 'Aerospace',
+    'industry_Agriculture' => 'Agriculture',
+    'industry_Automotive' => 'Automotive',
+    'industry_Banking & Finance' => 'Banking & Finance',
+    'industry_Biotechnology' => 'Biotechnology',
+    'industry_Broadcasting' => 'Broadcasting',
+    'industry_Business Services' => 'Business Services',
+    'industry_Commodities & Chemicals' => 'Commodities & Chemicals',
+    'industry_Communications' => 'Communications',
+    'industry_Computers & Hightech' => 'Computers & Hightech',
+    'industry_Defense' => 'Defense',
+    'industry_Energy' => 'Energy',
+    'industry_Entertainment' => 'Entertainment',
+    'industry_Government' => 'Government',
+    'industry_Healthcare & Life Sciences' => 'Healthcare & Life Sciences',
+    'industry_Insurance' => 'Insurance',
+    'industry_Manufacturing' => 'Manufacturing',
+    'industry_Marketing' => 'Marketing',
+    'industry_Media' => 'Media',
+    'industry_Nonprofit & Higher Ed' => 'Nonprofit & Higher Ed',
+    'industry_Pharmaceuticals' => 'Pharmaceuticals',
+    'industry_Professional Services & Consulting' => 'Professional Services & Consulting',
+    'industry_Real Estate' => 'Real Estate',
+    'industry_Retail & Wholesale' => 'Retail & Wholesale',
+    'industry_Sports' => 'Sports',
+    'industry_Transportation' => 'Transportation',
+    'industry_Travel & Luxury' => 'Travel & Luxury',
+    'industry_Other' => 'Other',
+    'industry_Photography' =>'Photography',
+
+    // Countries
+    'country_Afghanistan' => 'Afghanistan',
+    'country_Albania' => 'Albania',
+    'country_Antarctica' => 'Antarctica',
+    'country_Algeria' => 'Algeria',
+    'country_American Samoa' => 'American Samoa',
+    'country_Andorra' => 'Andorra',
+    'country_Angola' => 'Angola',
+    'country_Antigua and Barbuda' => 'Antigua and Barbuda',
+    'country_Azerbaijan' => 'Azerbaijan',
+    'country_Argentina' => 'Argentina',
+    'country_Australia' => 'Australia',
+    'country_Austria' => 'Austria',
+    'country_Bahamas' => 'Bahamas',
+    'country_Bahrain' => 'Bahrain',
+    'country_Bangladesh' => 'Bangladesh',
+    'country_Armenia' => 'Armenia',
+    'country_Barbados' => 'Barbados',
+    'country_Belgium' => 'Belgium',
+    'country_Bermuda' => 'Bermuda',
+    'country_Bhutan' => 'Bhutan',
+    'country_Bolivia, Plurinational State of' => 'Bolivia, Plurinational State of',
+    'country_Bosnia and Herzegovina' => 'Bosnia and Herzegovina',
+    'country_Botswana' => 'Botswana',
+    'country_Bouvet Island' => 'Bouvet Island',
+    'country_Brazil' => 'Brazil',
+    'country_Belize' => 'Belize',
+    'country_British Indian Ocean Territory' => 'British Indian Ocean Territory',
+    'country_Solomon Islands' => 'Solomon Islands',
+    'country_Virgin Islands, British' => 'Virgin Islands, British',
+    'country_Brunei Darussalam' => 'Brunei Darussalam',
+    'country_Bulgaria' => 'Bulgaria',
+    'country_Myanmar' => 'Myanmar',
+    'country_Burundi' => 'Burundi',
+    'country_Belarus' => 'Belarus',
+    'country_Cambodia' => 'Cambodia',
+    'country_Cameroon' => 'Cameroon',
+    'country_Canada' => 'Canada',
+    'country_Cape Verde' => 'Cape Verde',
+    'country_Cayman Islands' => 'Cayman Islands',
+    'country_Central African Republic' => 'Central African Republic',
+    'country_Sri Lanka' => 'Sri Lanka',
+    'country_Chad' => 'Chad',
+    'country_Chile' => 'Chile',
+    'country_China' => 'China',
+    'country_Taiwan, Province of China' => 'Taiwan, Province of China',
+    'country_Christmas Island' => 'Christmas Island',
+    'country_Cocos (Keeling) Islands' => 'Cocos (Keeling) Islands',
+    'country_Colombia' => 'Colombia',
+    'country_Comoros' => 'Comoros',
+    'country_Mayotte' => 'Mayotte',
+    'country_Congo' => 'Congo',
+    'country_Congo, the Democratic Republic of the' => 'Congo, the Democratic Republic of the',
+    'country_Cook Islands' => 'Cook Islands',
+    'country_Costa Rica' => 'Costa Rica',
+    'country_Croatia' => 'Croatia',
+    'country_Cuba' => 'Cuba',
+    'country_Cyprus' => 'Cyprus',
+    'country_Czech Republic' => 'Czech Republic',
+    'country_Benin' => 'Benin',
+    'country_Denmark' => 'Denmark',
+    'country_Dominica' => 'Dominica',
+    'country_Dominican Republic' => 'Dominican Republic',
+    'country_Ecuador' => 'Ecuador',
+    'country_El Salvador' => 'El Salvador',
+    'country_Equatorial Guinea' => 'Equatorial Guinea',
+    'country_Ethiopia' => 'Ethiopia',
+    'country_Eritrea' => 'Eritrea',
+    'country_Estonia' => 'Estonia',
+    'country_Faroe Islands' => 'Faroe Islands',
+    'country_Falkland Islands (Malvinas)' => 'Falkland Islands (Malvinas)',
+    'country_South Georgia and the South Sandwich Islands' => 'South Georgia and the South Sandwich Islands',
+    'country_Fiji' => 'Fiji',
+    'country_Finland' => 'Finland',
+    'country_Åland Islands' => 'Åland Islands',
+    'country_France' => 'France',
+    'country_French Guiana' => 'French Guiana',
+    'country_French Polynesia' => 'French Polynesia',
+    'country_French Southern Territories' => 'French Southern Territories',
+    'country_Djibouti' => 'Djibouti',
+    'country_Gabon' => 'Gabon',
+    'country_Georgia' => 'Georgia',
+    'country_Gambia' => 'Gambia',
+    'country_Palestinian Territory, Occupied' => 'Palestinian Territory, Occupied',
+    'country_Germany' => 'Germany',
+    'country_Ghana' => 'Ghana',
+    'country_Gibraltar' => 'Gibraltar',
+    'country_Kiribati' => 'Kiribati',
+    'country_Greece' => 'Greece',
+    'country_Greenland' => 'Greenland',
+    'country_Grenada' => 'Grenada',
+    'country_Guadeloupe' => 'Guadeloupe',
+    'country_Guam' => 'Guam',
+    'country_Guatemala' => 'Guatemala',
+    'country_Guinea' => 'Guinea',
+    'country_Guyana' => 'Guyana',
+    'country_Haiti' => 'Haiti',
+    'country_Heard Island and McDonald Islands' => 'Heard Island and McDonald Islands',
+    'country_Holy See (Vatican City State)' => 'Holy See (Vatican City State)',
+    'country_Honduras' => 'Honduras',
+    'country_Hong Kong' => 'Hong Kong',
+    'country_Hungary' => 'Hungary',
+    'country_Iceland' => 'Iceland',
+    'country_India' => 'India',
+    'country_Indonesia' => 'Indonesia',
+    'country_Iran, Islamic Republic of' => 'Iran, Islamic Republic of',
+    'country_Iraq' => 'Iraq',
+    'country_Ireland' => 'Ireland',
+    'country_Israel' => 'Israel',
+    'country_Italy' => 'Italy',
+    'country_Côte d\'Ivoire' => 'Côte d\'Ivoire',
+    'country_Jamaica' => 'Jamaica',
+    'country_Japan' => 'Japan',
+    'country_Kazakhstan' => 'Kazakhstan',
+    'country_Jordan' => 'Jordan',
+    'country_Kenya' => 'Kenya',
+    'country_Korea, Democratic People\'s Republic of' => 'Korea, Democratic People\'s Republic of',
+    'country_Korea, Republic of' => 'Korea, Republic of',
+    'country_Kuwait' => 'Kuwait',
+    'country_Kyrgyzstan' => 'Kyrgyzstan',
+    'country_Lao People\'s Democratic Republic' => 'Lao People\'s Democratic Republic',
+    'country_Lebanon' => 'Lebanon',
+    'country_Lesotho' => 'Lesotho',
+    'country_Latvia' => 'Latvia',
+    'country_Liberia' => 'Liberia',
+    'country_Libya' => 'Libya',
+    'country_Liechtenstein' => 'Liechtenstein',
+    'country_Lithuania' => 'Lithuania',
+    'country_Luxembourg' => 'Luxembourg',
+    'country_Macao' => 'Macao',
+    'country_Madagascar' => 'Madagascar',
+    'country_Malawi' => 'Malawi',
+    'country_Malaysia' => 'Malaysia',
+    'country_Maldives' => 'Maldives',
+    'country_Mali' => 'Mali',
+    'country_Malta' => 'Malta',
+    'country_Martinique' => 'Martinique',
+    'country_Mauritania' => 'Mauritania',
+    'country_Mauritius' => 'Mauritius',
+    'country_Mexico' => 'Mexico',
+    'country_Monaco' => 'Monaco',
+    'country_Mongolia' => 'Mongolia',
+    'country_Moldova, Republic of' => 'Moldova, Republic of',
+    'country_Montenegro' => 'Montenegro',
+    'country_Montserrat' => 'Montserrat',
+    'country_Morocco' => 'Morocco',
+    'country_Mozambique' => 'Mozambique',
+    'country_Oman' => 'Oman',
+    'country_Namibia' => 'Namibia',
+    'country_Nauru' => 'Nauru',
+    'country_Nepal' => 'Nepal',
+    'country_Netherlands' => 'Netherlands',
+    'country_Curaçao' => 'Curaçao',
+    'country_Aruba' => 'Aruba',
+    'country_Sint Maarten (Dutch part)' => 'Sint Maarten (Dutch part)',
+    'country_Bonaire, Sint Eustatius and Saba' => 'Bonaire, Sint Eustatius and Saba',
+    'country_New Caledonia' => 'New Caledonia',
+    'country_Vanuatu' => 'Vanuatu',
+    'country_New Zealand' => 'New Zealand',
+    'country_Nicaragua' => 'Nicaragua',
+    'country_Niger' => 'Niger',
+    'country_Nigeria' => 'Nigeria',
+    'country_Niue' => 'Niue',
+    'country_Norfolk Island' => 'Norfolk Island',
+    'country_Norway' => 'Norway',
+    'country_Northern Mariana Islands' => 'Northern Mariana Islands',
+    'country_United States Minor Outlying Islands' => 'United States Minor Outlying Islands',
+    'country_Micronesia, Federated States of' => 'Micronesia, Federated States of',
+    'country_Marshall Islands' => 'Marshall Islands',
+    'country_Palau' => 'Palau',
+    'country_Pakistan' => 'Pakistan',
+    'country_Panama' => 'Panama',
+    'country_Papua New Guinea' => 'Papua New Guinea',
+    'country_Paraguay' => 'Paraguay',
+    'country_Peru' => 'Peru',
+    'country_Philippines' => 'Philippines',
+    'country_Pitcairn' => 'Pitcairn',
+    'country_Poland' => 'Poland',
+    'country_Portugal' => 'Portugal',
+    'country_Guinea-Bissau' => 'Guinea-Bissau',
+    'country_Timor-Leste' => 'Timor-Leste',
+    'country_Puerto Rico' => 'Puerto Rico',
+    'country_Qatar' => 'Qatar',
+    'country_Réunion' => 'Réunion',
+    'country_Romania' => 'Romania',
+    'country_Russian Federation' => 'Russian Federation',
+    'country_Rwanda' => 'Rwanda',
+    'country_Saint Barthélemy' => 'Saint Barthélemy',
+    'country_Saint Helena, Ascension and Tristan da Cunha' => 'Saint Helena, Ascension and Tristan da Cunha',
+    'country_Saint Kitts and Nevis' => 'Saint Kitts and Nevis',
+    'country_Anguilla' => 'Anguilla',
+    'country_Saint Lucia' => 'Saint Lucia',
+    'country_Saint Martin (French part)' => 'Saint Martin (French part)',
+    'country_Saint Pierre and Miquelon' => 'Saint Pierre and Miquelon',
+    'country_Saint Vincent and the Grenadines' => 'Saint Vincent and the Grenadines',
+    'country_San Marino' => 'San Marino',
+    'country_Sao Tome and Principe' => 'Sao Tome and Principe',
+    'country_Saudi Arabia' => 'Saudi Arabia',
+    'country_Senegal' => 'Senegal',
+    'country_Serbia' => 'Serbia',
+    'country_Seychelles' => 'Seychelles',
+    'country_Sierra Leone' => 'Sierra Leone',
+    'country_Singapore' => 'Singapore',
+    'country_Slovakia' => 'Slovakia',
+    'country_Viet Nam' => 'Viet Nam',
+    'country_Slovenia' => 'Slovenia',
+    'country_Somalia' => 'Somalia',
+    'country_South Africa' => 'South Africa',
+    'country_Zimbabwe' => 'Zimbabwe',
+    'country_Spain' => 'Spain',
+    'country_South Sudan' => 'South Sudan',
+    'country_Sudan' => 'Sudan',
+    'country_Western Sahara' => 'Western Sahara',
+    'country_Suriname' => 'Suriname',
+    'country_Svalbard and Jan Mayen' => 'Svalbard and Jan Mayen',
+    'country_Swaziland' => 'Swaziland',
+    'country_Sweden' => 'Sweden',
+    'country_Switzerland' => 'Switzerland',
+    'country_Syrian Arab Republic' => 'Syrian Arab Republic',
+    'country_Tajikistan' => 'Tajikistan',
+    'country_Thailand' => 'Thailand',
+    'country_Togo' => 'Togo',
+    'country_Tokelau' => 'Tokelau',
+    'country_Tonga' => 'Tonga',
+    'country_Trinidad and Tobago' => 'Trinidad and Tobago',
+    'country_United Arab Emirates' => 'United Arab Emirates',
+    'country_Tunisia' => 'Tunisia',
+    'country_Turkey' => 'Turkey',
+    'country_Turkmenistan' => 'Turkmenistan',
+    'country_Turks and Caicos Islands' => 'Turks and Caicos Islands',
+    'country_Tuvalu' => 'Tuvalu',
+    'country_Uganda' => 'Uganda',
+    '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_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_Virgin Islands, U.S.' => 'Virgin Islands, U.S.',
+    'country_Burkina Faso' => 'Burkina Faso',
+    'country_Uruguay' => 'Uruguay',
+    'country_Uzbekistan' => 'Uzbekistan',
+    'country_Venezuela, Bolivarian Republic of' => 'Venezuela, Bolivarian Republic of',
+    'country_Wallis and Futuna' => 'Wallis and Futuna',
+    'country_Samoa' => 'Samoa',
+    'country_Yemen' => 'Yemen',
+    'country_Zambi' => 'Zambi',
+
+    // Languages
+    'lang_Brazilian Portuguese' => 'Brazilian Portuguese',
+    'lang_Croatian' => 'Croatian',
+    'lang_Czech' => 'Czech',
+    'lang_Danish' => 'Danish',
+    'lang_Dutch' => 'Dutch',
+    'lang_English' => 'English',
+    'lang_French' => 'French',
+    'lang_French - Canada' => 'French - Canada',
+    'lang_German' => 'German',
+    'lang_Italian' => 'Italian',
+    'lang_Japanese' => 'Japanese',
+    'lang_Lithuanian' => 'Lithuanian',
+    'lang_Norwegian' => 'Norwegian',
+    'lang_Polish' => 'Polish',
+    'lang_Spanish' => 'Spanish',
+    'lang_Spanish - Spain' => 'Spanish - Spain',
+    'lang_Swedish' => 'Swedish',
+
+    // Frequencies
+    'freq_weekly' => 'Weekly',
+    'freq_two_weeks' => 'Two weeks',
+    'freq_four_weeks' => 'Four weeks',
+    'freq_monthly' => 'Monthly',
+    'freq_three_months' => 'Three months',
+    'freq_six_months' => 'Six months',
+    'freq_annually' => 'Annually',
+
+    // Payment types
+    'payment_type_Apply Credit' => 'Apply Credit',
+    'payment_type_Bank Transfer' => 'Bank Transfer',
+    'payment_type_Cash' => 'Cash',
+    'payment_type_Debit' => 'Debit',
+    'payment_type_ACH' => 'ACH',
+    'payment_type_Visa Card' => 'Visa Card',
+    'payment_type_MasterCard' => 'MasterCard',
+    'payment_type_American Express' => 'American Express',
+    'payment_type_Discover Card' => 'Discover Card',
+    'payment_type_Diners Card' => 'Diners Card',
+    'payment_type_EuroCard' => 'EuroCard',
+    'payment_type_Nova' => 'Nova',
+    'payment_type_Credit Card Other' => 'Credit Card Other',
+    'payment_type_PayPal' => 'PayPal',
+    'payment_type_Google Wallet' => 'Google Wallet',
+    'payment_type_Check' => 'Check',
+
+    // Industries
+    'industry_Accounting & Legal' => 'Accounting & Legal',
+    'industry_Advertising' => 'Advertising',
+    'industry_Aerospace' => 'Aerospace',
+    'industry_Agriculture' => 'Agriculture',
+    'industry_Automotive' => 'Automotive',
+    'industry_Banking & Finance' => 'Banking & Finance',
+    'industry_Biotechnology' => 'Biotechnology',
+    'industry_Broadcasting' => 'Broadcasting',
+    'industry_Business Services' => 'Business Services',
+    'industry_Commodities & Chemicals' => 'Commodities & Chemicals',
+    'industry_Communications' => 'Communications',
+    'industry_Computers & Hightech' => 'Computers & Hightech',
+    'industry_Defense' => 'Defense',
+    'industry_Energy' => 'Energy',
+    'industry_Entertainment' => 'Entertainment',
+    'industry_Government' => 'Government',
+    'industry_Healthcare & Life Sciences' => 'Healthcare & Life Sciences',
+    'industry_Insurance' => 'Insurance',
+    'industry_Manufacturing' => 'Manufacturing',
+    'industry_Marketing' => 'Marketing',
+    'industry_Media' => 'Media',
+    'industry_Nonprofit & Higher Ed' => 'Nonprofit & Higher Ed',
+    'industry_Pharmaceuticals' => 'Pharmaceuticals',
+    'industry_Professional Services & Consulting' => 'Professional Services & Consulting',
+    'industry_Real Estate' => 'Real Estate',
+    'industry_Retail & Wholesale' => 'Retail & Wholesale',
+    'industry_Sports' => 'Sports',
+    'industry_Transportation' => 'Transportation',
+    'industry_Travel & Luxury' => 'Travel & Luxury',
+    'industry_Other' => 'Other',
+    'industry_Photography' =>'Photography',
+
+    // Countries
+    'country_Afghanistan' => 'Afghanistan',
+    'country_Albania' => 'Albania',
+    'country_Antarctica' => 'Antarctica',
+    'country_Algeria' => 'Algeria',
+    'country_American Samoa' => 'American Samoa',
+    'country_Andorra' => 'Andorra',
+    'country_Angola' => 'Angola',
+    'country_Antigua and Barbuda' => 'Antigua and Barbuda',
+    'country_Azerbaijan' => 'Azerbaijan',
+    'country_Argentina' => 'Argentina',
+    'country_Australia' => 'Australia',
+    'country_Austria' => 'Austria',
+    'country_Bahamas' => 'Bahamas',
+    'country_Bahrain' => 'Bahrain',
+    'country_Bangladesh' => 'Bangladesh',
+    'country_Armenia' => 'Armenia',
+    'country_Barbados' => 'Barbados',
+    'country_Belgium' => 'Belgium',
+    'country_Bermuda' => 'Bermuda',
+    'country_Bhutan' => 'Bhutan',
+    'country_Bolivia, Plurinational State of' => 'Bolivia, Plurinational State of',
+    'country_Bosnia and Herzegovina' => 'Bosnia and Herzegovina',
+    'country_Botswana' => 'Botswana',
+    'country_Bouvet Island' => 'Bouvet Island',
+    'country_Brazil' => 'Brazil',
+    'country_Belize' => 'Belize',
+    'country_British Indian Ocean Territory' => 'British Indian Ocean Territory',
+    'country_Solomon Islands' => 'Solomon Islands',
+    'country_Virgin Islands, British' => 'Virgin Islands, British',
+    'country_Brunei Darussalam' => 'Brunei Darussalam',
+    'country_Bulgaria' => 'Bulgaria',
+    'country_Myanmar' => 'Myanmar',
+    'country_Burundi' => 'Burundi',
+    'country_Belarus' => 'Belarus',
+    'country_Cambodia' => 'Cambodia',
+    'country_Cameroon' => 'Cameroon',
+    'country_Canada' => 'Canada',
+    'country_Cape Verde' => 'Cape Verde',
+    'country_Cayman Islands' => 'Cayman Islands',
+    'country_Central African Republic' => 'Central African Republic',
+    'country_Sri Lanka' => 'Sri Lanka',
+    'country_Chad' => 'Chad',
+    'country_Chile' => 'Chile',
+    'country_China' => 'China',
+    'country_Taiwan, Province of China' => 'Taiwan, Province of China',
+    'country_Christmas Island' => 'Christmas Island',
+    'country_Cocos (Keeling) Islands' => 'Cocos (Keeling) Islands',
+    'country_Colombia' => 'Colombia',
+    'country_Comoros' => 'Comoros',
+    'country_Mayotte' => 'Mayotte',
+    'country_Congo' => 'Congo',
+    'country_Congo, the Democratic Republic of the' => 'Congo, the Democratic Republic of the',
+    'country_Cook Islands' => 'Cook Islands',
+    'country_Costa Rica' => 'Costa Rica',
+    'country_Croatia' => 'Croatia',
+    'country_Cuba' => 'Cuba',
+    'country_Cyprus' => 'Cyprus',
+    'country_Czech Republic' => 'Czech Republic',
+    'country_Benin' => 'Benin',
+    'country_Denmark' => 'Denmark',
+    'country_Dominica' => 'Dominica',
+    'country_Dominican Republic' => 'Dominican Republic',
+    'country_Ecuador' => 'Ecuador',
+    'country_El Salvador' => 'El Salvador',
+    'country_Equatorial Guinea' => 'Equatorial Guinea',
+    'country_Ethiopia' => 'Ethiopia',
+    'country_Eritrea' => 'Eritrea',
+    'country_Estonia' => 'Estonia',
+    'country_Faroe Islands' => 'Faroe Islands',
+    'country_Falkland Islands (Malvinas)' => 'Falkland Islands (Malvinas)',
+    'country_South Georgia and the South Sandwich Islands' => 'South Georgia and the South Sandwich Islands',
+    'country_Fiji' => 'Fiji',
+    'country_Finland' => 'Finland',
+    'country_Åland Islands' => 'Åland Islands',
+    'country_France' => 'France',
+    'country_French Guiana' => 'French Guiana',
+    'country_French Polynesia' => 'French Polynesia',
+    'country_French Southern Territories' => 'French Southern Territories',
+    'country_Djibouti' => 'Djibouti',
+    'country_Gabon' => 'Gabon',
+    'country_Georgia' => 'Georgia',
+    'country_Gambia' => 'Gambia',
+    'country_Palestinian Territory, Occupied' => 'Palestinian Territory, Occupied',
+    'country_Germany' => 'Germany',
+    'country_Ghana' => 'Ghana',
+    'country_Gibraltar' => 'Gibraltar',
+    'country_Kiribati' => 'Kiribati',
+    'country_Greece' => 'Greece',
+    'country_Greenland' => 'Greenland',
+    'country_Grenada' => 'Grenada',
+    'country_Guadeloupe' => 'Guadeloupe',
+    'country_Guam' => 'Guam',
+    'country_Guatemala' => 'Guatemala',
+    'country_Guinea' => 'Guinea',
+    'country_Guyana' => 'Guyana',
+    'country_Haiti' => 'Haiti',
+    'country_Heard Island and McDonald Islands' => 'Heard Island and McDonald Islands',
+    'country_Holy See (Vatican City State)' => 'Holy See (Vatican City State)',
+    'country_Honduras' => 'Honduras',
+    'country_Hong Kong' => 'Hong Kong',
+    'country_Hungary' => 'Hungary',
+    'country_Iceland' => 'Iceland',
+    'country_India' => 'India',
+    'country_Indonesia' => 'Indonesia',
+    'country_Iran, Islamic Republic of' => 'Iran, Islamic Republic of',
+    'country_Iraq' => 'Iraq',
+    'country_Ireland' => 'Ireland',
+    'country_Israel' => 'Israel',
+    'country_Italy' => 'Italy',
+    'country_Côte d\'Ivoire' => 'Côte d\'Ivoire',
+    'country_Jamaica' => 'Jamaica',
+    'country_Japan' => 'Japan',
+    'country_Kazakhstan' => 'Kazakhstan',
+    'country_Jordan' => 'Jordan',
+    'country_Kenya' => 'Kenya',
+    'country_Korea, Democratic People\'s Republic of' => 'Korea, Democratic People\'s Republic of',
+    'country_Korea, Republic of' => 'Korea, Republic of',
+    'country_Kuwait' => 'Kuwait',
+    'country_Kyrgyzstan' => 'Kyrgyzstan',
+    'country_Lao People\'s Democratic Republic' => 'Lao People\'s Democratic Republic',
+    'country_Lebanon' => 'Lebanon',
+    'country_Lesotho' => 'Lesotho',
+    'country_Latvia' => 'Latvia',
+    'country_Liberia' => 'Liberia',
+    'country_Libya' => 'Libya',
+    'country_Liechtenstein' => 'Liechtenstein',
+    'country_Lithuania' => 'Lithuania',
+    'country_Luxembourg' => 'Luxembourg',
+    'country_Macao' => 'Macao',
+    'country_Madagascar' => 'Madagascar',
+    'country_Malawi' => 'Malawi',
+    'country_Malaysia' => 'Malaysia',
+    'country_Maldives' => 'Maldives',
+    'country_Mali' => 'Mali',
+    'country_Malta' => 'Malta',
+    'country_Martinique' => 'Martinique',
+    'country_Mauritania' => 'Mauritania',
+    'country_Mauritius' => 'Mauritius',
+    'country_Mexico' => 'Mexico',
+    'country_Monaco' => 'Monaco',
+    'country_Mongolia' => 'Mongolia',
+    'country_Moldova, Republic of' => 'Moldova, Republic of',
+    'country_Montenegro' => 'Montenegro',
+    'country_Montserrat' => 'Montserrat',
+    'country_Morocco' => 'Morocco',
+    'country_Mozambique' => 'Mozambique',
+    'country_Oman' => 'Oman',
+    'country_Namibia' => 'Namibia',
+    'country_Nauru' => 'Nauru',
+    'country_Nepal' => 'Nepal',
+    'country_Netherlands' => 'Netherlands',
+    'country_Curaçao' => 'Curaçao',
+    'country_Aruba' => 'Aruba',
+    'country_Sint Maarten (Dutch part)' => 'Sint Maarten (Dutch part)',
+    'country_Bonaire, Sint Eustatius and Saba' => 'Bonaire, Sint Eustatius and Saba',
+    'country_New Caledonia' => 'New Caledonia',
+    'country_Vanuatu' => 'Vanuatu',
+    'country_New Zealand' => 'New Zealand',
+    'country_Nicaragua' => 'Nicaragua',
+    'country_Niger' => 'Niger',
+    'country_Nigeria' => 'Nigeria',
+    'country_Niue' => 'Niue',
+    'country_Norfolk Island' => 'Norfolk Island',
+    'country_Norway' => 'Norway',
+    'country_Northern Mariana Islands' => 'Northern Mariana Islands',
+    'country_United States Minor Outlying Islands' => 'United States Minor Outlying Islands',
+    'country_Micronesia, Federated States of' => 'Micronesia, Federated States of',
+    'country_Marshall Islands' => 'Marshall Islands',
+    'country_Palau' => 'Palau',
+    'country_Pakistan' => 'Pakistan',
+    'country_Panama' => 'Panama',
+    'country_Papua New Guinea' => 'Papua New Guinea',
+    'country_Paraguay' => 'Paraguay',
+    'country_Peru' => 'Peru',
+    'country_Philippines' => 'Philippines',
+    'country_Pitcairn' => 'Pitcairn',
+    'country_Poland' => 'Poland',
+    'country_Portugal' => 'Portugal',
+    'country_Guinea-Bissau' => 'Guinea-Bissau',
+    'country_Timor-Leste' => 'Timor-Leste',
+    'country_Puerto Rico' => 'Puerto Rico',
+    'country_Qatar' => 'Qatar',
+    'country_Réunion' => 'Réunion',
+    'country_Romania' => 'Romania',
+    'country_Russian Federation' => 'Russian Federation',
+    'country_Rwanda' => 'Rwanda',
+    'country_Saint Barthélemy' => 'Saint Barthélemy',
+    'country_Saint Helena, Ascension and Tristan da Cunha' => 'Saint Helena, Ascension and Tristan da Cunha',
+    'country_Saint Kitts and Nevis' => 'Saint Kitts and Nevis',
+    'country_Anguilla' => 'Anguilla',
+    'country_Saint Lucia' => 'Saint Lucia',
+    'country_Saint Martin (French part)' => 'Saint Martin (French part)',
+    'country_Saint Pierre and Miquelon' => 'Saint Pierre and Miquelon',
+    'country_Saint Vincent and the Grenadines' => 'Saint Vincent and the Grenadines',
+    'country_San Marino' => 'San Marino',
+    'country_Sao Tome and Principe' => 'Sao Tome and Principe',
+    'country_Saudi Arabia' => 'Saudi Arabia',
+    'country_Senegal' => 'Senegal',
+    'country_Serbia' => 'Serbia',
+    'country_Seychelles' => 'Seychelles',
+    'country_Sierra Leone' => 'Sierra Leone',
+    'country_Singapore' => 'Singapore',
+    'country_Slovakia' => 'Slovakia',
+    'country_Viet Nam' => 'Viet Nam',
+    'country_Slovenia' => 'Slovenia',
+    'country_Somalia' => 'Somalia',
+    'country_South Africa' => 'South Africa',
+    'country_Zimbabwe' => 'Zimbabwe',
+    'country_Spain' => 'Spain',
+    'country_South Sudan' => 'South Sudan',
+    'country_Sudan' => 'Sudan',
+    'country_Western Sahara' => 'Western Sahara',
+    'country_Suriname' => 'Suriname',
+    'country_Svalbard and Jan Mayen' => 'Svalbard and Jan Mayen',
+    'country_Swaziland' => 'Swaziland',
+    'country_Sweden' => 'Sweden',
+    'country_Switzerland' => 'Switzerland',
+    'country_Syrian Arab Republic' => 'Syrian Arab Republic',
+    'country_Tajikistan' => 'Tajikistan',
+    'country_Thailand' => 'Thailand',
+    'country_Togo' => 'Togo',
+    'country_Tokelau' => 'Tokelau',
+    'country_Tonga' => 'Tonga',
+    'country_Trinidad and Tobago' => 'Trinidad and Tobago',
+    'country_United Arab Emirates' => 'United Arab Emirates',
+    'country_Tunisia' => 'Tunisia',
+    'country_Turkey' => 'Turkey',
+    'country_Turkmenistan' => 'Turkmenistan',
+    'country_Turks and Caicos Islands' => 'Turks and Caicos Islands',
+    'country_Tuvalu' => 'Tuvalu',
+    'country_Uganda' => 'Uganda',
+    '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_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_Virgin Islands, U.S.' => 'Virgin Islands, U.S.',
+    'country_Burkina Faso' => 'Burkina Faso',
+    'country_Uruguay' => 'Uruguay',
+    'country_Uzbekistan' => 'Uzbekistan',
+    'country_Venezuela, Bolivarian Republic of' => 'Venezuela, Bolivarian Republic of',
+    'country_Wallis and Futuna' => 'Wallis and Futuna',
+    'country_Samoa' => 'Samoa',
+    'country_Yemen' => 'Yemen',
+    'country_Zambi' => 'Zambi',
+
+    'view_client_portal' => 'View client portal',
+    'view_portal' => 'View Portal',
+    'vendor_contacts' => 'Vendor Contacts',
+    'all' => 'All',
+    'selected' => 'Selected',
+    'category' => 'Category',
+    'categories' => 'Categories',
+    'new_expense_category' => 'New Expense Category',
+    'edit_category' => 'Edit Category',
+    'archive_expense_category' => 'Archive Category',
+    'expense_categories' => 'Expense Categories',
+    'list_expense_categories' => 'List Expense Categories',
+    'updated_expense_category' => 'Successfully updated expense category',
+    'created_expense_category' => 'Successfully created expense category',
+    'archived_expense_category' => 'Successfully archived expense category',
+    'archived_expense_categories' => 'Successfully archived :count expense category',
+    'restore_expense_category' => 'Restore expense category',
+    'restored_expense_category' => 'Successfully restored expense category',
+    'apply_taxes' => 'Apply taxes',
+    'min_to_max_users' => ':min to :max users',
+    'max_users_reached' => 'The maximum number of users has been reached.',
+    'buy_now_buttons' => 'Buy Now Buttons',
+    'landing_page' => 'Landing Page',
+    'payment_type' => 'Payment Type',
+    'form' => 'Form',
+    'link' => 'Link',
+    'fields' => 'Fields',
+    'dwolla' => 'Dwolla',
+    'buy_now_buttons_warning' => 'Note: client and invoice records are created even if the transaction isn\'t completed.',
+    'buy_now_buttons_disabled' => 'This feature requires that a product is created and a payment gateway is configured.',
+    'enable_buy_now_buttons_help' => 'Enable support for buy now buttons',
+    'changes_take_effect_immediately' => 'Note: changes take effect immediately',
+    'wepay_account_description' => 'Payment gateway for Invoice Ninja',
+    'payment_error_code' => 'There was an error processing your payment [:code]. Please try again later.',
+    'standard_fees_apply' => 'Standard fees apply: 2.9% + $0.30 per successful charge.',
+    'limit_import_rows' => 'Data needs to be imported in batches of :count rows or less',
+
 
 );
 

resources/lang/cs/texts.php

@@ -1,6 +1,7 @@
 <?php
 
 $LANG = array(
+
     'organization' => 'Organizace',
     'name' => 'Jméno',
     'website' => 'Web',
@@ -385,7 +386,7 @@ $LANG = array(
     'gateway_help_1' => ':link zaregistrovat se na Authorize.net.',
     'gateway_help_2' => ':link zaregistrovat se na Authorize.net.',
     'gateway_help_17' => ':link získat PayPal API signature.',
-    'gateway_help_27' => ':link zaregistrovat se na TwoCheckout.',
+    'gateway_help_27' => ':link to sign up for 2Checkout.com. To ensure payments are tracked set :complete_link as the redirect URL under Account > Site Management in the 2Checkout portal.',
     'more_designs' => 'Více vzhledů',
     'more_designs_title' => 'Další vzhledy faktur',
     'more_designs_cloud_header' => 'Přejděte na Profi plán pro více vzhledů faktur',
@@ -774,6 +775,8 @@ $LANG = array(
     'activity_35' => ':user vytvořil :vendor',
     'activity_36' => ':user vytvořil :vendor',
     'activity_37' => ':user vytvořil :vendor',
+    'activity_42' => ':user created task ":task"',
+    'activity_43' => ':user updated task ":task"',
     'payment' => 'Platba',
     'system' => 'Systém',
     'signature' => 'Emailový podpis',
@@ -994,7 +997,7 @@ $LANG = array(
     'overdue' => 'Po termínu',
 
 
-    'white_label_text' => 'Objednejte si white label licenci na JEDEN ROK $:price pro odstranění značky Invoice Ninja z klientského portálu a stránek podpory.',
+    'white_label_text' => 'Purchase a ONE YEAR white label license for $:price to remove the Invoice Ninja branding and help support our project.',
     'user_email_footer' => 'Pro úpravu emailových notifikací prosím navštivte :link',
     'reset_password_footer' => 'Pokud jste nepožádali o resetování hesla, prosím kontaktujte naši podporu na: :email',
     'limit_users' => 'Omlouváme se, to už přesáhlo limit :limit uživatelů',
@@ -1295,7 +1298,7 @@ $LANG = array(
     'wepay_tos_agree' => 'I agree to the :link.',
     'wepay_tos_link_text' => 'WePay Terms of Service',
     'resend_confirmation_email' => 'Resend Confirmation Email',
-    'manage_wepay_account' => 'Manage WePay Account',
+    'manage_account' => 'Manage Account',
     'action_required' => 'Action Required',
     'finish_setup' => 'Finish Setup',
     'created_wepay_confirmation_required' => 'Please check your email and confirm your email address with WePay.',
@@ -1363,6 +1366,686 @@ $LANG = array(
     'failed_remove_payment_method' => 'Failed to remove the payment method',
     'gateway_exists' => 'This gateway already exists',
     'manual_entry' => 'Manual entry',
+    'start_of_week' => 'First day of the week',
+
+    // Frequencies
+    'freq_weekly' => 'Weekly',
+    'freq_two_weeks' => 'Two weeks',
+    'freq_four_weeks' => 'Four weeks',
+    'freq_monthly' => 'Monthly',
+    'freq_three_months' => 'Three months',
+    'freq_six_months' => 'Six months',
+    'freq_annually' => 'Annually',
+
+    // Payment types
+    'payment_type_Apply Credit' => 'Apply Credit',
+    'payment_type_Bank Transfer' => 'Bank Transfer',
+    'payment_type_Cash' => 'Cash',
+    'payment_type_Debit' => 'Debit',
+    'payment_type_ACH' => 'ACH',
+    'payment_type_Visa Card' => 'Visa Card',
+    'payment_type_MasterCard' => 'MasterCard',
+    'payment_type_American Express' => 'American Express',
+    'payment_type_Discover Card' => 'Discover Card',
+    'payment_type_Diners Card' => 'Diners Card',
+    'payment_type_EuroCard' => 'EuroCard',
+    'payment_type_Nova' => 'Nova',
+    'payment_type_Credit Card Other' => 'Credit Card Other',
+    'payment_type_PayPal' => 'PayPal',
+    'payment_type_Google Wallet' => 'Google Wallet',
+    'payment_type_Check' => 'Check',
+
+    // Industries
+    'industry_Accounting & Legal' => 'Accounting & Legal',
+    'industry_Advertising' => 'Advertising',
+    'industry_Aerospace' => 'Aerospace',
+    'industry_Agriculture' => 'Agriculture',
+    'industry_Automotive' => 'Automotive',
+    'industry_Banking & Finance' => 'Banking & Finance',
+    'industry_Biotechnology' => 'Biotechnology',
+    'industry_Broadcasting' => 'Broadcasting',
+    'industry_Business Services' => 'Business Services',
+    'industry_Commodities & Chemicals' => 'Commodities & Chemicals',
+    'industry_Communications' => 'Communications',
+    'industry_Computers & Hightech' => 'Computers & Hightech',
+    'industry_Defense' => 'Defense',
+    'industry_Energy' => 'Energy',
+    'industry_Entertainment' => 'Entertainment',
+    'industry_Government' => 'Government',
+    'industry_Healthcare & Life Sciences' => 'Healthcare & Life Sciences',
+    'industry_Insurance' => 'Insurance',
+    'industry_Manufacturing' => 'Manufacturing',
+    'industry_Marketing' => 'Marketing',
+    'industry_Media' => 'Media',
+    'industry_Nonprofit & Higher Ed' => 'Nonprofit & Higher Ed',
+    'industry_Pharmaceuticals' => 'Pharmaceuticals',
+    'industry_Professional Services & Consulting' => 'Professional Services & Consulting',
+    'industry_Real Estate' => 'Real Estate',
+    'industry_Retail & Wholesale' => 'Retail & Wholesale',
+    'industry_Sports' => 'Sports',
+    'industry_Transportation' => 'Transportation',
+    'industry_Travel & Luxury' => 'Travel & Luxury',
+    'industry_Other' => 'Other',
+    'industry_Photography' =>'Photography',
+
+    // Countries
+    'country_Afghanistan' => 'Afghanistan',
+    'country_Albania' => 'Albania',
+    'country_Antarctica' => 'Antarctica',
+    'country_Algeria' => 'Algeria',
+    'country_American Samoa' => 'American Samoa',
+    'country_Andorra' => 'Andorra',
+    'country_Angola' => 'Angola',
+    'country_Antigua and Barbuda' => 'Antigua and Barbuda',
+    'country_Azerbaijan' => 'Azerbaijan',
+    'country_Argentina' => 'Argentina',
+    'country_Australia' => 'Australia',
+    'country_Austria' => 'Austria',
+    'country_Bahamas' => 'Bahamas',
+    'country_Bahrain' => 'Bahrain',
+    'country_Bangladesh' => 'Bangladesh',
+    'country_Armenia' => 'Armenia',
+    'country_Barbados' => 'Barbados',
+    'country_Belgium' => 'Belgium',
+    'country_Bermuda' => 'Bermuda',
+    'country_Bhutan' => 'Bhutan',
+    'country_Bolivia, Plurinational State of' => 'Bolivia, Plurinational State of',
+    'country_Bosnia and Herzegovina' => 'Bosnia and Herzegovina',
+    'country_Botswana' => 'Botswana',
+    'country_Bouvet Island' => 'Bouvet Island',
+    'country_Brazil' => 'Brazil',
+    'country_Belize' => 'Belize',
+    'country_British Indian Ocean Territory' => 'British Indian Ocean Territory',
+    'country_Solomon Islands' => 'Solomon Islands',
+    'country_Virgin Islands, British' => 'Virgin Islands, British',
+    'country_Brunei Darussalam' => 'Brunei Darussalam',
+    'country_Bulgaria' => 'Bulgaria',
+    'country_Myanmar' => 'Myanmar',
+    'country_Burundi' => 'Burundi',
+    'country_Belarus' => 'Belarus',
+    'country_Cambodia' => 'Cambodia',
+    'country_Cameroon' => 'Cameroon',
+    'country_Canada' => 'Canada',
+    'country_Cape Verde' => 'Cape Verde',
+    'country_Cayman Islands' => 'Cayman Islands',
+    'country_Central African Republic' => 'Central African Republic',
+    'country_Sri Lanka' => 'Sri Lanka',
+    'country_Chad' => 'Chad',
+    'country_Chile' => 'Chile',
+    'country_China' => 'China',
+    'country_Taiwan, Province of China' => 'Taiwan, Province of China',
+    'country_Christmas Island' => 'Christmas Island',
+    'country_Cocos (Keeling) Islands' => 'Cocos (Keeling) Islands',
+    'country_Colombia' => 'Colombia',
+    'country_Comoros' => 'Comoros',
+    'country_Mayotte' => 'Mayotte',
+    'country_Congo' => 'Congo',
+    'country_Congo, the Democratic Republic of the' => 'Congo, the Democratic Republic of the',
+    'country_Cook Islands' => 'Cook Islands',
+    'country_Costa Rica' => 'Costa Rica',
+    'country_Croatia' => 'Croatia',
+    'country_Cuba' => 'Cuba',
+    'country_Cyprus' => 'Cyprus',
+    'country_Czech Republic' => 'Czech Republic',
+    'country_Benin' => 'Benin',
+    'country_Denmark' => 'Denmark',
+    'country_Dominica' => 'Dominica',
+    'country_Dominican Republic' => 'Dominican Republic',
+    'country_Ecuador' => 'Ecuador',
+    'country_El Salvador' => 'El Salvador',
+    'country_Equatorial Guinea' => 'Equatorial Guinea',
+    'country_Ethiopia' => 'Ethiopia',
+    'country_Eritrea' => 'Eritrea',
+    'country_Estonia' => 'Estonia',
+    'country_Faroe Islands' => 'Faroe Islands',
+    'country_Falkland Islands (Malvinas)' => 'Falkland Islands (Malvinas)',
+    'country_South Georgia and the South Sandwich Islands' => 'South Georgia and the South Sandwich Islands',
+    'country_Fiji' => 'Fiji',
+    'country_Finland' => 'Finland',
+    'country_Åland Islands' => 'Åland Islands',
+    'country_France' => 'France',
+    'country_French Guiana' => 'French Guiana',
+    'country_French Polynesia' => 'French Polynesia',
+    'country_French Southern Territories' => 'French Southern Territories',
+    'country_Djibouti' => 'Djibouti',
+    'country_Gabon' => 'Gabon',
+    'country_Georgia' => 'Georgia',
+    'country_Gambia' => 'Gambia',
+    'country_Palestinian Territory, Occupied' => 'Palestinian Territory, Occupied',
+    'country_Germany' => 'Germany',
+    'country_Ghana' => 'Ghana',
+    'country_Gibraltar' => 'Gibraltar',
+    'country_Kiribati' => 'Kiribati',
+    'country_Greece' => 'Greece',
+    'country_Greenland' => 'Greenland',
+    'country_Grenada' => 'Grenada',
+    'country_Guadeloupe' => 'Guadeloupe',
+    'country_Guam' => 'Guam',
+    'country_Guatemala' => 'Guatemala',
+    'country_Guinea' => 'Guinea',
+    'country_Guyana' => 'Guyana',
+    'country_Haiti' => 'Haiti',
+    'country_Heard Island and McDonald Islands' => 'Heard Island and McDonald Islands',
+    'country_Holy See (Vatican City State)' => 'Holy See (Vatican City State)',
+    'country_Honduras' => 'Honduras',
+    'country_Hong Kong' => 'Hong Kong',
+    'country_Hungary' => 'Hungary',
+    'country_Iceland' => 'Iceland',
+    'country_India' => 'India',
+    'country_Indonesia' => 'Indonesia',
+    'country_Iran, Islamic Republic of' => 'Iran, Islamic Republic of',
+    'country_Iraq' => 'Iraq',
+    'country_Ireland' => 'Ireland',
+    'country_Israel' => 'Israel',
+    'country_Italy' => 'Italy',
+    'country_Côte d\'Ivoire' => 'Côte d\'Ivoire',
+    'country_Jamaica' => 'Jamaica',
+    'country_Japan' => 'Japan',
+    'country_Kazakhstan' => 'Kazakhstan',
+    'country_Jordan' => 'Jordan',
+    'country_Kenya' => 'Kenya',
+    'country_Korea, Democratic People\'s Republic of' => 'Korea, Democratic People\'s Republic of',
+    'country_Korea, Republic of' => 'Korea, Republic of',
+    'country_Kuwait' => 'Kuwait',
+    'country_Kyrgyzstan' => 'Kyrgyzstan',
+    'country_Lao People\'s Democratic Republic' => 'Lao People\'s Democratic Republic',
+    'country_Lebanon' => 'Lebanon',
+    'country_Lesotho' => 'Lesotho',
+    'country_Latvia' => 'Latvia',
+    'country_Liberia' => 'Liberia',
+    'country_Libya' => 'Libya',
+    'country_Liechtenstein' => 'Liechtenstein',
+    'country_Lithuania' => 'Lithuania',
+    'country_Luxembourg' => 'Luxembourg',
+    'country_Macao' => 'Macao',
+    'country_Madagascar' => 'Madagascar',
+    'country_Malawi' => 'Malawi',
+    'country_Malaysia' => 'Malaysia',
+    'country_Maldives' => 'Maldives',
+    'country_Mali' => 'Mali',
+    'country_Malta' => 'Malta',
+    'country_Martinique' => 'Martinique',
+    'country_Mauritania' => 'Mauritania',
+    'country_Mauritius' => 'Mauritius',
+    'country_Mexico' => 'Mexico',
+    'country_Monaco' => 'Monaco',
+    'country_Mongolia' => 'Mongolia',
+    'country_Moldova, Republic of' => 'Moldova, Republic of',
+    'country_Montenegro' => 'Montenegro',
+    'country_Montserrat' => 'Montserrat',
+    'country_Morocco' => 'Morocco',
+    'country_Mozambique' => 'Mozambique',
+    'country_Oman' => 'Oman',
+    'country_Namibia' => 'Namibia',
+    'country_Nauru' => 'Nauru',
+    'country_Nepal' => 'Nepal',
+    'country_Netherlands' => 'Netherlands',
+    'country_Curaçao' => 'Curaçao',
+    'country_Aruba' => 'Aruba',
+    'country_Sint Maarten (Dutch part)' => 'Sint Maarten (Dutch part)',
+    'country_Bonaire, Sint Eustatius and Saba' => 'Bonaire, Sint Eustatius and Saba',
+    'country_New Caledonia' => 'New Caledonia',
+    'country_Vanuatu' => 'Vanuatu',
+    'country_New Zealand' => 'New Zealand',
+    'country_Nicaragua' => 'Nicaragua',
+    'country_Niger' => 'Niger',
+    'country_Nigeria' => 'Nigeria',
+    'country_Niue' => 'Niue',
+    'country_Norfolk Island' => 'Norfolk Island',
+    'country_Norway' => 'Norway',
+    'country_Northern Mariana Islands' => 'Northern Mariana Islands',
+    'country_United States Minor Outlying Islands' => 'United States Minor Outlying Islands',
+    'country_Micronesia, Federated States of' => 'Micronesia, Federated States of',
+    'country_Marshall Islands' => 'Marshall Islands',
+    'country_Palau' => 'Palau',
+    'country_Pakistan' => 'Pakistan',
+    'country_Panama' => 'Panama',
+    'country_Papua New Guinea' => 'Papua New Guinea',
+    'country_Paraguay' => 'Paraguay',
+    'country_Peru' => 'Peru',
+    'country_Philippines' => 'Philippines',
+    'country_Pitcairn' => 'Pitcairn',
+    'country_Poland' => 'Poland',
+    'country_Portugal' => 'Portugal',
+    'country_Guinea-Bissau' => 'Guinea-Bissau',
+    'country_Timor-Leste' => 'Timor-Leste',
+    'country_Puerto Rico' => 'Puerto Rico',
+    'country_Qatar' => 'Qatar',
+    'country_Réunion' => 'Réunion',
+    'country_Romania' => 'Romania',
+    'country_Russian Federation' => 'Russian Federation',
+    'country_Rwanda' => 'Rwanda',
+    'country_Saint Barthélemy' => 'Saint Barthélemy',
+    'country_Saint Helena, Ascension and Tristan da Cunha' => 'Saint Helena, Ascension and Tristan da Cunha',
+    'country_Saint Kitts and Nevis' => 'Saint Kitts and Nevis',
+    'country_Anguilla' => 'Anguilla',
+    'country_Saint Lucia' => 'Saint Lucia',
+    'country_Saint Martin (French part)' => 'Saint Martin (French part)',
+    'country_Saint Pierre and Miquelon' => 'Saint Pierre and Miquelon',
+    'country_Saint Vincent and the Grenadines' => 'Saint Vincent and the Grenadines',
+    'country_San Marino' => 'San Marino',
+    'country_Sao Tome and Principe' => 'Sao Tome and Principe',
+    'country_Saudi Arabia' => 'Saudi Arabia',
+    'country_Senegal' => 'Senegal',
+    'country_Serbia' => 'Serbia',
+    'country_Seychelles' => 'Seychelles',
+    'country_Sierra Leone' => 'Sierra Leone',
+    'country_Singapore' => 'Singapore',
+    'country_Slovakia' => 'Slovakia',
+    'country_Viet Nam' => 'Viet Nam',
+    'country_Slovenia' => 'Slovenia',
+    'country_Somalia' => 'Somalia',
+    'country_South Africa' => 'South Africa',
+    'country_Zimbabwe' => 'Zimbabwe',
+    'country_Spain' => 'Spain',
+    'country_South Sudan' => 'South Sudan',
+    'country_Sudan' => 'Sudan',
+    'country_Western Sahara' => 'Western Sahara',
+    'country_Suriname' => 'Suriname',
+    'country_Svalbard and Jan Mayen' => 'Svalbard and Jan Mayen',
+    'country_Swaziland' => 'Swaziland',
+    'country_Sweden' => 'Sweden',
+    'country_Switzerland' => 'Switzerland',
+    'country_Syrian Arab Republic' => 'Syrian Arab Republic',
+    'country_Tajikistan' => 'Tajikistan',
+    'country_Thailand' => 'Thailand',
+    'country_Togo' => 'Togo',
+    'country_Tokelau' => 'Tokelau',
+    'country_Tonga' => 'Tonga',
+    'country_Trinidad and Tobago' => 'Trinidad and Tobago',
+    'country_United Arab Emirates' => 'United Arab Emirates',
+    'country_Tunisia' => 'Tunisia',
+    'country_Turkey' => 'Turkey',
+    'country_Turkmenistan' => 'Turkmenistan',
+    'country_Turks and Caicos Islands' => 'Turks and Caicos Islands',
+    'country_Tuvalu' => 'Tuvalu',
+    'country_Uganda' => 'Uganda',
+    '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_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_Virgin Islands, U.S.' => 'Virgin Islands, U.S.',
+    'country_Burkina Faso' => 'Burkina Faso',
+    'country_Uruguay' => 'Uruguay',
+    'country_Uzbekistan' => 'Uzbekistan',
+    'country_Venezuela, Bolivarian Republic of' => 'Venezuela, Bolivarian Republic of',
+    'country_Wallis and Futuna' => 'Wallis and Futuna',
+    'country_Samoa' => 'Samoa',
+    'country_Yemen' => 'Yemen',
+    'country_Zambi' => 'Zambi',
+
+    // Languages
+    'lang_Brazilian Portuguese' => 'Brazilian Portuguese',
+    'lang_Croatian' => 'Croatian',
+    'lang_Czech' => 'Czech',
+    'lang_Danish' => 'Danish',
+    'lang_Dutch' => 'Dutch',
+    'lang_English' => 'English',
+    'lang_French' => 'French',
+    'lang_French - Canada' => 'French - Canada',
+    'lang_German' => 'German',
+    'lang_Italian' => 'Italian',
+    'lang_Japanese' => 'Japanese',
+    'lang_Lithuanian' => 'Lithuanian',
+    'lang_Norwegian' => 'Norwegian',
+    'lang_Polish' => 'Polish',
+    'lang_Spanish' => 'Spanish',
+    'lang_Spanish - Spain' => 'Spanish - Spain',
+    'lang_Swedish' => 'Swedish',
+
+    // Frequencies
+    'freq_weekly' => 'Weekly',
+    'freq_two_weeks' => 'Two weeks',
+    'freq_four_weeks' => 'Four weeks',
+    'freq_monthly' => 'Monthly',
+    'freq_three_months' => 'Three months',
+    'freq_six_months' => 'Six months',
+    'freq_annually' => 'Annually',
+
+    // Payment types
+    'payment_type_Apply Credit' => 'Apply Credit',
+    'payment_type_Bank Transfer' => 'Bank Transfer',
+    'payment_type_Cash' => 'Cash',
+    'payment_type_Debit' => 'Debit',
+    'payment_type_ACH' => 'ACH',
+    'payment_type_Visa Card' => 'Visa Card',
+    'payment_type_MasterCard' => 'MasterCard',
+    'payment_type_American Express' => 'American Express',
+    'payment_type_Discover Card' => 'Discover Card',
+    'payment_type_Diners Card' => 'Diners Card',
+    'payment_type_EuroCard' => 'EuroCard',
+    'payment_type_Nova' => 'Nova',
+    'payment_type_Credit Card Other' => 'Credit Card Other',
+    'payment_type_PayPal' => 'PayPal',
+    'payment_type_Google Wallet' => 'Google Wallet',
+    'payment_type_Check' => 'Check',
+
+    // Industries
+    'industry_Accounting & Legal' => 'Accounting & Legal',
+    'industry_Advertising' => 'Advertising',
+    'industry_Aerospace' => 'Aerospace',
+    'industry_Agriculture' => 'Agriculture',
+    'industry_Automotive' => 'Automotive',
+    'industry_Banking & Finance' => 'Banking & Finance',
+    'industry_Biotechnology' => 'Biotechnology',
+    'industry_Broadcasting' => 'Broadcasting',
+    'industry_Business Services' => 'Business Services',
+    'industry_Commodities & Chemicals' => 'Commodities & Chemicals',
+    'industry_Communications' => 'Communications',
+    'industry_Computers & Hightech' => 'Computers & Hightech',
+    'industry_Defense' => 'Defense',
+    'industry_Energy' => 'Energy',
+    'industry_Entertainment' => 'Entertainment',
+    'industry_Government' => 'Government',
+    'industry_Healthcare & Life Sciences' => 'Healthcare & Life Sciences',
+    'industry_Insurance' => 'Insurance',
+    'industry_Manufacturing' => 'Manufacturing',
+    'industry_Marketing' => 'Marketing',
+    'industry_Media' => 'Media',
+    'industry_Nonprofit & Higher Ed' => 'Nonprofit & Higher Ed',
+    'industry_Pharmaceuticals' => 'Pharmaceuticals',
+    'industry_Professional Services & Consulting' => 'Professional Services & Consulting',
+    'industry_Real Estate' => 'Real Estate',
+    'industry_Retail & Wholesale' => 'Retail & Wholesale',
+    'industry_Sports' => 'Sports',
+    'industry_Transportation' => 'Transportation',
+    'industry_Travel & Luxury' => 'Travel & Luxury',
+    'industry_Other' => 'Other',
+    'industry_Photography' =>'Photography',
+
+    // Countries
+    'country_Afghanistan' => 'Afghanistan',
+    'country_Albania' => 'Albania',
+    'country_Antarctica' => 'Antarctica',
+    'country_Algeria' => 'Algeria',
+    'country_American Samoa' => 'American Samoa',
+    'country_Andorra' => 'Andorra',
+    'country_Angola' => 'Angola',
+    'country_Antigua and Barbuda' => 'Antigua and Barbuda',
+    'country_Azerbaijan' => 'Azerbaijan',
+    'country_Argentina' => 'Argentina',
+    'country_Australia' => 'Australia',
+    'country_Austria' => 'Austria',
+    'country_Bahamas' => 'Bahamas',
+    'country_Bahrain' => 'Bahrain',
+    'country_Bangladesh' => 'Bangladesh',
+    'country_Armenia' => 'Armenia',
+    'country_Barbados' => 'Barbados',
+    'country_Belgium' => 'Belgium',
+    'country_Bermuda' => 'Bermuda',
+    'country_Bhutan' => 'Bhutan',
+    'country_Bolivia, Plurinational State of' => 'Bolivia, Plurinational State of',
+    'country_Bosnia and Herzegovina' => 'Bosnia and Herzegovina',
+    'country_Botswana' => 'Botswana',
+    'country_Bouvet Island' => 'Bouvet Island',
+    'country_Brazil' => 'Brazil',
+    'country_Belize' => 'Belize',
+    'country_British Indian Ocean Territory' => 'British Indian Ocean Territory',
+    'country_Solomon Islands' => 'Solomon Islands',
+    'country_Virgin Islands, British' => 'Virgin Islands, British',
+    'country_Brunei Darussalam' => 'Brunei Darussalam',
+    'country_Bulgaria' => 'Bulgaria',
+    'country_Myanmar' => 'Myanmar',
+    'country_Burundi' => 'Burundi',
+    'country_Belarus' => 'Belarus',
+    'country_Cambodia' => 'Cambodia',
+    'country_Cameroon' => 'Cameroon',
+    'country_Canada' => 'Canada',
+    'country_Cape Verde' => 'Cape Verde',
+    'country_Cayman Islands' => 'Cayman Islands',
+    'country_Central African Republic' => 'Central African Republic',
+    'country_Sri Lanka' => 'Sri Lanka',
+    'country_Chad' => 'Chad',
+    'country_Chile' => 'Chile',
+    'country_China' => 'China',
+    'country_Taiwan, Province of China' => 'Taiwan, Province of China',
+    'country_Christmas Island' => 'Christmas Island',
+    'country_Cocos (Keeling) Islands' => 'Cocos (Keeling) Islands',
+    'country_Colombia' => 'Colombia',
+    'country_Comoros' => 'Comoros',
+    'country_Mayotte' => 'Mayotte',
+    'country_Congo' => 'Congo',
+    'country_Congo, the Democratic Republic of the' => 'Congo, the Democratic Republic of the',
+    'country_Cook Islands' => 'Cook Islands',
+    'country_Costa Rica' => 'Costa Rica',
+    'country_Croatia' => 'Croatia',
+    'country_Cuba' => 'Cuba',
+    'country_Cyprus' => 'Cyprus',
+    'country_Czech Republic' => 'Czech Republic',
+    'country_Benin' => 'Benin',
+    'country_Denmark' => 'Denmark',
+    'country_Dominica' => 'Dominica',
+    'country_Dominican Republic' => 'Dominican Republic',
+    'country_Ecuador' => 'Ecuador',
+    'country_El Salvador' => 'El Salvador',
+    'country_Equatorial Guinea' => 'Equatorial Guinea',
+    'country_Ethiopia' => 'Ethiopia',
+    'country_Eritrea' => 'Eritrea',
+    'country_Estonia' => 'Estonia',
+    'country_Faroe Islands' => 'Faroe Islands',
+    'country_Falkland Islands (Malvinas)' => 'Falkland Islands (Malvinas)',
+    'country_South Georgia and the South Sandwich Islands' => 'South Georgia and the South Sandwich Islands',
+    'country_Fiji' => 'Fiji',
+    'country_Finland' => 'Finland',
+    'country_Åland Islands' => 'Åland Islands',
+    'country_France' => 'France',
+    'country_French Guiana' => 'French Guiana',
+    'country_French Polynesia' => 'French Polynesia',
+    'country_French Southern Territories' => 'French Southern Territories',
+    'country_Djibouti' => 'Djibouti',
+    'country_Gabon' => 'Gabon',
+    'country_Georgia' => 'Georgia',
+    'country_Gambia' => 'Gambia',
+    'country_Palestinian Territory, Occupied' => 'Palestinian Territory, Occupied',
+    'country_Germany' => 'Germany',
+    'country_Ghana' => 'Ghana',
+    'country_Gibraltar' => 'Gibraltar',
+    'country_Kiribati' => 'Kiribati',
+    'country_Greece' => 'Greece',
+    'country_Greenland' => 'Greenland',
+    'country_Grenada' => 'Grenada',
+    'country_Guadeloupe' => 'Guadeloupe',
+    'country_Guam' => 'Guam',
+    'country_Guatemala' => 'Guatemala',
+    'country_Guinea' => 'Guinea',
+    'country_Guyana' => 'Guyana',
+    'country_Haiti' => 'Haiti',
+    'country_Heard Island and McDonald Islands' => 'Heard Island and McDonald Islands',
+    'country_Holy See (Vatican City State)' => 'Holy See (Vatican City State)',
+    'country_Honduras' => 'Honduras',
+    'country_Hong Kong' => 'Hong Kong',
+    'country_Hungary' => 'Hungary',
+    'country_Iceland' => 'Iceland',
+    'country_India' => 'India',
+    'country_Indonesia' => 'Indonesia',
+    'country_Iran, Islamic Republic of' => 'Iran, Islamic Republic of',
+    'country_Iraq' => 'Iraq',
+    'country_Ireland' => 'Ireland',
+    'country_Israel' => 'Israel',
+    'country_Italy' => 'Italy',
+    'country_Côte d\'Ivoire' => 'Côte d\'Ivoire',
+    'country_Jamaica' => 'Jamaica',
+    'country_Japan' => 'Japan',
+    'country_Kazakhstan' => 'Kazakhstan',
+    'country_Jordan' => 'Jordan',
+    'country_Kenya' => 'Kenya',
+    'country_Korea, Democratic People\'s Republic of' => 'Korea, Democratic People\'s Republic of',
+    'country_Korea, Republic of' => 'Korea, Republic of',
+    'country_Kuwait' => 'Kuwait',
+    'country_Kyrgyzstan' => 'Kyrgyzstan',
+    'country_Lao People\'s Democratic Republic' => 'Lao People\'s Democratic Republic',
+    'country_Lebanon' => 'Lebanon',
+    'country_Lesotho' => 'Lesotho',
+    'country_Latvia' => 'Latvia',
+    'country_Liberia' => 'Liberia',
+    'country_Libya' => 'Libya',
+    'country_Liechtenstein' => 'Liechtenstein',
+    'country_Lithuania' => 'Lithuania',
+    'country_Luxembourg' => 'Luxembourg',
+    'country_Macao' => 'Macao',
+    'country_Madagascar' => 'Madagascar',
+    'country_Malawi' => 'Malawi',
+    'country_Malaysia' => 'Malaysia',
+    'country_Maldives' => 'Maldives',
+    'country_Mali' => 'Mali',
+    'country_Malta' => 'Malta',
+    'country_Martinique' => 'Martinique',
+    'country_Mauritania' => 'Mauritania',
+    'country_Mauritius' => 'Mauritius',
+    'country_Mexico' => 'Mexico',
+    'country_Monaco' => 'Monaco',
+    'country_Mongolia' => 'Mongolia',
+    'country_Moldova, Republic of' => 'Moldova, Republic of',
+    'country_Montenegro' => 'Montenegro',
+    'country_Montserrat' => 'Montserrat',
+    'country_Morocco' => 'Morocco',
+    'country_Mozambique' => 'Mozambique',
+    'country_Oman' => 'Oman',
+    'country_Namibia' => 'Namibia',
+    'country_Nauru' => 'Nauru',
+    'country_Nepal' => 'Nepal',
+    'country_Netherlands' => 'Netherlands',
+    'country_Curaçao' => 'Curaçao',
+    'country_Aruba' => 'Aruba',
+    'country_Sint Maarten (Dutch part)' => 'Sint Maarten (Dutch part)',
+    'country_Bonaire, Sint Eustatius and Saba' => 'Bonaire, Sint Eustatius and Saba',
+    'country_New Caledonia' => 'New Caledonia',
+    'country_Vanuatu' => 'Vanuatu',
+    'country_New Zealand' => 'New Zealand',
+    'country_Nicaragua' => 'Nicaragua',
+    'country_Niger' => 'Niger',
+    'country_Nigeria' => 'Nigeria',
+    'country_Niue' => 'Niue',
+    'country_Norfolk Island' => 'Norfolk Island',
+    'country_Norway' => 'Norway',
+    'country_Northern Mariana Islands' => 'Northern Mariana Islands',
+    'country_United States Minor Outlying Islands' => 'United States Minor Outlying Islands',
+    'country_Micronesia, Federated States of' => 'Micronesia, Federated States of',
+    'country_Marshall Islands' => 'Marshall Islands',
+    'country_Palau' => 'Palau',
+    'country_Pakistan' => 'Pakistan',
+    'country_Panama' => 'Panama',
+    'country_Papua New Guinea' => 'Papua New Guinea',
+    'country_Paraguay' => 'Paraguay',
+    'country_Peru' => 'Peru',
+    'country_Philippines' => 'Philippines',
+    'country_Pitcairn' => 'Pitcairn',
+    'country_Poland' => 'Poland',
+    'country_Portugal' => 'Portugal',
+    'country_Guinea-Bissau' => 'Guinea-Bissau',
+    'country_Timor-Leste' => 'Timor-Leste',
+    'country_Puerto Rico' => 'Puerto Rico',
+    'country_Qatar' => 'Qatar',
+    'country_Réunion' => 'Réunion',
+    'country_Romania' => 'Romania',
+    'country_Russian Federation' => 'Russian Federation',
+    'country_Rwanda' => 'Rwanda',
+    'country_Saint Barthélemy' => 'Saint Barthélemy',
+    'country_Saint Helena, Ascension and Tristan da Cunha' => 'Saint Helena, Ascension and Tristan da Cunha',
+    'country_Saint Kitts and Nevis' => 'Saint Kitts and Nevis',
+    'country_Anguilla' => 'Anguilla',
+    'country_Saint Lucia' => 'Saint Lucia',
+    'country_Saint Martin (French part)' => 'Saint Martin (French part)',
+    'country_Saint Pierre and Miquelon' => 'Saint Pierre and Miquelon',
+    'country_Saint Vincent and the Grenadines' => 'Saint Vincent and the Grenadines',
+    'country_San Marino' => 'San Marino',
+    'country_Sao Tome and Principe' => 'Sao Tome and Principe',
+    'country_Saudi Arabia' => 'Saudi Arabia',
+    'country_Senegal' => 'Senegal',
+    'country_Serbia' => 'Serbia',
+    'country_Seychelles' => 'Seychelles',
+    'country_Sierra Leone' => 'Sierra Leone',
+    'country_Singapore' => 'Singapore',
+    'country_Slovakia' => 'Slovakia',
+    'country_Viet Nam' => 'Viet Nam',
+    'country_Slovenia' => 'Slovenia',
+    'country_Somalia' => 'Somalia',
+    'country_South Africa' => 'South Africa',
+    'country_Zimbabwe' => 'Zimbabwe',
+    'country_Spain' => 'Spain',
+    'country_South Sudan' => 'South Sudan',
+    'country_Sudan' => 'Sudan',
+    'country_Western Sahara' => 'Western Sahara',
+    'country_Suriname' => 'Suriname',
+    'country_Svalbard and Jan Mayen' => 'Svalbard and Jan Mayen',
+    'country_Swaziland' => 'Swaziland',
+    'country_Sweden' => 'Sweden',
+    'country_Switzerland' => 'Switzerland',
+    'country_Syrian Arab Republic' => 'Syrian Arab Republic',
+    'country_Tajikistan' => 'Tajikistan',
+    'country_Thailand' => 'Thailand',
+    'country_Togo' => 'Togo',
+    'country_Tokelau' => 'Tokelau',
+    'country_Tonga' => 'Tonga',
+    'country_Trinidad and Tobago' => 'Trinidad and Tobago',
+    'country_United Arab Emirates' => 'United Arab Emirates',
+    'country_Tunisia' => 'Tunisia',
+    'country_Turkey' => 'Turkey',
+    'country_Turkmenistan' => 'Turkmenistan',
+    'country_Turks and Caicos Islands' => 'Turks and Caicos Islands',
+    'country_Tuvalu' => 'Tuvalu',
+    'country_Uganda' => 'Uganda',
+    '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_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_Virgin Islands, U.S.' => 'Virgin Islands, U.S.',
+    'country_Burkina Faso' => 'Burkina Faso',
+    'country_Uruguay' => 'Uruguay',
+    'country_Uzbekistan' => 'Uzbekistan',
+    'country_Venezuela, Bolivarian Republic of' => 'Venezuela, Bolivarian Republic of',
+    'country_Wallis and Futuna' => 'Wallis and Futuna',
+    'country_Samoa' => 'Samoa',
+    'country_Yemen' => 'Yemen',
+    'country_Zambi' => 'Zambi',
+
+    'view_client_portal' => 'View client portal',
+    'view_portal' => 'View Portal',
+    'vendor_contacts' => 'Vendor Contacts',
+    'all' => 'All',
+    'selected' => 'Selected',
+    'category' => 'Category',
+    'categories' => 'Categories',
+    'new_expense_category' => 'New Expense Category',
+    'edit_category' => 'Edit Category',
+    'archive_expense_category' => 'Archive Category',
+    'expense_categories' => 'Expense Categories',
+    'list_expense_categories' => 'List Expense Categories',
+    'updated_expense_category' => 'Successfully updated expense category',
+    'created_expense_category' => 'Successfully created expense category',
+    'archived_expense_category' => 'Successfully archived expense category',
+    'archived_expense_categories' => 'Successfully archived :count expense category',
+    'restore_expense_category' => 'Restore expense category',
+    'restored_expense_category' => 'Successfully restored expense category',
+    'apply_taxes' => 'Apply taxes',
+    'min_to_max_users' => ':min to :max users',
+    'max_users_reached' => 'The maximum number of users has been reached.',
+    'buy_now_buttons' => 'Buy Now Buttons',
+    'landing_page' => 'Landing Page',
+    'payment_type' => 'Payment Type',
+    'form' => 'Form',
+    'link' => 'Link',
+    'fields' => 'Fields',
+    'dwolla' => 'Dwolla',
+    'buy_now_buttons_warning' => 'Note: client and invoice records are created even if the transaction isn\'t completed.',
+    'buy_now_buttons_disabled' => 'This feature requires that a product is created and a payment gateway is configured.',
+    'enable_buy_now_buttons_help' => 'Enable support for buy now buttons',
+    'changes_take_effect_immediately' => 'Note: changes take effect immediately',
+    'wepay_account_description' => 'Payment gateway for Invoice Ninja',
+    'payment_error_code' => 'There was an error processing your payment [:code]. Please try again later.',
+    'standard_fees_apply' => 'Standard fees apply: 2.9% + $0.30 per successful charge.',
+    'limit_import_rows' => 'Data needs to be imported in batches of :count rows or less',
+
 
 );
 

resources/lang/da/texts.php

@@ -1,6 +1,7 @@
 <?php
 
 $LANG = array(
+
     'organization' => 'Organisation',
     'name' => 'Navn',
     'website' => 'Webside',
@@ -386,7 +387,7 @@ $LANG = array(
     'gateway_help_1' => ':link til at registrere dig hos Authorize.net.',
     'gateway_help_2' => ':link til at registrere dig hos Authorize.net.',
     'gateway_help_17' => ':link til at hente din PayPal API signatur.',
-    'gateway_help_27' => ':link til at registrere dig hos TwoCheckout.',
+    'gateway_help_27' => ':link to sign up for 2Checkout.com. To ensure payments are tracked set :complete_link as the redirect URL under Account > Site Management in the 2Checkout portal.',
     'more_designs' => 'Flere designs',
     'more_designs_title' => 'Yderligere faktura designs',
     'more_designs_cloud_header' => 'Skift til Pro for flere faktura designs',
@@ -773,6 +774,8 @@ $LANG = array(
     'activity_35' => ':user created :vendor',
     'activity_36' => ':user created :vendor',
     'activity_37' => ':user created :vendor',
+    'activity_42' => ':user created task ":task"',
+    'activity_43' => ':user updated task ":task"',
     'payment' => 'Payment',
     'system' => 'System',
     'signature' => 'Email Signature',
@@ -992,7 +995,7 @@ $LANG = array(
     'overdue' => 'Overdue',
 
 
-    'white_label_text' => 'Purchase a ONE YEAR white label license for $:price to remove the Invoice Ninja branding from the client portal and help support our project.',
+    'white_label_text' => 'Purchase a ONE YEAR white label license for $:price to remove the Invoice Ninja branding and help support our project.',
     'user_email_footer' => 'For at justere varslings indstillingene besøg venligst :link',
     'reset_password_footer' => 'Hvis du ikke bad om at få nulstillet din adgangskode kontakt venligst kundeservice: :email',
     'limit_users' => 'Desværre, dette vil overstige grænsen på :limit brugere',
@@ -1293,7 +1296,7 @@ $LANG = array(
     'wepay_tos_agree' => 'I agree to the :link.',
     'wepay_tos_link_text' => 'WePay Terms of Service',
     'resend_confirmation_email' => 'Resend Confirmation Email',
-    'manage_wepay_account' => 'Manage WePay Account',
+    'manage_account' => 'Manage Account',
     'action_required' => 'Action Required',
     'finish_setup' => 'Finish Setup',
     'created_wepay_confirmation_required' => 'Please check your email and confirm your email address with WePay.',
@@ -1361,6 +1364,686 @@ $LANG = array(
     'failed_remove_payment_method' => 'Failed to remove the payment method',
     'gateway_exists' => 'This gateway already exists',
     'manual_entry' => 'Manual entry',
+    'start_of_week' => 'First day of the week',
+
+    // Frequencies
+    'freq_weekly' => 'Weekly',
+    'freq_two_weeks' => 'Two weeks',
+    'freq_four_weeks' => 'Four weeks',
+    'freq_monthly' => 'Monthly',
+    'freq_three_months' => 'Three months',
+    'freq_six_months' => 'Six months',
+    'freq_annually' => 'Annually',
+
+    // Payment types
+    'payment_type_Apply Credit' => 'Apply Credit',
+    'payment_type_Bank Transfer' => 'Bank Transfer',
+    'payment_type_Cash' => 'Cash',
+    'payment_type_Debit' => 'Debit',
+    'payment_type_ACH' => 'ACH',
+    'payment_type_Visa Card' => 'Visa Card',
+    'payment_type_MasterCard' => 'MasterCard',
+    'payment_type_American Express' => 'American Express',
+    'payment_type_Discover Card' => 'Discover Card',
+    'payment_type_Diners Card' => 'Diners Card',
+    'payment_type_EuroCard' => 'EuroCard',
+    'payment_type_Nova' => 'Nova',
+    'payment_type_Credit Card Other' => 'Credit Card Other',
+    'payment_type_PayPal' => 'PayPal',
+    'payment_type_Google Wallet' => 'Google Wallet',
+    'payment_type_Check' => 'Check',
+
+    // Industries
+    'industry_Accounting & Legal' => 'Accounting & Legal',
+    'industry_Advertising' => 'Advertising',
+    'industry_Aerospace' => 'Aerospace',
+    'industry_Agriculture' => 'Agriculture',
+    'industry_Automotive' => 'Automotive',
+    'industry_Banking & Finance' => 'Banking & Finance',
+    'industry_Biotechnology' => 'Biotechnology',
+    'industry_Broadcasting' => 'Broadcasting',
+    'industry_Business Services' => 'Business Services',
+    'industry_Commodities & Chemicals' => 'Commodities & Chemicals',
+    'industry_Communications' => 'Communications',
+    'industry_Computers & Hightech' => 'Computers & Hightech',
+    'industry_Defense' => 'Defense',
+    'industry_Energy' => 'Energy',
+    'industry_Entertainment' => 'Entertainment',
+    'industry_Government' => 'Government',
+    'industry_Healthcare & Life Sciences' => 'Healthcare & Life Sciences',
+    'industry_Insurance' => 'Insurance',
+    'industry_Manufacturing' => 'Manufacturing',
+    'industry_Marketing' => 'Marketing',
+    'industry_Media' => 'Media',
+    'industry_Nonprofit & Higher Ed' => 'Nonprofit & Higher Ed',
+    'industry_Pharmaceuticals' => 'Pharmaceuticals',
+    'industry_Professional Services & Consulting' => 'Professional Services & Consulting',
+    'industry_Real Estate' => 'Real Estate',
+    'industry_Retail & Wholesale' => 'Retail & Wholesale',
+    'industry_Sports' => 'Sports',
+    'industry_Transportation' => 'Transportation',
+    'industry_Travel & Luxury' => 'Travel & Luxury',
+    'industry_Other' => 'Other',
+    'industry_Photography' =>'Photography',
+
+    // Countries
+    'country_Afghanistan' => 'Afghanistan',
+    'country_Albania' => 'Albania',
+    'country_Antarctica' => 'Antarctica',
+    'country_Algeria' => 'Algeria',
+    'country_American Samoa' => 'American Samoa',
+    'country_Andorra' => 'Andorra',
+    'country_Angola' => 'Angola',
+    'country_Antigua and Barbuda' => 'Antigua and Barbuda',
+    'country_Azerbaijan' => 'Azerbaijan',
+    'country_Argentina' => 'Argentina',
+    'country_Australia' => 'Australia',
+    'country_Austria' => 'Austria',
+    'country_Bahamas' => 'Bahamas',
+    'country_Bahrain' => 'Bahrain',
+    'country_Bangladesh' => 'Bangladesh',
+    'country_Armenia' => 'Armenia',
+    'country_Barbados' => 'Barbados',
+    'country_Belgium' => 'Belgium',
+    'country_Bermuda' => 'Bermuda',
+    'country_Bhutan' => 'Bhutan',
+    'country_Bolivia, Plurinational State of' => 'Bolivia, Plurinational State of',
+    'country_Bosnia and Herzegovina' => 'Bosnia and Herzegovina',
+    'country_Botswana' => 'Botswana',
+    'country_Bouvet Island' => 'Bouvet Island',
+    'country_Brazil' => 'Brazil',
+    'country_Belize' => 'Belize',
+    'country_British Indian Ocean Territory' => 'British Indian Ocean Territory',
+    'country_Solomon Islands' => 'Solomon Islands',
+    'country_Virgin Islands, British' => 'Virgin Islands, British',
+    'country_Brunei Darussalam' => 'Brunei Darussalam',
+    'country_Bulgaria' => 'Bulgaria',
+    'country_Myanmar' => 'Myanmar',
+    'country_Burundi' => 'Burundi',
+    'country_Belarus' => 'Belarus',
+    'country_Cambodia' => 'Cambodia',
+    'country_Cameroon' => 'Cameroon',
+    'country_Canada' => 'Canada',
+    'country_Cape Verde' => 'Cape Verde',
+    'country_Cayman Islands' => 'Cayman Islands',
+    'country_Central African Republic' => 'Central African Republic',
+    'country_Sri Lanka' => 'Sri Lanka',
+    'country_Chad' => 'Chad',
+    'country_Chile' => 'Chile',
+    'country_China' => 'China',
+    'country_Taiwan, Province of China' => 'Taiwan, Province of China',
+    'country_Christmas Island' => 'Christmas Island',
+    'country_Cocos (Keeling) Islands' => 'Cocos (Keeling) Islands',
+    'country_Colombia' => 'Colombia',
+    'country_Comoros' => 'Comoros',
+    'country_Mayotte' => 'Mayotte',
+    'country_Congo' => 'Congo',
+    'country_Congo, the Democratic Republic of the' => 'Congo, the Democratic Republic of the',
+    'country_Cook Islands' => 'Cook Islands',
+    'country_Costa Rica' => 'Costa Rica',
+    'country_Croatia' => 'Croatia',
+    'country_Cuba' => 'Cuba',
+    'country_Cyprus' => 'Cyprus',
+    'country_Czech Republic' => 'Czech Republic',
+    'country_Benin' => 'Benin',
+    'country_Denmark' => 'Denmark',
+    'country_Dominica' => 'Dominica',
+    'country_Dominican Republic' => 'Dominican Republic',
+    'country_Ecuador' => 'Ecuador',
+    'country_El Salvador' => 'El Salvador',
+    'country_Equatorial Guinea' => 'Equatorial Guinea',
+    'country_Ethiopia' => 'Ethiopia',
+    'country_Eritrea' => 'Eritrea',
+    'country_Estonia' => 'Estonia',
+    'country_Faroe Islands' => 'Faroe Islands',
+    'country_Falkland Islands (Malvinas)' => 'Falkland Islands (Malvinas)',
+    'country_South Georgia and the South Sandwich Islands' => 'South Georgia and the South Sandwich Islands',
+    'country_Fiji' => 'Fiji',
+    'country_Finland' => 'Finland',
+    'country_Åland Islands' => 'Åland Islands',
+    'country_France' => 'France',
+    'country_French Guiana' => 'French Guiana',
+    'country_French Polynesia' => 'French Polynesia',
+    'country_French Southern Territories' => 'French Southern Territories',
+    'country_Djibouti' => 'Djibouti',
+    'country_Gabon' => 'Gabon',
+    'country_Georgia' => 'Georgia',
+    'country_Gambia' => 'Gambia',
+    'country_Palestinian Territory, Occupied' => 'Palestinian Territory, Occupied',
+    'country_Germany' => 'Germany',
+    'country_Ghana' => 'Ghana',
+    'country_Gibraltar' => 'Gibraltar',
+    'country_Kiribati' => 'Kiribati',
+    'country_Greece' => 'Greece',
+    'country_Greenland' => 'Greenland',
+    'country_Grenada' => 'Grenada',
+    'country_Guadeloupe' => 'Guadeloupe',
+    'country_Guam' => 'Guam',
+    'country_Guatemala' => 'Guatemala',
+    'country_Guinea' => 'Guinea',
+    'country_Guyana' => 'Guyana',
+    'country_Haiti' => 'Haiti',
+    'country_Heard Island and McDonald Islands' => 'Heard Island and McDonald Islands',
+    'country_Holy See (Vatican City State)' => 'Holy See (Vatican City State)',
+    'country_Honduras' => 'Honduras',
+    'country_Hong Kong' => 'Hong Kong',
+    'country_Hungary' => 'Hungary',
+    'country_Iceland' => 'Iceland',
+    'country_India' => 'India',
+    'country_Indonesia' => 'Indonesia',
+    'country_Iran, Islamic Republic of' => 'Iran, Islamic Republic of',
+    'country_Iraq' => 'Iraq',
+    'country_Ireland' => 'Ireland',
+    'country_Israel' => 'Israel',
+    'country_Italy' => 'Italy',
+    'country_Côte d\'Ivoire' => 'Côte d\'Ivoire',
+    'country_Jamaica' => 'Jamaica',
+    'country_Japan' => 'Japan',
+    'country_Kazakhstan' => 'Kazakhstan',
+    'country_Jordan' => 'Jordan',
+    'country_Kenya' => 'Kenya',
+    'country_Korea, Democratic People\'s Republic of' => 'Korea, Democratic People\'s Republic of',
+    'country_Korea, Republic of' => 'Korea, Republic of',
+    'country_Kuwait' => 'Kuwait',
+    'country_Kyrgyzstan' => 'Kyrgyzstan',
+    'country_Lao People\'s Democratic Republic' => 'Lao People\'s Democratic Republic',
+    'country_Lebanon' => 'Lebanon',
+    'country_Lesotho' => 'Lesotho',
+    'country_Latvia' => 'Latvia',
+    'country_Liberia' => 'Liberia',
+    'country_Libya' => 'Libya',
+    'country_Liechtenstein' => 'Liechtenstein',
+    'country_Lithuania' => 'Lithuania',
+    'country_Luxembourg' => 'Luxembourg',
+    'country_Macao' => 'Macao',
+    'country_Madagascar' => 'Madagascar',
+    'country_Malawi' => 'Malawi',
+    'country_Malaysia' => 'Malaysia',
+    'country_Maldives' => 'Maldives',
+    'country_Mali' => 'Mali',
+    'country_Malta' => 'Malta',
+    'country_Martinique' => 'Martinique',
+    'country_Mauritania' => 'Mauritania',
+    'country_Mauritius' => 'Mauritius',
+    'country_Mexico' => 'Mexico',
+    'country_Monaco' => 'Monaco',
+    'country_Mongolia' => 'Mongolia',
+    'country_Moldova, Republic of' => 'Moldova, Republic of',
+    'country_Montenegro' => 'Montenegro',
+    'country_Montserrat' => 'Montserrat',
+    'country_Morocco' => 'Morocco',
+    'country_Mozambique' => 'Mozambique',
+    'country_Oman' => 'Oman',
+    'country_Namibia' => 'Namibia',
+    'country_Nauru' => 'Nauru',
+    'country_Nepal' => 'Nepal',
+    'country_Netherlands' => 'Netherlands',
+    'country_Curaçao' => 'Curaçao',
+    'country_Aruba' => 'Aruba',
+    'country_Sint Maarten (Dutch part)' => 'Sint Maarten (Dutch part)',
+    'country_Bonaire, Sint Eustatius and Saba' => 'Bonaire, Sint Eustatius and Saba',
+    'country_New Caledonia' => 'New Caledonia',
+    'country_Vanuatu' => 'Vanuatu',
+    'country_New Zealand' => 'New Zealand',
+    'country_Nicaragua' => 'Nicaragua',
+    'country_Niger' => 'Niger',
+    'country_Nigeria' => 'Nigeria',
+    'country_Niue' => 'Niue',
+    'country_Norfolk Island' => 'Norfolk Island',
+    'country_Norway' => 'Norway',
+    'country_Northern Mariana Islands' => 'Northern Mariana Islands',
+    'country_United States Minor Outlying Islands' => 'United States Minor Outlying Islands',
+    'country_Micronesia, Federated States of' => 'Micronesia, Federated States of',
+    'country_Marshall Islands' => 'Marshall Islands',
+    'country_Palau' => 'Palau',
+    'country_Pakistan' => 'Pakistan',
+    'country_Panama' => 'Panama',
+    'country_Papua New Guinea' => 'Papua New Guinea',
+    'country_Paraguay' => 'Paraguay',
+    'country_Peru' => 'Peru',
+    'country_Philippines' => 'Philippines',
+    'country_Pitcairn' => 'Pitcairn',
+    'country_Poland' => 'Poland',
+    'country_Portugal' => 'Portugal',
+    'country_Guinea-Bissau' => 'Guinea-Bissau',
+    'country_Timor-Leste' => 'Timor-Leste',
+    'country_Puerto Rico' => 'Puerto Rico',
+    'country_Qatar' => 'Qatar',
+    'country_Réunion' => 'Réunion',
+    'country_Romania' => 'Romania',
+    'country_Russian Federation' => 'Russian Federation',
+    'country_Rwanda' => 'Rwanda',
+    'country_Saint Barthélemy' => 'Saint Barthélemy',
+    'country_Saint Helena, Ascension and Tristan da Cunha' => 'Saint Helena, Ascension and Tristan da Cunha',
+    'country_Saint Kitts and Nevis' => 'Saint Kitts and Nevis',
+    'country_Anguilla' => 'Anguilla',
+    'country_Saint Lucia' => 'Saint Lucia',
+    'country_Saint Martin (French part)' => 'Saint Martin (French part)',
+    'country_Saint Pierre and Miquelon' => 'Saint Pierre and Miquelon',
+    'country_Saint Vincent and the Grenadines' => 'Saint Vincent and the Grenadines',
+    'country_San Marino' => 'San Marino',
+    'country_Sao Tome and Principe' => 'Sao Tome and Principe',
+    'country_Saudi Arabia' => 'Saudi Arabia',
+    'country_Senegal' => 'Senegal',
+    'country_Serbia' => 'Serbia',
+    'country_Seychelles' => 'Seychelles',
+    'country_Sierra Leone' => 'Sierra Leone',
+    'country_Singapore' => 'Singapore',
+    'country_Slovakia' => 'Slovakia',
+    'country_Viet Nam' => 'Viet Nam',
+    'country_Slovenia' => 'Slovenia',
+    'country_Somalia' => 'Somalia',
+    'country_South Africa' => 'South Africa',
+    'country_Zimbabwe' => 'Zimbabwe',
+    'country_Spain' => 'Spain',
+    'country_South Sudan' => 'South Sudan',
+    'country_Sudan' => 'Sudan',
+    'country_Western Sahara' => 'Western Sahara',
+    'country_Suriname' => 'Suriname',
+    'country_Svalbard and Jan Mayen' => 'Svalbard and Jan Mayen',
+    'country_Swaziland' => 'Swaziland',
+    'country_Sweden' => 'Sweden',
+    'country_Switzerland' => 'Switzerland',
+    'country_Syrian Arab Republic' => 'Syrian Arab Republic',
+    'country_Tajikistan' => 'Tajikistan',
+    'country_Thailand' => 'Thailand',
+    'country_Togo' => 'Togo',
+    'country_Tokelau' => 'Tokelau',
+    'country_Tonga' => 'Tonga',
+    'country_Trinidad and Tobago' => 'Trinidad and Tobago',
+    'country_United Arab Emirates' => 'United Arab Emirates',
+    'country_Tunisia' => 'Tunisia',
+    'country_Turkey' => 'Turkey',
+    'country_Turkmenistan' => 'Turkmenistan',
+    'country_Turks and Caicos Islands' => 'Turks and Caicos Islands',
+    'country_Tuvalu' => 'Tuvalu',
+    'country_Uganda' => 'Uganda',
+    '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_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_Virgin Islands, U.S.' => 'Virgin Islands, U.S.',
+    'country_Burkina Faso' => 'Burkina Faso',
+    'country_Uruguay' => 'Uruguay',
+    'country_Uzbekistan' => 'Uzbekistan',
+    'country_Venezuela, Bolivarian Republic of' => 'Venezuela, Bolivarian Republic of',
+    'country_Wallis and Futuna' => 'Wallis and Futuna',
+    'country_Samoa' => 'Samoa',
+    'country_Yemen' => 'Yemen',
+    'country_Zambi' => 'Zambi',
+
+    // Languages
+    'lang_Brazilian Portuguese' => 'Brazilian Portuguese',
+    'lang_Croatian' => 'Croatian',
+    'lang_Czech' => 'Czech',
+    'lang_Danish' => 'Danish',
+    'lang_Dutch' => 'Dutch',
+    'lang_English' => 'English',
+    'lang_French' => 'French',
+    'lang_French - Canada' => 'French - Canada',
+    'lang_German' => 'German',
+    'lang_Italian' => 'Italian',
+    'lang_Japanese' => 'Japanese',
+    'lang_Lithuanian' => 'Lithuanian',
+    'lang_Norwegian' => 'Norwegian',
+    'lang_Polish' => 'Polish',
+    'lang_Spanish' => 'Spanish',
+    'lang_Spanish - Spain' => 'Spanish - Spain',
+    'lang_Swedish' => 'Swedish',
+
+    // Frequencies
+    'freq_weekly' => 'Weekly',
+    'freq_two_weeks' => 'Two weeks',
+    'freq_four_weeks' => 'Four weeks',
+    'freq_monthly' => 'Monthly',
+    'freq_three_months' => 'Three months',
+    'freq_six_months' => 'Six months',
+    'freq_annually' => 'Annually',
+
+    // Payment types
+    'payment_type_Apply Credit' => 'Apply Credit',
+    'payment_type_Bank Transfer' => 'Bank Transfer',
+    'payment_type_Cash' => 'Cash',
+    'payment_type_Debit' => 'Debit',
+    'payment_type_ACH' => 'ACH',
+    'payment_type_Visa Card' => 'Visa Card',
+    'payment_type_MasterCard' => 'MasterCard',
+    'payment_type_American Express' => 'American Express',
+    'payment_type_Discover Card' => 'Discover Card',
+    'payment_type_Diners Card' => 'Diners Card',
+    'payment_type_EuroCard' => 'EuroCard',
+    'payment_type_Nova' => 'Nova',
+    'payment_type_Credit Card Other' => 'Credit Card Other',
+    'payment_type_PayPal' => 'PayPal',
+    'payment_type_Google Wallet' => 'Google Wallet',
+    'payment_type_Check' => 'Check',
+
+    // Industries
+    'industry_Accounting & Legal' => 'Accounting & Legal',
+    'industry_Advertising' => 'Advertising',
+    'industry_Aerospace' => 'Aerospace',
+    'industry_Agriculture' => 'Agriculture',
+    'industry_Automotive' => 'Automotive',
+    'industry_Banking & Finance' => 'Banking & Finance',
+    'industry_Biotechnology' => 'Biotechnology',
+    'industry_Broadcasting' => 'Broadcasting',
+    'industry_Business Services' => 'Business Services',
+    'industry_Commodities & Chemicals' => 'Commodities & Chemicals',
+    'industry_Communications' => 'Communications',
+    'industry_Computers & Hightech' => 'Computers & Hightech',
+    'industry_Defense' => 'Defense',
+    'industry_Energy' => 'Energy',
+    'industry_Entertainment' => 'Entertainment',
+    'industry_Government' => 'Government',
+    'industry_Healthcare & Life Sciences' => 'Healthcare & Life Sciences',
+    'industry_Insurance' => 'Insurance',
+    'industry_Manufacturing' => 'Manufacturing',
+    'industry_Marketing' => 'Marketing',
+    'industry_Media' => 'Media',
+    'industry_Nonprofit & Higher Ed' => 'Nonprofit & Higher Ed',
+    'industry_Pharmaceuticals' => 'Pharmaceuticals',
+    'industry_Professional Services & Consulting' => 'Professional Services & Consulting',
+    'industry_Real Estate' => 'Real Estate',
+    'industry_Retail & Wholesale' => 'Retail & Wholesale',
+    'industry_Sports' => 'Sports',
+    'industry_Transportation' => 'Transportation',
+    'industry_Travel & Luxury' => 'Travel & Luxury',
+    'industry_Other' => 'Other',
+    'industry_Photography' =>'Photography',
+
+    // Countries
+    'country_Afghanistan' => 'Afghanistan',
+    'country_Albania' => 'Albania',
+    'country_Antarctica' => 'Antarctica',
+    'country_Algeria' => 'Algeria',
+    'country_American Samoa' => 'American Samoa',
+    'country_Andorra' => 'Andorra',
+    'country_Angola' => 'Angola',
+    'country_Antigua and Barbuda' => 'Antigua and Barbuda',
+    'country_Azerbaijan' => 'Azerbaijan',
+    'country_Argentina' => 'Argentina',
+    'country_Australia' => 'Australia',
+    'country_Austria' => 'Austria',
+    'country_Bahamas' => 'Bahamas',
+    'country_Bahrain' => 'Bahrain',
+    'country_Bangladesh' => 'Bangladesh',
+    'country_Armenia' => 'Armenia',
+    'country_Barbados' => 'Barbados',
+    'country_Belgium' => 'Belgium',
+    'country_Bermuda' => 'Bermuda',
+    'country_Bhutan' => 'Bhutan',
+    'country_Bolivia, Plurinational State of' => 'Bolivia, Plurinational State of',
+    'country_Bosnia and Herzegovina' => 'Bosnia and Herzegovina',
+    'country_Botswana' => 'Botswana',
+    'country_Bouvet Island' => 'Bouvet Island',
+    'country_Brazil' => 'Brazil',
+    'country_Belize' => 'Belize',
+    'country_British Indian Ocean Territory' => 'British Indian Ocean Territory',
+    'country_Solomon Islands' => 'Solomon Islands',
+    'country_Virgin Islands, British' => 'Virgin Islands, British',
+    'country_Brunei Darussalam' => 'Brunei Darussalam',
+    'country_Bulgaria' => 'Bulgaria',
+    'country_Myanmar' => 'Myanmar',
+    'country_Burundi' => 'Burundi',
+    'country_Belarus' => 'Belarus',
+    'country_Cambodia' => 'Cambodia',
+    'country_Cameroon' => 'Cameroon',
+    'country_Canada' => 'Canada',
+    'country_Cape Verde' => 'Cape Verde',
+    'country_Cayman Islands' => 'Cayman Islands',
+    'country_Central African Republic' => 'Central African Republic',
+    'country_Sri Lanka' => 'Sri Lanka',
+    'country_Chad' => 'Chad',
+    'country_Chile' => 'Chile',
+    'country_China' => 'China',
+    'country_Taiwan, Province of China' => 'Taiwan, Province of China',
+    'country_Christmas Island' => 'Christmas Island',
+    'country_Cocos (Keeling) Islands' => 'Cocos (Keeling) Islands',
+    'country_Colombia' => 'Colombia',
+    'country_Comoros' => 'Comoros',
+    'country_Mayotte' => 'Mayotte',
+    'country_Congo' => 'Congo',
+    'country_Congo, the Democratic Republic of the' => 'Congo, the Democratic Republic of the',
+    'country_Cook Islands' => 'Cook Islands',
+    'country_Costa Rica' => 'Costa Rica',
+    'country_Croatia' => 'Croatia',
+    'country_Cuba' => 'Cuba',
+    'country_Cyprus' => 'Cyprus',
+    'country_Czech Republic' => 'Czech Republic',
+    'country_Benin' => 'Benin',
+    'country_Denmark' => 'Denmark',
+    'country_Dominica' => 'Dominica',
+    'country_Dominican Republic' => 'Dominican Republic',
+    'country_Ecuador' => 'Ecuador',
+    'country_El Salvador' => 'El Salvador',
+    'country_Equatorial Guinea' => 'Equatorial Guinea',
+    'country_Ethiopia' => 'Ethiopia',
+    'country_Eritrea' => 'Eritrea',
+    'country_Estonia' => 'Estonia',
+    'country_Faroe Islands' => 'Faroe Islands',
+    'country_Falkland Islands (Malvinas)' => 'Falkland Islands (Malvinas)',
+    'country_South Georgia and the South Sandwich Islands' => 'South Georgia and the South Sandwich Islands',
+    'country_Fiji' => 'Fiji',
+    'country_Finland' => 'Finland',
+    'country_Åland Islands' => 'Åland Islands',
+    'country_France' => 'France',
+    'country_French Guiana' => 'French Guiana',
+    'country_French Polynesia' => 'French Polynesia',
+    'country_French Southern Territories' => 'French Southern Territories',
+    'country_Djibouti' => 'Djibouti',
+    'country_Gabon' => 'Gabon',
+    'country_Georgia' => 'Georgia',
+    'country_Gambia' => 'Gambia',
+    'country_Palestinian Territory, Occupied' => 'Palestinian Territory, Occupied',
+    'country_Germany' => 'Germany',
+    'country_Ghana' => 'Ghana',
+    'country_Gibraltar' => 'Gibraltar',
+    'country_Kiribati' => 'Kiribati',
+    'country_Greece' => 'Greece',
+    'country_Greenland' => 'Greenland',
+    'country_Grenada' => 'Grenada',
+    'country_Guadeloupe' => 'Guadeloupe',
+    'country_Guam' => 'Guam',
+    'country_Guatemala' => 'Guatemala',
+    'country_Guinea' => 'Guinea',
+    'country_Guyana' => 'Guyana',
+    'country_Haiti' => 'Haiti',
+    'country_Heard Island and McDonald Islands' => 'Heard Island and McDonald Islands',
+    'country_Holy See (Vatican City State)' => 'Holy See (Vatican City State)',
+    'country_Honduras' => 'Honduras',
+    'country_Hong Kong' => 'Hong Kong',
+    'country_Hungary' => 'Hungary',
+    'country_Iceland' => 'Iceland',
+    'country_India' => 'India',
+    'country_Indonesia' => 'Indonesia',
+    'country_Iran, Islamic Republic of' => 'Iran, Islamic Republic of',
+    'country_Iraq' => 'Iraq',
+    'country_Ireland' => 'Ireland',
+    'country_Israel' => 'Israel',
+    'country_Italy' => 'Italy',
+    'country_Côte d\'Ivoire' => 'Côte d\'Ivoire',
+    'country_Jamaica' => 'Jamaica',
+    'country_Japan' => 'Japan',
+    'country_Kazakhstan' => 'Kazakhstan',
+    'country_Jordan' => 'Jordan',
+    'country_Kenya' => 'Kenya',
+    'country_Korea, Democratic People\'s Republic of' => 'Korea, Democratic People\'s Republic of',
+    'country_Korea, Republic of' => 'Korea, Republic of',
+    'country_Kuwait' => 'Kuwait',
+    'country_Kyrgyzstan' => 'Kyrgyzstan',
+    'country_Lao People\'s Democratic Republic' => 'Lao People\'s Democratic Republic',
+    'country_Lebanon' => 'Lebanon',
+    'country_Lesotho' => 'Lesotho',
+    'country_Latvia' => 'Latvia',
+    'country_Liberia' => 'Liberia',
+    'country_Libya' => 'Libya',
+    'country_Liechtenstein' => 'Liechtenstein',
+    'country_Lithuania' => 'Lithuania',
+    'country_Luxembourg' => 'Luxembourg',
+    'country_Macao' => 'Macao',
+    'country_Madagascar' => 'Madagascar',
+    'country_Malawi' => 'Malawi',
+    'country_Malaysia' => 'Malaysia',
+    'country_Maldives' => 'Maldives',
+    'country_Mali' => 'Mali',
+    'country_Malta' => 'Malta',
+    'country_Martinique' => 'Martinique',
+    'country_Mauritania' => 'Mauritania',
+    'country_Mauritius' => 'Mauritius',
+    'country_Mexico' => 'Mexico',
+    'country_Monaco' => 'Monaco',
+    'country_Mongolia' => 'Mongolia',
+    'country_Moldova, Republic of' => 'Moldova, Republic of',
+    'country_Montenegro' => 'Montenegro',
+    'country_Montserrat' => 'Montserrat',
+    'country_Morocco' => 'Morocco',
+    'country_Mozambique' => 'Mozambique',
+    'country_Oman' => 'Oman',
+    'country_Namibia' => 'Namibia',
+    'country_Nauru' => 'Nauru',
+    'country_Nepal' => 'Nepal',
+    'country_Netherlands' => 'Netherlands',
+    'country_Curaçao' => 'Curaçao',
+    'country_Aruba' => 'Aruba',
+    'country_Sint Maarten (Dutch part)' => 'Sint Maarten (Dutch part)',
+    'country_Bonaire, Sint Eustatius and Saba' => 'Bonaire, Sint Eustatius and Saba',
+    'country_New Caledonia' => 'New Caledonia',
+    'country_Vanuatu' => 'Vanuatu',
+    'country_New Zealand' => 'New Zealand',
+    'country_Nicaragua' => 'Nicaragua',
+    'country_Niger' => 'Niger',
+    'country_Nigeria' => 'Nigeria',
+    'country_Niue' => 'Niue',
+    'country_Norfolk Island' => 'Norfolk Island',
+    'country_Norway' => 'Norway',
+    'country_Northern Mariana Islands' => 'Northern Mariana Islands',
+    'country_United States Minor Outlying Islands' => 'United States Minor Outlying Islands',
+    'country_Micronesia, Federated States of' => 'Micronesia, Federated States of',
+    'country_Marshall Islands' => 'Marshall Islands',
+    'country_Palau' => 'Palau',
+    'country_Pakistan' => 'Pakistan',
+    'country_Panama' => 'Panama',
+    'country_Papua New Guinea' => 'Papua New Guinea',
+    'country_Paraguay' => 'Paraguay',
+    'country_Peru' => 'Peru',
+    'country_Philippines' => 'Philippines',
+    'country_Pitcairn' => 'Pitcairn',
+    'country_Poland' => 'Poland',
+    'country_Portugal' => 'Portugal',
+    'country_Guinea-Bissau' => 'Guinea-Bissau',
+    'country_Timor-Leste' => 'Timor-Leste',
+    'country_Puerto Rico' => 'Puerto Rico',
+    'country_Qatar' => 'Qatar',
+    'country_Réunion' => 'Réunion',
+    'country_Romania' => 'Romania',
+    'country_Russian Federation' => 'Russian Federation',
+    'country_Rwanda' => 'Rwanda',
+    'country_Saint Barthélemy' => 'Saint Barthélemy',
+    'country_Saint Helena, Ascension and Tristan da Cunha' => 'Saint Helena, Ascension and Tristan da Cunha',
+    'country_Saint Kitts and Nevis' => 'Saint Kitts and Nevis',
+    'country_Anguilla' => 'Anguilla',
+    'country_Saint Lucia' => 'Saint Lucia',
+    'country_Saint Martin (French part)' => 'Saint Martin (French part)',
+    'country_Saint Pierre and Miquelon' => 'Saint Pierre and Miquelon',
+    'country_Saint Vincent and the Grenadines' => 'Saint Vincent and the Grenadines',
+    'country_San Marino' => 'San Marino',
+    'country_Sao Tome and Principe' => 'Sao Tome and Principe',
+    'country_Saudi Arabia' => 'Saudi Arabia',
+    'country_Senegal' => 'Senegal',
+    'country_Serbia' => 'Serbia',
+    'country_Seychelles' => 'Seychelles',
+    'country_Sierra Leone' => 'Sierra Leone',
+    'country_Singapore' => 'Singapore',
+    'country_Slovakia' => 'Slovakia',
+    'country_Viet Nam' => 'Viet Nam',
+    'country_Slovenia' => 'Slovenia',
+    'country_Somalia' => 'Somalia',
+    'country_South Africa' => 'South Africa',
+    'country_Zimbabwe' => 'Zimbabwe',
+    'country_Spain' => 'Spain',
+    'country_South Sudan' => 'South Sudan',
+    'country_Sudan' => 'Sudan',
+    'country_Western Sahara' => 'Western Sahara',
+    'country_Suriname' => 'Suriname',
+    'country_Svalbard and Jan Mayen' => 'Svalbard and Jan Mayen',
+    'country_Swaziland' => 'Swaziland',
+    'country_Sweden' => 'Sweden',
+    'country_Switzerland' => 'Switzerland',
+    'country_Syrian Arab Republic' => 'Syrian Arab Republic',
+    'country_Tajikistan' => 'Tajikistan',
+    'country_Thailand' => 'Thailand',
+    'country_Togo' => 'Togo',
+    'country_Tokelau' => 'Tokelau',
+    'country_Tonga' => 'Tonga',
+    'country_Trinidad and Tobago' => 'Trinidad and Tobago',
+    'country_United Arab Emirates' => 'United Arab Emirates',
+    'country_Tunisia' => 'Tunisia',
+    'country_Turkey' => 'Turkey',
+    'country_Turkmenistan' => 'Turkmenistan',
+    'country_Turks and Caicos Islands' => 'Turks and Caicos Islands',
+    'country_Tuvalu' => 'Tuvalu',
+    'country_Uganda' => 'Uganda',
+    '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_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_Virgin Islands, U.S.' => 'Virgin Islands, U.S.',
+    'country_Burkina Faso' => 'Burkina Faso',
+    'country_Uruguay' => 'Uruguay',
+    'country_Uzbekistan' => 'Uzbekistan',
+    'country_Venezuela, Bolivarian Republic of' => 'Venezuela, Bolivarian Republic of',
+    'country_Wallis and Futuna' => 'Wallis and Futuna',
+    'country_Samoa' => 'Samoa',
+    'country_Yemen' => 'Yemen',
+    'country_Zambi' => 'Zambi',
+
+    'view_client_portal' => 'View client portal',
+    'view_portal' => 'View Portal',
+    'vendor_contacts' => 'Vendor Contacts',
+    'all' => 'All',
+    'selected' => 'Selected',
+    'category' => 'Category',
+    'categories' => 'Categories',
+    'new_expense_category' => 'New Expense Category',
+    'edit_category' => 'Edit Category',
+    'archive_expense_category' => 'Archive Category',
+    'expense_categories' => 'Expense Categories',
+    'list_expense_categories' => 'List Expense Categories',
+    'updated_expense_category' => 'Successfully updated expense category',
+    'created_expense_category' => 'Successfully created expense category',
+    'archived_expense_category' => 'Successfully archived expense category',
+    'archived_expense_categories' => 'Successfully archived :count expense category',
+    'restore_expense_category' => 'Restore expense category',
+    'restored_expense_category' => 'Successfully restored expense category',
+    'apply_taxes' => 'Apply taxes',
+    'min_to_max_users' => ':min to :max users',
+    'max_users_reached' => 'The maximum number of users has been reached.',
+    'buy_now_buttons' => 'Buy Now Buttons',
+    'landing_page' => 'Landing Page',
+    'payment_type' => 'Payment Type',
+    'form' => 'Form',
+    'link' => 'Link',
+    'fields' => 'Fields',
+    'dwolla' => 'Dwolla',
+    'buy_now_buttons_warning' => 'Note: client and invoice records are created even if the transaction isn\'t completed.',
+    'buy_now_buttons_disabled' => 'This feature requires that a product is created and a payment gateway is configured.',
+    'enable_buy_now_buttons_help' => 'Enable support for buy now buttons',
+    'changes_take_effect_immediately' => 'Note: changes take effect immediately',
+    'wepay_account_description' => 'Payment gateway for Invoice Ninja',
+    'payment_error_code' => 'There was an error processing your payment [:code]. Please try again later.',
+    'standard_fees_apply' => 'Standard fees apply: 2.9% + $0.30 per successful charge.',
+    'limit_import_rows' => 'Data needs to be imported in batches of :count rows or less',
+
 
 );
 

resources/lang/en/texts.php

@@ -1296,7 +1296,7 @@ $LANG = array(
     'wepay_tos_agree' => 'I agree to the :link.',
     'wepay_tos_link_text' => 'WePay Terms of Service',
     'resend_confirmation_email' => 'Resend Confirmation Email',
-    'manage_wepay_account' => 'Manage WePay Account',
+    'manage_account' => 'Manage Account',
     'action_required' => 'Action Required',
     'finish_setup' => 'Finish Setup',
     'created_wepay_confirmation_required' => 'Please check your email and confirm your email address with WePay.',
@@ -2029,6 +2029,21 @@ $LANG = array(
     'min_to_max_users' => ':min to :max users',
     'max_users_reached' => 'The maximum number of users has been reached.',
     'dwolla' => 'Dwolla',
+    'buy_now_buttons' => 'Buy Now Buttons',
+    'landing_page' => 'Landing Page',
+    'payment_type' => 'Payment Type',
+    'form' => 'Form',
+    'link' => 'Link',
+    'fields' => 'Fields',
+    'dwolla' => 'Dwolla',
+    'buy_now_buttons_warning' => 'Note: client and invoice records are created even if the transaction isn\'t completed.',
+    'buy_now_buttons_disabled' => 'This feature requires that a product is created and a payment gateway is configured.',
+    'enable_buy_now_buttons_help' => 'Enable support for buy now buttons',
+    'changes_take_effect_immediately' => 'Note: changes take effect immediately',
+    'wepay_account_description' => 'Payment gateway for Invoice Ninja',
+    'payment_error_code' => 'There was an error processing your payment [:code]. Please try again later.',
+    'standard_fees_apply' => 'Standard fees apply: 2.9% + $0.30 per successful charge.',
+    'limit_import_rows' => 'Data needs to be imported in batches of :count rows or less',
 
 );
 

resources/lang/es/texts.php

@@ -1,6 +1,7 @@
 <?php
 
 $LANG = array(
+
     'organization' => 'Empresa',
     'name' => 'Nombre',
     'website' => 'Sitio Web',
@@ -380,7 +381,7 @@ $LANG = array(
     'gateway_help_1' => ':link para registrarse con Authorize.net.',
     'gateway_help_2' => ':link para registrarse con Authorize.net.',
     'gateway_help_17' => ':link para obtener su firma del API de PayPal.',
-    'gateway_help_27' => ':link para registrarse con TwoCheckout.',
+    'gateway_help_27' => ':link to sign up for 2Checkout.com. To ensure payments are tracked set :complete_link as the redirect URL under Account > Site Management in the 2Checkout portal.',
     'more_designs' => 'Más diseños',
     'more_designs_title' => 'Diseños Adicionales de Facturas',
     'more_designs_cloud_header' => 'Vete Pro para más diseños de facturas',
@@ -767,6 +768,8 @@ $LANG = array(
     'activity_35' => ':user created :vendor',
     'activity_36' => ':user created :vendor',
     'activity_37' => ':user created :vendor',
+    'activity_42' => ':user created task ":task"',
+    'activity_43' => ':user updated task ":task"',
     'payment' => 'pago',
     'system' => 'Sistema',
     'signature' => 'Email Signature',
@@ -986,7 +989,7 @@ $LANG = array(
     'overdue' => 'Overdue',
 
 
-    'white_label_text' => 'Purchase a ONE YEAR white label license for $:price to remove the Invoice Ninja branding from the client portal and help support our project.',
+    'white_label_text' => 'Purchase a ONE YEAR white label license for $:price to remove the Invoice Ninja branding and help support our project.',
     'user_email_footer' => 'Para ajustar la configuración de las notificaciones de tu correo, visita :link',
     'reset_password_footer' => 'Si no has solicitado un cambio de contraseña, por favor contactate con nosostros: :email',
     'limit_users' => 'Lo sentimos, esta acción excederá el límite de :limit usarios',
@@ -1287,7 +1290,7 @@ $LANG = array(
     'wepay_tos_agree' => 'I agree to the :link.',
     'wepay_tos_link_text' => 'WePay Terms of Service',
     'resend_confirmation_email' => 'Resend Confirmation Email',
-    'manage_wepay_account' => 'Manage WePay Account',
+    'manage_account' => 'Manage Account',
     'action_required' => 'Action Required',
     'finish_setup' => 'Finish Setup',
     'created_wepay_confirmation_required' => 'Please check your email and confirm your email address with WePay.',
@@ -1355,6 +1358,686 @@ $LANG = array(
     'failed_remove_payment_method' => 'Failed to remove the payment method',
     'gateway_exists' => 'This gateway already exists',
     'manual_entry' => 'Manual entry',
+    'start_of_week' => 'First day of the week',
+
+    // Frequencies
+    'freq_weekly' => 'Weekly',
+    'freq_two_weeks' => 'Two weeks',
+    'freq_four_weeks' => 'Four weeks',
+    'freq_monthly' => 'Monthly',
+    'freq_three_months' => 'Three months',
+    'freq_six_months' => 'Six months',
+    'freq_annually' => 'Annually',
+
+    // Payment types
+    'payment_type_Apply Credit' => 'Apply Credit',
+    'payment_type_Bank Transfer' => 'Bank Transfer',
+    'payment_type_Cash' => 'Cash',
+    'payment_type_Debit' => 'Debit',
+    'payment_type_ACH' => 'ACH',
+    'payment_type_Visa Card' => 'Visa Card',
+    'payment_type_MasterCard' => 'MasterCard',
+    'payment_type_American Express' => 'American Express',
+    'payment_type_Discover Card' => 'Discover Card',
+    'payment_type_Diners Card' => 'Diners Card',
+    'payment_type_EuroCard' => 'EuroCard',
+    'payment_type_Nova' => 'Nova',
+    'payment_type_Credit Card Other' => 'Credit Card Other',
+    'payment_type_PayPal' => 'PayPal',
+    'payment_type_Google Wallet' => 'Google Wallet',
+    'payment_type_Check' => 'Check',
+
+    // Industries
+    'industry_Accounting & Legal' => 'Accounting & Legal',
+    'industry_Advertising' => 'Advertising',
+    'industry_Aerospace' => 'Aerospace',
+    'industry_Agriculture' => 'Agriculture',
+    'industry_Automotive' => 'Automotive',
+    'industry_Banking & Finance' => 'Banking & Finance',
+    'industry_Biotechnology' => 'Biotechnology',
+    'industry_Broadcasting' => 'Broadcasting',
+    'industry_Business Services' => 'Business Services',
+    'industry_Commodities & Chemicals' => 'Commodities & Chemicals',
+    'industry_Communications' => 'Communications',
+    'industry_Computers & Hightech' => 'Computers & Hightech',
+    'industry_Defense' => 'Defense',
+    'industry_Energy' => 'Energy',
+    'industry_Entertainment' => 'Entertainment',
+    'industry_Government' => 'Government',
+    'industry_Healthcare & Life Sciences' => 'Healthcare & Life Sciences',
+    'industry_Insurance' => 'Insurance',
+    'industry_Manufacturing' => 'Manufacturing',
+    'industry_Marketing' => 'Marketing',
+    'industry_Media' => 'Media',
+    'industry_Nonprofit & Higher Ed' => 'Nonprofit & Higher Ed',
+    'industry_Pharmaceuticals' => 'Pharmaceuticals',
+    'industry_Professional Services & Consulting' => 'Professional Services & Consulting',
+    'industry_Real Estate' => 'Real Estate',
+    'industry_Retail & Wholesale' => 'Retail & Wholesale',
+    'industry_Sports' => 'Sports',
+    'industry_Transportation' => 'Transportation',
+    'industry_Travel & Luxury' => 'Travel & Luxury',
+    'industry_Other' => 'Other',
+    'industry_Photography' =>'Photography',
+
+    // Countries
+    'country_Afghanistan' => 'Afghanistan',
+    'country_Albania' => 'Albania',
+    'country_Antarctica' => 'Antarctica',
+    'country_Algeria' => 'Algeria',
+    'country_American Samoa' => 'American Samoa',
+    'country_Andorra' => 'Andorra',
+    'country_Angola' => 'Angola',
+    'country_Antigua and Barbuda' => 'Antigua and Barbuda',
+    'country_Azerbaijan' => 'Azerbaijan',
+    'country_Argentina' => 'Argentina',
+    'country_Australia' => 'Australia',
+    'country_Austria' => 'Austria',
+    'country_Bahamas' => 'Bahamas',
+    'country_Bahrain' => 'Bahrain',
+    'country_Bangladesh' => 'Bangladesh',
+    'country_Armenia' => 'Armenia',
+    'country_Barbados' => 'Barbados',
+    'country_Belgium' => 'Belgium',
+    'country_Bermuda' => 'Bermuda',
+    'country_Bhutan' => 'Bhutan',
+    'country_Bolivia, Plurinational State of' => 'Bolivia, Plurinational State of',
+    'country_Bosnia and Herzegovina' => 'Bosnia and Herzegovina',
+    'country_Botswana' => 'Botswana',
+    'country_Bouvet Island' => 'Bouvet Island',
+    'country_Brazil' => 'Brazil',
+    'country_Belize' => 'Belize',
+    'country_British Indian Ocean Territory' => 'British Indian Ocean Territory',
+    'country_Solomon Islands' => 'Solomon Islands',
+    'country_Virgin Islands, British' => 'Virgin Islands, British',
+    'country_Brunei Darussalam' => 'Brunei Darussalam',
+    'country_Bulgaria' => 'Bulgaria',
+    'country_Myanmar' => 'Myanmar',
+    'country_Burundi' => 'Burundi',
+    'country_Belarus' => 'Belarus',
+    'country_Cambodia' => 'Cambodia',
+    'country_Cameroon' => 'Cameroon',
+    'country_Canada' => 'Canada',
+    'country_Cape Verde' => 'Cape Verde',
+    'country_Cayman Islands' => 'Cayman Islands',
+    'country_Central African Republic' => 'Central African Republic',
+    'country_Sri Lanka' => 'Sri Lanka',
+    'country_Chad' => 'Chad',
+    'country_Chile' => 'Chile',
+    'country_China' => 'China',
+    'country_Taiwan, Province of China' => 'Taiwan, Province of China',
+    'country_Christmas Island' => 'Christmas Island',
+    'country_Cocos (Keeling) Islands' => 'Cocos (Keeling) Islands',
+    'country_Colombia' => 'Colombia',
+    'country_Comoros' => 'Comoros',
+    'country_Mayotte' => 'Mayotte',
+    'country_Congo' => 'Congo',
+    'country_Congo, the Democratic Republic of the' => 'Congo, the Democratic Republic of the',
+    'country_Cook Islands' => 'Cook Islands',
+    'country_Costa Rica' => 'Costa Rica',
+    'country_Croatia' => 'Croatia',
+    'country_Cuba' => 'Cuba',
+    'country_Cyprus' => 'Cyprus',
+    'country_Czech Republic' => 'Czech Republic',
+    'country_Benin' => 'Benin',
+    'country_Denmark' => 'Denmark',
+    'country_Dominica' => 'Dominica',
+    'country_Dominican Republic' => 'Dominican Republic',
+    'country_Ecuador' => 'Ecuador',
+    'country_El Salvador' => 'El Salvador',
+    'country_Equatorial Guinea' => 'Equatorial Guinea',
+    'country_Ethiopia' => 'Ethiopia',
+    'country_Eritrea' => 'Eritrea',
+    'country_Estonia' => 'Estonia',
+    'country_Faroe Islands' => 'Faroe Islands',
+    'country_Falkland Islands (Malvinas)' => 'Falkland Islands (Malvinas)',
+    'country_South Georgia and the South Sandwich Islands' => 'South Georgia and the South Sandwich Islands',
+    'country_Fiji' => 'Fiji',
+    'country_Finland' => 'Finland',
+    'country_Åland Islands' => 'Åland Islands',
+    'country_France' => 'France',
+    'country_French Guiana' => 'French Guiana',
+    'country_French Polynesia' => 'French Polynesia',
+    'country_French Southern Territories' => 'French Southern Territories',
+    'country_Djibouti' => 'Djibouti',
+    'country_Gabon' => 'Gabon',
+    'country_Georgia' => 'Georgia',
+    'country_Gambia' => 'Gambia',
+    'country_Palestinian Territory, Occupied' => 'Palestinian Territory, Occupied',
+    'country_Germany' => 'Germany',
+    'country_Ghana' => 'Ghana',
+    'country_Gibraltar' => 'Gibraltar',
+    'country_Kiribati' => 'Kiribati',
+    'country_Greece' => 'Greece',
+    'country_Greenland' => 'Greenland',
+    'country_Grenada' => 'Grenada',
+    'country_Guadeloupe' => 'Guadeloupe',
+    'country_Guam' => 'Guam',
+    'country_Guatemala' => 'Guatemala',
+    'country_Guinea' => 'Guinea',
+    'country_Guyana' => 'Guyana',
+    'country_Haiti' => 'Haiti',
+    'country_Heard Island and McDonald Islands' => 'Heard Island and McDonald Islands',
+    'country_Holy See (Vatican City State)' => 'Holy See (Vatican City State)',
+    'country_Honduras' => 'Honduras',
+    'country_Hong Kong' => 'Hong Kong',
+    'country_Hungary' => 'Hungary',
+    'country_Iceland' => 'Iceland',
+    'country_India' => 'India',
+    'country_Indonesia' => 'Indonesia',
+    'country_Iran, Islamic Republic of' => 'Iran, Islamic Republic of',
+    'country_Iraq' => 'Iraq',
+    'country_Ireland' => 'Ireland',
+    'country_Israel' => 'Israel',
+    'country_Italy' => 'Italy',
+    'country_Côte d\'Ivoire' => 'Côte d\'Ivoire',
+    'country_Jamaica' => 'Jamaica',
+    'country_Japan' => 'Japan',
+    'country_Kazakhstan' => 'Kazakhstan',
+    'country_Jordan' => 'Jordan',
+    'country_Kenya' => 'Kenya',
+    'country_Korea, Democratic People\'s Republic of' => 'Korea, Democratic People\'s Republic of',
+    'country_Korea, Republic of' => 'Korea, Republic of',
+    'country_Kuwait' => 'Kuwait',
+    'country_Kyrgyzstan' => 'Kyrgyzstan',
+    'country_Lao People\'s Democratic Republic' => 'Lao People\'s Democratic Republic',
+    'country_Lebanon' => 'Lebanon',
+    'country_Lesotho' => 'Lesotho',
+    'country_Latvia' => 'Latvia',
+    'country_Liberia' => 'Liberia',
+    'country_Libya' => 'Libya',
+    'country_Liechtenstein' => 'Liechtenstein',
+    'country_Lithuania' => 'Lithuania',
+    'country_Luxembourg' => 'Luxembourg',
+    'country_Macao' => 'Macao',
+    'country_Madagascar' => 'Madagascar',
+    'country_Malawi' => 'Malawi',
+    'country_Malaysia' => 'Malaysia',
+    'country_Maldives' => 'Maldives',
+    'country_Mali' => 'Mali',
+    'country_Malta' => 'Malta',
+    'country_Martinique' => 'Martinique',
+    'country_Mauritania' => 'Mauritania',
+    'country_Mauritius' => 'Mauritius',
+    'country_Mexico' => 'Mexico',
+    'country_Monaco' => 'Monaco',
+    'country_Mongolia' => 'Mongolia',
+    'country_Moldova, Republic of' => 'Moldova, Republic of',
+    'country_Montenegro' => 'Montenegro',
+    'country_Montserrat' => 'Montserrat',
+    'country_Morocco' => 'Morocco',
+    'country_Mozambique' => 'Mozambique',
+    'country_Oman' => 'Oman',
+    'country_Namibia' => 'Namibia',
+    'country_Nauru' => 'Nauru',
+    'country_Nepal' => 'Nepal',
+    'country_Netherlands' => 'Netherlands',
+    'country_Curaçao' => 'Curaçao',
+    'country_Aruba' => 'Aruba',
+    'country_Sint Maarten (Dutch part)' => 'Sint Maarten (Dutch part)',
+    'country_Bonaire, Sint Eustatius and Saba' => 'Bonaire, Sint Eustatius and Saba',
+    'country_New Caledonia' => 'New Caledonia',
+    'country_Vanuatu' => 'Vanuatu',
+    'country_New Zealand' => 'New Zealand',
+    'country_Nicaragua' => 'Nicaragua',
+    'country_Niger' => 'Niger',
+    'country_Nigeria' => 'Nigeria',
+    'country_Niue' => 'Niue',
+    'country_Norfolk Island' => 'Norfolk Island',
+    'country_Norway' => 'Norway',
+    'country_Northern Mariana Islands' => 'Northern Mariana Islands',
+    'country_United States Minor Outlying Islands' => 'United States Minor Outlying Islands',
+    'country_Micronesia, Federated States of' => 'Micronesia, Federated States of',
+    'country_Marshall Islands' => 'Marshall Islands',
+    'country_Palau' => 'Palau',
+    'country_Pakistan' => 'Pakistan',
+    'country_Panama' => 'Panama',
+    'country_Papua New Guinea' => 'Papua New Guinea',
+    'country_Paraguay' => 'Paraguay',
+    'country_Peru' => 'Peru',
+    'country_Philippines' => 'Philippines',
+    'country_Pitcairn' => 'Pitcairn',
+    'country_Poland' => 'Poland',
+    'country_Portugal' => 'Portugal',
+    'country_Guinea-Bissau' => 'Guinea-Bissau',
+    'country_Timor-Leste' => 'Timor-Leste',
+    'country_Puerto Rico' => 'Puerto Rico',
+    'country_Qatar' => 'Qatar',
+    'country_Réunion' => 'Réunion',
+    'country_Romania' => 'Romania',
+    'country_Russian Federation' => 'Russian Federation',
+    'country_Rwanda' => 'Rwanda',
+    'country_Saint Barthélemy' => 'Saint Barthélemy',
+    'country_Saint Helena, Ascension and Tristan da Cunha' => 'Saint Helena, Ascension and Tristan da Cunha',
+    'country_Saint Kitts and Nevis' => 'Saint Kitts and Nevis',
+    'country_Anguilla' => 'Anguilla',
+    'country_Saint Lucia' => 'Saint Lucia',
+    'country_Saint Martin (French part)' => 'Saint Martin (French part)',
+    'country_Saint Pierre and Miquelon' => 'Saint Pierre and Miquelon',
+    'country_Saint Vincent and the Grenadines' => 'Saint Vincent and the Grenadines',
+    'country_San Marino' => 'San Marino',
+    'country_Sao Tome and Principe' => 'Sao Tome and Principe',
+    'country_Saudi Arabia' => 'Saudi Arabia',
+    'country_Senegal' => 'Senegal',
+    'country_Serbia' => 'Serbia',
+    'country_Seychelles' => 'Seychelles',
+    'country_Sierra Leone' => 'Sierra Leone',
+    'country_Singapore' => 'Singapore',
+    'country_Slovakia' => 'Slovakia',
+    'country_Viet Nam' => 'Viet Nam',
+    'country_Slovenia' => 'Slovenia',
+    'country_Somalia' => 'Somalia',
+    'country_South Africa' => 'South Africa',
+    'country_Zimbabwe' => 'Zimbabwe',
+    'country_Spain' => 'Spain',
+    'country_South Sudan' => 'South Sudan',
+    'country_Sudan' => 'Sudan',
+    'country_Western Sahara' => 'Western Sahara',
+    'country_Suriname' => 'Suriname',
+    'country_Svalbard and Jan Mayen' => 'Svalbard and Jan Mayen',
+    'country_Swaziland' => 'Swaziland',
+    'country_Sweden' => 'Sweden',
+    'country_Switzerland' => 'Switzerland',
+    'country_Syrian Arab Republic' => 'Syrian Arab Republic',
+    'country_Tajikistan' => 'Tajikistan',
+    'country_Thailand' => 'Thailand',
+    'country_Togo' => 'Togo',
+    'country_Tokelau' => 'Tokelau',
+    'country_Tonga' => 'Tonga',
+    'country_Trinidad and Tobago' => 'Trinidad and Tobago',
+    'country_United Arab Emirates' => 'United Arab Emirates',
+    'country_Tunisia' => 'Tunisia',
+    'country_Turkey' => 'Turkey',
+    'country_Turkmenistan' => 'Turkmenistan',
+    'country_Turks and Caicos Islands' => 'Turks and Caicos Islands',
+    'country_Tuvalu' => 'Tuvalu',
+    'country_Uganda' => 'Uganda',
+    '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_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_Virgin Islands, U.S.' => 'Virgin Islands, U.S.',
+    'country_Burkina Faso' => 'Burkina Faso',
+    'country_Uruguay' => 'Uruguay',
+    'country_Uzbekistan' => 'Uzbekistan',
+    'country_Venezuela, Bolivarian Republic of' => 'Venezuela, Bolivarian Republic of',
+    'country_Wallis and Futuna' => 'Wallis and Futuna',
+    'country_Samoa' => 'Samoa',
+    'country_Yemen' => 'Yemen',
+    'country_Zambi' => 'Zambi',
+
+    // Languages
+    'lang_Brazilian Portuguese' => 'Brazilian Portuguese',
+    'lang_Croatian' => 'Croatian',
+    'lang_Czech' => 'Czech',
+    'lang_Danish' => 'Danish',
+    'lang_Dutch' => 'Dutch',
+    'lang_English' => 'English',
+    'lang_French' => 'French',
+    'lang_French - Canada' => 'French - Canada',
+    'lang_German' => 'German',
+    'lang_Italian' => 'Italian',
+    'lang_Japanese' => 'Japanese',
+    'lang_Lithuanian' => 'Lithuanian',
+    'lang_Norwegian' => 'Norwegian',
+    'lang_Polish' => 'Polish',
+    'lang_Spanish' => 'Spanish',
+    'lang_Spanish - Spain' => 'Spanish - Spain',
+    'lang_Swedish' => 'Swedish',
+
+    // Frequencies
+    'freq_weekly' => 'Weekly',
+    'freq_two_weeks' => 'Two weeks',
+    'freq_four_weeks' => 'Four weeks',
+    'freq_monthly' => 'Monthly',
+    'freq_three_months' => 'Three months',
+    'freq_six_months' => 'Six months',
+    'freq_annually' => 'Annually',
+
+    // Payment types
+    'payment_type_Apply Credit' => 'Apply Credit',
+    'payment_type_Bank Transfer' => 'Bank Transfer',
+    'payment_type_Cash' => 'Cash',
+    'payment_type_Debit' => 'Debit',
+    'payment_type_ACH' => 'ACH',
+    'payment_type_Visa Card' => 'Visa Card',
+    'payment_type_MasterCard' => 'MasterCard',
+    'payment_type_American Express' => 'American Express',
+    'payment_type_Discover Card' => 'Discover Card',
+    'payment_type_Diners Card' => 'Diners Card',
+    'payment_type_EuroCard' => 'EuroCard',
+    'payment_type_Nova' => 'Nova',
+    'payment_type_Credit Card Other' => 'Credit Card Other',
+    'payment_type_PayPal' => 'PayPal',
+    'payment_type_Google Wallet' => 'Google Wallet',
+    'payment_type_Check' => 'Check',
+
+    // Industries
+    'industry_Accounting & Legal' => 'Accounting & Legal',
+    'industry_Advertising' => 'Advertising',
+    'industry_Aerospace' => 'Aerospace',
+    'industry_Agriculture' => 'Agriculture',
+    'industry_Automotive' => 'Automotive',
+    'industry_Banking & Finance' => 'Banking & Finance',
+    'industry_Biotechnology' => 'Biotechnology',
+    'industry_Broadcasting' => 'Broadcasting',
+    'industry_Business Services' => 'Business Services',
+    'industry_Commodities & Chemicals' => 'Commodities & Chemicals',
+    'industry_Communications' => 'Communications',
+    'industry_Computers & Hightech' => 'Computers & Hightech',
+    'industry_Defense' => 'Defense',
+    'industry_Energy' => 'Energy',
+    'industry_Entertainment' => 'Entertainment',
+    'industry_Government' => 'Government',
+    'industry_Healthcare & Life Sciences' => 'Healthcare & Life Sciences',
+    'industry_Insurance' => 'Insurance',
+    'industry_Manufacturing' => 'Manufacturing',
+    'industry_Marketing' => 'Marketing',
+    'industry_Media' => 'Media',
+    'industry_Nonprofit & Higher Ed' => 'Nonprofit & Higher Ed',
+    'industry_Pharmaceuticals' => 'Pharmaceuticals',
+    'industry_Professional Services & Consulting' => 'Professional Services & Consulting',
+    'industry_Real Estate' => 'Real Estate',
+    'industry_Retail & Wholesale' => 'Retail & Wholesale',
+    'industry_Sports' => 'Sports',
+    'industry_Transportation' => 'Transportation',
+    'industry_Travel & Luxury' => 'Travel & Luxury',
+    'industry_Other' => 'Other',
+    'industry_Photography' =>'Photography',
+
+    // Countries
+    'country_Afghanistan' => 'Afghanistan',
+    'country_Albania' => 'Albania',
+    'country_Antarctica' => 'Antarctica',
+    'country_Algeria' => 'Algeria',
+    'country_American Samoa' => 'American Samoa',
+    'country_Andorra' => 'Andorra',
+    'country_Angola' => 'Angola',
+    'country_Antigua and Barbuda' => 'Antigua and Barbuda',
+    'country_Azerbaijan' => 'Azerbaijan',
+    'country_Argentina' => 'Argentina',
+    'country_Australia' => 'Australia',
+    'country_Austria' => 'Austria',
+    'country_Bahamas' => 'Bahamas',
+    'country_Bahrain' => 'Bahrain',
+    'country_Bangladesh' => 'Bangladesh',
+    'country_Armenia' => 'Armenia',
+    'country_Barbados' => 'Barbados',
+    'country_Belgium' => 'Belgium',
+    'country_Bermuda' => 'Bermuda',
+    'country_Bhutan' => 'Bhutan',
+    'country_Bolivia, Plurinational State of' => 'Bolivia, Plurinational State of',
+    'country_Bosnia and Herzegovina' => 'Bosnia and Herzegovina',
+    'country_Botswana' => 'Botswana',
+    'country_Bouvet Island' => 'Bouvet Island',
+    'country_Brazil' => 'Brazil',
+    'country_Belize' => 'Belize',
+    'country_British Indian Ocean Territory' => 'British Indian Ocean Territory',
+    'country_Solomon Islands' => 'Solomon Islands',
+    'country_Virgin Islands, British' => 'Virgin Islands, British',
+    'country_Brunei Darussalam' => 'Brunei Darussalam',
+    'country_Bulgaria' => 'Bulgaria',
+    'country_Myanmar' => 'Myanmar',
+    'country_Burundi' => 'Burundi',
+    'country_Belarus' => 'Belarus',
+    'country_Cambodia' => 'Cambodia',
+    'country_Cameroon' => 'Cameroon',
+    'country_Canada' => 'Canada',
+    'country_Cape Verde' => 'Cape Verde',
+    'country_Cayman Islands' => 'Cayman Islands',
+    'country_Central African Republic' => 'Central African Republic',
+    'country_Sri Lanka' => 'Sri Lanka',
+    'country_Chad' => 'Chad',
+    'country_Chile' => 'Chile',
+    'country_China' => 'China',
+    'country_Taiwan, Province of China' => 'Taiwan, Province of China',
+    'country_Christmas Island' => 'Christmas Island',
+    'country_Cocos (Keeling) Islands' => 'Cocos (Keeling) Islands',
+    'country_Colombia' => 'Colombia',
+    'country_Comoros' => 'Comoros',
+    'country_Mayotte' => 'Mayotte',
+    'country_Congo' => 'Congo',
+    'country_Congo, the Democratic Republic of the' => 'Congo, the Democratic Republic of the',
+    'country_Cook Islands' => 'Cook Islands',
+    'country_Costa Rica' => 'Costa Rica',
+    'country_Croatia' => 'Croatia',
+    'country_Cuba' => 'Cuba',
+    'country_Cyprus' => 'Cyprus',
+    'country_Czech Republic' => 'Czech Republic',
+    'country_Benin' => 'Benin',
+    'country_Denmark' => 'Denmark',
+    'country_Dominica' => 'Dominica',
+    'country_Dominican Republic' => 'Dominican Republic',
+    'country_Ecuador' => 'Ecuador',
+    'country_El Salvador' => 'El Salvador',
+    'country_Equatorial Guinea' => 'Equatorial Guinea',
+    'country_Ethiopia' => 'Ethiopia',
+    'country_Eritrea' => 'Eritrea',
+    'country_Estonia' => 'Estonia',
+    'country_Faroe Islands' => 'Faroe Islands',
+    'country_Falkland Islands (Malvinas)' => 'Falkland Islands (Malvinas)',
+    'country_South Georgia and the South Sandwich Islands' => 'South Georgia and the South Sandwich Islands',
+    'country_Fiji' => 'Fiji',
+    'country_Finland' => 'Finland',
+    'country_Åland Islands' => 'Åland Islands',
+    'country_France' => 'France',
+    'country_French Guiana' => 'French Guiana',
+    'country_French Polynesia' => 'French Polynesia',
+    'country_French Southern Territories' => 'French Southern Territories',
+    'country_Djibouti' => 'Djibouti',
+    'country_Gabon' => 'Gabon',
+    'country_Georgia' => 'Georgia',
+    'country_Gambia' => 'Gambia',
+    'country_Palestinian Territory, Occupied' => 'Palestinian Territory, Occupied',
+    'country_Germany' => 'Germany',
+    'country_Ghana' => 'Ghana',
+    'country_Gibraltar' => 'Gibraltar',
+    'country_Kiribati' => 'Kiribati',
+    'country_Greece' => 'Greece',
+    'country_Greenland' => 'Greenland',
+    'country_Grenada' => 'Grenada',
+    'country_Guadeloupe' => 'Guadeloupe',
+    'country_Guam' => 'Guam',
+    'country_Guatemala' => 'Guatemala',
+    'country_Guinea' => 'Guinea',
+    'country_Guyana' => 'Guyana',
+    'country_Haiti' => 'Haiti',
+    'country_Heard Island and McDonald Islands' => 'Heard Island and McDonald Islands',
+    'country_Holy See (Vatican City State)' => 'Holy See (Vatican City State)',
+    'country_Honduras' => 'Honduras',
+    'country_Hong Kong' => 'Hong Kong',
+    'country_Hungary' => 'Hungary',
+    'country_Iceland' => 'Iceland',
+    'country_India' => 'India',
+    'country_Indonesia' => 'Indonesia',
+    'country_Iran, Islamic Republic of' => 'Iran, Islamic Republic of',
+    'country_Iraq' => 'Iraq',
+    'country_Ireland' => 'Ireland',
+    'country_Israel' => 'Israel',
+    'country_Italy' => 'Italy',
+    'country_Côte d\'Ivoire' => 'Côte d\'Ivoire',
+    'country_Jamaica' => 'Jamaica',
+    'country_Japan' => 'Japan',
+    'country_Kazakhstan' => 'Kazakhstan',
+    'country_Jordan' => 'Jordan',
+    'country_Kenya' => 'Kenya',
+    'country_Korea, Democratic People\'s Republic of' => 'Korea, Democratic People\'s Republic of',
+    'country_Korea, Republic of' => 'Korea, Republic of',
+    'country_Kuwait' => 'Kuwait',
+    'country_Kyrgyzstan' => 'Kyrgyzstan',
+    'country_Lao People\'s Democratic Republic' => 'Lao People\'s Democratic Republic',
+    'country_Lebanon' => 'Lebanon',
+    'country_Lesotho' => 'Lesotho',
+    'country_Latvia' => 'Latvia',
+    'country_Liberia' => 'Liberia',
+    'country_Libya' => 'Libya',
+    'country_Liechtenstein' => 'Liechtenstein',
+    'country_Lithuania' => 'Lithuania',
+    'country_Luxembourg' => 'Luxembourg',
+    'country_Macao' => 'Macao',
+    'country_Madagascar' => 'Madagascar',
+    'country_Malawi' => 'Malawi',
+    'country_Malaysia' => 'Malaysia',
+    'country_Maldives' => 'Maldives',
+    'country_Mali' => 'Mali',
+    'country_Malta' => 'Malta',
+    'country_Martinique' => 'Martinique',
+    'country_Mauritania' => 'Mauritania',
+    'country_Mauritius' => 'Mauritius',
+    'country_Mexico' => 'Mexico',
+    'country_Monaco' => 'Monaco',
+    'country_Mongolia' => 'Mongolia',
+    'country_Moldova, Republic of' => 'Moldova, Republic of',
+    'country_Montenegro' => 'Montenegro',
+    'country_Montserrat' => 'Montserrat',
+    'country_Morocco' => 'Morocco',
+    'country_Mozambique' => 'Mozambique',
+    'country_Oman' => 'Oman',
+    'country_Namibia' => 'Namibia',
+    'country_Nauru' => 'Nauru',
+    'country_Nepal' => 'Nepal',
+    'country_Netherlands' => 'Netherlands',
+    'country_Curaçao' => 'Curaçao',
+    'country_Aruba' => 'Aruba',
+    'country_Sint Maarten (Dutch part)' => 'Sint Maarten (Dutch part)',
+    'country_Bonaire, Sint Eustatius and Saba' => 'Bonaire, Sint Eustatius and Saba',
+    'country_New Caledonia' => 'New Caledonia',
+    'country_Vanuatu' => 'Vanuatu',
+    'country_New Zealand' => 'New Zealand',
+    'country_Nicaragua' => 'Nicaragua',
+    'country_Niger' => 'Niger',
+    'country_Nigeria' => 'Nigeria',
+    'country_Niue' => 'Niue',
+    'country_Norfolk Island' => 'Norfolk Island',
+    'country_Norway' => 'Norway',
+    'country_Northern Mariana Islands' => 'Northern Mariana Islands',
+    'country_United States Minor Outlying Islands' => 'United States Minor Outlying Islands',
+    'country_Micronesia, Federated States of' => 'Micronesia, Federated States of',
+    'country_Marshall Islands' => 'Marshall Islands',
+    'country_Palau' => 'Palau',
+    'country_Pakistan' => 'Pakistan',
+    'country_Panama' => 'Panama',
+    'country_Papua New Guinea' => 'Papua New Guinea',
+    'country_Paraguay' => 'Paraguay',
+    'country_Peru' => 'Peru',
+    'country_Philippines' => 'Philippines',
+    'country_Pitcairn' => 'Pitcairn',
+    'country_Poland' => 'Poland',
+    'country_Portugal' => 'Portugal',
+    'country_Guinea-Bissau' => 'Guinea-Bissau',
+    'country_Timor-Leste' => 'Timor-Leste',
+    'country_Puerto Rico' => 'Puerto Rico',
+    'country_Qatar' => 'Qatar',
+    'country_Réunion' => 'Réunion',
+    'country_Romania' => 'Romania',
+    'country_Russian Federation' => 'Russian Federation',
+    'country_Rwanda' => 'Rwanda',
+    'country_Saint Barthélemy' => 'Saint Barthélemy',
+    'country_Saint Helena, Ascension and Tristan da Cunha' => 'Saint Helena, Ascension and Tristan da Cunha',
+    'country_Saint Kitts and Nevis' => 'Saint Kitts and Nevis',
+    'country_Anguilla' => 'Anguilla',
+    'country_Saint Lucia' => 'Saint Lucia',
+    'country_Saint Martin (French part)' => 'Saint Martin (French part)',
+    'country_Saint Pierre and Miquelon' => 'Saint Pierre and Miquelon',
+    'country_Saint Vincent and the Grenadines' => 'Saint Vincent and the Grenadines',
+    'country_San Marino' => 'San Marino',
+    'country_Sao Tome and Principe' => 'Sao Tome and Principe',
+    'country_Saudi Arabia' => 'Saudi Arabia',
+    'country_Senegal' => 'Senegal',
+    'country_Serbia' => 'Serbia',
+    'country_Seychelles' => 'Seychelles',
+    'country_Sierra Leone' => 'Sierra Leone',
+    'country_Singapore' => 'Singapore',
+    'country_Slovakia' => 'Slovakia',
+    'country_Viet Nam' => 'Viet Nam',
+    'country_Slovenia' => 'Slovenia',
+    'country_Somalia' => 'Somalia',
+    'country_South Africa' => 'South Africa',
+    'country_Zimbabwe' => 'Zimbabwe',
+    'country_Spain' => 'Spain',
+    'country_South Sudan' => 'South Sudan',
+    'country_Sudan' => 'Sudan',
+    'country_Western Sahara' => 'Western Sahara',
+    'country_Suriname' => 'Suriname',
+    'country_Svalbard and Jan Mayen' => 'Svalbard and Jan Mayen',
+    'country_Swaziland' => 'Swaziland',
+    'country_Sweden' => 'Sweden',
+    'country_Switzerland' => 'Switzerland',
+    'country_Syrian Arab Republic' => 'Syrian Arab Republic',
+    'country_Tajikistan' => 'Tajikistan',
+    'country_Thailand' => 'Thailand',
+    'country_Togo' => 'Togo',
+    'country_Tokelau' => 'Tokelau',
+    'country_Tonga' => 'Tonga',
+    'country_Trinidad and Tobago' => 'Trinidad and Tobago',
+    'country_United Arab Emirates' => 'United Arab Emirates',
+    'country_Tunisia' => 'Tunisia',
+    'country_Turkey' => 'Turkey',
+    'country_Turkmenistan' => 'Turkmenistan',
+    'country_Turks and Caicos Islands' => 'Turks and Caicos Islands',
+    'country_Tuvalu' => 'Tuvalu',
+    'country_Uganda' => 'Uganda',
+    '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_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_Virgin Islands, U.S.' => 'Virgin Islands, U.S.',
+    'country_Burkina Faso' => 'Burkina Faso',
+    'country_Uruguay' => 'Uruguay',
+    'country_Uzbekistan' => 'Uzbekistan',
+    'country_Venezuela, Bolivarian Republic of' => 'Venezuela, Bolivarian Republic of',
+    'country_Wallis and Futuna' => 'Wallis and Futuna',
+    'country_Samoa' => 'Samoa',
+    'country_Yemen' => 'Yemen',
+    'country_Zambi' => 'Zambi',
+
+    'view_client_portal' => 'View client portal',
+    'view_portal' => 'View Portal',
+    'vendor_contacts' => 'Vendor Contacts',
+    'all' => 'All',
+    'selected' => 'Selected',
+    'category' => 'Category',
+    'categories' => 'Categories',
+    'new_expense_category' => 'New Expense Category',
+    'edit_category' => 'Edit Category',
+    'archive_expense_category' => 'Archive Category',
+    'expense_categories' => 'Expense Categories',
+    'list_expense_categories' => 'List Expense Categories',
+    'updated_expense_category' => 'Successfully updated expense category',
+    'created_expense_category' => 'Successfully created expense category',
+    'archived_expense_category' => 'Successfully archived expense category',
+    'archived_expense_categories' => 'Successfully archived :count expense category',
+    'restore_expense_category' => 'Restore expense category',
+    'restored_expense_category' => 'Successfully restored expense category',
+    'apply_taxes' => 'Apply taxes',
+    'min_to_max_users' => ':min to :max users',
+    'max_users_reached' => 'The maximum number of users has been reached.',
+    'buy_now_buttons' => 'Buy Now Buttons',
+    'landing_page' => 'Landing Page',
+    'payment_type' => 'Payment Type',
+    'form' => 'Form',
+    'link' => 'Link',
+    'fields' => 'Fields',
+    'dwolla' => 'Dwolla',
+    'buy_now_buttons_warning' => 'Note: client and invoice records are created even if the transaction isn\'t completed.',
+    'buy_now_buttons_disabled' => 'This feature requires that a product is created and a payment gateway is configured.',
+    'enable_buy_now_buttons_help' => 'Enable support for buy now buttons',
+    'changes_take_effect_immediately' => 'Note: changes take effect immediately',
+    'wepay_account_description' => 'Payment gateway for Invoice Ninja',
+    'payment_error_code' => 'There was an error processing your payment [:code]. Please try again later.',
+    'standard_fees_apply' => 'Standard fees apply: 2.9% + $0.30 per successful charge.',
+    'limit_import_rows' => 'Data needs to be imported in batches of :count rows or less',
+
 
 );
 

resources/lang/es_ES/texts.php

@@ -1,6 +1,7 @@
 <?php
 
 $LANG = array(
+
     'organization' => 'Empresa',
     'name' => 'Nombre',
     'website' => 'Sitio Web',
@@ -380,7 +381,7 @@ $LANG = array(
     'gateway_help_1' => ':link para registrarse en Authorize.net.',
     'gateway_help_2' => ':link para registrarse en Authorize.net.',
     'gateway_help_17' => ':link para obtener su firma API de PayPal.',
-    'gateway_help_27' => ':link para registrarse en TwoCheckout.',
+    'gateway_help_27' => ':link to sign up for 2Checkout.com. To ensure payments are tracked set :complete_link as the redirect URL under Account > Site Management in the 2Checkout portal.',
     'more_designs' => 'Más diseños',
     'more_designs_title' => 'Diseños adicionales para factura',
     'more_designs_cloud_header' => 'Pase a Pro para añadir más diseños de facturas',
@@ -767,6 +768,8 @@ $LANG = array(
     'activity_35' => ':user created :vendor',
     'activity_36' => ':user created :vendor',
     'activity_37' => ':user created :vendor',
+    'activity_42' => ':user created task ":task"',
+    'activity_43' => ':user updated task ":task"',
     'payment' => 'Pago',
     'system' => 'Sistema',
     'signature' => 'Firma del correo',
@@ -985,7 +988,7 @@ $LANG = array(
     'overdue' => 'Overdue',
 
 
-    'white_label_text' => 'Purchase a ONE YEAR white label license for $:price to remove the Invoice Ninja branding from the client portal and help support our project.',
+    'white_label_text' => 'Purchase a ONE YEAR white label license for $:price to remove the Invoice Ninja branding and help support our project.',
     'user_email_footer' => 'Para ajustar la configuración de las notificaciones de tu email, visita :link',
     'reset_password_footer' => 'Si no has solicitado un cambio de contraseña, por favor contactate con nosostros: :email',
     'limit_users' => 'Lo sentimos, esta acción excederá el límite de :limit usarios',
@@ -1286,7 +1289,7 @@ $LANG = array(
     'wepay_tos_agree' => 'I agree to the :link.',
     'wepay_tos_link_text' => 'WePay Terms of Service',
     'resend_confirmation_email' => 'Resend Confirmation Email',
-    'manage_wepay_account' => 'Manage WePay Account',
+    'manage_account' => 'Manage Account',
     'action_required' => 'Action Required',
     'finish_setup' => 'Finish Setup',
     'created_wepay_confirmation_required' => 'Please check your email and confirm your email address with WePay.',
@@ -1354,6 +1357,686 @@ $LANG = array(
     'failed_remove_payment_method' => 'Failed to remove the payment method',
     'gateway_exists' => 'This gateway already exists',
     'manual_entry' => 'Manual entry',
+    'start_of_week' => 'First day of the week',
+
+    // Frequencies
+    'freq_weekly' => 'Weekly',
+    'freq_two_weeks' => 'Two weeks',
+    'freq_four_weeks' => 'Four weeks',
+    'freq_monthly' => 'Monthly',
+    'freq_three_months' => 'Three months',
+    'freq_six_months' => 'Six months',
+    'freq_annually' => 'Annually',
+
+    // Payment types
+    'payment_type_Apply Credit' => 'Apply Credit',
+    'payment_type_Bank Transfer' => 'Bank Transfer',
+    'payment_type_Cash' => 'Cash',
+    'payment_type_Debit' => 'Debit',
+    'payment_type_ACH' => 'ACH',
+    'payment_type_Visa Card' => 'Visa Card',
+    'payment_type_MasterCard' => 'MasterCard',
+    'payment_type_American Express' => 'American Express',
+    'payment_type_Discover Card' => 'Discover Card',
+    'payment_type_Diners Card' => 'Diners Card',
+    'payment_type_EuroCard' => 'EuroCard',
+    'payment_type_Nova' => 'Nova',
+    'payment_type_Credit Card Other' => 'Credit Card Other',
+    'payment_type_PayPal' => 'PayPal',
+    'payment_type_Google Wallet' => 'Google Wallet',
+    'payment_type_Check' => 'Check',
+
+    // Industries
+    'industry_Accounting & Legal' => 'Accounting & Legal',
+    'industry_Advertising' => 'Advertising',
+    'industry_Aerospace' => 'Aerospace',
+    'industry_Agriculture' => 'Agriculture',
+    'industry_Automotive' => 'Automotive',
+    'industry_Banking & Finance' => 'Banking & Finance',
+    'industry_Biotechnology' => 'Biotechnology',
+    'industry_Broadcasting' => 'Broadcasting',
+    'industry_Business Services' => 'Business Services',
+    'industry_Commodities & Chemicals' => 'Commodities & Chemicals',
+    'industry_Communications' => 'Communications',
+    'industry_Computers & Hightech' => 'Computers & Hightech',
+    'industry_Defense' => 'Defense',
+    'industry_Energy' => 'Energy',
+    'industry_Entertainment' => 'Entertainment',
+    'industry_Government' => 'Government',
+    'industry_Healthcare & Life Sciences' => 'Healthcare & Life Sciences',
+    'industry_Insurance' => 'Insurance',
+    'industry_Manufacturing' => 'Manufacturing',
+    'industry_Marketing' => 'Marketing',
+    'industry_Media' => 'Media',
+    'industry_Nonprofit & Higher Ed' => 'Nonprofit & Higher Ed',
+    'industry_Pharmaceuticals' => 'Pharmaceuticals',
+    'industry_Professional Services & Consulting' => 'Professional Services & Consulting',
+    'industry_Real Estate' => 'Real Estate',
+    'industry_Retail & Wholesale' => 'Retail & Wholesale',
+    'industry_Sports' => 'Sports',
+    'industry_Transportation' => 'Transportation',
+    'industry_Travel & Luxury' => 'Travel & Luxury',
+    'industry_Other' => 'Other',
+    'industry_Photography' =>'Photography',
+
+    // Countries
+    'country_Afghanistan' => 'Afghanistan',
+    'country_Albania' => 'Albania',
+    'country_Antarctica' => 'Antarctica',
+    'country_Algeria' => 'Algeria',
+    'country_American Samoa' => 'American Samoa',
+    'country_Andorra' => 'Andorra',
+    'country_Angola' => 'Angola',
+    'country_Antigua and Barbuda' => 'Antigua and Barbuda',
+    'country_Azerbaijan' => 'Azerbaijan',
+    'country_Argentina' => 'Argentina',
+    'country_Australia' => 'Australia',
+    'country_Austria' => 'Austria',
+    'country_Bahamas' => 'Bahamas',
+    'country_Bahrain' => 'Bahrain',
+    'country_Bangladesh' => 'Bangladesh',
+    'country_Armenia' => 'Armenia',
+    'country_Barbados' => 'Barbados',
+    'country_Belgium' => 'Belgium',
+    'country_Bermuda' => 'Bermuda',
+    'country_Bhutan' => 'Bhutan',
+    'country_Bolivia, Plurinational State of' => 'Bolivia, Plurinational State of',
+    'country_Bosnia and Herzegovina' => 'Bosnia and Herzegovina',
+    'country_Botswana' => 'Botswana',
+    'country_Bouvet Island' => 'Bouvet Island',
+    'country_Brazil' => 'Brazil',
+    'country_Belize' => 'Belize',
+    'country_British Indian Ocean Territory' => 'British Indian Ocean Territory',
+    'country_Solomon Islands' => 'Solomon Islands',
+    'country_Virgin Islands, British' => 'Virgin Islands, British',
+    'country_Brunei Darussalam' => 'Brunei Darussalam',
+    'country_Bulgaria' => 'Bulgaria',
+    'country_Myanmar' => 'Myanmar',
+    'country_Burundi' => 'Burundi',
+    'country_Belarus' => 'Belarus',
+    'country_Cambodia' => 'Cambodia',
+    'country_Cameroon' => 'Cameroon',
+    'country_Canada' => 'Canada',
+    'country_Cape Verde' => 'Cape Verde',
+    'country_Cayman Islands' => 'Cayman Islands',
+    'country_Central African Republic' => 'Central African Republic',
+    'country_Sri Lanka' => 'Sri Lanka',
+    'country_Chad' => 'Chad',
+    'country_Chile' => 'Chile',
+    'country_China' => 'China',
+    'country_Taiwan, Province of China' => 'Taiwan, Province of China',
+    'country_Christmas Island' => 'Christmas Island',
+    'country_Cocos (Keeling) Islands' => 'Cocos (Keeling) Islands',
+    'country_Colombia' => 'Colombia',
+    'country_Comoros' => 'Comoros',
+    'country_Mayotte' => 'Mayotte',
+    'country_Congo' => 'Congo',
+    'country_Congo, the Democratic Republic of the' => 'Congo, the Democratic Republic of the',
+    'country_Cook Islands' => 'Cook Islands',
+    'country_Costa Rica' => 'Costa Rica',
+    'country_Croatia' => 'Croatia',
+    'country_Cuba' => 'Cuba',
+    'country_Cyprus' => 'Cyprus',
+    'country_Czech Republic' => 'Czech Republic',
+    'country_Benin' => 'Benin',
+    'country_Denmark' => 'Denmark',
+    'country_Dominica' => 'Dominica',
+    'country_Dominican Republic' => 'Dominican Republic',
+    'country_Ecuador' => 'Ecuador',
+    'country_El Salvador' => 'El Salvador',
+    'country_Equatorial Guinea' => 'Equatorial Guinea',
+    'country_Ethiopia' => 'Ethiopia',
+    'country_Eritrea' => 'Eritrea',
+    'country_Estonia' => 'Estonia',
+    'country_Faroe Islands' => 'Faroe Islands',
+    'country_Falkland Islands (Malvinas)' => 'Falkland Islands (Malvinas)',
+    'country_South Georgia and the South Sandwich Islands' => 'South Georgia and the South Sandwich Islands',
+    'country_Fiji' => 'Fiji',
+    'country_Finland' => 'Finland',
+    'country_Åland Islands' => 'Åland Islands',
+    'country_France' => 'France',
+    'country_French Guiana' => 'French Guiana',
+    'country_French Polynesia' => 'French Polynesia',
+    'country_French Southern Territories' => 'French Southern Territories',
+    'country_Djibouti' => 'Djibouti',
+    'country_Gabon' => 'Gabon',
+    'country_Georgia' => 'Georgia',
+    'country_Gambia' => 'Gambia',
+    'country_Palestinian Territory, Occupied' => 'Palestinian Territory, Occupied',
+    'country_Germany' => 'Germany',
+    'country_Ghana' => 'Ghana',
+    'country_Gibraltar' => 'Gibraltar',
+    'country_Kiribati' => 'Kiribati',
+    'country_Greece' => 'Greece',
+    'country_Greenland' => 'Greenland',
+    'country_Grenada' => 'Grenada',
+    'country_Guadeloupe' => 'Guadeloupe',
+    'country_Guam' => 'Guam',
+    'country_Guatemala' => 'Guatemala',
+    'country_Guinea' => 'Guinea',
+    'country_Guyana' => 'Guyana',
+    'country_Haiti' => 'Haiti',
+    'country_Heard Island and McDonald Islands' => 'Heard Island and McDonald Islands',
+    'country_Holy See (Vatican City State)' => 'Holy See (Vatican City State)',
+    'country_Honduras' => 'Honduras',
+    'country_Hong Kong' => 'Hong Kong',
+    'country_Hungary' => 'Hungary',
+    'country_Iceland' => 'Iceland',
+    'country_India' => 'India',
+    'country_Indonesia' => 'Indonesia',
+    'country_Iran, Islamic Republic of' => 'Iran, Islamic Republic of',
+    'country_Iraq' => 'Iraq',
+    'country_Ireland' => 'Ireland',
+    'country_Israel' => 'Israel',
+    'country_Italy' => 'Italy',
+    'country_Côte d\'Ivoire' => 'Côte d\'Ivoire',
+    'country_Jamaica' => 'Jamaica',
+    'country_Japan' => 'Japan',
+    'country_Kazakhstan' => 'Kazakhstan',
+    'country_Jordan' => 'Jordan',
+    'country_Kenya' => 'Kenya',
+    'country_Korea, Democratic People\'s Republic of' => 'Korea, Democratic People\'s Republic of',
+    'country_Korea, Republic of' => 'Korea, Republic of',
+    'country_Kuwait' => 'Kuwait',
+    'country_Kyrgyzstan' => 'Kyrgyzstan',
+    'country_Lao People\'s Democratic Republic' => 'Lao People\'s Democratic Republic',
+    'country_Lebanon' => 'Lebanon',
+    'country_Lesotho' => 'Lesotho',
+    'country_Latvia' => 'Latvia',
+    'country_Liberia' => 'Liberia',
+    'country_Libya' => 'Libya',
+    'country_Liechtenstein' => 'Liechtenstein',
+    'country_Lithuania' => 'Lithuania',
+    'country_Luxembourg' => 'Luxembourg',
+    'country_Macao' => 'Macao',
+    'country_Madagascar' => 'Madagascar',
+    'country_Malawi' => 'Malawi',
+    'country_Malaysia' => 'Malaysia',
+    'country_Maldives' => 'Maldives',
+    'country_Mali' => 'Mali',
+    'country_Malta' => 'Malta',
+    'country_Martinique' => 'Martinique',
+    'country_Mauritania' => 'Mauritania',
+    'country_Mauritius' => 'Mauritius',
+    'country_Mexico' => 'Mexico',
+    'country_Monaco' => 'Monaco',
+    'country_Mongolia' => 'Mongolia',
+    'country_Moldova, Republic of' => 'Moldova, Republic of',
+    'country_Montenegro' => 'Montenegro',
+    'country_Montserrat' => 'Montserrat',
+    'country_Morocco' => 'Morocco',
+    'country_Mozambique' => 'Mozambique',
+    'country_Oman' => 'Oman',
+    'country_Namibia' => 'Namibia',
+    'country_Nauru' => 'Nauru',
+    'country_Nepal' => 'Nepal',
+    'country_Netherlands' => 'Netherlands',
+    'country_Curaçao' => 'Curaçao',
+    'country_Aruba' => 'Aruba',
+    'country_Sint Maarten (Dutch part)' => 'Sint Maarten (Dutch part)',
+    'country_Bonaire, Sint Eustatius and Saba' => 'Bonaire, Sint Eustatius and Saba',
+    'country_New Caledonia' => 'New Caledonia',
+    'country_Vanuatu' => 'Vanuatu',
+    'country_New Zealand' => 'New Zealand',
+    'country_Nicaragua' => 'Nicaragua',
+    'country_Niger' => 'Niger',
+    'country_Nigeria' => 'Nigeria',
+    'country_Niue' => 'Niue',
+    'country_Norfolk Island' => 'Norfolk Island',
+    'country_Norway' => 'Norway',
+    'country_Northern Mariana Islands' => 'Northern Mariana Islands',
+    'country_United States Minor Outlying Islands' => 'United States Minor Outlying Islands',
+    'country_Micronesia, Federated States of' => 'Micronesia, Federated States of',
+    'country_Marshall Islands' => 'Marshall Islands',
+    'country_Palau' => 'Palau',
+    'country_Pakistan' => 'Pakistan',
+    'country_Panama' => 'Panama',
+    'country_Papua New Guinea' => 'Papua New Guinea',
+    'country_Paraguay' => 'Paraguay',
+    'country_Peru' => 'Peru',
+    'country_Philippines' => 'Philippines',
+    'country_Pitcairn' => 'Pitcairn',
+    'country_Poland' => 'Poland',
+    'country_Portugal' => 'Portugal',
+    'country_Guinea-Bissau' => 'Guinea-Bissau',
+    'country_Timor-Leste' => 'Timor-Leste',
+    'country_Puerto Rico' => 'Puerto Rico',
+    'country_Qatar' => 'Qatar',
+    'country_Réunion' => 'Réunion',
+    'country_Romania' => 'Romania',
+    'country_Russian Federation' => 'Russian Federation',
+    'country_Rwanda' => 'Rwanda',
+    'country_Saint Barthélemy' => 'Saint Barthélemy',
+    'country_Saint Helena, Ascension and Tristan da Cunha' => 'Saint Helena, Ascension and Tristan da Cunha',
+    'country_Saint Kitts and Nevis' => 'Saint Kitts and Nevis',
+    'country_Anguilla' => 'Anguilla',
+    'country_Saint Lucia' => 'Saint Lucia',
+    'country_Saint Martin (French part)' => 'Saint Martin (French part)',
+    'country_Saint Pierre and Miquelon' => 'Saint Pierre and Miquelon',
+    'country_Saint Vincent and the Grenadines' => 'Saint Vincent and the Grenadines',
+    'country_San Marino' => 'San Marino',
+    'country_Sao Tome and Principe' => 'Sao Tome and Principe',
+    'country_Saudi Arabia' => 'Saudi Arabia',
+    'country_Senegal' => 'Senegal',
+    'country_Serbia' => 'Serbia',
+    'country_Seychelles' => 'Seychelles',
+    'country_Sierra Leone' => 'Sierra Leone',
+    'country_Singapore' => 'Singapore',
+    'country_Slovakia' => 'Slovakia',
+    'country_Viet Nam' => 'Viet Nam',
+    'country_Slovenia' => 'Slovenia',
+    'country_Somalia' => 'Somalia',
+    'country_South Africa' => 'South Africa',
+    'country_Zimbabwe' => 'Zimbabwe',
+    'country_Spain' => 'Spain',
+    'country_South Sudan' => 'South Sudan',
+    'country_Sudan' => 'Sudan',
+    'country_Western Sahara' => 'Western Sahara',
+    'country_Suriname' => 'Suriname',
+    'country_Svalbard and Jan Mayen' => 'Svalbard and Jan Mayen',
+    'country_Swaziland' => 'Swaziland',
+    'country_Sweden' => 'Sweden',
+    'country_Switzerland' => 'Switzerland',
+    'country_Syrian Arab Republic' => 'Syrian Arab Republic',
+    'country_Tajikistan' => 'Tajikistan',
+    'country_Thailand' => 'Thailand',
+    'country_Togo' => 'Togo',
+    'country_Tokelau' => 'Tokelau',
+    'country_Tonga' => 'Tonga',
+    'country_Trinidad and Tobago' => 'Trinidad and Tobago',
+    'country_United Arab Emirates' => 'United Arab Emirates',
+    'country_Tunisia' => 'Tunisia',
+    'country_Turkey' => 'Turkey',
+    'country_Turkmenistan' => 'Turkmenistan',
+    'country_Turks and Caicos Islands' => 'Turks and Caicos Islands',
+    'country_Tuvalu' => 'Tuvalu',
+    'country_Uganda' => 'Uganda',
+    '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_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_Virgin Islands, U.S.' => 'Virgin Islands, U.S.',
+    'country_Burkina Faso' => 'Burkina Faso',
+    'country_Uruguay' => 'Uruguay',
+    'country_Uzbekistan' => 'Uzbekistan',
+    'country_Venezuela, Bolivarian Republic of' => 'Venezuela, Bolivarian Republic of',
+    'country_Wallis and Futuna' => 'Wallis and Futuna',
+    'country_Samoa' => 'Samoa',
+    'country_Yemen' => 'Yemen',
+    'country_Zambi' => 'Zambi',
+
+    // Languages
+    'lang_Brazilian Portuguese' => 'Brazilian Portuguese',
+    'lang_Croatian' => 'Croatian',
+    'lang_Czech' => 'Czech',
+    'lang_Danish' => 'Danish',
+    'lang_Dutch' => 'Dutch',
+    'lang_English' => 'English',
+    'lang_French' => 'French',
+    'lang_French - Canada' => 'French - Canada',
+    'lang_German' => 'German',
+    'lang_Italian' => 'Italian',
+    'lang_Japanese' => 'Japanese',
+    'lang_Lithuanian' => 'Lithuanian',
+    'lang_Norwegian' => 'Norwegian',
+    'lang_Polish' => 'Polish',
+    'lang_Spanish' => 'Spanish',
+    'lang_Spanish - Spain' => 'Spanish - Spain',
+    'lang_Swedish' => 'Swedish',
+
+    // Frequencies
+    'freq_weekly' => 'Weekly',
+    'freq_two_weeks' => 'Two weeks',
+    'freq_four_weeks' => 'Four weeks',
+    'freq_monthly' => 'Monthly',
+    'freq_three_months' => 'Three months',
+    'freq_six_months' => 'Six months',
+    'freq_annually' => 'Annually',
+
+    // Payment types
+    'payment_type_Apply Credit' => 'Apply Credit',
+    'payment_type_Bank Transfer' => 'Bank Transfer',
+    'payment_type_Cash' => 'Cash',
+    'payment_type_Debit' => 'Debit',
+    'payment_type_ACH' => 'ACH',
+    'payment_type_Visa Card' => 'Visa Card',
+    'payment_type_MasterCard' => 'MasterCard',
+    'payment_type_American Express' => 'American Express',
+    'payment_type_Discover Card' => 'Discover Card',
+    'payment_type_Diners Card' => 'Diners Card',
+    'payment_type_EuroCard' => 'EuroCard',
+    'payment_type_Nova' => 'Nova',
+    'payment_type_Credit Card Other' => 'Credit Card Other',
+    'payment_type_PayPal' => 'PayPal',
+    'payment_type_Google Wallet' => 'Google Wallet',
+    'payment_type_Check' => 'Check',
+
+    // Industries
+    'industry_Accounting & Legal' => 'Accounting & Legal',
+    'industry_Advertising' => 'Advertising',
+    'industry_Aerospace' => 'Aerospace',
+    'industry_Agriculture' => 'Agriculture',
+    'industry_Automotive' => 'Automotive',
+    'industry_Banking & Finance' => 'Banking & Finance',
+    'industry_Biotechnology' => 'Biotechnology',
+    'industry_Broadcasting' => 'Broadcasting',
+    'industry_Business Services' => 'Business Services',
+    'industry_Commodities & Chemicals' => 'Commodities & Chemicals',
+    'industry_Communications' => 'Communications',
+    'industry_Computers & Hightech' => 'Computers & Hightech',
+    'industry_Defense' => 'Defense',
+    'industry_Energy' => 'Energy',
+    'industry_Entertainment' => 'Entertainment',
+    'industry_Government' => 'Government',
+    'industry_Healthcare & Life Sciences' => 'Healthcare & Life Sciences',
+    'industry_Insurance' => 'Insurance',
+    'industry_Manufacturing' => 'Manufacturing',
+    'industry_Marketing' => 'Marketing',
+    'industry_Media' => 'Media',
+    'industry_Nonprofit & Higher Ed' => 'Nonprofit & Higher Ed',
+    'industry_Pharmaceuticals' => 'Pharmaceuticals',
+    'industry_Professional Services & Consulting' => 'Professional Services & Consulting',
+    'industry_Real Estate' => 'Real Estate',
+    'industry_Retail & Wholesale' => 'Retail & Wholesale',
+    'industry_Sports' => 'Sports',
+    'industry_Transportation' => 'Transportation',
+    'industry_Travel & Luxury' => 'Travel & Luxury',
+    'industry_Other' => 'Other',
+    'industry_Photography' =>'Photography',
+
+    // Countries
+    'country_Afghanistan' => 'Afghanistan',
+    'country_Albania' => 'Albania',
+    'country_Antarctica' => 'Antarctica',
+    'country_Algeria' => 'Algeria',
+    'country_American Samoa' => 'American Samoa',
+    'country_Andorra' => 'Andorra',
+    'country_Angola' => 'Angola',
+    'country_Antigua and Barbuda' => 'Antigua and Barbuda',
+    'country_Azerbaijan' => 'Azerbaijan',
+    'country_Argentina' => 'Argentina',
+    'country_Australia' => 'Australia',
+    'country_Austria' => 'Austria',
+    'country_Bahamas' => 'Bahamas',
+    'country_Bahrain' => 'Bahrain',
+    'country_Bangladesh' => 'Bangladesh',
+    'country_Armenia' => 'Armenia',
+    'country_Barbados' => 'Barbados',
+    'country_Belgium' => 'Belgium',
+    'country_Bermuda' => 'Bermuda',
+    'country_Bhutan' => 'Bhutan',
+    'country_Bolivia, Plurinational State of' => 'Bolivia, Plurinational State of',
+    'country_Bosnia and Herzegovina' => 'Bosnia and Herzegovina',
+    'country_Botswana' => 'Botswana',
+    'country_Bouvet Island' => 'Bouvet Island',
+    'country_Brazil' => 'Brazil',
+    'country_Belize' => 'Belize',
+    'country_British Indian Ocean Territory' => 'British Indian Ocean Territory',
+    'country_Solomon Islands' => 'Solomon Islands',
+    'country_Virgin Islands, British' => 'Virgin Islands, British',
+    'country_Brunei Darussalam' => 'Brunei Darussalam',
+    'country_Bulgaria' => 'Bulgaria',
+    'country_Myanmar' => 'Myanmar',
+    'country_Burundi' => 'Burundi',
+    'country_Belarus' => 'Belarus',
+    'country_Cambodia' => 'Cambodia',
+    'country_Cameroon' => 'Cameroon',
+    'country_Canada' => 'Canada',
+    'country_Cape Verde' => 'Cape Verde',
+    'country_Cayman Islands' => 'Cayman Islands',
+    'country_Central African Republic' => 'Central African Republic',
+    'country_Sri Lanka' => 'Sri Lanka',
+    'country_Chad' => 'Chad',
+    'country_Chile' => 'Chile',
+    'country_China' => 'China',
+    'country_Taiwan, Province of China' => 'Taiwan, Province of China',
+    'country_Christmas Island' => 'Christmas Island',
+    'country_Cocos (Keeling) Islands' => 'Cocos (Keeling) Islands',
+    'country_Colombia' => 'Colombia',
+    'country_Comoros' => 'Comoros',
+    'country_Mayotte' => 'Mayotte',
+    'country_Congo' => 'Congo',
+    'country_Congo, the Democratic Republic of the' => 'Congo, the Democratic Republic of the',
+    'country_Cook Islands' => 'Cook Islands',
+    'country_Costa Rica' => 'Costa Rica',
+    'country_Croatia' => 'Croatia',
+    'country_Cuba' => 'Cuba',
+    'country_Cyprus' => 'Cyprus',
+    'country_Czech Republic' => 'Czech Republic',
+    'country_Benin' => 'Benin',
+    'country_Denmark' => 'Denmark',
+    'country_Dominica' => 'Dominica',
+    'country_Dominican Republic' => 'Dominican Republic',
+    'country_Ecuador' => 'Ecuador',
+    'country_El Salvador' => 'El Salvador',
+    'country_Equatorial Guinea' => 'Equatorial Guinea',
+    'country_Ethiopia' => 'Ethiopia',
+    'country_Eritrea' => 'Eritrea',
+    'country_Estonia' => 'Estonia',
+    'country_Faroe Islands' => 'Faroe Islands',
+    'country_Falkland Islands (Malvinas)' => 'Falkland Islands (Malvinas)',
+    'country_South Georgia and the South Sandwich Islands' => 'South Georgia and the South Sandwich Islands',
+    'country_Fiji' => 'Fiji',
+    'country_Finland' => 'Finland',
+    'country_Åland Islands' => 'Åland Islands',
+    'country_France' => 'France',
+    'country_French Guiana' => 'French Guiana',
+    'country_French Polynesia' => 'French Polynesia',
+    'country_French Southern Territories' => 'French Southern Territories',
+    'country_Djibouti' => 'Djibouti',
+    'country_Gabon' => 'Gabon',
+    'country_Georgia' => 'Georgia',
+    'country_Gambia' => 'Gambia',
+    'country_Palestinian Territory, Occupied' => 'Palestinian Territory, Occupied',
+    'country_Germany' => 'Germany',
+    'country_Ghana' => 'Ghana',
+    'country_Gibraltar' => 'Gibraltar',
+    'country_Kiribati' => 'Kiribati',
+    'country_Greece' => 'Greece',
+    'country_Greenland' => 'Greenland',
+    'country_Grenada' => 'Grenada',
+    'country_Guadeloupe' => 'Guadeloupe',
+    'country_Guam' => 'Guam',
+    'country_Guatemala' => 'Guatemala',
+    'country_Guinea' => 'Guinea',
+    'country_Guyana' => 'Guyana',
+    'country_Haiti' => 'Haiti',
+    'country_Heard Island and McDonald Islands' => 'Heard Island and McDonald Islands',
+    'country_Holy See (Vatican City State)' => 'Holy See (Vatican City State)',
+    'country_Honduras' => 'Honduras',
+    'country_Hong Kong' => 'Hong Kong',
+    'country_Hungary' => 'Hungary',
+    'country_Iceland' => 'Iceland',
+    'country_India' => 'India',
+    'country_Indonesia' => 'Indonesia',
+    'country_Iran, Islamic Republic of' => 'Iran, Islamic Republic of',
+    'country_Iraq' => 'Iraq',
+    'country_Ireland' => 'Ireland',
+    'country_Israel' => 'Israel',
+    'country_Italy' => 'Italy',
+    'country_Côte d\'Ivoire' => 'Côte d\'Ivoire',
+    'country_Jamaica' => 'Jamaica',
+    'country_Japan' => 'Japan',
+    'country_Kazakhstan' => 'Kazakhstan',
+    'country_Jordan' => 'Jordan',
+    'country_Kenya' => 'Kenya',
+    'country_Korea, Democratic People\'s Republic of' => 'Korea, Democratic People\'s Republic of',
+    'country_Korea, Republic of' => 'Korea, Republic of',
+    'country_Kuwait' => 'Kuwait',
+    'country_Kyrgyzstan' => 'Kyrgyzstan',
+    'country_Lao People\'s Democratic Republic' => 'Lao People\'s Democratic Republic',
+    'country_Lebanon' => 'Lebanon',
+    'country_Lesotho' => 'Lesotho',
+    'country_Latvia' => 'Latvia',
+    'country_Liberia' => 'Liberia',
+    'country_Libya' => 'Libya',
+    'country_Liechtenstein' => 'Liechtenstein',
+    'country_Lithuania' => 'Lithuania',
+    'country_Luxembourg' => 'Luxembourg',
+    'country_Macao' => 'Macao',
+    'country_Madagascar' => 'Madagascar',
+    'country_Malawi' => 'Malawi',
+    'country_Malaysia' => 'Malaysia',
+    'country_Maldives' => 'Maldives',
+    'country_Mali' => 'Mali',
+    'country_Malta' => 'Malta',
+    'country_Martinique' => 'Martinique',
+    'country_Mauritania' => 'Mauritania',
+    'country_Mauritius' => 'Mauritius',
+    'country_Mexico' => 'Mexico',
+    'country_Monaco' => 'Monaco',
+    'country_Mongolia' => 'Mongolia',
+    'country_Moldova, Republic of' => 'Moldova, Republic of',
+    'country_Montenegro' => 'Montenegro',
+    'country_Montserrat' => 'Montserrat',
+    'country_Morocco' => 'Morocco',
+    'country_Mozambique' => 'Mozambique',
+    'country_Oman' => 'Oman',
+    'country_Namibia' => 'Namibia',
+    'country_Nauru' => 'Nauru',
+    'country_Nepal' => 'Nepal',
+    'country_Netherlands' => 'Netherlands',
+    'country_Curaçao' => 'Curaçao',
+    'country_Aruba' => 'Aruba',
+    'country_Sint Maarten (Dutch part)' => 'Sint Maarten (Dutch part)',
+    'country_Bonaire, Sint Eustatius and Saba' => 'Bonaire, Sint Eustatius and Saba',
+    'country_New Caledonia' => 'New Caledonia',
+    'country_Vanuatu' => 'Vanuatu',
+    'country_New Zealand' => 'New Zealand',
+    'country_Nicaragua' => 'Nicaragua',
+    'country_Niger' => 'Niger',
+    'country_Nigeria' => 'Nigeria',
+    'country_Niue' => 'Niue',
+    'country_Norfolk Island' => 'Norfolk Island',
+    'country_Norway' => 'Norway',
+    'country_Northern Mariana Islands' => 'Northern Mariana Islands',
+    'country_United States Minor Outlying Islands' => 'United States Minor Outlying Islands',
+    'country_Micronesia, Federated States of' => 'Micronesia, Federated States of',
+    'country_Marshall Islands' => 'Marshall Islands',
+    'country_Palau' => 'Palau',
+    'country_Pakistan' => 'Pakistan',
+    'country_Panama' => 'Panama',
+    'country_Papua New Guinea' => 'Papua New Guinea',
+    'country_Paraguay' => 'Paraguay',
+    'country_Peru' => 'Peru',
+    'country_Philippines' => 'Philippines',
+    'country_Pitcairn' => 'Pitcairn',
+    'country_Poland' => 'Poland',
+    'country_Portugal' => 'Portugal',
+    'country_Guinea-Bissau' => 'Guinea-Bissau',
+    'country_Timor-Leste' => 'Timor-Leste',
+    'country_Puerto Rico' => 'Puerto Rico',
+    'country_Qatar' => 'Qatar',
+    'country_Réunion' => 'Réunion',
+    'country_Romania' => 'Romania',
+    'country_Russian Federation' => 'Russian Federation',
+    'country_Rwanda' => 'Rwanda',
+    'country_Saint Barthélemy' => 'Saint Barthélemy',
+    'country_Saint Helena, Ascension and Tristan da Cunha' => 'Saint Helena, Ascension and Tristan da Cunha',
+    'country_Saint Kitts and Nevis' => 'Saint Kitts and Nevis',
+    'country_Anguilla' => 'Anguilla',
+    'country_Saint Lucia' => 'Saint Lucia',
+    'country_Saint Martin (French part)' => 'Saint Martin (French part)',
+    'country_Saint Pierre and Miquelon' => 'Saint Pierre and Miquelon',
+    'country_Saint Vincent and the Grenadines' => 'Saint Vincent and the Grenadines',
+    'country_San Marino' => 'San Marino',
+    'country_Sao Tome and Principe' => 'Sao Tome and Principe',
+    'country_Saudi Arabia' => 'Saudi Arabia',
+    'country_Senegal' => 'Senegal',
+    'country_Serbia' => 'Serbia',
+    'country_Seychelles' => 'Seychelles',
+    'country_Sierra Leone' => 'Sierra Leone',
+    'country_Singapore' => 'Singapore',
+    'country_Slovakia' => 'Slovakia',
+    'country_Viet Nam' => 'Viet Nam',
+    'country_Slovenia' => 'Slovenia',
+    'country_Somalia' => 'Somalia',
+    'country_South Africa' => 'South Africa',
+    'country_Zimbabwe' => 'Zimbabwe',
+    'country_Spain' => 'Spain',
+    'country_South Sudan' => 'South Sudan',
+    'country_Sudan' => 'Sudan',
+    'country_Western Sahara' => 'Western Sahara',
+    'country_Suriname' => 'Suriname',
+    'country_Svalbard and Jan Mayen' => 'Svalbard and Jan Mayen',
+    'country_Swaziland' => 'Swaziland',
+    'country_Sweden' => 'Sweden',
+    'country_Switzerland' => 'Switzerland',
+    'country_Syrian Arab Republic' => 'Syrian Arab Republic',
+    'country_Tajikistan' => 'Tajikistan',
+    'country_Thailand' => 'Thailand',
+    'country_Togo' => 'Togo',
+    'country_Tokelau' => 'Tokelau',
+    'country_Tonga' => 'Tonga',
+    'country_Trinidad and Tobago' => 'Trinidad and Tobago',
+    'country_United Arab Emirates' => 'United Arab Emirates',
+    'country_Tunisia' => 'Tunisia',
+    'country_Turkey' => 'Turkey',
+    'country_Turkmenistan' => 'Turkmenistan',
+    'country_Turks and Caicos Islands' => 'Turks and Caicos Islands',
+    'country_Tuvalu' => 'Tuvalu',
+    'country_Uganda' => 'Uganda',
+    '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_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_Virgin Islands, U.S.' => 'Virgin Islands, U.S.',
+    'country_Burkina Faso' => 'Burkina Faso',
+    'country_Uruguay' => 'Uruguay',
+    'country_Uzbekistan' => 'Uzbekistan',
+    'country_Venezuela, Bolivarian Republic of' => 'Venezuela, Bolivarian Republic of',
+    'country_Wallis and Futuna' => 'Wallis and Futuna',
+    'country_Samoa' => 'Samoa',
+    'country_Yemen' => 'Yemen',
+    'country_Zambi' => 'Zambi',
+
+    'view_client_portal' => 'View client portal',
+    'view_portal' => 'View Portal',
+    'vendor_contacts' => 'Vendor Contacts',
+    'all' => 'All',
+    'selected' => 'Selected',
+    'category' => 'Category',
+    'categories' => 'Categories',
+    'new_expense_category' => 'New Expense Category',
+    'edit_category' => 'Edit Category',
+    'archive_expense_category' => 'Archive Category',
+    'expense_categories' => 'Expense Categories',
+    'list_expense_categories' => 'List Expense Categories',
+    'updated_expense_category' => 'Successfully updated expense category',
+    'created_expense_category' => 'Successfully created expense category',
+    'archived_expense_category' => 'Successfully archived expense category',
+    'archived_expense_categories' => 'Successfully archived :count expense category',
+    'restore_expense_category' => 'Restore expense category',
+    'restored_expense_category' => 'Successfully restored expense category',
+    'apply_taxes' => 'Apply taxes',
+    'min_to_max_users' => ':min to :max users',
+    'max_users_reached' => 'The maximum number of users has been reached.',
+    'buy_now_buttons' => 'Buy Now Buttons',
+    'landing_page' => 'Landing Page',
+    'payment_type' => 'Payment Type',
+    'form' => 'Form',
+    'link' => 'Link',
+    'fields' => 'Fields',
+    'dwolla' => 'Dwolla',
+    'buy_now_buttons_warning' => 'Note: client and invoice records are created even if the transaction isn\'t completed.',
+    'buy_now_buttons_disabled' => 'This feature requires that a product is created and a payment gateway is configured.',
+    'enable_buy_now_buttons_help' => 'Enable support for buy now buttons',
+    'changes_take_effect_immediately' => 'Note: changes take effect immediately',
+    'wepay_account_description' => 'Payment gateway for Invoice Ninja',
+    'payment_error_code' => 'There was an error processing your payment [:code]. Please try again later.',
+    'standard_fees_apply' => 'Standard fees apply: 2.9% + $0.30 per successful charge.',
+    'limit_import_rows' => 'Data needs to be imported in batches of :count rows or less',
+
 
 );
 

resources/lang/fr/texts.php

@@ -1,6 +1,7 @@
 <?php
 
 $LANG = array(
+
     'organization' => 'Entreprise',
     'name' => 'Nom',
     'website' => 'Site web',
@@ -380,7 +381,7 @@ $LANG = array(
     'gateway_help_1' => ':link pour vous inscrire à Authorize.net.',
     'gateway_help_2' => ':link pour vous inscrire à Authorize.net.',
     'gateway_help_17' => ':link pour obtenir votre signature PayPal API.',
-    'gateway_help_27' => ':link pour vous enregistrer sur TwoCheckout.',
+    'gateway_help_27' => ':link to sign up for 2Checkout.com. To ensure payments are tracked set :complete_link as the redirect URL under Account > Site Management in the 2Checkout portal.',
     'more_designs' => 'Plus de modèles',
     'more_designs_title' => 'Modèles de factures additionnels',
     'more_designs_cloud_header' => 'Passez au Plan Pro pour plus de modèles',
@@ -767,6 +768,8 @@ $LANG = array(
     'activity_35' => ':user created :vendor',
     'activity_36' => ':user created :vendor',
     'activity_37' => ':user created :vendor',
+    'activity_42' => ':user created task ":task"',
+    'activity_43' => ':user updated task ":task"',
     'payment' => 'Paiement',
     'system' => 'Système',
     'signature' => 'Signature email',
@@ -986,7 +989,7 @@ $LANG = array(
     'overdue' => 'Impayé',
 
 
-    'white_label_text' => 'Purchase a ONE YEAR white label license for $:price to remove the Invoice Ninja branding from the client portal and help support our project.',
+    'white_label_text' => 'Purchase a ONE YEAR white label license for $:price to remove the Invoice Ninja branding and help support our project.',
     'user_email_footer' => 'Pour modifier vos paramètres de notification par courriel, veuillez visiter :link',
     'reset_password_footer' => 'Si vous n\'avez pas effectué de demande de réinitalisation de mot de passe veuillez contacter notre support : :email',
     'limit_users' => 'Désolé, ceci excédera la limite de :limit utilisateurs',
@@ -1287,7 +1290,7 @@ $LANG = array(
     'wepay_tos_agree' => 'I agree to the :link.',
     'wepay_tos_link_text' => 'WePay Terms of Service',
     'resend_confirmation_email' => 'Resend Confirmation Email',
-    'manage_wepay_account' => 'Manage WePay Account',
+    'manage_account' => 'Manage Account',
     'action_required' => 'Action Required',
     'finish_setup' => 'Finish Setup',
     'created_wepay_confirmation_required' => 'Please check your email and confirm your email address with WePay.',
@@ -1355,6 +1358,686 @@ $LANG = array(
     'failed_remove_payment_method' => 'Failed to remove the payment method',
     'gateway_exists' => 'This gateway already exists',
     'manual_entry' => 'Manual entry',
+    'start_of_week' => 'First day of the week',
+
+    // Frequencies
+    'freq_weekly' => 'Weekly',
+    'freq_two_weeks' => 'Two weeks',
+    'freq_four_weeks' => 'Four weeks',
+    'freq_monthly' => 'Monthly',
+    'freq_three_months' => 'Three months',
+    'freq_six_months' => 'Six months',
+    'freq_annually' => 'Annually',
+
+    // Payment types
+    'payment_type_Apply Credit' => 'Apply Credit',
+    'payment_type_Bank Transfer' => 'Bank Transfer',
+    'payment_type_Cash' => 'Cash',
+    'payment_type_Debit' => 'Debit',
+    'payment_type_ACH' => 'ACH',
+    'payment_type_Visa Card' => 'Visa Card',
+    'payment_type_MasterCard' => 'MasterCard',
+    'payment_type_American Express' => 'American Express',
+    'payment_type_Discover Card' => 'Discover Card',
+    'payment_type_Diners Card' => 'Diners Card',
+    'payment_type_EuroCard' => 'EuroCard',
+    'payment_type_Nova' => 'Nova',
+    'payment_type_Credit Card Other' => 'Credit Card Other',
+    'payment_type_PayPal' => 'PayPal',
+    'payment_type_Google Wallet' => 'Google Wallet',
+    'payment_type_Check' => 'Check',
+
+    // Industries
+    'industry_Accounting & Legal' => 'Accounting & Legal',
+    'industry_Advertising' => 'Advertising',
+    'industry_Aerospace' => 'Aerospace',
+    'industry_Agriculture' => 'Agriculture',
+    'industry_Automotive' => 'Automotive',
+    'industry_Banking & Finance' => 'Banking & Finance',
+    'industry_Biotechnology' => 'Biotechnology',
+    'industry_Broadcasting' => 'Broadcasting',
+    'industry_Business Services' => 'Business Services',
+    'industry_Commodities & Chemicals' => 'Commodities & Chemicals',
+    'industry_Communications' => 'Communications',
+    'industry_Computers & Hightech' => 'Computers & Hightech',
+    'industry_Defense' => 'Defense',
+    'industry_Energy' => 'Energy',
+    'industry_Entertainment' => 'Entertainment',
+    'industry_Government' => 'Government',
+    'industry_Healthcare & Life Sciences' => 'Healthcare & Life Sciences',
+    'industry_Insurance' => 'Insurance',
+    'industry_Manufacturing' => 'Manufacturing',
+    'industry_Marketing' => 'Marketing',
+    'industry_Media' => 'Media',
+    'industry_Nonprofit & Higher Ed' => 'Nonprofit & Higher Ed',
+    'industry_Pharmaceuticals' => 'Pharmaceuticals',
+    'industry_Professional Services & Consulting' => 'Professional Services & Consulting',
+    'industry_Real Estate' => 'Real Estate',
+    'industry_Retail & Wholesale' => 'Retail & Wholesale',
+    'industry_Sports' => 'Sports',
+    'industry_Transportation' => 'Transportation',
+    'industry_Travel & Luxury' => 'Travel & Luxury',
+    'industry_Other' => 'Other',
+    'industry_Photography' =>'Photography',
+
+    // Countries
+    'country_Afghanistan' => 'Afghanistan',
+    'country_Albania' => 'Albania',
+    'country_Antarctica' => 'Antarctica',
+    'country_Algeria' => 'Algeria',
+    'country_American Samoa' => 'American Samoa',
+    'country_Andorra' => 'Andorra',
+    'country_Angola' => 'Angola',
+    'country_Antigua and Barbuda' => 'Antigua and Barbuda',
+    'country_Azerbaijan' => 'Azerbaijan',
+    'country_Argentina' => 'Argentina',
+    'country_Australia' => 'Australia',
+    'country_Austria' => 'Austria',
+    'country_Bahamas' => 'Bahamas',
+    'country_Bahrain' => 'Bahrain',
+    'country_Bangladesh' => 'Bangladesh',
+    'country_Armenia' => 'Armenia',
+    'country_Barbados' => 'Barbados',
+    'country_Belgium' => 'Belgium',
+    'country_Bermuda' => 'Bermuda',
+    'country_Bhutan' => 'Bhutan',
+    'country_Bolivia, Plurinational State of' => 'Bolivia, Plurinational State of',
+    'country_Bosnia and Herzegovina' => 'Bosnia and Herzegovina',
+    'country_Botswana' => 'Botswana',
+    'country_Bouvet Island' => 'Bouvet Island',
+    'country_Brazil' => 'Brazil',
+    'country_Belize' => 'Belize',
+    'country_British Indian Ocean Territory' => 'British Indian Ocean Territory',
+    'country_Solomon Islands' => 'Solomon Islands',
+    'country_Virgin Islands, British' => 'Virgin Islands, British',
+    'country_Brunei Darussalam' => 'Brunei Darussalam',
+    'country_Bulgaria' => 'Bulgaria',
+    'country_Myanmar' => 'Myanmar',
+    'country_Burundi' => 'Burundi',
+    'country_Belarus' => 'Belarus',
+    'country_Cambodia' => 'Cambodia',
+    'country_Cameroon' => 'Cameroon',
+    'country_Canada' => 'Canada',
+    'country_Cape Verde' => 'Cape Verde',
+    'country_Cayman Islands' => 'Cayman Islands',
+    'country_Central African Republic' => 'Central African Republic',
+    'country_Sri Lanka' => 'Sri Lanka',
+    'country_Chad' => 'Chad',
+    'country_Chile' => 'Chile',
+    'country_China' => 'China',
+    'country_Taiwan, Province of China' => 'Taiwan, Province of China',
+    'country_Christmas Island' => 'Christmas Island',
+    'country_Cocos (Keeling) Islands' => 'Cocos (Keeling) Islands',
+    'country_Colombia' => 'Colombia',
+    'country_Comoros' => 'Comoros',
+    'country_Mayotte' => 'Mayotte',
+    'country_Congo' => 'Congo',
+    'country_Congo, the Democratic Republic of the' => 'Congo, the Democratic Republic of the',
+    'country_Cook Islands' => 'Cook Islands',
+    'country_Costa Rica' => 'Costa Rica',
+    'country_Croatia' => 'Croatia',
+    'country_Cuba' => 'Cuba',
+    'country_Cyprus' => 'Cyprus',
+    'country_Czech Republic' => 'Czech Republic',
+    'country_Benin' => 'Benin',
+    'country_Denmark' => 'Denmark',
+    'country_Dominica' => 'Dominica',
+    'country_Dominican Republic' => 'Dominican Republic',
+    'country_Ecuador' => 'Ecuador',
+    'country_El Salvador' => 'El Salvador',
+    'country_Equatorial Guinea' => 'Equatorial Guinea',
+    'country_Ethiopia' => 'Ethiopia',
+    'country_Eritrea' => 'Eritrea',
+    'country_Estonia' => 'Estonia',
+    'country_Faroe Islands' => 'Faroe Islands',
+    'country_Falkland Islands (Malvinas)' => 'Falkland Islands (Malvinas)',
+    'country_South Georgia and the South Sandwich Islands' => 'South Georgia and the South Sandwich Islands',
+    'country_Fiji' => 'Fiji',
+    'country_Finland' => 'Finland',
+    'country_Åland Islands' => 'Åland Islands',
+    'country_France' => 'France',
+    'country_French Guiana' => 'French Guiana',
+    'country_French Polynesia' => 'French Polynesia',
+    'country_French Southern Territories' => 'French Southern Territories',
+    'country_Djibouti' => 'Djibouti',
+    'country_Gabon' => 'Gabon',
+    'country_Georgia' => 'Georgia',
+    'country_Gambia' => 'Gambia',
+    'country_Palestinian Territory, Occupied' => 'Palestinian Territory, Occupied',
+    'country_Germany' => 'Germany',
+    'country_Ghana' => 'Ghana',
+    'country_Gibraltar' => 'Gibraltar',
+    'country_Kiribati' => 'Kiribati',
+    'country_Greece' => 'Greece',
+    'country_Greenland' => 'Greenland',
+    'country_Grenada' => 'Grenada',
+    'country_Guadeloupe' => 'Guadeloupe',
+    'country_Guam' => 'Guam',
+    'country_Guatemala' => 'Guatemala',
+    'country_Guinea' => 'Guinea',
+    'country_Guyana' => 'Guyana',
+    'country_Haiti' => 'Haiti',
+    'country_Heard Island and McDonald Islands' => 'Heard Island and McDonald Islands',
+    'country_Holy See (Vatican City State)' => 'Holy See (Vatican City State)',
+    'country_Honduras' => 'Honduras',
+    'country_Hong Kong' => 'Hong Kong',
+    'country_Hungary' => 'Hungary',
+    'country_Iceland' => 'Iceland',
+    'country_India' => 'India',
+    'country_Indonesia' => 'Indonesia',
+    'country_Iran, Islamic Republic of' => 'Iran, Islamic Republic of',
+    'country_Iraq' => 'Iraq',
+    'country_Ireland' => 'Ireland',
+    'country_Israel' => 'Israel',
+    'country_Italy' => 'Italy',
+    'country_Côte d\'Ivoire' => 'Côte d\'Ivoire',
+    'country_Jamaica' => 'Jamaica',
+    'country_Japan' => 'Japan',
+    'country_Kazakhstan' => 'Kazakhstan',
+    'country_Jordan' => 'Jordan',
+    'country_Kenya' => 'Kenya',
+    'country_Korea, Democratic People\'s Republic of' => 'Korea, Democratic People\'s Republic of',
+    'country_Korea, Republic of' => 'Korea, Republic of',
+    'country_Kuwait' => 'Kuwait',
+    'country_Kyrgyzstan' => 'Kyrgyzstan',
+    'country_Lao People\'s Democratic Republic' => 'Lao People\'s Democratic Republic',
+    'country_Lebanon' => 'Lebanon',
+    'country_Lesotho' => 'Lesotho',
+    'country_Latvia' => 'Latvia',
+    'country_Liberia' => 'Liberia',
+    'country_Libya' => 'Libya',
+    'country_Liechtenstein' => 'Liechtenstein',
+    'country_Lithuania' => 'Lithuania',
+    'country_Luxembourg' => 'Luxembourg',
+    'country_Macao' => 'Macao',
+    'country_Madagascar' => 'Madagascar',
+    'country_Malawi' => 'Malawi',
+    'country_Malaysia' => 'Malaysia',
+    'country_Maldives' => 'Maldives',
+    'country_Mali' => 'Mali',
+    'country_Malta' => 'Malta',
+    'country_Martinique' => 'Martinique',
+    'country_Mauritania' => 'Mauritania',
+    'country_Mauritius' => 'Mauritius',
+    'country_Mexico' => 'Mexico',
+    'country_Monaco' => 'Monaco',
+    'country_Mongolia' => 'Mongolia',
+    'country_Moldova, Republic of' => 'Moldova, Republic of',
+    'country_Montenegro' => 'Montenegro',
+    'country_Montserrat' => 'Montserrat',
+    'country_Morocco' => 'Morocco',
+    'country_Mozambique' => 'Mozambique',
+    'country_Oman' => 'Oman',
+    'country_Namibia' => 'Namibia',
+    'country_Nauru' => 'Nauru',
+    'country_Nepal' => 'Nepal',
+    'country_Netherlands' => 'Netherlands',
+    'country_Curaçao' => 'Curaçao',
+    'country_Aruba' => 'Aruba',
+    'country_Sint Maarten (Dutch part)' => 'Sint Maarten (Dutch part)',
+    'country_Bonaire, Sint Eustatius and Saba' => 'Bonaire, Sint Eustatius and Saba',
+    'country_New Caledonia' => 'New Caledonia',
+    'country_Vanuatu' => 'Vanuatu',
+    'country_New Zealand' => 'New Zealand',
+    'country_Nicaragua' => 'Nicaragua',
+    'country_Niger' => 'Niger',
+    'country_Nigeria' => 'Nigeria',
+    'country_Niue' => 'Niue',
+    'country_Norfolk Island' => 'Norfolk Island',
+    'country_Norway' => 'Norway',
+    'country_Northern Mariana Islands' => 'Northern Mariana Islands',
+    'country_United States Minor Outlying Islands' => 'United States Minor Outlying Islands',
+    'country_Micronesia, Federated States of' => 'Micronesia, Federated States of',
+    'country_Marshall Islands' => 'Marshall Islands',
+    'country_Palau' => 'Palau',
+    'country_Pakistan' => 'Pakistan',
+    'country_Panama' => 'Panama',
+    'country_Papua New Guinea' => 'Papua New Guinea',
+    'country_Paraguay' => 'Paraguay',
+    'country_Peru' => 'Peru',
+    'country_Philippines' => 'Philippines',
+    'country_Pitcairn' => 'Pitcairn',
+    'country_Poland' => 'Poland',
+    'country_Portugal' => 'Portugal',
+    'country_Guinea-Bissau' => 'Guinea-Bissau',
+    'country_Timor-Leste' => 'Timor-Leste',
+    'country_Puerto Rico' => 'Puerto Rico',
+    'country_Qatar' => 'Qatar',
+    'country_Réunion' => 'Réunion',
+    'country_Romania' => 'Romania',
+    'country_Russian Federation' => 'Russian Federation',
+    'country_Rwanda' => 'Rwanda',
+    'country_Saint Barthélemy' => 'Saint Barthélemy',
+    'country_Saint Helena, Ascension and Tristan da Cunha' => 'Saint Helena, Ascension and Tristan da Cunha',
+    'country_Saint Kitts and Nevis' => 'Saint Kitts and Nevis',
+    'country_Anguilla' => 'Anguilla',
+    'country_Saint Lucia' => 'Saint Lucia',
+    'country_Saint Martin (French part)' => 'Saint Martin (French part)',
+    'country_Saint Pierre and Miquelon' => 'Saint Pierre and Miquelon',
+    'country_Saint Vincent and the Grenadines' => 'Saint Vincent and the Grenadines',
+    'country_San Marino' => 'San Marino',
+    'country_Sao Tome and Principe' => 'Sao Tome and Principe',
+    'country_Saudi Arabia' => 'Saudi Arabia',
+    'country_Senegal' => 'Senegal',
+    'country_Serbia' => 'Serbia',
+    'country_Seychelles' => 'Seychelles',
+    'country_Sierra Leone' => 'Sierra Leone',
+    'country_Singapore' => 'Singapore',
+    'country_Slovakia' => 'Slovakia',
+    'country_Viet Nam' => 'Viet Nam',
+    'country_Slovenia' => 'Slovenia',
+    'country_Somalia' => 'Somalia',
+    'country_South Africa' => 'South Africa',
+    'country_Zimbabwe' => 'Zimbabwe',
+    'country_Spain' => 'Spain',
+    'country_South Sudan' => 'South Sudan',
+    'country_Sudan' => 'Sudan',
+    'country_Western Sahara' => 'Western Sahara',
+    'country_Suriname' => 'Suriname',
+    'country_Svalbard and Jan Mayen' => 'Svalbard and Jan Mayen',
+    'country_Swaziland' => 'Swaziland',
+    'country_Sweden' => 'Sweden',
+    'country_Switzerland' => 'Switzerland',
+    'country_Syrian Arab Republic' => 'Syrian Arab Republic',
+    'country_Tajikistan' => 'Tajikistan',
+    'country_Thailand' => 'Thailand',
+    'country_Togo' => 'Togo',
+    'country_Tokelau' => 'Tokelau',
+    'country_Tonga' => 'Tonga',
+    'country_Trinidad and Tobago' => 'Trinidad and Tobago',
+    'country_United Arab Emirates' => 'United Arab Emirates',
+    'country_Tunisia' => 'Tunisia',
+    'country_Turkey' => 'Turkey',
+    'country_Turkmenistan' => 'Turkmenistan',
+    'country_Turks and Caicos Islands' => 'Turks and Caicos Islands',
+    'country_Tuvalu' => 'Tuvalu',
+    'country_Uganda' => 'Uganda',
+    '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_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_Virgin Islands, U.S.' => 'Virgin Islands, U.S.',
+    'country_Burkina Faso' => 'Burkina Faso',
+    'country_Uruguay' => 'Uruguay',
+    'country_Uzbekistan' => 'Uzbekistan',
+    'country_Venezuela, Bolivarian Republic of' => 'Venezuela, Bolivarian Republic of',
+    'country_Wallis and Futuna' => 'Wallis and Futuna',
+    'country_Samoa' => 'Samoa',
+    'country_Yemen' => 'Yemen',
+    'country_Zambi' => 'Zambi',
+
+    // Languages
+    'lang_Brazilian Portuguese' => 'Brazilian Portuguese',
+    'lang_Croatian' => 'Croatian',
+    'lang_Czech' => 'Czech',
+    'lang_Danish' => 'Danish',
+    'lang_Dutch' => 'Dutch',
+    'lang_English' => 'English',
+    'lang_French' => 'French',
+    'lang_French - Canada' => 'French - Canada',
+    'lang_German' => 'German',
+    'lang_Italian' => 'Italian',
+    'lang_Japanese' => 'Japanese',
+    'lang_Lithuanian' => 'Lithuanian',
+    'lang_Norwegian' => 'Norwegian',
+    'lang_Polish' => 'Polish',
+    'lang_Spanish' => 'Spanish',
+    'lang_Spanish - Spain' => 'Spanish - Spain',
+    'lang_Swedish' => 'Swedish',
+
+    // Frequencies
+    'freq_weekly' => 'Weekly',
+    'freq_two_weeks' => 'Two weeks',
+    'freq_four_weeks' => 'Four weeks',
+    'freq_monthly' => 'Monthly',
+    'freq_three_months' => 'Three months',
+    'freq_six_months' => 'Six months',
+    'freq_annually' => 'Annually',
+
+    // Payment types
+    'payment_type_Apply Credit' => 'Apply Credit',
+    'payment_type_Bank Transfer' => 'Bank Transfer',
+    'payment_type_Cash' => 'Cash',
+    'payment_type_Debit' => 'Debit',
+    'payment_type_ACH' => 'ACH',
+    'payment_type_Visa Card' => 'Visa Card',
+    'payment_type_MasterCard' => 'MasterCard',
+    'payment_type_American Express' => 'American Express',
+    'payment_type_Discover Card' => 'Discover Card',
+    'payment_type_Diners Card' => 'Diners Card',
+    'payment_type_EuroCard' => 'EuroCard',
+    'payment_type_Nova' => 'Nova',
+    'payment_type_Credit Card Other' => 'Credit Card Other',
+    'payment_type_PayPal' => 'PayPal',
+    'payment_type_Google Wallet' => 'Google Wallet',
+    'payment_type_Check' => 'Check',
+
+    // Industries
+    'industry_Accounting & Legal' => 'Accounting & Legal',
+    'industry_Advertising' => 'Advertising',
+    'industry_Aerospace' => 'Aerospace',
+    'industry_Agriculture' => 'Agriculture',
+    'industry_Automotive' => 'Automotive',
+    'industry_Banking & Finance' => 'Banking & Finance',
+    'industry_Biotechnology' => 'Biotechnology',
+    'industry_Broadcasting' => 'Broadcasting',
+    'industry_Business Services' => 'Business Services',
+    'industry_Commodities & Chemicals' => 'Commodities & Chemicals',
+    'industry_Communications' => 'Communications',
+    'industry_Computers & Hightech' => 'Computers & Hightech',
+    'industry_Defense' => 'Defense',
+    'industry_Energy' => 'Energy',
+    'industry_Entertainment' => 'Entertainment',
+    'industry_Government' => 'Government',
+    'industry_Healthcare & Life Sciences' => 'Healthcare & Life Sciences',
+    'industry_Insurance' => 'Insurance',
+    'industry_Manufacturing' => 'Manufacturing',
+    'industry_Marketing' => 'Marketing',
+    'industry_Media' => 'Media',
+    'industry_Nonprofit & Higher Ed' => 'Nonprofit & Higher Ed',
+    'industry_Pharmaceuticals' => 'Pharmaceuticals',
+    'industry_Professional Services & Consulting' => 'Professional Services & Consulting',
+    'industry_Real Estate' => 'Real Estate',
+    'industry_Retail & Wholesale' => 'Retail & Wholesale',
+    'industry_Sports' => 'Sports',
+    'industry_Transportation' => 'Transportation',
+    'industry_Travel & Luxury' => 'Travel & Luxury',
+    'industry_Other' => 'Other',
+    'industry_Photography' =>'Photography',
+
+    // Countries
+    'country_Afghanistan' => 'Afghanistan',
+    'country_Albania' => 'Albania',
+    'country_Antarctica' => 'Antarctica',
+    'country_Algeria' => 'Algeria',
+    'country_American Samoa' => 'American Samoa',
+    'country_Andorra' => 'Andorra',
+    'country_Angola' => 'Angola',
+    'country_Antigua and Barbuda' => 'Antigua and Barbuda',
+    'country_Azerbaijan' => 'Azerbaijan',
+    'country_Argentina' => 'Argentina',
+    'country_Australia' => 'Australia',
+    'country_Austria' => 'Austria',
+    'country_Bahamas' => 'Bahamas',
+    'country_Bahrain' => 'Bahrain',
+    'country_Bangladesh' => 'Bangladesh',
+    'country_Armenia' => 'Armenia',
+    'country_Barbados' => 'Barbados',
+    'country_Belgium' => 'Belgium',
+    'country_Bermuda' => 'Bermuda',
+    'country_Bhutan' => 'Bhutan',
+    'country_Bolivia, Plurinational State of' => 'Bolivia, Plurinational State of',
+    'country_Bosnia and Herzegovina' => 'Bosnia and Herzegovina',
+    'country_Botswana' => 'Botswana',
+    'country_Bouvet Island' => 'Bouvet Island',
+    'country_Brazil' => 'Brazil',
+    'country_Belize' => 'Belize',
+    'country_British Indian Ocean Territory' => 'British Indian Ocean Territory',
+    'country_Solomon Islands' => 'Solomon Islands',
+    'country_Virgin Islands, British' => 'Virgin Islands, British',
+    'country_Brunei Darussalam' => 'Brunei Darussalam',
+    'country_Bulgaria' => 'Bulgaria',
+    'country_Myanmar' => 'Myanmar',
+    'country_Burundi' => 'Burundi',
+    'country_Belarus' => 'Belarus',
+    'country_Cambodia' => 'Cambodia',
+    'country_Cameroon' => 'Cameroon',
+    'country_Canada' => 'Canada',
+    'country_Cape Verde' => 'Cape Verde',
+    'country_Cayman Islands' => 'Cayman Islands',
+    'country_Central African Republic' => 'Central African Republic',
+    'country_Sri Lanka' => 'Sri Lanka',
+    'country_Chad' => 'Chad',
+    'country_Chile' => 'Chile',
+    'country_China' => 'China',
+    'country_Taiwan, Province of China' => 'Taiwan, Province of China',
+    'country_Christmas Island' => 'Christmas Island',
+    'country_Cocos (Keeling) Islands' => 'Cocos (Keeling) Islands',
+    'country_Colombia' => 'Colombia',
+    'country_Comoros' => 'Comoros',
+    'country_Mayotte' => 'Mayotte',
+    'country_Congo' => 'Congo',
+    'country_Congo, the Democratic Republic of the' => 'Congo, the Democratic Republic of the',
+    'country_Cook Islands' => 'Cook Islands',
+    'country_Costa Rica' => 'Costa Rica',
+    'country_Croatia' => 'Croatia',
+    'country_Cuba' => 'Cuba',
+    'country_Cyprus' => 'Cyprus',
+    'country_Czech Republic' => 'Czech Republic',
+    'country_Benin' => 'Benin',
+    'country_Denmark' => 'Denmark',
+    'country_Dominica' => 'Dominica',
+    'country_Dominican Republic' => 'Dominican Republic',
+    'country_Ecuador' => 'Ecuador',
+    'country_El Salvador' => 'El Salvador',
+    'country_Equatorial Guinea' => 'Equatorial Guinea',
+    'country_Ethiopia' => 'Ethiopia',
+    'country_Eritrea' => 'Eritrea',
+    'country_Estonia' => 'Estonia',
+    'country_Faroe Islands' => 'Faroe Islands',
+    'country_Falkland Islands (Malvinas)' => 'Falkland Islands (Malvinas)',
+    'country_South Georgia and the South Sandwich Islands' => 'South Georgia and the South Sandwich Islands',
+    'country_Fiji' => 'Fiji',
+    'country_Finland' => 'Finland',
+    'country_Åland Islands' => 'Åland Islands',
+    'country_France' => 'France',
+    'country_French Guiana' => 'French Guiana',
+    'country_French Polynesia' => 'French Polynesia',
+    'country_French Southern Territories' => 'French Southern Territories',
+    'country_Djibouti' => 'Djibouti',
+    'country_Gabon' => 'Gabon',
+    'country_Georgia' => 'Georgia',
+    'country_Gambia' => 'Gambia',
+    'country_Palestinian Territory, Occupied' => 'Palestinian Territory, Occupied',
+    'country_Germany' => 'Germany',
+    'country_Ghana' => 'Ghana',
+    'country_Gibraltar' => 'Gibraltar',
+    'country_Kiribati' => 'Kiribati',
+    'country_Greece' => 'Greece',
+    'country_Greenland' => 'Greenland',
+    'country_Grenada' => 'Grenada',
+    'country_Guadeloupe' => 'Guadeloupe',
+    'country_Guam' => 'Guam',
+    'country_Guatemala' => 'Guatemala',
+    'country_Guinea' => 'Guinea',
+    'country_Guyana' => 'Guyana',
+    'country_Haiti' => 'Haiti',
+    'country_Heard Island and McDonald Islands' => 'Heard Island and McDonald Islands',
+    'country_Holy See (Vatican City State)' => 'Holy See (Vatican City State)',
+    'country_Honduras' => 'Honduras',
+    'country_Hong Kong' => 'Hong Kong',
+    'country_Hungary' => 'Hungary',
+    'country_Iceland' => 'Iceland',
+    'country_India' => 'India',
+    'country_Indonesia' => 'Indonesia',
+    'country_Iran, Islamic Republic of' => 'Iran, Islamic Republic of',
+    'country_Iraq' => 'Iraq',
+    'country_Ireland' => 'Ireland',
+    'country_Israel' => 'Israel',
+    'country_Italy' => 'Italy',
+    'country_Côte d\'Ivoire' => 'Côte d\'Ivoire',
+    'country_Jamaica' => 'Jamaica',
+    'country_Japan' => 'Japan',
+    'country_Kazakhstan' => 'Kazakhstan',
+    'country_Jordan' => 'Jordan',
+    'country_Kenya' => 'Kenya',
+    'country_Korea, Democratic People\'s Republic of' => 'Korea, Democratic People\'s Republic of',
+    'country_Korea, Republic of' => 'Korea, Republic of',
+    'country_Kuwait' => 'Kuwait',
+    'country_Kyrgyzstan' => 'Kyrgyzstan',
+    'country_Lao People\'s Democratic Republic' => 'Lao People\'s Democratic Republic',
+    'country_Lebanon' => 'Lebanon',
+    'country_Lesotho' => 'Lesotho',
+    'country_Latvia' => 'Latvia',
+    'country_Liberia' => 'Liberia',
+    'country_Libya' => 'Libya',
+    'country_Liechtenstein' => 'Liechtenstein',
+    'country_Lithuania' => 'Lithuania',
+    'country_Luxembourg' => 'Luxembourg',
+    'country_Macao' => 'Macao',
+    'country_Madagascar' => 'Madagascar',
+    'country_Malawi' => 'Malawi',
+    'country_Malaysia' => 'Malaysia',
+    'country_Maldives' => 'Maldives',
+    'country_Mali' => 'Mali',
+    'country_Malta' => 'Malta',
+    'country_Martinique' => 'Martinique',
+    'country_Mauritania' => 'Mauritania',
+    'country_Mauritius' => 'Mauritius',
+    'country_Mexico' => 'Mexico',
+    'country_Monaco' => 'Monaco',
+    'country_Mongolia' => 'Mongolia',
+    'country_Moldova, Republic of' => 'Moldova, Republic of',
+    'country_Montenegro' => 'Montenegro',
+    'country_Montserrat' => 'Montserrat',
+    'country_Morocco' => 'Morocco',
+    'country_Mozambique' => 'Mozambique',
+    'country_Oman' => 'Oman',
+    'country_Namibia' => 'Namibia',
+    'country_Nauru' => 'Nauru',
+    'country_Nepal' => 'Nepal',
+    'country_Netherlands' => 'Netherlands',
+    'country_Curaçao' => 'Curaçao',
+    'country_Aruba' => 'Aruba',
+    'country_Sint Maarten (Dutch part)' => 'Sint Maarten (Dutch part)',
+    'country_Bonaire, Sint Eustatius and Saba' => 'Bonaire, Sint Eustatius and Saba',
+    'country_New Caledonia' => 'New Caledonia',
+    'country_Vanuatu' => 'Vanuatu',
+    'country_New Zealand' => 'New Zealand',
+    'country_Nicaragua' => 'Nicaragua',
+    'country_Niger' => 'Niger',
+    'country_Nigeria' => 'Nigeria',
+    'country_Niue' => 'Niue',
+    'country_Norfolk Island' => 'Norfolk Island',
+    'country_Norway' => 'Norway',
+    'country_Northern Mariana Islands' => 'Northern Mariana Islands',
+    'country_United States Minor Outlying Islands' => 'United States Minor Outlying Islands',
+    'country_Micronesia, Federated States of' => 'Micronesia, Federated States of',
+    'country_Marshall Islands' => 'Marshall Islands',
+    'country_Palau' => 'Palau',
+    'country_Pakistan' => 'Pakistan',
+    'country_Panama' => 'Panama',
+    'country_Papua New Guinea' => 'Papua New Guinea',
+    'country_Paraguay' => 'Paraguay',
+    'country_Peru' => 'Peru',
+    'country_Philippines' => 'Philippines',
+    'country_Pitcairn' => 'Pitcairn',
+    'country_Poland' => 'Poland',
+    'country_Portugal' => 'Portugal',
+    'country_Guinea-Bissau' => 'Guinea-Bissau',
+    'country_Timor-Leste' => 'Timor-Leste',
+    'country_Puerto Rico' => 'Puerto Rico',
+    'country_Qatar' => 'Qatar',
+    'country_Réunion' => 'Réunion',
+    'country_Romania' => 'Romania',
+    'country_Russian Federation' => 'Russian Federation',
+    'country_Rwanda' => 'Rwanda',
+    'country_Saint Barthélemy' => 'Saint Barthélemy',
+    'country_Saint Helena, Ascension and Tristan da Cunha' => 'Saint Helena, Ascension and Tristan da Cunha',
+    'country_Saint Kitts and Nevis' => 'Saint Kitts and Nevis',
+    'country_Anguilla' => 'Anguilla',
+    'country_Saint Lucia' => 'Saint Lucia',
+    'country_Saint Martin (French part)' => 'Saint Martin (French part)',
+    'country_Saint Pierre and Miquelon' => 'Saint Pierre and Miquelon',
+    'country_Saint Vincent and the Grenadines' => 'Saint Vincent and the Grenadines',
+    'country_San Marino' => 'San Marino',
+    'country_Sao Tome and Principe' => 'Sao Tome and Principe',
+    'country_Saudi Arabia' => 'Saudi Arabia',
+    'country_Senegal' => 'Senegal',
+    'country_Serbia' => 'Serbia',
+    'country_Seychelles' => 'Seychelles',
+    'country_Sierra Leone' => 'Sierra Leone',
+    'country_Singapore' => 'Singapore',
+    'country_Slovakia' => 'Slovakia',
+    'country_Viet Nam' => 'Viet Nam',
+    'country_Slovenia' => 'Slovenia',
+    'country_Somalia' => 'Somalia',
+    'country_South Africa' => 'South Africa',
+    'country_Zimbabwe' => 'Zimbabwe',
+    'country_Spain' => 'Spain',
+    'country_South Sudan' => 'South Sudan',
+    'country_Sudan' => 'Sudan',
+    'country_Western Sahara' => 'Western Sahara',
+    'country_Suriname' => 'Suriname',
+    'country_Svalbard and Jan Mayen' => 'Svalbard and Jan Mayen',
+    'country_Swaziland' => 'Swaziland',
+    'country_Sweden' => 'Sweden',
+    'country_Switzerland' => 'Switzerland',
+    'country_Syrian Arab Republic' => 'Syrian Arab Republic',
+    'country_Tajikistan' => 'Tajikistan',
+    'country_Thailand' => 'Thailand',
+    'country_Togo' => 'Togo',
+    'country_Tokelau' => 'Tokelau',
+    'country_Tonga' => 'Tonga',
+    'country_Trinidad and Tobago' => 'Trinidad and Tobago',
+    'country_United Arab Emirates' => 'United Arab Emirates',
+    'country_Tunisia' => 'Tunisia',
+    'country_Turkey' => 'Turkey',
+    'country_Turkmenistan' => 'Turkmenistan',
+    'country_Turks and Caicos Islands' => 'Turks and Caicos Islands',
+    'country_Tuvalu' => 'Tuvalu',
+    'country_Uganda' => 'Uganda',
+    '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_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_Virgin Islands, U.S.' => 'Virgin Islands, U.S.',
+    'country_Burkina Faso' => 'Burkina Faso',
+    'country_Uruguay' => 'Uruguay',
+    'country_Uzbekistan' => 'Uzbekistan',
+    'country_Venezuela, Bolivarian Republic of' => 'Venezuela, Bolivarian Republic of',
+    'country_Wallis and Futuna' => 'Wallis and Futuna',
+    'country_Samoa' => 'Samoa',
+    'country_Yemen' => 'Yemen',
+    'country_Zambi' => 'Zambi',
+
+    'view_client_portal' => 'View client portal',
+    'view_portal' => 'View Portal',
+    'vendor_contacts' => 'Vendor Contacts',
+    'all' => 'All',
+    'selected' => 'Selected',
+    'category' => 'Category',
+    'categories' => 'Categories',
+    'new_expense_category' => 'New Expense Category',
+    'edit_category' => 'Edit Category',
+    'archive_expense_category' => 'Archive Category',
+    'expense_categories' => 'Expense Categories',
+    'list_expense_categories' => 'List Expense Categories',
+    'updated_expense_category' => 'Successfully updated expense category',
+    'created_expense_category' => 'Successfully created expense category',
+    'archived_expense_category' => 'Successfully archived expense category',
+    'archived_expense_categories' => 'Successfully archived :count expense category',
+    'restore_expense_category' => 'Restore expense category',
+    'restored_expense_category' => 'Successfully restored expense category',
+    'apply_taxes' => 'Apply taxes',
+    'min_to_max_users' => ':min to :max users',
+    'max_users_reached' => 'The maximum number of users has been reached.',
+    'buy_now_buttons' => 'Buy Now Buttons',
+    'landing_page' => 'Landing Page',
+    'payment_type' => 'Payment Type',
+    'form' => 'Form',
+    'link' => 'Link',
+    'fields' => 'Fields',
+    'dwolla' => 'Dwolla',
+    'buy_now_buttons_warning' => 'Note: client and invoice records are created even if the transaction isn\'t completed.',
+    'buy_now_buttons_disabled' => 'This feature requires that a product is created and a payment gateway is configured.',
+    'enable_buy_now_buttons_help' => 'Enable support for buy now buttons',
+    'changes_take_effect_immediately' => 'Note: changes take effect immediately',
+    'wepay_account_description' => 'Payment gateway for Invoice Ninja',
+    'payment_error_code' => 'There was an error processing your payment [:code]. Please try again later.',
+    'standard_fees_apply' => 'Standard fees apply: 2.9% + $0.30 per successful charge.',
+    'limit_import_rows' => 'Data needs to be imported in batches of :count rows or less',
+
 
 );
 

resources/lang/fr_CA/texts.php

@@ -1,6 +1,7 @@
 <?php
 
 $LANG = array(
+
     'organization' => 'Entreprise',
     'name' => 'Nom',
     'website' => 'Site web',
@@ -380,7 +381,7 @@ $LANG = array(
     'gateway_help_1' => ':link pour vous inscrire à Authorize.net.',
     'gateway_help_2' => ':link pour vous inscrire à Authorize.net.',
     'gateway_help_17' => ':link pour obtenir votre signature API PayPal.',
-    'gateway_help_27' => ':link pour vous inscrire à TwoCheckout.',
+    'gateway_help_27' => ':link to sign up for 2Checkout.com. To ensure payments are tracked set :complete_link as the redirect URL under Account > Site Management in the 2Checkout portal.',
     'more_designs' => 'Plus de modèles',
     'more_designs_title' => 'Modèles de factures additionnels',
     'more_designs_cloud_header' => 'Passez au Plan Pro pour obtenir plus de modèles',
@@ -767,6 +768,8 @@ $LANG = array(
     'activity_35' => ':user a créé :vendor',
     'activity_36' => ':user a créé :vendor',
     'activity_37' => ':user a créé :vendor',
+    'activity_42' => ':user created task ":task"',
+    'activity_43' => ':user updated task ":task"',
     'payment' => 'Paiement',
     'system' => 'Système',
     'signature' => 'Signature de courriel',
@@ -983,7 +986,7 @@ $LANG = array(
     'overdue' => 'En souffrance',
 
 
-    'white_label_text' => 'Achetez une licence sans pub d\'un an à $:price pour retirer le logo de Invoice Ninja du portail client et supporter notre projet.',
+    'white_label_text' => 'Purchase a ONE YEAR white label license for $:price to remove the Invoice Ninja branding and help support our project.',
     'user_email_footer' => 'Pour modifier vos paramètres de notification par courriel, veuillez visiter :link',
     'reset_password_footer' => 'Si vous n\'avez pas effectué de demande de réinitalisation de mot de passe veuillez contacter notre support : :email',
     'limit_users' => 'Désolé, ceci excédera la limite de :limit utilisateurs',
@@ -1284,7 +1287,7 @@ Lorsque les montant apparaîtront sur votre relevé, veuillez revenir sur cette
     'wepay_tos_agree' => 'J\'accepte les :link.',
     'wepay_tos_link_text' => 'Conditions d\'utilisation de WePay',
     'resend_confirmation_email' => 'Renvoyer le courriel de confirmation',
-    'manage_wepay_account' => 'Gérer le compte WePay',
+    'manage_account' => 'Manage Account',
     'action_required' => 'Action requise',
     'finish_setup' => 'Terminer la configuration',
     'created_wepay_confirmation_required' => 'Veuillez vérifier vos courriel et confirmer votre adresse courriel avec WePay.',
@@ -1352,6 +1355,686 @@ Lorsque les montant apparaîtront sur votre relevé, veuillez revenir sur cette
     'failed_remove_payment_method' => 'Failed to remove the payment method',
     'gateway_exists' => 'This gateway already exists',
     'manual_entry' => 'Manual entry',
+    'start_of_week' => 'First day of the week',
+
+    // Frequencies
+    'freq_weekly' => 'Weekly',
+    'freq_two_weeks' => 'Two weeks',
+    'freq_four_weeks' => 'Four weeks',
+    'freq_monthly' => 'Monthly',
+    'freq_three_months' => 'Three months',
+    'freq_six_months' => 'Six months',
+    'freq_annually' => 'Annually',
+
+    // Payment types
+    'payment_type_Apply Credit' => 'Apply Credit',
+    'payment_type_Bank Transfer' => 'Bank Transfer',
+    'payment_type_Cash' => 'Cash',
+    'payment_type_Debit' => 'Debit',
+    'payment_type_ACH' => 'ACH',
+    'payment_type_Visa Card' => 'Visa Card',
+    'payment_type_MasterCard' => 'MasterCard',
+    'payment_type_American Express' => 'American Express',
+    'payment_type_Discover Card' => 'Discover Card',
+    'payment_type_Diners Card' => 'Diners Card',
+    'payment_type_EuroCard' => 'EuroCard',
+    'payment_type_Nova' => 'Nova',
+    'payment_type_Credit Card Other' => 'Credit Card Other',
+    'payment_type_PayPal' => 'PayPal',
+    'payment_type_Google Wallet' => 'Google Wallet',
+    'payment_type_Check' => 'Check',
+
+    // Industries
+    'industry_Accounting & Legal' => 'Accounting & Legal',
+    'industry_Advertising' => 'Advertising',
+    'industry_Aerospace' => 'Aerospace',
+    'industry_Agriculture' => 'Agriculture',
+    'industry_Automotive' => 'Automotive',
+    'industry_Banking & Finance' => 'Banking & Finance',
+    'industry_Biotechnology' => 'Biotechnology',
+    'industry_Broadcasting' => 'Broadcasting',
+    'industry_Business Services' => 'Business Services',
+    'industry_Commodities & Chemicals' => 'Commodities & Chemicals',
+    'industry_Communications' => 'Communications',
+    'industry_Computers & Hightech' => 'Computers & Hightech',
+    'industry_Defense' => 'Defense',
+    'industry_Energy' => 'Energy',
+    'industry_Entertainment' => 'Entertainment',
+    'industry_Government' => 'Government',
+    'industry_Healthcare & Life Sciences' => 'Healthcare & Life Sciences',
+    'industry_Insurance' => 'Insurance',
+    'industry_Manufacturing' => 'Manufacturing',
+    'industry_Marketing' => 'Marketing',
+    'industry_Media' => 'Media',
+    'industry_Nonprofit & Higher Ed' => 'Nonprofit & Higher Ed',
+    'industry_Pharmaceuticals' => 'Pharmaceuticals',
+    'industry_Professional Services & Consulting' => 'Professional Services & Consulting',
+    'industry_Real Estate' => 'Real Estate',
+    'industry_Retail & Wholesale' => 'Retail & Wholesale',
+    'industry_Sports' => 'Sports',
+    'industry_Transportation' => 'Transportation',
+    'industry_Travel & Luxury' => 'Travel & Luxury',
+    'industry_Other' => 'Other',
+    'industry_Photography' =>'Photography',
+
+    // Countries
+    'country_Afghanistan' => 'Afghanistan',
+    'country_Albania' => 'Albania',
+    'country_Antarctica' => 'Antarctica',
+    'country_Algeria' => 'Algeria',
+    'country_American Samoa' => 'American Samoa',
+    'country_Andorra' => 'Andorra',
+    'country_Angola' => 'Angola',
+    'country_Antigua and Barbuda' => 'Antigua and Barbuda',
+    'country_Azerbaijan' => 'Azerbaijan',
+    'country_Argentina' => 'Argentina',
+    'country_Australia' => 'Australia',
+    'country_Austria' => 'Austria',
+    'country_Bahamas' => 'Bahamas',
+    'country_Bahrain' => 'Bahrain',
+    'country_Bangladesh' => 'Bangladesh',
+    'country_Armenia' => 'Armenia',
+    'country_Barbados' => 'Barbados',
+    'country_Belgium' => 'Belgium',
+    'country_Bermuda' => 'Bermuda',
+    'country_Bhutan' => 'Bhutan',
+    'country_Bolivia, Plurinational State of' => 'Bolivia, Plurinational State of',
+    'country_Bosnia and Herzegovina' => 'Bosnia and Herzegovina',
+    'country_Botswana' => 'Botswana',
+    'country_Bouvet Island' => 'Bouvet Island',
+    'country_Brazil' => 'Brazil',
+    'country_Belize' => 'Belize',
+    'country_British Indian Ocean Territory' => 'British Indian Ocean Territory',
+    'country_Solomon Islands' => 'Solomon Islands',
+    'country_Virgin Islands, British' => 'Virgin Islands, British',
+    'country_Brunei Darussalam' => 'Brunei Darussalam',
+    'country_Bulgaria' => 'Bulgaria',
+    'country_Myanmar' => 'Myanmar',
+    'country_Burundi' => 'Burundi',
+    'country_Belarus' => 'Belarus',
+    'country_Cambodia' => 'Cambodia',
+    'country_Cameroon' => 'Cameroon',
+    'country_Canada' => 'Canada',
+    'country_Cape Verde' => 'Cape Verde',
+    'country_Cayman Islands' => 'Cayman Islands',
+    'country_Central African Republic' => 'Central African Republic',
+    'country_Sri Lanka' => 'Sri Lanka',
+    'country_Chad' => 'Chad',
+    'country_Chile' => 'Chile',
+    'country_China' => 'China',
+    'country_Taiwan, Province of China' => 'Taiwan, Province of China',
+    'country_Christmas Island' => 'Christmas Island',
+    'country_Cocos (Keeling) Islands' => 'Cocos (Keeling) Islands',
+    'country_Colombia' => 'Colombia',
+    'country_Comoros' => 'Comoros',
+    'country_Mayotte' => 'Mayotte',
+    'country_Congo' => 'Congo',
+    'country_Congo, the Democratic Republic of the' => 'Congo, the Democratic Republic of the',
+    'country_Cook Islands' => 'Cook Islands',
+    'country_Costa Rica' => 'Costa Rica',
+    'country_Croatia' => 'Croatia',
+    'country_Cuba' => 'Cuba',
+    'country_Cyprus' => 'Cyprus',
+    'country_Czech Republic' => 'Czech Republic',
+    'country_Benin' => 'Benin',
+    'country_Denmark' => 'Denmark',
+    'country_Dominica' => 'Dominica',
+    'country_Dominican Republic' => 'Dominican Republic',
+    'country_Ecuador' => 'Ecuador',
+    'country_El Salvador' => 'El Salvador',
+    'country_Equatorial Guinea' => 'Equatorial Guinea',
+    'country_Ethiopia' => 'Ethiopia',
+    'country_Eritrea' => 'Eritrea',
+    'country_Estonia' => 'Estonia',
+    'country_Faroe Islands' => 'Faroe Islands',
+    'country_Falkland Islands (Malvinas)' => 'Falkland Islands (Malvinas)',
+    'country_South Georgia and the South Sandwich Islands' => 'South Georgia and the South Sandwich Islands',
+    'country_Fiji' => 'Fiji',
+    'country_Finland' => 'Finland',
+    'country_Åland Islands' => 'Åland Islands',
+    'country_France' => 'France',
+    'country_French Guiana' => 'French Guiana',
+    'country_French Polynesia' => 'French Polynesia',
+    'country_French Southern Territories' => 'French Southern Territories',
+    'country_Djibouti' => 'Djibouti',
+    'country_Gabon' => 'Gabon',
+    'country_Georgia' => 'Georgia',
+    'country_Gambia' => 'Gambia',
+    'country_Palestinian Territory, Occupied' => 'Palestinian Territory, Occupied',
+    'country_Germany' => 'Germany',
+    'country_Ghana' => 'Ghana',
+    'country_Gibraltar' => 'Gibraltar',
+    'country_Kiribati' => 'Kiribati',
+    'country_Greece' => 'Greece',
+    'country_Greenland' => 'Greenland',
+    'country_Grenada' => 'Grenada',
+    'country_Guadeloupe' => 'Guadeloupe',
+    'country_Guam' => 'Guam',
+    'country_Guatemala' => 'Guatemala',
+    'country_Guinea' => 'Guinea',
+    'country_Guyana' => 'Guyana',
+    'country_Haiti' => 'Haiti',
+    'country_Heard Island and McDonald Islands' => 'Heard Island and McDonald Islands',
+    'country_Holy See (Vatican City State)' => 'Holy See (Vatican City State)',
+    'country_Honduras' => 'Honduras',
+    'country_Hong Kong' => 'Hong Kong',
+    'country_Hungary' => 'Hungary',
+    'country_Iceland' => 'Iceland',
+    'country_India' => 'India',
+    'country_Indonesia' => 'Indonesia',
+    'country_Iran, Islamic Republic of' => 'Iran, Islamic Republic of',
+    'country_Iraq' => 'Iraq',
+    'country_Ireland' => 'Ireland',
+    'country_Israel' => 'Israel',
+    'country_Italy' => 'Italy',
+    'country_Côte d\'Ivoire' => 'Côte d\'Ivoire',
+    'country_Jamaica' => 'Jamaica',
+    'country_Japan' => 'Japan',
+    'country_Kazakhstan' => 'Kazakhstan',
+    'country_Jordan' => 'Jordan',
+    'country_Kenya' => 'Kenya',
+    'country_Korea, Democratic People\'s Republic of' => 'Korea, Democratic People\'s Republic of',
+    'country_Korea, Republic of' => 'Korea, Republic of',
+    'country_Kuwait' => 'Kuwait',
+    'country_Kyrgyzstan' => 'Kyrgyzstan',
+    'country_Lao People\'s Democratic Republic' => 'Lao People\'s Democratic Republic',
+    'country_Lebanon' => 'Lebanon',
+    'country_Lesotho' => 'Lesotho',
+    'country_Latvia' => 'Latvia',
+    'country_Liberia' => 'Liberia',
+    'country_Libya' => 'Libya',
+    'country_Liechtenstein' => 'Liechtenstein',
+    'country_Lithuania' => 'Lithuania',
+    'country_Luxembourg' => 'Luxembourg',
+    'country_Macao' => 'Macao',
+    'country_Madagascar' => 'Madagascar',
+    'country_Malawi' => 'Malawi',
+    'country_Malaysia' => 'Malaysia',
+    'country_Maldives' => 'Maldives',
+    'country_Mali' => 'Mali',
+    'country_Malta' => 'Malta',
+    'country_Martinique' => 'Martinique',
+    'country_Mauritania' => 'Mauritania',
+    'country_Mauritius' => 'Mauritius',
+    'country_Mexico' => 'Mexico',
+    'country_Monaco' => 'Monaco',
+    'country_Mongolia' => 'Mongolia',
+    'country_Moldova, Republic of' => 'Moldova, Republic of',
+    'country_Montenegro' => 'Montenegro',
+    'country_Montserrat' => 'Montserrat',
+    'country_Morocco' => 'Morocco',
+    'country_Mozambique' => 'Mozambique',
+    'country_Oman' => 'Oman',
+    'country_Namibia' => 'Namibia',
+    'country_Nauru' => 'Nauru',
+    'country_Nepal' => 'Nepal',
+    'country_Netherlands' => 'Netherlands',
+    'country_Curaçao' => 'Curaçao',
+    'country_Aruba' => 'Aruba',
+    'country_Sint Maarten (Dutch part)' => 'Sint Maarten (Dutch part)',
+    'country_Bonaire, Sint Eustatius and Saba' => 'Bonaire, Sint Eustatius and Saba',
+    'country_New Caledonia' => 'New Caledonia',
+    'country_Vanuatu' => 'Vanuatu',
+    'country_New Zealand' => 'New Zealand',
+    'country_Nicaragua' => 'Nicaragua',
+    'country_Niger' => 'Niger',
+    'country_Nigeria' => 'Nigeria',
+    'country_Niue' => 'Niue',
+    'country_Norfolk Island' => 'Norfolk Island',
+    'country_Norway' => 'Norway',
+    'country_Northern Mariana Islands' => 'Northern Mariana Islands',
+    'country_United States Minor Outlying Islands' => 'United States Minor Outlying Islands',
+    'country_Micronesia, Federated States of' => 'Micronesia, Federated States of',
+    'country_Marshall Islands' => 'Marshall Islands',
+    'country_Palau' => 'Palau',
+    'country_Pakistan' => 'Pakistan',
+    'country_Panama' => 'Panama',
+    'country_Papua New Guinea' => 'Papua New Guinea',
+    'country_Paraguay' => 'Paraguay',
+    'country_Peru' => 'Peru',
+    'country_Philippines' => 'Philippines',
+    'country_Pitcairn' => 'Pitcairn',
+    'country_Poland' => 'Poland',
+    'country_Portugal' => 'Portugal',
+    'country_Guinea-Bissau' => 'Guinea-Bissau',
+    'country_Timor-Leste' => 'Timor-Leste',
+    'country_Puerto Rico' => 'Puerto Rico',
+    'country_Qatar' => 'Qatar',
+    'country_Réunion' => 'Réunion',
+    'country_Romania' => 'Romania',
+    'country_Russian Federation' => 'Russian Federation',
+    'country_Rwanda' => 'Rwanda',
+    'country_Saint Barthélemy' => 'Saint Barthélemy',
+    'country_Saint Helena, Ascension and Tristan da Cunha' => 'Saint Helena, Ascension and Tristan da Cunha',
+    'country_Saint Kitts and Nevis' => 'Saint Kitts and Nevis',
+    'country_Anguilla' => 'Anguilla',
+    'country_Saint Lucia' => 'Saint Lucia',
+    'country_Saint Martin (French part)' => 'Saint Martin (French part)',
+    'country_Saint Pierre and Miquelon' => 'Saint Pierre and Miquelon',
+    'country_Saint Vincent and the Grenadines' => 'Saint Vincent and the Grenadines',
+    'country_San Marino' => 'San Marino',
+    'country_Sao Tome and Principe' => 'Sao Tome and Principe',
+    'country_Saudi Arabia' => 'Saudi Arabia',
+    'country_Senegal' => 'Senegal',
+    'country_Serbia' => 'Serbia',
+    'country_Seychelles' => 'Seychelles',
+    'country_Sierra Leone' => 'Sierra Leone',
+    'country_Singapore' => 'Singapore',
+    'country_Slovakia' => 'Slovakia',
+    'country_Viet Nam' => 'Viet Nam',
+    'country_Slovenia' => 'Slovenia',
+    'country_Somalia' => 'Somalia',
+    'country_South Africa' => 'South Africa',
+    'country_Zimbabwe' => 'Zimbabwe',
+    'country_Spain' => 'Spain',
+    'country_South Sudan' => 'South Sudan',
+    'country_Sudan' => 'Sudan',
+    'country_Western Sahara' => 'Western Sahara',
+    'country_Suriname' => 'Suriname',
+    'country_Svalbard and Jan Mayen' => 'Svalbard and Jan Mayen',
+    'country_Swaziland' => 'Swaziland',
+    'country_Sweden' => 'Sweden',
+    'country_Switzerland' => 'Switzerland',
+    'country_Syrian Arab Republic' => 'Syrian Arab Republic',
+    'country_Tajikistan' => 'Tajikistan',
+    'country_Thailand' => 'Thailand',
+    'country_Togo' => 'Togo',
+    'country_Tokelau' => 'Tokelau',
+    'country_Tonga' => 'Tonga',
+    'country_Trinidad and Tobago' => 'Trinidad and Tobago',
+    'country_United Arab Emirates' => 'United Arab Emirates',
+    'country_Tunisia' => 'Tunisia',
+    'country_Turkey' => 'Turkey',
+    'country_Turkmenistan' => 'Turkmenistan',
+    'country_Turks and Caicos Islands' => 'Turks and Caicos Islands',
+    'country_Tuvalu' => 'Tuvalu',
+    'country_Uganda' => 'Uganda',
+    '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_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_Virgin Islands, U.S.' => 'Virgin Islands, U.S.',
+    'country_Burkina Faso' => 'Burkina Faso',
+    'country_Uruguay' => 'Uruguay',
+    'country_Uzbekistan' => 'Uzbekistan',
+    'country_Venezuela, Bolivarian Republic of' => 'Venezuela, Bolivarian Republic of',
+    'country_Wallis and Futuna' => 'Wallis and Futuna',
+    'country_Samoa' => 'Samoa',
+    'country_Yemen' => 'Yemen',
+    'country_Zambi' => 'Zambi',
+
+    // Languages
+    'lang_Brazilian Portuguese' => 'Brazilian Portuguese',
+    'lang_Croatian' => 'Croatian',
+    'lang_Czech' => 'Czech',
+    'lang_Danish' => 'Danish',
+    'lang_Dutch' => 'Dutch',
+    'lang_English' => 'English',
+    'lang_French' => 'French',
+    'lang_French - Canada' => 'French - Canada',
+    'lang_German' => 'German',
+    'lang_Italian' => 'Italian',
+    'lang_Japanese' => 'Japanese',
+    'lang_Lithuanian' => 'Lithuanian',
+    'lang_Norwegian' => 'Norwegian',
+    'lang_Polish' => 'Polish',
+    'lang_Spanish' => 'Spanish',
+    'lang_Spanish - Spain' => 'Spanish - Spain',
+    'lang_Swedish' => 'Swedish',
+
+    // Frequencies
+    'freq_weekly' => 'Weekly',
+    'freq_two_weeks' => 'Two weeks',
+    'freq_four_weeks' => 'Four weeks',
+    'freq_monthly' => 'Monthly',
+    'freq_three_months' => 'Three months',
+    'freq_six_months' => 'Six months',
+    'freq_annually' => 'Annually',
+
+    // Payment types
+    'payment_type_Apply Credit' => 'Apply Credit',
+    'payment_type_Bank Transfer' => 'Bank Transfer',
+    'payment_type_Cash' => 'Cash',
+    'payment_type_Debit' => 'Debit',
+    'payment_type_ACH' => 'ACH',
+    'payment_type_Visa Card' => 'Visa Card',
+    'payment_type_MasterCard' => 'MasterCard',
+    'payment_type_American Express' => 'American Express',
+    'payment_type_Discover Card' => 'Discover Card',
+    'payment_type_Diners Card' => 'Diners Card',
+    'payment_type_EuroCard' => 'EuroCard',
+    'payment_type_Nova' => 'Nova',
+    'payment_type_Credit Card Other' => 'Credit Card Other',
+    'payment_type_PayPal' => 'PayPal',
+    'payment_type_Google Wallet' => 'Google Wallet',
+    'payment_type_Check' => 'Check',
+
+    // Industries
+    'industry_Accounting & Legal' => 'Accounting & Legal',
+    'industry_Advertising' => 'Advertising',
+    'industry_Aerospace' => 'Aerospace',
+    'industry_Agriculture' => 'Agriculture',
+    'industry_Automotive' => 'Automotive',
+    'industry_Banking & Finance' => 'Banking & Finance',
+    'industry_Biotechnology' => 'Biotechnology',
+    'industry_Broadcasting' => 'Broadcasting',
+    'industry_Business Services' => 'Business Services',
+    'industry_Commodities & Chemicals' => 'Commodities & Chemicals',
+    'industry_Communications' => 'Communications',
+    'industry_Computers & Hightech' => 'Computers & Hightech',
+    'industry_Defense' => 'Defense',
+    'industry_Energy' => 'Energy',
+    'industry_Entertainment' => 'Entertainment',
+    'industry_Government' => 'Government',
+    'industry_Healthcare & Life Sciences' => 'Healthcare & Life Sciences',
+    'industry_Insurance' => 'Insurance',
+    'industry_Manufacturing' => 'Manufacturing',
+    'industry_Marketing' => 'Marketing',
+    'industry_Media' => 'Media',
+    'industry_Nonprofit & Higher Ed' => 'Nonprofit & Higher Ed',
+    'industry_Pharmaceuticals' => 'Pharmaceuticals',
+    'industry_Professional Services & Consulting' => 'Professional Services & Consulting',
+    'industry_Real Estate' => 'Real Estate',
+    'industry_Retail & Wholesale' => 'Retail & Wholesale',
+    'industry_Sports' => 'Sports',
+    'industry_Transportation' => 'Transportation',
+    'industry_Travel & Luxury' => 'Travel & Luxury',
+    'industry_Other' => 'Other',
+    'industry_Photography' =>'Photography',
+
+    // Countries
+    'country_Afghanistan' => 'Afghanistan',
+    'country_Albania' => 'Albania',
+    'country_Antarctica' => 'Antarctica',
+    'country_Algeria' => 'Algeria',
+    'country_American Samoa' => 'American Samoa',
+    'country_Andorra' => 'Andorra',
+    'country_Angola' => 'Angola',
+    'country_Antigua and Barbuda' => 'Antigua and Barbuda',
+    'country_Azerbaijan' => 'Azerbaijan',
+    'country_Argentina' => 'Argentina',
+    'country_Australia' => 'Australia',
+    'country_Austria' => 'Austria',
+    'country_Bahamas' => 'Bahamas',
+    'country_Bahrain' => 'Bahrain',
+    'country_Bangladesh' => 'Bangladesh',
+    'country_Armenia' => 'Armenia',
+    'country_Barbados' => 'Barbados',
+    'country_Belgium' => 'Belgium',
+    'country_Bermuda' => 'Bermuda',
+    'country_Bhutan' => 'Bhutan',
+    'country_Bolivia, Plurinational State of' => 'Bolivia, Plurinational State of',
+    'country_Bosnia and Herzegovina' => 'Bosnia and Herzegovina',
+    'country_Botswana' => 'Botswana',
+    'country_Bouvet Island' => 'Bouvet Island',
+    'country_Brazil' => 'Brazil',
+    'country_Belize' => 'Belize',
+    'country_British Indian Ocean Territory' => 'British Indian Ocean Territory',
+    'country_Solomon Islands' => 'Solomon Islands',
+    'country_Virgin Islands, British' => 'Virgin Islands, British',
+    'country_Brunei Darussalam' => 'Brunei Darussalam',
+    'country_Bulgaria' => 'Bulgaria',
+    'country_Myanmar' => 'Myanmar',
+    'country_Burundi' => 'Burundi',
+    'country_Belarus' => 'Belarus',
+    'country_Cambodia' => 'Cambodia',
+    'country_Cameroon' => 'Cameroon',
+    'country_Canada' => 'Canada',
+    'country_Cape Verde' => 'Cape Verde',
+    'country_Cayman Islands' => 'Cayman Islands',
+    'country_Central African Republic' => 'Central African Republic',
+    'country_Sri Lanka' => 'Sri Lanka',
+    'country_Chad' => 'Chad',
+    'country_Chile' => 'Chile',
+    'country_China' => 'China',
+    'country_Taiwan, Province of China' => 'Taiwan, Province of China',
+    'country_Christmas Island' => 'Christmas Island',
+    'country_Cocos (Keeling) Islands' => 'Cocos (Keeling) Islands',
+    'country_Colombia' => 'Colombia',
+    'country_Comoros' => 'Comoros',
+    'country_Mayotte' => 'Mayotte',
+    'country_Congo' => 'Congo',
+    'country_Congo, the Democratic Republic of the' => 'Congo, the Democratic Republic of the',
+    'country_Cook Islands' => 'Cook Islands',
+    'country_Costa Rica' => 'Costa Rica',
+    'country_Croatia' => 'Croatia',
+    'country_Cuba' => 'Cuba',
+    'country_Cyprus' => 'Cyprus',
+    'country_Czech Republic' => 'Czech Republic',
+    'country_Benin' => 'Benin',
+    'country_Denmark' => 'Denmark',
+    'country_Dominica' => 'Dominica',
+    'country_Dominican Republic' => 'Dominican Republic',
+    'country_Ecuador' => 'Ecuador',
+    'country_El Salvador' => 'El Salvador',
+    'country_Equatorial Guinea' => 'Equatorial Guinea',
+    'country_Ethiopia' => 'Ethiopia',
+    'country_Eritrea' => 'Eritrea',
+    'country_Estonia' => 'Estonia',
+    'country_Faroe Islands' => 'Faroe Islands',
+    'country_Falkland Islands (Malvinas)' => 'Falkland Islands (Malvinas)',
+    'country_South Georgia and the South Sandwich Islands' => 'South Georgia and the South Sandwich Islands',
+    'country_Fiji' => 'Fiji',
+    'country_Finland' => 'Finland',
+    'country_Åland Islands' => 'Åland Islands',
+    'country_France' => 'France',
+    'country_French Guiana' => 'French Guiana',
+    'country_French Polynesia' => 'French Polynesia',
+    'country_French Southern Territories' => 'French Southern Territories',
+    'country_Djibouti' => 'Djibouti',
+    'country_Gabon' => 'Gabon',
+    'country_Georgia' => 'Georgia',
+    'country_Gambia' => 'Gambia',
+    'country_Palestinian Territory, Occupied' => 'Palestinian Territory, Occupied',
+    'country_Germany' => 'Germany',
+    'country_Ghana' => 'Ghana',
+    'country_Gibraltar' => 'Gibraltar',
+    'country_Kiribati' => 'Kiribati',
+    'country_Greece' => 'Greece',
+    'country_Greenland' => 'Greenland',
+    'country_Grenada' => 'Grenada',
+    'country_Guadeloupe' => 'Guadeloupe',
+    'country_Guam' => 'Guam',
+    'country_Guatemala' => 'Guatemala',
+    'country_Guinea' => 'Guinea',
+    'country_Guyana' => 'Guyana',
+    'country_Haiti' => 'Haiti',
+    'country_Heard Island and McDonald Islands' => 'Heard Island and McDonald Islands',
+    'country_Holy See (Vatican City State)' => 'Holy See (Vatican City State)',
+    'country_Honduras' => 'Honduras',
+    'country_Hong Kong' => 'Hong Kong',
+    'country_Hungary' => 'Hungary',
+    'country_Iceland' => 'Iceland',
+    'country_India' => 'India',
+    'country_Indonesia' => 'Indonesia',
+    'country_Iran, Islamic Republic of' => 'Iran, Islamic Republic of',
+    'country_Iraq' => 'Iraq',
+    'country_Ireland' => 'Ireland',
+    'country_Israel' => 'Israel',
+    'country_Italy' => 'Italy',
+    'country_Côte d\'Ivoire' => 'Côte d\'Ivoire',
+    'country_Jamaica' => 'Jamaica',
+    'country_Japan' => 'Japan',
+    'country_Kazakhstan' => 'Kazakhstan',
+    'country_Jordan' => 'Jordan',
+    'country_Kenya' => 'Kenya',
+    'country_Korea, Democratic People\'s Republic of' => 'Korea, Democratic People\'s Republic of',
+    'country_Korea, Republic of' => 'Korea, Republic of',
+    'country_Kuwait' => 'Kuwait',
+    'country_Kyrgyzstan' => 'Kyrgyzstan',
+    'country_Lao People\'s Democratic Republic' => 'Lao People\'s Democratic Republic',
+    'country_Lebanon' => 'Lebanon',
+    'country_Lesotho' => 'Lesotho',
+    'country_Latvia' => 'Latvia',
+    'country_Liberia' => 'Liberia',
+    'country_Libya' => 'Libya',
+    'country_Liechtenstein' => 'Liechtenstein',
+    'country_Lithuania' => 'Lithuania',
+    'country_Luxembourg' => 'Luxembourg',
+    'country_Macao' => 'Macao',
+    'country_Madagascar' => 'Madagascar',
+    'country_Malawi' => 'Malawi',
+    'country_Malaysia' => 'Malaysia',
+    'country_Maldives' => 'Maldives',
+    'country_Mali' => 'Mali',
+    'country_Malta' => 'Malta',
+    'country_Martinique' => 'Martinique',
+    'country_Mauritania' => 'Mauritania',
+    'country_Mauritius' => 'Mauritius',
+    'country_Mexico' => 'Mexico',
+    'country_Monaco' => 'Monaco',
+    'country_Mongolia' => 'Mongolia',
+    'country_Moldova, Republic of' => 'Moldova, Republic of',
+    'country_Montenegro' => 'Montenegro',
+    'country_Montserrat' => 'Montserrat',
+    'country_Morocco' => 'Morocco',
+    'country_Mozambique' => 'Mozambique',
+    'country_Oman' => 'Oman',
+    'country_Namibia' => 'Namibia',
+    'country_Nauru' => 'Nauru',
+    'country_Nepal' => 'Nepal',
+    'country_Netherlands' => 'Netherlands',
+    'country_Curaçao' => 'Curaçao',
+    'country_Aruba' => 'Aruba',
+    'country_Sint Maarten (Dutch part)' => 'Sint Maarten (Dutch part)',
+    'country_Bonaire, Sint Eustatius and Saba' => 'Bonaire, Sint Eustatius and Saba',
+    'country_New Caledonia' => 'New Caledonia',
+    'country_Vanuatu' => 'Vanuatu',
+    'country_New Zealand' => 'New Zealand',
+    'country_Nicaragua' => 'Nicaragua',
+    'country_Niger' => 'Niger',
+    'country_Nigeria' => 'Nigeria',
+    'country_Niue' => 'Niue',
+    'country_Norfolk Island' => 'Norfolk Island',
+    'country_Norway' => 'Norway',
+    'country_Northern Mariana Islands' => 'Northern Mariana Islands',
+    'country_United States Minor Outlying Islands' => 'United States Minor Outlying Islands',
+    'country_Micronesia, Federated States of' => 'Micronesia, Federated States of',
+    'country_Marshall Islands' => 'Marshall Islands',
+    'country_Palau' => 'Palau',
+    'country_Pakistan' => 'Pakistan',
+    'country_Panama' => 'Panama',
+    'country_Papua New Guinea' => 'Papua New Guinea',
+    'country_Paraguay' => 'Paraguay',
+    'country_Peru' => 'Peru',
+    'country_Philippines' => 'Philippines',
+    'country_Pitcairn' => 'Pitcairn',
+    'country_Poland' => 'Poland',
+    'country_Portugal' => 'Portugal',
+    'country_Guinea-Bissau' => 'Guinea-Bissau',
+    'country_Timor-Leste' => 'Timor-Leste',
+    'country_Puerto Rico' => 'Puerto Rico',
+    'country_Qatar' => 'Qatar',
+    'country_Réunion' => 'Réunion',
+    'country_Romania' => 'Romania',
+    'country_Russian Federation' => 'Russian Federation',
+    'country_Rwanda' => 'Rwanda',
+    'country_Saint Barthélemy' => 'Saint Barthélemy',
+    'country_Saint Helena, Ascension and Tristan da Cunha' => 'Saint Helena, Ascension and Tristan da Cunha',
+    'country_Saint Kitts and Nevis' => 'Saint Kitts and Nevis',
+    'country_Anguilla' => 'Anguilla',
+    'country_Saint Lucia' => 'Saint Lucia',
+    'country_Saint Martin (French part)' => 'Saint Martin (French part)',
+    'country_Saint Pierre and Miquelon' => 'Saint Pierre and Miquelon',
+    'country_Saint Vincent and the Grenadines' => 'Saint Vincent and the Grenadines',
+    'country_San Marino' => 'San Marino',
+    'country_Sao Tome and Principe' => 'Sao Tome and Principe',
+    'country_Saudi Arabia' => 'Saudi Arabia',
+    'country_Senegal' => 'Senegal',
+    'country_Serbia' => 'Serbia',
+    'country_Seychelles' => 'Seychelles',
+    'country_Sierra Leone' => 'Sierra Leone',
+    'country_Singapore' => 'Singapore',
+    'country_Slovakia' => 'Slovakia',
+    'country_Viet Nam' => 'Viet Nam',
+    'country_Slovenia' => 'Slovenia',
+    'country_Somalia' => 'Somalia',
+    'country_South Africa' => 'South Africa',
+    'country_Zimbabwe' => 'Zimbabwe',
+    'country_Spain' => 'Spain',
+    'country_South Sudan' => 'South Sudan',
+    'country_Sudan' => 'Sudan',
+    'country_Western Sahara' => 'Western Sahara',
+    'country_Suriname' => 'Suriname',
+    'country_Svalbard and Jan Mayen' => 'Svalbard and Jan Mayen',
+    'country_Swaziland' => 'Swaziland',
+    'country_Sweden' => 'Sweden',
+    'country_Switzerland' => 'Switzerland',
+    'country_Syrian Arab Republic' => 'Syrian Arab Republic',
+    'country_Tajikistan' => 'Tajikistan',
+    'country_Thailand' => 'Thailand',
+    'country_Togo' => 'Togo',
+    'country_Tokelau' => 'Tokelau',
+    'country_Tonga' => 'Tonga',
+    'country_Trinidad and Tobago' => 'Trinidad and Tobago',
+    'country_United Arab Emirates' => 'United Arab Emirates',
+    'country_Tunisia' => 'Tunisia',
+    'country_Turkey' => 'Turkey',
+    'country_Turkmenistan' => 'Turkmenistan',
+    'country_Turks and Caicos Islands' => 'Turks and Caicos Islands',
+    'country_Tuvalu' => 'Tuvalu',
+    'country_Uganda' => 'Uganda',
+    '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_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_Virgin Islands, U.S.' => 'Virgin Islands, U.S.',
+    'country_Burkina Faso' => 'Burkina Faso',
+    'country_Uruguay' => 'Uruguay',
+    'country_Uzbekistan' => 'Uzbekistan',
+    'country_Venezuela, Bolivarian Republic of' => 'Venezuela, Bolivarian Republic of',
+    'country_Wallis and Futuna' => 'Wallis and Futuna',
+    'country_Samoa' => 'Samoa',
+    'country_Yemen' => 'Yemen',
+    'country_Zambi' => 'Zambi',
+
+    'view_client_portal' => 'View client portal',
+    'view_portal' => 'View Portal',
+    'vendor_contacts' => 'Vendor Contacts',
+    'all' => 'All',
+    'selected' => 'Selected',
+    'category' => 'Category',
+    'categories' => 'Categories',
+    'new_expense_category' => 'New Expense Category',
+    'edit_category' => 'Edit Category',
+    'archive_expense_category' => 'Archive Category',
+    'expense_categories' => 'Expense Categories',
+    'list_expense_categories' => 'List Expense Categories',
+    'updated_expense_category' => 'Successfully updated expense category',
+    'created_expense_category' => 'Successfully created expense category',
+    'archived_expense_category' => 'Successfully archived expense category',
+    'archived_expense_categories' => 'Successfully archived :count expense category',
+    'restore_expense_category' => 'Restore expense category',
+    'restored_expense_category' => 'Successfully restored expense category',
+    'apply_taxes' => 'Apply taxes',
+    'min_to_max_users' => ':min to :max users',
+    'max_users_reached' => 'The maximum number of users has been reached.',
+    'buy_now_buttons' => 'Buy Now Buttons',
+    'landing_page' => 'Landing Page',
+    'payment_type' => 'Payment Type',
+    'form' => 'Form',
+    'link' => 'Link',
+    'fields' => 'Fields',
+    'dwolla' => 'Dwolla',
+    'buy_now_buttons_warning' => 'Note: client and invoice records are created even if the transaction isn\'t completed.',
+    'buy_now_buttons_disabled' => 'This feature requires that a product is created and a payment gateway is configured.',
+    'enable_buy_now_buttons_help' => 'Enable support for buy now buttons',
+    'changes_take_effect_immediately' => 'Note: changes take effect immediately',
+    'wepay_account_description' => 'Payment gateway for Invoice Ninja',
+    'payment_error_code' => 'There was an error processing your payment [:code]. Please try again later.',
+    'standard_fees_apply' => 'Standard fees apply: 2.9% + $0.30 per successful charge.',
+    'limit_import_rows' => 'Data needs to be imported in batches of :count rows or less',
+
 
 );
 

resources/lang/hr/texts.php

@@ -1,6 +1,7 @@
 <?php
 
 $LANG = array(
+
     'organization' => 'Organizacija',
     'name' => 'Ime',
     'website' => 'Web mjesto',
@@ -386,7 +387,7 @@ $LANG = array(
     'gateway_help_1' => ':link za pristup na Authorize.net.',
     'gateway_help_2' => ':link za pristup na Authorize.net.',
     'gateway_help_17' => ':link za pristup vašem PayPal API potpisu.',
-    'gateway_help_27' => ':link za pristup za TwoCheckout.',
+    'gateway_help_27' => ':link to sign up for 2Checkout.com. To ensure payments are tracked set :complete_link as the redirect URL under Account > Site Management in the 2Checkout portal.',
     'more_designs' => 'Više dizajna',
     'more_designs_title' => 'Dodatni dizajni računa',
     'more_designs_cloud_header' => 'Nadogradite na Pro za više dizajna računa',
@@ -773,6 +774,8 @@ $LANG = array(
     'activity_35' => ':user kreirao :vendor',
     'activity_36' => ':user kreirao :vendor',
     'activity_37' => ':user kreirao :vendor',
+    'activity_42' => ':user created task ":task"',
+    'activity_43' => ':user updated task ":task"',
     'payment' => 'Uplata',
     'system' => 'Sustav',
     'signature' => 'Potpis e-pošte',
@@ -992,7 +995,7 @@ $LANG = array(
     'overdue' => 'Van valute',
 
 
-    'white_label_text' => 'Purchase a ONE YEAR white label license for $:price to remove the Invoice Ninja branding from the client portal and help support our project.',
+    'white_label_text' => 'Purchase a ONE YEAR white label license for $:price to remove the Invoice Ninja branding and help support our project.',
     'user_email_footer' => 'To adjust your email notification settings please visit :link',
     'reset_password_footer' => 'If you did not request this password reset please email our support: :email',
     'limit_users' => 'Sorry, this will exceed the limit of :limit users',
@@ -1293,7 +1296,7 @@ $LANG = array(
     'wepay_tos_agree' => 'I agree to the :link.',
     'wepay_tos_link_text' => 'WePay Terms of Service',
     'resend_confirmation_email' => 'Resend Confirmation Email',
-    'manage_wepay_account' => 'Manage WePay Account',
+    'manage_account' => 'Manage Account',
     'action_required' => 'Action Required',
     'finish_setup' => 'Finish Setup',
     'created_wepay_confirmation_required' => 'Please check your email and confirm your email address with WePay.',
@@ -1361,6 +1364,686 @@ $LANG = array(
     'failed_remove_payment_method' => 'Failed to remove the payment method',
     'gateway_exists' => 'This gateway already exists',
     'manual_entry' => 'Manual entry',
+    'start_of_week' => 'First day of the week',
+
+    // Frequencies
+    'freq_weekly' => 'Weekly',
+    'freq_two_weeks' => 'Two weeks',
+    'freq_four_weeks' => 'Four weeks',
+    'freq_monthly' => 'Monthly',
+    'freq_three_months' => 'Three months',
+    'freq_six_months' => 'Six months',
+    'freq_annually' => 'Annually',
+
+    // Payment types
+    'payment_type_Apply Credit' => 'Apply Credit',
+    'payment_type_Bank Transfer' => 'Bank Transfer',
+    'payment_type_Cash' => 'Cash',
+    'payment_type_Debit' => 'Debit',
+    'payment_type_ACH' => 'ACH',
+    'payment_type_Visa Card' => 'Visa Card',
+    'payment_type_MasterCard' => 'MasterCard',
+    'payment_type_American Express' => 'American Express',
+    'payment_type_Discover Card' => 'Discover Card',
+    'payment_type_Diners Card' => 'Diners Card',
+    'payment_type_EuroCard' => 'EuroCard',
+    'payment_type_Nova' => 'Nova',
+    'payment_type_Credit Card Other' => 'Credit Card Other',
+    'payment_type_PayPal' => 'PayPal',
+    'payment_type_Google Wallet' => 'Google Wallet',
+    'payment_type_Check' => 'Check',
+
+    // Industries
+    'industry_Accounting & Legal' => 'Accounting & Legal',
+    'industry_Advertising' => 'Advertising',
+    'industry_Aerospace' => 'Aerospace',
+    'industry_Agriculture' => 'Agriculture',
+    'industry_Automotive' => 'Automotive',
+    'industry_Banking & Finance' => 'Banking & Finance',
+    'industry_Biotechnology' => 'Biotechnology',
+    'industry_Broadcasting' => 'Broadcasting',
+    'industry_Business Services' => 'Business Services',
+    'industry_Commodities & Chemicals' => 'Commodities & Chemicals',
+    'industry_Communications' => 'Communications',
+    'industry_Computers & Hightech' => 'Computers & Hightech',
+    'industry_Defense' => 'Defense',
+    'industry_Energy' => 'Energy',
+    'industry_Entertainment' => 'Entertainment',
+    'industry_Government' => 'Government',
+    'industry_Healthcare & Life Sciences' => 'Healthcare & Life Sciences',
+    'industry_Insurance' => 'Insurance',
+    'industry_Manufacturing' => 'Manufacturing',
+    'industry_Marketing' => 'Marketing',
+    'industry_Media' => 'Media',
+    'industry_Nonprofit & Higher Ed' => 'Nonprofit & Higher Ed',
+    'industry_Pharmaceuticals' => 'Pharmaceuticals',
+    'industry_Professional Services & Consulting' => 'Professional Services & Consulting',
+    'industry_Real Estate' => 'Real Estate',
+    'industry_Retail & Wholesale' => 'Retail & Wholesale',
+    'industry_Sports' => 'Sports',
+    'industry_Transportation' => 'Transportation',
+    'industry_Travel & Luxury' => 'Travel & Luxury',
+    'industry_Other' => 'Other',
+    'industry_Photography' =>'Photography',
+
+    // Countries
+    'country_Afghanistan' => 'Afghanistan',
+    'country_Albania' => 'Albania',
+    'country_Antarctica' => 'Antarctica',
+    'country_Algeria' => 'Algeria',
+    'country_American Samoa' => 'American Samoa',
+    'country_Andorra' => 'Andorra',
+    'country_Angola' => 'Angola',
+    'country_Antigua and Barbuda' => 'Antigua and Barbuda',
+    'country_Azerbaijan' => 'Azerbaijan',
+    'country_Argentina' => 'Argentina',
+    'country_Australia' => 'Australia',
+    'country_Austria' => 'Austria',
+    'country_Bahamas' => 'Bahamas',
+    'country_Bahrain' => 'Bahrain',
+    'country_Bangladesh' => 'Bangladesh',
+    'country_Armenia' => 'Armenia',
+    'country_Barbados' => 'Barbados',
+    'country_Belgium' => 'Belgium',
+    'country_Bermuda' => 'Bermuda',
+    'country_Bhutan' => 'Bhutan',
+    'country_Bolivia, Plurinational State of' => 'Bolivia, Plurinational State of',
+    'country_Bosnia and Herzegovina' => 'Bosnia and Herzegovina',
+    'country_Botswana' => 'Botswana',
+    'country_Bouvet Island' => 'Bouvet Island',
+    'country_Brazil' => 'Brazil',
+    'country_Belize' => 'Belize',
+    'country_British Indian Ocean Territory' => 'British Indian Ocean Territory',
+    'country_Solomon Islands' => 'Solomon Islands',
+    'country_Virgin Islands, British' => 'Virgin Islands, British',
+    'country_Brunei Darussalam' => 'Brunei Darussalam',
+    'country_Bulgaria' => 'Bulgaria',
+    'country_Myanmar' => 'Myanmar',
+    'country_Burundi' => 'Burundi',
+    'country_Belarus' => 'Belarus',
+    'country_Cambodia' => 'Cambodia',
+    'country_Cameroon' => 'Cameroon',
+    'country_Canada' => 'Canada',
+    'country_Cape Verde' => 'Cape Verde',
+    'country_Cayman Islands' => 'Cayman Islands',
+    'country_Central African Republic' => 'Central African Republic',
+    'country_Sri Lanka' => 'Sri Lanka',
+    'country_Chad' => 'Chad',
+    'country_Chile' => 'Chile',
+    'country_China' => 'China',
+    'country_Taiwan, Province of China' => 'Taiwan, Province of China',
+    'country_Christmas Island' => 'Christmas Island',
+    'country_Cocos (Keeling) Islands' => 'Cocos (Keeling) Islands',
+    'country_Colombia' => 'Colombia',
+    'country_Comoros' => 'Comoros',
+    'country_Mayotte' => 'Mayotte',
+    'country_Congo' => 'Congo',
+    'country_Congo, the Democratic Republic of the' => 'Congo, the Democratic Republic of the',
+    'country_Cook Islands' => 'Cook Islands',
+    'country_Costa Rica' => 'Costa Rica',
+    'country_Croatia' => 'Croatia',
+    'country_Cuba' => 'Cuba',
+    'country_Cyprus' => 'Cyprus',
+    'country_Czech Republic' => 'Czech Republic',
+    'country_Benin' => 'Benin',
+    'country_Denmark' => 'Denmark',
+    'country_Dominica' => 'Dominica',
+    'country_Dominican Republic' => 'Dominican Republic',
+    'country_Ecuador' => 'Ecuador',
+    'country_El Salvador' => 'El Salvador',
+    'country_Equatorial Guinea' => 'Equatorial Guinea',
+    'country_Ethiopia' => 'Ethiopia',
+    'country_Eritrea' => 'Eritrea',
+    'country_Estonia' => 'Estonia',
+    'country_Faroe Islands' => 'Faroe Islands',
+    'country_Falkland Islands (Malvinas)' => 'Falkland Islands (Malvinas)',
+    'country_South Georgia and the South Sandwich Islands' => 'South Georgia and the South Sandwich Islands',
+    'country_Fiji' => 'Fiji',
+    'country_Finland' => 'Finland',
+    'country_Åland Islands' => 'Åland Islands',
+    'country_France' => 'France',
+    'country_French Guiana' => 'French Guiana',
+    'country_French Polynesia' => 'French Polynesia',
+    'country_French Southern Territories' => 'French Southern Territories',
+    'country_Djibouti' => 'Djibouti',
+    'country_Gabon' => 'Gabon',
+    'country_Georgia' => 'Georgia',
+    'country_Gambia' => 'Gambia',
+    'country_Palestinian Territory, Occupied' => 'Palestinian Territory, Occupied',
+    'country_Germany' => 'Germany',
+    'country_Ghana' => 'Ghana',
+    'country_Gibraltar' => 'Gibraltar',
+    'country_Kiribati' => 'Kiribati',
+    'country_Greece' => 'Greece',
+    'country_Greenland' => 'Greenland',
+    'country_Grenada' => 'Grenada',
+    'country_Guadeloupe' => 'Guadeloupe',
+    'country_Guam' => 'Guam',
+    'country_Guatemala' => 'Guatemala',
+    'country_Guinea' => 'Guinea',
+    'country_Guyana' => 'Guyana',
+    'country_Haiti' => 'Haiti',
+    'country_Heard Island and McDonald Islands' => 'Heard Island and McDonald Islands',
+    'country_Holy See (Vatican City State)' => 'Holy See (Vatican City State)',
+    'country_Honduras' => 'Honduras',
+    'country_Hong Kong' => 'Hong Kong',
+    'country_Hungary' => 'Hungary',
+    'country_Iceland' => 'Iceland',
+    'country_India' => 'India',
+    'country_Indonesia' => 'Indonesia',
+    'country_Iran, Islamic Republic of' => 'Iran, Islamic Republic of',
+    'country_Iraq' => 'Iraq',
+    'country_Ireland' => 'Ireland',
+    'country_Israel' => 'Israel',
+    'country_Italy' => 'Italy',
+    'country_Côte d\'Ivoire' => 'Côte d\'Ivoire',
+    'country_Jamaica' => 'Jamaica',
+    'country_Japan' => 'Japan',
+    'country_Kazakhstan' => 'Kazakhstan',
+    'country_Jordan' => 'Jordan',
+    'country_Kenya' => 'Kenya',
+    'country_Korea, Democratic People\'s Republic of' => 'Korea, Democratic People\'s Republic of',
+    'country_Korea, Republic of' => 'Korea, Republic of',
+    'country_Kuwait' => 'Kuwait',
+    'country_Kyrgyzstan' => 'Kyrgyzstan',
+    'country_Lao People\'s Democratic Republic' => 'Lao People\'s Democratic Republic',
+    'country_Lebanon' => 'Lebanon',
+    'country_Lesotho' => 'Lesotho',
+    'country_Latvia' => 'Latvia',
+    'country_Liberia' => 'Liberia',
+    'country_Libya' => 'Libya',
+    'country_Liechtenstein' => 'Liechtenstein',
+    'country_Lithuania' => 'Lithuania',
+    'country_Luxembourg' => 'Luxembourg',
+    'country_Macao' => 'Macao',
+    'country_Madagascar' => 'Madagascar',
+    'country_Malawi' => 'Malawi',
+    'country_Malaysia' => 'Malaysia',
+    'country_Maldives' => 'Maldives',
+    'country_Mali' => 'Mali',
+    'country_Malta' => 'Malta',
+    'country_Martinique' => 'Martinique',
+    'country_Mauritania' => 'Mauritania',
+    'country_Mauritius' => 'Mauritius',
+    'country_Mexico' => 'Mexico',
+    'country_Monaco' => 'Monaco',
+    'country_Mongolia' => 'Mongolia',
+    'country_Moldova, Republic of' => 'Moldova, Republic of',
+    'country_Montenegro' => 'Montenegro',
+    'country_Montserrat' => 'Montserrat',
+    'country_Morocco' => 'Morocco',
+    'country_Mozambique' => 'Mozambique',
+    'country_Oman' => 'Oman',
+    'country_Namibia' => 'Namibia',
+    'country_Nauru' => 'Nauru',
+    'country_Nepal' => 'Nepal',
+    'country_Netherlands' => 'Netherlands',
+    'country_Curaçao' => 'Curaçao',
+    'country_Aruba' => 'Aruba',
+    'country_Sint Maarten (Dutch part)' => 'Sint Maarten (Dutch part)',
+    'country_Bonaire, Sint Eustatius and Saba' => 'Bonaire, Sint Eustatius and Saba',
+    'country_New Caledonia' => 'New Caledonia',
+    'country_Vanuatu' => 'Vanuatu',
+    'country_New Zealand' => 'New Zealand',
+    'country_Nicaragua' => 'Nicaragua',
+    'country_Niger' => 'Niger',
+    'country_Nigeria' => 'Nigeria',
+    'country_Niue' => 'Niue',
+    'country_Norfolk Island' => 'Norfolk Island',
+    'country_Norway' => 'Norway',
+    'country_Northern Mariana Islands' => 'Northern Mariana Islands',
+    'country_United States Minor Outlying Islands' => 'United States Minor Outlying Islands',
+    'country_Micronesia, Federated States of' => 'Micronesia, Federated States of',
+    'country_Marshall Islands' => 'Marshall Islands',
+    'country_Palau' => 'Palau',
+    'country_Pakistan' => 'Pakistan',
+    'country_Panama' => 'Panama',
+    'country_Papua New Guinea' => 'Papua New Guinea',
+    'country_Paraguay' => 'Paraguay',
+    'country_Peru' => 'Peru',
+    'country_Philippines' => 'Philippines',
+    'country_Pitcairn' => 'Pitcairn',
+    'country_Poland' => 'Poland',
+    'country_Portugal' => 'Portugal',
+    'country_Guinea-Bissau' => 'Guinea-Bissau',
+    'country_Timor-Leste' => 'Timor-Leste',
+    'country_Puerto Rico' => 'Puerto Rico',
+    'country_Qatar' => 'Qatar',
+    'country_Réunion' => 'Réunion',
+    'country_Romania' => 'Romania',
+    'country_Russian Federation' => 'Russian Federation',
+    'country_Rwanda' => 'Rwanda',
+    'country_Saint Barthélemy' => 'Saint Barthélemy',
+    'country_Saint Helena, Ascension and Tristan da Cunha' => 'Saint Helena, Ascension and Tristan da Cunha',
+    'country_Saint Kitts and Nevis' => 'Saint Kitts and Nevis',
+    'country_Anguilla' => 'Anguilla',
+    'country_Saint Lucia' => 'Saint Lucia',
+    'country_Saint Martin (French part)' => 'Saint Martin (French part)',
+    'country_Saint Pierre and Miquelon' => 'Saint Pierre and Miquelon',
+    'country_Saint Vincent and the Grenadines' => 'Saint Vincent and the Grenadines',
+    'country_San Marino' => 'San Marino',
+    'country_Sao Tome and Principe' => 'Sao Tome and Principe',
+    'country_Saudi Arabia' => 'Saudi Arabia',
+    'country_Senegal' => 'Senegal',
+    'country_Serbia' => 'Serbia',
+    'country_Seychelles' => 'Seychelles',
+    'country_Sierra Leone' => 'Sierra Leone',
+    'country_Singapore' => 'Singapore',
+    'country_Slovakia' => 'Slovakia',
+    'country_Viet Nam' => 'Viet Nam',
+    'country_Slovenia' => 'Slovenia',
+    'country_Somalia' => 'Somalia',
+    'country_South Africa' => 'South Africa',
+    'country_Zimbabwe' => 'Zimbabwe',
+    'country_Spain' => 'Spain',
+    'country_South Sudan' => 'South Sudan',
+    'country_Sudan' => 'Sudan',
+    'country_Western Sahara' => 'Western Sahara',
+    'country_Suriname' => 'Suriname',
+    'country_Svalbard and Jan Mayen' => 'Svalbard and Jan Mayen',
+    'country_Swaziland' => 'Swaziland',
+    'country_Sweden' => 'Sweden',
+    'country_Switzerland' => 'Switzerland',
+    'country_Syrian Arab Republic' => 'Syrian Arab Republic',
+    'country_Tajikistan' => 'Tajikistan',
+    'country_Thailand' => 'Thailand',
+    'country_Togo' => 'Togo',
+    'country_Tokelau' => 'Tokelau',
+    'country_Tonga' => 'Tonga',
+    'country_Trinidad and Tobago' => 'Trinidad and Tobago',
+    'country_United Arab Emirates' => 'United Arab Emirates',
+    'country_Tunisia' => 'Tunisia',
+    'country_Turkey' => 'Turkey',
+    'country_Turkmenistan' => 'Turkmenistan',
+    'country_Turks and Caicos Islands' => 'Turks and Caicos Islands',
+    'country_Tuvalu' => 'Tuvalu',
+    'country_Uganda' => 'Uganda',
+    '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_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_Virgin Islands, U.S.' => 'Virgin Islands, U.S.',
+    'country_Burkina Faso' => 'Burkina Faso',
+    'country_Uruguay' => 'Uruguay',
+    'country_Uzbekistan' => 'Uzbekistan',
+    'country_Venezuela, Bolivarian Republic of' => 'Venezuela, Bolivarian Republic of',
+    'country_Wallis and Futuna' => 'Wallis and Futuna',
+    'country_Samoa' => 'Samoa',
+    'country_Yemen' => 'Yemen',
+    'country_Zambi' => 'Zambi',
+
+    // Languages
+    'lang_Brazilian Portuguese' => 'Brazilian Portuguese',
+    'lang_Croatian' => 'Croatian',
+    'lang_Czech' => 'Czech',
+    'lang_Danish' => 'Danish',
+    'lang_Dutch' => 'Dutch',
+    'lang_English' => 'English',
+    'lang_French' => 'French',
+    'lang_French - Canada' => 'French - Canada',
+    'lang_German' => 'German',
+    'lang_Italian' => 'Italian',
+    'lang_Japanese' => 'Japanese',
+    'lang_Lithuanian' => 'Lithuanian',
+    'lang_Norwegian' => 'Norwegian',
+    'lang_Polish' => 'Polish',
+    'lang_Spanish' => 'Spanish',
+    'lang_Spanish - Spain' => 'Spanish - Spain',
+    'lang_Swedish' => 'Swedish',
+
+    // Frequencies
+    'freq_weekly' => 'Weekly',
+    'freq_two_weeks' => 'Two weeks',
+    'freq_four_weeks' => 'Four weeks',
+    'freq_monthly' => 'Monthly',
+    'freq_three_months' => 'Three months',
+    'freq_six_months' => 'Six months',
+    'freq_annually' => 'Annually',
+
+    // Payment types
+    'payment_type_Apply Credit' => 'Apply Credit',
+    'payment_type_Bank Transfer' => 'Bank Transfer',
+    'payment_type_Cash' => 'Cash',
+    'payment_type_Debit' => 'Debit',
+    'payment_type_ACH' => 'ACH',
+    'payment_type_Visa Card' => 'Visa Card',
+    'payment_type_MasterCard' => 'MasterCard',
+    'payment_type_American Express' => 'American Express',
+    'payment_type_Discover Card' => 'Discover Card',
+    'payment_type_Diners Card' => 'Diners Card',
+    'payment_type_EuroCard' => 'EuroCard',
+    'payment_type_Nova' => 'Nova',
+    'payment_type_Credit Card Other' => 'Credit Card Other',
+    'payment_type_PayPal' => 'PayPal',
+    'payment_type_Google Wallet' => 'Google Wallet',
+    'payment_type_Check' => 'Check',
+
+    // Industries
+    'industry_Accounting & Legal' => 'Accounting & Legal',
+    'industry_Advertising' => 'Advertising',
+    'industry_Aerospace' => 'Aerospace',
+    'industry_Agriculture' => 'Agriculture',
+    'industry_Automotive' => 'Automotive',
+    'industry_Banking & Finance' => 'Banking & Finance',
+    'industry_Biotechnology' => 'Biotechnology',
+    'industry_Broadcasting' => 'Broadcasting',
+    'industry_Business Services' => 'Business Services',
+    'industry_Commodities & Chemicals' => 'Commodities & Chemicals',
+    'industry_Communications' => 'Communications',
+    'industry_Computers & Hightech' => 'Computers & Hightech',
+    'industry_Defense' => 'Defense',
+    'industry_Energy' => 'Energy',
+    'industry_Entertainment' => 'Entertainment',
+    'industry_Government' => 'Government',
+    'industry_Healthcare & Life Sciences' => 'Healthcare & Life Sciences',
+    'industry_Insurance' => 'Insurance',
+    'industry_Manufacturing' => 'Manufacturing',
+    'industry_Marketing' => 'Marketing',
+    'industry_Media' => 'Media',
+    'industry_Nonprofit & Higher Ed' => 'Nonprofit & Higher Ed',
+    'industry_Pharmaceuticals' => 'Pharmaceuticals',
+    'industry_Professional Services & Consulting' => 'Professional Services & Consulting',
+    'industry_Real Estate' => 'Real Estate',
+    'industry_Retail & Wholesale' => 'Retail & Wholesale',
+    'industry_Sports' => 'Sports',
+    'industry_Transportation' => 'Transportation',
+    'industry_Travel & Luxury' => 'Travel & Luxury',
+    'industry_Other' => 'Other',
+    'industry_Photography' =>'Photography',
+
+    // Countries
+    'country_Afghanistan' => 'Afghanistan',
+    'country_Albania' => 'Albania',
+    'country_Antarctica' => 'Antarctica',
+    'country_Algeria' => 'Algeria',
+    'country_American Samoa' => 'American Samoa',
+    'country_Andorra' => 'Andorra',
+    'country_Angola' => 'Angola',
+    'country_Antigua and Barbuda' => 'Antigua and Barbuda',
+    'country_Azerbaijan' => 'Azerbaijan',
+    'country_Argentina' => 'Argentina',
+    'country_Australia' => 'Australia',
+    'country_Austria' => 'Austria',
+    'country_Bahamas' => 'Bahamas',
+    'country_Bahrain' => 'Bahrain',
+    'country_Bangladesh' => 'Bangladesh',
+    'country_Armenia' => 'Armenia',
+    'country_Barbados' => 'Barbados',
+    'country_Belgium' => 'Belgium',
+    'country_Bermuda' => 'Bermuda',
+    'country_Bhutan' => 'Bhutan',
+    'country_Bolivia, Plurinational State of' => 'Bolivia, Plurinational State of',
+    'country_Bosnia and Herzegovina' => 'Bosnia and Herzegovina',
+    'country_Botswana' => 'Botswana',
+    'country_Bouvet Island' => 'Bouvet Island',
+    'country_Brazil' => 'Brazil',
+    'country_Belize' => 'Belize',
+    'country_British Indian Ocean Territory' => 'British Indian Ocean Territory',
+    'country_Solomon Islands' => 'Solomon Islands',
+    'country_Virgin Islands, British' => 'Virgin Islands, British',
+    'country_Brunei Darussalam' => 'Brunei Darussalam',
+    'country_Bulgaria' => 'Bulgaria',
+    'country_Myanmar' => 'Myanmar',
+    'country_Burundi' => 'Burundi',
+    'country_Belarus' => 'Belarus',
+    'country_Cambodia' => 'Cambodia',
+    'country_Cameroon' => 'Cameroon',
+    'country_Canada' => 'Canada',
+    'country_Cape Verde' => 'Cape Verde',
+    'country_Cayman Islands' => 'Cayman Islands',
+    'country_Central African Republic' => 'Central African Republic',
+    'country_Sri Lanka' => 'Sri Lanka',
+    'country_Chad' => 'Chad',
+    'country_Chile' => 'Chile',
+    'country_China' => 'China',
+    'country_Taiwan, Province of China' => 'Taiwan, Province of China',
+    'country_Christmas Island' => 'Christmas Island',
+    'country_Cocos (Keeling) Islands' => 'Cocos (Keeling) Islands',
+    'country_Colombia' => 'Colombia',
+    'country_Comoros' => 'Comoros',
+    'country_Mayotte' => 'Mayotte',
+    'country_Congo' => 'Congo',
+    'country_Congo, the Democratic Republic of the' => 'Congo, the Democratic Republic of the',
+    'country_Cook Islands' => 'Cook Islands',
+    'country_Costa Rica' => 'Costa Rica',
+    'country_Croatia' => 'Croatia',
+    'country_Cuba' => 'Cuba',
+    'country_Cyprus' => 'Cyprus',
+    'country_Czech Republic' => 'Czech Republic',
+    'country_Benin' => 'Benin',
+    'country_Denmark' => 'Denmark',
+    'country_Dominica' => 'Dominica',
+    'country_Dominican Republic' => 'Dominican Republic',
+    'country_Ecuador' => 'Ecuador',
+    'country_El Salvador' => 'El Salvador',
+    'country_Equatorial Guinea' => 'Equatorial Guinea',
+    'country_Ethiopia' => 'Ethiopia',
+    'country_Eritrea' => 'Eritrea',
+    'country_Estonia' => 'Estonia',
+    'country_Faroe Islands' => 'Faroe Islands',
+    'country_Falkland Islands (Malvinas)' => 'Falkland Islands (Malvinas)',
+    'country_South Georgia and the South Sandwich Islands' => 'South Georgia and the South Sandwich Islands',
+    'country_Fiji' => 'Fiji',
+    'country_Finland' => 'Finland',
+    'country_Åland Islands' => 'Åland Islands',
+    'country_France' => 'France',
+    'country_French Guiana' => 'French Guiana',
+    'country_French Polynesia' => 'French Polynesia',
+    'country_French Southern Territories' => 'French Southern Territories',
+    'country_Djibouti' => 'Djibouti',
+    'country_Gabon' => 'Gabon',
+    'country_Georgia' => 'Georgia',
+    'country_Gambia' => 'Gambia',
+    'country_Palestinian Territory, Occupied' => 'Palestinian Territory, Occupied',
+    'country_Germany' => 'Germany',
+    'country_Ghana' => 'Ghana',
+    'country_Gibraltar' => 'Gibraltar',
+    'country_Kiribati' => 'Kiribati',
+    'country_Greece' => 'Greece',
+    'country_Greenland' => 'Greenland',
+    'country_Grenada' => 'Grenada',
+    'country_Guadeloupe' => 'Guadeloupe',
+    'country_Guam' => 'Guam',
+    'country_Guatemala' => 'Guatemala',
+    'country_Guinea' => 'Guinea',
+    'country_Guyana' => 'Guyana',
+    'country_Haiti' => 'Haiti',
+    'country_Heard Island and McDonald Islands' => 'Heard Island and McDonald Islands',
+    'country_Holy See (Vatican City State)' => 'Holy See (Vatican City State)',
+    'country_Honduras' => 'Honduras',
+    'country_Hong Kong' => 'Hong Kong',
+    'country_Hungary' => 'Hungary',
+    'country_Iceland' => 'Iceland',
+    'country_India' => 'India',
+    'country_Indonesia' => 'Indonesia',
+    'country_Iran, Islamic Republic of' => 'Iran, Islamic Republic of',
+    'country_Iraq' => 'Iraq',
+    'country_Ireland' => 'Ireland',
+    'country_Israel' => 'Israel',
+    'country_Italy' => 'Italy',
+    'country_Côte d\'Ivoire' => 'Côte d\'Ivoire',
+    'country_Jamaica' => 'Jamaica',
+    'country_Japan' => 'Japan',
+    'country_Kazakhstan' => 'Kazakhstan',
+    'country_Jordan' => 'Jordan',
+    'country_Kenya' => 'Kenya',
+    'country_Korea, Democratic People\'s Republic of' => 'Korea, Democratic People\'s Republic of',
+    'country_Korea, Republic of' => 'Korea, Republic of',
+    'country_Kuwait' => 'Kuwait',
+    'country_Kyrgyzstan' => 'Kyrgyzstan',
+    'country_Lao People\'s Democratic Republic' => 'Lao People\'s Democratic Republic',
+    'country_Lebanon' => 'Lebanon',
+    'country_Lesotho' => 'Lesotho',
+    'country_Latvia' => 'Latvia',
+    'country_Liberia' => 'Liberia',
+    'country_Libya' => 'Libya',
+    'country_Liechtenstein' => 'Liechtenstein',
+    'country_Lithuania' => 'Lithuania',
+    'country_Luxembourg' => 'Luxembourg',
+    'country_Macao' => 'Macao',
+    'country_Madagascar' => 'Madagascar',
+    'country_Malawi' => 'Malawi',
+    'country_Malaysia' => 'Malaysia',
+    'country_Maldives' => 'Maldives',
+    'country_Mali' => 'Mali',
+    'country_Malta' => 'Malta',
+    'country_Martinique' => 'Martinique',
+    'country_Mauritania' => 'Mauritania',
+    'country_Mauritius' => 'Mauritius',
+    'country_Mexico' => 'Mexico',
+    'country_Monaco' => 'Monaco',
+    'country_Mongolia' => 'Mongolia',
+    'country_Moldova, Republic of' => 'Moldova, Republic of',
+    'country_Montenegro' => 'Montenegro',
+    'country_Montserrat' => 'Montserrat',
+    'country_Morocco' => 'Morocco',
+    'country_Mozambique' => 'Mozambique',
+    'country_Oman' => 'Oman',
+    'country_Namibia' => 'Namibia',
+    'country_Nauru' => 'Nauru',
+    'country_Nepal' => 'Nepal',
+    'country_Netherlands' => 'Netherlands',
+    'country_Curaçao' => 'Curaçao',
+    'country_Aruba' => 'Aruba',
+    'country_Sint Maarten (Dutch part)' => 'Sint Maarten (Dutch part)',
+    'country_Bonaire, Sint Eustatius and Saba' => 'Bonaire, Sint Eustatius and Saba',
+    'country_New Caledonia' => 'New Caledonia',
+    'country_Vanuatu' => 'Vanuatu',
+    'country_New Zealand' => 'New Zealand',
+    'country_Nicaragua' => 'Nicaragua',
+    'country_Niger' => 'Niger',
+    'country_Nigeria' => 'Nigeria',
+    'country_Niue' => 'Niue',
+    'country_Norfolk Island' => 'Norfolk Island',
+    'country_Norway' => 'Norway',
+    'country_Northern Mariana Islands' => 'Northern Mariana Islands',
+    'country_United States Minor Outlying Islands' => 'United States Minor Outlying Islands',
+    'country_Micronesia, Federated States of' => 'Micronesia, Federated States of',
+    'country_Marshall Islands' => 'Marshall Islands',
+    'country_Palau' => 'Palau',
+    'country_Pakistan' => 'Pakistan',
+    'country_Panama' => 'Panama',
+    'country_Papua New Guinea' => 'Papua New Guinea',
+    'country_Paraguay' => 'Paraguay',
+    'country_Peru' => 'Peru',
+    'country_Philippines' => 'Philippines',
+    'country_Pitcairn' => 'Pitcairn',
+    'country_Poland' => 'Poland',
+    'country_Portugal' => 'Portugal',
+    'country_Guinea-Bissau' => 'Guinea-Bissau',
+    'country_Timor-Leste' => 'Timor-Leste',
+    'country_Puerto Rico' => 'Puerto Rico',
+    'country_Qatar' => 'Qatar',
+    'country_Réunion' => 'Réunion',
+    'country_Romania' => 'Romania',
+    'country_Russian Federation' => 'Russian Federation',
+    'country_Rwanda' => 'Rwanda',
+    'country_Saint Barthélemy' => 'Saint Barthélemy',
+    'country_Saint Helena, Ascension and Tristan da Cunha' => 'Saint Helena, Ascension and Tristan da Cunha',
+    'country_Saint Kitts and Nevis' => 'Saint Kitts and Nevis',
+    'country_Anguilla' => 'Anguilla',
+    'country_Saint Lucia' => 'Saint Lucia',
+    'country_Saint Martin (French part)' => 'Saint Martin (French part)',
+    'country_Saint Pierre and Miquelon' => 'Saint Pierre and Miquelon',
+    'country_Saint Vincent and the Grenadines' => 'Saint Vincent and the Grenadines',
+    'country_San Marino' => 'San Marino',
+    'country_Sao Tome and Principe' => 'Sao Tome and Principe',
+    'country_Saudi Arabia' => 'Saudi Arabia',
+    'country_Senegal' => 'Senegal',
+    'country_Serbia' => 'Serbia',
+    'country_Seychelles' => 'Seychelles',
+    'country_Sierra Leone' => 'Sierra Leone',
+    'country_Singapore' => 'Singapore',
+    'country_Slovakia' => 'Slovakia',
+    'country_Viet Nam' => 'Viet Nam',
+    'country_Slovenia' => 'Slovenia',
+    'country_Somalia' => 'Somalia',
+    'country_South Africa' => 'South Africa',
+    'country_Zimbabwe' => 'Zimbabwe',
+    'country_Spain' => 'Spain',
+    'country_South Sudan' => 'South Sudan',
+    'country_Sudan' => 'Sudan',
+    'country_Western Sahara' => 'Western Sahara',
+    'country_Suriname' => 'Suriname',
+    'country_Svalbard and Jan Mayen' => 'Svalbard and Jan Mayen',
+    'country_Swaziland' => 'Swaziland',
+    'country_Sweden' => 'Sweden',
+    'country_Switzerland' => 'Switzerland',
+    'country_Syrian Arab Republic' => 'Syrian Arab Republic',
+    'country_Tajikistan' => 'Tajikistan',
+    'country_Thailand' => 'Thailand',
+    'country_Togo' => 'Togo',
+    'country_Tokelau' => 'Tokelau',
+    'country_Tonga' => 'Tonga',
+    'country_Trinidad and Tobago' => 'Trinidad and Tobago',
+    'country_United Arab Emirates' => 'United Arab Emirates',
+    'country_Tunisia' => 'Tunisia',
+    'country_Turkey' => 'Turkey',
+    'country_Turkmenistan' => 'Turkmenistan',
+    'country_Turks and Caicos Islands' => 'Turks and Caicos Islands',
+    'country_Tuvalu' => 'Tuvalu',
+    'country_Uganda' => 'Uganda',
+    '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_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_Virgin Islands, U.S.' => 'Virgin Islands, U.S.',
+    'country_Burkina Faso' => 'Burkina Faso',
+    'country_Uruguay' => 'Uruguay',
+    'country_Uzbekistan' => 'Uzbekistan',
+    'country_Venezuela, Bolivarian Republic of' => 'Venezuela, Bolivarian Republic of',
+    'country_Wallis and Futuna' => 'Wallis and Futuna',
+    'country_Samoa' => 'Samoa',
+    'country_Yemen' => 'Yemen',
+    'country_Zambi' => 'Zambi',
+
+    'view_client_portal' => 'View client portal',
+    'view_portal' => 'View Portal',
+    'vendor_contacts' => 'Vendor Contacts',
+    'all' => 'All',
+    'selected' => 'Selected',
+    'category' => 'Category',
+    'categories' => 'Categories',
+    'new_expense_category' => 'New Expense Category',
+    'edit_category' => 'Edit Category',
+    'archive_expense_category' => 'Archive Category',
+    'expense_categories' => 'Expense Categories',
+    'list_expense_categories' => 'List Expense Categories',
+    'updated_expense_category' => 'Successfully updated expense category',
+    'created_expense_category' => 'Successfully created expense category',
+    'archived_expense_category' => 'Successfully archived expense category',
+    'archived_expense_categories' => 'Successfully archived :count expense category',
+    'restore_expense_category' => 'Restore expense category',
+    'restored_expense_category' => 'Successfully restored expense category',
+    'apply_taxes' => 'Apply taxes',
+    'min_to_max_users' => ':min to :max users',
+    'max_users_reached' => 'The maximum number of users has been reached.',
+    'buy_now_buttons' => 'Buy Now Buttons',
+    'landing_page' => 'Landing Page',
+    'payment_type' => 'Payment Type',
+    'form' => 'Form',
+    'link' => 'Link',
+    'fields' => 'Fields',
+    'dwolla' => 'Dwolla',
+    'buy_now_buttons_warning' => 'Note: client and invoice records are created even if the transaction isn\'t completed.',
+    'buy_now_buttons_disabled' => 'This feature requires that a product is created and a payment gateway is configured.',
+    'enable_buy_now_buttons_help' => 'Enable support for buy now buttons',
+    'changes_take_effect_immediately' => 'Note: changes take effect immediately',
+    'wepay_account_description' => 'Payment gateway for Invoice Ninja',
+    'payment_error_code' => 'There was an error processing your payment [:code]. Please try again later.',
+    'standard_fees_apply' => 'Standard fees apply: 2.9% + $0.30 per successful charge.',
+    'limit_import_rows' => 'Data needs to be imported in batches of :count rows or less',
+
 
 );
 

resources/lang/it/texts.php

@@ -1,6 +1,7 @@
 <?php
 
 $LANG = array(
+
     'organization' => 'Organizzazione',
     'name' => 'Nome',
     'website' => 'Sito web',
@@ -380,7 +381,7 @@ $LANG = array(
     'gateway_help_1' => ':link to sign up for Authorize.net.',
     'gateway_help_2' => ':link to sign up for Authorize.net.',
     'gateway_help_17' => ':link to get your PayPal API signature.',
-    'gateway_help_27' => ':link to sign up for TwoCheckout.',
+    'gateway_help_27' => ':link to sign up for 2Checkout.com. To ensure payments are tracked set :complete_link as the redirect URL under Account > Site Management in the 2Checkout portal.',
     'more_designs' => 'More designs',
     'more_designs_title' => 'Additional Invoice Designs',
     'more_designs_cloud_header' => 'Go Pro for more invoice designs',
@@ -767,6 +768,8 @@ $LANG = array(
     'activity_35' => ':user created :vendor',
     'activity_36' => ':user created :vendor',
     'activity_37' => ':user created :vendor',
+    'activity_42' => ':user created task ":task"',
+    'activity_43' => ':user updated task ":task"',
     'payment' => 'Payment',
     'system' => 'System',
     'signature' => 'Email Signature',
@@ -986,7 +989,7 @@ $LANG = array(
     'overdue' => 'Overdue',
 
 
-    'white_label_text' => 'Purchase a ONE YEAR white label license for $:price to remove the Invoice Ninja branding from the client portal and help support our project.',
+    'white_label_text' => 'Purchase a ONE YEAR white label license for $:price to remove the Invoice Ninja branding and help support our project.',
     'user_email_footer' => 'Per modificare le impostazioni di notifiche via email per favore accedi a: :link',
     'reset_password_footer' => 'Se non sei stato tu a voler resettare la password per favore invia un\'email di assistenza a: :email',
     'limit_users' => 'Sorry, this will exceed the limit of :limit users',
@@ -1287,7 +1290,7 @@ $LANG = array(
     'wepay_tos_agree' => 'I agree to the :link.',
     'wepay_tos_link_text' => 'WePay Terms of Service',
     'resend_confirmation_email' => 'Resend Confirmation Email',
-    'manage_wepay_account' => 'Manage WePay Account',
+    'manage_account' => 'Manage Account',
     'action_required' => 'Action Required',
     'finish_setup' => 'Finish Setup',
     'created_wepay_confirmation_required' => 'Please check your email and confirm your email address with WePay.',
@@ -1355,6 +1358,686 @@ $LANG = array(
     'failed_remove_payment_method' => 'Failed to remove the payment method',
     'gateway_exists' => 'This gateway already exists',
     'manual_entry' => 'Manual entry',
+    'start_of_week' => 'First day of the week',
+
+    // Frequencies
+    'freq_weekly' => 'Weekly',
+    'freq_two_weeks' => 'Two weeks',
+    'freq_four_weeks' => 'Four weeks',
+    'freq_monthly' => 'Monthly',
+    'freq_three_months' => 'Three months',
+    'freq_six_months' => 'Six months',
+    'freq_annually' => 'Annually',
+
+    // Payment types
+    'payment_type_Apply Credit' => 'Apply Credit',
+    'payment_type_Bank Transfer' => 'Bank Transfer',
+    'payment_type_Cash' => 'Cash',
+    'payment_type_Debit' => 'Debit',
+    'payment_type_ACH' => 'ACH',
+    'payment_type_Visa Card' => 'Visa Card',
+    'payment_type_MasterCard' => 'MasterCard',
+    'payment_type_American Express' => 'American Express',
+    'payment_type_Discover Card' => 'Discover Card',
+    'payment_type_Diners Card' => 'Diners Card',
+    'payment_type_EuroCard' => 'EuroCard',
+    'payment_type_Nova' => 'Nova',
+    'payment_type_Credit Card Other' => 'Credit Card Other',
+    'payment_type_PayPal' => 'PayPal',
+    'payment_type_Google Wallet' => 'Google Wallet',
+    'payment_type_Check' => 'Check',
+
+    // Industries
+    'industry_Accounting & Legal' => 'Accounting & Legal',
+    'industry_Advertising' => 'Advertising',
+    'industry_Aerospace' => 'Aerospace',
+    'industry_Agriculture' => 'Agriculture',
+    'industry_Automotive' => 'Automotive',
+    'industry_Banking & Finance' => 'Banking & Finance',
+    'industry_Biotechnology' => 'Biotechnology',
+    'industry_Broadcasting' => 'Broadcasting',
+    'industry_Business Services' => 'Business Services',
+    'industry_Commodities & Chemicals' => 'Commodities & Chemicals',
+    'industry_Communications' => 'Communications',
+    'industry_Computers & Hightech' => 'Computers & Hightech',
+    'industry_Defense' => 'Defense',
+    'industry_Energy' => 'Energy',
+    'industry_Entertainment' => 'Entertainment',
+    'industry_Government' => 'Government',
+    'industry_Healthcare & Life Sciences' => 'Healthcare & Life Sciences',
+    'industry_Insurance' => 'Insurance',
+    'industry_Manufacturing' => 'Manufacturing',
+    'industry_Marketing' => 'Marketing',
+    'industry_Media' => 'Media',
+    'industry_Nonprofit & Higher Ed' => 'Nonprofit & Higher Ed',
+    'industry_Pharmaceuticals' => 'Pharmaceuticals',
+    'industry_Professional Services & Consulting' => 'Professional Services & Consulting',
+    'industry_Real Estate' => 'Real Estate',
+    'industry_Retail & Wholesale' => 'Retail & Wholesale',
+    'industry_Sports' => 'Sports',
+    'industry_Transportation' => 'Transportation',
+    'industry_Travel & Luxury' => 'Travel & Luxury',
+    'industry_Other' => 'Other',
+    'industry_Photography' =>'Photography',
+
+    // Countries
+    'country_Afghanistan' => 'Afghanistan',
+    'country_Albania' => 'Albania',
+    'country_Antarctica' => 'Antarctica',
+    'country_Algeria' => 'Algeria',
+    'country_American Samoa' => 'American Samoa',
+    'country_Andorra' => 'Andorra',
+    'country_Angola' => 'Angola',
+    'country_Antigua and Barbuda' => 'Antigua and Barbuda',
+    'country_Azerbaijan' => 'Azerbaijan',
+    'country_Argentina' => 'Argentina',
+    'country_Australia' => 'Australia',
+    'country_Austria' => 'Austria',
+    'country_Bahamas' => 'Bahamas',
+    'country_Bahrain' => 'Bahrain',
+    'country_Bangladesh' => 'Bangladesh',
+    'country_Armenia' => 'Armenia',
+    'country_Barbados' => 'Barbados',
+    'country_Belgium' => 'Belgium',
+    'country_Bermuda' => 'Bermuda',
+    'country_Bhutan' => 'Bhutan',
+    'country_Bolivia, Plurinational State of' => 'Bolivia, Plurinational State of',
+    'country_Bosnia and Herzegovina' => 'Bosnia and Herzegovina',
+    'country_Botswana' => 'Botswana',
+    'country_Bouvet Island' => 'Bouvet Island',
+    'country_Brazil' => 'Brazil',
+    'country_Belize' => 'Belize',
+    'country_British Indian Ocean Territory' => 'British Indian Ocean Territory',
+    'country_Solomon Islands' => 'Solomon Islands',
+    'country_Virgin Islands, British' => 'Virgin Islands, British',
+    'country_Brunei Darussalam' => 'Brunei Darussalam',
+    'country_Bulgaria' => 'Bulgaria',
+    'country_Myanmar' => 'Myanmar',
+    'country_Burundi' => 'Burundi',
+    'country_Belarus' => 'Belarus',
+    'country_Cambodia' => 'Cambodia',
+    'country_Cameroon' => 'Cameroon',
+    'country_Canada' => 'Canada',
+    'country_Cape Verde' => 'Cape Verde',
+    'country_Cayman Islands' => 'Cayman Islands',
+    'country_Central African Republic' => 'Central African Republic',
+    'country_Sri Lanka' => 'Sri Lanka',
+    'country_Chad' => 'Chad',
+    'country_Chile' => 'Chile',
+    'country_China' => 'China',
+    'country_Taiwan, Province of China' => 'Taiwan, Province of China',
+    'country_Christmas Island' => 'Christmas Island',
+    'country_Cocos (Keeling) Islands' => 'Cocos (Keeling) Islands',
+    'country_Colombia' => 'Colombia',
+    'country_Comoros' => 'Comoros',
+    'country_Mayotte' => 'Mayotte',
+    'country_Congo' => 'Congo',
+    'country_Congo, the Democratic Republic of the' => 'Congo, the Democratic Republic of the',
+    'country_Cook Islands' => 'Cook Islands',
+    'country_Costa Rica' => 'Costa Rica',
+    'country_Croatia' => 'Croatia',
+    'country_Cuba' => 'Cuba',
+    'country_Cyprus' => 'Cyprus',
+    'country_Czech Republic' => 'Czech Republic',
+    'country_Benin' => 'Benin',
+    'country_Denmark' => 'Denmark',
+    'country_Dominica' => 'Dominica',
+    'country_Dominican Republic' => 'Dominican Republic',
+    'country_Ecuador' => 'Ecuador',
+    'country_El Salvador' => 'El Salvador',
+    'country_Equatorial Guinea' => 'Equatorial Guinea',
+    'country_Ethiopia' => 'Ethiopia',
+    'country_Eritrea' => 'Eritrea',
+    'country_Estonia' => 'Estonia',
+    'country_Faroe Islands' => 'Faroe Islands',
+    'country_Falkland Islands (Malvinas)' => 'Falkland Islands (Malvinas)',
+    'country_South Georgia and the South Sandwich Islands' => 'South Georgia and the South Sandwich Islands',
+    'country_Fiji' => 'Fiji',
+    'country_Finland' => 'Finland',
+    'country_Åland Islands' => 'Åland Islands',
+    'country_France' => 'France',
+    'country_French Guiana' => 'French Guiana',
+    'country_French Polynesia' => 'French Polynesia',
+    'country_French Southern Territories' => 'French Southern Territories',
+    'country_Djibouti' => 'Djibouti',
+    'country_Gabon' => 'Gabon',
+    'country_Georgia' => 'Georgia',
+    'country_Gambia' => 'Gambia',
+    'country_Palestinian Territory, Occupied' => 'Palestinian Territory, Occupied',
+    'country_Germany' => 'Germany',
+    'country_Ghana' => 'Ghana',
+    'country_Gibraltar' => 'Gibraltar',
+    'country_Kiribati' => 'Kiribati',
+    'country_Greece' => 'Greece',
+    'country_Greenland' => 'Greenland',
+    'country_Grenada' => 'Grenada',
+    'country_Guadeloupe' => 'Guadeloupe',
+    'country_Guam' => 'Guam',
+    'country_Guatemala' => 'Guatemala',
+    'country_Guinea' => 'Guinea',
+    'country_Guyana' => 'Guyana',
+    'country_Haiti' => 'Haiti',
+    'country_Heard Island and McDonald Islands' => 'Heard Island and McDonald Islands',
+    'country_Holy See (Vatican City State)' => 'Holy See (Vatican City State)',
+    'country_Honduras' => 'Honduras',
+    'country_Hong Kong' => 'Hong Kong',
+    'country_Hungary' => 'Hungary',
+    'country_Iceland' => 'Iceland',
+    'country_India' => 'India',
+    'country_Indonesia' => 'Indonesia',
+    'country_Iran, Islamic Republic of' => 'Iran, Islamic Republic of',
+    'country_Iraq' => 'Iraq',
+    'country_Ireland' => 'Ireland',
+    'country_Israel' => 'Israel',
+    'country_Italy' => 'Italy',
+    'country_Côte d\'Ivoire' => 'Côte d\'Ivoire',
+    'country_Jamaica' => 'Jamaica',
+    'country_Japan' => 'Japan',
+    'country_Kazakhstan' => 'Kazakhstan',
+    'country_Jordan' => 'Jordan',
+    'country_Kenya' => 'Kenya',
+    'country_Korea, Democratic People\'s Republic of' => 'Korea, Democratic People\'s Republic of',
+    'country_Korea, Republic of' => 'Korea, Republic of',
+    'country_Kuwait' => 'Kuwait',
+    'country_Kyrgyzstan' => 'Kyrgyzstan',
+    'country_Lao People\'s Democratic Republic' => 'Lao People\'s Democratic Republic',
+    'country_Lebanon' => 'Lebanon',
+    'country_Lesotho' => 'Lesotho',
+    'country_Latvia' => 'Latvia',
+    'country_Liberia' => 'Liberia',
+    'country_Libya' => 'Libya',
+    'country_Liechtenstein' => 'Liechtenstein',
+    'country_Lithuania' => 'Lithuania',
+    'country_Luxembourg' => 'Luxembourg',
+    'country_Macao' => 'Macao',
+    'country_Madagascar' => 'Madagascar',
+    'country_Malawi' => 'Malawi',
+    'country_Malaysia' => 'Malaysia',
+    'country_Maldives' => 'Maldives',
+    'country_Mali' => 'Mali',
+    'country_Malta' => 'Malta',
+    'country_Martinique' => 'Martinique',
+    'country_Mauritania' => 'Mauritania',
+    'country_Mauritius' => 'Mauritius',
+    'country_Mexico' => 'Mexico',
+    'country_Monaco' => 'Monaco',
+    'country_Mongolia' => 'Mongolia',
+    'country_Moldova, Republic of' => 'Moldova, Republic of',
+    'country_Montenegro' => 'Montenegro',
+    'country_Montserrat' => 'Montserrat',
+    'country_Morocco' => 'Morocco',
+    'country_Mozambique' => 'Mozambique',
+    'country_Oman' => 'Oman',
+    'country_Namibia' => 'Namibia',
+    'country_Nauru' => 'Nauru',
+    'country_Nepal' => 'Nepal',
+    'country_Netherlands' => 'Netherlands',
+    'country_Curaçao' => 'Curaçao',
+    'country_Aruba' => 'Aruba',
+    'country_Sint Maarten (Dutch part)' => 'Sint Maarten (Dutch part)',
+    'country_Bonaire, Sint Eustatius and Saba' => 'Bonaire, Sint Eustatius and Saba',
+    'country_New Caledonia' => 'New Caledonia',
+    'country_Vanuatu' => 'Vanuatu',
+    'country_New Zealand' => 'New Zealand',
+    'country_Nicaragua' => 'Nicaragua',
+    'country_Niger' => 'Niger',
+    'country_Nigeria' => 'Nigeria',
+    'country_Niue' => 'Niue',
+    'country_Norfolk Island' => 'Norfolk Island',
+    'country_Norway' => 'Norway',
+    'country_Northern Mariana Islands' => 'Northern Mariana Islands',
+    'country_United States Minor Outlying Islands' => 'United States Minor Outlying Islands',
+    'country_Micronesia, Federated States of' => 'Micronesia, Federated States of',
+    'country_Marshall Islands' => 'Marshall Islands',
+    'country_Palau' => 'Palau',
+    'country_Pakistan' => 'Pakistan',
+    'country_Panama' => 'Panama',
+    'country_Papua New Guinea' => 'Papua New Guinea',
+    'country_Paraguay' => 'Paraguay',
+    'country_Peru' => 'Peru',
+    'country_Philippines' => 'Philippines',
+    'country_Pitcairn' => 'Pitcairn',
+    'country_Poland' => 'Poland',
+    'country_Portugal' => 'Portugal',
+    'country_Guinea-Bissau' => 'Guinea-Bissau',
+    'country_Timor-Leste' => 'Timor-Leste',
+    'country_Puerto Rico' => 'Puerto Rico',
+    'country_Qatar' => 'Qatar',
+    'country_Réunion' => 'Réunion',
+    'country_Romania' => 'Romania',
+    'country_Russian Federation' => 'Russian Federation',
+    'country_Rwanda' => 'Rwanda',
+    'country_Saint Barthélemy' => 'Saint Barthélemy',
+    'country_Saint Helena, Ascension and Tristan da Cunha' => 'Saint Helena, Ascension and Tristan da Cunha',
+    'country_Saint Kitts and Nevis' => 'Saint Kitts and Nevis',
+    'country_Anguilla' => 'Anguilla',
+    'country_Saint Lucia' => 'Saint Lucia',
+    'country_Saint Martin (French part)' => 'Saint Martin (French part)',
+    'country_Saint Pierre and Miquelon' => 'Saint Pierre and Miquelon',
+    'country_Saint Vincent and the Grenadines' => 'Saint Vincent and the Grenadines',
+    'country_San Marino' => 'San Marino',
+    'country_Sao Tome and Principe' => 'Sao Tome and Principe',
+    'country_Saudi Arabia' => 'Saudi Arabia',
+    'country_Senegal' => 'Senegal',
+    'country_Serbia' => 'Serbia',
+    'country_Seychelles' => 'Seychelles',
+    'country_Sierra Leone' => 'Sierra Leone',
+    'country_Singapore' => 'Singapore',
+    'country_Slovakia' => 'Slovakia',
+    'country_Viet Nam' => 'Viet Nam',
+    'country_Slovenia' => 'Slovenia',
+    'country_Somalia' => 'Somalia',
+    'country_South Africa' => 'South Africa',
+    'country_Zimbabwe' => 'Zimbabwe',
+    'country_Spain' => 'Spain',
+    'country_South Sudan' => 'South Sudan',
+    'country_Sudan' => 'Sudan',
+    'country_Western Sahara' => 'Western Sahara',
+    'country_Suriname' => 'Suriname',
+    'country_Svalbard and Jan Mayen' => 'Svalbard and Jan Mayen',
+    'country_Swaziland' => 'Swaziland',
+    'country_Sweden' => 'Sweden',
+    'country_Switzerland' => 'Switzerland',
+    'country_Syrian Arab Republic' => 'Syrian Arab Republic',
+    'country_Tajikistan' => 'Tajikistan',
+    'country_Thailand' => 'Thailand',
+    'country_Togo' => 'Togo',
+    'country_Tokelau' => 'Tokelau',
+    'country_Tonga' => 'Tonga',
+    'country_Trinidad and Tobago' => 'Trinidad and Tobago',
+    'country_United Arab Emirates' => 'United Arab Emirates',
+    'country_Tunisia' => 'Tunisia',
+    'country_Turkey' => 'Turkey',
+    'country_Turkmenistan' => 'Turkmenistan',
+    'country_Turks and Caicos Islands' => 'Turks and Caicos Islands',
+    'country_Tuvalu' => 'Tuvalu',
+    'country_Uganda' => 'Uganda',
+    '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_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_Virgin Islands, U.S.' => 'Virgin Islands, U.S.',
+    'country_Burkina Faso' => 'Burkina Faso',
+    'country_Uruguay' => 'Uruguay',
+    'country_Uzbekistan' => 'Uzbekistan',
+    'country_Venezuela, Bolivarian Republic of' => 'Venezuela, Bolivarian Republic of',
+    'country_Wallis and Futuna' => 'Wallis and Futuna',
+    'country_Samoa' => 'Samoa',
+    'country_Yemen' => 'Yemen',
+    'country_Zambi' => 'Zambi',
+
+    // Languages
+    'lang_Brazilian Portuguese' => 'Brazilian Portuguese',
+    'lang_Croatian' => 'Croatian',
+    'lang_Czech' => 'Czech',
+    'lang_Danish' => 'Danish',
+    'lang_Dutch' => 'Dutch',
+    'lang_English' => 'English',
+    'lang_French' => 'French',
+    'lang_French - Canada' => 'French - Canada',
+    'lang_German' => 'German',
+    'lang_Italian' => 'Italian',
+    'lang_Japanese' => 'Japanese',
+    'lang_Lithuanian' => 'Lithuanian',
+    'lang_Norwegian' => 'Norwegian',
+    'lang_Polish' => 'Polish',
+    'lang_Spanish' => 'Spanish',
+    'lang_Spanish - Spain' => 'Spanish - Spain',
+    'lang_Swedish' => 'Swedish',
+
+    // Frequencies
+    'freq_weekly' => 'Weekly',
+    'freq_two_weeks' => 'Two weeks',
+    'freq_four_weeks' => 'Four weeks',
+    'freq_monthly' => 'Monthly',
+    'freq_three_months' => 'Three months',
+    'freq_six_months' => 'Six months',
+    'freq_annually' => 'Annually',
+
+    // Payment types
+    'payment_type_Apply Credit' => 'Apply Credit',
+    'payment_type_Bank Transfer' => 'Bank Transfer',
+    'payment_type_Cash' => 'Cash',
+    'payment_type_Debit' => 'Debit',
+    'payment_type_ACH' => 'ACH',
+    'payment_type_Visa Card' => 'Visa Card',
+    'payment_type_MasterCard' => 'MasterCard',
+    'payment_type_American Express' => 'American Express',
+    'payment_type_Discover Card' => 'Discover Card',
+    'payment_type_Diners Card' => 'Diners Card',
+    'payment_type_EuroCard' => 'EuroCard',
+    'payment_type_Nova' => 'Nova',
+    'payment_type_Credit Card Other' => 'Credit Card Other',
+    'payment_type_PayPal' => 'PayPal',
+    'payment_type_Google Wallet' => 'Google Wallet',
+    'payment_type_Check' => 'Check',
+
+    // Industries
+    'industry_Accounting & Legal' => 'Accounting & Legal',
+    'industry_Advertising' => 'Advertising',
+    'industry_Aerospace' => 'Aerospace',
+    'industry_Agriculture' => 'Agriculture',
+    'industry_Automotive' => 'Automotive',
+    'industry_Banking & Finance' => 'Banking & Finance',
+    'industry_Biotechnology' => 'Biotechnology',
+    'industry_Broadcasting' => 'Broadcasting',
+    'industry_Business Services' => 'Business Services',
+    'industry_Commodities & Chemicals' => 'Commodities & Chemicals',
+    'industry_Communications' => 'Communications',
+    'industry_Computers & Hightech' => 'Computers & Hightech',
+    'industry_Defense' => 'Defense',
+    'industry_Energy' => 'Energy',
+    'industry_Entertainment' => 'Entertainment',
+    'industry_Government' => 'Government',
+    'industry_Healthcare & Life Sciences' => 'Healthcare & Life Sciences',
+    'industry_Insurance' => 'Insurance',
+    'industry_Manufacturing' => 'Manufacturing',
+    'industry_Marketing' => 'Marketing',
+    'industry_Media' => 'Media',
+    'industry_Nonprofit & Higher Ed' => 'Nonprofit & Higher Ed',
+    'industry_Pharmaceuticals' => 'Pharmaceuticals',
+    'industry_Professional Services & Consulting' => 'Professional Services & Consulting',
+    'industry_Real Estate' => 'Real Estate',
+    'industry_Retail & Wholesale' => 'Retail & Wholesale',
+    'industry_Sports' => 'Sports',
+    'industry_Transportation' => 'Transportation',
+    'industry_Travel & Luxury' => 'Travel & Luxury',
+    'industry_Other' => 'Other',
+    'industry_Photography' =>'Photography',
+
+    // Countries
+    'country_Afghanistan' => 'Afghanistan',
+    'country_Albania' => 'Albania',
+    'country_Antarctica' => 'Antarctica',
+    'country_Algeria' => 'Algeria',
+    'country_American Samoa' => 'American Samoa',
+    'country_Andorra' => 'Andorra',
+    'country_Angola' => 'Angola',
+    'country_Antigua and Barbuda' => 'Antigua and Barbuda',
+    'country_Azerbaijan' => 'Azerbaijan',
+    'country_Argentina' => 'Argentina',
+    'country_Australia' => 'Australia',
+    'country_Austria' => 'Austria',
+    'country_Bahamas' => 'Bahamas',
+    'country_Bahrain' => 'Bahrain',
+    'country_Bangladesh' => 'Bangladesh',
+    'country_Armenia' => 'Armenia',
+    'country_Barbados' => 'Barbados',
+    'country_Belgium' => 'Belgium',
+    'country_Bermuda' => 'Bermuda',
+    'country_Bhutan' => 'Bhutan',
+    'country_Bolivia, Plurinational State of' => 'Bolivia, Plurinational State of',
+    'country_Bosnia and Herzegovina' => 'Bosnia and Herzegovina',
+    'country_Botswana' => 'Botswana',
+    'country_Bouvet Island' => 'Bouvet Island',
+    'country_Brazil' => 'Brazil',
+    'country_Belize' => 'Belize',
+    'country_British Indian Ocean Territory' => 'British Indian Ocean Territory',
+    'country_Solomon Islands' => 'Solomon Islands',
+    'country_Virgin Islands, British' => 'Virgin Islands, British',
+    'country_Brunei Darussalam' => 'Brunei Darussalam',
+    'country_Bulgaria' => 'Bulgaria',
+    'country_Myanmar' => 'Myanmar',
+    'country_Burundi' => 'Burundi',
+    'country_Belarus' => 'Belarus',
+    'country_Cambodia' => 'Cambodia',
+    'country_Cameroon' => 'Cameroon',
+    'country_Canada' => 'Canada',
+    'country_Cape Verde' => 'Cape Verde',
+    'country_Cayman Islands' => 'Cayman Islands',
+    'country_Central African Republic' => 'Central African Republic',
+    'country_Sri Lanka' => 'Sri Lanka',
+    'country_Chad' => 'Chad',
+    'country_Chile' => 'Chile',
+    'country_China' => 'China',
+    'country_Taiwan, Province of China' => 'Taiwan, Province of China',
+    'country_Christmas Island' => 'Christmas Island',
+    'country_Cocos (Keeling) Islands' => 'Cocos (Keeling) Islands',
+    'country_Colombia' => 'Colombia',
+    'country_Comoros' => 'Comoros',
+    'country_Mayotte' => 'Mayotte',
+    'country_Congo' => 'Congo',
+    'country_Congo, the Democratic Republic of the' => 'Congo, the Democratic Republic of the',
+    'country_Cook Islands' => 'Cook Islands',
+    'country_Costa Rica' => 'Costa Rica',
+    'country_Croatia' => 'Croatia',
+    'country_Cuba' => 'Cuba',
+    'country_Cyprus' => 'Cyprus',
+    'country_Czech Republic' => 'Czech Republic',
+    'country_Benin' => 'Benin',
+    'country_Denmark' => 'Denmark',
+    'country_Dominica' => 'Dominica',
+    'country_Dominican Republic' => 'Dominican Republic',
+    'country_Ecuador' => 'Ecuador',
+    'country_El Salvador' => 'El Salvador',
+    'country_Equatorial Guinea' => 'Equatorial Guinea',
+    'country_Ethiopia' => 'Ethiopia',
+    'country_Eritrea' => 'Eritrea',
+    'country_Estonia' => 'Estonia',
+    'country_Faroe Islands' => 'Faroe Islands',
+    'country_Falkland Islands (Malvinas)' => 'Falkland Islands (Malvinas)',
+    'country_South Georgia and the South Sandwich Islands' => 'South Georgia and the South Sandwich Islands',
+    'country_Fiji' => 'Fiji',
+    'country_Finland' => 'Finland',
+    'country_Åland Islands' => 'Åland Islands',
+    'country_France' => 'France',
+    'country_French Guiana' => 'French Guiana',
+    'country_French Polynesia' => 'French Polynesia',
+    'country_French Southern Territories' => 'French Southern Territories',
+    'country_Djibouti' => 'Djibouti',
+    'country_Gabon' => 'Gabon',
+    'country_Georgia' => 'Georgia',
+    'country_Gambia' => 'Gambia',
+    'country_Palestinian Territory, Occupied' => 'Palestinian Territory, Occupied',
+    'country_Germany' => 'Germany',
+    'country_Ghana' => 'Ghana',
+    'country_Gibraltar' => 'Gibraltar',
+    'country_Kiribati' => 'Kiribati',
+    'country_Greece' => 'Greece',
+    'country_Greenland' => 'Greenland',
+    'country_Grenada' => 'Grenada',
+    'country_Guadeloupe' => 'Guadeloupe',
+    'country_Guam' => 'Guam',
+    'country_Guatemala' => 'Guatemala',
+    'country_Guinea' => 'Guinea',
+    'country_Guyana' => 'Guyana',
+    'country_Haiti' => 'Haiti',
+    'country_Heard Island and McDonald Islands' => 'Heard Island and McDonald Islands',
+    'country_Holy See (Vatican City State)' => 'Holy See (Vatican City State)',
+    'country_Honduras' => 'Honduras',
+    'country_Hong Kong' => 'Hong Kong',
+    'country_Hungary' => 'Hungary',
+    'country_Iceland' => 'Iceland',
+    'country_India' => 'India',
+    'country_Indonesia' => 'Indonesia',
+    'country_Iran, Islamic Republic of' => 'Iran, Islamic Republic of',
+    'country_Iraq' => 'Iraq',
+    'country_Ireland' => 'Ireland',
+    'country_Israel' => 'Israel',
+    'country_Italy' => 'Italy',
+    'country_Côte d\'Ivoire' => 'Côte d\'Ivoire',
+    'country_Jamaica' => 'Jamaica',
+    'country_Japan' => 'Japan',
+    'country_Kazakhstan' => 'Kazakhstan',
+    'country_Jordan' => 'Jordan',
+    'country_Kenya' => 'Kenya',
+    'country_Korea, Democratic People\'s Republic of' => 'Korea, Democratic People\'s Republic of',
+    'country_Korea, Republic of' => 'Korea, Republic of',
+    'country_Kuwait' => 'Kuwait',
+    'country_Kyrgyzstan' => 'Kyrgyzstan',
+    'country_Lao People\'s Democratic Republic' => 'Lao People\'s Democratic Republic',
+    'country_Lebanon' => 'Lebanon',
+    'country_Lesotho' => 'Lesotho',
+    'country_Latvia' => 'Latvia',
+    'country_Liberia' => 'Liberia',
+    'country_Libya' => 'Libya',
+    'country_Liechtenstein' => 'Liechtenstein',
+    'country_Lithuania' => 'Lithuania',
+    'country_Luxembourg' => 'Luxembourg',
+    'country_Macao' => 'Macao',
+    'country_Madagascar' => 'Madagascar',
+    'country_Malawi' => 'Malawi',
+    'country_Malaysia' => 'Malaysia',
+    'country_Maldives' => 'Maldives',
+    'country_Mali' => 'Mali',
+    'country_Malta' => 'Malta',
+    'country_Martinique' => 'Martinique',
+    'country_Mauritania' => 'Mauritania',
+    'country_Mauritius' => 'Mauritius',
+    'country_Mexico' => 'Mexico',
+    'country_Monaco' => 'Monaco',
+    'country_Mongolia' => 'Mongolia',
+    'country_Moldova, Republic of' => 'Moldova, Republic of',
+    'country_Montenegro' => 'Montenegro',
+    'country_Montserrat' => 'Montserrat',
+    'country_Morocco' => 'Morocco',
+    'country_Mozambique' => 'Mozambique',
+    'country_Oman' => 'Oman',
+    'country_Namibia' => 'Namibia',
+    'country_Nauru' => 'Nauru',
+    'country_Nepal' => 'Nepal',
+    'country_Netherlands' => 'Netherlands',
+    'country_Curaçao' => 'Curaçao',
+    'country_Aruba' => 'Aruba',
+    'country_Sint Maarten (Dutch part)' => 'Sint Maarten (Dutch part)',
+    'country_Bonaire, Sint Eustatius and Saba' => 'Bonaire, Sint Eustatius and Saba',
+    'country_New Caledonia' => 'New Caledonia',
+    'country_Vanuatu' => 'Vanuatu',
+    'country_New Zealand' => 'New Zealand',
+    'country_Nicaragua' => 'Nicaragua',
+    'country_Niger' => 'Niger',
+    'country_Nigeria' => 'Nigeria',
+    'country_Niue' => 'Niue',
+    'country_Norfolk Island' => 'Norfolk Island',
+    'country_Norway' => 'Norway',
+    'country_Northern Mariana Islands' => 'Northern Mariana Islands',
+    'country_United States Minor Outlying Islands' => 'United States Minor Outlying Islands',
+    'country_Micronesia, Federated States of' => 'Micronesia, Federated States of',
+    'country_Marshall Islands' => 'Marshall Islands',
+    'country_Palau' => 'Palau',
+    'country_Pakistan' => 'Pakistan',
+    'country_Panama' => 'Panama',
+    'country_Papua New Guinea' => 'Papua New Guinea',
+    'country_Paraguay' => 'Paraguay',
+    'country_Peru' => 'Peru',
+    'country_Philippines' => 'Philippines',
+    'country_Pitcairn' => 'Pitcairn',
+    'country_Poland' => 'Poland',
+    'country_Portugal' => 'Portugal',
+    'country_Guinea-Bissau' => 'Guinea-Bissau',
+    'country_Timor-Leste' => 'Timor-Leste',
+    'country_Puerto Rico' => 'Puerto Rico',
+    'country_Qatar' => 'Qatar',
+    'country_Réunion' => 'Réunion',
+    'country_Romania' => 'Romania',
+    'country_Russian Federation' => 'Russian Federation',
+    'country_Rwanda' => 'Rwanda',
+    'country_Saint Barthélemy' => 'Saint Barthélemy',
+    'country_Saint Helena, Ascension and Tristan da Cunha' => 'Saint Helena, Ascension and Tristan da Cunha',
+    'country_Saint Kitts and Nevis' => 'Saint Kitts and Nevis',
+    'country_Anguilla' => 'Anguilla',
+    'country_Saint Lucia' => 'Saint Lucia',
+    'country_Saint Martin (French part)' => 'Saint Martin (French part)',
+    'country_Saint Pierre and Miquelon' => 'Saint Pierre and Miquelon',
+    'country_Saint Vincent and the Grenadines' => 'Saint Vincent and the Grenadines',
+    'country_San Marino' => 'San Marino',
+    'country_Sao Tome and Principe' => 'Sao Tome and Principe',
+    'country_Saudi Arabia' => 'Saudi Arabia',
+    'country_Senegal' => 'Senegal',
+    'country_Serbia' => 'Serbia',
+    'country_Seychelles' => 'Seychelles',
+    'country_Sierra Leone' => 'Sierra Leone',
+    'country_Singapore' => 'Singapore',
+    'country_Slovakia' => 'Slovakia',
+    'country_Viet Nam' => 'Viet Nam',
+    'country_Slovenia' => 'Slovenia',
+    'country_Somalia' => 'Somalia',
+    'country_South Africa' => 'South Africa',
+    'country_Zimbabwe' => 'Zimbabwe',
+    'country_Spain' => 'Spain',
+    'country_South Sudan' => 'South Sudan',
+    'country_Sudan' => 'Sudan',
+    'country_Western Sahara' => 'Western Sahara',
+    'country_Suriname' => 'Suriname',
+    'country_Svalbard and Jan Mayen' => 'Svalbard and Jan Mayen',
+    'country_Swaziland' => 'Swaziland',
+    'country_Sweden' => 'Sweden',
+    'country_Switzerland' => 'Switzerland',
+    'country_Syrian Arab Republic' => 'Syrian Arab Republic',
+    'country_Tajikistan' => 'Tajikistan',
+    'country_Thailand' => 'Thailand',
+    'country_Togo' => 'Togo',
+    'country_Tokelau' => 'Tokelau',
+    'country_Tonga' => 'Tonga',
+    'country_Trinidad and Tobago' => 'Trinidad and Tobago',
+    'country_United Arab Emirates' => 'United Arab Emirates',
+    'country_Tunisia' => 'Tunisia',
+    'country_Turkey' => 'Turkey',
+    'country_Turkmenistan' => 'Turkmenistan',
+    'country_Turks and Caicos Islands' => 'Turks and Caicos Islands',
+    'country_Tuvalu' => 'Tuvalu',
+    'country_Uganda' => 'Uganda',
+    '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_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_Virgin Islands, U.S.' => 'Virgin Islands, U.S.',
+    'country_Burkina Faso' => 'Burkina Faso',
+    'country_Uruguay' => 'Uruguay',
+    'country_Uzbekistan' => 'Uzbekistan',
+    'country_Venezuela, Bolivarian Republic of' => 'Venezuela, Bolivarian Republic of',
+    'country_Wallis and Futuna' => 'Wallis and Futuna',
+    'country_Samoa' => 'Samoa',
+    'country_Yemen' => 'Yemen',
+    'country_Zambi' => 'Zambi',
+
+    'view_client_portal' => 'View client portal',
+    'view_portal' => 'View Portal',
+    'vendor_contacts' => 'Vendor Contacts',
+    'all' => 'All',
+    'selected' => 'Selected',
+    'category' => 'Category',
+    'categories' => 'Categories',
+    'new_expense_category' => 'New Expense Category',
+    'edit_category' => 'Edit Category',
+    'archive_expense_category' => 'Archive Category',
+    'expense_categories' => 'Expense Categories',
+    'list_expense_categories' => 'List Expense Categories',
+    'updated_expense_category' => 'Successfully updated expense category',
+    'created_expense_category' => 'Successfully created expense category',
+    'archived_expense_category' => 'Successfully archived expense category',
+    'archived_expense_categories' => 'Successfully archived :count expense category',
+    'restore_expense_category' => 'Restore expense category',
+    'restored_expense_category' => 'Successfully restored expense category',
+    'apply_taxes' => 'Apply taxes',
+    'min_to_max_users' => ':min to :max users',
+    'max_users_reached' => 'The maximum number of users has been reached.',
+    'buy_now_buttons' => 'Buy Now Buttons',
+    'landing_page' => 'Landing Page',
+    'payment_type' => 'Payment Type',
+    'form' => 'Form',
+    'link' => 'Link',
+    'fields' => 'Fields',
+    'dwolla' => 'Dwolla',
+    'buy_now_buttons_warning' => 'Note: client and invoice records are created even if the transaction isn\'t completed.',
+    'buy_now_buttons_disabled' => 'This feature requires that a product is created and a payment gateway is configured.',
+    'enable_buy_now_buttons_help' => 'Enable support for buy now buttons',
+    'changes_take_effect_immediately' => 'Note: changes take effect immediately',
+    'wepay_account_description' => 'Payment gateway for Invoice Ninja',
+    'payment_error_code' => 'There was an error processing your payment [:code]. Please try again later.',
+    'standard_fees_apply' => 'Standard fees apply: 2.9% + $0.30 per successful charge.',
+    'limit_import_rows' => 'Data needs to be imported in batches of :count rows or less',
+
 
 );
 

resources/lang/ja/texts.php

@@ -1,6 +1,7 @@
 <?php
 
 $LANG = array(
+
     'organization' => '組織',
     'name' => '名前',
     'website' => 'WEBサイト',
@@ -386,7 +387,7 @@ $LANG = array(
     'gateway_help_1' => 'Authorize.netにサインアップする。 :link',
     'gateway_help_2' => 'Authorize.netにサインアップする。 :link',
     'gateway_help_17' => 'PayPal API signatureを取得する。 :link',
-    'gateway_help_27' => 'TwoCheckoutにサインアップする。:link',
+    'gateway_help_27' => ':link to sign up for 2Checkout.com. To ensure payments are tracked set :complete_link as the redirect URL under Account > Site Management in the 2Checkout portal.',
     'more_designs' => 'その他のデザイン',
     'more_designs_title' => 'その他の請求書デザイン',
     'more_designs_cloud_header' => 'プロ・プランで他の請求書デザインを使う',
@@ -773,6 +774,8 @@ $LANG = array(
     'activity_35' => ':user created :vendor',
     'activity_36' => ':user created :vendor',
     'activity_37' => ':user created :vendor',
+    'activity_42' => ':user created task ":task"',
+    'activity_43' => ':user updated task ":task"',
     'payment' => 'Payment',
     'system' => 'System',
     'signature' => 'Eメール 署名',
@@ -992,7 +995,7 @@ $LANG = array(
     'overdue' => 'Overdue',
 
 
-    'white_label_text' => 'Purchase a ONE YEAR white label license for $:price to remove the Invoice Ninja branding from the client portal and help support our project.',
+    'white_label_text' => 'Purchase a ONE YEAR white label license for $:price to remove the Invoice Ninja branding and help support our project.',
     'user_email_footer' => 'To adjust your email notification settings please visit :link',
     'reset_password_footer' => 'If you did not request this password reset please email our support: :email',
     'limit_users' => 'Sorry, this will exceed the limit of :limit users',
@@ -1293,7 +1296,7 @@ $LANG = array(
     'wepay_tos_agree' => 'I agree to the :link.',
     'wepay_tos_link_text' => 'WePay Terms of Service',
     'resend_confirmation_email' => 'Resend Confirmation Email',
-    'manage_wepay_account' => 'Manage WePay Account',
+    'manage_account' => 'Manage Account',
     'action_required' => 'Action Required',
     'finish_setup' => 'Finish Setup',
     'created_wepay_confirmation_required' => 'Please check your email and confirm your email address with WePay.',
@@ -1361,6 +1364,686 @@ $LANG = array(
     'failed_remove_payment_method' => 'Failed to remove the payment method',
     'gateway_exists' => 'This gateway already exists',
     'manual_entry' => 'Manual entry',
+    'start_of_week' => 'First day of the week',
+
+    // Frequencies
+    'freq_weekly' => 'Weekly',
+    'freq_two_weeks' => 'Two weeks',
+    'freq_four_weeks' => 'Four weeks',
+    'freq_monthly' => 'Monthly',
+    'freq_three_months' => 'Three months',
+    'freq_six_months' => 'Six months',
+    'freq_annually' => 'Annually',
+
+    // Payment types
+    'payment_type_Apply Credit' => 'Apply Credit',
+    'payment_type_Bank Transfer' => 'Bank Transfer',
+    'payment_type_Cash' => 'Cash',
+    'payment_type_Debit' => 'Debit',
+    'payment_type_ACH' => 'ACH',
+    'payment_type_Visa Card' => 'Visa Card',
+    'payment_type_MasterCard' => 'MasterCard',
+    'payment_type_American Express' => 'American Express',
+    'payment_type_Discover Card' => 'Discover Card',
+    'payment_type_Diners Card' => 'Diners Card',
+    'payment_type_EuroCard' => 'EuroCard',
+    'payment_type_Nova' => 'Nova',
+    'payment_type_Credit Card Other' => 'Credit Card Other',
+    'payment_type_PayPal' => 'PayPal',
+    'payment_type_Google Wallet' => 'Google Wallet',
+    'payment_type_Check' => 'Check',
+
+    // Industries
+    'industry_Accounting & Legal' => 'Accounting & Legal',
+    'industry_Advertising' => 'Advertising',
+    'industry_Aerospace' => 'Aerospace',
+    'industry_Agriculture' => 'Agriculture',
+    'industry_Automotive' => 'Automotive',
+    'industry_Banking & Finance' => 'Banking & Finance',
+    'industry_Biotechnology' => 'Biotechnology',
+    'industry_Broadcasting' => 'Broadcasting',
+    'industry_Business Services' => 'Business Services',
+    'industry_Commodities & Chemicals' => 'Commodities & Chemicals',
+    'industry_Communications' => 'Communications',
+    'industry_Computers & Hightech' => 'Computers & Hightech',
+    'industry_Defense' => 'Defense',
+    'industry_Energy' => 'Energy',
+    'industry_Entertainment' => 'Entertainment',
+    'industry_Government' => 'Government',
+    'industry_Healthcare & Life Sciences' => 'Healthcare & Life Sciences',
+    'industry_Insurance' => 'Insurance',
+    'industry_Manufacturing' => 'Manufacturing',
+    'industry_Marketing' => 'Marketing',
+    'industry_Media' => 'Media',
+    'industry_Nonprofit & Higher Ed' => 'Nonprofit & Higher Ed',
+    'industry_Pharmaceuticals' => 'Pharmaceuticals',
+    'industry_Professional Services & Consulting' => 'Professional Services & Consulting',
+    'industry_Real Estate' => 'Real Estate',
+    'industry_Retail & Wholesale' => 'Retail & Wholesale',
+    'industry_Sports' => 'Sports',
+    'industry_Transportation' => 'Transportation',
+    'industry_Travel & Luxury' => 'Travel & Luxury',
+    'industry_Other' => 'Other',
+    'industry_Photography' =>'Photography',
+
+    // Countries
+    'country_Afghanistan' => 'Afghanistan',
+    'country_Albania' => 'Albania',
+    'country_Antarctica' => 'Antarctica',
+    'country_Algeria' => 'Algeria',
+    'country_American Samoa' => 'American Samoa',
+    'country_Andorra' => 'Andorra',
+    'country_Angola' => 'Angola',
+    'country_Antigua and Barbuda' => 'Antigua and Barbuda',
+    'country_Azerbaijan' => 'Azerbaijan',
+    'country_Argentina' => 'Argentina',
+    'country_Australia' => 'Australia',
+    'country_Austria' => 'Austria',
+    'country_Bahamas' => 'Bahamas',
+    'country_Bahrain' => 'Bahrain',
+    'country_Bangladesh' => 'Bangladesh',
+    'country_Armenia' => 'Armenia',
+    'country_Barbados' => 'Barbados',
+    'country_Belgium' => 'Belgium',
+    'country_Bermuda' => 'Bermuda',
+    'country_Bhutan' => 'Bhutan',
+    'country_Bolivia, Plurinational State of' => 'Bolivia, Plurinational State of',
+    'country_Bosnia and Herzegovina' => 'Bosnia and Herzegovina',
+    'country_Botswana' => 'Botswana',
+    'country_Bouvet Island' => 'Bouvet Island',
+    'country_Brazil' => 'Brazil',
+    'country_Belize' => 'Belize',
+    'country_British Indian Ocean Territory' => 'British Indian Ocean Territory',
+    'country_Solomon Islands' => 'Solomon Islands',
+    'country_Virgin Islands, British' => 'Virgin Islands, British',
+    'country_Brunei Darussalam' => 'Brunei Darussalam',
+    'country_Bulgaria' => 'Bulgaria',
+    'country_Myanmar' => 'Myanmar',
+    'country_Burundi' => 'Burundi',
+    'country_Belarus' => 'Belarus',
+    'country_Cambodia' => 'Cambodia',
+    'country_Cameroon' => 'Cameroon',
+    'country_Canada' => 'Canada',
+    'country_Cape Verde' => 'Cape Verde',
+    'country_Cayman Islands' => 'Cayman Islands',
+    'country_Central African Republic' => 'Central African Republic',
+    'country_Sri Lanka' => 'Sri Lanka',
+    'country_Chad' => 'Chad',
+    'country_Chile' => 'Chile',
+    'country_China' => 'China',
+    'country_Taiwan, Province of China' => 'Taiwan, Province of China',
+    'country_Christmas Island' => 'Christmas Island',
+    'country_Cocos (Keeling) Islands' => 'Cocos (Keeling) Islands',
+    'country_Colombia' => 'Colombia',
+    'country_Comoros' => 'Comoros',
+    'country_Mayotte' => 'Mayotte',
+    'country_Congo' => 'Congo',
+    'country_Congo, the Democratic Republic of the' => 'Congo, the Democratic Republic of the',
+    'country_Cook Islands' => 'Cook Islands',
+    'country_Costa Rica' => 'Costa Rica',
+    'country_Croatia' => 'Croatia',
+    'country_Cuba' => 'Cuba',
+    'country_Cyprus' => 'Cyprus',
+    'country_Czech Republic' => 'Czech Republic',
+    'country_Benin' => 'Benin',
+    'country_Denmark' => 'Denmark',
+    'country_Dominica' => 'Dominica',
+    'country_Dominican Republic' => 'Dominican Republic',
+    'country_Ecuador' => 'Ecuador',
+    'country_El Salvador' => 'El Salvador',
+    'country_Equatorial Guinea' => 'Equatorial Guinea',
+    'country_Ethiopia' => 'Ethiopia',
+    'country_Eritrea' => 'Eritrea',
+    'country_Estonia' => 'Estonia',
+    'country_Faroe Islands' => 'Faroe Islands',
+    'country_Falkland Islands (Malvinas)' => 'Falkland Islands (Malvinas)',
+    'country_South Georgia and the South Sandwich Islands' => 'South Georgia and the South Sandwich Islands',
+    'country_Fiji' => 'Fiji',
+    'country_Finland' => 'Finland',
+    'country_Åland Islands' => 'Åland Islands',
+    'country_France' => 'France',
+    'country_French Guiana' => 'French Guiana',
+    'country_French Polynesia' => 'French Polynesia',
+    'country_French Southern Territories' => 'French Southern Territories',
+    'country_Djibouti' => 'Djibouti',
+    'country_Gabon' => 'Gabon',
+    'country_Georgia' => 'Georgia',
+    'country_Gambia' => 'Gambia',
+    'country_Palestinian Territory, Occupied' => 'Palestinian Territory, Occupied',
+    'country_Germany' => 'Germany',
+    'country_Ghana' => 'Ghana',
+    'country_Gibraltar' => 'Gibraltar',
+    'country_Kiribati' => 'Kiribati',
+    'country_Greece' => 'Greece',
+    'country_Greenland' => 'Greenland',
+    'country_Grenada' => 'Grenada',
+    'country_Guadeloupe' => 'Guadeloupe',
+    'country_Guam' => 'Guam',
+    'country_Guatemala' => 'Guatemala',
+    'country_Guinea' => 'Guinea',
+    'country_Guyana' => 'Guyana',
+    'country_Haiti' => 'Haiti',
+    'country_Heard Island and McDonald Islands' => 'Heard Island and McDonald Islands',
+    'country_Holy See (Vatican City State)' => 'Holy See (Vatican City State)',
+    'country_Honduras' => 'Honduras',
+    'country_Hong Kong' => 'Hong Kong',
+    'country_Hungary' => 'Hungary',
+    'country_Iceland' => 'Iceland',
+    'country_India' => 'India',
+    'country_Indonesia' => 'Indonesia',
+    'country_Iran, Islamic Republic of' => 'Iran, Islamic Republic of',
+    'country_Iraq' => 'Iraq',
+    'country_Ireland' => 'Ireland',
+    'country_Israel' => 'Israel',
+    'country_Italy' => 'Italy',
+    'country_Côte d\'Ivoire' => 'Côte d\'Ivoire',
+    'country_Jamaica' => 'Jamaica',
+    'country_Japan' => 'Japan',
+    'country_Kazakhstan' => 'Kazakhstan',
+    'country_Jordan' => 'Jordan',
+    'country_Kenya' => 'Kenya',
+    'country_Korea, Democratic People\'s Republic of' => 'Korea, Democratic People\'s Republic of',
+    'country_Korea, Republic of' => 'Korea, Republic of',
+    'country_Kuwait' => 'Kuwait',
+    'country_Kyrgyzstan' => 'Kyrgyzstan',
+    'country_Lao People\'s Democratic Republic' => 'Lao People\'s Democratic Republic',
+    'country_Lebanon' => 'Lebanon',
+    'country_Lesotho' => 'Lesotho',
+    'country_Latvia' => 'Latvia',
+    'country_Liberia' => 'Liberia',
+    'country_Libya' => 'Libya',
+    'country_Liechtenstein' => 'Liechtenstein',
+    'country_Lithuania' => 'Lithuania',
+    'country_Luxembourg' => 'Luxembourg',
+    'country_Macao' => 'Macao',
+    'country_Madagascar' => 'Madagascar',
+    'country_Malawi' => 'Malawi',
+    'country_Malaysia' => 'Malaysia',
+    'country_Maldives' => 'Maldives',
+    'country_Mali' => 'Mali',
+    'country_Malta' => 'Malta',
+    'country_Martinique' => 'Martinique',
+    'country_Mauritania' => 'Mauritania',
+    'country_Mauritius' => 'Mauritius',
+    'country_Mexico' => 'Mexico',
+    'country_Monaco' => 'Monaco',
+    'country_Mongolia' => 'Mongolia',
+    'country_Moldova, Republic of' => 'Moldova, Republic of',
+    'country_Montenegro' => 'Montenegro',
+    'country_Montserrat' => 'Montserrat',
+    'country_Morocco' => 'Morocco',
+    'country_Mozambique' => 'Mozambique',
+    'country_Oman' => 'Oman',
+    'country_Namibia' => 'Namibia',
+    'country_Nauru' => 'Nauru',
+    'country_Nepal' => 'Nepal',
+    'country_Netherlands' => 'Netherlands',
+    'country_Curaçao' => 'Curaçao',
+    'country_Aruba' => 'Aruba',
+    'country_Sint Maarten (Dutch part)' => 'Sint Maarten (Dutch part)',
+    'country_Bonaire, Sint Eustatius and Saba' => 'Bonaire, Sint Eustatius and Saba',
+    'country_New Caledonia' => 'New Caledonia',
+    'country_Vanuatu' => 'Vanuatu',
+    'country_New Zealand' => 'New Zealand',
+    'country_Nicaragua' => 'Nicaragua',
+    'country_Niger' => 'Niger',
+    'country_Nigeria' => 'Nigeria',
+    'country_Niue' => 'Niue',
+    'country_Norfolk Island' => 'Norfolk Island',
+    'country_Norway' => 'Norway',
+    'country_Northern Mariana Islands' => 'Northern Mariana Islands',
+    'country_United States Minor Outlying Islands' => 'United States Minor Outlying Islands',
+    'country_Micronesia, Federated States of' => 'Micronesia, Federated States of',
+    'country_Marshall Islands' => 'Marshall Islands',
+    'country_Palau' => 'Palau',
+    'country_Pakistan' => 'Pakistan',
+    'country_Panama' => 'Panama',
+    'country_Papua New Guinea' => 'Papua New Guinea',
+    'country_Paraguay' => 'Paraguay',
+    'country_Peru' => 'Peru',
+    'country_Philippines' => 'Philippines',
+    'country_Pitcairn' => 'Pitcairn',
+    'country_Poland' => 'Poland',
+    'country_Portugal' => 'Portugal',
+    'country_Guinea-Bissau' => 'Guinea-Bissau',
+    'country_Timor-Leste' => 'Timor-Leste',
+    'country_Puerto Rico' => 'Puerto Rico',
+    'country_Qatar' => 'Qatar',
+    'country_Réunion' => 'Réunion',
+    'country_Romania' => 'Romania',
+    'country_Russian Federation' => 'Russian Federation',
+    'country_Rwanda' => 'Rwanda',
+    'country_Saint Barthélemy' => 'Saint Barthélemy',
+    'country_Saint Helena, Ascension and Tristan da Cunha' => 'Saint Helena, Ascension and Tristan da Cunha',
+    'country_Saint Kitts and Nevis' => 'Saint Kitts and Nevis',
+    'country_Anguilla' => 'Anguilla',
+    'country_Saint Lucia' => 'Saint Lucia',
+    'country_Saint Martin (French part)' => 'Saint Martin (French part)',
+    'country_Saint Pierre and Miquelon' => 'Saint Pierre and Miquelon',
+    'country_Saint Vincent and the Grenadines' => 'Saint Vincent and the Grenadines',
+    'country_San Marino' => 'San Marino',
+    'country_Sao Tome and Principe' => 'Sao Tome and Principe',
+    'country_Saudi Arabia' => 'Saudi Arabia',
+    'country_Senegal' => 'Senegal',
+    'country_Serbia' => 'Serbia',
+    'country_Seychelles' => 'Seychelles',
+    'country_Sierra Leone' => 'Sierra Leone',
+    'country_Singapore' => 'Singapore',
+    'country_Slovakia' => 'Slovakia',
+    'country_Viet Nam' => 'Viet Nam',
+    'country_Slovenia' => 'Slovenia',
+    'country_Somalia' => 'Somalia',
+    'country_South Africa' => 'South Africa',
+    'country_Zimbabwe' => 'Zimbabwe',
+    'country_Spain' => 'Spain',
+    'country_South Sudan' => 'South Sudan',
+    'country_Sudan' => 'Sudan',
+    'country_Western Sahara' => 'Western Sahara',
+    'country_Suriname' => 'Suriname',
+    'country_Svalbard and Jan Mayen' => 'Svalbard and Jan Mayen',
+    'country_Swaziland' => 'Swaziland',
+    'country_Sweden' => 'Sweden',
+    'country_Switzerland' => 'Switzerland',
+    'country_Syrian Arab Republic' => 'Syrian Arab Republic',
+    'country_Tajikistan' => 'Tajikistan',
+    'country_Thailand' => 'Thailand',
+    'country_Togo' => 'Togo',
+    'country_Tokelau' => 'Tokelau',
+    'country_Tonga' => 'Tonga',
+    'country_Trinidad and Tobago' => 'Trinidad and Tobago',
+    'country_United Arab Emirates' => 'United Arab Emirates',
+    'country_Tunisia' => 'Tunisia',
+    'country_Turkey' => 'Turkey',
+    'country_Turkmenistan' => 'Turkmenistan',
+    'country_Turks and Caicos Islands' => 'Turks and Caicos Islands',
+    'country_Tuvalu' => 'Tuvalu',
+    'country_Uganda' => 'Uganda',
+    '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_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_Virgin Islands, U.S.' => 'Virgin Islands, U.S.',
+    'country_Burkina Faso' => 'Burkina Faso',
+    'country_Uruguay' => 'Uruguay',
+    'country_Uzbekistan' => 'Uzbekistan',
+    'country_Venezuela, Bolivarian Republic of' => 'Venezuela, Bolivarian Republic of',
+    'country_Wallis and Futuna' => 'Wallis and Futuna',
+    'country_Samoa' => 'Samoa',
+    'country_Yemen' => 'Yemen',
+    'country_Zambi' => 'Zambi',
+
+    // Languages
+    'lang_Brazilian Portuguese' => 'Brazilian Portuguese',
+    'lang_Croatian' => 'Croatian',
+    'lang_Czech' => 'Czech',
+    'lang_Danish' => 'Danish',
+    'lang_Dutch' => 'Dutch',
+    'lang_English' => 'English',
+    'lang_French' => 'French',
+    'lang_French - Canada' => 'French - Canada',
+    'lang_German' => 'German',
+    'lang_Italian' => 'Italian',
+    'lang_Japanese' => 'Japanese',
+    'lang_Lithuanian' => 'Lithuanian',
+    'lang_Norwegian' => 'Norwegian',
+    'lang_Polish' => 'Polish',
+    'lang_Spanish' => 'Spanish',
+    'lang_Spanish - Spain' => 'Spanish - Spain',
+    'lang_Swedish' => 'Swedish',
+
+    // Frequencies
+    'freq_weekly' => 'Weekly',
+    'freq_two_weeks' => 'Two weeks',
+    'freq_four_weeks' => 'Four weeks',
+    'freq_monthly' => 'Monthly',
+    'freq_three_months' => 'Three months',
+    'freq_six_months' => 'Six months',
+    'freq_annually' => 'Annually',
+
+    // Payment types
+    'payment_type_Apply Credit' => 'Apply Credit',
+    'payment_type_Bank Transfer' => 'Bank Transfer',
+    'payment_type_Cash' => 'Cash',
+    'payment_type_Debit' => 'Debit',
+    'payment_type_ACH' => 'ACH',
+    'payment_type_Visa Card' => 'Visa Card',
+    'payment_type_MasterCard' => 'MasterCard',
+    'payment_type_American Express' => 'American Express',
+    'payment_type_Discover Card' => 'Discover Card',
+    'payment_type_Diners Card' => 'Diners Card',
+    'payment_type_EuroCard' => 'EuroCard',
+    'payment_type_Nova' => 'Nova',
+    'payment_type_Credit Card Other' => 'Credit Card Other',
+    'payment_type_PayPal' => 'PayPal',
+    'payment_type_Google Wallet' => 'Google Wallet',
+    'payment_type_Check' => 'Check',
+
+    // Industries
+    'industry_Accounting & Legal' => 'Accounting & Legal',
+    'industry_Advertising' => 'Advertising',
+    'industry_Aerospace' => 'Aerospace',
+    'industry_Agriculture' => 'Agriculture',
+    'industry_Automotive' => 'Automotive',
+    'industry_Banking & Finance' => 'Banking & Finance',
+    'industry_Biotechnology' => 'Biotechnology',
+    'industry_Broadcasting' => 'Broadcasting',
+    'industry_Business Services' => 'Business Services',
+    'industry_Commodities & Chemicals' => 'Commodities & Chemicals',
+    'industry_Communications' => 'Communications',
+    'industry_Computers & Hightech' => 'Computers & Hightech',
+    'industry_Defense' => 'Defense',
+    'industry_Energy' => 'Energy',
+    'industry_Entertainment' => 'Entertainment',
+    'industry_Government' => 'Government',
+    'industry_Healthcare & Life Sciences' => 'Healthcare & Life Sciences',
+    'industry_Insurance' => 'Insurance',
+    'industry_Manufacturing' => 'Manufacturing',
+    'industry_Marketing' => 'Marketing',
+    'industry_Media' => 'Media',
+    'industry_Nonprofit & Higher Ed' => 'Nonprofit & Higher Ed',
+    'industry_Pharmaceuticals' => 'Pharmaceuticals',
+    'industry_Professional Services & Consulting' => 'Professional Services & Consulting',
+    'industry_Real Estate' => 'Real Estate',
+    'industry_Retail & Wholesale' => 'Retail & Wholesale',
+    'industry_Sports' => 'Sports',
+    'industry_Transportation' => 'Transportation',
+    'industry_Travel & Luxury' => 'Travel & Luxury',
+    'industry_Other' => 'Other',
+    'industry_Photography' =>'Photography',
+
+    // Countries
+    'country_Afghanistan' => 'Afghanistan',
+    'country_Albania' => 'Albania',
+    'country_Antarctica' => 'Antarctica',
+    'country_Algeria' => 'Algeria',
+    'country_American Samoa' => 'American Samoa',
+    'country_Andorra' => 'Andorra',
+    'country_Angola' => 'Angola',
+    'country_Antigua and Barbuda' => 'Antigua and Barbuda',
+    'country_Azerbaijan' => 'Azerbaijan',
+    'country_Argentina' => 'Argentina',
+    'country_Australia' => 'Australia',
+    'country_Austria' => 'Austria',
+    'country_Bahamas' => 'Bahamas',
+    'country_Bahrain' => 'Bahrain',
+    'country_Bangladesh' => 'Bangladesh',
+    'country_Armenia' => 'Armenia',
+    'country_Barbados' => 'Barbados',
+    'country_Belgium' => 'Belgium',
+    'country_Bermuda' => 'Bermuda',
+    'country_Bhutan' => 'Bhutan',
+    'country_Bolivia, Plurinational State of' => 'Bolivia, Plurinational State of',
+    'country_Bosnia and Herzegovina' => 'Bosnia and Herzegovina',
+    'country_Botswana' => 'Botswana',
+    'country_Bouvet Island' => 'Bouvet Island',
+    'country_Brazil' => 'Brazil',
+    'country_Belize' => 'Belize',
+    'country_British Indian Ocean Territory' => 'British Indian Ocean Territory',
+    'country_Solomon Islands' => 'Solomon Islands',
+    'country_Virgin Islands, British' => 'Virgin Islands, British',
+    'country_Brunei Darussalam' => 'Brunei Darussalam',
+    'country_Bulgaria' => 'Bulgaria',
+    'country_Myanmar' => 'Myanmar',
+    'country_Burundi' => 'Burundi',
+    'country_Belarus' => 'Belarus',
+    'country_Cambodia' => 'Cambodia',
+    'country_Cameroon' => 'Cameroon',
+    'country_Canada' => 'Canada',
+    'country_Cape Verde' => 'Cape Verde',
+    'country_Cayman Islands' => 'Cayman Islands',
+    'country_Central African Republic' => 'Central African Republic',
+    'country_Sri Lanka' => 'Sri Lanka',
+    'country_Chad' => 'Chad',
+    'country_Chile' => 'Chile',
+    'country_China' => 'China',
+    'country_Taiwan, Province of China' => 'Taiwan, Province of China',
+    'country_Christmas Island' => 'Christmas Island',
+    'country_Cocos (Keeling) Islands' => 'Cocos (Keeling) Islands',
+    'country_Colombia' => 'Colombia',
+    'country_Comoros' => 'Comoros',
+    'country_Mayotte' => 'Mayotte',
+    'country_Congo' => 'Congo',
+    'country_Congo, the Democratic Republic of the' => 'Congo, the Democratic Republic of the',
+    'country_Cook Islands' => 'Cook Islands',
+    'country_Costa Rica' => 'Costa Rica',
+    'country_Croatia' => 'Croatia',
+    'country_Cuba' => 'Cuba',
+    'country_Cyprus' => 'Cyprus',
+    'country_Czech Republic' => 'Czech Republic',
+    'country_Benin' => 'Benin',
+    'country_Denmark' => 'Denmark',
+    'country_Dominica' => 'Dominica',
+    'country_Dominican Republic' => 'Dominican Republic',
+    'country_Ecuador' => 'Ecuador',
+    'country_El Salvador' => 'El Salvador',
+    'country_Equatorial Guinea' => 'Equatorial Guinea',
+    'country_Ethiopia' => 'Ethiopia',
+    'country_Eritrea' => 'Eritrea',
+    'country_Estonia' => 'Estonia',
+    'country_Faroe Islands' => 'Faroe Islands',
+    'country_Falkland Islands (Malvinas)' => 'Falkland Islands (Malvinas)',
+    'country_South Georgia and the South Sandwich Islands' => 'South Georgia and the South Sandwich Islands',
+    'country_Fiji' => 'Fiji',
+    'country_Finland' => 'Finland',
+    'country_Åland Islands' => 'Åland Islands',
+    'country_France' => 'France',
+    'country_French Guiana' => 'French Guiana',
+    'country_French Polynesia' => 'French Polynesia',
+    'country_French Southern Territories' => 'French Southern Territories',
+    'country_Djibouti' => 'Djibouti',
+    'country_Gabon' => 'Gabon',
+    'country_Georgia' => 'Georgia',
+    'country_Gambia' => 'Gambia',
+    'country_Palestinian Territory, Occupied' => 'Palestinian Territory, Occupied',
+    'country_Germany' => 'Germany',
+    'country_Ghana' => 'Ghana',
+    'country_Gibraltar' => 'Gibraltar',
+    'country_Kiribati' => 'Kiribati',
+    'country_Greece' => 'Greece',
+    'country_Greenland' => 'Greenland',
+    'country_Grenada' => 'Grenada',
+    'country_Guadeloupe' => 'Guadeloupe',
+    'country_Guam' => 'Guam',
+    'country_Guatemala' => 'Guatemala',
+    'country_Guinea' => 'Guinea',
+    'country_Guyana' => 'Guyana',
+    'country_Haiti' => 'Haiti',
+    'country_Heard Island and McDonald Islands' => 'Heard Island and McDonald Islands',
+    'country_Holy See (Vatican City State)' => 'Holy See (Vatican City State)',
+    'country_Honduras' => 'Honduras',
+    'country_Hong Kong' => 'Hong Kong',
+    'country_Hungary' => 'Hungary',
+    'country_Iceland' => 'Iceland',
+    'country_India' => 'India',
+    'country_Indonesia' => 'Indonesia',
+    'country_Iran, Islamic Republic of' => 'Iran, Islamic Republic of',
+    'country_Iraq' => 'Iraq',
+    'country_Ireland' => 'Ireland',
+    'country_Israel' => 'Israel',
+    'country_Italy' => 'Italy',
+    'country_Côte d\'Ivoire' => 'Côte d\'Ivoire',
+    'country_Jamaica' => 'Jamaica',
+    'country_Japan' => 'Japan',
+    'country_Kazakhstan' => 'Kazakhstan',
+    'country_Jordan' => 'Jordan',
+    'country_Kenya' => 'Kenya',
+    'country_Korea, Democratic People\'s Republic of' => 'Korea, Democratic People\'s Republic of',
+    'country_Korea, Republic of' => 'Korea, Republic of',
+    'country_Kuwait' => 'Kuwait',
+    'country_Kyrgyzstan' => 'Kyrgyzstan',
+    'country_Lao People\'s Democratic Republic' => 'Lao People\'s Democratic Republic',
+    'country_Lebanon' => 'Lebanon',
+    'country_Lesotho' => 'Lesotho',
+    'country_Latvia' => 'Latvia',
+    'country_Liberia' => 'Liberia',
+    'country_Libya' => 'Libya',
+    'country_Liechtenstein' => 'Liechtenstein',
+    'country_Lithuania' => 'Lithuania',
+    'country_Luxembourg' => 'Luxembourg',
+    'country_Macao' => 'Macao',
+    'country_Madagascar' => 'Madagascar',
+    'country_Malawi' => 'Malawi',
+    'country_Malaysia' => 'Malaysia',
+    'country_Maldives' => 'Maldives',
+    'country_Mali' => 'Mali',
+    'country_Malta' => 'Malta',
+    'country_Martinique' => 'Martinique',
+    'country_Mauritania' => 'Mauritania',
+    'country_Mauritius' => 'Mauritius',
+    'country_Mexico' => 'Mexico',
+    'country_Monaco' => 'Monaco',
+    'country_Mongolia' => 'Mongolia',
+    'country_Moldova, Republic of' => 'Moldova, Republic of',
+    'country_Montenegro' => 'Montenegro',
+    'country_Montserrat' => 'Montserrat',
+    'country_Morocco' => 'Morocco',
+    'country_Mozambique' => 'Mozambique',
+    'country_Oman' => 'Oman',
+    'country_Namibia' => 'Namibia',
+    'country_Nauru' => 'Nauru',
+    'country_Nepal' => 'Nepal',
+    'country_Netherlands' => 'Netherlands',
+    'country_Curaçao' => 'Curaçao',
+    'country_Aruba' => 'Aruba',
+    'country_Sint Maarten (Dutch part)' => 'Sint Maarten (Dutch part)',
+    'country_Bonaire, Sint Eustatius and Saba' => 'Bonaire, Sint Eustatius and Saba',
+    'country_New Caledonia' => 'New Caledonia',
+    'country_Vanuatu' => 'Vanuatu',
+    'country_New Zealand' => 'New Zealand',
+    'country_Nicaragua' => 'Nicaragua',
+    'country_Niger' => 'Niger',
+    'country_Nigeria' => 'Nigeria',
+    'country_Niue' => 'Niue',
+    'country_Norfolk Island' => 'Norfolk Island',
+    'country_Norway' => 'Norway',
+    'country_Northern Mariana Islands' => 'Northern Mariana Islands',
+    'country_United States Minor Outlying Islands' => 'United States Minor Outlying Islands',
+    'country_Micronesia, Federated States of' => 'Micronesia, Federated States of',
+    'country_Marshall Islands' => 'Marshall Islands',
+    'country_Palau' => 'Palau',
+    'country_Pakistan' => 'Pakistan',
+    'country_Panama' => 'Panama',
+    'country_Papua New Guinea' => 'Papua New Guinea',
+    'country_Paraguay' => 'Paraguay',
+    'country_Peru' => 'Peru',
+    'country_Philippines' => 'Philippines',
+    'country_Pitcairn' => 'Pitcairn',
+    'country_Poland' => 'Poland',
+    'country_Portugal' => 'Portugal',
+    'country_Guinea-Bissau' => 'Guinea-Bissau',
+    'country_Timor-Leste' => 'Timor-Leste',
+    'country_Puerto Rico' => 'Puerto Rico',
+    'country_Qatar' => 'Qatar',
+    'country_Réunion' => 'Réunion',
+    'country_Romania' => 'Romania',
+    'country_Russian Federation' => 'Russian Federation',
+    'country_Rwanda' => 'Rwanda',
+    'country_Saint Barthélemy' => 'Saint Barthélemy',
+    'country_Saint Helena, Ascension and Tristan da Cunha' => 'Saint Helena, Ascension and Tristan da Cunha',
+    'country_Saint Kitts and Nevis' => 'Saint Kitts and Nevis',
+    'country_Anguilla' => 'Anguilla',
+    'country_Saint Lucia' => 'Saint Lucia',
+    'country_Saint Martin (French part)' => 'Saint Martin (French part)',
+    'country_Saint Pierre and Miquelon' => 'Saint Pierre and Miquelon',
+    'country_Saint Vincent and the Grenadines' => 'Saint Vincent and the Grenadines',
+    'country_San Marino' => 'San Marino',
+    'country_Sao Tome and Principe' => 'Sao Tome and Principe',
+    'country_Saudi Arabia' => 'Saudi Arabia',
+    'country_Senegal' => 'Senegal',
+    'country_Serbia' => 'Serbia',
+    'country_Seychelles' => 'Seychelles',
+    'country_Sierra Leone' => 'Sierra Leone',
+    'country_Singapore' => 'Singapore',
+    'country_Slovakia' => 'Slovakia',
+    'country_Viet Nam' => 'Viet Nam',
+    'country_Slovenia' => 'Slovenia',
+    'country_Somalia' => 'Somalia',
+    'country_South Africa' => 'South Africa',
+    'country_Zimbabwe' => 'Zimbabwe',
+    'country_Spain' => 'Spain',
+    'country_South Sudan' => 'South Sudan',
+    'country_Sudan' => 'Sudan',
+    'country_Western Sahara' => 'Western Sahara',
+    'country_Suriname' => 'Suriname',
+    'country_Svalbard and Jan Mayen' => 'Svalbard and Jan Mayen',
+    'country_Swaziland' => 'Swaziland',
+    'country_Sweden' => 'Sweden',
+    'country_Switzerland' => 'Switzerland',
+    'country_Syrian Arab Republic' => 'Syrian Arab Republic',
+    'country_Tajikistan' => 'Tajikistan',
+    'country_Thailand' => 'Thailand',
+    'country_Togo' => 'Togo',
+    'country_Tokelau' => 'Tokelau',
+    'country_Tonga' => 'Tonga',
+    'country_Trinidad and Tobago' => 'Trinidad and Tobago',
+    'country_United Arab Emirates' => 'United Arab Emirates',
+    'country_Tunisia' => 'Tunisia',
+    'country_Turkey' => 'Turkey',
+    'country_Turkmenistan' => 'Turkmenistan',
+    'country_Turks and Caicos Islands' => 'Turks and Caicos Islands',
+    'country_Tuvalu' => 'Tuvalu',
+    'country_Uganda' => 'Uganda',
+    '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_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_Virgin Islands, U.S.' => 'Virgin Islands, U.S.',
+    'country_Burkina Faso' => 'Burkina Faso',
+    'country_Uruguay' => 'Uruguay',
+    'country_Uzbekistan' => 'Uzbekistan',
+    'country_Venezuela, Bolivarian Republic of' => 'Venezuela, Bolivarian Republic of',
+    'country_Wallis and Futuna' => 'Wallis and Futuna',
+    'country_Samoa' => 'Samoa',
+    'country_Yemen' => 'Yemen',
+    'country_Zambi' => 'Zambi',
+
+    'view_client_portal' => 'View client portal',
+    'view_portal' => 'View Portal',
+    'vendor_contacts' => 'Vendor Contacts',
+    'all' => 'All',
+    'selected' => 'Selected',
+    'category' => 'Category',
+    'categories' => 'Categories',
+    'new_expense_category' => 'New Expense Category',
+    'edit_category' => 'Edit Category',
+    'archive_expense_category' => 'Archive Category',
+    'expense_categories' => 'Expense Categories',
+    'list_expense_categories' => 'List Expense Categories',
+    'updated_expense_category' => 'Successfully updated expense category',
+    'created_expense_category' => 'Successfully created expense category',
+    'archived_expense_category' => 'Successfully archived expense category',
+    'archived_expense_categories' => 'Successfully archived :count expense category',
+    'restore_expense_category' => 'Restore expense category',
+    'restored_expense_category' => 'Successfully restored expense category',
+    'apply_taxes' => 'Apply taxes',
+    'min_to_max_users' => ':min to :max users',
+    'max_users_reached' => 'The maximum number of users has been reached.',
+    'buy_now_buttons' => 'Buy Now Buttons',
+    'landing_page' => 'Landing Page',
+    'payment_type' => 'Payment Type',
+    'form' => 'Form',
+    'link' => 'Link',
+    'fields' => 'Fields',
+    'dwolla' => 'Dwolla',
+    'buy_now_buttons_warning' => 'Note: client and invoice records are created even if the transaction isn\'t completed.',
+    'buy_now_buttons_disabled' => 'This feature requires that a product is created and a payment gateway is configured.',
+    'enable_buy_now_buttons_help' => 'Enable support for buy now buttons',
+    'changes_take_effect_immediately' => 'Note: changes take effect immediately',
+    'wepay_account_description' => 'Payment gateway for Invoice Ninja',
+    'payment_error_code' => 'There was an error processing your payment [:code]. Please try again later.',
+    'standard_fees_apply' => 'Standard fees apply: 2.9% + $0.30 per successful charge.',
+    'limit_import_rows' => 'Data needs to be imported in batches of :count rows or less',
+
 
 );
 

resources/lang/lt/texts.php

@@ -1,6 +1,7 @@
 <?php
 
 $LANG = array(
+
     'organization' => 'Įmonė',
     'name' => 'Pavadinimas',
     'website' => 'Internetinis puslapis',
@@ -386,7 +387,7 @@ $LANG = array(
     'gateway_help_1' => ':link to sign up for Authorize.net.',
     'gateway_help_2' => ':link to sign up for Authorize.net.',
     'gateway_help_17' => ':link to get your PayPal API signature.',
-    'gateway_help_27' => ':link to sign up for TwoCheckout.',
+    'gateway_help_27' => ':link to sign up for 2Checkout.com. To ensure payments are tracked set :complete_link as the redirect URL under Account > Site Management in the 2Checkout portal.',
     'more_designs' => 'More designs',
     'more_designs_title' => 'Additional Invoice Designs',
     'more_designs_cloud_header' => 'Go Pro for more invoice designs',
@@ -773,6 +774,8 @@ $LANG = array(
     'activity_35' => ':user sukurtas :vendor',
     'activity_36' => ':user sukurtas :vendor',
     'activity_37' => ':user sukurtas :vendor',
+    'activity_42' => ':user created task ":task"',
+    'activity_43' => ':user updated task ":task"',
     'payment' => 'Payment',
     'system' => 'System',
     'signature' => 'Email Signature',
@@ -992,7 +995,7 @@ $LANG = array(
     'overdue' => 'Overdue',
 
 
-    'white_label_text' => 'Purchase a ONE YEAR white label license for $:price to remove the Invoice Ninja branding from the client portal and help support our project.',
+    'white_label_text' => 'Purchase a ONE YEAR white label license for $:price to remove the Invoice Ninja branding and help support our project.',
     'user_email_footer' => 'To adjust your email notification settings please visit :link',
     'reset_password_footer' => 'If you did not request this password reset please email our support: :email',
     'limit_users' => 'Sorry, this will exceed the limit of :limit users',
@@ -1293,7 +1296,7 @@ $LANG = array(
     'wepay_tos_agree' => 'Sutinku :link.',
     'wepay_tos_link_text' => 'WePay paslaugų teikimo sąlygos',
     'resend_confirmation_email' => 'Persiųsti patvirtinimo laišką',
-    'manage_wepay_account' => 'Valdyti WePay paskyrą',
+    'manage_account' => 'Manage Account',
     'action_required' => 'Reikalingas veiksmas',
     'finish_setup' => 'Baigti nustatymus',
     'created_wepay_confirmation_required' => 'Prašome patikrinti savo el. paštą ir patvirtinkite el. pašto adresą WePay.',
@@ -1361,6 +1364,686 @@ $LANG = array(
     'failed_remove_payment_method' => 'Failed to remove the payment method',
     'gateway_exists' => 'This gateway already exists',
     'manual_entry' => 'Manual entry',
+    'start_of_week' => 'First day of the week',
+
+    // Frequencies
+    'freq_weekly' => 'Weekly',
+    'freq_two_weeks' => 'Two weeks',
+    'freq_four_weeks' => 'Four weeks',
+    'freq_monthly' => 'Monthly',
+    'freq_three_months' => 'Three months',
+    'freq_six_months' => 'Six months',
+    'freq_annually' => 'Annually',
+
+    // Payment types
+    'payment_type_Apply Credit' => 'Apply Credit',
+    'payment_type_Bank Transfer' => 'Bank Transfer',
+    'payment_type_Cash' => 'Cash',
+    'payment_type_Debit' => 'Debit',
+    'payment_type_ACH' => 'ACH',
+    'payment_type_Visa Card' => 'Visa Card',
+    'payment_type_MasterCard' => 'MasterCard',
+    'payment_type_American Express' => 'American Express',
+    'payment_type_Discover Card' => 'Discover Card',
+    'payment_type_Diners Card' => 'Diners Card',
+    'payment_type_EuroCard' => 'EuroCard',
+    'payment_type_Nova' => 'Nova',
+    'payment_type_Credit Card Other' => 'Credit Card Other',
+    'payment_type_PayPal' => 'PayPal',
+    'payment_type_Google Wallet' => 'Google Wallet',
+    'payment_type_Check' => 'Check',
+
+    // Industries
+    'industry_Accounting & Legal' => 'Accounting & Legal',
+    'industry_Advertising' => 'Advertising',
+    'industry_Aerospace' => 'Aerospace',
+    'industry_Agriculture' => 'Agriculture',
+    'industry_Automotive' => 'Automotive',
+    'industry_Banking & Finance' => 'Banking & Finance',
+    'industry_Biotechnology' => 'Biotechnology',
+    'industry_Broadcasting' => 'Broadcasting',
+    'industry_Business Services' => 'Business Services',
+    'industry_Commodities & Chemicals' => 'Commodities & Chemicals',
+    'industry_Communications' => 'Communications',
+    'industry_Computers & Hightech' => 'Computers & Hightech',
+    'industry_Defense' => 'Defense',
+    'industry_Energy' => 'Energy',
+    'industry_Entertainment' => 'Entertainment',
+    'industry_Government' => 'Government',
+    'industry_Healthcare & Life Sciences' => 'Healthcare & Life Sciences',
+    'industry_Insurance' => 'Insurance',
+    'industry_Manufacturing' => 'Manufacturing',
+    'industry_Marketing' => 'Marketing',
+    'industry_Media' => 'Media',
+    'industry_Nonprofit & Higher Ed' => 'Nonprofit & Higher Ed',
+    'industry_Pharmaceuticals' => 'Pharmaceuticals',
+    'industry_Professional Services & Consulting' => 'Professional Services & Consulting',
+    'industry_Real Estate' => 'Real Estate',
+    'industry_Retail & Wholesale' => 'Retail & Wholesale',
+    'industry_Sports' => 'Sports',
+    'industry_Transportation' => 'Transportation',
+    'industry_Travel & Luxury' => 'Travel & Luxury',
+    'industry_Other' => 'Other',
+    'industry_Photography' =>'Photography',
+
+    // Countries
+    'country_Afghanistan' => 'Afghanistan',
+    'country_Albania' => 'Albania',
+    'country_Antarctica' => 'Antarctica',
+    'country_Algeria' => 'Algeria',
+    'country_American Samoa' => 'American Samoa',
+    'country_Andorra' => 'Andorra',
+    'country_Angola' => 'Angola',
+    'country_Antigua and Barbuda' => 'Antigua and Barbuda',
+    'country_Azerbaijan' => 'Azerbaijan',
+    'country_Argentina' => 'Argentina',
+    'country_Australia' => 'Australia',
+    'country_Austria' => 'Austria',
+    'country_Bahamas' => 'Bahamas',
+    'country_Bahrain' => 'Bahrain',
+    'country_Bangladesh' => 'Bangladesh',
+    'country_Armenia' => 'Armenia',
+    'country_Barbados' => 'Barbados',
+    'country_Belgium' => 'Belgium',
+    'country_Bermuda' => 'Bermuda',
+    'country_Bhutan' => 'Bhutan',
+    'country_Bolivia, Plurinational State of' => 'Bolivia, Plurinational State of',
+    'country_Bosnia and Herzegovina' => 'Bosnia and Herzegovina',
+    'country_Botswana' => 'Botswana',
+    'country_Bouvet Island' => 'Bouvet Island',
+    'country_Brazil' => 'Brazil',
+    'country_Belize' => 'Belize',
+    'country_British Indian Ocean Territory' => 'British Indian Ocean Territory',
+    'country_Solomon Islands' => 'Solomon Islands',
+    'country_Virgin Islands, British' => 'Virgin Islands, British',
+    'country_Brunei Darussalam' => 'Brunei Darussalam',
+    'country_Bulgaria' => 'Bulgaria',
+    'country_Myanmar' => 'Myanmar',
+    'country_Burundi' => 'Burundi',
+    'country_Belarus' => 'Belarus',
+    'country_Cambodia' => 'Cambodia',
+    'country_Cameroon' => 'Cameroon',
+    'country_Canada' => 'Canada',
+    'country_Cape Verde' => 'Cape Verde',
+    'country_Cayman Islands' => 'Cayman Islands',
+    'country_Central African Republic' => 'Central African Republic',
+    'country_Sri Lanka' => 'Sri Lanka',
+    'country_Chad' => 'Chad',
+    'country_Chile' => 'Chile',
+    'country_China' => 'China',
+    'country_Taiwan, Province of China' => 'Taiwan, Province of China',
+    'country_Christmas Island' => 'Christmas Island',
+    'country_Cocos (Keeling) Islands' => 'Cocos (Keeling) Islands',
+    'country_Colombia' => 'Colombia',
+    'country_Comoros' => 'Comoros',
+    'country_Mayotte' => 'Mayotte',
+    'country_Congo' => 'Congo',
+    'country_Congo, the Democratic Republic of the' => 'Congo, the Democratic Republic of the',
+    'country_Cook Islands' => 'Cook Islands',
+    'country_Costa Rica' => 'Costa Rica',
+    'country_Croatia' => 'Croatia',
+    'country_Cuba' => 'Cuba',
+    'country_Cyprus' => 'Cyprus',
+    'country_Czech Republic' => 'Czech Republic',
+    'country_Benin' => 'Benin',
+    'country_Denmark' => 'Denmark',
+    'country_Dominica' => 'Dominica',
+    'country_Dominican Republic' => 'Dominican Republic',
+    'country_Ecuador' => 'Ecuador',
+    'country_El Salvador' => 'El Salvador',
+    'country_Equatorial Guinea' => 'Equatorial Guinea',
+    'country_Ethiopia' => 'Ethiopia',
+    'country_Eritrea' => 'Eritrea',
+    'country_Estonia' => 'Estonia',
+    'country_Faroe Islands' => 'Faroe Islands',
+    'country_Falkland Islands (Malvinas)' => 'Falkland Islands (Malvinas)',
+    'country_South Georgia and the South Sandwich Islands' => 'South Georgia and the South Sandwich Islands',
+    'country_Fiji' => 'Fiji',
+    'country_Finland' => 'Finland',
+    'country_Åland Islands' => 'Åland Islands',
+    'country_France' => 'France',
+    'country_French Guiana' => 'French Guiana',
+    'country_French Polynesia' => 'French Polynesia',
+    'country_French Southern Territories' => 'French Southern Territories',
+    'country_Djibouti' => 'Djibouti',
+    'country_Gabon' => 'Gabon',
+    'country_Georgia' => 'Georgia',
+    'country_Gambia' => 'Gambia',
+    'country_Palestinian Territory, Occupied' => 'Palestinian Territory, Occupied',
+    'country_Germany' => 'Germany',
+    'country_Ghana' => 'Ghana',
+    'country_Gibraltar' => 'Gibraltar',
+    'country_Kiribati' => 'Kiribati',
+    'country_Greece' => 'Greece',
+    'country_Greenland' => 'Greenland',
+    'country_Grenada' => 'Grenada',
+    'country_Guadeloupe' => 'Guadeloupe',
+    'country_Guam' => 'Guam',
+    'country_Guatemala' => 'Guatemala',
+    'country_Guinea' => 'Guinea',
+    'country_Guyana' => 'Guyana',
+    'country_Haiti' => 'Haiti',
+    'country_Heard Island and McDonald Islands' => 'Heard Island and McDonald Islands',
+    'country_Holy See (Vatican City State)' => 'Holy See (Vatican City State)',
+    'country_Honduras' => 'Honduras',
+    'country_Hong Kong' => 'Hong Kong',
+    'country_Hungary' => 'Hungary',
+    'country_Iceland' => 'Iceland',
+    'country_India' => 'India',
+    'country_Indonesia' => 'Indonesia',
+    'country_Iran, Islamic Republic of' => 'Iran, Islamic Republic of',
+    'country_Iraq' => 'Iraq',
+    'country_Ireland' => 'Ireland',
+    'country_Israel' => 'Israel',
+    'country_Italy' => 'Italy',
+    'country_Côte d\'Ivoire' => 'Côte d\'Ivoire',
+    'country_Jamaica' => 'Jamaica',
+    'country_Japan' => 'Japan',
+    'country_Kazakhstan' => 'Kazakhstan',
+    'country_Jordan' => 'Jordan',
+    'country_Kenya' => 'Kenya',
+    'country_Korea, Democratic People\'s Republic of' => 'Korea, Democratic People\'s Republic of',
+    'country_Korea, Republic of' => 'Korea, Republic of',
+    'country_Kuwait' => 'Kuwait',
+    'country_Kyrgyzstan' => 'Kyrgyzstan',
+    'country_Lao People\'s Democratic Republic' => 'Lao People\'s Democratic Republic',
+    'country_Lebanon' => 'Lebanon',
+    'country_Lesotho' => 'Lesotho',
+    'country_Latvia' => 'Latvia',
+    'country_Liberia' => 'Liberia',
+    'country_Libya' => 'Libya',
+    'country_Liechtenstein' => 'Liechtenstein',
+    'country_Lithuania' => 'Lithuania',
+    'country_Luxembourg' => 'Luxembourg',
+    'country_Macao' => 'Macao',
+    'country_Madagascar' => 'Madagascar',
+    'country_Malawi' => 'Malawi',
+    'country_Malaysia' => 'Malaysia',
+    'country_Maldives' => 'Maldives',
+    'country_Mali' => 'Mali',
+    'country_Malta' => 'Malta',
+    'country_Martinique' => 'Martinique',
+    'country_Mauritania' => 'Mauritania',
+    'country_Mauritius' => 'Mauritius',
+    'country_Mexico' => 'Mexico',
+    'country_Monaco' => 'Monaco',
+    'country_Mongolia' => 'Mongolia',
+    'country_Moldova, Republic of' => 'Moldova, Republic of',
+    'country_Montenegro' => 'Montenegro',
+    'country_Montserrat' => 'Montserrat',
+    'country_Morocco' => 'Morocco',
+    'country_Mozambique' => 'Mozambique',
+    'country_Oman' => 'Oman',
+    'country_Namibia' => 'Namibia',
+    'country_Nauru' => 'Nauru',
+    'country_Nepal' => 'Nepal',
+    'country_Netherlands' => 'Netherlands',
+    'country_Curaçao' => 'Curaçao',
+    'country_Aruba' => 'Aruba',
+    'country_Sint Maarten (Dutch part)' => 'Sint Maarten (Dutch part)',
+    'country_Bonaire, Sint Eustatius and Saba' => 'Bonaire, Sint Eustatius and Saba',
+    'country_New Caledonia' => 'New Caledonia',
+    'country_Vanuatu' => 'Vanuatu',
+    'country_New Zealand' => 'New Zealand',
+    'country_Nicaragua' => 'Nicaragua',
+    'country_Niger' => 'Niger',
+    'country_Nigeria' => 'Nigeria',
+    'country_Niue' => 'Niue',
+    'country_Norfolk Island' => 'Norfolk Island',
+    'country_Norway' => 'Norway',
+    'country_Northern Mariana Islands' => 'Northern Mariana Islands',
+    'country_United States Minor Outlying Islands' => 'United States Minor Outlying Islands',
+    'country_Micronesia, Federated States of' => 'Micronesia, Federated States of',
+    'country_Marshall Islands' => 'Marshall Islands',
+    'country_Palau' => 'Palau',
+    'country_Pakistan' => 'Pakistan',
+    'country_Panama' => 'Panama',
+    'country_Papua New Guinea' => 'Papua New Guinea',
+    'country_Paraguay' => 'Paraguay',
+    'country_Peru' => 'Peru',
+    'country_Philippines' => 'Philippines',
+    'country_Pitcairn' => 'Pitcairn',
+    'country_Poland' => 'Poland',
+    'country_Portugal' => 'Portugal',
+    'country_Guinea-Bissau' => 'Guinea-Bissau',
+    'country_Timor-Leste' => 'Timor-Leste',
+    'country_Puerto Rico' => 'Puerto Rico',
+    'country_Qatar' => 'Qatar',
+    'country_Réunion' => 'Réunion',
+    'country_Romania' => 'Romania',
+    'country_Russian Federation' => 'Russian Federation',
+    'country_Rwanda' => 'Rwanda',
+    'country_Saint Barthélemy' => 'Saint Barthélemy',
+    'country_Saint Helena, Ascension and Tristan da Cunha' => 'Saint Helena, Ascension and Tristan da Cunha',
+    'country_Saint Kitts and Nevis' => 'Saint Kitts and Nevis',
+    'country_Anguilla' => 'Anguilla',
+    'country_Saint Lucia' => 'Saint Lucia',
+    'country_Saint Martin (French part)' => 'Saint Martin (French part)',
+    'country_Saint Pierre and Miquelon' => 'Saint Pierre and Miquelon',
+    'country_Saint Vincent and the Grenadines' => 'Saint Vincent and the Grenadines',
+    'country_San Marino' => 'San Marino',
+    'country_Sao Tome and Principe' => 'Sao Tome and Principe',
+    'country_Saudi Arabia' => 'Saudi Arabia',
+    'country_Senegal' => 'Senegal',
+    'country_Serbia' => 'Serbia',
+    'country_Seychelles' => 'Seychelles',
+    'country_Sierra Leone' => 'Sierra Leone',
+    'country_Singapore' => 'Singapore',
+    'country_Slovakia' => 'Slovakia',
+    'country_Viet Nam' => 'Viet Nam',
+    'country_Slovenia' => 'Slovenia',
+    'country_Somalia' => 'Somalia',
+    'country_South Africa' => 'South Africa',
+    'country_Zimbabwe' => 'Zimbabwe',
+    'country_Spain' => 'Spain',
+    'country_South Sudan' => 'South Sudan',
+    'country_Sudan' => 'Sudan',
+    'country_Western Sahara' => 'Western Sahara',
+    'country_Suriname' => 'Suriname',
+    'country_Svalbard and Jan Mayen' => 'Svalbard and Jan Mayen',
+    'country_Swaziland' => 'Swaziland',
+    'country_Sweden' => 'Sweden',
+    'country_Switzerland' => 'Switzerland',
+    'country_Syrian Arab Republic' => 'Syrian Arab Republic',
+    'country_Tajikistan' => 'Tajikistan',
+    'country_Thailand' => 'Thailand',
+    'country_Togo' => 'Togo',
+    'country_Tokelau' => 'Tokelau',
+    'country_Tonga' => 'Tonga',
+    'country_Trinidad and Tobago' => 'Trinidad and Tobago',
+    'country_United Arab Emirates' => 'United Arab Emirates',
+    'country_Tunisia' => 'Tunisia',
+    'country_Turkey' => 'Turkey',
+    'country_Turkmenistan' => 'Turkmenistan',
+    'country_Turks and Caicos Islands' => 'Turks and Caicos Islands',
+    'country_Tuvalu' => 'Tuvalu',
+    'country_Uganda' => 'Uganda',
+    '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_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_Virgin Islands, U.S.' => 'Virgin Islands, U.S.',
+    'country_Burkina Faso' => 'Burkina Faso',
+    'country_Uruguay' => 'Uruguay',
+    'country_Uzbekistan' => 'Uzbekistan',
+    'country_Venezuela, Bolivarian Republic of' => 'Venezuela, Bolivarian Republic of',
+    'country_Wallis and Futuna' => 'Wallis and Futuna',
+    'country_Samoa' => 'Samoa',
+    'country_Yemen' => 'Yemen',
+    'country_Zambi' => 'Zambi',
+
+    // Languages
+    'lang_Brazilian Portuguese' => 'Brazilian Portuguese',
+    'lang_Croatian' => 'Croatian',
+    'lang_Czech' => 'Czech',
+    'lang_Danish' => 'Danish',
+    'lang_Dutch' => 'Dutch',
+    'lang_English' => 'English',
+    'lang_French' => 'French',
+    'lang_French - Canada' => 'French - Canada',
+    'lang_German' => 'German',
+    'lang_Italian' => 'Italian',
+    'lang_Japanese' => 'Japanese',
+    'lang_Lithuanian' => 'Lithuanian',
+    'lang_Norwegian' => 'Norwegian',
+    'lang_Polish' => 'Polish',
+    'lang_Spanish' => 'Spanish',
+    'lang_Spanish - Spain' => 'Spanish - Spain',
+    'lang_Swedish' => 'Swedish',
+
+    // Frequencies
+    'freq_weekly' => 'Weekly',
+    'freq_two_weeks' => 'Two weeks',
+    'freq_four_weeks' => 'Four weeks',
+    'freq_monthly' => 'Monthly',
+    'freq_three_months' => 'Three months',
+    'freq_six_months' => 'Six months',
+    'freq_annually' => 'Annually',
+
+    // Payment types
+    'payment_type_Apply Credit' => 'Apply Credit',
+    'payment_type_Bank Transfer' => 'Bank Transfer',
+    'payment_type_Cash' => 'Cash',
+    'payment_type_Debit' => 'Debit',
+    'payment_type_ACH' => 'ACH',
+    'payment_type_Visa Card' => 'Visa Card',
+    'payment_type_MasterCard' => 'MasterCard',
+    'payment_type_American Express' => 'American Express',
+    'payment_type_Discover Card' => 'Discover Card',
+    'payment_type_Diners Card' => 'Diners Card',
+    'payment_type_EuroCard' => 'EuroCard',
+    'payment_type_Nova' => 'Nova',
+    'payment_type_Credit Card Other' => 'Credit Card Other',
+    'payment_type_PayPal' => 'PayPal',
+    'payment_type_Google Wallet' => 'Google Wallet',
+    'payment_type_Check' => 'Check',
+
+    // Industries
+    'industry_Accounting & Legal' => 'Accounting & Legal',
+    'industry_Advertising' => 'Advertising',
+    'industry_Aerospace' => 'Aerospace',
+    'industry_Agriculture' => 'Agriculture',
+    'industry_Automotive' => 'Automotive',
+    'industry_Banking & Finance' => 'Banking & Finance',
+    'industry_Biotechnology' => 'Biotechnology',
+    'industry_Broadcasting' => 'Broadcasting',
+    'industry_Business Services' => 'Business Services',
+    'industry_Commodities & Chemicals' => 'Commodities & Chemicals',
+    'industry_Communications' => 'Communications',
+    'industry_Computers & Hightech' => 'Computers & Hightech',
+    'industry_Defense' => 'Defense',
+    'industry_Energy' => 'Energy',
+    'industry_Entertainment' => 'Entertainment',
+    'industry_Government' => 'Government',
+    'industry_Healthcare & Life Sciences' => 'Healthcare & Life Sciences',
+    'industry_Insurance' => 'Insurance',
+    'industry_Manufacturing' => 'Manufacturing',
+    'industry_Marketing' => 'Marketing',
+    'industry_Media' => 'Media',
+    'industry_Nonprofit & Higher Ed' => 'Nonprofit & Higher Ed',
+    'industry_Pharmaceuticals' => 'Pharmaceuticals',
+    'industry_Professional Services & Consulting' => 'Professional Services & Consulting',
+    'industry_Real Estate' => 'Real Estate',
+    'industry_Retail & Wholesale' => 'Retail & Wholesale',
+    'industry_Sports' => 'Sports',
+    'industry_Transportation' => 'Transportation',
+    'industry_Travel & Luxury' => 'Travel & Luxury',
+    'industry_Other' => 'Other',
+    'industry_Photography' =>'Photography',
+
+    // Countries
+    'country_Afghanistan' => 'Afghanistan',
+    'country_Albania' => 'Albania',
+    'country_Antarctica' => 'Antarctica',
+    'country_Algeria' => 'Algeria',
+    'country_American Samoa' => 'American Samoa',
+    'country_Andorra' => 'Andorra',
+    'country_Angola' => 'Angola',
+    'country_Antigua and Barbuda' => 'Antigua and Barbuda',
+    'country_Azerbaijan' => 'Azerbaijan',
+    'country_Argentina' => 'Argentina',
+    'country_Australia' => 'Australia',
+    'country_Austria' => 'Austria',
+    'country_Bahamas' => 'Bahamas',
+    'country_Bahrain' => 'Bahrain',
+    'country_Bangladesh' => 'Bangladesh',
+    'country_Armenia' => 'Armenia',
+    'country_Barbados' => 'Barbados',
+    'country_Belgium' => 'Belgium',
+    'country_Bermuda' => 'Bermuda',
+    'country_Bhutan' => 'Bhutan',
+    'country_Bolivia, Plurinational State of' => 'Bolivia, Plurinational State of',
+    'country_Bosnia and Herzegovina' => 'Bosnia and Herzegovina',
+    'country_Botswana' => 'Botswana',
+    'country_Bouvet Island' => 'Bouvet Island',
+    'country_Brazil' => 'Brazil',
+    'country_Belize' => 'Belize',
+    'country_British Indian Ocean Territory' => 'British Indian Ocean Territory',
+    'country_Solomon Islands' => 'Solomon Islands',
+    'country_Virgin Islands, British' => 'Virgin Islands, British',
+    'country_Brunei Darussalam' => 'Brunei Darussalam',
+    'country_Bulgaria' => 'Bulgaria',
+    'country_Myanmar' => 'Myanmar',
+    'country_Burundi' => 'Burundi',
+    'country_Belarus' => 'Belarus',
+    'country_Cambodia' => 'Cambodia',
+    'country_Cameroon' => 'Cameroon',
+    'country_Canada' => 'Canada',
+    'country_Cape Verde' => 'Cape Verde',
+    'country_Cayman Islands' => 'Cayman Islands',
+    'country_Central African Republic' => 'Central African Republic',
+    'country_Sri Lanka' => 'Sri Lanka',
+    'country_Chad' => 'Chad',
+    'country_Chile' => 'Chile',
+    'country_China' => 'China',
+    'country_Taiwan, Province of China' => 'Taiwan, Province of China',
+    'country_Christmas Island' => 'Christmas Island',
+    'country_Cocos (Keeling) Islands' => 'Cocos (Keeling) Islands',
+    'country_Colombia' => 'Colombia',
+    'country_Comoros' => 'Comoros',
+    'country_Mayotte' => 'Mayotte',
+    'country_Congo' => 'Congo',
+    'country_Congo, the Democratic Republic of the' => 'Congo, the Democratic Republic of the',
+    'country_Cook Islands' => 'Cook Islands',
+    'country_Costa Rica' => 'Costa Rica',
+    'country_Croatia' => 'Croatia',
+    'country_Cuba' => 'Cuba',
+    'country_Cyprus' => 'Cyprus',
+    'country_Czech Republic' => 'Czech Republic',
+    'country_Benin' => 'Benin',
+    'country_Denmark' => 'Denmark',
+    'country_Dominica' => 'Dominica',
+    'country_Dominican Republic' => 'Dominican Republic',
+    'country_Ecuador' => 'Ecuador',
+    'country_El Salvador' => 'El Salvador',
+    'country_Equatorial Guinea' => 'Equatorial Guinea',
+    'country_Ethiopia' => 'Ethiopia',
+    'country_Eritrea' => 'Eritrea',
+    'country_Estonia' => 'Estonia',
+    'country_Faroe Islands' => 'Faroe Islands',
+    'country_Falkland Islands (Malvinas)' => 'Falkland Islands (Malvinas)',
+    'country_South Georgia and the South Sandwich Islands' => 'South Georgia and the South Sandwich Islands',
+    'country_Fiji' => 'Fiji',
+    'country_Finland' => 'Finland',
+    'country_Åland Islands' => 'Åland Islands',
+    'country_France' => 'France',
+    'country_French Guiana' => 'French Guiana',
+    'country_French Polynesia' => 'French Polynesia',
+    'country_French Southern Territories' => 'French Southern Territories',
+    'country_Djibouti' => 'Djibouti',
+    'country_Gabon' => 'Gabon',
+    'country_Georgia' => 'Georgia',
+    'country_Gambia' => 'Gambia',
+    'country_Palestinian Territory, Occupied' => 'Palestinian Territory, Occupied',
+    'country_Germany' => 'Germany',
+    'country_Ghana' => 'Ghana',
+    'country_Gibraltar' => 'Gibraltar',
+    'country_Kiribati' => 'Kiribati',
+    'country_Greece' => 'Greece',
+    'country_Greenland' => 'Greenland',
+    'country_Grenada' => 'Grenada',
+    'country_Guadeloupe' => 'Guadeloupe',
+    'country_Guam' => 'Guam',
+    'country_Guatemala' => 'Guatemala',
+    'country_Guinea' => 'Guinea',
+    'country_Guyana' => 'Guyana',
+    'country_Haiti' => 'Haiti',
+    'country_Heard Island and McDonald Islands' => 'Heard Island and McDonald Islands',
+    'country_Holy See (Vatican City State)' => 'Holy See (Vatican City State)',
+    'country_Honduras' => 'Honduras',
+    'country_Hong Kong' => 'Hong Kong',
+    'country_Hungary' => 'Hungary',
+    'country_Iceland' => 'Iceland',
+    'country_India' => 'India',
+    'country_Indonesia' => 'Indonesia',
+    'country_Iran, Islamic Republic of' => 'Iran, Islamic Republic of',
+    'country_Iraq' => 'Iraq',
+    'country_Ireland' => 'Ireland',
+    'country_Israel' => 'Israel',
+    'country_Italy' => 'Italy',
+    'country_Côte d\'Ivoire' => 'Côte d\'Ivoire',
+    'country_Jamaica' => 'Jamaica',
+    'country_Japan' => 'Japan',
+    'country_Kazakhstan' => 'Kazakhstan',
+    'country_Jordan' => 'Jordan',
+    'country_Kenya' => 'Kenya',
+    'country_Korea, Democratic People\'s Republic of' => 'Korea, Democratic People\'s Republic of',
+    'country_Korea, Republic of' => 'Korea, Republic of',
+    'country_Kuwait' => 'Kuwait',
+    'country_Kyrgyzstan' => 'Kyrgyzstan',
+    'country_Lao People\'s Democratic Republic' => 'Lao People\'s Democratic Republic',
+    'country_Lebanon' => 'Lebanon',
+    'country_Lesotho' => 'Lesotho',
+    'country_Latvia' => 'Latvia',
+    'country_Liberia' => 'Liberia',
+    'country_Libya' => 'Libya',
+    'country_Liechtenstein' => 'Liechtenstein',
+    'country_Lithuania' => 'Lithuania',
+    'country_Luxembourg' => 'Luxembourg',
+    'country_Macao' => 'Macao',
+    'country_Madagascar' => 'Madagascar',
+    'country_Malawi' => 'Malawi',
+    'country_Malaysia' => 'Malaysia',
+    'country_Maldives' => 'Maldives',
+    'country_Mali' => 'Mali',
+    'country_Malta' => 'Malta',
+    'country_Martinique' => 'Martinique',
+    'country_Mauritania' => 'Mauritania',
+    'country_Mauritius' => 'Mauritius',
+    'country_Mexico' => 'Mexico',
+    'country_Monaco' => 'Monaco',
+    'country_Mongolia' => 'Mongolia',
+    'country_Moldova, Republic of' => 'Moldova, Republic of',
+    'country_Montenegro' => 'Montenegro',
+    'country_Montserrat' => 'Montserrat',
+    'country_Morocco' => 'Morocco',
+    'country_Mozambique' => 'Mozambique',
+    'country_Oman' => 'Oman',
+    'country_Namibia' => 'Namibia',
+    'country_Nauru' => 'Nauru',
+    'country_Nepal' => 'Nepal',
+    'country_Netherlands' => 'Netherlands',
+    'country_Curaçao' => 'Curaçao',
+    'country_Aruba' => 'Aruba',
+    'country_Sint Maarten (Dutch part)' => 'Sint Maarten (Dutch part)',
+    'country_Bonaire, Sint Eustatius and Saba' => 'Bonaire, Sint Eustatius and Saba',
+    'country_New Caledonia' => 'New Caledonia',
+    'country_Vanuatu' => 'Vanuatu',
+    'country_New Zealand' => 'New Zealand',
+    'country_Nicaragua' => 'Nicaragua',
+    'country_Niger' => 'Niger',
+    'country_Nigeria' => 'Nigeria',
+    'country_Niue' => 'Niue',
+    'country_Norfolk Island' => 'Norfolk Island',
+    'country_Norway' => 'Norway',
+    'country_Northern Mariana Islands' => 'Northern Mariana Islands',
+    'country_United States Minor Outlying Islands' => 'United States Minor Outlying Islands',
+    'country_Micronesia, Federated States of' => 'Micronesia, Federated States of',
+    'country_Marshall Islands' => 'Marshall Islands',
+    'country_Palau' => 'Palau',
+    'country_Pakistan' => 'Pakistan',
+    'country_Panama' => 'Panama',
+    'country_Papua New Guinea' => 'Papua New Guinea',
+    'country_Paraguay' => 'Paraguay',
+    'country_Peru' => 'Peru',
+    'country_Philippines' => 'Philippines',
+    'country_Pitcairn' => 'Pitcairn',
+    'country_Poland' => 'Poland',
+    'country_Portugal' => 'Portugal',
+    'country_Guinea-Bissau' => 'Guinea-Bissau',
+    'country_Timor-Leste' => 'Timor-Leste',
+    'country_Puerto Rico' => 'Puerto Rico',
+    'country_Qatar' => 'Qatar',
+    'country_Réunion' => 'Réunion',
+    'country_Romania' => 'Romania',
+    'country_Russian Federation' => 'Russian Federation',
+    'country_Rwanda' => 'Rwanda',
+    'country_Saint Barthélemy' => 'Saint Barthélemy',
+    'country_Saint Helena, Ascension and Tristan da Cunha' => 'Saint Helena, Ascension and Tristan da Cunha',
+    'country_Saint Kitts and Nevis' => 'Saint Kitts and Nevis',
+    'country_Anguilla' => 'Anguilla',
+    'country_Saint Lucia' => 'Saint Lucia',
+    'country_Saint Martin (French part)' => 'Saint Martin (French part)',
+    'country_Saint Pierre and Miquelon' => 'Saint Pierre and Miquelon',
+    'country_Saint Vincent and the Grenadines' => 'Saint Vincent and the Grenadines',
+    'country_San Marino' => 'San Marino',
+    'country_Sao Tome and Principe' => 'Sao Tome and Principe',
+    'country_Saudi Arabia' => 'Saudi Arabia',
+    'country_Senegal' => 'Senegal',
+    'country_Serbia' => 'Serbia',
+    'country_Seychelles' => 'Seychelles',
+    'country_Sierra Leone' => 'Sierra Leone',
+    'country_Singapore' => 'Singapore',
+    'country_Slovakia' => 'Slovakia',
+    'country_Viet Nam' => 'Viet Nam',
+    'country_Slovenia' => 'Slovenia',
+    'country_Somalia' => 'Somalia',
+    'country_South Africa' => 'South Africa',
+    'country_Zimbabwe' => 'Zimbabwe',
+    'country_Spain' => 'Spain',
+    'country_South Sudan' => 'South Sudan',
+    'country_Sudan' => 'Sudan',
+    'country_Western Sahara' => 'Western Sahara',
+    'country_Suriname' => 'Suriname',
+    'country_Svalbard and Jan Mayen' => 'Svalbard and Jan Mayen',
+    'country_Swaziland' => 'Swaziland',
+    'country_Sweden' => 'Sweden',
+    'country_Switzerland' => 'Switzerland',
+    'country_Syrian Arab Republic' => 'Syrian Arab Republic',
+    'country_Tajikistan' => 'Tajikistan',
+    'country_Thailand' => 'Thailand',
+    'country_Togo' => 'Togo',
+    'country_Tokelau' => 'Tokelau',
+    'country_Tonga' => 'Tonga',
+    'country_Trinidad and Tobago' => 'Trinidad and Tobago',
+    'country_United Arab Emirates' => 'United Arab Emirates',
+    'country_Tunisia' => 'Tunisia',
+    'country_Turkey' => 'Turkey',
+    'country_Turkmenistan' => 'Turkmenistan',
+    'country_Turks and Caicos Islands' => 'Turks and Caicos Islands',
+    'country_Tuvalu' => 'Tuvalu',
+    'country_Uganda' => 'Uganda',
+    '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_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_Virgin Islands, U.S.' => 'Virgin Islands, U.S.',
+    'country_Burkina Faso' => 'Burkina Faso',
+    'country_Uruguay' => 'Uruguay',
+    'country_Uzbekistan' => 'Uzbekistan',
+    'country_Venezuela, Bolivarian Republic of' => 'Venezuela, Bolivarian Republic of',
+    'country_Wallis and Futuna' => 'Wallis and Futuna',
+    'country_Samoa' => 'Samoa',
+    'country_Yemen' => 'Yemen',
+    'country_Zambi' => 'Zambi',
+
+    'view_client_portal' => 'View client portal',
+    'view_portal' => 'View Portal',
+    'vendor_contacts' => 'Vendor Contacts',
+    'all' => 'All',
+    'selected' => 'Selected',
+    'category' => 'Category',
+    'categories' => 'Categories',
+    'new_expense_category' => 'New Expense Category',
+    'edit_category' => 'Edit Category',
+    'archive_expense_category' => 'Archive Category',
+    'expense_categories' => 'Expense Categories',
+    'list_expense_categories' => 'List Expense Categories',
+    'updated_expense_category' => 'Successfully updated expense category',
+    'created_expense_category' => 'Successfully created expense category',
+    'archived_expense_category' => 'Successfully archived expense category',
+    'archived_expense_categories' => 'Successfully archived :count expense category',
+    'restore_expense_category' => 'Restore expense category',
+    'restored_expense_category' => 'Successfully restored expense category',
+    'apply_taxes' => 'Apply taxes',
+    'min_to_max_users' => ':min to :max users',
+    'max_users_reached' => 'The maximum number of users has been reached.',
+    'buy_now_buttons' => 'Buy Now Buttons',
+    'landing_page' => 'Landing Page',
+    'payment_type' => 'Payment Type',
+    'form' => 'Form',
+    'link' => 'Link',
+    'fields' => 'Fields',
+    'dwolla' => 'Dwolla',
+    'buy_now_buttons_warning' => 'Note: client and invoice records are created even if the transaction isn\'t completed.',
+    'buy_now_buttons_disabled' => 'This feature requires that a product is created and a payment gateway is configured.',
+    'enable_buy_now_buttons_help' => 'Enable support for buy now buttons',
+    'changes_take_effect_immediately' => 'Note: changes take effect immediately',
+    'wepay_account_description' => 'Payment gateway for Invoice Ninja',
+    'payment_error_code' => 'There was an error processing your payment [:code]. Please try again later.',
+    'standard_fees_apply' => 'Standard fees apply: 2.9% + $0.30 per successful charge.',
+    'limit_import_rows' => 'Data needs to be imported in batches of :count rows or less',
+
 
 );
 

resources/lang/nb_NO/texts.php

@@ -1,6 +1,7 @@
 <?php
 
 $LANG = array(
+
     'organization' => 'Organisasjon',
     'name' => 'Navn',
     'website' => 'Nettside',
@@ -386,7 +387,7 @@ $LANG = array(
     'gateway_help_1' => ':link for å lage en konto for Authorize.net.',
     'gateway_help_2' => ':link for å lage en konto for Authorize.net.',
     'gateway_help_17' => ':link for å få din PayPal API signatur.',
-    'gateway_help_27' => ':link for å lage en konto for TwoCheckout.',
+    'gateway_help_27' => ':link to sign up for 2Checkout.com. To ensure payments are tracked set :complete_link as the redirect URL under Account > Site Management in the 2Checkout portal.',
     'more_designs' => 'Flere design',
     'more_designs_title' => 'Flere Faktura Design',
     'more_designs_cloud_header' => 'Gå Pro for flere faktura design',
@@ -773,6 +774,8 @@ $LANG = array(
     'activity_35' => ':user created :vendor',
     'activity_36' => ':user created :vendor',
     'activity_37' => ':user created :vendor',
+    'activity_42' => ':user created task ":task"',
+    'activity_43' => ':user updated task ":task"',
     'payment' => 'Betaling',
     'system' => 'System',
     'signature' => 'E-post Signatur',
@@ -992,7 +995,7 @@ $LANG = array(
     'overdue' => 'Overdue',
 
 
-    'white_label_text' => 'Purchase a ONE YEAR white label license for $:price to remove the Invoice Ninja branding from the client portal and help support our project.',
+    'white_label_text' => 'Purchase a ONE YEAR white label license for $:price to remove the Invoice Ninja branding and help support our project.',
     'user_email_footer' => 'For å justere varslingsinnstillingene vennligst besøk :link',
     'reset_password_footer' => 'Hvis du ikke ba om å få nullstillt ditt passord, vennligst kontakt kundeservice: :email',
     'limit_users' => 'Dessverre, vil dette overstige grensen på :limit brukere',
@@ -1293,7 +1296,7 @@ $LANG = array(
     'wepay_tos_agree' => 'I agree to the :link.',
     'wepay_tos_link_text' => 'WePay Terms of Service',
     'resend_confirmation_email' => 'Resend Confirmation Email',
-    'manage_wepay_account' => 'Manage WePay Account',
+    'manage_account' => 'Manage Account',
     'action_required' => 'Action Required',
     'finish_setup' => 'Finish Setup',
     'created_wepay_confirmation_required' => 'Please check your email and confirm your email address with WePay.',
@@ -1361,6 +1364,686 @@ $LANG = array(
     'failed_remove_payment_method' => 'Failed to remove the payment method',
     'gateway_exists' => 'This gateway already exists',
     'manual_entry' => 'Manual entry',
+    'start_of_week' => 'First day of the week',
+
+    // Frequencies
+    'freq_weekly' => 'Weekly',
+    'freq_two_weeks' => 'Two weeks',
+    'freq_four_weeks' => 'Four weeks',
+    'freq_monthly' => 'Monthly',
+    'freq_three_months' => 'Three months',
+    'freq_six_months' => 'Six months',
+    'freq_annually' => 'Annually',
+
+    // Payment types
+    'payment_type_Apply Credit' => 'Apply Credit',
+    'payment_type_Bank Transfer' => 'Bank Transfer',
+    'payment_type_Cash' => 'Cash',
+    'payment_type_Debit' => 'Debit',
+    'payment_type_ACH' => 'ACH',
+    'payment_type_Visa Card' => 'Visa Card',
+    'payment_type_MasterCard' => 'MasterCard',
+    'payment_type_American Express' => 'American Express',
+    'payment_type_Discover Card' => 'Discover Card',
+    'payment_type_Diners Card' => 'Diners Card',
+    'payment_type_EuroCard' => 'EuroCard',
+    'payment_type_Nova' => 'Nova',
+    'payment_type_Credit Card Other' => 'Credit Card Other',
+    'payment_type_PayPal' => 'PayPal',
+    'payment_type_Google Wallet' => 'Google Wallet',
+    'payment_type_Check' => 'Check',
+
+    // Industries
+    'industry_Accounting & Legal' => 'Accounting & Legal',
+    'industry_Advertising' => 'Advertising',
+    'industry_Aerospace' => 'Aerospace',
+    'industry_Agriculture' => 'Agriculture',
+    'industry_Automotive' => 'Automotive',
+    'industry_Banking & Finance' => 'Banking & Finance',
+    'industry_Biotechnology' => 'Biotechnology',
+    'industry_Broadcasting' => 'Broadcasting',
+    'industry_Business Services' => 'Business Services',
+    'industry_Commodities & Chemicals' => 'Commodities & Chemicals',
+    'industry_Communications' => 'Communications',
+    'industry_Computers & Hightech' => 'Computers & Hightech',
+    'industry_Defense' => 'Defense',
+    'industry_Energy' => 'Energy',
+    'industry_Entertainment' => 'Entertainment',
+    'industry_Government' => 'Government',
+    'industry_Healthcare & Life Sciences' => 'Healthcare & Life Sciences',
+    'industry_Insurance' => 'Insurance',
+    'industry_Manufacturing' => 'Manufacturing',
+    'industry_Marketing' => 'Marketing',
+    'industry_Media' => 'Media',
+    'industry_Nonprofit & Higher Ed' => 'Nonprofit & Higher Ed',
+    'industry_Pharmaceuticals' => 'Pharmaceuticals',
+    'industry_Professional Services & Consulting' => 'Professional Services & Consulting',
+    'industry_Real Estate' => 'Real Estate',
+    'industry_Retail & Wholesale' => 'Retail & Wholesale',
+    'industry_Sports' => 'Sports',
+    'industry_Transportation' => 'Transportation',
+    'industry_Travel & Luxury' => 'Travel & Luxury',
+    'industry_Other' => 'Other',
+    'industry_Photography' =>'Photography',
+
+    // Countries
+    'country_Afghanistan' => 'Afghanistan',
+    'country_Albania' => 'Albania',
+    'country_Antarctica' => 'Antarctica',
+    'country_Algeria' => 'Algeria',
+    'country_American Samoa' => 'American Samoa',
+    'country_Andorra' => 'Andorra',
+    'country_Angola' => 'Angola',
+    'country_Antigua and Barbuda' => 'Antigua and Barbuda',
+    'country_Azerbaijan' => 'Azerbaijan',
+    'country_Argentina' => 'Argentina',
+    'country_Australia' => 'Australia',
+    'country_Austria' => 'Austria',
+    'country_Bahamas' => 'Bahamas',
+    'country_Bahrain' => 'Bahrain',
+    'country_Bangladesh' => 'Bangladesh',
+    'country_Armenia' => 'Armenia',
+    'country_Barbados' => 'Barbados',
+    'country_Belgium' => 'Belgium',
+    'country_Bermuda' => 'Bermuda',
+    'country_Bhutan' => 'Bhutan',
+    'country_Bolivia, Plurinational State of' => 'Bolivia, Plurinational State of',
+    'country_Bosnia and Herzegovina' => 'Bosnia and Herzegovina',
+    'country_Botswana' => 'Botswana',
+    'country_Bouvet Island' => 'Bouvet Island',
+    'country_Brazil' => 'Brazil',
+    'country_Belize' => 'Belize',
+    'country_British Indian Ocean Territory' => 'British Indian Ocean Territory',
+    'country_Solomon Islands' => 'Solomon Islands',
+    'country_Virgin Islands, British' => 'Virgin Islands, British',
+    'country_Brunei Darussalam' => 'Brunei Darussalam',
+    'country_Bulgaria' => 'Bulgaria',
+    'country_Myanmar' => 'Myanmar',
+    'country_Burundi' => 'Burundi',
+    'country_Belarus' => 'Belarus',
+    'country_Cambodia' => 'Cambodia',
+    'country_Cameroon' => 'Cameroon',
+    'country_Canada' => 'Canada',
+    'country_Cape Verde' => 'Cape Verde',
+    'country_Cayman Islands' => 'Cayman Islands',
+    'country_Central African Republic' => 'Central African Republic',
+    'country_Sri Lanka' => 'Sri Lanka',
+    'country_Chad' => 'Chad',
+    'country_Chile' => 'Chile',
+    'country_China' => 'China',
+    'country_Taiwan, Province of China' => 'Taiwan, Province of China',
+    'country_Christmas Island' => 'Christmas Island',
+    'country_Cocos (Keeling) Islands' => 'Cocos (Keeling) Islands',
+    'country_Colombia' => 'Colombia',
+    'country_Comoros' => 'Comoros',
+    'country_Mayotte' => 'Mayotte',
+    'country_Congo' => 'Congo',
+    'country_Congo, the Democratic Republic of the' => 'Congo, the Democratic Republic of the',
+    'country_Cook Islands' => 'Cook Islands',
+    'country_Costa Rica' => 'Costa Rica',
+    'country_Croatia' => 'Croatia',
+    'country_Cuba' => 'Cuba',
+    'country_Cyprus' => 'Cyprus',
+    'country_Czech Republic' => 'Czech Republic',
+    'country_Benin' => 'Benin',
+    'country_Denmark' => 'Denmark',
+    'country_Dominica' => 'Dominica',
+    'country_Dominican Republic' => 'Dominican Republic',
+    'country_Ecuador' => 'Ecuador',
+    'country_El Salvador' => 'El Salvador',
+    'country_Equatorial Guinea' => 'Equatorial Guinea',
+    'country_Ethiopia' => 'Ethiopia',
+    'country_Eritrea' => 'Eritrea',
+    'country_Estonia' => 'Estonia',
+    'country_Faroe Islands' => 'Faroe Islands',
+    'country_Falkland Islands (Malvinas)' => 'Falkland Islands (Malvinas)',
+    'country_South Georgia and the South Sandwich Islands' => 'South Georgia and the South Sandwich Islands',
+    'country_Fiji' => 'Fiji',
+    'country_Finland' => 'Finland',
+    'country_Åland Islands' => 'Åland Islands',
+    'country_France' => 'France',
+    'country_French Guiana' => 'French Guiana',
+    'country_French Polynesia' => 'French Polynesia',
+    'country_French Southern Territories' => 'French Southern Territories',
+    'country_Djibouti' => 'Djibouti',
+    'country_Gabon' => 'Gabon',
+    'country_Georgia' => 'Georgia',
+    'country_Gambia' => 'Gambia',
+    'country_Palestinian Territory, Occupied' => 'Palestinian Territory, Occupied',
+    'country_Germany' => 'Germany',
+    'country_Ghana' => 'Ghana',
+    'country_Gibraltar' => 'Gibraltar',
+    'country_Kiribati' => 'Kiribati',
+    'country_Greece' => 'Greece',
+    'country_Greenland' => 'Greenland',
+    'country_Grenada' => 'Grenada',
+    'country_Guadeloupe' => 'Guadeloupe',
+    'country_Guam' => 'Guam',
+    'country_Guatemala' => 'Guatemala',
+    'country_Guinea' => 'Guinea',
+    'country_Guyana' => 'Guyana',
+    'country_Haiti' => 'Haiti',
+    'country_Heard Island and McDonald Islands' => 'Heard Island and McDonald Islands',
+    'country_Holy See (Vatican City State)' => 'Holy See (Vatican City State)',
+    'country_Honduras' => 'Honduras',
+    'country_Hong Kong' => 'Hong Kong',
+    'country_Hungary' => 'Hungary',
+    'country_Iceland' => 'Iceland',
+    'country_India' => 'India',
+    'country_Indonesia' => 'Indonesia',
+    'country_Iran, Islamic Republic of' => 'Iran, Islamic Republic of',
+    'country_Iraq' => 'Iraq',
+    'country_Ireland' => 'Ireland',
+    'country_Israel' => 'Israel',
+    'country_Italy' => 'Italy',
+    'country_Côte d\'Ivoire' => 'Côte d\'Ivoire',
+    'country_Jamaica' => 'Jamaica',
+    'country_Japan' => 'Japan',
+    'country_Kazakhstan' => 'Kazakhstan',
+    'country_Jordan' => 'Jordan',
+    'country_Kenya' => 'Kenya',
+    'country_Korea, Democratic People\'s Republic of' => 'Korea, Democratic People\'s Republic of',
+    'country_Korea, Republic of' => 'Korea, Republic of',
+    'country_Kuwait' => 'Kuwait',
+    'country_Kyrgyzstan' => 'Kyrgyzstan',
+    'country_Lao People\'s Democratic Republic' => 'Lao People\'s Democratic Republic',
+    'country_Lebanon' => 'Lebanon',
+    'country_Lesotho' => 'Lesotho',
+    'country_Latvia' => 'Latvia',
+    'country_Liberia' => 'Liberia',
+    'country_Libya' => 'Libya',
+    'country_Liechtenstein' => 'Liechtenstein',
+    'country_Lithuania' => 'Lithuania',
+    'country_Luxembourg' => 'Luxembourg',
+    'country_Macao' => 'Macao',
+    'country_Madagascar' => 'Madagascar',
+    'country_Malawi' => 'Malawi',
+    'country_Malaysia' => 'Malaysia',
+    'country_Maldives' => 'Maldives',
+    'country_Mali' => 'Mali',
+    'country_Malta' => 'Malta',
+    'country_Martinique' => 'Martinique',
+    'country_Mauritania' => 'Mauritania',
+    'country_Mauritius' => 'Mauritius',
+    'country_Mexico' => 'Mexico',
+    'country_Monaco' => 'Monaco',
+    'country_Mongolia' => 'Mongolia',
+    'country_Moldova, Republic of' => 'Moldova, Republic of',
+    'country_Montenegro' => 'Montenegro',
+    'country_Montserrat' => 'Montserrat',
+    'country_Morocco' => 'Morocco',
+    'country_Mozambique' => 'Mozambique',
+    'country_Oman' => 'Oman',
+    'country_Namibia' => 'Namibia',
+    'country_Nauru' => 'Nauru',
+    'country_Nepal' => 'Nepal',
+    'country_Netherlands' => 'Netherlands',
+    'country_Curaçao' => 'Curaçao',
+    'country_Aruba' => 'Aruba',
+    'country_Sint Maarten (Dutch part)' => 'Sint Maarten (Dutch part)',
+    'country_Bonaire, Sint Eustatius and Saba' => 'Bonaire, Sint Eustatius and Saba',
+    'country_New Caledonia' => 'New Caledonia',
+    'country_Vanuatu' => 'Vanuatu',
+    'country_New Zealand' => 'New Zealand',
+    'country_Nicaragua' => 'Nicaragua',
+    'country_Niger' => 'Niger',
+    'country_Nigeria' => 'Nigeria',
+    'country_Niue' => 'Niue',
+    'country_Norfolk Island' => 'Norfolk Island',
+    'country_Norway' => 'Norway',
+    'country_Northern Mariana Islands' => 'Northern Mariana Islands',
+    'country_United States Minor Outlying Islands' => 'United States Minor Outlying Islands',
+    'country_Micronesia, Federated States of' => 'Micronesia, Federated States of',
+    'country_Marshall Islands' => 'Marshall Islands',
+    'country_Palau' => 'Palau',
+    'country_Pakistan' => 'Pakistan',
+    'country_Panama' => 'Panama',
+    'country_Papua New Guinea' => 'Papua New Guinea',
+    'country_Paraguay' => 'Paraguay',
+    'country_Peru' => 'Peru',
+    'country_Philippines' => 'Philippines',
+    'country_Pitcairn' => 'Pitcairn',
+    'country_Poland' => 'Poland',
+    'country_Portugal' => 'Portugal',
+    'country_Guinea-Bissau' => 'Guinea-Bissau',
+    'country_Timor-Leste' => 'Timor-Leste',
+    'country_Puerto Rico' => 'Puerto Rico',
+    'country_Qatar' => 'Qatar',
+    'country_Réunion' => 'Réunion',
+    'country_Romania' => 'Romania',
+    'country_Russian Federation' => 'Russian Federation',
+    'country_Rwanda' => 'Rwanda',
+    'country_Saint Barthélemy' => 'Saint Barthélemy',
+    'country_Saint Helena, Ascension and Tristan da Cunha' => 'Saint Helena, Ascension and Tristan da Cunha',
+    'country_Saint Kitts and Nevis' => 'Saint Kitts and Nevis',
+    'country_Anguilla' => 'Anguilla',
+    'country_Saint Lucia' => 'Saint Lucia',
+    'country_Saint Martin (French part)' => 'Saint Martin (French part)',
+    'country_Saint Pierre and Miquelon' => 'Saint Pierre and Miquelon',
+    'country_Saint Vincent and the Grenadines' => 'Saint Vincent and the Grenadines',
+    'country_San Marino' => 'San Marino',
+    'country_Sao Tome and Principe' => 'Sao Tome and Principe',
+    'country_Saudi Arabia' => 'Saudi Arabia',
+    'country_Senegal' => 'Senegal',
+    'country_Serbia' => 'Serbia',
+    'country_Seychelles' => 'Seychelles',
+    'country_Sierra Leone' => 'Sierra Leone',
+    'country_Singapore' => 'Singapore',
+    'country_Slovakia' => 'Slovakia',
+    'country_Viet Nam' => 'Viet Nam',
+    'country_Slovenia' => 'Slovenia',
+    'country_Somalia' => 'Somalia',
+    'country_South Africa' => 'South Africa',
+    'country_Zimbabwe' => 'Zimbabwe',
+    'country_Spain' => 'Spain',
+    'country_South Sudan' => 'South Sudan',
+    'country_Sudan' => 'Sudan',
+    'country_Western Sahara' => 'Western Sahara',
+    'country_Suriname' => 'Suriname',
+    'country_Svalbard and Jan Mayen' => 'Svalbard and Jan Mayen',
+    'country_Swaziland' => 'Swaziland',
+    'country_Sweden' => 'Sweden',
+    'country_Switzerland' => 'Switzerland',
+    'country_Syrian Arab Republic' => 'Syrian Arab Republic',
+    'country_Tajikistan' => 'Tajikistan',
+    'country_Thailand' => 'Thailand',
+    'country_Togo' => 'Togo',
+    'country_Tokelau' => 'Tokelau',
+    'country_Tonga' => 'Tonga',
+    'country_Trinidad and Tobago' => 'Trinidad and Tobago',
+    'country_United Arab Emirates' => 'United Arab Emirates',
+    'country_Tunisia' => 'Tunisia',
+    'country_Turkey' => 'Turkey',
+    'country_Turkmenistan' => 'Turkmenistan',
+    'country_Turks and Caicos Islands' => 'Turks and Caicos Islands',
+    'country_Tuvalu' => 'Tuvalu',
+    'country_Uganda' => 'Uganda',
+    '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_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_Virgin Islands, U.S.' => 'Virgin Islands, U.S.',
+    'country_Burkina Faso' => 'Burkina Faso',
+    'country_Uruguay' => 'Uruguay',
+    'country_Uzbekistan' => 'Uzbekistan',
+    'country_Venezuela, Bolivarian Republic of' => 'Venezuela, Bolivarian Republic of',
+    'country_Wallis and Futuna' => 'Wallis and Futuna',
+    'country_Samoa' => 'Samoa',
+    'country_Yemen' => 'Yemen',
+    'country_Zambi' => 'Zambi',
+
+    // Languages
+    'lang_Brazilian Portuguese' => 'Brazilian Portuguese',
+    'lang_Croatian' => 'Croatian',
+    'lang_Czech' => 'Czech',
+    'lang_Danish' => 'Danish',
+    'lang_Dutch' => 'Dutch',
+    'lang_English' => 'English',
+    'lang_French' => 'French',
+    'lang_French - Canada' => 'French - Canada',
+    'lang_German' => 'German',
+    'lang_Italian' => 'Italian',
+    'lang_Japanese' => 'Japanese',
+    'lang_Lithuanian' => 'Lithuanian',
+    'lang_Norwegian' => 'Norwegian',
+    'lang_Polish' => 'Polish',
+    'lang_Spanish' => 'Spanish',
+    'lang_Spanish - Spain' => 'Spanish - Spain',
+    'lang_Swedish' => 'Swedish',
+
+    // Frequencies
+    'freq_weekly' => 'Weekly',
+    'freq_two_weeks' => 'Two weeks',
+    'freq_four_weeks' => 'Four weeks',
+    'freq_monthly' => 'Monthly',
+    'freq_three_months' => 'Three months',
+    'freq_six_months' => 'Six months',
+    'freq_annually' => 'Annually',
+
+    // Payment types
+    'payment_type_Apply Credit' => 'Apply Credit',
+    'payment_type_Bank Transfer' => 'Bank Transfer',
+    'payment_type_Cash' => 'Cash',
+    'payment_type_Debit' => 'Debit',
+    'payment_type_ACH' => 'ACH',
+    'payment_type_Visa Card' => 'Visa Card',
+    'payment_type_MasterCard' => 'MasterCard',
+    'payment_type_American Express' => 'American Express',
+    'payment_type_Discover Card' => 'Discover Card',
+    'payment_type_Diners Card' => 'Diners Card',
+    'payment_type_EuroCard' => 'EuroCard',
+    'payment_type_Nova' => 'Nova',
+    'payment_type_Credit Card Other' => 'Credit Card Other',
+    'payment_type_PayPal' => 'PayPal',
+    'payment_type_Google Wallet' => 'Google Wallet',
+    'payment_type_Check' => 'Check',
+
+    // Industries
+    'industry_Accounting & Legal' => 'Accounting & Legal',
+    'industry_Advertising' => 'Advertising',
+    'industry_Aerospace' => 'Aerospace',
+    'industry_Agriculture' => 'Agriculture',
+    'industry_Automotive' => 'Automotive',
+    'industry_Banking & Finance' => 'Banking & Finance',
+    'industry_Biotechnology' => 'Biotechnology',
+    'industry_Broadcasting' => 'Broadcasting',
+    'industry_Business Services' => 'Business Services',
+    'industry_Commodities & Chemicals' => 'Commodities & Chemicals',
+    'industry_Communications' => 'Communications',
+    'industry_Computers & Hightech' => 'Computers & Hightech',
+    'industry_Defense' => 'Defense',
+    'industry_Energy' => 'Energy',
+    'industry_Entertainment' => 'Entertainment',
+    'industry_Government' => 'Government',
+    'industry_Healthcare & Life Sciences' => 'Healthcare & Life Sciences',
+    'industry_Insurance' => 'Insurance',
+    'industry_Manufacturing' => 'Manufacturing',
+    'industry_Marketing' => 'Marketing',
+    'industry_Media' => 'Media',
+    'industry_Nonprofit & Higher Ed' => 'Nonprofit & Higher Ed',
+    'industry_Pharmaceuticals' => 'Pharmaceuticals',
+    'industry_Professional Services & Consulting' => 'Professional Services & Consulting',
+    'industry_Real Estate' => 'Real Estate',
+    'industry_Retail & Wholesale' => 'Retail & Wholesale',
+    'industry_Sports' => 'Sports',
+    'industry_Transportation' => 'Transportation',
+    'industry_Travel & Luxury' => 'Travel & Luxury',
+    'industry_Other' => 'Other',
+    'industry_Photography' =>'Photography',
+
+    // Countries
+    'country_Afghanistan' => 'Afghanistan',
+    'country_Albania' => 'Albania',
+    'country_Antarctica' => 'Antarctica',
+    'country_Algeria' => 'Algeria',
+    'country_American Samoa' => 'American Samoa',
+    'country_Andorra' => 'Andorra',
+    'country_Angola' => 'Angola',
+    'country_Antigua and Barbuda' => 'Antigua and Barbuda',
+    'country_Azerbaijan' => 'Azerbaijan',
+    'country_Argentina' => 'Argentina',
+    'country_Australia' => 'Australia',
+    'country_Austria' => 'Austria',
+    'country_Bahamas' => 'Bahamas',
+    'country_Bahrain' => 'Bahrain',
+    'country_Bangladesh' => 'Bangladesh',
+    'country_Armenia' => 'Armenia',
+    'country_Barbados' => 'Barbados',
+    'country_Belgium' => 'Belgium',
+    'country_Bermuda' => 'Bermuda',
+    'country_Bhutan' => 'Bhutan',
+    'country_Bolivia, Plurinational State of' => 'Bolivia, Plurinational State of',
+    'country_Bosnia and Herzegovina' => 'Bosnia and Herzegovina',
+    'country_Botswana' => 'Botswana',
+    'country_Bouvet Island' => 'Bouvet Island',
+    'country_Brazil' => 'Brazil',
+    'country_Belize' => 'Belize',
+    'country_British Indian Ocean Territory' => 'British Indian Ocean Territory',
+    'country_Solomon Islands' => 'Solomon Islands',
+    'country_Virgin Islands, British' => 'Virgin Islands, British',
+    'country_Brunei Darussalam' => 'Brunei Darussalam',
+    'country_Bulgaria' => 'Bulgaria',
+    'country_Myanmar' => 'Myanmar',
+    'country_Burundi' => 'Burundi',
+    'country_Belarus' => 'Belarus',
+    'country_Cambodia' => 'Cambodia',
+    'country_Cameroon' => 'Cameroon',
+    'country_Canada' => 'Canada',
+    'country_Cape Verde' => 'Cape Verde',
+    'country_Cayman Islands' => 'Cayman Islands',
+    'country_Central African Republic' => 'Central African Republic',
+    'country_Sri Lanka' => 'Sri Lanka',
+    'country_Chad' => 'Chad',
+    'country_Chile' => 'Chile',
+    'country_China' => 'China',
+    'country_Taiwan, Province of China' => 'Taiwan, Province of China',
+    'country_Christmas Island' => 'Christmas Island',
+    'country_Cocos (Keeling) Islands' => 'Cocos (Keeling) Islands',
+    'country_Colombia' => 'Colombia',
+    'country_Comoros' => 'Comoros',
+    'country_Mayotte' => 'Mayotte',
+    'country_Congo' => 'Congo',
+    'country_Congo, the Democratic Republic of the' => 'Congo, the Democratic Republic of the',
+    'country_Cook Islands' => 'Cook Islands',
+    'country_Costa Rica' => 'Costa Rica',
+    'country_Croatia' => 'Croatia',
+    'country_Cuba' => 'Cuba',
+    'country_Cyprus' => 'Cyprus',
+    'country_Czech Republic' => 'Czech Republic',
+    'country_Benin' => 'Benin',
+    'country_Denmark' => 'Denmark',
+    'country_Dominica' => 'Dominica',
+    'country_Dominican Republic' => 'Dominican Republic',
+    'country_Ecuador' => 'Ecuador',
+    'country_El Salvador' => 'El Salvador',
+    'country_Equatorial Guinea' => 'Equatorial Guinea',
+    'country_Ethiopia' => 'Ethiopia',
+    'country_Eritrea' => 'Eritrea',
+    'country_Estonia' => 'Estonia',
+    'country_Faroe Islands' => 'Faroe Islands',
+    'country_Falkland Islands (Malvinas)' => 'Falkland Islands (Malvinas)',
+    'country_South Georgia and the South Sandwich Islands' => 'South Georgia and the South Sandwich Islands',
+    'country_Fiji' => 'Fiji',
+    'country_Finland' => 'Finland',
+    'country_Åland Islands' => 'Åland Islands',
+    'country_France' => 'France',
+    'country_French Guiana' => 'French Guiana',
+    'country_French Polynesia' => 'French Polynesia',
+    'country_French Southern Territories' => 'French Southern Territories',
+    'country_Djibouti' => 'Djibouti',
+    'country_Gabon' => 'Gabon',
+    'country_Georgia' => 'Georgia',
+    'country_Gambia' => 'Gambia',
+    'country_Palestinian Territory, Occupied' => 'Palestinian Territory, Occupied',
+    'country_Germany' => 'Germany',
+    'country_Ghana' => 'Ghana',
+    'country_Gibraltar' => 'Gibraltar',
+    'country_Kiribati' => 'Kiribati',
+    'country_Greece' => 'Greece',
+    'country_Greenland' => 'Greenland',
+    'country_Grenada' => 'Grenada',
+    'country_Guadeloupe' => 'Guadeloupe',
+    'country_Guam' => 'Guam',
+    'country_Guatemala' => 'Guatemala',
+    'country_Guinea' => 'Guinea',
+    'country_Guyana' => 'Guyana',
+    'country_Haiti' => 'Haiti',
+    'country_Heard Island and McDonald Islands' => 'Heard Island and McDonald Islands',
+    'country_Holy See (Vatican City State)' => 'Holy See (Vatican City State)',
+    'country_Honduras' => 'Honduras',
+    'country_Hong Kong' => 'Hong Kong',
+    'country_Hungary' => 'Hungary',
+    'country_Iceland' => 'Iceland',
+    'country_India' => 'India',
+    'country_Indonesia' => 'Indonesia',
+    'country_Iran, Islamic Republic of' => 'Iran, Islamic Republic of',
+    'country_Iraq' => 'Iraq',
+    'country_Ireland' => 'Ireland',
+    'country_Israel' => 'Israel',
+    'country_Italy' => 'Italy',
+    'country_Côte d\'Ivoire' => 'Côte d\'Ivoire',
+    'country_Jamaica' => 'Jamaica',
+    'country_Japan' => 'Japan',
+    'country_Kazakhstan' => 'Kazakhstan',
+    'country_Jordan' => 'Jordan',
+    'country_Kenya' => 'Kenya',
+    'country_Korea, Democratic People\'s Republic of' => 'Korea, Democratic People\'s Republic of',
+    'country_Korea, Republic of' => 'Korea, Republic of',
+    'country_Kuwait' => 'Kuwait',
+    'country_Kyrgyzstan' => 'Kyrgyzstan',
+    'country_Lao People\'s Democratic Republic' => 'Lao People\'s Democratic Republic',
+    'country_Lebanon' => 'Lebanon',
+    'country_Lesotho' => 'Lesotho',
+    'country_Latvia' => 'Latvia',
+    'country_Liberia' => 'Liberia',
+    'country_Libya' => 'Libya',
+    'country_Liechtenstein' => 'Liechtenstein',
+    'country_Lithuania' => 'Lithuania',
+    'country_Luxembourg' => 'Luxembourg',
+    'country_Macao' => 'Macao',
+    'country_Madagascar' => 'Madagascar',
+    'country_Malawi' => 'Malawi',
+    'country_Malaysia' => 'Malaysia',
+    'country_Maldives' => 'Maldives',
+    'country_Mali' => 'Mali',
+    'country_Malta' => 'Malta',
+    'country_Martinique' => 'Martinique',
+    'country_Mauritania' => 'Mauritania',
+    'country_Mauritius' => 'Mauritius',
+    'country_Mexico' => 'Mexico',
+    'country_Monaco' => 'Monaco',
+    'country_Mongolia' => 'Mongolia',
+    'country_Moldova, Republic of' => 'Moldova, Republic of',
+    'country_Montenegro' => 'Montenegro',
+    'country_Montserrat' => 'Montserrat',
+    'country_Morocco' => 'Morocco',
+    'country_Mozambique' => 'Mozambique',
+    'country_Oman' => 'Oman',
+    'country_Namibia' => 'Namibia',
+    'country_Nauru' => 'Nauru',
+    'country_Nepal' => 'Nepal',
+    'country_Netherlands' => 'Netherlands',
+    'country_Curaçao' => 'Curaçao',
+    'country_Aruba' => 'Aruba',
+    'country_Sint Maarten (Dutch part)' => 'Sint Maarten (Dutch part)',
+    'country_Bonaire, Sint Eustatius and Saba' => 'Bonaire, Sint Eustatius and Saba',
+    'country_New Caledonia' => 'New Caledonia',
+    'country_Vanuatu' => 'Vanuatu',
+    'country_New Zealand' => 'New Zealand',
+    'country_Nicaragua' => 'Nicaragua',
+    'country_Niger' => 'Niger',
+    'country_Nigeria' => 'Nigeria',
+    'country_Niue' => 'Niue',
+    'country_Norfolk Island' => 'Norfolk Island',
+    'country_Norway' => 'Norway',
+    'country_Northern Mariana Islands' => 'Northern Mariana Islands',
+    'country_United States Minor Outlying Islands' => 'United States Minor Outlying Islands',
+    'country_Micronesia, Federated States of' => 'Micronesia, Federated States of',
+    'country_Marshall Islands' => 'Marshall Islands',
+    'country_Palau' => 'Palau',
+    'country_Pakistan' => 'Pakistan',
+    'country_Panama' => 'Panama',
+    'country_Papua New Guinea' => 'Papua New Guinea',
+    'country_Paraguay' => 'Paraguay',
+    'country_Peru' => 'Peru',
+    'country_Philippines' => 'Philippines',
+    'country_Pitcairn' => 'Pitcairn',
+    'country_Poland' => 'Poland',
+    'country_Portugal' => 'Portugal',
+    'country_Guinea-Bissau' => 'Guinea-Bissau',
+    'country_Timor-Leste' => 'Timor-Leste',
+    'country_Puerto Rico' => 'Puerto Rico',
+    'country_Qatar' => 'Qatar',
+    'country_Réunion' => 'Réunion',
+    'country_Romania' => 'Romania',
+    'country_Russian Federation' => 'Russian Federation',
+    'country_Rwanda' => 'Rwanda',
+    'country_Saint Barthélemy' => 'Saint Barthélemy',
+    'country_Saint Helena, Ascension and Tristan da Cunha' => 'Saint Helena, Ascension and Tristan da Cunha',
+    'country_Saint Kitts and Nevis' => 'Saint Kitts and Nevis',
+    'country_Anguilla' => 'Anguilla',
+    'country_Saint Lucia' => 'Saint Lucia',
+    'country_Saint Martin (French part)' => 'Saint Martin (French part)',
+    'country_Saint Pierre and Miquelon' => 'Saint Pierre and Miquelon',
+    'country_Saint Vincent and the Grenadines' => 'Saint Vincent and the Grenadines',
+    'country_San Marino' => 'San Marino',
+    'country_Sao Tome and Principe' => 'Sao Tome and Principe',
+    'country_Saudi Arabia' => 'Saudi Arabia',
+    'country_Senegal' => 'Senegal',
+    'country_Serbia' => 'Serbia',
+    'country_Seychelles' => 'Seychelles',
+    'country_Sierra Leone' => 'Sierra Leone',
+    'country_Singapore' => 'Singapore',
+    'country_Slovakia' => 'Slovakia',
+    'country_Viet Nam' => 'Viet Nam',
+    'country_Slovenia' => 'Slovenia',
+    'country_Somalia' => 'Somalia',
+    'country_South Africa' => 'South Africa',
+    'country_Zimbabwe' => 'Zimbabwe',
+    'country_Spain' => 'Spain',
+    'country_South Sudan' => 'South Sudan',
+    'country_Sudan' => 'Sudan',
+    'country_Western Sahara' => 'Western Sahara',
+    'country_Suriname' => 'Suriname',
+    'country_Svalbard and Jan Mayen' => 'Svalbard and Jan Mayen',
+    'country_Swaziland' => 'Swaziland',
+    'country_Sweden' => 'Sweden',
+    'country_Switzerland' => 'Switzerland',
+    'country_Syrian Arab Republic' => 'Syrian Arab Republic',
+    'country_Tajikistan' => 'Tajikistan',
+    'country_Thailand' => 'Thailand',
+    'country_Togo' => 'Togo',
+    'country_Tokelau' => 'Tokelau',
+    'country_Tonga' => 'Tonga',
+    'country_Trinidad and Tobago' => 'Trinidad and Tobago',
+    'country_United Arab Emirates' => 'United Arab Emirates',
+    'country_Tunisia' => 'Tunisia',
+    'country_Turkey' => 'Turkey',
+    'country_Turkmenistan' => 'Turkmenistan',
+    'country_Turks and Caicos Islands' => 'Turks and Caicos Islands',
+    'country_Tuvalu' => 'Tuvalu',
+    'country_Uganda' => 'Uganda',
+    '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_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_Virgin Islands, U.S.' => 'Virgin Islands, U.S.',
+    'country_Burkina Faso' => 'Burkina Faso',
+    'country_Uruguay' => 'Uruguay',
+    'country_Uzbekistan' => 'Uzbekistan',
+    'country_Venezuela, Bolivarian Republic of' => 'Venezuela, Bolivarian Republic of',
+    'country_Wallis and Futuna' => 'Wallis and Futuna',
+    'country_Samoa' => 'Samoa',
+    'country_Yemen' => 'Yemen',
+    'country_Zambi' => 'Zambi',
+
+    'view_client_portal' => 'View client portal',
+    'view_portal' => 'View Portal',
+    'vendor_contacts' => 'Vendor Contacts',
+    'all' => 'All',
+    'selected' => 'Selected',
+    'category' => 'Category',
+    'categories' => 'Categories',
+    'new_expense_category' => 'New Expense Category',
+    'edit_category' => 'Edit Category',
+    'archive_expense_category' => 'Archive Category',
+    'expense_categories' => 'Expense Categories',
+    'list_expense_categories' => 'List Expense Categories',
+    'updated_expense_category' => 'Successfully updated expense category',
+    'created_expense_category' => 'Successfully created expense category',
+    'archived_expense_category' => 'Successfully archived expense category',
+    'archived_expense_categories' => 'Successfully archived :count expense category',
+    'restore_expense_category' => 'Restore expense category',
+    'restored_expense_category' => 'Successfully restored expense category',
+    'apply_taxes' => 'Apply taxes',
+    'min_to_max_users' => ':min to :max users',
+    'max_users_reached' => 'The maximum number of users has been reached.',
+    'buy_now_buttons' => 'Buy Now Buttons',
+    'landing_page' => 'Landing Page',
+    'payment_type' => 'Payment Type',
+    'form' => 'Form',
+    'link' => 'Link',
+    'fields' => 'Fields',
+    'dwolla' => 'Dwolla',
+    'buy_now_buttons_warning' => 'Note: client and invoice records are created even if the transaction isn\'t completed.',
+    'buy_now_buttons_disabled' => 'This feature requires that a product is created and a payment gateway is configured.',
+    'enable_buy_now_buttons_help' => 'Enable support for buy now buttons',
+    'changes_take_effect_immediately' => 'Note: changes take effect immediately',
+    'wepay_account_description' => 'Payment gateway for Invoice Ninja',
+    'payment_error_code' => 'There was an error processing your payment [:code]. Please try again later.',
+    'standard_fees_apply' => 'Standard fees apply: 2.9% + $0.30 per successful charge.',
+    'limit_import_rows' => 'Data needs to be imported in batches of :count rows or less',
+
 
 );
 

resources/lang/nl/texts.php

@@ -1,6 +1,7 @@
 <?php
 
 $LANG = array(
+
     'organization' => 'Organisatie',
     'name' => 'Naam',
     'website' => 'Website',
@@ -67,8 +68,8 @@ $LANG = array(
     'tax_rates' => 'BTW-tarieven',
     'rate' => 'Tarief',
     'settings' => 'Instellingen',
-    'enable_invoice_tax' => 'Activeer instelling van <b>BTW op volledige factuur</b>',
-    'enable_line_item_tax' => 'Activeer instelling van <b>BTW per lijn</b>',
+    'enable_invoice_tax' => 'Activeer het specifiëren van <b>BTW op volledige factuur</b>',
+    'enable_line_item_tax' => 'Activeer het specifiëren van <b>BTW per lijn</b>',
     'dashboard' => 'Dashboard',
     'clients' => 'Klanten',
     'invoices' => 'Facturen',
@@ -380,7 +381,7 @@ $LANG = array(
     'gateway_help_1' => ':link om in te schrijven voor Authorize.net.',
     'gateway_help_2' => ':link om in te schrijven voor Authorize.net.',
     'gateway_help_17' => ':link om uw PayPal API signature te krijgen.',
-    'gateway_help_27' => ':link om in te schrijven voor TwoCheckout.',
+    'gateway_help_27' => ':link to sign up for 2Checkout.com. To ensure payments are tracked set :complete_link as the redirect URL under Account > Site Management in the 2Checkout portal.',
     'more_designs' => 'Meer ontwerpen',
     'more_designs_title' => 'Aanvullende factuurontwerpen',
     'more_designs_cloud_header' => 'Neem Pro Plan voor meer factuurontwerpen',
@@ -767,6 +768,8 @@ $LANG = array(
     'activity_35' => ':user heeft leverancier :vendor aangemaakt',
     'activity_36' => ':user heeft leverancier :vendor aangemaakt',
     'activity_37' => ':user heeft leverancier :vendor aangemaakt',
+    'activity_42' => ':user created task ":task"',
+    'activity_43' => ':user updated task ":task"',
     'payment' => 'Betaling',
     'system' => 'Systeem',
     'signature' => 'E-mailhandtekening',
@@ -983,7 +986,7 @@ $LANG = array(
     'overdue' => 'Verlopen',
 
 
-    'white_label_text' => 'Koop een &eacute;&eacute;n jaar geldige white label licentie van $:price om de Invoice Ninja logo\'s in het klantenportaal te verbergen en ons project te ondersteunen.',
+    'white_label_text' => 'Purchase a ONE YEAR white label license for $:price to remove the Invoice Ninja branding and help support our project.',
     'user_email_footer' => 'Ga alstublieft naar :link om uw e-mail notificatie instellingen aan te passen',
     'reset_password_footer' => 'Neem a.u.b. contact op met onze helpdesk indien u deze wachtwoordreset niet heeft aangevraagd. Het e-mailadres van de helpdesk is :email',
     'limit_users' => 'Sorry, dit zou de limiet van :limit gebruikers overschrijden',
@@ -1284,7 +1287,7 @@ Kom terug naar deze betalingsmethode pagina zodra u de bedragen heeft ontvangen
     'wepay_tos_agree' => 'Ik ga akkoord met de :link.',
     'wepay_tos_link_text' => 'WePay servicevoorwaarden',
     'resend_confirmation_email' => 'Bevestigings-e-mail opnieuw versturen',
-    'manage_wepay_account' => 'WePay account beheren',
+    'manage_account' => 'Manage Account',
     'action_required' => 'Actie vereist',
     'finish_setup' => 'Installatie voltooien',
     'created_wepay_confirmation_required' => 'Controleer uw e-mail en bevestig uw e-mailadres met WePay.',
@@ -1352,6 +1355,686 @@ Kom terug naar deze betalingsmethode pagina zodra u de bedragen heeft ontvangen
     'failed_remove_payment_method' => 'Failed to remove the payment method',
     'gateway_exists' => 'This gateway already exists',
     'manual_entry' => 'Manual entry',
+    'start_of_week' => 'First day of the week',
+
+    // Frequencies
+    'freq_weekly' => 'Weekly',
+    'freq_two_weeks' => 'Two weeks',
+    'freq_four_weeks' => 'Four weeks',
+    'freq_monthly' => 'Monthly',
+    'freq_three_months' => 'Three months',
+    'freq_six_months' => 'Six months',
+    'freq_annually' => 'Annually',
+
+    // Payment types
+    'payment_type_Apply Credit' => 'Apply Credit',
+    'payment_type_Bank Transfer' => 'Bank Transfer',
+    'payment_type_Cash' => 'Cash',
+    'payment_type_Debit' => 'Debit',
+    'payment_type_ACH' => 'ACH',
+    'payment_type_Visa Card' => 'Visa Card',
+    'payment_type_MasterCard' => 'MasterCard',
+    'payment_type_American Express' => 'American Express',
+    'payment_type_Discover Card' => 'Discover Card',
+    'payment_type_Diners Card' => 'Diners Card',
+    'payment_type_EuroCard' => 'EuroCard',
+    'payment_type_Nova' => 'Nova',
+    'payment_type_Credit Card Other' => 'Credit Card Other',
+    'payment_type_PayPal' => 'PayPal',
+    'payment_type_Google Wallet' => 'Google Wallet',
+    'payment_type_Check' => 'Check',
+
+    // Industries
+    'industry_Accounting & Legal' => 'Accounting & Legal',
+    'industry_Advertising' => 'Advertising',
+    'industry_Aerospace' => 'Aerospace',
+    'industry_Agriculture' => 'Agriculture',
+    'industry_Automotive' => 'Automotive',
+    'industry_Banking & Finance' => 'Banking & Finance',
+    'industry_Biotechnology' => 'Biotechnology',
+    'industry_Broadcasting' => 'Broadcasting',
+    'industry_Business Services' => 'Business Services',
+    'industry_Commodities & Chemicals' => 'Commodities & Chemicals',
+    'industry_Communications' => 'Communications',
+    'industry_Computers & Hightech' => 'Computers & Hightech',
+    'industry_Defense' => 'Defense',
+    'industry_Energy' => 'Energy',
+    'industry_Entertainment' => 'Entertainment',
+    'industry_Government' => 'Government',
+    'industry_Healthcare & Life Sciences' => 'Healthcare & Life Sciences',
+    'industry_Insurance' => 'Insurance',
+    'industry_Manufacturing' => 'Manufacturing',
+    'industry_Marketing' => 'Marketing',
+    'industry_Media' => 'Media',
+    'industry_Nonprofit & Higher Ed' => 'Nonprofit & Higher Ed',
+    'industry_Pharmaceuticals' => 'Pharmaceuticals',
+    'industry_Professional Services & Consulting' => 'Professional Services & Consulting',
+    'industry_Real Estate' => 'Real Estate',
+    'industry_Retail & Wholesale' => 'Retail & Wholesale',
+    'industry_Sports' => 'Sports',
+    'industry_Transportation' => 'Transportation',
+    'industry_Travel & Luxury' => 'Travel & Luxury',
+    'industry_Other' => 'Other',
+    'industry_Photography' =>'Photography',
+
+    // Countries
+    'country_Afghanistan' => 'Afghanistan',
+    'country_Albania' => 'Albania',
+    'country_Antarctica' => 'Antarctica',
+    'country_Algeria' => 'Algeria',
+    'country_American Samoa' => 'American Samoa',
+    'country_Andorra' => 'Andorra',
+    'country_Angola' => 'Angola',
+    'country_Antigua and Barbuda' => 'Antigua and Barbuda',
+    'country_Azerbaijan' => 'Azerbaijan',
+    'country_Argentina' => 'Argentina',
+    'country_Australia' => 'Australia',
+    'country_Austria' => 'Austria',
+    'country_Bahamas' => 'Bahamas',
+    'country_Bahrain' => 'Bahrain',
+    'country_Bangladesh' => 'Bangladesh',
+    'country_Armenia' => 'Armenia',
+    'country_Barbados' => 'Barbados',
+    'country_Belgium' => 'Belgium',
+    'country_Bermuda' => 'Bermuda',
+    'country_Bhutan' => 'Bhutan',
+    'country_Bolivia, Plurinational State of' => 'Bolivia, Plurinational State of',
+    'country_Bosnia and Herzegovina' => 'Bosnia and Herzegovina',
+    'country_Botswana' => 'Botswana',
+    'country_Bouvet Island' => 'Bouvet Island',
+    'country_Brazil' => 'Brazil',
+    'country_Belize' => 'Belize',
+    'country_British Indian Ocean Territory' => 'British Indian Ocean Territory',
+    'country_Solomon Islands' => 'Solomon Islands',
+    'country_Virgin Islands, British' => 'Virgin Islands, British',
+    'country_Brunei Darussalam' => 'Brunei Darussalam',
+    'country_Bulgaria' => 'Bulgaria',
+    'country_Myanmar' => 'Myanmar',
+    'country_Burundi' => 'Burundi',
+    'country_Belarus' => 'Belarus',
+    'country_Cambodia' => 'Cambodia',
+    'country_Cameroon' => 'Cameroon',
+    'country_Canada' => 'Canada',
+    'country_Cape Verde' => 'Cape Verde',
+    'country_Cayman Islands' => 'Cayman Islands',
+    'country_Central African Republic' => 'Central African Republic',
+    'country_Sri Lanka' => 'Sri Lanka',
+    'country_Chad' => 'Chad',
+    'country_Chile' => 'Chile',
+    'country_China' => 'China',
+    'country_Taiwan, Province of China' => 'Taiwan, Province of China',
+    'country_Christmas Island' => 'Christmas Island',
+    'country_Cocos (Keeling) Islands' => 'Cocos (Keeling) Islands',
+    'country_Colombia' => 'Colombia',
+    'country_Comoros' => 'Comoros',
+    'country_Mayotte' => 'Mayotte',
+    'country_Congo' => 'Congo',
+    'country_Congo, the Democratic Republic of the' => 'Congo, the Democratic Republic of the',
+    'country_Cook Islands' => 'Cook Islands',
+    'country_Costa Rica' => 'Costa Rica',
+    'country_Croatia' => 'Croatia',
+    'country_Cuba' => 'Cuba',
+    'country_Cyprus' => 'Cyprus',
+    'country_Czech Republic' => 'Czech Republic',
+    'country_Benin' => 'Benin',
+    'country_Denmark' => 'Denmark',
+    'country_Dominica' => 'Dominica',
+    'country_Dominican Republic' => 'Dominican Republic',
+    'country_Ecuador' => 'Ecuador',
+    'country_El Salvador' => 'El Salvador',
+    'country_Equatorial Guinea' => 'Equatorial Guinea',
+    'country_Ethiopia' => 'Ethiopia',
+    'country_Eritrea' => 'Eritrea',
+    'country_Estonia' => 'Estonia',
+    'country_Faroe Islands' => 'Faroe Islands',
+    'country_Falkland Islands (Malvinas)' => 'Falkland Islands (Malvinas)',
+    'country_South Georgia and the South Sandwich Islands' => 'South Georgia and the South Sandwich Islands',
+    'country_Fiji' => 'Fiji',
+    'country_Finland' => 'Finland',
+    'country_Åland Islands' => 'Åland Islands',
+    'country_France' => 'France',
+    'country_French Guiana' => 'French Guiana',
+    'country_French Polynesia' => 'French Polynesia',
+    'country_French Southern Territories' => 'French Southern Territories',
+    'country_Djibouti' => 'Djibouti',
+    'country_Gabon' => 'Gabon',
+    'country_Georgia' => 'Georgia',
+    'country_Gambia' => 'Gambia',
+    'country_Palestinian Territory, Occupied' => 'Palestinian Territory, Occupied',
+    'country_Germany' => 'Germany',
+    'country_Ghana' => 'Ghana',
+    'country_Gibraltar' => 'Gibraltar',
+    'country_Kiribati' => 'Kiribati',
+    'country_Greece' => 'Greece',
+    'country_Greenland' => 'Greenland',
+    'country_Grenada' => 'Grenada',
+    'country_Guadeloupe' => 'Guadeloupe',
+    'country_Guam' => 'Guam',
+    'country_Guatemala' => 'Guatemala',
+    'country_Guinea' => 'Guinea',
+    'country_Guyana' => 'Guyana',
+    'country_Haiti' => 'Haiti',
+    'country_Heard Island and McDonald Islands' => 'Heard Island and McDonald Islands',
+    'country_Holy See (Vatican City State)' => 'Holy See (Vatican City State)',
+    'country_Honduras' => 'Honduras',
+    'country_Hong Kong' => 'Hong Kong',
+    'country_Hungary' => 'Hungary',
+    'country_Iceland' => 'Iceland',
+    'country_India' => 'India',
+    'country_Indonesia' => 'Indonesia',
+    'country_Iran, Islamic Republic of' => 'Iran, Islamic Republic of',
+    'country_Iraq' => 'Iraq',
+    'country_Ireland' => 'Ireland',
+    'country_Israel' => 'Israel',
+    'country_Italy' => 'Italy',
+    'country_Côte d\'Ivoire' => 'Côte d\'Ivoire',
+    'country_Jamaica' => 'Jamaica',
+    'country_Japan' => 'Japan',
+    'country_Kazakhstan' => 'Kazakhstan',
+    'country_Jordan' => 'Jordan',
+    'country_Kenya' => 'Kenya',
+    'country_Korea, Democratic People\'s Republic of' => 'Korea, Democratic People\'s Republic of',
+    'country_Korea, Republic of' => 'Korea, Republic of',
+    'country_Kuwait' => 'Kuwait',
+    'country_Kyrgyzstan' => 'Kyrgyzstan',
+    'country_Lao People\'s Democratic Republic' => 'Lao People\'s Democratic Republic',
+    'country_Lebanon' => 'Lebanon',
+    'country_Lesotho' => 'Lesotho',
+    'country_Latvia' => 'Latvia',
+    'country_Liberia' => 'Liberia',
+    'country_Libya' => 'Libya',
+    'country_Liechtenstein' => 'Liechtenstein',
+    'country_Lithuania' => 'Lithuania',
+    'country_Luxembourg' => 'Luxembourg',
+    'country_Macao' => 'Macao',
+    'country_Madagascar' => 'Madagascar',
+    'country_Malawi' => 'Malawi',
+    'country_Malaysia' => 'Malaysia',
+    'country_Maldives' => 'Maldives',
+    'country_Mali' => 'Mali',
+    'country_Malta' => 'Malta',
+    'country_Martinique' => 'Martinique',
+    'country_Mauritania' => 'Mauritania',
+    'country_Mauritius' => 'Mauritius',
+    'country_Mexico' => 'Mexico',
+    'country_Monaco' => 'Monaco',
+    'country_Mongolia' => 'Mongolia',
+    'country_Moldova, Republic of' => 'Moldova, Republic of',
+    'country_Montenegro' => 'Montenegro',
+    'country_Montserrat' => 'Montserrat',
+    'country_Morocco' => 'Morocco',
+    'country_Mozambique' => 'Mozambique',
+    'country_Oman' => 'Oman',
+    'country_Namibia' => 'Namibia',
+    'country_Nauru' => 'Nauru',
+    'country_Nepal' => 'Nepal',
+    'country_Netherlands' => 'Netherlands',
+    'country_Curaçao' => 'Curaçao',
+    'country_Aruba' => 'Aruba',
+    'country_Sint Maarten (Dutch part)' => 'Sint Maarten (Dutch part)',
+    'country_Bonaire, Sint Eustatius and Saba' => 'Bonaire, Sint Eustatius and Saba',
+    'country_New Caledonia' => 'New Caledonia',
+    'country_Vanuatu' => 'Vanuatu',
+    'country_New Zealand' => 'New Zealand',
+    'country_Nicaragua' => 'Nicaragua',
+    'country_Niger' => 'Niger',
+    'country_Nigeria' => 'Nigeria',
+    'country_Niue' => 'Niue',
+    'country_Norfolk Island' => 'Norfolk Island',
+    'country_Norway' => 'Norway',
+    'country_Northern Mariana Islands' => 'Northern Mariana Islands',
+    'country_United States Minor Outlying Islands' => 'United States Minor Outlying Islands',
+    'country_Micronesia, Federated States of' => 'Micronesia, Federated States of',
+    'country_Marshall Islands' => 'Marshall Islands',
+    'country_Palau' => 'Palau',
+    'country_Pakistan' => 'Pakistan',
+    'country_Panama' => 'Panama',
+    'country_Papua New Guinea' => 'Papua New Guinea',
+    'country_Paraguay' => 'Paraguay',
+    'country_Peru' => 'Peru',
+    'country_Philippines' => 'Philippines',
+    'country_Pitcairn' => 'Pitcairn',
+    'country_Poland' => 'Poland',
+    'country_Portugal' => 'Portugal',
+    'country_Guinea-Bissau' => 'Guinea-Bissau',
+    'country_Timor-Leste' => 'Timor-Leste',
+    'country_Puerto Rico' => 'Puerto Rico',
+    'country_Qatar' => 'Qatar',
+    'country_Réunion' => 'Réunion',
+    'country_Romania' => 'Romania',
+    'country_Russian Federation' => 'Russian Federation',
+    'country_Rwanda' => 'Rwanda',
+    'country_Saint Barthélemy' => 'Saint Barthélemy',
+    'country_Saint Helena, Ascension and Tristan da Cunha' => 'Saint Helena, Ascension and Tristan da Cunha',
+    'country_Saint Kitts and Nevis' => 'Saint Kitts and Nevis',
+    'country_Anguilla' => 'Anguilla',
+    'country_Saint Lucia' => 'Saint Lucia',
+    'country_Saint Martin (French part)' => 'Saint Martin (French part)',
+    'country_Saint Pierre and Miquelon' => 'Saint Pierre and Miquelon',
+    'country_Saint Vincent and the Grenadines' => 'Saint Vincent and the Grenadines',
+    'country_San Marino' => 'San Marino',
+    'country_Sao Tome and Principe' => 'Sao Tome and Principe',
+    'country_Saudi Arabia' => 'Saudi Arabia',
+    'country_Senegal' => 'Senegal',
+    'country_Serbia' => 'Serbia',
+    'country_Seychelles' => 'Seychelles',
+    'country_Sierra Leone' => 'Sierra Leone',
+    'country_Singapore' => 'Singapore',
+    'country_Slovakia' => 'Slovakia',
+    'country_Viet Nam' => 'Viet Nam',
+    'country_Slovenia' => 'Slovenia',
+    'country_Somalia' => 'Somalia',
+    'country_South Africa' => 'South Africa',
+    'country_Zimbabwe' => 'Zimbabwe',
+    'country_Spain' => 'Spain',
+    'country_South Sudan' => 'South Sudan',
+    'country_Sudan' => 'Sudan',
+    'country_Western Sahara' => 'Western Sahara',
+    'country_Suriname' => 'Suriname',
+    'country_Svalbard and Jan Mayen' => 'Svalbard and Jan Mayen',
+    'country_Swaziland' => 'Swaziland',
+    'country_Sweden' => 'Sweden',
+    'country_Switzerland' => 'Switzerland',
+    'country_Syrian Arab Republic' => 'Syrian Arab Republic',
+    'country_Tajikistan' => 'Tajikistan',
+    'country_Thailand' => 'Thailand',
+    'country_Togo' => 'Togo',
+    'country_Tokelau' => 'Tokelau',
+    'country_Tonga' => 'Tonga',
+    'country_Trinidad and Tobago' => 'Trinidad and Tobago',
+    'country_United Arab Emirates' => 'United Arab Emirates',
+    'country_Tunisia' => 'Tunisia',
+    'country_Turkey' => 'Turkey',
+    'country_Turkmenistan' => 'Turkmenistan',
+    'country_Turks and Caicos Islands' => 'Turks and Caicos Islands',
+    'country_Tuvalu' => 'Tuvalu',
+    'country_Uganda' => 'Uganda',
+    '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_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_Virgin Islands, U.S.' => 'Virgin Islands, U.S.',
+    'country_Burkina Faso' => 'Burkina Faso',
+    'country_Uruguay' => 'Uruguay',
+    'country_Uzbekistan' => 'Uzbekistan',
+    'country_Venezuela, Bolivarian Republic of' => 'Venezuela, Bolivarian Republic of',
+    'country_Wallis and Futuna' => 'Wallis and Futuna',
+    'country_Samoa' => 'Samoa',
+    'country_Yemen' => 'Yemen',
+    'country_Zambi' => 'Zambi',
+
+    // Languages
+    'lang_Brazilian Portuguese' => 'Brazilian Portuguese',
+    'lang_Croatian' => 'Croatian',
+    'lang_Czech' => 'Czech',
+    'lang_Danish' => 'Danish',
+    'lang_Dutch' => 'Dutch',
+    'lang_English' => 'English',
+    'lang_French' => 'French',
+    'lang_French - Canada' => 'French - Canada',
+    'lang_German' => 'German',
+    'lang_Italian' => 'Italian',
+    'lang_Japanese' => 'Japanese',
+    'lang_Lithuanian' => 'Lithuanian',
+    'lang_Norwegian' => 'Norwegian',
+    'lang_Polish' => 'Polish',
+    'lang_Spanish' => 'Spanish',
+    'lang_Spanish - Spain' => 'Spanish - Spain',
+    'lang_Swedish' => 'Swedish',
+
+    // Frequencies
+    'freq_weekly' => 'Weekly',
+    'freq_two_weeks' => 'Two weeks',
+    'freq_four_weeks' => 'Four weeks',
+    'freq_monthly' => 'Monthly',
+    'freq_three_months' => 'Three months',
+    'freq_six_months' => 'Six months',
+    'freq_annually' => 'Annually',
+
+    // Payment types
+    'payment_type_Apply Credit' => 'Apply Credit',
+    'payment_type_Bank Transfer' => 'Bank Transfer',
+    'payment_type_Cash' => 'Cash',
+    'payment_type_Debit' => 'Debit',
+    'payment_type_ACH' => 'ACH',
+    'payment_type_Visa Card' => 'Visa Card',
+    'payment_type_MasterCard' => 'MasterCard',
+    'payment_type_American Express' => 'American Express',
+    'payment_type_Discover Card' => 'Discover Card',
+    'payment_type_Diners Card' => 'Diners Card',
+    'payment_type_EuroCard' => 'EuroCard',
+    'payment_type_Nova' => 'Nova',
+    'payment_type_Credit Card Other' => 'Credit Card Other',
+    'payment_type_PayPal' => 'PayPal',
+    'payment_type_Google Wallet' => 'Google Wallet',
+    'payment_type_Check' => 'Check',
+
+    // Industries
+    'industry_Accounting & Legal' => 'Accounting & Legal',
+    'industry_Advertising' => 'Advertising',
+    'industry_Aerospace' => 'Aerospace',
+    'industry_Agriculture' => 'Agriculture',
+    'industry_Automotive' => 'Automotive',
+    'industry_Banking & Finance' => 'Banking & Finance',
+    'industry_Biotechnology' => 'Biotechnology',
+    'industry_Broadcasting' => 'Broadcasting',
+    'industry_Business Services' => 'Business Services',
+    'industry_Commodities & Chemicals' => 'Commodities & Chemicals',
+    'industry_Communications' => 'Communications',
+    'industry_Computers & Hightech' => 'Computers & Hightech',
+    'industry_Defense' => 'Defense',
+    'industry_Energy' => 'Energy',
+    'industry_Entertainment' => 'Entertainment',
+    'industry_Government' => 'Government',
+    'industry_Healthcare & Life Sciences' => 'Healthcare & Life Sciences',
+    'industry_Insurance' => 'Insurance',
+    'industry_Manufacturing' => 'Manufacturing',
+    'industry_Marketing' => 'Marketing',
+    'industry_Media' => 'Media',
+    'industry_Nonprofit & Higher Ed' => 'Nonprofit & Higher Ed',
+    'industry_Pharmaceuticals' => 'Pharmaceuticals',
+    'industry_Professional Services & Consulting' => 'Professional Services & Consulting',
+    'industry_Real Estate' => 'Real Estate',
+    'industry_Retail & Wholesale' => 'Retail & Wholesale',
+    'industry_Sports' => 'Sports',
+    'industry_Transportation' => 'Transportation',
+    'industry_Travel & Luxury' => 'Travel & Luxury',
+    'industry_Other' => 'Other',
+    'industry_Photography' =>'Photography',
+
+    // Countries
+    'country_Afghanistan' => 'Afghanistan',
+    'country_Albania' => 'Albania',
+    'country_Antarctica' => 'Antarctica',
+    'country_Algeria' => 'Algeria',
+    'country_American Samoa' => 'American Samoa',
+    'country_Andorra' => 'Andorra',
+    'country_Angola' => 'Angola',
+    'country_Antigua and Barbuda' => 'Antigua and Barbuda',
+    'country_Azerbaijan' => 'Azerbaijan',
+    'country_Argentina' => 'Argentina',
+    'country_Australia' => 'Australia',
+    'country_Austria' => 'Austria',
+    'country_Bahamas' => 'Bahamas',
+    'country_Bahrain' => 'Bahrain',
+    'country_Bangladesh' => 'Bangladesh',
+    'country_Armenia' => 'Armenia',
+    'country_Barbados' => 'Barbados',
+    'country_Belgium' => 'Belgium',
+    'country_Bermuda' => 'Bermuda',
+    'country_Bhutan' => 'Bhutan',
+    'country_Bolivia, Plurinational State of' => 'Bolivia, Plurinational State of',
+    'country_Bosnia and Herzegovina' => 'Bosnia and Herzegovina',
+    'country_Botswana' => 'Botswana',
+    'country_Bouvet Island' => 'Bouvet Island',
+    'country_Brazil' => 'Brazil',
+    'country_Belize' => 'Belize',
+    'country_British Indian Ocean Territory' => 'British Indian Ocean Territory',
+    'country_Solomon Islands' => 'Solomon Islands',
+    'country_Virgin Islands, British' => 'Virgin Islands, British',
+    'country_Brunei Darussalam' => 'Brunei Darussalam',
+    'country_Bulgaria' => 'Bulgaria',
+    'country_Myanmar' => 'Myanmar',
+    'country_Burundi' => 'Burundi',
+    'country_Belarus' => 'Belarus',
+    'country_Cambodia' => 'Cambodia',
+    'country_Cameroon' => 'Cameroon',
+    'country_Canada' => 'Canada',
+    'country_Cape Verde' => 'Cape Verde',
+    'country_Cayman Islands' => 'Cayman Islands',
+    'country_Central African Republic' => 'Central African Republic',
+    'country_Sri Lanka' => 'Sri Lanka',
+    'country_Chad' => 'Chad',
+    'country_Chile' => 'Chile',
+    'country_China' => 'China',
+    'country_Taiwan, Province of China' => 'Taiwan, Province of China',
+    'country_Christmas Island' => 'Christmas Island',
+    'country_Cocos (Keeling) Islands' => 'Cocos (Keeling) Islands',
+    'country_Colombia' => 'Colombia',
+    'country_Comoros' => 'Comoros',
+    'country_Mayotte' => 'Mayotte',
+    'country_Congo' => 'Congo',
+    'country_Congo, the Democratic Republic of the' => 'Congo, the Democratic Republic of the',
+    'country_Cook Islands' => 'Cook Islands',
+    'country_Costa Rica' => 'Costa Rica',
+    'country_Croatia' => 'Croatia',
+    'country_Cuba' => 'Cuba',
+    'country_Cyprus' => 'Cyprus',
+    'country_Czech Republic' => 'Czech Republic',
+    'country_Benin' => 'Benin',
+    'country_Denmark' => 'Denmark',
+    'country_Dominica' => 'Dominica',
+    'country_Dominican Republic' => 'Dominican Republic',
+    'country_Ecuador' => 'Ecuador',
+    'country_El Salvador' => 'El Salvador',
+    'country_Equatorial Guinea' => 'Equatorial Guinea',
+    'country_Ethiopia' => 'Ethiopia',
+    'country_Eritrea' => 'Eritrea',
+    'country_Estonia' => 'Estonia',
+    'country_Faroe Islands' => 'Faroe Islands',
+    'country_Falkland Islands (Malvinas)' => 'Falkland Islands (Malvinas)',
+    'country_South Georgia and the South Sandwich Islands' => 'South Georgia and the South Sandwich Islands',
+    'country_Fiji' => 'Fiji',
+    'country_Finland' => 'Finland',
+    'country_Åland Islands' => 'Åland Islands',
+    'country_France' => 'France',
+    'country_French Guiana' => 'French Guiana',
+    'country_French Polynesia' => 'French Polynesia',
+    'country_French Southern Territories' => 'French Southern Territories',
+    'country_Djibouti' => 'Djibouti',
+    'country_Gabon' => 'Gabon',
+    'country_Georgia' => 'Georgia',
+    'country_Gambia' => 'Gambia',
+    'country_Palestinian Territory, Occupied' => 'Palestinian Territory, Occupied',
+    'country_Germany' => 'Germany',
+    'country_Ghana' => 'Ghana',
+    'country_Gibraltar' => 'Gibraltar',
+    'country_Kiribati' => 'Kiribati',
+    'country_Greece' => 'Greece',
+    'country_Greenland' => 'Greenland',
+    'country_Grenada' => 'Grenada',
+    'country_Guadeloupe' => 'Guadeloupe',
+    'country_Guam' => 'Guam',
+    'country_Guatemala' => 'Guatemala',
+    'country_Guinea' => 'Guinea',
+    'country_Guyana' => 'Guyana',
+    'country_Haiti' => 'Haiti',
+    'country_Heard Island and McDonald Islands' => 'Heard Island and McDonald Islands',
+    'country_Holy See (Vatican City State)' => 'Holy See (Vatican City State)',
+    'country_Honduras' => 'Honduras',
+    'country_Hong Kong' => 'Hong Kong',
+    'country_Hungary' => 'Hungary',
+    'country_Iceland' => 'Iceland',
+    'country_India' => 'India',
+    'country_Indonesia' => 'Indonesia',
+    'country_Iran, Islamic Republic of' => 'Iran, Islamic Republic of',
+    'country_Iraq' => 'Iraq',
+    'country_Ireland' => 'Ireland',
+    'country_Israel' => 'Israel',
+    'country_Italy' => 'Italy',
+    'country_Côte d\'Ivoire' => 'Côte d\'Ivoire',
+    'country_Jamaica' => 'Jamaica',
+    'country_Japan' => 'Japan',
+    'country_Kazakhstan' => 'Kazakhstan',
+    'country_Jordan' => 'Jordan',
+    'country_Kenya' => 'Kenya',
+    'country_Korea, Democratic People\'s Republic of' => 'Korea, Democratic People\'s Republic of',
+    'country_Korea, Republic of' => 'Korea, Republic of',
+    'country_Kuwait' => 'Kuwait',
+    'country_Kyrgyzstan' => 'Kyrgyzstan',
+    'country_Lao People\'s Democratic Republic' => 'Lao People\'s Democratic Republic',
+    'country_Lebanon' => 'Lebanon',
+    'country_Lesotho' => 'Lesotho',
+    'country_Latvia' => 'Latvia',
+    'country_Liberia' => 'Liberia',
+    'country_Libya' => 'Libya',
+    'country_Liechtenstein' => 'Liechtenstein',
+    'country_Lithuania' => 'Lithuania',
+    'country_Luxembourg' => 'Luxembourg',
+    'country_Macao' => 'Macao',
+    'country_Madagascar' => 'Madagascar',
+    'country_Malawi' => 'Malawi',
+    'country_Malaysia' => 'Malaysia',
+    'country_Maldives' => 'Maldives',
+    'country_Mali' => 'Mali',
+    'country_Malta' => 'Malta',
+    'country_Martinique' => 'Martinique',
+    'country_Mauritania' => 'Mauritania',
+    'country_Mauritius' => 'Mauritius',
+    'country_Mexico' => 'Mexico',
+    'country_Monaco' => 'Monaco',
+    'country_Mongolia' => 'Mongolia',
+    'country_Moldova, Republic of' => 'Moldova, Republic of',
+    'country_Montenegro' => 'Montenegro',
+    'country_Montserrat' => 'Montserrat',
+    'country_Morocco' => 'Morocco',
+    'country_Mozambique' => 'Mozambique',
+    'country_Oman' => 'Oman',
+    'country_Namibia' => 'Namibia',
+    'country_Nauru' => 'Nauru',
+    'country_Nepal' => 'Nepal',
+    'country_Netherlands' => 'Netherlands',
+    'country_Curaçao' => 'Curaçao',
+    'country_Aruba' => 'Aruba',
+    'country_Sint Maarten (Dutch part)' => 'Sint Maarten (Dutch part)',
+    'country_Bonaire, Sint Eustatius and Saba' => 'Bonaire, Sint Eustatius and Saba',
+    'country_New Caledonia' => 'New Caledonia',
+    'country_Vanuatu' => 'Vanuatu',
+    'country_New Zealand' => 'New Zealand',
+    'country_Nicaragua' => 'Nicaragua',
+    'country_Niger' => 'Niger',
+    'country_Nigeria' => 'Nigeria',
+    'country_Niue' => 'Niue',
+    'country_Norfolk Island' => 'Norfolk Island',
+    'country_Norway' => 'Norway',
+    'country_Northern Mariana Islands' => 'Northern Mariana Islands',
+    'country_United States Minor Outlying Islands' => 'United States Minor Outlying Islands',
+    'country_Micronesia, Federated States of' => 'Micronesia, Federated States of',
+    'country_Marshall Islands' => 'Marshall Islands',
+    'country_Palau' => 'Palau',
+    'country_Pakistan' => 'Pakistan',
+    'country_Panama' => 'Panama',
+    'country_Papua New Guinea' => 'Papua New Guinea',
+    'country_Paraguay' => 'Paraguay',
+    'country_Peru' => 'Peru',
+    'country_Philippines' => 'Philippines',
+    'country_Pitcairn' => 'Pitcairn',
+    'country_Poland' => 'Poland',
+    'country_Portugal' => 'Portugal',
+    'country_Guinea-Bissau' => 'Guinea-Bissau',
+    'country_Timor-Leste' => 'Timor-Leste',
+    'country_Puerto Rico' => 'Puerto Rico',
+    'country_Qatar' => 'Qatar',
+    'country_Réunion' => 'Réunion',
+    'country_Romania' => 'Romania',
+    'country_Russian Federation' => 'Russian Federation',
+    'country_Rwanda' => 'Rwanda',
+    'country_Saint Barthélemy' => 'Saint Barthélemy',
+    'country_Saint Helena, Ascension and Tristan da Cunha' => 'Saint Helena, Ascension and Tristan da Cunha',
+    'country_Saint Kitts and Nevis' => 'Saint Kitts and Nevis',
+    'country_Anguilla' => 'Anguilla',
+    'country_Saint Lucia' => 'Saint Lucia',
+    'country_Saint Martin (French part)' => 'Saint Martin (French part)',
+    'country_Saint Pierre and Miquelon' => 'Saint Pierre and Miquelon',
+    'country_Saint Vincent and the Grenadines' => 'Saint Vincent and the Grenadines',
+    'country_San Marino' => 'San Marino',
+    'country_Sao Tome and Principe' => 'Sao Tome and Principe',
+    'country_Saudi Arabia' => 'Saudi Arabia',
+    'country_Senegal' => 'Senegal',
+    'country_Serbia' => 'Serbia',
+    'country_Seychelles' => 'Seychelles',
+    'country_Sierra Leone' => 'Sierra Leone',
+    'country_Singapore' => 'Singapore',
+    'country_Slovakia' => 'Slovakia',
+    'country_Viet Nam' => 'Viet Nam',
+    'country_Slovenia' => 'Slovenia',
+    'country_Somalia' => 'Somalia',
+    'country_South Africa' => 'South Africa',
+    'country_Zimbabwe' => 'Zimbabwe',
+    'country_Spain' => 'Spain',
+    'country_South Sudan' => 'South Sudan',
+    'country_Sudan' => 'Sudan',
+    'country_Western Sahara' => 'Western Sahara',
+    'country_Suriname' => 'Suriname',
+    'country_Svalbard and Jan Mayen' => 'Svalbard and Jan Mayen',
+    'country_Swaziland' => 'Swaziland',
+    'country_Sweden' => 'Sweden',
+    'country_Switzerland' => 'Switzerland',
+    'country_Syrian Arab Republic' => 'Syrian Arab Republic',
+    'country_Tajikistan' => 'Tajikistan',
+    'country_Thailand' => 'Thailand',
+    'country_Togo' => 'Togo',
+    'country_Tokelau' => 'Tokelau',
+    'country_Tonga' => 'Tonga',
+    'country_Trinidad and Tobago' => 'Trinidad and Tobago',
+    'country_United Arab Emirates' => 'United Arab Emirates',
+    'country_Tunisia' => 'Tunisia',
+    'country_Turkey' => 'Turkey',
+    'country_Turkmenistan' => 'Turkmenistan',
+    'country_Turks and Caicos Islands' => 'Turks and Caicos Islands',
+    'country_Tuvalu' => 'Tuvalu',
+    'country_Uganda' => 'Uganda',
+    '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_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_Virgin Islands, U.S.' => 'Virgin Islands, U.S.',
+    'country_Burkina Faso' => 'Burkina Faso',
+    'country_Uruguay' => 'Uruguay',
+    'country_Uzbekistan' => 'Uzbekistan',
+    'country_Venezuela, Bolivarian Republic of' => 'Venezuela, Bolivarian Republic of',
+    'country_Wallis and Futuna' => 'Wallis and Futuna',
+    'country_Samoa' => 'Samoa',
+    'country_Yemen' => 'Yemen',
+    'country_Zambi' => 'Zambi',
+
+    'view_client_portal' => 'View client portal',
+    'view_portal' => 'View Portal',
+    'vendor_contacts' => 'Vendor Contacts',
+    'all' => 'All',
+    'selected' => 'Selected',
+    'category' => 'Category',
+    'categories' => 'Categories',
+    'new_expense_category' => 'New Expense Category',
+    'edit_category' => 'Edit Category',
+    'archive_expense_category' => 'Archive Category',
+    'expense_categories' => 'Expense Categories',
+    'list_expense_categories' => 'List Expense Categories',
+    'updated_expense_category' => 'Successfully updated expense category',
+    'created_expense_category' => 'Successfully created expense category',
+    'archived_expense_category' => 'Successfully archived expense category',
+    'archived_expense_categories' => 'Successfully archived :count expense category',
+    'restore_expense_category' => 'Restore expense category',
+    'restored_expense_category' => 'Successfully restored expense category',
+    'apply_taxes' => 'Apply taxes',
+    'min_to_max_users' => ':min to :max users',
+    'max_users_reached' => 'The maximum number of users has been reached.',
+    'buy_now_buttons' => 'Buy Now Buttons',
+    'landing_page' => 'Landing Page',
+    'payment_type' => 'Payment Type',
+    'form' => 'Form',
+    'link' => 'Link',
+    'fields' => 'Fields',
+    'dwolla' => 'Dwolla',
+    'buy_now_buttons_warning' => 'Note: client and invoice records are created even if the transaction isn\'t completed.',
+    'buy_now_buttons_disabled' => 'This feature requires that a product is created and a payment gateway is configured.',
+    'enable_buy_now_buttons_help' => 'Enable support for buy now buttons',
+    'changes_take_effect_immediately' => 'Note: changes take effect immediately',
+    'wepay_account_description' => 'Payment gateway for Invoice Ninja',
+    'payment_error_code' => 'There was an error processing your payment [:code]. Please try again later.',
+    'standard_fees_apply' => 'Standard fees apply: 2.9% + $0.30 per successful charge.',
+    'limit_import_rows' => 'Data needs to be imported in batches of :count rows or less',
+
 
 );
 

resources/lang/pl/texts.php

@@ -1,6 +1,7 @@
 <?php
 
 $LANG = array(
+
     'organization' => 'Organizacja',
     'name' => 'Nazwa',
     'website' => 'Strona internetowa',
@@ -386,7 +387,7 @@ $LANG = array(
     'gateway_help_1' => ':link to sign up for Authorize.net.',
     'gateway_help_2' => ':link to sign up for Authorize.net.',
     'gateway_help_17' => ':link to get your PayPal API signature.',
-    'gateway_help_27' => ':link to sign up for TwoCheckout.',
+    'gateway_help_27' => ':link to sign up for 2Checkout.com. To ensure payments are tracked set :complete_link as the redirect URL under Account > Site Management in the 2Checkout portal.',
     'more_designs' => 'Więcej motywów',
     'more_designs_title' => 'Dodatkowe motywy faktur',
     'more_designs_cloud_header' => 'Więcej motywów faktur w wersji PRO',
@@ -773,6 +774,8 @@ $LANG = array(
     'activity_35' => ':user created :vendor',
     'activity_36' => ':user created :vendor',
     'activity_37' => ':user created :vendor',
+    'activity_42' => ':user created task ":task"',
+    'activity_43' => ':user updated task ":task"',
     'payment' => 'Payment',
     'system' => 'System',
     'signature' => 'Podpis e-mail',
@@ -992,7 +995,7 @@ $LANG = array(
     'overdue' => 'Zaległy',
 
 
-    'white_label_text' => 'Kup white label licencję na JEDEN ROK za $:price aby usunąć z portalu klienta logo Invoice Ninja i wesprzeć nasz projekt.',
+    'white_label_text' => 'Purchase a ONE YEAR white label license for $:price to remove the Invoice Ninja branding and help support our project.',
     'user_email_footer' => 'Aby dostosować ustawienia powiadomień email, zobacz :link',
     'reset_password_footer' => 'If you did not request this password reset please email our support: :email',
     'limit_users' => 'Sorry, this will exceed the limit of :limit users',
@@ -1293,7 +1296,7 @@ $LANG = array(
     'wepay_tos_agree' => 'Zgadzam się z :link',
     'wepay_tos_link_text' => 'WePay Terms of Service',
     'resend_confirmation_email' => 'Wyślij ponownie email potwierdzający',
-    'manage_wepay_account' => 'Manage WePay Account',
+    'manage_account' => 'Manage Account',
     'action_required' => 'Action Required',
     'finish_setup' => 'Zakończ konfigurację',
     'created_wepay_confirmation_required' => 'Please check your email and confirm your email address with WePay.',
@@ -1361,6 +1364,686 @@ $LANG = array(
     'failed_remove_payment_method' => 'Failed to remove the payment method',
     'gateway_exists' => 'This gateway already exists',
     'manual_entry' => 'Manual entry',
+    'start_of_week' => 'First day of the week',
+
+    // Frequencies
+    'freq_weekly' => 'Weekly',
+    'freq_two_weeks' => 'Two weeks',
+    'freq_four_weeks' => 'Four weeks',
+    'freq_monthly' => 'Monthly',
+    'freq_three_months' => 'Three months',
+    'freq_six_months' => 'Six months',
+    'freq_annually' => 'Annually',
+
+    // Payment types
+    'payment_type_Apply Credit' => 'Apply Credit',
+    'payment_type_Bank Transfer' => 'Bank Transfer',
+    'payment_type_Cash' => 'Cash',
+    'payment_type_Debit' => 'Debit',
+    'payment_type_ACH' => 'ACH',
+    'payment_type_Visa Card' => 'Visa Card',
+    'payment_type_MasterCard' => 'MasterCard',
+    'payment_type_American Express' => 'American Express',
+    'payment_type_Discover Card' => 'Discover Card',
+    'payment_type_Diners Card' => 'Diners Card',
+    'payment_type_EuroCard' => 'EuroCard',
+    'payment_type_Nova' => 'Nova',
+    'payment_type_Credit Card Other' => 'Credit Card Other',
+    'payment_type_PayPal' => 'PayPal',
+    'payment_type_Google Wallet' => 'Google Wallet',
+    'payment_type_Check' => 'Check',
+
+    // Industries
+    'industry_Accounting & Legal' => 'Accounting & Legal',
+    'industry_Advertising' => 'Advertising',
+    'industry_Aerospace' => 'Aerospace',
+    'industry_Agriculture' => 'Agriculture',
+    'industry_Automotive' => 'Automotive',
+    'industry_Banking & Finance' => 'Banking & Finance',
+    'industry_Biotechnology' => 'Biotechnology',
+    'industry_Broadcasting' => 'Broadcasting',
+    'industry_Business Services' => 'Business Services',
+    'industry_Commodities & Chemicals' => 'Commodities & Chemicals',
+    'industry_Communications' => 'Communications',
+    'industry_Computers & Hightech' => 'Computers & Hightech',
+    'industry_Defense' => 'Defense',
+    'industry_Energy' => 'Energy',
+    'industry_Entertainment' => 'Entertainment',
+    'industry_Government' => 'Government',
+    'industry_Healthcare & Life Sciences' => 'Healthcare & Life Sciences',
+    'industry_Insurance' => 'Insurance',
+    'industry_Manufacturing' => 'Manufacturing',
+    'industry_Marketing' => 'Marketing',
+    'industry_Media' => 'Media',
+    'industry_Nonprofit & Higher Ed' => 'Nonprofit & Higher Ed',
+    'industry_Pharmaceuticals' => 'Pharmaceuticals',
+    'industry_Professional Services & Consulting' => 'Professional Services & Consulting',
+    'industry_Real Estate' => 'Real Estate',
+    'industry_Retail & Wholesale' => 'Retail & Wholesale',
+    'industry_Sports' => 'Sports',
+    'industry_Transportation' => 'Transportation',
+    'industry_Travel & Luxury' => 'Travel & Luxury',
+    'industry_Other' => 'Other',
+    'industry_Photography' =>'Photography',
+
+    // Countries
+    'country_Afghanistan' => 'Afghanistan',
+    'country_Albania' => 'Albania',
+    'country_Antarctica' => 'Antarctica',
+    'country_Algeria' => 'Algeria',
+    'country_American Samoa' => 'American Samoa',
+    'country_Andorra' => 'Andorra',
+    'country_Angola' => 'Angola',
+    'country_Antigua and Barbuda' => 'Antigua and Barbuda',
+    'country_Azerbaijan' => 'Azerbaijan',
+    'country_Argentina' => 'Argentina',
+    'country_Australia' => 'Australia',
+    'country_Austria' => 'Austria',
+    'country_Bahamas' => 'Bahamas',
+    'country_Bahrain' => 'Bahrain',
+    'country_Bangladesh' => 'Bangladesh',
+    'country_Armenia' => 'Armenia',
+    'country_Barbados' => 'Barbados',
+    'country_Belgium' => 'Belgium',
+    'country_Bermuda' => 'Bermuda',
+    'country_Bhutan' => 'Bhutan',
+    'country_Bolivia, Plurinational State of' => 'Bolivia, Plurinational State of',
+    'country_Bosnia and Herzegovina' => 'Bosnia and Herzegovina',
+    'country_Botswana' => 'Botswana',
+    'country_Bouvet Island' => 'Bouvet Island',
+    'country_Brazil' => 'Brazil',
+    'country_Belize' => 'Belize',
+    'country_British Indian Ocean Territory' => 'British Indian Ocean Territory',
+    'country_Solomon Islands' => 'Solomon Islands',
+    'country_Virgin Islands, British' => 'Virgin Islands, British',
+    'country_Brunei Darussalam' => 'Brunei Darussalam',
+    'country_Bulgaria' => 'Bulgaria',
+    'country_Myanmar' => 'Myanmar',
+    'country_Burundi' => 'Burundi',
+    'country_Belarus' => 'Belarus',
+    'country_Cambodia' => 'Cambodia',
+    'country_Cameroon' => 'Cameroon',
+    'country_Canada' => 'Canada',
+    'country_Cape Verde' => 'Cape Verde',
+    'country_Cayman Islands' => 'Cayman Islands',
+    'country_Central African Republic' => 'Central African Republic',
+    'country_Sri Lanka' => 'Sri Lanka',
+    'country_Chad' => 'Chad',
+    'country_Chile' => 'Chile',
+    'country_China' => 'China',
+    'country_Taiwan, Province of China' => 'Taiwan, Province of China',
+    'country_Christmas Island' => 'Christmas Island',
+    'country_Cocos (Keeling) Islands' => 'Cocos (Keeling) Islands',
+    'country_Colombia' => 'Colombia',
+    'country_Comoros' => 'Comoros',
+    'country_Mayotte' => 'Mayotte',
+    'country_Congo' => 'Congo',
+    'country_Congo, the Democratic Republic of the' => 'Congo, the Democratic Republic of the',
+    'country_Cook Islands' => 'Cook Islands',
+    'country_Costa Rica' => 'Costa Rica',
+    'country_Croatia' => 'Croatia',
+    'country_Cuba' => 'Cuba',
+    'country_Cyprus' => 'Cyprus',
+    'country_Czech Republic' => 'Czech Republic',
+    'country_Benin' => 'Benin',
+    'country_Denmark' => 'Denmark',
+    'country_Dominica' => 'Dominica',
+    'country_Dominican Republic' => 'Dominican Republic',
+    'country_Ecuador' => 'Ecuador',
+    'country_El Salvador' => 'El Salvador',
+    'country_Equatorial Guinea' => 'Equatorial Guinea',
+    'country_Ethiopia' => 'Ethiopia',
+    'country_Eritrea' => 'Eritrea',
+    'country_Estonia' => 'Estonia',
+    'country_Faroe Islands' => 'Faroe Islands',
+    'country_Falkland Islands (Malvinas)' => 'Falkland Islands (Malvinas)',
+    'country_South Georgia and the South Sandwich Islands' => 'South Georgia and the South Sandwich Islands',
+    'country_Fiji' => 'Fiji',
+    'country_Finland' => 'Finland',
+    'country_Åland Islands' => 'Åland Islands',
+    'country_France' => 'France',
+    'country_French Guiana' => 'French Guiana',
+    'country_French Polynesia' => 'French Polynesia',
+    'country_French Southern Territories' => 'French Southern Territories',
+    'country_Djibouti' => 'Djibouti',
+    'country_Gabon' => 'Gabon',
+    'country_Georgia' => 'Georgia',
+    'country_Gambia' => 'Gambia',
+    'country_Palestinian Territory, Occupied' => 'Palestinian Territory, Occupied',
+    'country_Germany' => 'Germany',
+    'country_Ghana' => 'Ghana',
+    'country_Gibraltar' => 'Gibraltar',
+    'country_Kiribati' => 'Kiribati',
+    'country_Greece' => 'Greece',
+    'country_Greenland' => 'Greenland',
+    'country_Grenada' => 'Grenada',
+    'country_Guadeloupe' => 'Guadeloupe',
+    'country_Guam' => 'Guam',
+    'country_Guatemala' => 'Guatemala',
+    'country_Guinea' => 'Guinea',
+    'country_Guyana' => 'Guyana',
+    'country_Haiti' => 'Haiti',
+    'country_Heard Island and McDonald Islands' => 'Heard Island and McDonald Islands',
+    'country_Holy See (Vatican City State)' => 'Holy See (Vatican City State)',
+    'country_Honduras' => 'Honduras',
+    'country_Hong Kong' => 'Hong Kong',
+    'country_Hungary' => 'Hungary',
+    'country_Iceland' => 'Iceland',
+    'country_India' => 'India',
+    'country_Indonesia' => 'Indonesia',
+    'country_Iran, Islamic Republic of' => 'Iran, Islamic Republic of',
+    'country_Iraq' => 'Iraq',
+    'country_Ireland' => 'Ireland',
+    'country_Israel' => 'Israel',
+    'country_Italy' => 'Italy',
+    'country_Côte d\'Ivoire' => 'Côte d\'Ivoire',
+    'country_Jamaica' => 'Jamaica',
+    'country_Japan' => 'Japan',
+    'country_Kazakhstan' => 'Kazakhstan',
+    'country_Jordan' => 'Jordan',
+    'country_Kenya' => 'Kenya',
+    'country_Korea, Democratic People\'s Republic of' => 'Korea, Democratic People\'s Republic of',
+    'country_Korea, Republic of' => 'Korea, Republic of',
+    'country_Kuwait' => 'Kuwait',
+    'country_Kyrgyzstan' => 'Kyrgyzstan',
+    'country_Lao People\'s Democratic Republic' => 'Lao People\'s Democratic Republic',
+    'country_Lebanon' => 'Lebanon',
+    'country_Lesotho' => 'Lesotho',
+    'country_Latvia' => 'Latvia',
+    'country_Liberia' => 'Liberia',
+    'country_Libya' => 'Libya',
+    'country_Liechtenstein' => 'Liechtenstein',
+    'country_Lithuania' => 'Lithuania',
+    'country_Luxembourg' => 'Luxembourg',
+    'country_Macao' => 'Macao',
+    'country_Madagascar' => 'Madagascar',
+    'country_Malawi' => 'Malawi',
+    'country_Malaysia' => 'Malaysia',
+    'country_Maldives' => 'Maldives',
+    'country_Mali' => 'Mali',
+    'country_Malta' => 'Malta',
+    'country_Martinique' => 'Martinique',
+    'country_Mauritania' => 'Mauritania',
+    'country_Mauritius' => 'Mauritius',
+    'country_Mexico' => 'Mexico',
+    'country_Monaco' => 'Monaco',
+    'country_Mongolia' => 'Mongolia',
+    'country_Moldova, Republic of' => 'Moldova, Republic of',
+    'country_Montenegro' => 'Montenegro',
+    'country_Montserrat' => 'Montserrat',
+    'country_Morocco' => 'Morocco',
+    'country_Mozambique' => 'Mozambique',
+    'country_Oman' => 'Oman',
+    'country_Namibia' => 'Namibia',
+    'country_Nauru' => 'Nauru',
+    'country_Nepal' => 'Nepal',
+    'country_Netherlands' => 'Netherlands',
+    'country_Curaçao' => 'Curaçao',
+    'country_Aruba' => 'Aruba',
+    'country_Sint Maarten (Dutch part)' => 'Sint Maarten (Dutch part)',
+    'country_Bonaire, Sint Eustatius and Saba' => 'Bonaire, Sint Eustatius and Saba',
+    'country_New Caledonia' => 'New Caledonia',
+    'country_Vanuatu' => 'Vanuatu',
+    'country_New Zealand' => 'New Zealand',
+    'country_Nicaragua' => 'Nicaragua',
+    'country_Niger' => 'Niger',
+    'country_Nigeria' => 'Nigeria',
+    'country_Niue' => 'Niue',
+    'country_Norfolk Island' => 'Norfolk Island',
+    'country_Norway' => 'Norway',
+    'country_Northern Mariana Islands' => 'Northern Mariana Islands',
+    'country_United States Minor Outlying Islands' => 'United States Minor Outlying Islands',
+    'country_Micronesia, Federated States of' => 'Micronesia, Federated States of',
+    'country_Marshall Islands' => 'Marshall Islands',
+    'country_Palau' => 'Palau',
+    'country_Pakistan' => 'Pakistan',
+    'country_Panama' => 'Panama',
+    'country_Papua New Guinea' => 'Papua New Guinea',
+    'country_Paraguay' => 'Paraguay',
+    'country_Peru' => 'Peru',
+    'country_Philippines' => 'Philippines',
+    'country_Pitcairn' => 'Pitcairn',
+    'country_Poland' => 'Poland',
+    'country_Portugal' => 'Portugal',
+    'country_Guinea-Bissau' => 'Guinea-Bissau',
+    'country_Timor-Leste' => 'Timor-Leste',
+    'country_Puerto Rico' => 'Puerto Rico',
+    'country_Qatar' => 'Qatar',
+    'country_Réunion' => 'Réunion',
+    'country_Romania' => 'Romania',
+    'country_Russian Federation' => 'Russian Federation',
+    'country_Rwanda' => 'Rwanda',
+    'country_Saint Barthélemy' => 'Saint Barthélemy',
+    'country_Saint Helena, Ascension and Tristan da Cunha' => 'Saint Helena, Ascension and Tristan da Cunha',
+    'country_Saint Kitts and Nevis' => 'Saint Kitts and Nevis',
+    'country_Anguilla' => 'Anguilla',
+    'country_Saint Lucia' => 'Saint Lucia',
+    'country_Saint Martin (French part)' => 'Saint Martin (French part)',
+    'country_Saint Pierre and Miquelon' => 'Saint Pierre and Miquelon',
+    'country_Saint Vincent and the Grenadines' => 'Saint Vincent and the Grenadines',
+    'country_San Marino' => 'San Marino',
+    'country_Sao Tome and Principe' => 'Sao Tome and Principe',
+    'country_Saudi Arabia' => 'Saudi Arabia',
+    'country_Senegal' => 'Senegal',
+    'country_Serbia' => 'Serbia',
+    'country_Seychelles' => 'Seychelles',
+    'country_Sierra Leone' => 'Sierra Leone',
+    'country_Singapore' => 'Singapore',
+    'country_Slovakia' => 'Slovakia',
+    'country_Viet Nam' => 'Viet Nam',
+    'country_Slovenia' => 'Slovenia',
+    'country_Somalia' => 'Somalia',
+    'country_South Africa' => 'South Africa',
+    'country_Zimbabwe' => 'Zimbabwe',
+    'country_Spain' => 'Spain',
+    'country_South Sudan' => 'South Sudan',
+    'country_Sudan' => 'Sudan',
+    'country_Western Sahara' => 'Western Sahara',
+    'country_Suriname' => 'Suriname',
+    'country_Svalbard and Jan Mayen' => 'Svalbard and Jan Mayen',
+    'country_Swaziland' => 'Swaziland',
+    'country_Sweden' => 'Sweden',
+    'country_Switzerland' => 'Switzerland',
+    'country_Syrian Arab Republic' => 'Syrian Arab Republic',
+    'country_Tajikistan' => 'Tajikistan',
+    'country_Thailand' => 'Thailand',
+    'country_Togo' => 'Togo',
+    'country_Tokelau' => 'Tokelau',
+    'country_Tonga' => 'Tonga',
+    'country_Trinidad and Tobago' => 'Trinidad and Tobago',
+    'country_United Arab Emirates' => 'United Arab Emirates',
+    'country_Tunisia' => 'Tunisia',
+    'country_Turkey' => 'Turkey',
+    'country_Turkmenistan' => 'Turkmenistan',
+    'country_Turks and Caicos Islands' => 'Turks and Caicos Islands',
+    'country_Tuvalu' => 'Tuvalu',
+    'country_Uganda' => 'Uganda',
+    '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_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_Virgin Islands, U.S.' => 'Virgin Islands, U.S.',
+    'country_Burkina Faso' => 'Burkina Faso',
+    'country_Uruguay' => 'Uruguay',
+    'country_Uzbekistan' => 'Uzbekistan',
+    'country_Venezuela, Bolivarian Republic of' => 'Venezuela, Bolivarian Republic of',
+    'country_Wallis and Futuna' => 'Wallis and Futuna',
+    'country_Samoa' => 'Samoa',
+    'country_Yemen' => 'Yemen',
+    'country_Zambi' => 'Zambi',
+
+    // Languages
+    'lang_Brazilian Portuguese' => 'Brazilian Portuguese',
+    'lang_Croatian' => 'Croatian',
+    'lang_Czech' => 'Czech',
+    'lang_Danish' => 'Danish',
+    'lang_Dutch' => 'Dutch',
+    'lang_English' => 'English',
+    'lang_French' => 'French',
+    'lang_French - Canada' => 'French - Canada',
+    'lang_German' => 'German',
+    'lang_Italian' => 'Italian',
+    'lang_Japanese' => 'Japanese',
+    'lang_Lithuanian' => 'Lithuanian',
+    'lang_Norwegian' => 'Norwegian',
+    'lang_Polish' => 'Polish',
+    'lang_Spanish' => 'Spanish',
+    'lang_Spanish - Spain' => 'Spanish - Spain',
+    'lang_Swedish' => 'Swedish',
+
+    // Frequencies
+    'freq_weekly' => 'Weekly',
+    'freq_two_weeks' => 'Two weeks',
+    'freq_four_weeks' => 'Four weeks',
+    'freq_monthly' => 'Monthly',
+    'freq_three_months' => 'Three months',
+    'freq_six_months' => 'Six months',
+    'freq_annually' => 'Annually',
+
+    // Payment types
+    'payment_type_Apply Credit' => 'Apply Credit',
+    'payment_type_Bank Transfer' => 'Bank Transfer',
+    'payment_type_Cash' => 'Cash',
+    'payment_type_Debit' => 'Debit',
+    'payment_type_ACH' => 'ACH',
+    'payment_type_Visa Card' => 'Visa Card',
+    'payment_type_MasterCard' => 'MasterCard',
+    'payment_type_American Express' => 'American Express',
+    'payment_type_Discover Card' => 'Discover Card',
+    'payment_type_Diners Card' => 'Diners Card',
+    'payment_type_EuroCard' => 'EuroCard',
+    'payment_type_Nova' => 'Nova',
+    'payment_type_Credit Card Other' => 'Credit Card Other',
+    'payment_type_PayPal' => 'PayPal',
+    'payment_type_Google Wallet' => 'Google Wallet',
+    'payment_type_Check' => 'Check',
+
+    // Industries
+    'industry_Accounting & Legal' => 'Accounting & Legal',
+    'industry_Advertising' => 'Advertising',
+    'industry_Aerospace' => 'Aerospace',
+    'industry_Agriculture' => 'Agriculture',
+    'industry_Automotive' => 'Automotive',
+    'industry_Banking & Finance' => 'Banking & Finance',
+    'industry_Biotechnology' => 'Biotechnology',
+    'industry_Broadcasting' => 'Broadcasting',
+    'industry_Business Services' => 'Business Services',
+    'industry_Commodities & Chemicals' => 'Commodities & Chemicals',
+    'industry_Communications' => 'Communications',
+    'industry_Computers & Hightech' => 'Computers & Hightech',
+    'industry_Defense' => 'Defense',
+    'industry_Energy' => 'Energy',
+    'industry_Entertainment' => 'Entertainment',
+    'industry_Government' => 'Government',
+    'industry_Healthcare & Life Sciences' => 'Healthcare & Life Sciences',
+    'industry_Insurance' => 'Insurance',
+    'industry_Manufacturing' => 'Manufacturing',
+    'industry_Marketing' => 'Marketing',
+    'industry_Media' => 'Media',
+    'industry_Nonprofit & Higher Ed' => 'Nonprofit & Higher Ed',
+    'industry_Pharmaceuticals' => 'Pharmaceuticals',
+    'industry_Professional Services & Consulting' => 'Professional Services & Consulting',
+    'industry_Real Estate' => 'Real Estate',
+    'industry_Retail & Wholesale' => 'Retail & Wholesale',
+    'industry_Sports' => 'Sports',
+    'industry_Transportation' => 'Transportation',
+    'industry_Travel & Luxury' => 'Travel & Luxury',
+    'industry_Other' => 'Other',
+    'industry_Photography' =>'Photography',
+
+    // Countries
+    'country_Afghanistan' => 'Afghanistan',
+    'country_Albania' => 'Albania',
+    'country_Antarctica' => 'Antarctica',
+    'country_Algeria' => 'Algeria',
+    'country_American Samoa' => 'American Samoa',
+    'country_Andorra' => 'Andorra',
+    'country_Angola' => 'Angola',
+    'country_Antigua and Barbuda' => 'Antigua and Barbuda',
+    'country_Azerbaijan' => 'Azerbaijan',
+    'country_Argentina' => 'Argentina',
+    'country_Australia' => 'Australia',
+    'country_Austria' => 'Austria',
+    'country_Bahamas' => 'Bahamas',
+    'country_Bahrain' => 'Bahrain',
+    'country_Bangladesh' => 'Bangladesh',
+    'country_Armenia' => 'Armenia',
+    'country_Barbados' => 'Barbados',
+    'country_Belgium' => 'Belgium',
+    'country_Bermuda' => 'Bermuda',
+    'country_Bhutan' => 'Bhutan',
+    'country_Bolivia, Plurinational State of' => 'Bolivia, Plurinational State of',
+    'country_Bosnia and Herzegovina' => 'Bosnia and Herzegovina',
+    'country_Botswana' => 'Botswana',
+    'country_Bouvet Island' => 'Bouvet Island',
+    'country_Brazil' => 'Brazil',
+    'country_Belize' => 'Belize',
+    'country_British Indian Ocean Territory' => 'British Indian Ocean Territory',
+    'country_Solomon Islands' => 'Solomon Islands',
+    'country_Virgin Islands, British' => 'Virgin Islands, British',
+    'country_Brunei Darussalam' => 'Brunei Darussalam',
+    'country_Bulgaria' => 'Bulgaria',
+    'country_Myanmar' => 'Myanmar',
+    'country_Burundi' => 'Burundi',
+    'country_Belarus' => 'Belarus',
+    'country_Cambodia' => 'Cambodia',
+    'country_Cameroon' => 'Cameroon',
+    'country_Canada' => 'Canada',
+    'country_Cape Verde' => 'Cape Verde',
+    'country_Cayman Islands' => 'Cayman Islands',
+    'country_Central African Republic' => 'Central African Republic',
+    'country_Sri Lanka' => 'Sri Lanka',
+    'country_Chad' => 'Chad',
+    'country_Chile' => 'Chile',
+    'country_China' => 'China',
+    'country_Taiwan, Province of China' => 'Taiwan, Province of China',
+    'country_Christmas Island' => 'Christmas Island',
+    'country_Cocos (Keeling) Islands' => 'Cocos (Keeling) Islands',
+    'country_Colombia' => 'Colombia',
+    'country_Comoros' => 'Comoros',
+    'country_Mayotte' => 'Mayotte',
+    'country_Congo' => 'Congo',
+    'country_Congo, the Democratic Republic of the' => 'Congo, the Democratic Republic of the',
+    'country_Cook Islands' => 'Cook Islands',
+    'country_Costa Rica' => 'Costa Rica',
+    'country_Croatia' => 'Croatia',
+    'country_Cuba' => 'Cuba',
+    'country_Cyprus' => 'Cyprus',
+    'country_Czech Republic' => 'Czech Republic',
+    'country_Benin' => 'Benin',
+    'country_Denmark' => 'Denmark',
+    'country_Dominica' => 'Dominica',
+    'country_Dominican Republic' => 'Dominican Republic',
+    'country_Ecuador' => 'Ecuador',
+    'country_El Salvador' => 'El Salvador',
+    'country_Equatorial Guinea' => 'Equatorial Guinea',
+    'country_Ethiopia' => 'Ethiopia',
+    'country_Eritrea' => 'Eritrea',
+    'country_Estonia' => 'Estonia',
+    'country_Faroe Islands' => 'Faroe Islands',
+    'country_Falkland Islands (Malvinas)' => 'Falkland Islands (Malvinas)',
+    'country_South Georgia and the South Sandwich Islands' => 'South Georgia and the South Sandwich Islands',
+    'country_Fiji' => 'Fiji',
+    'country_Finland' => 'Finland',
+    'country_Åland Islands' => 'Åland Islands',
+    'country_France' => 'France',
+    'country_French Guiana' => 'French Guiana',
+    'country_French Polynesia' => 'French Polynesia',
+    'country_French Southern Territories' => 'French Southern Territories',
+    'country_Djibouti' => 'Djibouti',
+    'country_Gabon' => 'Gabon',
+    'country_Georgia' => 'Georgia',
+    'country_Gambia' => 'Gambia',
+    'country_Palestinian Territory, Occupied' => 'Palestinian Territory, Occupied',
+    'country_Germany' => 'Germany',
+    'country_Ghana' => 'Ghana',
+    'country_Gibraltar' => 'Gibraltar',
+    'country_Kiribati' => 'Kiribati',
+    'country_Greece' => 'Greece',
+    'country_Greenland' => 'Greenland',
+    'country_Grenada' => 'Grenada',
+    'country_Guadeloupe' => 'Guadeloupe',
+    'country_Guam' => 'Guam',
+    'country_Guatemala' => 'Guatemala',
+    'country_Guinea' => 'Guinea',
+    'country_Guyana' => 'Guyana',
+    'country_Haiti' => 'Haiti',
+    'country_Heard Island and McDonald Islands' => 'Heard Island and McDonald Islands',
+    'country_Holy See (Vatican City State)' => 'Holy See (Vatican City State)',
+    'country_Honduras' => 'Honduras',
+    'country_Hong Kong' => 'Hong Kong',
+    'country_Hungary' => 'Hungary',
+    'country_Iceland' => 'Iceland',
+    'country_India' => 'India',
+    'country_Indonesia' => 'Indonesia',
+    'country_Iran, Islamic Republic of' => 'Iran, Islamic Republic of',
+    'country_Iraq' => 'Iraq',
+    'country_Ireland' => 'Ireland',
+    'country_Israel' => 'Israel',
+    'country_Italy' => 'Italy',
+    'country_Côte d\'Ivoire' => 'Côte d\'Ivoire',
+    'country_Jamaica' => 'Jamaica',
+    'country_Japan' => 'Japan',
+    'country_Kazakhstan' => 'Kazakhstan',
+    'country_Jordan' => 'Jordan',
+    'country_Kenya' => 'Kenya',
+    'country_Korea, Democratic People\'s Republic of' => 'Korea, Democratic People\'s Republic of',
+    'country_Korea, Republic of' => 'Korea, Republic of',
+    'country_Kuwait' => 'Kuwait',
+    'country_Kyrgyzstan' => 'Kyrgyzstan',
+    'country_Lao People\'s Democratic Republic' => 'Lao People\'s Democratic Republic',
+    'country_Lebanon' => 'Lebanon',
+    'country_Lesotho' => 'Lesotho',
+    'country_Latvia' => 'Latvia',
+    'country_Liberia' => 'Liberia',
+    'country_Libya' => 'Libya',
+    'country_Liechtenstein' => 'Liechtenstein',
+    'country_Lithuania' => 'Lithuania',
+    'country_Luxembourg' => 'Luxembourg',
+    'country_Macao' => 'Macao',
+    'country_Madagascar' => 'Madagascar',
+    'country_Malawi' => 'Malawi',
+    'country_Malaysia' => 'Malaysia',
+    'country_Maldives' => 'Maldives',
+    'country_Mali' => 'Mali',
+    'country_Malta' => 'Malta',
+    'country_Martinique' => 'Martinique',
+    'country_Mauritania' => 'Mauritania',
+    'country_Mauritius' => 'Mauritius',
+    'country_Mexico' => 'Mexico',
+    'country_Monaco' => 'Monaco',
+    'country_Mongolia' => 'Mongolia',
+    'country_Moldova, Republic of' => 'Moldova, Republic of',
+    'country_Montenegro' => 'Montenegro',
+    'country_Montserrat' => 'Montserrat',
+    'country_Morocco' => 'Morocco',
+    'country_Mozambique' => 'Mozambique',
+    'country_Oman' => 'Oman',
+    'country_Namibia' => 'Namibia',
+    'country_Nauru' => 'Nauru',
+    'country_Nepal' => 'Nepal',
+    'country_Netherlands' => 'Netherlands',
+    'country_Curaçao' => 'Curaçao',
+    'country_Aruba' => 'Aruba',
+    'country_Sint Maarten (Dutch part)' => 'Sint Maarten (Dutch part)',
+    'country_Bonaire, Sint Eustatius and Saba' => 'Bonaire, Sint Eustatius and Saba',
+    'country_New Caledonia' => 'New Caledonia',
+    'country_Vanuatu' => 'Vanuatu',
+    'country_New Zealand' => 'New Zealand',
+    'country_Nicaragua' => 'Nicaragua',
+    'country_Niger' => 'Niger',
+    'country_Nigeria' => 'Nigeria',
+    'country_Niue' => 'Niue',
+    'country_Norfolk Island' => 'Norfolk Island',
+    'country_Norway' => 'Norway',
+    'country_Northern Mariana Islands' => 'Northern Mariana Islands',
+    'country_United States Minor Outlying Islands' => 'United States Minor Outlying Islands',
+    'country_Micronesia, Federated States of' => 'Micronesia, Federated States of',
+    'country_Marshall Islands' => 'Marshall Islands',
+    'country_Palau' => 'Palau',
+    'country_Pakistan' => 'Pakistan',
+    'country_Panama' => 'Panama',
+    'country_Papua New Guinea' => 'Papua New Guinea',
+    'country_Paraguay' => 'Paraguay',
+    'country_Peru' => 'Peru',
+    'country_Philippines' => 'Philippines',
+    'country_Pitcairn' => 'Pitcairn',
+    'country_Poland' => 'Poland',
+    'country_Portugal' => 'Portugal',
+    'country_Guinea-Bissau' => 'Guinea-Bissau',
+    'country_Timor-Leste' => 'Timor-Leste',
+    'country_Puerto Rico' => 'Puerto Rico',
+    'country_Qatar' => 'Qatar',
+    'country_Réunion' => 'Réunion',
+    'country_Romania' => 'Romania',
+    'country_Russian Federation' => 'Russian Federation',
+    'country_Rwanda' => 'Rwanda',
+    'country_Saint Barthélemy' => 'Saint Barthélemy',
+    'country_Saint Helena, Ascension and Tristan da Cunha' => 'Saint Helena, Ascension and Tristan da Cunha',
+    'country_Saint Kitts and Nevis' => 'Saint Kitts and Nevis',
+    'country_Anguilla' => 'Anguilla',
+    'country_Saint Lucia' => 'Saint Lucia',
+    'country_Saint Martin (French part)' => 'Saint Martin (French part)',
+    'country_Saint Pierre and Miquelon' => 'Saint Pierre and Miquelon',
+    'country_Saint Vincent and the Grenadines' => 'Saint Vincent and the Grenadines',
+    'country_San Marino' => 'San Marino',
+    'country_Sao Tome and Principe' => 'Sao Tome and Principe',
+    'country_Saudi Arabia' => 'Saudi Arabia',
+    'country_Senegal' => 'Senegal',
+    'country_Serbia' => 'Serbia',
+    'country_Seychelles' => 'Seychelles',
+    'country_Sierra Leone' => 'Sierra Leone',
+    'country_Singapore' => 'Singapore',
+    'country_Slovakia' => 'Slovakia',
+    'country_Viet Nam' => 'Viet Nam',
+    'country_Slovenia' => 'Slovenia',
+    'country_Somalia' => 'Somalia',
+    'country_South Africa' => 'South Africa',
+    'country_Zimbabwe' => 'Zimbabwe',
+    'country_Spain' => 'Spain',
+    'country_South Sudan' => 'South Sudan',
+    'country_Sudan' => 'Sudan',
+    'country_Western Sahara' => 'Western Sahara',
+    'country_Suriname' => 'Suriname',
+    'country_Svalbard and Jan Mayen' => 'Svalbard and Jan Mayen',
+    'country_Swaziland' => 'Swaziland',
+    'country_Sweden' => 'Sweden',
+    'country_Switzerland' => 'Switzerland',
+    'country_Syrian Arab Republic' => 'Syrian Arab Republic',
+    'country_Tajikistan' => 'Tajikistan',
+    'country_Thailand' => 'Thailand',
+    'country_Togo' => 'Togo',
+    'country_Tokelau' => 'Tokelau',
+    'country_Tonga' => 'Tonga',
+    'country_Trinidad and Tobago' => 'Trinidad and Tobago',
+    'country_United Arab Emirates' => 'United Arab Emirates',
+    'country_Tunisia' => 'Tunisia',
+    'country_Turkey' => 'Turkey',
+    'country_Turkmenistan' => 'Turkmenistan',
+    'country_Turks and Caicos Islands' => 'Turks and Caicos Islands',
+    'country_Tuvalu' => 'Tuvalu',
+    'country_Uganda' => 'Uganda',
+    '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_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_Virgin Islands, U.S.' => 'Virgin Islands, U.S.',
+    'country_Burkina Faso' => 'Burkina Faso',
+    'country_Uruguay' => 'Uruguay',
+    'country_Uzbekistan' => 'Uzbekistan',
+    'country_Venezuela, Bolivarian Republic of' => 'Venezuela, Bolivarian Republic of',
+    'country_Wallis and Futuna' => 'Wallis and Futuna',
+    'country_Samoa' => 'Samoa',
+    'country_Yemen' => 'Yemen',
+    'country_Zambi' => 'Zambi',
+
+    'view_client_portal' => 'View client portal',
+    'view_portal' => 'View Portal',
+    'vendor_contacts' => 'Vendor Contacts',
+    'all' => 'All',
+    'selected' => 'Selected',
+    'category' => 'Category',
+    'categories' => 'Categories',
+    'new_expense_category' => 'New Expense Category',
+    'edit_category' => 'Edit Category',
+    'archive_expense_category' => 'Archive Category',
+    'expense_categories' => 'Expense Categories',
+    'list_expense_categories' => 'List Expense Categories',
+    'updated_expense_category' => 'Successfully updated expense category',
+    'created_expense_category' => 'Successfully created expense category',
+    'archived_expense_category' => 'Successfully archived expense category',
+    'archived_expense_categories' => 'Successfully archived :count expense category',
+    'restore_expense_category' => 'Restore expense category',
+    'restored_expense_category' => 'Successfully restored expense category',
+    'apply_taxes' => 'Apply taxes',
+    'min_to_max_users' => ':min to :max users',
+    'max_users_reached' => 'The maximum number of users has been reached.',
+    'buy_now_buttons' => 'Buy Now Buttons',
+    'landing_page' => 'Landing Page',
+    'payment_type' => 'Payment Type',
+    'form' => 'Form',
+    'link' => 'Link',
+    'fields' => 'Fields',
+    'dwolla' => 'Dwolla',
+    'buy_now_buttons_warning' => 'Note: client and invoice records are created even if the transaction isn\'t completed.',
+    'buy_now_buttons_disabled' => 'This feature requires that a product is created and a payment gateway is configured.',
+    'enable_buy_now_buttons_help' => 'Enable support for buy now buttons',
+    'changes_take_effect_immediately' => 'Note: changes take effect immediately',
+    'wepay_account_description' => 'Payment gateway for Invoice Ninja',
+    'payment_error_code' => 'There was an error processing your payment [:code]. Please try again later.',
+    'standard_fees_apply' => 'Standard fees apply: 2.9% + $0.30 per successful charge.',
+    'limit_import_rows' => 'Data needs to be imported in batches of :count rows or less',
+
 
 );
 

resources/lang/pt_BR/texts.php

@@ -1,6 +1,7 @@
 <?php
 
 $LANG = array(
+
     'organization' => 'Organização',
     'name' => 'Nome',
     'website' => 'Website',
@@ -380,7 +381,7 @@ $LANG = array(
     'gateway_help_1' => ':link para acessar Authorize.net.',
     'gateway_help_2' => ':link para acessar Authorize.net.',
     'gateway_help_17' => ':link para adquirir sua "PayPal API signature".',
-    'gateway_help_27' => ':link para acessar TwoCheckout.',
+    'gateway_help_27' => ':link to sign up for 2Checkout.com. To ensure payments are tracked set :complete_link as the redirect URL under Account > Site Management in the 2Checkout portal.',
     'more_designs' => 'Mais Modelos',
     'more_designs_title' => 'Modelo Adicionais',
     'more_designs_cloud_header' => 'Adquira o Plano Pro para mais modelos',
@@ -767,6 +768,8 @@ $LANG = array(
     'activity_35' => ':user criou :vendor',
     'activity_36' => ':user criou :vendor',
     'activity_37' => ':user criou :vendor',
+    'activity_42' => ':user created task ":task"',
+    'activity_43' => ':user updated task ":task"',
     'payment' => 'Pagamento',
     'system' => 'Sistema',
     'signature' => 'Assinatura do E-mail',
@@ -983,7 +986,7 @@ $LANG = array(
     'overdue' => 'Vencido',
 
 
-    'white_label_text' => 'Adquira UM ano de licença white label por $:price para remover a marca Invoice Ninja  do portal do cliente e ajudar nosso projeto.',
+    'white_label_text' => 'Purchase a ONE YEAR white label license for $:price to remove the Invoice Ninja branding and help support our project.',
     'user_email_footer' => 'Para ajustar suas configurações de notificações de e-mail acesse :link',
     'reset_password_footer' => 'Se você não solicitou a redefinição de sua senha por favor envie um e-mail para o nosso suporte: :email',
     'limit_users' => 'Desculpe, isto irá exceder o limite de :limit usuários',
@@ -1284,7 +1287,7 @@ Quando tiver os valores dos depósitos, volte a esta pagina e complete a verific
     'wepay_tos_agree' => 'Concordo com :link.',
     'wepay_tos_link_text' => 'Termos de Serviço do WePay',
     'resend_confirmation_email' => 'Reenviar e-Mail de Confirmação',
-    'manage_wepay_account' => 'Gerenciar Conta WePay',
+    'manage_account' => 'Manage Account',
     'action_required' => 'Ação Obrigatória',
     'finish_setup' => 'Finalizar Configuração',
     'created_wepay_confirmation_required' => 'Por favor verifique seu e-mail e confirme seu endereço de e-mail com o WePay',
@@ -1352,6 +1355,686 @@ Quando tiver os valores dos depósitos, volte a esta pagina e complete a verific
     'failed_remove_payment_method' => 'Failed to remove the payment method',
     'gateway_exists' => 'This gateway already exists',
     'manual_entry' => 'Manual entry',
+    'start_of_week' => 'First day of the week',
+
+    // Frequencies
+    'freq_weekly' => 'Weekly',
+    'freq_two_weeks' => 'Two weeks',
+    'freq_four_weeks' => 'Four weeks',
+    'freq_monthly' => 'Monthly',
+    'freq_three_months' => 'Three months',
+    'freq_six_months' => 'Six months',
+    'freq_annually' => 'Annually',
+
+    // Payment types
+    'payment_type_Apply Credit' => 'Apply Credit',
+    'payment_type_Bank Transfer' => 'Bank Transfer',
+    'payment_type_Cash' => 'Cash',
+    'payment_type_Debit' => 'Debit',
+    'payment_type_ACH' => 'ACH',
+    'payment_type_Visa Card' => 'Visa Card',
+    'payment_type_MasterCard' => 'MasterCard',
+    'payment_type_American Express' => 'American Express',
+    'payment_type_Discover Card' => 'Discover Card',
+    'payment_type_Diners Card' => 'Diners Card',
+    'payment_type_EuroCard' => 'EuroCard',
+    'payment_type_Nova' => 'Nova',
+    'payment_type_Credit Card Other' => 'Credit Card Other',
+    'payment_type_PayPal' => 'PayPal',
+    'payment_type_Google Wallet' => 'Google Wallet',
+    'payment_type_Check' => 'Check',
+
+    // Industries
+    'industry_Accounting & Legal' => 'Accounting & Legal',
+    'industry_Advertising' => 'Advertising',
+    'industry_Aerospace' => 'Aerospace',
+    'industry_Agriculture' => 'Agriculture',
+    'industry_Automotive' => 'Automotive',
+    'industry_Banking & Finance' => 'Banking & Finance',
+    'industry_Biotechnology' => 'Biotechnology',
+    'industry_Broadcasting' => 'Broadcasting',
+    'industry_Business Services' => 'Business Services',
+    'industry_Commodities & Chemicals' => 'Commodities & Chemicals',
+    'industry_Communications' => 'Communications',
+    'industry_Computers & Hightech' => 'Computers & Hightech',
+    'industry_Defense' => 'Defense',
+    'industry_Energy' => 'Energy',
+    'industry_Entertainment' => 'Entertainment',
+    'industry_Government' => 'Government',
+    'industry_Healthcare & Life Sciences' => 'Healthcare & Life Sciences',
+    'industry_Insurance' => 'Insurance',
+    'industry_Manufacturing' => 'Manufacturing',
+    'industry_Marketing' => 'Marketing',
+    'industry_Media' => 'Media',
+    'industry_Nonprofit & Higher Ed' => 'Nonprofit & Higher Ed',
+    'industry_Pharmaceuticals' => 'Pharmaceuticals',
+    'industry_Professional Services & Consulting' => 'Professional Services & Consulting',
+    'industry_Real Estate' => 'Real Estate',
+    'industry_Retail & Wholesale' => 'Retail & Wholesale',
+    'industry_Sports' => 'Sports',
+    'industry_Transportation' => 'Transportation',
+    'industry_Travel & Luxury' => 'Travel & Luxury',
+    'industry_Other' => 'Other',
+    'industry_Photography' =>'Photography',
+
+    // Countries
+    'country_Afghanistan' => 'Afghanistan',
+    'country_Albania' => 'Albania',
+    'country_Antarctica' => 'Antarctica',
+    'country_Algeria' => 'Algeria',
+    'country_American Samoa' => 'American Samoa',
+    'country_Andorra' => 'Andorra',
+    'country_Angola' => 'Angola',
+    'country_Antigua and Barbuda' => 'Antigua and Barbuda',
+    'country_Azerbaijan' => 'Azerbaijan',
+    'country_Argentina' => 'Argentina',
+    'country_Australia' => 'Australia',
+    'country_Austria' => 'Austria',
+    'country_Bahamas' => 'Bahamas',
+    'country_Bahrain' => 'Bahrain',
+    'country_Bangladesh' => 'Bangladesh',
+    'country_Armenia' => 'Armenia',
+    'country_Barbados' => 'Barbados',
+    'country_Belgium' => 'Belgium',
+    'country_Bermuda' => 'Bermuda',
+    'country_Bhutan' => 'Bhutan',
+    'country_Bolivia, Plurinational State of' => 'Bolivia, Plurinational State of',
+    'country_Bosnia and Herzegovina' => 'Bosnia and Herzegovina',
+    'country_Botswana' => 'Botswana',
+    'country_Bouvet Island' => 'Bouvet Island',
+    'country_Brazil' => 'Brazil',
+    'country_Belize' => 'Belize',
+    'country_British Indian Ocean Territory' => 'British Indian Ocean Territory',
+    'country_Solomon Islands' => 'Solomon Islands',
+    'country_Virgin Islands, British' => 'Virgin Islands, British',
+    'country_Brunei Darussalam' => 'Brunei Darussalam',
+    'country_Bulgaria' => 'Bulgaria',
+    'country_Myanmar' => 'Myanmar',
+    'country_Burundi' => 'Burundi',
+    'country_Belarus' => 'Belarus',
+    'country_Cambodia' => 'Cambodia',
+    'country_Cameroon' => 'Cameroon',
+    'country_Canada' => 'Canada',
+    'country_Cape Verde' => 'Cape Verde',
+    'country_Cayman Islands' => 'Cayman Islands',
+    'country_Central African Republic' => 'Central African Republic',
+    'country_Sri Lanka' => 'Sri Lanka',
+    'country_Chad' => 'Chad',
+    'country_Chile' => 'Chile',
+    'country_China' => 'China',
+    'country_Taiwan, Province of China' => 'Taiwan, Province of China',
+    'country_Christmas Island' => 'Christmas Island',
+    'country_Cocos (Keeling) Islands' => 'Cocos (Keeling) Islands',
+    'country_Colombia' => 'Colombia',
+    'country_Comoros' => 'Comoros',
+    'country_Mayotte' => 'Mayotte',
+    'country_Congo' => 'Congo',
+    'country_Congo, the Democratic Republic of the' => 'Congo, the Democratic Republic of the',
+    'country_Cook Islands' => 'Cook Islands',
+    'country_Costa Rica' => 'Costa Rica',
+    'country_Croatia' => 'Croatia',
+    'country_Cuba' => 'Cuba',
+    'country_Cyprus' => 'Cyprus',
+    'country_Czech Republic' => 'Czech Republic',
+    'country_Benin' => 'Benin',
+    'country_Denmark' => 'Denmark',
+    'country_Dominica' => 'Dominica',
+    'country_Dominican Republic' => 'Dominican Republic',
+    'country_Ecuador' => 'Ecuador',
+    'country_El Salvador' => 'El Salvador',
+    'country_Equatorial Guinea' => 'Equatorial Guinea',
+    'country_Ethiopia' => 'Ethiopia',
+    'country_Eritrea' => 'Eritrea',
+    'country_Estonia' => 'Estonia',
+    'country_Faroe Islands' => 'Faroe Islands',
+    'country_Falkland Islands (Malvinas)' => 'Falkland Islands (Malvinas)',
+    'country_South Georgia and the South Sandwich Islands' => 'South Georgia and the South Sandwich Islands',
+    'country_Fiji' => 'Fiji',
+    'country_Finland' => 'Finland',
+    'country_Åland Islands' => 'Åland Islands',
+    'country_France' => 'France',
+    'country_French Guiana' => 'French Guiana',
+    'country_French Polynesia' => 'French Polynesia',
+    'country_French Southern Territories' => 'French Southern Territories',
+    'country_Djibouti' => 'Djibouti',
+    'country_Gabon' => 'Gabon',
+    'country_Georgia' => 'Georgia',
+    'country_Gambia' => 'Gambia',
+    'country_Palestinian Territory, Occupied' => 'Palestinian Territory, Occupied',
+    'country_Germany' => 'Germany',
+    'country_Ghana' => 'Ghana',
+    'country_Gibraltar' => 'Gibraltar',
+    'country_Kiribati' => 'Kiribati',
+    'country_Greece' => 'Greece',
+    'country_Greenland' => 'Greenland',
+    'country_Grenada' => 'Grenada',
+    'country_Guadeloupe' => 'Guadeloupe',
+    'country_Guam' => 'Guam',
+    'country_Guatemala' => 'Guatemala',
+    'country_Guinea' => 'Guinea',
+    'country_Guyana' => 'Guyana',
+    'country_Haiti' => 'Haiti',
+    'country_Heard Island and McDonald Islands' => 'Heard Island and McDonald Islands',
+    'country_Holy See (Vatican City State)' => 'Holy See (Vatican City State)',
+    'country_Honduras' => 'Honduras',
+    'country_Hong Kong' => 'Hong Kong',
+    'country_Hungary' => 'Hungary',
+    'country_Iceland' => 'Iceland',
+    'country_India' => 'India',
+    'country_Indonesia' => 'Indonesia',
+    'country_Iran, Islamic Republic of' => 'Iran, Islamic Republic of',
+    'country_Iraq' => 'Iraq',
+    'country_Ireland' => 'Ireland',
+    'country_Israel' => 'Israel',
+    'country_Italy' => 'Italy',
+    'country_Côte d\'Ivoire' => 'Côte d\'Ivoire',
+    'country_Jamaica' => 'Jamaica',
+    'country_Japan' => 'Japan',
+    'country_Kazakhstan' => 'Kazakhstan',
+    'country_Jordan' => 'Jordan',
+    'country_Kenya' => 'Kenya',
+    'country_Korea, Democratic People\'s Republic of' => 'Korea, Democratic People\'s Republic of',
+    'country_Korea, Republic of' => 'Korea, Republic of',
+    'country_Kuwait' => 'Kuwait',
+    'country_Kyrgyzstan' => 'Kyrgyzstan',
+    'country_Lao People\'s Democratic Republic' => 'Lao People\'s Democratic Republic',
+    'country_Lebanon' => 'Lebanon',
+    'country_Lesotho' => 'Lesotho',
+    'country_Latvia' => 'Latvia',
+    'country_Liberia' => 'Liberia',
+    'country_Libya' => 'Libya',
+    'country_Liechtenstein' => 'Liechtenstein',
+    'country_Lithuania' => 'Lithuania',
+    'country_Luxembourg' => 'Luxembourg',
+    'country_Macao' => 'Macao',
+    'country_Madagascar' => 'Madagascar',
+    'country_Malawi' => 'Malawi',
+    'country_Malaysia' => 'Malaysia',
+    'country_Maldives' => 'Maldives',
+    'country_Mali' => 'Mali',
+    'country_Malta' => 'Malta',
+    'country_Martinique' => 'Martinique',
+    'country_Mauritania' => 'Mauritania',
+    'country_Mauritius' => 'Mauritius',
+    'country_Mexico' => 'Mexico',
+    'country_Monaco' => 'Monaco',
+    'country_Mongolia' => 'Mongolia',
+    'country_Moldova, Republic of' => 'Moldova, Republic of',
+    'country_Montenegro' => 'Montenegro',
+    'country_Montserrat' => 'Montserrat',
+    'country_Morocco' => 'Morocco',
+    'country_Mozambique' => 'Mozambique',
+    'country_Oman' => 'Oman',
+    'country_Namibia' => 'Namibia',
+    'country_Nauru' => 'Nauru',
+    'country_Nepal' => 'Nepal',
+    'country_Netherlands' => 'Netherlands',
+    'country_Curaçao' => 'Curaçao',
+    'country_Aruba' => 'Aruba',
+    'country_Sint Maarten (Dutch part)' => 'Sint Maarten (Dutch part)',
+    'country_Bonaire, Sint Eustatius and Saba' => 'Bonaire, Sint Eustatius and Saba',
+    'country_New Caledonia' => 'New Caledonia',
+    'country_Vanuatu' => 'Vanuatu',
+    'country_New Zealand' => 'New Zealand',
+    'country_Nicaragua' => 'Nicaragua',
+    'country_Niger' => 'Niger',
+    'country_Nigeria' => 'Nigeria',
+    'country_Niue' => 'Niue',
+    'country_Norfolk Island' => 'Norfolk Island',
+    'country_Norway' => 'Norway',
+    'country_Northern Mariana Islands' => 'Northern Mariana Islands',
+    'country_United States Minor Outlying Islands' => 'United States Minor Outlying Islands',
+    'country_Micronesia, Federated States of' => 'Micronesia, Federated States of',
+    'country_Marshall Islands' => 'Marshall Islands',
+    'country_Palau' => 'Palau',
+    'country_Pakistan' => 'Pakistan',
+    'country_Panama' => 'Panama',
+    'country_Papua New Guinea' => 'Papua New Guinea',
+    'country_Paraguay' => 'Paraguay',
+    'country_Peru' => 'Peru',
+    'country_Philippines' => 'Philippines',
+    'country_Pitcairn' => 'Pitcairn',
+    'country_Poland' => 'Poland',
+    'country_Portugal' => 'Portugal',
+    'country_Guinea-Bissau' => 'Guinea-Bissau',
+    'country_Timor-Leste' => 'Timor-Leste',
+    'country_Puerto Rico' => 'Puerto Rico',
+    'country_Qatar' => 'Qatar',
+    'country_Réunion' => 'Réunion',
+    'country_Romania' => 'Romania',
+    'country_Russian Federation' => 'Russian Federation',
+    'country_Rwanda' => 'Rwanda',
+    'country_Saint Barthélemy' => 'Saint Barthélemy',
+    'country_Saint Helena, Ascension and Tristan da Cunha' => 'Saint Helena, Ascension and Tristan da Cunha',
+    'country_Saint Kitts and Nevis' => 'Saint Kitts and Nevis',
+    'country_Anguilla' => 'Anguilla',
+    'country_Saint Lucia' => 'Saint Lucia',
+    'country_Saint Martin (French part)' => 'Saint Martin (French part)',
+    'country_Saint Pierre and Miquelon' => 'Saint Pierre and Miquelon',
+    'country_Saint Vincent and the Grenadines' => 'Saint Vincent and the Grenadines',
+    'country_San Marino' => 'San Marino',
+    'country_Sao Tome and Principe' => 'Sao Tome and Principe',
+    'country_Saudi Arabia' => 'Saudi Arabia',
+    'country_Senegal' => 'Senegal',
+    'country_Serbia' => 'Serbia',
+    'country_Seychelles' => 'Seychelles',
+    'country_Sierra Leone' => 'Sierra Leone',
+    'country_Singapore' => 'Singapore',
+    'country_Slovakia' => 'Slovakia',
+    'country_Viet Nam' => 'Viet Nam',
+    'country_Slovenia' => 'Slovenia',
+    'country_Somalia' => 'Somalia',
+    'country_South Africa' => 'South Africa',
+    'country_Zimbabwe' => 'Zimbabwe',
+    'country_Spain' => 'Spain',
+    'country_South Sudan' => 'South Sudan',
+    'country_Sudan' => 'Sudan',
+    'country_Western Sahara' => 'Western Sahara',
+    'country_Suriname' => 'Suriname',
+    'country_Svalbard and Jan Mayen' => 'Svalbard and Jan Mayen',
+    'country_Swaziland' => 'Swaziland',
+    'country_Sweden' => 'Sweden',
+    'country_Switzerland' => 'Switzerland',
+    'country_Syrian Arab Republic' => 'Syrian Arab Republic',
+    'country_Tajikistan' => 'Tajikistan',
+    'country_Thailand' => 'Thailand',
+    'country_Togo' => 'Togo',
+    'country_Tokelau' => 'Tokelau',
+    'country_Tonga' => 'Tonga',
+    'country_Trinidad and Tobago' => 'Trinidad and Tobago',
+    'country_United Arab Emirates' => 'United Arab Emirates',
+    'country_Tunisia' => 'Tunisia',
+    'country_Turkey' => 'Turkey',
+    'country_Turkmenistan' => 'Turkmenistan',
+    'country_Turks and Caicos Islands' => 'Turks and Caicos Islands',
+    'country_Tuvalu' => 'Tuvalu',
+    'country_Uganda' => 'Uganda',
+    '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_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_Virgin Islands, U.S.' => 'Virgin Islands, U.S.',
+    'country_Burkina Faso' => 'Burkina Faso',
+    'country_Uruguay' => 'Uruguay',
+    'country_Uzbekistan' => 'Uzbekistan',
+    'country_Venezuela, Bolivarian Republic of' => 'Venezuela, Bolivarian Republic of',
+    'country_Wallis and Futuna' => 'Wallis and Futuna',
+    'country_Samoa' => 'Samoa',
+    'country_Yemen' => 'Yemen',
+    'country_Zambi' => 'Zambi',
+
+    // Languages
+    'lang_Brazilian Portuguese' => 'Brazilian Portuguese',
+    'lang_Croatian' => 'Croatian',
+    'lang_Czech' => 'Czech',
+    'lang_Danish' => 'Danish',
+    'lang_Dutch' => 'Dutch',
+    'lang_English' => 'English',
+    'lang_French' => 'French',
+    'lang_French - Canada' => 'French - Canada',
+    'lang_German' => 'German',
+    'lang_Italian' => 'Italian',
+    'lang_Japanese' => 'Japanese',
+    'lang_Lithuanian' => 'Lithuanian',
+    'lang_Norwegian' => 'Norwegian',
+    'lang_Polish' => 'Polish',
+    'lang_Spanish' => 'Spanish',
+    'lang_Spanish - Spain' => 'Spanish - Spain',
+    'lang_Swedish' => 'Swedish',
+
+    // Frequencies
+    'freq_weekly' => 'Weekly',
+    'freq_two_weeks' => 'Two weeks',
+    'freq_four_weeks' => 'Four weeks',
+    'freq_monthly' => 'Monthly',
+    'freq_three_months' => 'Three months',
+    'freq_six_months' => 'Six months',
+    'freq_annually' => 'Annually',
+
+    // Payment types
+    'payment_type_Apply Credit' => 'Apply Credit',
+    'payment_type_Bank Transfer' => 'Bank Transfer',
+    'payment_type_Cash' => 'Cash',
+    'payment_type_Debit' => 'Debit',
+    'payment_type_ACH' => 'ACH',
+    'payment_type_Visa Card' => 'Visa Card',
+    'payment_type_MasterCard' => 'MasterCard',
+    'payment_type_American Express' => 'American Express',
+    'payment_type_Discover Card' => 'Discover Card',
+    'payment_type_Diners Card' => 'Diners Card',
+    'payment_type_EuroCard' => 'EuroCard',
+    'payment_type_Nova' => 'Nova',
+    'payment_type_Credit Card Other' => 'Credit Card Other',
+    'payment_type_PayPal' => 'PayPal',
+    'payment_type_Google Wallet' => 'Google Wallet',
+    'payment_type_Check' => 'Check',
+
+    // Industries
+    'industry_Accounting & Legal' => 'Accounting & Legal',
+    'industry_Advertising' => 'Advertising',
+    'industry_Aerospace' => 'Aerospace',
+    'industry_Agriculture' => 'Agriculture',
+    'industry_Automotive' => 'Automotive',
+    'industry_Banking & Finance' => 'Banking & Finance',
+    'industry_Biotechnology' => 'Biotechnology',
+    'industry_Broadcasting' => 'Broadcasting',
+    'industry_Business Services' => 'Business Services',
+    'industry_Commodities & Chemicals' => 'Commodities & Chemicals',
+    'industry_Communications' => 'Communications',
+    'industry_Computers & Hightech' => 'Computers & Hightech',
+    'industry_Defense' => 'Defense',
+    'industry_Energy' => 'Energy',
+    'industry_Entertainment' => 'Entertainment',
+    'industry_Government' => 'Government',
+    'industry_Healthcare & Life Sciences' => 'Healthcare & Life Sciences',
+    'industry_Insurance' => 'Insurance',
+    'industry_Manufacturing' => 'Manufacturing',
+    'industry_Marketing' => 'Marketing',
+    'industry_Media' => 'Media',
+    'industry_Nonprofit & Higher Ed' => 'Nonprofit & Higher Ed',
+    'industry_Pharmaceuticals' => 'Pharmaceuticals',
+    'industry_Professional Services & Consulting' => 'Professional Services & Consulting',
+    'industry_Real Estate' => 'Real Estate',
+    'industry_Retail & Wholesale' => 'Retail & Wholesale',
+    'industry_Sports' => 'Sports',
+    'industry_Transportation' => 'Transportation',
+    'industry_Travel & Luxury' => 'Travel & Luxury',
+    'industry_Other' => 'Other',
+    'industry_Photography' =>'Photography',
+
+    // Countries
+    'country_Afghanistan' => 'Afghanistan',
+    'country_Albania' => 'Albania',
+    'country_Antarctica' => 'Antarctica',
+    'country_Algeria' => 'Algeria',
+    'country_American Samoa' => 'American Samoa',
+    'country_Andorra' => 'Andorra',
+    'country_Angola' => 'Angola',
+    'country_Antigua and Barbuda' => 'Antigua and Barbuda',
+    'country_Azerbaijan' => 'Azerbaijan',
+    'country_Argentina' => 'Argentina',
+    'country_Australia' => 'Australia',
+    'country_Austria' => 'Austria',
+    'country_Bahamas' => 'Bahamas',
+    'country_Bahrain' => 'Bahrain',
+    'country_Bangladesh' => 'Bangladesh',
+    'country_Armenia' => 'Armenia',
+    'country_Barbados' => 'Barbados',
+    'country_Belgium' => 'Belgium',
+    'country_Bermuda' => 'Bermuda',
+    'country_Bhutan' => 'Bhutan',
+    'country_Bolivia, Plurinational State of' => 'Bolivia, Plurinational State of',
+    'country_Bosnia and Herzegovina' => 'Bosnia and Herzegovina',
+    'country_Botswana' => 'Botswana',
+    'country_Bouvet Island' => 'Bouvet Island',
+    'country_Brazil' => 'Brazil',
+    'country_Belize' => 'Belize',
+    'country_British Indian Ocean Territory' => 'British Indian Ocean Territory',
+    'country_Solomon Islands' => 'Solomon Islands',
+    'country_Virgin Islands, British' => 'Virgin Islands, British',
+    'country_Brunei Darussalam' => 'Brunei Darussalam',
+    'country_Bulgaria' => 'Bulgaria',
+    'country_Myanmar' => 'Myanmar',
+    'country_Burundi' => 'Burundi',
+    'country_Belarus' => 'Belarus',
+    'country_Cambodia' => 'Cambodia',
+    'country_Cameroon' => 'Cameroon',
+    'country_Canada' => 'Canada',
+    'country_Cape Verde' => 'Cape Verde',
+    'country_Cayman Islands' => 'Cayman Islands',
+    'country_Central African Republic' => 'Central African Republic',
+    'country_Sri Lanka' => 'Sri Lanka',
+    'country_Chad' => 'Chad',
+    'country_Chile' => 'Chile',
+    'country_China' => 'China',
+    'country_Taiwan, Province of China' => 'Taiwan, Province of China',
+    'country_Christmas Island' => 'Christmas Island',
+    'country_Cocos (Keeling) Islands' => 'Cocos (Keeling) Islands',
+    'country_Colombia' => 'Colombia',
+    'country_Comoros' => 'Comoros',
+    'country_Mayotte' => 'Mayotte',
+    'country_Congo' => 'Congo',
+    'country_Congo, the Democratic Republic of the' => 'Congo, the Democratic Republic of the',
+    'country_Cook Islands' => 'Cook Islands',
+    'country_Costa Rica' => 'Costa Rica',
+    'country_Croatia' => 'Croatia',
+    'country_Cuba' => 'Cuba',
+    'country_Cyprus' => 'Cyprus',
+    'country_Czech Republic' => 'Czech Republic',
+    'country_Benin' => 'Benin',
+    'country_Denmark' => 'Denmark',
+    'country_Dominica' => 'Dominica',
+    'country_Dominican Republic' => 'Dominican Republic',
+    'country_Ecuador' => 'Ecuador',
+    'country_El Salvador' => 'El Salvador',
+    'country_Equatorial Guinea' => 'Equatorial Guinea',
+    'country_Ethiopia' => 'Ethiopia',
+    'country_Eritrea' => 'Eritrea',
+    'country_Estonia' => 'Estonia',
+    'country_Faroe Islands' => 'Faroe Islands',
+    'country_Falkland Islands (Malvinas)' => 'Falkland Islands (Malvinas)',
+    'country_South Georgia and the South Sandwich Islands' => 'South Georgia and the South Sandwich Islands',
+    'country_Fiji' => 'Fiji',
+    'country_Finland' => 'Finland',
+    'country_Åland Islands' => 'Åland Islands',
+    'country_France' => 'France',
+    'country_French Guiana' => 'French Guiana',
+    'country_French Polynesia' => 'French Polynesia',
+    'country_French Southern Territories' => 'French Southern Territories',
+    'country_Djibouti' => 'Djibouti',
+    'country_Gabon' => 'Gabon',
+    'country_Georgia' => 'Georgia',
+    'country_Gambia' => 'Gambia',
+    'country_Palestinian Territory, Occupied' => 'Palestinian Territory, Occupied',
+    'country_Germany' => 'Germany',
+    'country_Ghana' => 'Ghana',
+    'country_Gibraltar' => 'Gibraltar',
+    'country_Kiribati' => 'Kiribati',
+    'country_Greece' => 'Greece',
+    'country_Greenland' => 'Greenland',
+    'country_Grenada' => 'Grenada',
+    'country_Guadeloupe' => 'Guadeloupe',
+    'country_Guam' => 'Guam',
+    'country_Guatemala' => 'Guatemala',
+    'country_Guinea' => 'Guinea',
+    'country_Guyana' => 'Guyana',
+    'country_Haiti' => 'Haiti',
+    'country_Heard Island and McDonald Islands' => 'Heard Island and McDonald Islands',
+    'country_Holy See (Vatican City State)' => 'Holy See (Vatican City State)',
+    'country_Honduras' => 'Honduras',
+    'country_Hong Kong' => 'Hong Kong',
+    'country_Hungary' => 'Hungary',
+    'country_Iceland' => 'Iceland',
+    'country_India' => 'India',
+    'country_Indonesia' => 'Indonesia',
+    'country_Iran, Islamic Republic of' => 'Iran, Islamic Republic of',
+    'country_Iraq' => 'Iraq',
+    'country_Ireland' => 'Ireland',
+    'country_Israel' => 'Israel',
+    'country_Italy' => 'Italy',
+    'country_Côte d\'Ivoire' => 'Côte d\'Ivoire',
+    'country_Jamaica' => 'Jamaica',
+    'country_Japan' => 'Japan',
+    'country_Kazakhstan' => 'Kazakhstan',
+    'country_Jordan' => 'Jordan',
+    'country_Kenya' => 'Kenya',
+    'country_Korea, Democratic People\'s Republic of' => 'Korea, Democratic People\'s Republic of',
+    'country_Korea, Republic of' => 'Korea, Republic of',
+    'country_Kuwait' => 'Kuwait',
+    'country_Kyrgyzstan' => 'Kyrgyzstan',
+    'country_Lao People\'s Democratic Republic' => 'Lao People\'s Democratic Republic',
+    'country_Lebanon' => 'Lebanon',
+    'country_Lesotho' => 'Lesotho',
+    'country_Latvia' => 'Latvia',
+    'country_Liberia' => 'Liberia',
+    'country_Libya' => 'Libya',
+    'country_Liechtenstein' => 'Liechtenstein',
+    'country_Lithuania' => 'Lithuania',
+    'country_Luxembourg' => 'Luxembourg',
+    'country_Macao' => 'Macao',
+    'country_Madagascar' => 'Madagascar',
+    'country_Malawi' => 'Malawi',
+    'country_Malaysia' => 'Malaysia',
+    'country_Maldives' => 'Maldives',
+    'country_Mali' => 'Mali',
+    'country_Malta' => 'Malta',
+    'country_Martinique' => 'Martinique',
+    'country_Mauritania' => 'Mauritania',
+    'country_Mauritius' => 'Mauritius',
+    'country_Mexico' => 'Mexico',
+    'country_Monaco' => 'Monaco',
+    'country_Mongolia' => 'Mongolia',
+    'country_Moldova, Republic of' => 'Moldova, Republic of',
+    'country_Montenegro' => 'Montenegro',
+    'country_Montserrat' => 'Montserrat',
+    'country_Morocco' => 'Morocco',
+    'country_Mozambique' => 'Mozambique',
+    'country_Oman' => 'Oman',
+    'country_Namibia' => 'Namibia',
+    'country_Nauru' => 'Nauru',
+    'country_Nepal' => 'Nepal',
+    'country_Netherlands' => 'Netherlands',
+    'country_Curaçao' => 'Curaçao',
+    'country_Aruba' => 'Aruba',
+    'country_Sint Maarten (Dutch part)' => 'Sint Maarten (Dutch part)',
+    'country_Bonaire, Sint Eustatius and Saba' => 'Bonaire, Sint Eustatius and Saba',
+    'country_New Caledonia' => 'New Caledonia',
+    'country_Vanuatu' => 'Vanuatu',
+    'country_New Zealand' => 'New Zealand',
+    'country_Nicaragua' => 'Nicaragua',
+    'country_Niger' => 'Niger',
+    'country_Nigeria' => 'Nigeria',
+    'country_Niue' => 'Niue',
+    'country_Norfolk Island' => 'Norfolk Island',
+    'country_Norway' => 'Norway',
+    'country_Northern Mariana Islands' => 'Northern Mariana Islands',
+    'country_United States Minor Outlying Islands' => 'United States Minor Outlying Islands',
+    'country_Micronesia, Federated States of' => 'Micronesia, Federated States of',
+    'country_Marshall Islands' => 'Marshall Islands',
+    'country_Palau' => 'Palau',
+    'country_Pakistan' => 'Pakistan',
+    'country_Panama' => 'Panama',
+    'country_Papua New Guinea' => 'Papua New Guinea',
+    'country_Paraguay' => 'Paraguay',
+    'country_Peru' => 'Peru',
+    'country_Philippines' => 'Philippines',
+    'country_Pitcairn' => 'Pitcairn',
+    'country_Poland' => 'Poland',
+    'country_Portugal' => 'Portugal',
+    'country_Guinea-Bissau' => 'Guinea-Bissau',
+    'country_Timor-Leste' => 'Timor-Leste',
+    'country_Puerto Rico' => 'Puerto Rico',
+    'country_Qatar' => 'Qatar',
+    'country_Réunion' => 'Réunion',
+    'country_Romania' => 'Romania',
+    'country_Russian Federation' => 'Russian Federation',
+    'country_Rwanda' => 'Rwanda',
+    'country_Saint Barthélemy' => 'Saint Barthélemy',
+    'country_Saint Helena, Ascension and Tristan da Cunha' => 'Saint Helena, Ascension and Tristan da Cunha',
+    'country_Saint Kitts and Nevis' => 'Saint Kitts and Nevis',
+    'country_Anguilla' => 'Anguilla',
+    'country_Saint Lucia' => 'Saint Lucia',
+    'country_Saint Martin (French part)' => 'Saint Martin (French part)',
+    'country_Saint Pierre and Miquelon' => 'Saint Pierre and Miquelon',
+    'country_Saint Vincent and the Grenadines' => 'Saint Vincent and the Grenadines',
+    'country_San Marino' => 'San Marino',
+    'country_Sao Tome and Principe' => 'Sao Tome and Principe',
+    'country_Saudi Arabia' => 'Saudi Arabia',
+    'country_Senegal' => 'Senegal',
+    'country_Serbia' => 'Serbia',
+    'country_Seychelles' => 'Seychelles',
+    'country_Sierra Leone' => 'Sierra Leone',
+    'country_Singapore' => 'Singapore',
+    'country_Slovakia' => 'Slovakia',
+    'country_Viet Nam' => 'Viet Nam',
+    'country_Slovenia' => 'Slovenia',
+    'country_Somalia' => 'Somalia',
+    'country_South Africa' => 'South Africa',
+    'country_Zimbabwe' => 'Zimbabwe',
+    'country_Spain' => 'Spain',
+    'country_South Sudan' => 'South Sudan',
+    'country_Sudan' => 'Sudan',
+    'country_Western Sahara' => 'Western Sahara',
+    'country_Suriname' => 'Suriname',
+    'country_Svalbard and Jan Mayen' => 'Svalbard and Jan Mayen',
+    'country_Swaziland' => 'Swaziland',
+    'country_Sweden' => 'Sweden',
+    'country_Switzerland' => 'Switzerland',
+    'country_Syrian Arab Republic' => 'Syrian Arab Republic',
+    'country_Tajikistan' => 'Tajikistan',
+    'country_Thailand' => 'Thailand',
+    'country_Togo' => 'Togo',
+    'country_Tokelau' => 'Tokelau',
+    'country_Tonga' => 'Tonga',
+    'country_Trinidad and Tobago' => 'Trinidad and Tobago',
+    'country_United Arab Emirates' => 'United Arab Emirates',
+    'country_Tunisia' => 'Tunisia',
+    'country_Turkey' => 'Turkey',
+    'country_Turkmenistan' => 'Turkmenistan',
+    'country_Turks and Caicos Islands' => 'Turks and Caicos Islands',
+    'country_Tuvalu' => 'Tuvalu',
+    'country_Uganda' => 'Uganda',
+    '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_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_Virgin Islands, U.S.' => 'Virgin Islands, U.S.',
+    'country_Burkina Faso' => 'Burkina Faso',
+    'country_Uruguay' => 'Uruguay',
+    'country_Uzbekistan' => 'Uzbekistan',
+    'country_Venezuela, Bolivarian Republic of' => 'Venezuela, Bolivarian Republic of',
+    'country_Wallis and Futuna' => 'Wallis and Futuna',
+    'country_Samoa' => 'Samoa',
+    'country_Yemen' => 'Yemen',
+    'country_Zambi' => 'Zambi',
+
+    'view_client_portal' => 'View client portal',
+    'view_portal' => 'View Portal',
+    'vendor_contacts' => 'Vendor Contacts',
+    'all' => 'All',
+    'selected' => 'Selected',
+    'category' => 'Category',
+    'categories' => 'Categories',
+    'new_expense_category' => 'New Expense Category',
+    'edit_category' => 'Edit Category',
+    'archive_expense_category' => 'Archive Category',
+    'expense_categories' => 'Expense Categories',
+    'list_expense_categories' => 'List Expense Categories',
+    'updated_expense_category' => 'Successfully updated expense category',
+    'created_expense_category' => 'Successfully created expense category',
+    'archived_expense_category' => 'Successfully archived expense category',
+    'archived_expense_categories' => 'Successfully archived :count expense category',
+    'restore_expense_category' => 'Restore expense category',
+    'restored_expense_category' => 'Successfully restored expense category',
+    'apply_taxes' => 'Apply taxes',
+    'min_to_max_users' => ':min to :max users',
+    'max_users_reached' => 'The maximum number of users has been reached.',
+    'buy_now_buttons' => 'Buy Now Buttons',
+    'landing_page' => 'Landing Page',
+    'payment_type' => 'Payment Type',
+    'form' => 'Form',
+    'link' => 'Link',
+    'fields' => 'Fields',
+    'dwolla' => 'Dwolla',
+    'buy_now_buttons_warning' => 'Note: client and invoice records are created even if the transaction isn\'t completed.',
+    'buy_now_buttons_disabled' => 'This feature requires that a product is created and a payment gateway is configured.',
+    'enable_buy_now_buttons_help' => 'Enable support for buy now buttons',
+    'changes_take_effect_immediately' => 'Note: changes take effect immediately',
+    'wepay_account_description' => 'Payment gateway for Invoice Ninja',
+    'payment_error_code' => 'There was an error processing your payment [:code]. Please try again later.',
+    'standard_fees_apply' => 'Standard fees apply: 2.9% + $0.30 per successful charge.',
+    'limit_import_rows' => 'Data needs to be imported in batches of :count rows or less',
+
 
 );
 

resources/lang/sv/texts.php

@@ -1,6 +1,7 @@
 <?php
 
 $LANG = array(
+
     'organization' => 'Organisation',
     'name' => 'Namn',
     'website' => 'Hemsida',
@@ -385,7 +386,7 @@ $LANG = array(
     'gateway_help_1' => ':link för att registrera dig på Authorize.net.',
     'gateway_help_2' => ':link för att registrera dig på Authorize.net.',
     'gateway_help_17' => ':link för att hämta din PayPal API-nyckel.',
-    'gateway_help_27' => ':link för att registrera dig för TwoCheckout.',
+    'gateway_help_27' => ':link to sign up for 2Checkout.com. To ensure payments are tracked set :complete_link as the redirect URL under Account > Site Management in the 2Checkout portal.',
     'more_designs' => 'Fler fakturalayouter',
     'more_designs_title' => 'Fler fakturalayouter',
     'more_designs_cloud_header' => 'Uppgrader till Pro för fler fakturalayouter',
@@ -772,6 +773,8 @@ $LANG = array(
     'activity_35' => ':user created :vendor',
     'activity_36' => ':user created :vendor',
     'activity_37' => ':user created :vendor',
+    'activity_42' => ':user created task ":task"',
+    'activity_43' => ':user updated task ":task"',
     'payment' => 'Payment',
     'system' => 'System',
     'signature' => 'Email Signature',
@@ -991,7 +994,7 @@ $LANG = array(
     'overdue' => 'Overdue',
 
 
-    'white_label_text' => 'Purchase a ONE YEAR white label license for $:price to remove the Invoice Ninja branding from the client portal and help support our project.',
+    'white_label_text' => 'Purchase a ONE YEAR white label license for $:price to remove the Invoice Ninja branding and help support our project.',
     'user_email_footer' => 'För att anpassa dina e-post notifieringar gå till :link',
     'reset_password_footer' => 'Om du inte begärt en återställning av ditt lösenord så var snäll och maila vår support: :email',
     'limit_users' => 'Ledsen, men du får skapa max :limit användare',
@@ -1292,7 +1295,7 @@ $LANG = array(
     'wepay_tos_agree' => 'I agree to the :link.',
     'wepay_tos_link_text' => 'WePay Terms of Service',
     'resend_confirmation_email' => 'Resend Confirmation Email',
-    'manage_wepay_account' => 'Manage WePay Account',
+    'manage_account' => 'Manage Account',
     'action_required' => 'Action Required',
     'finish_setup' => 'Finish Setup',
     'created_wepay_confirmation_required' => 'Please check your email and confirm your email address with WePay.',
@@ -1360,6 +1363,686 @@ $LANG = array(
     'failed_remove_payment_method' => 'Failed to remove the payment method',
     'gateway_exists' => 'This gateway already exists',
     'manual_entry' => 'Manual entry',
+    'start_of_week' => 'First day of the week',
+
+    // Frequencies
+    'freq_weekly' => 'Weekly',
+    'freq_two_weeks' => 'Two weeks',
+    'freq_four_weeks' => 'Four weeks',
+    'freq_monthly' => 'Monthly',
+    'freq_three_months' => 'Three months',
+    'freq_six_months' => 'Six months',
+    'freq_annually' => 'Annually',
+
+    // Payment types
+    'payment_type_Apply Credit' => 'Apply Credit',
+    'payment_type_Bank Transfer' => 'Bank Transfer',
+    'payment_type_Cash' => 'Cash',
+    'payment_type_Debit' => 'Debit',
+    'payment_type_ACH' => 'ACH',
+    'payment_type_Visa Card' => 'Visa Card',
+    'payment_type_MasterCard' => 'MasterCard',
+    'payment_type_American Express' => 'American Express',
+    'payment_type_Discover Card' => 'Discover Card',
+    'payment_type_Diners Card' => 'Diners Card',
+    'payment_type_EuroCard' => 'EuroCard',
+    'payment_type_Nova' => 'Nova',
+    'payment_type_Credit Card Other' => 'Credit Card Other',
+    'payment_type_PayPal' => 'PayPal',
+    'payment_type_Google Wallet' => 'Google Wallet',
+    'payment_type_Check' => 'Check',
+
+    // Industries
+    'industry_Accounting & Legal' => 'Accounting & Legal',
+    'industry_Advertising' => 'Advertising',
+    'industry_Aerospace' => 'Aerospace',
+    'industry_Agriculture' => 'Agriculture',
+    'industry_Automotive' => 'Automotive',
+    'industry_Banking & Finance' => 'Banking & Finance',
+    'industry_Biotechnology' => 'Biotechnology',
+    'industry_Broadcasting' => 'Broadcasting',
+    'industry_Business Services' => 'Business Services',
+    'industry_Commodities & Chemicals' => 'Commodities & Chemicals',
+    'industry_Communications' => 'Communications',
+    'industry_Computers & Hightech' => 'Computers & Hightech',
+    'industry_Defense' => 'Defense',
+    'industry_Energy' => 'Energy',
+    'industry_Entertainment' => 'Entertainment',
+    'industry_Government' => 'Government',
+    'industry_Healthcare & Life Sciences' => 'Healthcare & Life Sciences',
+    'industry_Insurance' => 'Insurance',
+    'industry_Manufacturing' => 'Manufacturing',
+    'industry_Marketing' => 'Marketing',
+    'industry_Media' => 'Media',
+    'industry_Nonprofit & Higher Ed' => 'Nonprofit & Higher Ed',
+    'industry_Pharmaceuticals' => 'Pharmaceuticals',
+    'industry_Professional Services & Consulting' => 'Professional Services & Consulting',
+    'industry_Real Estate' => 'Real Estate',
+    'industry_Retail & Wholesale' => 'Retail & Wholesale',
+    'industry_Sports' => 'Sports',
+    'industry_Transportation' => 'Transportation',
+    'industry_Travel & Luxury' => 'Travel & Luxury',
+    'industry_Other' => 'Other',
+    'industry_Photography' =>'Photography',
+
+    // Countries
+    'country_Afghanistan' => 'Afghanistan',
+    'country_Albania' => 'Albania',
+    'country_Antarctica' => 'Antarctica',
+    'country_Algeria' => 'Algeria',
+    'country_American Samoa' => 'American Samoa',
+    'country_Andorra' => 'Andorra',
+    'country_Angola' => 'Angola',
+    'country_Antigua and Barbuda' => 'Antigua and Barbuda',
+    'country_Azerbaijan' => 'Azerbaijan',
+    'country_Argentina' => 'Argentina',
+    'country_Australia' => 'Australia',
+    'country_Austria' => 'Austria',
+    'country_Bahamas' => 'Bahamas',
+    'country_Bahrain' => 'Bahrain',
+    'country_Bangladesh' => 'Bangladesh',
+    'country_Armenia' => 'Armenia',
+    'country_Barbados' => 'Barbados',
+    'country_Belgium' => 'Belgium',
+    'country_Bermuda' => 'Bermuda',
+    'country_Bhutan' => 'Bhutan',
+    'country_Bolivia, Plurinational State of' => 'Bolivia, Plurinational State of',
+    'country_Bosnia and Herzegovina' => 'Bosnia and Herzegovina',
+    'country_Botswana' => 'Botswana',
+    'country_Bouvet Island' => 'Bouvet Island',
+    'country_Brazil' => 'Brazil',
+    'country_Belize' => 'Belize',
+    'country_British Indian Ocean Territory' => 'British Indian Ocean Territory',
+    'country_Solomon Islands' => 'Solomon Islands',
+    'country_Virgin Islands, British' => 'Virgin Islands, British',
+    'country_Brunei Darussalam' => 'Brunei Darussalam',
+    'country_Bulgaria' => 'Bulgaria',
+    'country_Myanmar' => 'Myanmar',
+    'country_Burundi' => 'Burundi',
+    'country_Belarus' => 'Belarus',
+    'country_Cambodia' => 'Cambodia',
+    'country_Cameroon' => 'Cameroon',
+    'country_Canada' => 'Canada',
+    'country_Cape Verde' => 'Cape Verde',
+    'country_Cayman Islands' => 'Cayman Islands',
+    'country_Central African Republic' => 'Central African Republic',
+    'country_Sri Lanka' => 'Sri Lanka',
+    'country_Chad' => 'Chad',
+    'country_Chile' => 'Chile',
+    'country_China' => 'China',
+    'country_Taiwan, Province of China' => 'Taiwan, Province of China',
+    'country_Christmas Island' => 'Christmas Island',
+    'country_Cocos (Keeling) Islands' => 'Cocos (Keeling) Islands',
+    'country_Colombia' => 'Colombia',
+    'country_Comoros' => 'Comoros',
+    'country_Mayotte' => 'Mayotte',
+    'country_Congo' => 'Congo',
+    'country_Congo, the Democratic Republic of the' => 'Congo, the Democratic Republic of the',
+    'country_Cook Islands' => 'Cook Islands',
+    'country_Costa Rica' => 'Costa Rica',
+    'country_Croatia' => 'Croatia',
+    'country_Cuba' => 'Cuba',
+    'country_Cyprus' => 'Cyprus',
+    'country_Czech Republic' => 'Czech Republic',
+    'country_Benin' => 'Benin',
+    'country_Denmark' => 'Denmark',
+    'country_Dominica' => 'Dominica',
+    'country_Dominican Republic' => 'Dominican Republic',
+    'country_Ecuador' => 'Ecuador',
+    'country_El Salvador' => 'El Salvador',
+    'country_Equatorial Guinea' => 'Equatorial Guinea',
+    'country_Ethiopia' => 'Ethiopia',
+    'country_Eritrea' => 'Eritrea',
+    'country_Estonia' => 'Estonia',
+    'country_Faroe Islands' => 'Faroe Islands',
+    'country_Falkland Islands (Malvinas)' => 'Falkland Islands (Malvinas)',
+    'country_South Georgia and the South Sandwich Islands' => 'South Georgia and the South Sandwich Islands',
+    'country_Fiji' => 'Fiji',
+    'country_Finland' => 'Finland',
+    'country_Åland Islands' => 'Åland Islands',
+    'country_France' => 'France',
+    'country_French Guiana' => 'French Guiana',
+    'country_French Polynesia' => 'French Polynesia',
+    'country_French Southern Territories' => 'French Southern Territories',
+    'country_Djibouti' => 'Djibouti',
+    'country_Gabon' => 'Gabon',
+    'country_Georgia' => 'Georgia',
+    'country_Gambia' => 'Gambia',
+    'country_Palestinian Territory, Occupied' => 'Palestinian Territory, Occupied',
+    'country_Germany' => 'Germany',
+    'country_Ghana' => 'Ghana',
+    'country_Gibraltar' => 'Gibraltar',
+    'country_Kiribati' => 'Kiribati',
+    'country_Greece' => 'Greece',
+    'country_Greenland' => 'Greenland',
+    'country_Grenada' => 'Grenada',
+    'country_Guadeloupe' => 'Guadeloupe',
+    'country_Guam' => 'Guam',
+    'country_Guatemala' => 'Guatemala',
+    'country_Guinea' => 'Guinea',
+    'country_Guyana' => 'Guyana',
+    'country_Haiti' => 'Haiti',
+    'country_Heard Island and McDonald Islands' => 'Heard Island and McDonald Islands',
+    'country_Holy See (Vatican City State)' => 'Holy See (Vatican City State)',
+    'country_Honduras' => 'Honduras',
+    'country_Hong Kong' => 'Hong Kong',
+    'country_Hungary' => 'Hungary',
+    'country_Iceland' => 'Iceland',
+    'country_India' => 'India',
+    'country_Indonesia' => 'Indonesia',
+    'country_Iran, Islamic Republic of' => 'Iran, Islamic Republic of',
+    'country_Iraq' => 'Iraq',
+    'country_Ireland' => 'Ireland',
+    'country_Israel' => 'Israel',
+    'country_Italy' => 'Italy',
+    'country_Côte d\'Ivoire' => 'Côte d\'Ivoire',
+    'country_Jamaica' => 'Jamaica',
+    'country_Japan' => 'Japan',
+    'country_Kazakhstan' => 'Kazakhstan',
+    'country_Jordan' => 'Jordan',
+    'country_Kenya' => 'Kenya',
+    'country_Korea, Democratic People\'s Republic of' => 'Korea, Democratic People\'s Republic of',
+    'country_Korea, Republic of' => 'Korea, Republic of',
+    'country_Kuwait' => 'Kuwait',
+    'country_Kyrgyzstan' => 'Kyrgyzstan',
+    'country_Lao People\'s Democratic Republic' => 'Lao People\'s Democratic Republic',
+    'country_Lebanon' => 'Lebanon',
+    'country_Lesotho' => 'Lesotho',
+    'country_Latvia' => 'Latvia',
+    'country_Liberia' => 'Liberia',
+    'country_Libya' => 'Libya',
+    'country_Liechtenstein' => 'Liechtenstein',
+    'country_Lithuania' => 'Lithuania',
+    'country_Luxembourg' => 'Luxembourg',
+    'country_Macao' => 'Macao',
+    'country_Madagascar' => 'Madagascar',
+    'country_Malawi' => 'Malawi',
+    'country_Malaysia' => 'Malaysia',
+    'country_Maldives' => 'Maldives',
+    'country_Mali' => 'Mali',
+    'country_Malta' => 'Malta',
+    'country_Martinique' => 'Martinique',
+    'country_Mauritania' => 'Mauritania',
+    'country_Mauritius' => 'Mauritius',
+    'country_Mexico' => 'Mexico',
+    'country_Monaco' => 'Monaco',
+    'country_Mongolia' => 'Mongolia',
+    'country_Moldova, Republic of' => 'Moldova, Republic of',
+    'country_Montenegro' => 'Montenegro',
+    'country_Montserrat' => 'Montserrat',
+    'country_Morocco' => 'Morocco',
+    'country_Mozambique' => 'Mozambique',
+    'country_Oman' => 'Oman',
+    'country_Namibia' => 'Namibia',
+    'country_Nauru' => 'Nauru',
+    'country_Nepal' => 'Nepal',
+    'country_Netherlands' => 'Netherlands',
+    'country_Curaçao' => 'Curaçao',
+    'country_Aruba' => 'Aruba',
+    'country_Sint Maarten (Dutch part)' => 'Sint Maarten (Dutch part)',
+    'country_Bonaire, Sint Eustatius and Saba' => 'Bonaire, Sint Eustatius and Saba',
+    'country_New Caledonia' => 'New Caledonia',
+    'country_Vanuatu' => 'Vanuatu',
+    'country_New Zealand' => 'New Zealand',
+    'country_Nicaragua' => 'Nicaragua',
+    'country_Niger' => 'Niger',
+    'country_Nigeria' => 'Nigeria',
+    'country_Niue' => 'Niue',
+    'country_Norfolk Island' => 'Norfolk Island',
+    'country_Norway' => 'Norway',
+    'country_Northern Mariana Islands' => 'Northern Mariana Islands',
+    'country_United States Minor Outlying Islands' => 'United States Minor Outlying Islands',
+    'country_Micronesia, Federated States of' => 'Micronesia, Federated States of',
+    'country_Marshall Islands' => 'Marshall Islands',
+    'country_Palau' => 'Palau',
+    'country_Pakistan' => 'Pakistan',
+    'country_Panama' => 'Panama',
+    'country_Papua New Guinea' => 'Papua New Guinea',
+    'country_Paraguay' => 'Paraguay',
+    'country_Peru' => 'Peru',
+    'country_Philippines' => 'Philippines',
+    'country_Pitcairn' => 'Pitcairn',
+    'country_Poland' => 'Poland',
+    'country_Portugal' => 'Portugal',
+    'country_Guinea-Bissau' => 'Guinea-Bissau',
+    'country_Timor-Leste' => 'Timor-Leste',
+    'country_Puerto Rico' => 'Puerto Rico',
+    'country_Qatar' => 'Qatar',
+    'country_Réunion' => 'Réunion',
+    'country_Romania' => 'Romania',
+    'country_Russian Federation' => 'Russian Federation',
+    'country_Rwanda' => 'Rwanda',
+    'country_Saint Barthélemy' => 'Saint Barthélemy',
+    'country_Saint Helena, Ascension and Tristan da Cunha' => 'Saint Helena, Ascension and Tristan da Cunha',
+    'country_Saint Kitts and Nevis' => 'Saint Kitts and Nevis',
+    'country_Anguilla' => 'Anguilla',
+    'country_Saint Lucia' => 'Saint Lucia',
+    'country_Saint Martin (French part)' => 'Saint Martin (French part)',
+    'country_Saint Pierre and Miquelon' => 'Saint Pierre and Miquelon',
+    'country_Saint Vincent and the Grenadines' => 'Saint Vincent and the Grenadines',
+    'country_San Marino' => 'San Marino',
+    'country_Sao Tome and Principe' => 'Sao Tome and Principe',
+    'country_Saudi Arabia' => 'Saudi Arabia',
+    'country_Senegal' => 'Senegal',
+    'country_Serbia' => 'Serbia',
+    'country_Seychelles' => 'Seychelles',
+    'country_Sierra Leone' => 'Sierra Leone',
+    'country_Singapore' => 'Singapore',
+    'country_Slovakia' => 'Slovakia',
+    'country_Viet Nam' => 'Viet Nam',
+    'country_Slovenia' => 'Slovenia',
+    'country_Somalia' => 'Somalia',
+    'country_South Africa' => 'South Africa',
+    'country_Zimbabwe' => 'Zimbabwe',
+    'country_Spain' => 'Spain',
+    'country_South Sudan' => 'South Sudan',
+    'country_Sudan' => 'Sudan',
+    'country_Western Sahara' => 'Western Sahara',
+    'country_Suriname' => 'Suriname',
+    'country_Svalbard and Jan Mayen' => 'Svalbard and Jan Mayen',
+    'country_Swaziland' => 'Swaziland',
+    'country_Sweden' => 'Sweden',
+    'country_Switzerland' => 'Switzerland',
+    'country_Syrian Arab Republic' => 'Syrian Arab Republic',
+    'country_Tajikistan' => 'Tajikistan',
+    'country_Thailand' => 'Thailand',
+    'country_Togo' => 'Togo',
+    'country_Tokelau' => 'Tokelau',
+    'country_Tonga' => 'Tonga',
+    'country_Trinidad and Tobago' => 'Trinidad and Tobago',
+    'country_United Arab Emirates' => 'United Arab Emirates',
+    'country_Tunisia' => 'Tunisia',
+    'country_Turkey' => 'Turkey',
+    'country_Turkmenistan' => 'Turkmenistan',
+    'country_Turks and Caicos Islands' => 'Turks and Caicos Islands',
+    'country_Tuvalu' => 'Tuvalu',
+    'country_Uganda' => 'Uganda',
+    '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_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_Virgin Islands, U.S.' => 'Virgin Islands, U.S.',
+    'country_Burkina Faso' => 'Burkina Faso',
+    'country_Uruguay' => 'Uruguay',
+    'country_Uzbekistan' => 'Uzbekistan',
+    'country_Venezuela, Bolivarian Republic of' => 'Venezuela, Bolivarian Republic of',
+    'country_Wallis and Futuna' => 'Wallis and Futuna',
+    'country_Samoa' => 'Samoa',
+    'country_Yemen' => 'Yemen',
+    'country_Zambi' => 'Zambi',
+
+    // Languages
+    'lang_Brazilian Portuguese' => 'Brazilian Portuguese',
+    'lang_Croatian' => 'Croatian',
+    'lang_Czech' => 'Czech',
+    'lang_Danish' => 'Danish',
+    'lang_Dutch' => 'Dutch',
+    'lang_English' => 'English',
+    'lang_French' => 'French',
+    'lang_French - Canada' => 'French - Canada',
+    'lang_German' => 'German',
+    'lang_Italian' => 'Italian',
+    'lang_Japanese' => 'Japanese',
+    'lang_Lithuanian' => 'Lithuanian',
+    'lang_Norwegian' => 'Norwegian',
+    'lang_Polish' => 'Polish',
+    'lang_Spanish' => 'Spanish',
+    'lang_Spanish - Spain' => 'Spanish - Spain',
+    'lang_Swedish' => 'Swedish',
+
+    // Frequencies
+    'freq_weekly' => 'Weekly',
+    'freq_two_weeks' => 'Two weeks',
+    'freq_four_weeks' => 'Four weeks',
+    'freq_monthly' => 'Monthly',
+    'freq_three_months' => 'Three months',
+    'freq_six_months' => 'Six months',
+    'freq_annually' => 'Annually',
+
+    // Payment types
+    'payment_type_Apply Credit' => 'Apply Credit',
+    'payment_type_Bank Transfer' => 'Bank Transfer',
+    'payment_type_Cash' => 'Cash',
+    'payment_type_Debit' => 'Debit',
+    'payment_type_ACH' => 'ACH',
+    'payment_type_Visa Card' => 'Visa Card',
+    'payment_type_MasterCard' => 'MasterCard',
+    'payment_type_American Express' => 'American Express',
+    'payment_type_Discover Card' => 'Discover Card',
+    'payment_type_Diners Card' => 'Diners Card',
+    'payment_type_EuroCard' => 'EuroCard',
+    'payment_type_Nova' => 'Nova',
+    'payment_type_Credit Card Other' => 'Credit Card Other',
+    'payment_type_PayPal' => 'PayPal',
+    'payment_type_Google Wallet' => 'Google Wallet',
+    'payment_type_Check' => 'Check',
+
+    // Industries
+    'industry_Accounting & Legal' => 'Accounting & Legal',
+    'industry_Advertising' => 'Advertising',
+    'industry_Aerospace' => 'Aerospace',
+    'industry_Agriculture' => 'Agriculture',
+    'industry_Automotive' => 'Automotive',
+    'industry_Banking & Finance' => 'Banking & Finance',
+    'industry_Biotechnology' => 'Biotechnology',
+    'industry_Broadcasting' => 'Broadcasting',
+    'industry_Business Services' => 'Business Services',
+    'industry_Commodities & Chemicals' => 'Commodities & Chemicals',
+    'industry_Communications' => 'Communications',
+    'industry_Computers & Hightech' => 'Computers & Hightech',
+    'industry_Defense' => 'Defense',
+    'industry_Energy' => 'Energy',
+    'industry_Entertainment' => 'Entertainment',
+    'industry_Government' => 'Government',
+    'industry_Healthcare & Life Sciences' => 'Healthcare & Life Sciences',
+    'industry_Insurance' => 'Insurance',
+    'industry_Manufacturing' => 'Manufacturing',
+    'industry_Marketing' => 'Marketing',
+    'industry_Media' => 'Media',
+    'industry_Nonprofit & Higher Ed' => 'Nonprofit & Higher Ed',
+    'industry_Pharmaceuticals' => 'Pharmaceuticals',
+    'industry_Professional Services & Consulting' => 'Professional Services & Consulting',
+    'industry_Real Estate' => 'Real Estate',
+    'industry_Retail & Wholesale' => 'Retail & Wholesale',
+    'industry_Sports' => 'Sports',
+    'industry_Transportation' => 'Transportation',
+    'industry_Travel & Luxury' => 'Travel & Luxury',
+    'industry_Other' => 'Other',
+    'industry_Photography' =>'Photography',
+
+    // Countries
+    'country_Afghanistan' => 'Afghanistan',
+    'country_Albania' => 'Albania',
+    'country_Antarctica' => 'Antarctica',
+    'country_Algeria' => 'Algeria',
+    'country_American Samoa' => 'American Samoa',
+    'country_Andorra' => 'Andorra',
+    'country_Angola' => 'Angola',
+    'country_Antigua and Barbuda' => 'Antigua and Barbuda',
+    'country_Azerbaijan' => 'Azerbaijan',
+    'country_Argentina' => 'Argentina',
+    'country_Australia' => 'Australia',
+    'country_Austria' => 'Austria',
+    'country_Bahamas' => 'Bahamas',
+    'country_Bahrain' => 'Bahrain',
+    'country_Bangladesh' => 'Bangladesh',
+    'country_Armenia' => 'Armenia',
+    'country_Barbados' => 'Barbados',
+    'country_Belgium' => 'Belgium',
+    'country_Bermuda' => 'Bermuda',
+    'country_Bhutan' => 'Bhutan',
+    'country_Bolivia, Plurinational State of' => 'Bolivia, Plurinational State of',
+    'country_Bosnia and Herzegovina' => 'Bosnia and Herzegovina',
+    'country_Botswana' => 'Botswana',
+    'country_Bouvet Island' => 'Bouvet Island',
+    'country_Brazil' => 'Brazil',
+    'country_Belize' => 'Belize',
+    'country_British Indian Ocean Territory' => 'British Indian Ocean Territory',
+    'country_Solomon Islands' => 'Solomon Islands',
+    'country_Virgin Islands, British' => 'Virgin Islands, British',
+    'country_Brunei Darussalam' => 'Brunei Darussalam',
+    'country_Bulgaria' => 'Bulgaria',
+    'country_Myanmar' => 'Myanmar',
+    'country_Burundi' => 'Burundi',
+    'country_Belarus' => 'Belarus',
+    'country_Cambodia' => 'Cambodia',
+    'country_Cameroon' => 'Cameroon',
+    'country_Canada' => 'Canada',
+    'country_Cape Verde' => 'Cape Verde',
+    'country_Cayman Islands' => 'Cayman Islands',
+    'country_Central African Republic' => 'Central African Republic',
+    'country_Sri Lanka' => 'Sri Lanka',
+    'country_Chad' => 'Chad',
+    'country_Chile' => 'Chile',
+    'country_China' => 'China',
+    'country_Taiwan, Province of China' => 'Taiwan, Province of China',
+    'country_Christmas Island' => 'Christmas Island',
+    'country_Cocos (Keeling) Islands' => 'Cocos (Keeling) Islands',
+    'country_Colombia' => 'Colombia',
+    'country_Comoros' => 'Comoros',
+    'country_Mayotte' => 'Mayotte',
+    'country_Congo' => 'Congo',
+    'country_Congo, the Democratic Republic of the' => 'Congo, the Democratic Republic of the',
+    'country_Cook Islands' => 'Cook Islands',
+    'country_Costa Rica' => 'Costa Rica',
+    'country_Croatia' => 'Croatia',
+    'country_Cuba' => 'Cuba',
+    'country_Cyprus' => 'Cyprus',
+    'country_Czech Republic' => 'Czech Republic',
+    'country_Benin' => 'Benin',
+    'country_Denmark' => 'Denmark',
+    'country_Dominica' => 'Dominica',
+    'country_Dominican Republic' => 'Dominican Republic',
+    'country_Ecuador' => 'Ecuador',
+    'country_El Salvador' => 'El Salvador',
+    'country_Equatorial Guinea' => 'Equatorial Guinea',
+    'country_Ethiopia' => 'Ethiopia',
+    'country_Eritrea' => 'Eritrea',
+    'country_Estonia' => 'Estonia',
+    'country_Faroe Islands' => 'Faroe Islands',
+    'country_Falkland Islands (Malvinas)' => 'Falkland Islands (Malvinas)',
+    'country_South Georgia and the South Sandwich Islands' => 'South Georgia and the South Sandwich Islands',
+    'country_Fiji' => 'Fiji',
+    'country_Finland' => 'Finland',
+    'country_Åland Islands' => 'Åland Islands',
+    'country_France' => 'France',
+    'country_French Guiana' => 'French Guiana',
+    'country_French Polynesia' => 'French Polynesia',
+    'country_French Southern Territories' => 'French Southern Territories',
+    'country_Djibouti' => 'Djibouti',
+    'country_Gabon' => 'Gabon',
+    'country_Georgia' => 'Georgia',
+    'country_Gambia' => 'Gambia',
+    'country_Palestinian Territory, Occupied' => 'Palestinian Territory, Occupied',
+    'country_Germany' => 'Germany',
+    'country_Ghana' => 'Ghana',
+    'country_Gibraltar' => 'Gibraltar',
+    'country_Kiribati' => 'Kiribati',
+    'country_Greece' => 'Greece',
+    'country_Greenland' => 'Greenland',
+    'country_Grenada' => 'Grenada',
+    'country_Guadeloupe' => 'Guadeloupe',
+    'country_Guam' => 'Guam',
+    'country_Guatemala' => 'Guatemala',
+    'country_Guinea' => 'Guinea',
+    'country_Guyana' => 'Guyana',
+    'country_Haiti' => 'Haiti',
+    'country_Heard Island and McDonald Islands' => 'Heard Island and McDonald Islands',
+    'country_Holy See (Vatican City State)' => 'Holy See (Vatican City State)',
+    'country_Honduras' => 'Honduras',
+    'country_Hong Kong' => 'Hong Kong',
+    'country_Hungary' => 'Hungary',
+    'country_Iceland' => 'Iceland',
+    'country_India' => 'India',
+    'country_Indonesia' => 'Indonesia',
+    'country_Iran, Islamic Republic of' => 'Iran, Islamic Republic of',
+    'country_Iraq' => 'Iraq',
+    'country_Ireland' => 'Ireland',
+    'country_Israel' => 'Israel',
+    'country_Italy' => 'Italy',
+    'country_Côte d\'Ivoire' => 'Côte d\'Ivoire',
+    'country_Jamaica' => 'Jamaica',
+    'country_Japan' => 'Japan',
+    'country_Kazakhstan' => 'Kazakhstan',
+    'country_Jordan' => 'Jordan',
+    'country_Kenya' => 'Kenya',
+    'country_Korea, Democratic People\'s Republic of' => 'Korea, Democratic People\'s Republic of',
+    'country_Korea, Republic of' => 'Korea, Republic of',
+    'country_Kuwait' => 'Kuwait',
+    'country_Kyrgyzstan' => 'Kyrgyzstan',
+    'country_Lao People\'s Democratic Republic' => 'Lao People\'s Democratic Republic',
+    'country_Lebanon' => 'Lebanon',
+    'country_Lesotho' => 'Lesotho',
+    'country_Latvia' => 'Latvia',
+    'country_Liberia' => 'Liberia',
+    'country_Libya' => 'Libya',
+    'country_Liechtenstein' => 'Liechtenstein',
+    'country_Lithuania' => 'Lithuania',
+    'country_Luxembourg' => 'Luxembourg',
+    'country_Macao' => 'Macao',
+    'country_Madagascar' => 'Madagascar',
+    'country_Malawi' => 'Malawi',
+    'country_Malaysia' => 'Malaysia',
+    'country_Maldives' => 'Maldives',
+    'country_Mali' => 'Mali',
+    'country_Malta' => 'Malta',
+    'country_Martinique' => 'Martinique',
+    'country_Mauritania' => 'Mauritania',
+    'country_Mauritius' => 'Mauritius',
+    'country_Mexico' => 'Mexico',
+    'country_Monaco' => 'Monaco',
+    'country_Mongolia' => 'Mongolia',
+    'country_Moldova, Republic of' => 'Moldova, Republic of',
+    'country_Montenegro' => 'Montenegro',
+    'country_Montserrat' => 'Montserrat',
+    'country_Morocco' => 'Morocco',
+    'country_Mozambique' => 'Mozambique',
+    'country_Oman' => 'Oman',
+    'country_Namibia' => 'Namibia',
+    'country_Nauru' => 'Nauru',
+    'country_Nepal' => 'Nepal',
+    'country_Netherlands' => 'Netherlands',
+    'country_Curaçao' => 'Curaçao',
+    'country_Aruba' => 'Aruba',
+    'country_Sint Maarten (Dutch part)' => 'Sint Maarten (Dutch part)',
+    'country_Bonaire, Sint Eustatius and Saba' => 'Bonaire, Sint Eustatius and Saba',
+    'country_New Caledonia' => 'New Caledonia',
+    'country_Vanuatu' => 'Vanuatu',
+    'country_New Zealand' => 'New Zealand',
+    'country_Nicaragua' => 'Nicaragua',
+    'country_Niger' => 'Niger',
+    'country_Nigeria' => 'Nigeria',
+    'country_Niue' => 'Niue',
+    'country_Norfolk Island' => 'Norfolk Island',
+    'country_Norway' => 'Norway',
+    'country_Northern Mariana Islands' => 'Northern Mariana Islands',
+    'country_United States Minor Outlying Islands' => 'United States Minor Outlying Islands',
+    'country_Micronesia, Federated States of' => 'Micronesia, Federated States of',
+    'country_Marshall Islands' => 'Marshall Islands',
+    'country_Palau' => 'Palau',
+    'country_Pakistan' => 'Pakistan',
+    'country_Panama' => 'Panama',
+    'country_Papua New Guinea' => 'Papua New Guinea',
+    'country_Paraguay' => 'Paraguay',
+    'country_Peru' => 'Peru',
+    'country_Philippines' => 'Philippines',
+    'country_Pitcairn' => 'Pitcairn',
+    'country_Poland' => 'Poland',
+    'country_Portugal' => 'Portugal',
+    'country_Guinea-Bissau' => 'Guinea-Bissau',
+    'country_Timor-Leste' => 'Timor-Leste',
+    'country_Puerto Rico' => 'Puerto Rico',
+    'country_Qatar' => 'Qatar',
+    'country_Réunion' => 'Réunion',
+    'country_Romania' => 'Romania',
+    'country_Russian Federation' => 'Russian Federation',
+    'country_Rwanda' => 'Rwanda',
+    'country_Saint Barthélemy' => 'Saint Barthélemy',
+    'country_Saint Helena, Ascension and Tristan da Cunha' => 'Saint Helena, Ascension and Tristan da Cunha',
+    'country_Saint Kitts and Nevis' => 'Saint Kitts and Nevis',
+    'country_Anguilla' => 'Anguilla',
+    'country_Saint Lucia' => 'Saint Lucia',
+    'country_Saint Martin (French part)' => 'Saint Martin (French part)',
+    'country_Saint Pierre and Miquelon' => 'Saint Pierre and Miquelon',
+    'country_Saint Vincent and the Grenadines' => 'Saint Vincent and the Grenadines',
+    'country_San Marino' => 'San Marino',
+    'country_Sao Tome and Principe' => 'Sao Tome and Principe',
+    'country_Saudi Arabia' => 'Saudi Arabia',
+    'country_Senegal' => 'Senegal',
+    'country_Serbia' => 'Serbia',
+    'country_Seychelles' => 'Seychelles',
+    'country_Sierra Leone' => 'Sierra Leone',
+    'country_Singapore' => 'Singapore',
+    'country_Slovakia' => 'Slovakia',
+    'country_Viet Nam' => 'Viet Nam',
+    'country_Slovenia' => 'Slovenia',
+    'country_Somalia' => 'Somalia',
+    'country_South Africa' => 'South Africa',
+    'country_Zimbabwe' => 'Zimbabwe',
+    'country_Spain' => 'Spain',
+    'country_South Sudan' => 'South Sudan',
+    'country_Sudan' => 'Sudan',
+    'country_Western Sahara' => 'Western Sahara',
+    'country_Suriname' => 'Suriname',
+    'country_Svalbard and Jan Mayen' => 'Svalbard and Jan Mayen',
+    'country_Swaziland' => 'Swaziland',
+    'country_Sweden' => 'Sweden',
+    'country_Switzerland' => 'Switzerland',
+    'country_Syrian Arab Republic' => 'Syrian Arab Republic',
+    'country_Tajikistan' => 'Tajikistan',
+    'country_Thailand' => 'Thailand',
+    'country_Togo' => 'Togo',
+    'country_Tokelau' => 'Tokelau',
+    'country_Tonga' => 'Tonga',
+    'country_Trinidad and Tobago' => 'Trinidad and Tobago',
+    'country_United Arab Emirates' => 'United Arab Emirates',
+    'country_Tunisia' => 'Tunisia',
+    'country_Turkey' => 'Turkey',
+    'country_Turkmenistan' => 'Turkmenistan',
+    'country_Turks and Caicos Islands' => 'Turks and Caicos Islands',
+    'country_Tuvalu' => 'Tuvalu',
+    'country_Uganda' => 'Uganda',
+    '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_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_Virgin Islands, U.S.' => 'Virgin Islands, U.S.',
+    'country_Burkina Faso' => 'Burkina Faso',
+    'country_Uruguay' => 'Uruguay',
+    'country_Uzbekistan' => 'Uzbekistan',
+    'country_Venezuela, Bolivarian Republic of' => 'Venezuela, Bolivarian Republic of',
+    'country_Wallis and Futuna' => 'Wallis and Futuna',
+    'country_Samoa' => 'Samoa',
+    'country_Yemen' => 'Yemen',
+    'country_Zambi' => 'Zambi',
+
+    'view_client_portal' => 'View client portal',
+    'view_portal' => 'View Portal',
+    'vendor_contacts' => 'Vendor Contacts',
+    'all' => 'All',
+    'selected' => 'Selected',
+    'category' => 'Category',
+    'categories' => 'Categories',
+    'new_expense_category' => 'New Expense Category',
+    'edit_category' => 'Edit Category',
+    'archive_expense_category' => 'Archive Category',
+    'expense_categories' => 'Expense Categories',
+    'list_expense_categories' => 'List Expense Categories',
+    'updated_expense_category' => 'Successfully updated expense category',
+    'created_expense_category' => 'Successfully created expense category',
+    'archived_expense_category' => 'Successfully archived expense category',
+    'archived_expense_categories' => 'Successfully archived :count expense category',
+    'restore_expense_category' => 'Restore expense category',
+    'restored_expense_category' => 'Successfully restored expense category',
+    'apply_taxes' => 'Apply taxes',
+    'min_to_max_users' => ':min to :max users',
+    'max_users_reached' => 'The maximum number of users has been reached.',
+    'buy_now_buttons' => 'Buy Now Buttons',
+    'landing_page' => 'Landing Page',
+    'payment_type' => 'Payment Type',
+    'form' => 'Form',
+    'link' => 'Link',
+    'fields' => 'Fields',
+    'dwolla' => 'Dwolla',
+    'buy_now_buttons_warning' => 'Note: client and invoice records are created even if the transaction isn\'t completed.',
+    'buy_now_buttons_disabled' => 'This feature requires that a product is created and a payment gateway is configured.',
+    'enable_buy_now_buttons_help' => 'Enable support for buy now buttons',
+    'changes_take_effect_immediately' => 'Note: changes take effect immediately',
+    'wepay_account_description' => 'Payment gateway for Invoice Ninja',
+    'payment_error_code' => 'There was an error processing your payment [:code]. Please try again later.',
+    'standard_fees_apply' => 'Standard fees apply: 2.9% + $0.30 per successful charge.',
+    'limit_import_rows' => 'Data needs to be imported in batches of :count rows or less',
+
 
 );
 

resources/lang/th/texts.php

@@ -1,6 +1,7 @@
 <?php
 
 $LANG = array(
+
     'organization' => 'องค์กร',
     'name' => 'ชื่อ',
     'website' => 'เว็บไซต์',
@@ -146,7 +147,7 @@ $LANG = array(
     'edit_client' => 'แก้ไขลูกค้า',
     'edit_invoice' => 'แก้ไขใบแจ้งหนี้',
     'create_invoice' => 'สร้างใบแจ้งหนี้',
-    'enter_credit' => 'Enter Credit',
+    'enter_credit' => 'เพิ่มเครดิต',
     'last_logged_in' => 'เข้าระบบล่าสุด',
     'details' => 'รายละเอียด',
     'standing' => 'ยอดคงค้าง',
@@ -386,7 +387,7 @@ $LANG = array(
     'gateway_help_1' => ':link to sign up for Authorize.net.',
     'gateway_help_2' => ':link to sign up for Authorize.net.',
     'gateway_help_17' => ':link to get your PayPal API signature.',
-    'gateway_help_27' => ':link to sign up for TwoCheckout.',
+    'gateway_help_27' => ':link to sign up for 2Checkout.com. To ensure payments are tracked set :complete_link as the redirect URL under Account > Site Management in the 2Checkout portal.',
     'more_designs' => 'More designs',
     'more_designs_title' => 'Additional Invoice Designs',
     'more_designs_cloud_header' => 'Go Pro for more invoice designs',
@@ -418,16 +419,16 @@ $LANG = array(
     'restored_payment' => 'Successfully restored payment',
     'restored_credit' => 'Successfully restored credit',
     'reason_for_canceling' => 'Help us improve our site by telling us why you\'re leaving.',
-    'discount_percent' => 'Percent',
-    'discount_amount' => 'Amount',
-    'invoice_history' => 'Invoice History',
-    'quote_history' => 'Quote History',
-    'current_version' => 'Current version',
-    'select_version' => 'Select version',
-    'view_history' => 'View History',
-    'edit_payment' => 'Edit Payment',
-    'updated_payment' => 'Successfully updated payment',
-    'deleted' => 'Deleted',
+    'discount_percent' => 'เปอร์เซ็นต์',
+    'discount_amount' => 'ยอดรวม',
+    'invoice_history' => 'ประวัติการแจ้งหนี้',
+    'quote_history' => 'ประวัติการเสนอราคา',
+    'current_version' => 'รุ่นปัจจุบัน',
+    'select_version' => 'เลือกรุ่น',
+    'view_history' => 'ดูประวัติย้อนหลัง',
+    'edit_payment' => 'แก้ไขรายการจ่ายเงิน',
+    'updated_payment' => 'การปรับปรุงรายการจ่ายเงินเสร็จสมบูรณ์',
+    'deleted' => 'ลบแล้ว',
     'restore_user' => 'Restore User',
     'restored_user' => 'Successfully restored user',
     'show_deleted_users' => 'Show deleted users',
@@ -773,6 +774,8 @@ $LANG = array(
     'activity_35' => ':user created :vendor',
     'activity_36' => ':user created :vendor',
     'activity_37' => ':user created :vendor',
+    'activity_42' => ':user created task ":task"',
+    'activity_43' => ':user updated task ":task"',
     'payment' => 'Payment',
     'system' => 'System',
     'signature' => 'Email Signature',
@@ -992,7 +995,7 @@ $LANG = array(
     'overdue' => 'Overdue',
 
 
-    'white_label_text' => 'Purchase a ONE YEAR white label license for $:price to remove the Invoice Ninja branding from the client portal and help support our project.',
+    'white_label_text' => 'Purchase a ONE YEAR white label license for $:price to remove the Invoice Ninja branding and help support our project.',
     'user_email_footer' => 'To adjust your email notification settings please visit :link',
     'reset_password_footer' => 'If you did not request this password reset please email our support: :email',
     'limit_users' => 'Sorry, this will exceed the limit of :limit users',
@@ -1289,11 +1292,11 @@ $LANG = array(
     'use_another_provider' => 'Use another provider',
     'company_name' => 'ชื่อบริษัท',
     'wepay_company_name_help' => 'This will appear on client\'s credit card statements.',
-    'wepay_description_help' => 'The purpose of this account.',
-    'wepay_tos_agree' => 'I agree to the :link.',
-    'wepay_tos_link_text' => 'WePay Terms of Service',
-    'resend_confirmation_email' => 'Resend Confirmation Email',
-    'manage_wepay_account' => 'Manage WePay Account',
+    'wepay_description_help' => 'วัตถุประสงค์ของบัญชีนี้',
+    'wepay_tos_agree' => 'ข้าพเจ้าเห็นด้วยตาม :link',
+    'wepay_tos_link_text' => 'เงื่อนไขของ WePay',
+    'resend_confirmation_email' => 'ส่งอีเมลเพื่อยืนยันใหม่',
+    'manage_account' => 'Manage Account',
     'action_required' => 'Action Required',
     'finish_setup' => 'การติดตั้งเสร็จสมบูรณ์',
     'created_wepay_confirmation_required' => 'Please check your email and confirm your email address with WePay.',
@@ -1361,6 +1364,686 @@ $LANG = array(
     'failed_remove_payment_method' => 'Failed to remove the payment method',
     'gateway_exists' => 'This gateway already exists',
     'manual_entry' => 'Manual entry',
+    'start_of_week' => 'First day of the week',
+
+    // Frequencies
+    'freq_weekly' => 'Weekly',
+    'freq_two_weeks' => 'Two weeks',
+    'freq_four_weeks' => 'Four weeks',
+    'freq_monthly' => 'Monthly',
+    'freq_three_months' => 'Three months',
+    'freq_six_months' => 'Six months',
+    'freq_annually' => 'Annually',
+
+    // Payment types
+    'payment_type_Apply Credit' => 'Apply Credit',
+    'payment_type_Bank Transfer' => 'Bank Transfer',
+    'payment_type_Cash' => 'Cash',
+    'payment_type_Debit' => 'Debit',
+    'payment_type_ACH' => 'ACH',
+    'payment_type_Visa Card' => 'Visa Card',
+    'payment_type_MasterCard' => 'MasterCard',
+    'payment_type_American Express' => 'American Express',
+    'payment_type_Discover Card' => 'Discover Card',
+    'payment_type_Diners Card' => 'Diners Card',
+    'payment_type_EuroCard' => 'EuroCard',
+    'payment_type_Nova' => 'Nova',
+    'payment_type_Credit Card Other' => 'Credit Card Other',
+    'payment_type_PayPal' => 'PayPal',
+    'payment_type_Google Wallet' => 'Google Wallet',
+    'payment_type_Check' => 'Check',
+
+    // Industries
+    'industry_Accounting & Legal' => 'Accounting & Legal',
+    'industry_Advertising' => 'Advertising',
+    'industry_Aerospace' => 'Aerospace',
+    'industry_Agriculture' => 'Agriculture',
+    'industry_Automotive' => 'Automotive',
+    'industry_Banking & Finance' => 'Banking & Finance',
+    'industry_Biotechnology' => 'Biotechnology',
+    'industry_Broadcasting' => 'Broadcasting',
+    'industry_Business Services' => 'Business Services',
+    'industry_Commodities & Chemicals' => 'Commodities & Chemicals',
+    'industry_Communications' => 'Communications',
+    'industry_Computers & Hightech' => 'Computers & Hightech',
+    'industry_Defense' => 'Defense',
+    'industry_Energy' => 'Energy',
+    'industry_Entertainment' => 'Entertainment',
+    'industry_Government' => 'Government',
+    'industry_Healthcare & Life Sciences' => 'Healthcare & Life Sciences',
+    'industry_Insurance' => 'Insurance',
+    'industry_Manufacturing' => 'Manufacturing',
+    'industry_Marketing' => 'Marketing',
+    'industry_Media' => 'Media',
+    'industry_Nonprofit & Higher Ed' => 'Nonprofit & Higher Ed',
+    'industry_Pharmaceuticals' => 'Pharmaceuticals',
+    'industry_Professional Services & Consulting' => 'Professional Services & Consulting',
+    'industry_Real Estate' => 'Real Estate',
+    'industry_Retail & Wholesale' => 'Retail & Wholesale',
+    'industry_Sports' => 'Sports',
+    'industry_Transportation' => 'Transportation',
+    'industry_Travel & Luxury' => 'Travel & Luxury',
+    'industry_Other' => 'อื่นๆ',
+    'industry_Photography' =>'ภาพถ่าย',
+
+    // Countries
+    'country_Afghanistan' => 'Afghanistan',
+    'country_Albania' => 'Albania',
+    'country_Antarctica' => 'Antarctica',
+    'country_Algeria' => 'Algeria',
+    'country_American Samoa' => 'American Samoa',
+    'country_Andorra' => 'Andorra',
+    'country_Angola' => 'Angola',
+    'country_Antigua and Barbuda' => 'Antigua and Barbuda',
+    'country_Azerbaijan' => 'Azerbaijan',
+    'country_Argentina' => 'Argentina',
+    'country_Australia' => 'Australia',
+    'country_Austria' => 'Austria',
+    'country_Bahamas' => 'Bahamas',
+    'country_Bahrain' => 'Bahrain',
+    'country_Bangladesh' => 'Bangladesh',
+    'country_Armenia' => 'Armenia',
+    'country_Barbados' => 'Barbados',
+    'country_Belgium' => 'Belgium',
+    'country_Bermuda' => 'Bermuda',
+    'country_Bhutan' => 'Bhutan',
+    'country_Bolivia, Plurinational State of' => 'Bolivia, Plurinational State of',
+    'country_Bosnia and Herzegovina' => 'Bosnia and Herzegovina',
+    'country_Botswana' => 'Botswana',
+    'country_Bouvet Island' => 'Bouvet Island',
+    'country_Brazil' => 'Brazil',
+    'country_Belize' => 'Belize',
+    'country_British Indian Ocean Territory' => 'British Indian Ocean Territory',
+    'country_Solomon Islands' => 'Solomon Islands',
+    'country_Virgin Islands, British' => 'Virgin Islands, British',
+    'country_Brunei Darussalam' => 'Brunei Darussalam',
+    'country_Bulgaria' => 'Bulgaria',
+    'country_Myanmar' => 'Myanmar',
+    'country_Burundi' => 'Burundi',
+    'country_Belarus' => 'Belarus',
+    'country_Cambodia' => 'Cambodia',
+    'country_Cameroon' => 'Cameroon',
+    'country_Canada' => 'Canada',
+    'country_Cape Verde' => 'Cape Verde',
+    'country_Cayman Islands' => 'Cayman Islands',
+    'country_Central African Republic' => 'Central African Republic',
+    'country_Sri Lanka' => 'Sri Lanka',
+    'country_Chad' => 'Chad',
+    'country_Chile' => 'Chile',
+    'country_China' => 'China',
+    'country_Taiwan, Province of China' => 'Taiwan, Province of China',
+    'country_Christmas Island' => 'Christmas Island',
+    'country_Cocos (Keeling) Islands' => 'Cocos (Keeling) Islands',
+    'country_Colombia' => 'Colombia',
+    'country_Comoros' => 'Comoros',
+    'country_Mayotte' => 'Mayotte',
+    'country_Congo' => 'Congo',
+    'country_Congo, the Democratic Republic of the' => 'Congo, the Democratic Republic of the',
+    'country_Cook Islands' => 'Cook Islands',
+    'country_Costa Rica' => 'Costa Rica',
+    'country_Croatia' => 'Croatia',
+    'country_Cuba' => 'Cuba',
+    'country_Cyprus' => 'Cyprus',
+    'country_Czech Republic' => 'Czech Republic',
+    'country_Benin' => 'Benin',
+    'country_Denmark' => 'Denmark',
+    'country_Dominica' => 'Dominica',
+    'country_Dominican Republic' => 'Dominican Republic',
+    'country_Ecuador' => 'Ecuador',
+    'country_El Salvador' => 'El Salvador',
+    'country_Equatorial Guinea' => 'Equatorial Guinea',
+    'country_Ethiopia' => 'Ethiopia',
+    'country_Eritrea' => 'Eritrea',
+    'country_Estonia' => 'Estonia',
+    'country_Faroe Islands' => 'Faroe Islands',
+    'country_Falkland Islands (Malvinas)' => 'Falkland Islands (Malvinas)',
+    'country_South Georgia and the South Sandwich Islands' => 'South Georgia and the South Sandwich Islands',
+    'country_Fiji' => 'Fiji',
+    'country_Finland' => 'Finland',
+    'country_Åland Islands' => 'Åland Islands',
+    'country_France' => 'France',
+    'country_French Guiana' => 'French Guiana',
+    'country_French Polynesia' => 'French Polynesia',
+    'country_French Southern Territories' => 'French Southern Territories',
+    'country_Djibouti' => 'Djibouti',
+    'country_Gabon' => 'Gabon',
+    'country_Georgia' => 'Georgia',
+    'country_Gambia' => 'Gambia',
+    'country_Palestinian Territory, Occupied' => 'Palestinian Territory, Occupied',
+    'country_Germany' => 'Germany',
+    'country_Ghana' => 'Ghana',
+    'country_Gibraltar' => 'Gibraltar',
+    'country_Kiribati' => 'Kiribati',
+    'country_Greece' => 'Greece',
+    'country_Greenland' => 'Greenland',
+    'country_Grenada' => 'Grenada',
+    'country_Guadeloupe' => 'Guadeloupe',
+    'country_Guam' => 'Guam',
+    'country_Guatemala' => 'Guatemala',
+    'country_Guinea' => 'Guinea',
+    'country_Guyana' => 'Guyana',
+    'country_Haiti' => 'Haiti',
+    'country_Heard Island and McDonald Islands' => 'Heard Island and McDonald Islands',
+    'country_Holy See (Vatican City State)' => 'Holy See (Vatican City State)',
+    'country_Honduras' => 'Honduras',
+    'country_Hong Kong' => 'ฮ่องกง',
+    'country_Hungary' => 'ฮังการี่',
+    'country_Iceland' => 'ไอซ์แลนด์',
+    'country_India' => 'อินเดีย',
+    'country_Indonesia' => 'อินโดนีเซีย',
+    'country_Iran, Islamic Republic of' => 'อิหร่าน',
+    'country_Iraq' => 'Iraq',
+    'country_Ireland' => 'Ireland',
+    'country_Israel' => 'Israel',
+    'country_Italy' => 'Italy',
+    'country_Côte d\'Ivoire' => 'Côte d\'Ivoire',
+    'country_Jamaica' => 'Jamaica',
+    'country_Japan' => 'Japan',
+    'country_Kazakhstan' => 'Kazakhstan',
+    'country_Jordan' => 'Jordan',
+    'country_Kenya' => 'Kenya',
+    'country_Korea, Democratic People\'s Republic of' => 'Korea, Democratic People\'s Republic of',
+    'country_Korea, Republic of' => 'Korea, Republic of',
+    'country_Kuwait' => 'Kuwait',
+    'country_Kyrgyzstan' => 'Kyrgyzstan',
+    'country_Lao People\'s Democratic Republic' => 'Lao People\'s Democratic Republic',
+    'country_Lebanon' => 'Lebanon',
+    'country_Lesotho' => 'Lesotho',
+    'country_Latvia' => 'Latvia',
+    'country_Liberia' => 'Liberia',
+    'country_Libya' => 'Libya',
+    'country_Liechtenstein' => 'Liechtenstein',
+    'country_Lithuania' => 'Lithuania',
+    'country_Luxembourg' => 'Luxembourg',
+    'country_Macao' => 'Macao',
+    'country_Madagascar' => 'Madagascar',
+    'country_Malawi' => 'Malawi',
+    'country_Malaysia' => 'Malaysia',
+    'country_Maldives' => 'Maldives',
+    'country_Mali' => 'Mali',
+    'country_Malta' => 'Malta',
+    'country_Martinique' => 'Martinique',
+    'country_Mauritania' => 'Mauritania',
+    'country_Mauritius' => 'Mauritius',
+    'country_Mexico' => 'Mexico',
+    'country_Monaco' => 'Monaco',
+    'country_Mongolia' => 'Mongolia',
+    'country_Moldova, Republic of' => 'Moldova, Republic of',
+    'country_Montenegro' => 'Montenegro',
+    'country_Montserrat' => 'Montserrat',
+    'country_Morocco' => 'Morocco',
+    'country_Mozambique' => 'Mozambique',
+    'country_Oman' => 'Oman',
+    'country_Namibia' => 'Namibia',
+    'country_Nauru' => 'Nauru',
+    'country_Nepal' => 'Nepal',
+    'country_Netherlands' => 'Netherlands',
+    'country_Curaçao' => 'Curaçao',
+    'country_Aruba' => 'Aruba',
+    'country_Sint Maarten (Dutch part)' => 'Sint Maarten (Dutch part)',
+    'country_Bonaire, Sint Eustatius and Saba' => 'Bonaire, Sint Eustatius and Saba',
+    'country_New Caledonia' => 'New Caledonia',
+    'country_Vanuatu' => 'Vanuatu',
+    'country_New Zealand' => 'New Zealand',
+    'country_Nicaragua' => 'Nicaragua',
+    'country_Niger' => 'Niger',
+    'country_Nigeria' => 'Nigeria',
+    'country_Niue' => 'Niue',
+    'country_Norfolk Island' => 'Norfolk Island',
+    'country_Norway' => 'Norway',
+    'country_Northern Mariana Islands' => 'Northern Mariana Islands',
+    'country_United States Minor Outlying Islands' => 'United States Minor Outlying Islands',
+    'country_Micronesia, Federated States of' => 'Micronesia, Federated States of',
+    'country_Marshall Islands' => 'Marshall Islands',
+    'country_Palau' => 'Palau',
+    'country_Pakistan' => 'Pakistan',
+    'country_Panama' => 'Panama',
+    'country_Papua New Guinea' => 'Papua New Guinea',
+    'country_Paraguay' => 'Paraguay',
+    'country_Peru' => 'Peru',
+    'country_Philippines' => 'Philippines',
+    'country_Pitcairn' => 'Pitcairn',
+    'country_Poland' => 'Poland',
+    'country_Portugal' => 'Portugal',
+    'country_Guinea-Bissau' => 'Guinea-Bissau',
+    'country_Timor-Leste' => 'Timor-Leste',
+    'country_Puerto Rico' => 'Puerto Rico',
+    'country_Qatar' => 'Qatar',
+    'country_Réunion' => 'Réunion',
+    'country_Romania' => 'Romania',
+    'country_Russian Federation' => 'Russian Federation',
+    'country_Rwanda' => 'Rwanda',
+    'country_Saint Barthélemy' => 'Saint Barthélemy',
+    'country_Saint Helena, Ascension and Tristan da Cunha' => 'Saint Helena, Ascension and Tristan da Cunha',
+    'country_Saint Kitts and Nevis' => 'Saint Kitts and Nevis',
+    'country_Anguilla' => 'Anguilla',
+    'country_Saint Lucia' => 'Saint Lucia',
+    'country_Saint Martin (French part)' => 'Saint Martin (French part)',
+    'country_Saint Pierre and Miquelon' => 'Saint Pierre and Miquelon',
+    'country_Saint Vincent and the Grenadines' => 'Saint Vincent and the Grenadines',
+    'country_San Marino' => 'San Marino',
+    'country_Sao Tome and Principe' => 'Sao Tome and Principe',
+    'country_Saudi Arabia' => 'Saudi Arabia',
+    'country_Senegal' => 'Senegal',
+    'country_Serbia' => 'Serbia',
+    'country_Seychelles' => 'Seychelles',
+    'country_Sierra Leone' => 'Sierra Leone',
+    'country_Singapore' => 'Singapore',
+    'country_Slovakia' => 'Slovakia',
+    'country_Viet Nam' => 'Viet Nam',
+    'country_Slovenia' => 'Slovenia',
+    'country_Somalia' => 'Somalia',
+    'country_South Africa' => 'South Africa',
+    'country_Zimbabwe' => 'Zimbabwe',
+    'country_Spain' => 'Spain',
+    'country_South Sudan' => 'South Sudan',
+    'country_Sudan' => 'Sudan',
+    'country_Western Sahara' => 'Western Sahara',
+    'country_Suriname' => 'Suriname',
+    'country_Svalbard and Jan Mayen' => 'Svalbard and Jan Mayen',
+    'country_Swaziland' => 'Swaziland',
+    'country_Sweden' => 'Sweden',
+    'country_Switzerland' => 'Switzerland',
+    'country_Syrian Arab Republic' => 'Syrian Arab Republic',
+    'country_Tajikistan' => 'Tajikistan',
+    'country_Thailand' => 'Thailand',
+    'country_Togo' => 'Togo',
+    'country_Tokelau' => 'Tokelau',
+    'country_Tonga' => 'Tonga',
+    'country_Trinidad and Tobago' => 'Trinidad and Tobago',
+    'country_United Arab Emirates' => 'United Arab Emirates',
+    'country_Tunisia' => 'Tunisia',
+    'country_Turkey' => 'Turkey',
+    'country_Turkmenistan' => 'Turkmenistan',
+    'country_Turks and Caicos Islands' => 'Turks and Caicos Islands',
+    'country_Tuvalu' => 'Tuvalu',
+    'country_Uganda' => 'Uganda',
+    '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_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_Virgin Islands, U.S.' => 'Virgin Islands, U.S.',
+    'country_Burkina Faso' => 'Burkina Faso',
+    'country_Uruguay' => 'Uruguay',
+    'country_Uzbekistan' => 'Uzbekistan',
+    'country_Venezuela, Bolivarian Republic of' => 'Venezuela, Bolivarian Republic of',
+    'country_Wallis and Futuna' => 'Wallis and Futuna',
+    'country_Samoa' => 'Samoa',
+    'country_Yemen' => 'Yemen',
+    'country_Zambi' => 'Zambi',
+
+    // Languages
+    'lang_Brazilian Portuguese' => 'Brazilian Portuguese',
+    'lang_Croatian' => 'Croatian',
+    'lang_Czech' => 'Czech',
+    'lang_Danish' => 'Danish',
+    'lang_Dutch' => 'Dutch',
+    'lang_English' => 'English',
+    'lang_French' => 'French',
+    'lang_French - Canada' => 'French - Canada',
+    'lang_German' => 'German',
+    'lang_Italian' => 'Italian',
+    'lang_Japanese' => 'Japanese',
+    'lang_Lithuanian' => 'Lithuanian',
+    'lang_Norwegian' => 'Norwegian',
+    'lang_Polish' => 'Polish',
+    'lang_Spanish' => 'Spanish',
+    'lang_Spanish - Spain' => 'Spanish - Spain',
+    'lang_Swedish' => 'Swedish',
+
+    // Frequencies
+    'freq_weekly' => 'Weekly',
+    'freq_two_weeks' => 'Two weeks',
+    'freq_four_weeks' => 'Four weeks',
+    'freq_monthly' => 'Monthly',
+    'freq_three_months' => 'Three months',
+    'freq_six_months' => 'Six months',
+    'freq_annually' => 'Annually',
+
+    // Payment types
+    'payment_type_Apply Credit' => 'Apply Credit',
+    'payment_type_Bank Transfer' => 'Bank Transfer',
+    'payment_type_Cash' => 'Cash',
+    'payment_type_Debit' => 'Debit',
+    'payment_type_ACH' => 'ACH',
+    'payment_type_Visa Card' => 'Visa Card',
+    'payment_type_MasterCard' => 'MasterCard',
+    'payment_type_American Express' => 'American Express',
+    'payment_type_Discover Card' => 'Discover Card',
+    'payment_type_Diners Card' => 'Diners Card',
+    'payment_type_EuroCard' => 'EuroCard',
+    'payment_type_Nova' => 'Nova',
+    'payment_type_Credit Card Other' => 'Credit Card Other',
+    'payment_type_PayPal' => 'PayPal',
+    'payment_type_Google Wallet' => 'Google Wallet',
+    'payment_type_Check' => 'Check',
+
+    // Industries
+    'industry_Accounting & Legal' => 'Accounting & Legal',
+    'industry_Advertising' => 'Advertising',
+    'industry_Aerospace' => 'Aerospace',
+    'industry_Agriculture' => 'Agriculture',
+    'industry_Automotive' => 'Automotive',
+    'industry_Banking & Finance' => 'Banking & Finance',
+    'industry_Biotechnology' => 'Biotechnology',
+    'industry_Broadcasting' => 'Broadcasting',
+    'industry_Business Services' => 'Business Services',
+    'industry_Commodities & Chemicals' => 'Commodities & Chemicals',
+    'industry_Communications' => 'Communications',
+    'industry_Computers & Hightech' => 'Computers & Hightech',
+    'industry_Defense' => 'Defense',
+    'industry_Energy' => 'Energy',
+    'industry_Entertainment' => 'Entertainment',
+    'industry_Government' => 'Government',
+    'industry_Healthcare & Life Sciences' => 'Healthcare & Life Sciences',
+    'industry_Insurance' => 'Insurance',
+    'industry_Manufacturing' => 'Manufacturing',
+    'industry_Marketing' => 'Marketing',
+    'industry_Media' => 'Media',
+    'industry_Nonprofit & Higher Ed' => 'Nonprofit & Higher Ed',
+    'industry_Pharmaceuticals' => 'Pharmaceuticals',
+    'industry_Professional Services & Consulting' => 'Professional Services & Consulting',
+    'industry_Real Estate' => 'Real Estate',
+    'industry_Retail & Wholesale' => 'Retail & Wholesale',
+    'industry_Sports' => 'Sports',
+    'industry_Transportation' => 'Transportation',
+    'industry_Travel & Luxury' => 'Travel & Luxury',
+    'industry_Other' => 'อื่นๆ',
+    'industry_Photography' =>'ภาพถ่าย',
+
+    // Countries
+    'country_Afghanistan' => 'Afghanistan',
+    'country_Albania' => 'Albania',
+    'country_Antarctica' => 'Antarctica',
+    'country_Algeria' => 'Algeria',
+    'country_American Samoa' => 'American Samoa',
+    'country_Andorra' => 'Andorra',
+    'country_Angola' => 'Angola',
+    'country_Antigua and Barbuda' => 'Antigua and Barbuda',
+    'country_Azerbaijan' => 'Azerbaijan',
+    'country_Argentina' => 'Argentina',
+    'country_Australia' => 'Australia',
+    'country_Austria' => 'Austria',
+    'country_Bahamas' => 'Bahamas',
+    'country_Bahrain' => 'Bahrain',
+    'country_Bangladesh' => 'Bangladesh',
+    'country_Armenia' => 'Armenia',
+    'country_Barbados' => 'Barbados',
+    'country_Belgium' => 'Belgium',
+    'country_Bermuda' => 'Bermuda',
+    'country_Bhutan' => 'Bhutan',
+    'country_Bolivia, Plurinational State of' => 'Bolivia, Plurinational State of',
+    'country_Bosnia and Herzegovina' => 'Bosnia and Herzegovina',
+    'country_Botswana' => 'Botswana',
+    'country_Bouvet Island' => 'Bouvet Island',
+    'country_Brazil' => 'Brazil',
+    'country_Belize' => 'Belize',
+    'country_British Indian Ocean Territory' => 'British Indian Ocean Territory',
+    'country_Solomon Islands' => 'Solomon Islands',
+    'country_Virgin Islands, British' => 'Virgin Islands, British',
+    'country_Brunei Darussalam' => 'Brunei Darussalam',
+    'country_Bulgaria' => 'Bulgaria',
+    'country_Myanmar' => 'Myanmar',
+    'country_Burundi' => 'Burundi',
+    'country_Belarus' => 'Belarus',
+    'country_Cambodia' => 'Cambodia',
+    'country_Cameroon' => 'Cameroon',
+    'country_Canada' => 'Canada',
+    'country_Cape Verde' => 'Cape Verde',
+    'country_Cayman Islands' => 'Cayman Islands',
+    'country_Central African Republic' => 'Central African Republic',
+    'country_Sri Lanka' => 'Sri Lanka',
+    'country_Chad' => 'Chad',
+    'country_Chile' => 'Chile',
+    'country_China' => 'China',
+    'country_Taiwan, Province of China' => 'Taiwan, Province of China',
+    'country_Christmas Island' => 'Christmas Island',
+    'country_Cocos (Keeling) Islands' => 'Cocos (Keeling) Islands',
+    'country_Colombia' => 'Colombia',
+    'country_Comoros' => 'Comoros',
+    'country_Mayotte' => 'Mayotte',
+    'country_Congo' => 'Congo',
+    'country_Congo, the Democratic Republic of the' => 'Congo, the Democratic Republic of the',
+    'country_Cook Islands' => 'Cook Islands',
+    'country_Costa Rica' => 'Costa Rica',
+    'country_Croatia' => 'Croatia',
+    'country_Cuba' => 'Cuba',
+    'country_Cyprus' => 'Cyprus',
+    'country_Czech Republic' => 'Czech Republic',
+    'country_Benin' => 'Benin',
+    'country_Denmark' => 'Denmark',
+    'country_Dominica' => 'Dominica',
+    'country_Dominican Republic' => 'Dominican Republic',
+    'country_Ecuador' => 'Ecuador',
+    'country_El Salvador' => 'El Salvador',
+    'country_Equatorial Guinea' => 'Equatorial Guinea',
+    'country_Ethiopia' => 'Ethiopia',
+    'country_Eritrea' => 'Eritrea',
+    'country_Estonia' => 'Estonia',
+    'country_Faroe Islands' => 'Faroe Islands',
+    'country_Falkland Islands (Malvinas)' => 'Falkland Islands (Malvinas)',
+    'country_South Georgia and the South Sandwich Islands' => 'South Georgia and the South Sandwich Islands',
+    'country_Fiji' => 'Fiji',
+    'country_Finland' => 'Finland',
+    'country_Åland Islands' => 'Åland Islands',
+    'country_France' => 'France',
+    'country_French Guiana' => 'French Guiana',
+    'country_French Polynesia' => 'French Polynesia',
+    'country_French Southern Territories' => 'French Southern Territories',
+    'country_Djibouti' => 'Djibouti',
+    'country_Gabon' => 'Gabon',
+    'country_Georgia' => 'Georgia',
+    'country_Gambia' => 'Gambia',
+    'country_Palestinian Territory, Occupied' => 'Palestinian Territory, Occupied',
+    'country_Germany' => 'Germany',
+    'country_Ghana' => 'Ghana',
+    'country_Gibraltar' => 'Gibraltar',
+    'country_Kiribati' => 'Kiribati',
+    'country_Greece' => 'Greece',
+    'country_Greenland' => 'Greenland',
+    'country_Grenada' => 'Grenada',
+    'country_Guadeloupe' => 'Guadeloupe',
+    'country_Guam' => 'Guam',
+    'country_Guatemala' => 'Guatemala',
+    'country_Guinea' => 'Guinea',
+    'country_Guyana' => 'Guyana',
+    'country_Haiti' => 'Haiti',
+    'country_Heard Island and McDonald Islands' => 'Heard Island and McDonald Islands',
+    'country_Holy See (Vatican City State)' => 'Holy See (Vatican City State)',
+    'country_Honduras' => 'Honduras',
+    'country_Hong Kong' => 'ฮ่องกง',
+    'country_Hungary' => 'ฮังการี่',
+    'country_Iceland' => 'ไอซ์แลนด์',
+    'country_India' => 'อินเดีย',
+    'country_Indonesia' => 'อินโดนีเซีย',
+    'country_Iran, Islamic Republic of' => 'อิหร่าน',
+    'country_Iraq' => 'Iraq',
+    'country_Ireland' => 'Ireland',
+    'country_Israel' => 'Israel',
+    'country_Italy' => 'Italy',
+    'country_Côte d\'Ivoire' => 'Côte d\'Ivoire',
+    'country_Jamaica' => 'Jamaica',
+    'country_Japan' => 'Japan',
+    'country_Kazakhstan' => 'Kazakhstan',
+    'country_Jordan' => 'Jordan',
+    'country_Kenya' => 'Kenya',
+    'country_Korea, Democratic People\'s Republic of' => 'Korea, Democratic People\'s Republic of',
+    'country_Korea, Republic of' => 'Korea, Republic of',
+    'country_Kuwait' => 'Kuwait',
+    'country_Kyrgyzstan' => 'Kyrgyzstan',
+    'country_Lao People\'s Democratic Republic' => 'Lao People\'s Democratic Republic',
+    'country_Lebanon' => 'Lebanon',
+    'country_Lesotho' => 'Lesotho',
+    'country_Latvia' => 'Latvia',
+    'country_Liberia' => 'Liberia',
+    'country_Libya' => 'Libya',
+    'country_Liechtenstein' => 'Liechtenstein',
+    'country_Lithuania' => 'Lithuania',
+    'country_Luxembourg' => 'Luxembourg',
+    'country_Macao' => 'Macao',
+    'country_Madagascar' => 'Madagascar',
+    'country_Malawi' => 'Malawi',
+    'country_Malaysia' => 'Malaysia',
+    'country_Maldives' => 'Maldives',
+    'country_Mali' => 'Mali',
+    'country_Malta' => 'Malta',
+    'country_Martinique' => 'Martinique',
+    'country_Mauritania' => 'Mauritania',
+    'country_Mauritius' => 'Mauritius',
+    'country_Mexico' => 'Mexico',
+    'country_Monaco' => 'Monaco',
+    'country_Mongolia' => 'Mongolia',
+    'country_Moldova, Republic of' => 'Moldova, Republic of',
+    'country_Montenegro' => 'Montenegro',
+    'country_Montserrat' => 'Montserrat',
+    'country_Morocco' => 'Morocco',
+    'country_Mozambique' => 'Mozambique',
+    'country_Oman' => 'Oman',
+    'country_Namibia' => 'Namibia',
+    'country_Nauru' => 'Nauru',
+    'country_Nepal' => 'Nepal',
+    'country_Netherlands' => 'Netherlands',
+    'country_Curaçao' => 'Curaçao',
+    'country_Aruba' => 'Aruba',
+    'country_Sint Maarten (Dutch part)' => 'Sint Maarten (Dutch part)',
+    'country_Bonaire, Sint Eustatius and Saba' => 'Bonaire, Sint Eustatius and Saba',
+    'country_New Caledonia' => 'New Caledonia',
+    'country_Vanuatu' => 'Vanuatu',
+    'country_New Zealand' => 'New Zealand',
+    'country_Nicaragua' => 'Nicaragua',
+    'country_Niger' => 'Niger',
+    'country_Nigeria' => 'Nigeria',
+    'country_Niue' => 'Niue',
+    'country_Norfolk Island' => 'Norfolk Island',
+    'country_Norway' => 'Norway',
+    'country_Northern Mariana Islands' => 'Northern Mariana Islands',
+    'country_United States Minor Outlying Islands' => 'United States Minor Outlying Islands',
+    'country_Micronesia, Federated States of' => 'Micronesia, Federated States of',
+    'country_Marshall Islands' => 'Marshall Islands',
+    'country_Palau' => 'Palau',
+    'country_Pakistan' => 'Pakistan',
+    'country_Panama' => 'Panama',
+    'country_Papua New Guinea' => 'Papua New Guinea',
+    'country_Paraguay' => 'Paraguay',
+    'country_Peru' => 'Peru',
+    'country_Philippines' => 'Philippines',
+    'country_Pitcairn' => 'Pitcairn',
+    'country_Poland' => 'Poland',
+    'country_Portugal' => 'Portugal',
+    'country_Guinea-Bissau' => 'Guinea-Bissau',
+    'country_Timor-Leste' => 'Timor-Leste',
+    'country_Puerto Rico' => 'Puerto Rico',
+    'country_Qatar' => 'Qatar',
+    'country_Réunion' => 'Réunion',
+    'country_Romania' => 'Romania',
+    'country_Russian Federation' => 'Russian Federation',
+    'country_Rwanda' => 'Rwanda',
+    'country_Saint Barthélemy' => 'Saint Barthélemy',
+    'country_Saint Helena, Ascension and Tristan da Cunha' => 'Saint Helena, Ascension and Tristan da Cunha',
+    'country_Saint Kitts and Nevis' => 'Saint Kitts and Nevis',
+    'country_Anguilla' => 'Anguilla',
+    'country_Saint Lucia' => 'Saint Lucia',
+    'country_Saint Martin (French part)' => 'Saint Martin (French part)',
+    'country_Saint Pierre and Miquelon' => 'Saint Pierre and Miquelon',
+    'country_Saint Vincent and the Grenadines' => 'Saint Vincent and the Grenadines',
+    'country_San Marino' => 'San Marino',
+    'country_Sao Tome and Principe' => 'Sao Tome and Principe',
+    'country_Saudi Arabia' => 'Saudi Arabia',
+    'country_Senegal' => 'Senegal',
+    'country_Serbia' => 'Serbia',
+    'country_Seychelles' => 'Seychelles',
+    'country_Sierra Leone' => 'Sierra Leone',
+    'country_Singapore' => 'Singapore',
+    'country_Slovakia' => 'Slovakia',
+    'country_Viet Nam' => 'Viet Nam',
+    'country_Slovenia' => 'Slovenia',
+    'country_Somalia' => 'Somalia',
+    'country_South Africa' => 'South Africa',
+    'country_Zimbabwe' => 'Zimbabwe',
+    'country_Spain' => 'Spain',
+    'country_South Sudan' => 'South Sudan',
+    'country_Sudan' => 'Sudan',
+    'country_Western Sahara' => 'Western Sahara',
+    'country_Suriname' => 'Suriname',
+    'country_Svalbard and Jan Mayen' => 'Svalbard and Jan Mayen',
+    'country_Swaziland' => 'Swaziland',
+    'country_Sweden' => 'Sweden',
+    'country_Switzerland' => 'Switzerland',
+    'country_Syrian Arab Republic' => 'Syrian Arab Republic',
+    'country_Tajikistan' => 'Tajikistan',
+    'country_Thailand' => 'Thailand',
+    'country_Togo' => 'Togo',
+    'country_Tokelau' => 'Tokelau',
+    'country_Tonga' => 'Tonga',
+    'country_Trinidad and Tobago' => 'Trinidad and Tobago',
+    'country_United Arab Emirates' => 'United Arab Emirates',
+    'country_Tunisia' => 'Tunisia',
+    'country_Turkey' => 'Turkey',
+    'country_Turkmenistan' => 'Turkmenistan',
+    'country_Turks and Caicos Islands' => 'Turks and Caicos Islands',
+    'country_Tuvalu' => 'Tuvalu',
+    'country_Uganda' => 'Uganda',
+    '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_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_Virgin Islands, U.S.' => 'Virgin Islands, U.S.',
+    'country_Burkina Faso' => 'Burkina Faso',
+    'country_Uruguay' => 'Uruguay',
+    'country_Uzbekistan' => 'Uzbekistan',
+    'country_Venezuela, Bolivarian Republic of' => 'Venezuela, Bolivarian Republic of',
+    'country_Wallis and Futuna' => 'Wallis and Futuna',
+    'country_Samoa' => 'Samoa',
+    'country_Yemen' => 'Yemen',
+    'country_Zambi' => 'Zambi',
+
+    'view_client_portal' => 'View client portal',
+    'view_portal' => 'View Portal',
+    'vendor_contacts' => 'Vendor Contacts',
+    'all' => 'All',
+    'selected' => 'Selected',
+    'category' => 'Category',
+    'categories' => 'Categories',
+    'new_expense_category' => 'New Expense Category',
+    'edit_category' => 'Edit Category',
+    'archive_expense_category' => 'Archive Category',
+    'expense_categories' => 'Expense Categories',
+    'list_expense_categories' => 'List Expense Categories',
+    'updated_expense_category' => 'Successfully updated expense category',
+    'created_expense_category' => 'Successfully created expense category',
+    'archived_expense_category' => 'Successfully archived expense category',
+    'archived_expense_categories' => 'Successfully archived :count expense category',
+    'restore_expense_category' => 'Restore expense category',
+    'restored_expense_category' => 'Successfully restored expense category',
+    'apply_taxes' => 'Apply taxes',
+    'min_to_max_users' => ':min to :max users',
+    'max_users_reached' => 'The maximum number of users has been reached.',
+    'buy_now_buttons' => 'Buy Now Buttons',
+    'landing_page' => 'Landing Page',
+    'payment_type' => 'Payment Type',
+    'form' => 'Form',
+    'link' => 'Link',
+    'fields' => 'Fields',
+    'dwolla' => 'Dwolla',
+    'buy_now_buttons_warning' => 'Note: client and invoice records are created even if the transaction isn\'t completed.',
+    'buy_now_buttons_disabled' => 'This feature requires that a product is created and a payment gateway is configured.',
+    'enable_buy_now_buttons_help' => 'Enable support for buy now buttons',
+    'changes_take_effect_immediately' => 'Note: changes take effect immediately',
+    'wepay_account_description' => 'Payment gateway for Invoice Ninja',
+    'payment_error_code' => 'There was an error processing your payment [:code]. Please try again later.',
+    'standard_fees_apply' => 'Standard fees apply: 2.9% + $0.30 per successful charge.',
+    'limit_import_rows' => 'Data needs to be imported in batches of :count rows or less',
+
 
 );
 

resources/views/accounts/account_gateway_wepay.blade.php

@@ -9,7 +9,6 @@
                 'first_name' => 'required',
                 'last_name' => 'required',
                 'email' => 'required',
-                'description' => 'required',
                 'company_name' => 'required',
                 'tos_agree' => 'required',
                 'country' => 'required',
@@ -40,7 +39,6 @@
             {!! Former::text('last_name') !!}
             {!! Former::text('email') !!}
             {!! Former::text('company_name')->help('wepay_company_name_help')->maxlength(255) !!}
-            {!! Former::text('description')->help('wepay_description_help') !!}
 
             @if (WEPAY_ENABLE_CANADA)
                 <div id="wepay-country">
@@ -72,7 +70,8 @@
 
             {!! Former::checkbox('tos_agree')->label(' ')->text(trans('texts.wepay_tos_agree',
                     ['link'=>'<a id="wepay-tos-link" href="https://go.wepay.com/terms-of-service-us" target="_blank">'.trans('texts.wepay_tos_link_text').'</a>']
-                ))->value('true') !!}
+                ))->value('true')
+                  ->inlineHelp('standard_fees_apply') !!}
         </div>
         </div>
 

resources/views/accounts/api_tokens.blade.php

@@ -6,7 +6,7 @@
 
   <div class="pull-right">
   {!! Button::normal(trans('texts.documentation'))->asLinkTo(NINJA_WEB_URL.'/api-documentation/')->withAttributes(['target' => '_blank'])->appendIcon(Icon::create('info-sign')) !!}
-  @if (Utils::isNinja() && !Utils::isReseller())  
+  @if (Utils::isNinja() && !Utils::isReseller())
     {!! Button::normal(trans('texts.zapier'))->asLinkTo(ZAPIER_URL)->withAttributes(['target' => '_blank']) !!}
   @endif
   @if (Utils::hasFeature(FEATURE_API))
@@ -53,7 +53,7 @@
 
   @if (Utils::isNinja() && !Utils::isReseller())
     <p>&nbsp;</p>
-    <script src="https://zapier.com/zapbook/embed/widget.js?services=invoice-ninja&container=false&limit=6"></script>
+    <script src="https://zapier.com/zapbook/embed/widget.js?guided_zaps=5627,6025,12216,8805,5628,6027&container=false&limit=6"></script>
   @endif
-  
+
 @stop

resources/views/accounts/client_portal.blade.php

@@ -3,7 +3,16 @@
 @section('head')
 @parent
 
-<link href='https://fonts.googleapis.com/css?family=Roboto+Mono' rel='stylesheet' type='text/css'>
+    @include('money_script')
+
+    <link href='https://fonts.googleapis.com/css?family=Roboto+Mono' rel='stylesheet' type='text/css'>
+
+    <style>
+    .checkbox-inline input[type="checkbox"] {
+        margin-left:-20px !important;
+    }
+    </style>
+
 @stop
 
 @section('content')
@@ -17,6 +26,7 @@
 {!! Former::populateField('client_view_css', $client_view_css) !!}
 {!! Former::populateField('enable_portal_password', intval($enable_portal_password)) !!}
 {!! Former::populateField('send_portal_password', intval($send_portal_password)) !!}
+{!! Former::populateField('enable_buy_now_buttons', intval($account->enable_buy_now_buttons)) !!}
 
 @if (!Utils::isNinja() && !Auth::user()->account->hasFeature(FEATURE_WHITE_LABEL))
 <div class="alert alert-warning" style="font-size:larger;">
@@ -69,6 +79,83 @@
             </div>
         </div>
 
+        <div class="panel panel-default" id="buyNow">
+            <div class="panel-heading">
+                <h3 class="panel-title">{!! trans('texts.buy_now_buttons') !!}</h3>
+            </div>
+            <div class="panel-body">
+                <div class="col-md-10 col-md-offset-1">
+
+                    @if (count($gateway_types) && count($products))
+
+                        {!! Former::checkbox('enable_buy_now_buttons')
+                            ->text(trans('texts.enable'))
+                            ->label(' ')
+                            ->help(trans('texts.enable_buy_now_buttons_help')) !!}
+
+                        @if ($account->enable_buy_now_buttons)
+                            {!! Former::select('product')
+                                ->onchange('updateBuyNowButtons()')
+                                ->addOption('', '')
+                                ->inlineHelp('buy_now_buttons_warning')
+                                ->addGroupClass('product-select') !!}
+
+                            {!! Former::checkboxes('client_fields')
+                                    ->onchange('updateBuyNowButtons()')
+                                    ->checkboxes([
+                                        trans('texts.first_name') => ['value' => 'first_name', 'name' => 'first_name'],
+                                        trans('texts.last_name') => ['value' => 'last_name', 'name' => 'last_name'],
+                                        trans('texts.email') => ['value' => 'email', 'name' => 'email'],
+                                    ]) !!}
+
+                            {!! Former::inline_radios('landing_page')
+                                    ->onchange('showPaymentTypes();updateBuyNowButtons();')
+                                    ->radios([
+                                        trans('texts.invoice') => ['value' => 'invoice', 'name' => 'landing_page_type'],
+                                        trans('texts.payment') => ['value' => 'payment', 'name' => 'landing_page_type'],
+                                    ])->check('invoice') !!}
+
+                            <div id="paymentTypesDiv" style="display:none">
+                                {!! Former::select('payment_type')
+                                    ->onchange('updateBuyNowButtons()')
+                                    ->options($gateway_types) !!}
+                            </div>
+
+                            <p>&nbsp;</p>
+
+                            <div role="tabpanel">
+                                <ul class="nav nav-tabs" role="tablist" style="border: none">
+                                    <li role="presentation" class="active">
+                                        <a href="#form" aria-controls="form" role="tab" data-toggle="tab">{{ trans('texts.form') }}</a>
+                                    </li>
+                                    <li role="presentation">
+                                        <a href="#link" aria-controls="link" role="tab" data-toggle="tab">{{ trans('texts.link') }}</a>
+                                    </li>
+                                </ul>
+                            </div>
+                            <div class="tab-content">
+                                <div role="tabpanel" class="tab-pane active" id="form">
+                                    <textarea id="formTextarea" class="form-control" rows="4" readonly></textarea>
+                                </div>
+                                <div role="tabpanel" class="tab-pane" id="link">
+                                    <textarea id="linkTextarea" class="form-control" rows="4" readonly></textarea>
+                                </div>
+                            </div>
+
+                        @endif
+
+                    @else
+
+                        <center style="font-size:16px;color:#888888;">
+                            {{ trans('texts.buy_now_buttons_disabled') }}
+                        </center>
+
+                    @endif
+
+                </div>
+            </div>
+        </div>
+
         @if (Utils::hasFeature(FEATURE_CLIENT_PORTAL_CSS))
         <div class="panel panel-default">
             <div class="panel-heading">
@@ -80,7 +167,6 @@
                     ->label(trans('texts.custom_css'))
                     ->rows(10)
                     ->raw()
-                    ->autofocus()
                     ->maxlength(60000)
                     ->style("min-width:100%;max-width:100%;font-family:'Roboto Mono', 'Lucida Console', Monaco, monospace;font-size:14px;'") !!}
             </div>
@@ -95,12 +181,74 @@
 </center>
 
 {!! Former::close() !!}
+
 <script>
+
+    var products = {!! $products !!};
+    console.log(products);
+
+    $(function() {
+        var $productSelect = $('select#product');
+        for (var i=0; i<products.length; i++) {
+            var product = products[i];
+
+            $productSelect.append(new Option(formatMoney(product.cost) + ' - ' + product.product_key, product.public_id));
+        }
+        $productSelect.combobox();
+
+        fixCheckboxes();
+        updateBuyNowButtons();
+    })
+
 	$('#enable_portal_password').change(fixCheckboxes);
-	function fixCheckboxes(){
+
+	function fixCheckboxes() {
 		var checked = $('#enable_portal_password').is(':checked');
 		$('#send_portal_password').prop('disabled', !checked);
 	}
-	fixCheckboxes();
+
+    function showPaymentTypes() {
+        var val = $('input[name=landing_page_type]:checked').val()
+        if (val == '{{ ENTITY_PAYMENT }}') {
+            $('#paymentTypesDiv').fadeIn();
+        } else {
+            $('#paymentTypesDiv').hide();
+        }
+    }
+
+    function updateBuyNowButtons() {
+        var productId = $('#product').val();
+        var landingPage = $('input[name=landing_page_type]:checked').val()
+        var paymentType = landingPage == 'payment' ? '/' + $('#payment_type').val() : '';
+
+        var form = '';
+        var link = '';
+
+        if (productId) {
+            var link = '{{ url('/buy_now') }}' + paymentType +
+                '?account_key={{ $account->account_key }}' +
+                '&product_id=' + productId;
+
+            var form = '<form action="{{ url('/buy_now') }}' + paymentType + '" method="post" target="_top">' + "\n" +
+                        '<input type="hidden" name="account_key" value="{{ $account->account_key }}"/>' + "\n" +
+                        '<input type="hidden" name="product_id" value="' + productId + '"/>' + "\n";
+
+            @foreach (['first_name', 'last_name', 'email'] as $field)
+                if ($('input#{{ $field }}').is(':checked')) {
+                    form += '<input type="{{ $field == 'email' ? 'email' : 'text' }}" name="{{ $field }}" placeholder="{{ trans("texts.{$field}") }}" required/>' + "\n";
+                    link += '&{{ $field }}=';
+                }
+            @endforeach
+
+            form += '<input type="submit" value="Buy Now" name="submit"/>' + "\n" + '</form>';
+        }
+
+        $('#formTextarea').text(form);
+        $('#linkTextarea').text(link);
+    }
+
+
+
 </script>
+
 @stop

resources/views/accounts/management.blade.php

@@ -38,11 +38,7 @@
 				@if ($planDetails && $planDetails['active'])
 					<div class="form-group">
 						<label class="col-sm-4 control-label">
-							@if((!$account->company->pending_plan || $account->company->pending_plan == $planDetails['plan']) && $planDetails['expires'] && !$planDetails['trial'])
-								{{ trans('texts.renews') }}
-							@else
-								{{ trans('texts.expires') }}
-							@endif
+							{{ trans('texts.renews') }}
 						</label>
 						<div class="col-sm-8">
 							<p class="form-control-static">
@@ -54,28 +50,6 @@
 							</p>
 						</div>
 					</div>
-					@if ($account->company->pending_plan)
-					<div class="form-group">
-						<label class="col-sm-4 control-label">{{ trans('texts.pending_change_to') }}</label>
-						<div class="col-sm-8">
-							<p class="form-control-static">
-								@if ($account->company->pending_plan == PLAN_FREE)
-									{{ trans('texts.plan_changes_to', [
-										'plan'=>trans('texts.plan_free'),
-										'date'=>Utils::dateToString($planDetails['expires'])
-									]) }}
-								@else
-									{{ trans('texts.plan_term_changes_to', [
-										'plan'=>trans('texts.plan_'.$account->company->pending_plan),
-										'term'=>trans('texts.plan_term_'.$account->company->pending_term.'ly'),
-										'date'=>Utils::dateToString($planDetails['expires'])
-									]) }}
-								@endif<br>
-								<a href="#" onclick="cancelPendingChange()">{{ trans('texts.cancel_plan_change') }}</a>
-							</p>
-						</div>
-					</div>
-					@endif
 					@if (Utils::isNinjaProd())
 						{!! Former::actions( Button::info(trans('texts.plan_change'))->large()->withAttributes(['onclick' => 'showChangePlan()'])->appendIcon(Icon::create('edit'))) !!}
 					@endif
@@ -148,6 +122,11 @@
 
 						</div>
 						<div class="modal-footer" style="margin-top: 0px">
+                            @if (Utils::isPro())
+                                <div class="pull-left" style="padding-top: 8px;color:#888888">
+                                    {{ trans('texts.changes_take_effect_immediately') }}
+                                </div>
+                            @endif
 							<button type="button" class="btn btn-default" data-dismiss="modal">{{ trans('texts.go_back') }}</button>
 							@if ($planDetails && $planDetails['active'])
 								<button type="button" class="btn btn-primary" id="changePlanButton" onclick="confirmChangePlan()">{{ trans('texts.plan_change') }}</button>
@@ -221,15 +200,6 @@
         }
     }
 
-	@if ($account->company->pending_plan)
-    	function cancelPendingChange(){
-    		$('#plan').val('{{ $planDetails['plan'] }}')
-    		$('#plan_term').val('{{ $planDetails['term'] }}')
-    		confirmChangePlan();
-    		return false;
-    	}
-	@endif
-
   	jQuery(document).ready(function($){
 		function updatePlanModal() {
 			var plan = $('#plan').val();

resources/views/credits/edit.blade.php

@@ -2,12 +2,12 @@
 
 @section('content')
 
-	
+
 	{!! Former::open($url)->addClass('col-md-10 col-md-offset-1 warn-on-exit')->method($method)->rules(array(
 			'client' => 'required',
-  		'amount' => 'required',		
+  		'amount' => 'required',
 	)) !!}
-	
+
 	<div class="row">
         <div class="col-md-10 col-md-offset-1">
 
@@ -38,23 +38,27 @@
 
 	<script type="text/javascript">
 
-	
+
 	var clients = {!! $clients !!};
 
 	$(function() {
 
-		var $clientSelect = $('select#client');		
+		var $clientSelect = $('select#client');
 		for (var i=0; i<clients.length; i++) {
 			var client = clients[i];
-			$clientSelect.append(new Option(getClientDisplayName(client), client.public_id));
-		}	
+            var clientName = getClientDisplayName(client);
+            if (!clientName) {
+                continue;
+            }
+			$clientSelect.append(new Option(clientName, client.public_id));
+		}
 
 		if ({{ $clientPublicId ? 'true' : 'false' }}) {
 			$clientSelect.val({{ $clientPublicId }});
 		}
 
 		$clientSelect.combobox();
-		
+
 		$('#currency_id').combobox();
 		$('#credit_date').datepicker('update', new Date());
 
@@ -71,4 +75,4 @@
 
 	</script>
 
-@stop
+@stop

resources/views/expenses/edit.blade.php

@@ -257,7 +257,11 @@
             var $clientSelect = $('select#client_id');
             for (var i=0; i<clients.length; i++) {
                 var client = clients[i];
-                $clientSelect.append(new Option(getClientDisplayName(client), client.public_id));
+                var clientName = getClientDisplayName(client);
+                if (!clientName) {
+                    continue;
+                }
+                $clientSelect.append(new Option(clientName, client.public_id));
             }
             $clientSelect.combobox().change(function() {
                 onClientChange();

resources/views/invoices/edit.blade.php

@@ -789,6 +789,9 @@
         for (var i=0; i<clients.length; i++) {
             var client = clients[i];
             var clientName = getClientDisplayName(client);
+            if (!clientName) {
+                continue;
+            }
             for (var j=0; j<client.contacts.length; j++) {
                 var contact = client.contacts[j];
                 var contactName = getContactDisplayName(contact);

resources/views/payments/credit_card.blade.php

@@ -77,16 +77,14 @@
         </div>
     </div>
 
-    @if (isset($paymentTitle) || ! empty($contact->email))
-        <div class="row" style="display:{{ isset($paymentTitle) ? 'block' : 'none' }}">
-            <div class="col-md-12">
-                {!! Former::text('email')
-                        ->placeholder(trans('texts.email'))
-                        ->autocomplete('email')
-                        ->label('') !!}
-            </div>
+    <div class="row" style="display:{{ isset($paymentTitle) || empty($contact->email) ? 'block' : 'none' }}">
+        <div class="col-md-12">
+            {!! Former::text('email')
+                    ->placeholder(trans('texts.email'))
+                    ->autocomplete('email')
+                    ->label('') !!}
         </div>
-    @endif
+    </div>
 
     <p>&nbsp;<br/>&nbsp;</p>
 
@@ -257,5 +255,5 @@
     <p>&nbsp;</p>
 
     {!! Former::close() !!}
-    
+
 @stop

resources/views/tasks/edit.blade.php

@@ -408,7 +408,11 @@
         var $clientSelect = $('select#client');
         for (var i=0; i<clients.length; i++) {
             var client = clients[i];
-            $clientSelect.append(new Option(getClientDisplayName(client), client.public_id));
+            var clientName = getClientDisplayName(client);
+            if (!clientName) {
+                continue;
+            }
+            $clientSelect.append(new Option(clientName, client.public_id));
         }
 
         if ({{ $clientPublicId ? 'true' : 'false' }}) {

tests/acceptance/OnlinePaymentCest.php

@@ -91,7 +91,8 @@ class OnlinePaymentCest
 
         // create recurring invoice and auto-bill
         $I->amOnPage('/recurring_invoices/create');
-        $I->selectDropdown($I, $clientEmail, '.client_select .dropdown-toggle');
+        //$I->selectDropdown($I, $clientEmail, '.client_select .dropdown-toggle');
+        $I->selectDropdown($I, 'Test Test', '.client_select .dropdown-toggle');
         $I->fillField('table.invoice-table tbody tr:nth-child(1) #product_key', $productKey);
         $I->click('table.invoice-table tbody tr:nth-child(1) .tt-selectable');
         $I->selectOption('#auto_bill', 3);