diff --git a/resources/lang/ca/texts.php b/resources/lang/ca/texts.php
index ff3ea396cb53..d2a83f399d8d 100644
--- a/resources/lang/ca/texts.php
+++ b/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',
+
 
 );
 
diff --git a/resources/lang/cs/texts.php b/resources/lang/cs/texts.php
index 262fc40f97c1..ab5f3250826c 100644
--- a/resources/lang/cs/texts.php
+++ b/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',
+
 
 );
 
diff --git a/resources/lang/da/texts.php b/resources/lang/da/texts.php
index 60405977e521..70fd4e77df4f 100644
--- a/resources/lang/da/texts.php
+++ b/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',
+
 
 );
 
diff --git a/resources/lang/de/texts.php b/resources/lang/de/texts.php
index d585ebe7aec2..62e14a5f9e49 100644
--- a/resources/lang/de/texts.php
+++ b/resources/lang/de/texts.php
@@ -2,7 +2,6 @@
 
 $LANG = array(
 
-    // client
     'organization' => 'Organisation',
     'name' => 'Name',
     'website' => 'Webseite',
@@ -388,7 +387,7 @@ $LANG = array(
     'gateway_help_1' => ':link um sich bei Authorize.net anzumelden.',
     'gateway_help_2' => ':link um sich bei Authorize.net anzumelden.',
     'gateway_help_17' => ':link um deine PayPal API-Signatur zu erhalten.',
-    'gateway_help_27' => ':link um sich bei TwoCheckout anzumelden.',
+    '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' => 'Weitere Designs',
     'more_designs_title' => 'Zusätzliche Rechnungsdesigns',
     'more_designs_cloud_header' => 'Werde Pro-Mitglied für zusätzliche Rechnungsdesigns',
@@ -775,8 +774,8 @@ $LANG = array(
     'activity_35' => ':user created :vendor',
     'activity_36' => ':user created :vendor',
     'activity_37' => ':user created :vendor',
-    'activity_42' => ':user erstellte Aufgabe ":task"',
-    'activity_43' => ':user aktualisierte Aufgabe ":task"',
+    'activity_42' => ':user created task ":task"',
+    'activity_43' => ':user updated task ":task"',
     'payment' => 'Zahlung',
     'system' => 'System',
     'signature' => 'Email-Signatur',
@@ -996,7 +995,7 @@ $LANG = array(
     'overdue' => 'Überfällig',
 
 
-    'white_label_text' => 'Kaufen Sie eine 1 Jahres Whitelabel Lizenz zum Preis von $:price um das Invoice Ninja Branding vom Kundenportal zu entfernen und unser Projekt zu unterstützen.',
+    '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' => 'Um deine E-Mail-Benachrichtigungen anzupassen besuche bitte :link',
     'reset_password_footer' => 'Wenn du das Zurücksetzen des Passworts nicht beantragt hast, benachrichtige bitte unseren Support: :email',
     'limit_users' => 'Entschuldige, das würde das Limit von :limit Benutzern überschreiten',
@@ -1170,6 +1169,7 @@ $LANG = array(
     'enterprise_plan_features' => 'The Enterprise plan adds support for multiple users and file attachments, :link to see the full list of features.',
     'return_to_app' => 'Return to app',
 
+
     // Payment updates
     'refund_payment' => 'Zahlung erstatten',
     'refund_max' => 'Max:',
@@ -1293,10 +1293,10 @@ $LANG = array(
     'company_name' => 'Firmenname',
     'wepay_company_name_help' => 'Das erscheint auf den Kontoauszügen des Kunden.',
     'wepay_description_help' => 'Zweck des Kontos.',
-    'wepay_tos_agree' => 'I agree to the :link.',
+    'wepay_tos_agree' => 'Ich stimme den :link zu',
     'wepay_tos_link_text' => 'WePay Servicebedingungen',
     'resend_confirmation_email' => 'Bestätigungsemail nochmal senden',
-    'manage_wepay_account' => 'WePay Konto verwalten',
+    'manage_account' => 'Manage Account',
     'action_required' => 'Handeln erforderlich',
     'finish_setup' => 'Setup abschließen',
     'created_wepay_confirmation_required' => 'Bitte prüfen Sie Ihr E-Mail Konto und bestätigen Sie Ihre E-Mail Adresse bei WePay.',
@@ -1309,77 +1309,77 @@ $LANG = array(
     'accept_debit_cards' => 'Debitkarten aktzeptieren',
     'debit_cards' => 'Debitkarten',
 
-    'warn_start_date_changed' => 'The next invoice will be sent on the new start date.',
-    'original_start_date' => 'Original start date',
-    'new_start_date' => 'New start date',
-    'security' => 'Security',
-    'see_whats_new' => 'See what\'s new in v:version',
-    'wait_for_upload' => 'Please wait for the document upload to complete.',
+    'warn_start_date_changed' => 'Die nächste Rechnungen wird zum neuen Startdatum versendet.',
+    'original_start_date' => 'Originales Startdatum',
+    'new_start_date' => 'Neues Startdatum',
+    'security' => 'Sicherheit',
+    'see_whats_new' => 'Neu in v:version',
+    'wait_for_upload' => 'Bitte warten Sie bis der Dokumentenupload abgeschlossen wurde.',
     'upgrade_for_permissions' => 'Upgrade to our Enterprise plan to enable permissions.',
     'enable_second_tax_rate' => 'Enable specifying a <b>second tax rate</b>',
-    'payment_file' => 'Payment File',
+    'payment_file' => 'Zahlungsdatei',
     'expense_file' => 'Expense File',
-    'product_file' => 'Product File',
-    'import_products' => 'Import Products',
-    'products_will_create' => 'products will be created.',
-    'product_key' => 'Product',
-    'created_products' => 'Successfully created :count product(s)',
-    'export_help' => 'Use JSON if you plan to import the data into Invoice Ninja.',
-    'JSON_file' => 'JSON File',
+    'product_file' => 'Produktdatei',
+    'import_products' => 'Produkte importieren',
+    'products_will_create' => 'Produkte werden erstellt.',
+    'product_key' => 'Produkt',
+    'created_products' => 'Erfolgreich :count Produkt(e) erstellt',
+    'export_help' => 'Nutzen Sie JSON wenn Sie die Daten in Invoice Ninja importieren wollen',
+    'JSON_file' => 'JSON Datei',
 
-    'view_dashboard' => 'View Dashboard',
-    'client_session_expired' => 'Session Expired',
+    'view_dashboard' => 'Übersicht anzeigen',
+    'client_session_expired' => 'Session abgelaufen',
     'client_session_expired_message' => 'Your session has expired. Please click the link in your email again.',
 
     'auto_bill_notification' => 'This invoice will automatically be billed to your :payment_method on file on :due_date.',
-    'auto_bill_payment_method_bank_transfer' => 'bank account',
-    'auto_bill_payment_method_credit_card' => 'credit card',
-    'auto_bill_payment_method_paypal' => 'PayPal account',
+    'auto_bill_payment_method_bank_transfer' => 'Bankkonto',
+    'auto_bill_payment_method_credit_card' => 'Kreditkarte',
+    'auto_bill_payment_method_paypal' => 'PayPal Konto',
     'auto_bill_notification_placeholder' => 'This invoice will automatically be billed to your credit card on file on the due date.',
-    'payment_settings' => 'Payment Settings',
+    'payment_settings' => 'Zahlungseinstellungen',
 
     'on_send_date' => 'On send date',
     'on_due_date' => 'On due date',
     'auto_bill_ach_date_help' => 'ACH auto bill will always happen on the due date',
     'warn_change_auto_bill' => 'Due to NACHA rules, changes to this invoice may prevent ACH auto bill.',
 
-    'bank_account' => 'Bank Account',
+    'bank_account' => 'Bankkonto',
     'payment_processed_through_wepay' => 'ACH payments will be processed using WePay.',
     'wepay_payment_tos_agree' => 'I agree to the WePay :terms and :privacy_policy.',
-    'privacy_policy' => 'Privacy Policy',
+    'privacy_policy' => 'Datenschutzerklärung',
     'wepay_payment_tos_agree_required' => 'You must agree to the WePay Terms of Service and Privacy Policy.',
     'payment_settings_supported_gateways' => 'These options are supported by the WePay, Stripe, and Braintree gateways.',
-    'ach_email_prompt' => 'Please enter your email address:',
-    'verification_pending' => 'Verification Pending',
+    'ach_email_prompt' => 'Bitte geben Sie eine gültige E-Mail-Adresse ein:',
+    'verification_pending' => 'Überprüfung ausstehend',
 
     'update_font_cache' => 'Please force refresh the page to update the font cache.',
-    'more_options' => 'More options',
-    'credit_card' => 'Credit Card',
-    'bank_transfer' => 'Bank Transfer',
+    'more_options' => 'Weitere Optionen',
+    'credit_card' => 'Kreditkarte',
+    'bank_transfer' => 'Überweisung',
     'no_transaction_reference' => 'We did not recieve a payment transaction reference from the gateway.',
     'use_bank_on_file' => 'Use Bank on File',
     'auto_bill_email_message' => 'This invoice will automatically be billed to the payment method on file on the due date.',
     'bitcoin' => 'Bitcoin',
-    'added_on' => 'Added :date',
-    'failed_remove_payment_method' => 'Failed to remove the payment method',
+    'added_on' => 'Datum :date hinzugefügt',
+    'failed_remove_payment_method' => 'Zahlungsart entfernen fehlgeschlagen',
     'gateway_exists' => 'This gateway already exists',
-    'manual_entry' => 'Manual entry',
-    'start_of_week' => 'Erster Tag der Woche',
+    'manual_entry' => 'Manuell hinzufügen',
+    'start_of_week' => 'First day of the week',
 
     // Frequencies
-    'freq_weekly' => 'wöchentlich',
-    'freq_two_weeks' => 'zweiwöchentlich',
-    'freq_four_weeks' => 'vierwöchentlich',
-    'freq_monthly' => 'monatlich',
-    'freq_three_months' => 'dreimonatlich',
-    'freq_six_months' => 'halbjährlich',
-    'freq_annually' => 'jährlich',
+    'freq_weekly' => 'Wöchentlich',
+    'freq_two_weeks' => 'Zweiwöchentlich',
+    'freq_four_weeks' => 'Vierwöchentlich',
+    'freq_monthly' => 'Monatlich',
+    'freq_three_months' => 'Dreimonatlich',
+    'freq_six_months' => 'Halbjährlich',
+    'freq_annually' => 'Annually',
 
     // Payment types
-    'payment_type_Apply Credit' => 'Kredit',
+    'payment_type_Apply Credit' => 'Apply Credit',
     'payment_type_Bank Transfer' => 'Überweisung',
     'payment_type_Cash' => 'Bar',
-    'payment_type_Debit' => 'Guthaben',
+    'payment_type_Debit' => 'Debit',
     'payment_type_ACH' => 'ACH',
     'payment_type_Visa Card' => 'VISA',
     'payment_type_MasterCard' => 'MasterCard',
@@ -1388,315 +1388,665 @@ $LANG = array(
     'payment_type_Diners Card' => 'Diners Card',
     'payment_type_EuroCard' => 'EuroCard',
     'payment_type_Nova' => 'Nova',
-    'payment_type_Credit Card Other' => 'Andere Kreditkarte',
+    'payment_type_Credit Card Other' => 'Kreditkarte (andere)',
     'payment_type_PayPal' => 'PayPal',
     'payment_type_Google Wallet' => 'Google Wallet',
     'payment_type_Check' => 'Scheck',
 
     // Industries
-    'industry_Accounting & Legal' => 'Buchhaltung & Rechnungswesen',
+    'industry_Accounting & Legal' => 'Buchhaltung & Rechtswesen',
     'industry_Advertising' => 'Werbung',
     'industry_Aerospace' => 'Luft- und Raumfahrt',
-    'industry_Agriculture' => 'Landwirtschaft',
+    'industry_Agriculture' => 'Land- und Forstwirtschaft',
     'industry_Automotive' => 'Automobilbau',
     'industry_Banking & Finance' => 'Bank- und Finanzwesen',
     'industry_Biotechnology' => 'Biotechnologie',
     'industry_Broadcasting' => 'Rundfunk',
-    'industry_Business Services' => 'Dienstleistungen',
-    'industry_Commodities & Chemicals' => 'Handelsgüter und Chemikalien',
-    'industry_Communications' => 'Kommunikation',
-    'industry_Computers & Hightech' => 'Computer und Hochtechnologie',
-    'industry_Defense' => 'Verteidigungsbereich',
-    'industry_Energy' => 'Energie',
-    'industry_Entertainment' => 'Unterhaltung',
-    'industry_Government' => 'Regierungsbereich',
-    'industry_Healthcare & Life Sciences' => 'Gesundheitswesen und Biowissenschaften',
-    'industry_Insurance' => 'Versicherung',
-    'industry_Manufacturing' => 'Herstellung',
+    'industry_Business Services' => 'Business Services',
+    'industry_Commodities & Chemicals' => 'Commodities & Chemicals',
+    'industry_Communications' => 'Communications',
+    'industry_Computers & Hightech' => 'Computer & Hightech',
+    'industry_Defense' => 'Verteidung',
+    'industry_Energy' => 'Energy',
+    'industry_Entertainment' => 'Unterhaltungsindustrie',
+    'industry_Government' => 'Kommunal- und Staatsverwaltung',
+    'industry_Healthcare & Life Sciences' => 'Gesundheitswesen',
+    'industry_Insurance' => 'Versicherungswesen',
+    'industry_Manufacturing' => 'Produzierendes Gewerbe',
     'industry_Marketing' => 'Marketing',
-    'industry_Media' => 'Medien',
-    'industry_Nonprofit & Higher Ed' => 'Nonprofit-Bereich',
-    'industry_Pharmaceuticals' => 'Pharmazeutika',
-    'industry_Professional Services & Consulting' => 'Unternehmensberatung',
+    'industry_Media' => 'Kommunikation',
+    'industry_Nonprofit & Higher Ed' => 'Gemeinnützige Unternehmen',
+    'industry_Pharmaceuticals' => 'Arzneimittel',
+    'industry_Professional Services & Consulting' => 'Professional Services & Consulting',
     'industry_Real Estate' => 'Immobilien',
     'industry_Retail & Wholesale' => 'Einzel- und Großhandel',
-    'industry_Sports' => 'Sport',
-    'industry_Transportation' => 'Transport',
-    'industry_Travel & Luxury' => 'Reisen und Luxus',
+    'industry_Sports' => 'Sports',
+    'industry_Transportation' => 'Verkehrswesen',
+    'industry_Travel & Luxury' => 'Reisen & Luxus',
     'industry_Other' => 'Andere',
-    'industry_Photography' => 'Fotografie',
+    'industry_Photography' =>'Fotografie',
 
     // Countries
-    'country_Afghanistan' => '',
+    'country_Afghanistan' => 'Afghanistan',
     'country_Albania' => 'Albanien',
-    'country_Antarctica' => '',
+    'country_Antarctica' => 'Antarktis',
     'country_Algeria' => 'Algerien',
-    'country_American Samoa' => '',
-    'country_Andorra' => '',
-    'country_Angola' => '',
-    'country_Antigua and Barbuda' => '',
-    'country_Azerbaijan' => '',
+    'country_American Samoa' => 'Amerikanisch-Samoa',
+    'country_Andorra' => 'Andorra',
+    'country_Angola' => 'Angola',
+    'country_Antigua and Barbuda' => 'Antigua und Barbuda',
+    'country_Azerbaijan' => 'Aserbaidschan',
     'country_Argentina' => 'Argentinien',
-    'country_Australia' => '',
-    'country_Austria' => '',
-    'country_Bahamas' => '',
-    'country_Bahrain' => '',
-    'country_Bangladesh' => '',
-    'country_Armenia' => '',
-    'country_Barbados' => '',
-    'country_Belgium' => '',
-    'country_Bermuda' => '',
-    'country_Bhutan' => '',
-    'country_Bolivia, Plurinational State of' => '',
-    'country_Bosnia and Herzegovina' => '',
-    'country_Botswana' => '',
-    'country_Bouvet Island' => '',
-    'country_Brazil' => '',
-    'country_Belize' => '',
-    'country_British Indian Ocean Territory' => '',
-    'country_Solomon Islands' => '',
-    'country_Virgin Islands, British' => '',
-    'country_Brunei Darussalam' => '',
-    'country_Bulgaria' => '',
-    'country_Myanmar' => '',
-    'country_Burundi' => '',
-    'country_Belarus' => '',
-    'country_Cambodia' => '',
-    'country_Cameroon' => '',
-    'country_Canada' => '',
-    'country_Cape Verde' => '',
-    'country_Cayman Islands' => '',
-    'country_Central African Republic' => '',
-    'country_Sri Lanka' => '',
-    'country_Chad' => '',
-    'country_Chile' => '',
-    'country_China' => '',
-    'country_Taiwan, Province of China' => '',
-    'country_Christmas Island' => '',
-    'country_Cocos (Keeling) Islands' => '',
-    'country_Colombia' => '',
-    'country_Comoros' => '',
-    'country_Mayotte' => '',
-    'country_Congo' => '',
-    'country_Congo, the Democratic Republic of the' => '',
-    'country_Cook Islands' => '',
-    'country_Costa Rica' => '',
-    'country_Croatia' => '',
-    'country_Cuba' => '',
-    'country_Cyprus' => '',
-    'country_Czech Republic' => '',
-    'country_Benin' => '',
-    'country_Denmark' => '',
-    'country_Dominica' => '',
-    'country_Dominican Republic' => '',
-    'country_Ecuador' => '',
-    'country_El Salvador' => '',
-    'country_Equatorial Guinea' => '',
-    'country_Ethiopia' => '',
-    'country_Eritrea' => '',
-    'country_Estonia' => '',
-    'country_Faroe Islands' => '',
-    'country_Falkland Islands (Malvinas)' => '',
-    'country_South Georgia and the South Sandwich Islands' => '',
-    'country_Fiji' => '',
-    'country_Finland' => '',
-    'country_Åland Islands' => '',
+    'country_Australia' => 'Australien',
+    'country_Austria' => 'Österreich',
+    'country_Bahamas' => 'Bahamas',
+    'country_Bahrain' => 'Bahrain',
+    'country_Bangladesh' => 'Bangladesch',
+    'country_Armenia' => 'Armenien',
+    'country_Barbados' => 'Barbados',
+    'country_Belgium' => 'Belgien',
+    'country_Bermuda' => 'Bermuda',
+    'country_Bhutan' => 'Bhutan',
+    'country_Bolivia, Plurinational State of' => 'Bolivien',
+    'country_Bosnia and Herzegovina' => 'Bosnien und Herzigowina',
+    'country_Botswana' => 'Botswana',
+    'country_Bouvet Island' => 'Bouvet Island',
+    'country_Brazil' => 'Brasilien',
+    'country_Belize' => 'Belize',
+    'country_British Indian Ocean Territory' => 'Britisches Territorium im Indischen Ozean',
+    'country_Solomon Islands' => 'Salomonen',
+    'country_Virgin Islands, British' => 'Britische Jungferninseln',
+    'country_Brunei Darussalam' => 'Brunei',
+    'country_Bulgaria' => 'Bulgarien',
+    'country_Myanmar' => 'Myanmar',
+    'country_Burundi' => 'Burundi',
+    'country_Belarus' => 'Weißrussland',
+    'country_Cambodia' => 'Kambodscha',
+    'country_Cameroon' => 'Kamerun',
+    'country_Canada' => 'Kanada',
+    'country_Cape Verde' => 'Kap Verde',
+    'country_Cayman Islands' => 'Kaimaninseln',
+    'country_Central African Republic' => 'Zentralafrikanische Republik',
+    'country_Sri Lanka' => 'Sri Lanka',
+    'country_Chad' => 'Tschad',
+    'country_Chile' => 'Chile',
+    'country_China' => 'China',
+    'country_Taiwan, Province of China' => 'Taiwan',
+    'country_Christmas Island' => 'Weihnachtsinsel',
+    'country_Cocos (Keeling) Islands' => 'Kokosinseln',
+    'country_Colombia' => 'Kulumbien',
+    'country_Comoros' => 'Komoren',
+    'country_Mayotte' => 'Mayotte',
+    'country_Congo' => 'Kongo',
+    'country_Congo, the Democratic Republic of the' => 'Kongo, Demokratische Republik',
+    'country_Cook Islands' => 'Cook Inseln',
+    'country_Costa Rica' => 'Costa Rica',
+    'country_Croatia' => 'Kroatien',
+    'country_Cuba' => 'Kuba',
+    'country_Cyprus' => 'Zypern',
+    'country_Czech Republic' => 'Tschechische Republik',
+    'country_Benin' => 'Benin',
+    'country_Denmark' => 'Dänemark',
+    'country_Dominica' => 'Dominica',
+    'country_Dominican Republic' => 'Dominikanische Republik',
+    'country_Ecuador' => 'Ecuador',
+    'country_El Salvador' => 'El Salvador',
+    'country_Equatorial Guinea' => 'Äquatorialguinea',
+    'country_Ethiopia' => 'Äthiopien',
+    'country_Eritrea' => 'Eritrea',
+    'country_Estonia' => 'Estland',
+    'country_Faroe Islands' => 'Färöer-Inseln',
+    'country_Falkland Islands (Malvinas)' => 'Falklandinseln',
+    'country_South Georgia and the South Sandwich Islands' => 'Südgeorgien und die Südlichen Sandwichinseln',
+    'country_Fiji' => 'Fidschi',
+    'country_Finland' => 'Finnland',
+    'country_Åland Islands' => 'Åland',
     'country_France' => 'Frankreich',
-    'country_French Guiana' => '',
-    'country_French Polynesia' => '',
-    'country_French Southern Territories' => '',
-    'country_Djibouti' => '',
-    'country_Gabon' => '',
-    'country_Georgia' => '',
-    'country_Gambia' => '',
-    'country_Palestinian Territory, Occupied' => '',
+    'country_French Guiana' => 'Französisch-Guayana',
+    'country_French Polynesia' => 'Französisch-Polynesien',
+    'country_French Southern Territories' => 'Französische Süd- und Antarktisgebiete',
+    'country_Djibouti' => 'Dschibuti',
+    'country_Gabon' => 'Gabun',
+    'country_Georgia' => 'Georgien',
+    'country_Gambia' => 'Gambia',
+    'country_Palestinian Territory, Occupied' => 'Palästinensische Autonomiegebiete',
     'country_Germany' => 'Deutschland',
-    'country_Ghana' => '',
-    'country_Gibraltar' => '',
-    'country_Kiribati' => '',
-    'country_Greece' => '',
-    'country_Greenland' => '',
-    'country_Grenada' => '',
-    'country_Guadeloupe' => '',
-    'country_Guam' => '',
-    'country_Guatemala' => '',
-    'country_Guinea' => '',
-    'country_Guyana' => '',
-    'country_Haiti' => '',
-    'country_Heard Island and McDonald Islands' => '',
-    'country_Holy See (Vatican City State)' => '',
-    'country_Honduras' => '',
-    'country_Hong Kong' => '',
-    'country_Hungary' => '',
-    'country_Iceland' => '',
-    'country_India' => '',
-    'country_Indonesia' => '',
-    'country_Iran, Islamic Republic of' => '',
-    'country_Iraq' => '',
-    'country_Ireland' => '',
-    'country_Israel' => '',
-    'country_Italy' => '',
-    'country_Côte d\'Ivoire' => '',
-    'country_Jamaica' => '',
-    'country_Japan' => '',
-    'country_Kazakhstan' => '',
-    'country_Jordan' => '',
-    'country_Kenya' => '',
-    'country_Korea, Democratic People\'s Republic of' => '',
-    'country_Korea, Republic of' => '',
-    'country_Kuwait' => '',
-    'country_Kyrgyzstan' => '',
-    'country_Lao People\'s Democratic Republic' => '',
-    'country_Lebanon' => '',
-    'country_Lesotho' => '',
-    'country_Latvia' => '',
-    'country_Liberia' => '',
-    'country_Libya' => '',
-    'country_Liechtenstein' => '',
-    'country_Lithuania' => '',
-    'country_Luxembourg' => '',
-    'country_Macao' => '',
-    'country_Madagascar' => '',
-    'country_Malawi' => '',
-    'country_Malaysia' => '',
-    'country_Maldives' => '',
-    'country_Mali' => '',
-    'country_Malta' => '',
-    'country_Martinique' => '',
-    'country_Mauritania' => '',
-    'country_Mauritius' => '',
-    'country_Mexico' => '',
-    'country_Monaco' => '',
-    'country_Mongolia' => '',
-    'country_Moldova, Republic of' => '',
-    'country_Montenegro' => '',
-    'country_Montserrat' => '',
-    'country_Morocco' => '',
-    'country_Mozambique' => '',
-    'country_Oman' => '',
-    'country_Namibia' => '',
-    'country_Nauru' => '',
-    'country_Nepal' => '',
-    'country_Netherlands' => '',
-    'country_Curaçao' => '',
-    'country_Aruba' => '',
-    'country_Sint Maarten (Dutch part)' => '',
-    'country_Bonaire, Sint Eustatius and Saba' => '',
-    'country_New Caledonia' => '',
-    'country_Vanuatu' => '',
-    'country_New Zealand' => '',
-    'country_Nicaragua' => '',
-    'country_Niger' => '',
-    'country_Nigeria' => '',
-    'country_Niue' => '',
-    'country_Norfolk Island' => '',
-    'country_Norway' => '',
-    'country_Northern Mariana Islands' => '',
-    'country_United States Minor Outlying Islands' => '',
-    'country_Micronesia, Federated States of' => '',
-    'country_Marshall Islands' => '',
-    'country_Palau' => '',
-    'country_Pakistan' => '',
-    'country_Panama' => '',
-    'country_Papua New Guinea' => '',
-    'country_Paraguay' => '',
-    'country_Peru' => '',
-    'country_Philippines' => '',
-    'country_Pitcairn' => '',
-    'country_Poland' => '',
-    'country_Portugal' => '',
-    'country_Guinea-Bissau' => '',
-    'country_Timor-Leste' => '',
-    'country_Puerto Rico' => '',
-    'country_Qatar' => '',
-    'country_Réunion' => '',
-    'country_Romania' => '',
-    'country_Russian Federation' => '',
-    'country_Rwanda' => '',
-    'country_Saint Barthélemy' => '',
-    'country_Saint Helena, Ascension and Tristan da Cunha' => '',
-    'country_Saint Kitts and Nevis' => '',
-    'country_Anguilla' => '',
-    'country_Saint Lucia' => '',
-    'country_Saint Martin (French part)' => '',
-    'country_Saint Pierre and Miquelon' => '',
-    'country_Saint Vincent and the Grenadines' => '',
-    'country_San Marino' => '',
-    'country_Sao Tome and Principe' => '',
-    'country_Saudi Arabia' => '',
-    'country_Senegal' => '',
-    'country_Serbia' => '',
-    'country_Seychelles' => '',
-    'country_Sierra Leone' => '',
-    'country_Singapore' => '',
-    'country_Slovakia' => '',
-    'country_Viet Nam' => '',
-    'country_Slovenia' => '',
-    'country_Somalia' => '',
-    'country_South Africa' => '',
-    'country_Zimbabwe' => '',
-    'country_Spain' => '',
-    'country_South Sudan' => '',
-    'country_Sudan' => '',
-    'country_Western Sahara' => '',
-    'country_Suriname' => '',
-    'country_Svalbard and Jan Mayen' => '',
-    'country_Swaziland' => '',
-    'country_Sweden' => '',
-    'country_Switzerland' => '',
-    'country_Syrian Arab Republic' => '',
-    'country_Tajikistan' => '',
-    'country_Thailand' => '',
-    'country_Togo' => '',
-    'country_Tokelau' => '',
-    'country_Tonga' => '',
-    'country_Trinidad and Tobago' => '',
-    'country_United Arab Emirates' => '',
-    'country_Tunisia' => '',
-    'country_Turkey' => '',
-    'country_Turkmenistan' => '',
-    'country_Turks and Caicos Islands' => '',
-    'country_Tuvalu' => '',
-    'country_Uganda' => '',
-    'country_Ukraine' => '',
-    'country_Macedonia, the former Yugoslav Republic of' => '',
-    'country_Egypt' => '',
-    'country_United Kingdom' => '',
-    'country_Guernsey' => '',
-    'country_Jersey' => '',
-    'country_Isle of Man' => '',
-    'country_Tanzania, United Republic of' => '',
-    'country_United States' => '',
-    'country_Virgin Islands, U.S.' => '',
-    'country_Burkina Faso' => '',
-    'country_Uruguay' => '',
-    'country_Uzbekistan' => '',
-    'country_Venezuela, Bolivarian Republic of' => '',
-    'country_Wallis and Futuna' => '',
-    'country_Samoa' => '',
-    'country_Yemen' => '',
-    'country_Zambi' => '',
+    'country_Ghana' => 'Ghana',
+    'country_Gibraltar' => 'Gibraltar',
+    'country_Kiribati' => 'Kiribati',
+    'country_Greece' => 'Griechenland',
+    'country_Greenland' => 'Grönland',
+    '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 und McDonaldinseln',
+    'country_Holy See (Vatican City State)' => 'Vatikanstadt',
+    'country_Honduras' => 'Honduras',
+    'country_Hong Kong' => 'Hongkong',
+    'country_Hungary' => 'Ungarn',
+    'country_Iceland' => 'Island',
+    'country_India' => 'Indien',
+    'country_Indonesia' => 'Indonesien',
+    'country_Iran, Islamic Republic of' => 'Iran',
+    'country_Iraq' => 'Irak',
+    'country_Ireland' => 'Irland',
+    'country_Israel' => 'Israel',
+    'country_Italy' => 'Italien',
+    'country_Côte d\'Ivoire' => 'Elfenbeinküste',
+    'country_Jamaica' => 'Jamaica',
+    'country_Japan' => 'Japan',
+    'country_Kazakhstan' => 'Kasachstan',
+    'country_Jordan' => 'Jordanien',
+    'country_Kenya' => 'Kenia',
+    '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' => 'Kirgisistan',
+    'country_Lao People\'s Democratic Republic' => 'Lao People\'s Democratic Republic',
+    'country_Lebanon' => 'Libanon',
+    'country_Lesotho' => 'Lesotho',
+    'country_Latvia' => 'Lettland',
+    'country_Liberia' => 'Liberia',
+    'country_Libya' => 'Lybien',
+    'country_Liechtenstein' => 'Lichtenstein',
+    'country_Lithuania' => 'Litauen',
+    'country_Luxembourg' => 'Luxembourg',
+    'country_Macao' => 'Macao',
+    'country_Madagascar' => 'Madagascar',
+    'country_Malawi' => 'Malawi',
+    'country_Malaysia' => 'Malaysia',
+    'country_Maldives' => 'Malediven',
+    'country_Mali' => 'Mali',
+    'country_Malta' => 'Malta',
+    'country_Martinique' => 'Martinique',
+    'country_Mauritania' => 'Mauretanien',
+    'country_Mauritius' => 'Mauritius',
+    'country_Mexico' => 'Mexiko',
+    'country_Monaco' => 'Monaco',
+    'country_Mongolia' => 'Mongolei',
+    'country_Moldova, Republic of' => 'Moldova, Republic of',
+    'country_Montenegro' => 'Montenegro',
+    'country_Montserrat' => 'Montserrat',
+    'country_Morocco' => 'Marokko',
+    'country_Mozambique' => 'Mosambique',
+    'country_Oman' => 'Oman',
+    'country_Namibia' => 'Namibia',
+    'country_Nauru' => 'Nauru',
+    'country_Nepal' => 'Nepal',
+    'country_Netherlands' => 'Niederlande',
+    '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' => 'Neuseeland',
+    'country_Nicaragua' => 'Nicaragua',
+    'country_Niger' => 'Niger',
+    'country_Nigeria' => 'Nigeria',
+    'country_Niue' => 'Niue',
+    'country_Norfolk Island' => 'Norfolkinsel',
+    'country_Norway' => 'Norwegen',
+    'country_Northern Mariana Islands' => 'Nördliche Marianen',
+    'country_United States Minor Outlying Islands' => 'United States Minor Outlying Islands',
+    'country_Micronesia, Federated States of' => 'Micronesia, Federated States of',
+    'country_Marshall Islands' => 'Marshallinseln',
+    'country_Palau' => 'Palau',
+    'country_Pakistan' => 'Pakistan',
+    'country_Panama' => 'Panama',
+    'country_Papua New Guinea' => 'Papua-Neuguinea',
+    'country_Paraguay' => 'Paraguay',
+    'country_Peru' => 'Peru',
+    'country_Philippines' => 'Philippienen',
+    'country_Pitcairn' => 'Pitcairninseln',
+    'country_Poland' => 'Polen',
+    'country_Portugal' => 'Portugal',
+    'country_Guinea-Bissau' => 'Guinea-Bissau',
+    'country_Timor-Leste' => 'Osttimor',
+    'country_Puerto Rico' => 'Puerto Rico',
+    'country_Qatar' => 'Katar',
+    'country_Réunion' => 'Réunion',
+    'country_Romania' => 'Rumänien',
+    'country_Russian Federation' => 'Russland',
+    'country_Rwanda' => 'Ruanda',
+    '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' => 'St. Kitts und 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-Arabien',
+    'country_Senegal' => 'Senegal',
+    'country_Serbia' => 'Serbien',
+    'country_Seychelles' => 'Seychellen',
+    'country_Sierra Leone' => 'Sierra Leone',
+    'country_Singapore' => 'Singapur',
+    'country_Slovakia' => 'Slowakei',
+    'country_Viet Nam' => 'Vietnam',
+    'country_Slovenia' => 'Slovenien',
+    'country_Somalia' => 'Somalia',
+    'country_South Africa' => 'Südafrika',
+    'country_Zimbabwe' => 'Simbabwe',
+    'country_Spain' => 'Spanien',
+    'country_South Sudan' => 'Südsudan',
+    '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' => 'Schweden',
+    'country_Switzerland' => 'Schweiz',
+    'country_Syrian Arab Republic' => 'Syrian Arab Republic',
+    'country_Tajikistan' => 'Tadschikistan',
+    'country_Thailand' => 'Thailand',
+    'country_Togo' => 'Togo',
+    'country_Tokelau' => 'Tokelau',
+    'country_Tonga' => 'Tonga',
+    'country_Trinidad and Tobago' => 'Trinidad und Tobago',
+    'country_United Arab Emirates' => 'Vereinigte Arabische Emirate',
+    'country_Tunisia' => 'Tunesien',
+    'country_Turkey' => 'Türkei',
+    'country_Turkmenistan' => 'Turkmenistan',
+    'country_Turks and Caicos Islands' => 'Turks- und Caicosinseln',
+    'country_Tuvalu' => 'Tuvalu',
+    'country_Uganda' => 'Uganda',
+    'country_Ukraine' => 'Ukraine',
+    'country_Macedonia, the former Yugoslav Republic of' => 'Mazedonien',
+    'country_Egypt' => 'Ägypten',
+    'country_United Kingdom' => 'Vereinigtes Königreich',
+    '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' => 'Vereinigte Staaten von Amerika',
+    'country_Virgin Islands, U.S.' => 'Jungferninseln',
+    'country_Burkina Faso' => 'Burkina Faso',
+    'country_Uruguay' => 'Uruguay',
+    'country_Uzbekistan' => 'Usbekistan',
+    'country_Venezuela, Bolivarian Republic of' => 'Venezuela',
+    'country_Wallis and Futuna' => 'Wallis und Futuna',
+    'country_Samoa' => 'Samoa',
+    'country_Yemen' => 'Jemen',
+    'country_Zambi' => 'Sambia',
 
     // Languages
-    'lang_Brazilian Portuguese' => 'Brazilian Portuguese',
+    'lang_Brazilian Portuguese' => 'Brasilianisches Portugiesisch',
     'lang_Croatian' => 'Kroatisch',
     'lang_Czech' => 'Tschechisch',
     'lang_Danish' => 'Dänisch',
     'lang_Dutch' => 'Niederländisch',
     'lang_English' => 'Englisch',
     'lang_French' => 'Französisch',
-    'lang_French - Canada' => 'French - Canada',
+    'lang_French - Canada' => 'Französisch - Kanada',
     'lang_German' => 'Deutsch',
-    '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',
+    'lang_Italian' => 'Italienisch',
+    'lang_Japanese' => 'Japanisch',
+    'lang_Lithuanian' => 'Litauisch',
+    'lang_Norwegian' => 'Norwegisch',
+    'lang_Polish' => 'Polnisch',
+    'lang_Spanish' => 'Spanisch',
+    'lang_Spanish - Spain' => 'Spanisch - Spanien',
+    'lang_Swedish' => 'Schwedisch',
+
+    // Frequencies
+    'freq_weekly' => 'Wöchentlich',
+    'freq_two_weeks' => 'Zweiwöchentlich',
+    'freq_four_weeks' => 'Vierwöchentlich',
+    'freq_monthly' => 'Monatlich',
+    'freq_three_months' => 'Dreimonatlich',
+    'freq_six_months' => 'Halbjährlich',
+    'freq_annually' => 'Annually',
+
+    // Payment types
+    'payment_type_Apply Credit' => 'Apply Credit',
+    'payment_type_Bank Transfer' => 'Überweisung',
+    'payment_type_Cash' => 'Bar',
+    'payment_type_Debit' => 'Debit',
+    'payment_type_ACH' => 'ACH',
+    'payment_type_Visa Card' => 'VISA',
+    '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' => 'Kreditkarte (andere)',
+    'payment_type_PayPal' => 'PayPal',
+    'payment_type_Google Wallet' => 'Google Wallet',
+    'payment_type_Check' => 'Scheck',
+
+    // Industries
+    'industry_Accounting & Legal' => 'Buchhaltung & Rechtswesen',
+    'industry_Advertising' => 'Werbung',
+    'industry_Aerospace' => 'Luft- und Raumfahrt',
+    'industry_Agriculture' => 'Land- und Forstwirtschaft',
+    'industry_Automotive' => 'Automobilbau',
+    'industry_Banking & Finance' => 'Bank- und Finanzwesen',
+    'industry_Biotechnology' => 'Biotechnologie',
+    'industry_Broadcasting' => 'Rundfunk',
+    'industry_Business Services' => 'Business Services',
+    'industry_Commodities & Chemicals' => 'Commodities & Chemicals',
+    'industry_Communications' => 'Communications',
+    'industry_Computers & Hightech' => 'Computer & Hightech',
+    'industry_Defense' => 'Verteidung',
+    'industry_Energy' => 'Energy',
+    'industry_Entertainment' => 'Unterhaltungsindustrie',
+    'industry_Government' => 'Kommunal- und Staatsverwaltung',
+    'industry_Healthcare & Life Sciences' => 'Gesundheitswesen',
+    'industry_Insurance' => 'Versicherungswesen',
+    'industry_Manufacturing' => 'Produzierendes Gewerbe',
+    'industry_Marketing' => 'Marketing',
+    'industry_Media' => 'Kommunikation',
+    'industry_Nonprofit & Higher Ed' => 'Gemeinnützige Unternehmen',
+    'industry_Pharmaceuticals' => 'Arzneimittel',
+    'industry_Professional Services & Consulting' => 'Professional Services & Consulting',
+    'industry_Real Estate' => 'Immobilien',
+    'industry_Retail & Wholesale' => 'Einzel- und Großhandel',
+    'industry_Sports' => 'Sports',
+    'industry_Transportation' => 'Verkehrswesen',
+    'industry_Travel & Luxury' => 'Reisen & Luxus',
+    'industry_Other' => 'Andere',
+    'industry_Photography' =>'Fotografie',
+
+    // Countries
+    'country_Afghanistan' => 'Afghanistan',
+    'country_Albania' => 'Albanien',
+    'country_Antarctica' => 'Antarktis',
+    'country_Algeria' => 'Algerien',
+    'country_American Samoa' => 'Amerikanisch-Samoa',
+    'country_Andorra' => 'Andorra',
+    'country_Angola' => 'Angola',
+    'country_Antigua and Barbuda' => 'Antigua und Barbuda',
+    'country_Azerbaijan' => 'Aserbaidschan',
+    'country_Argentina' => 'Argentinien',
+    'country_Australia' => 'Australien',
+    'country_Austria' => 'Österreich',
+    'country_Bahamas' => 'Bahamas',
+    'country_Bahrain' => 'Bahrain',
+    'country_Bangladesh' => 'Bangladesch',
+    'country_Armenia' => 'Armenien',
+    'country_Barbados' => 'Barbados',
+    'country_Belgium' => 'Belgien',
+    'country_Bermuda' => 'Bermuda',
+    'country_Bhutan' => 'Bhutan',
+    'country_Bolivia, Plurinational State of' => 'Bolivien',
+    'country_Bosnia and Herzegovina' => 'Bosnien und Herzigowina',
+    'country_Botswana' => 'Botswana',
+    'country_Bouvet Island' => 'Bouvet Island',
+    'country_Brazil' => 'Brasilien',
+    'country_Belize' => 'Belize',
+    'country_British Indian Ocean Territory' => 'Britisches Territorium im Indischen Ozean',
+    'country_Solomon Islands' => 'Salomonen',
+    'country_Virgin Islands, British' => 'Britische Jungferninseln',
+    'country_Brunei Darussalam' => 'Brunei',
+    'country_Bulgaria' => 'Bulgarien',
+    'country_Myanmar' => 'Myanmar',
+    'country_Burundi' => 'Burundi',
+    'country_Belarus' => 'Weißrussland',
+    'country_Cambodia' => 'Kambodscha',
+    'country_Cameroon' => 'Kamerun',
+    'country_Canada' => 'Kanada',
+    'country_Cape Verde' => 'Kap Verde',
+    'country_Cayman Islands' => 'Kaimaninseln',
+    'country_Central African Republic' => 'Zentralafrikanische Republik',
+    'country_Sri Lanka' => 'Sri Lanka',
+    'country_Chad' => 'Tschad',
+    'country_Chile' => 'Chile',
+    'country_China' => 'China',
+    'country_Taiwan, Province of China' => 'Taiwan',
+    'country_Christmas Island' => 'Weihnachtsinsel',
+    'country_Cocos (Keeling) Islands' => 'Kokosinseln',
+    'country_Colombia' => 'Kulumbien',
+    'country_Comoros' => 'Komoren',
+    'country_Mayotte' => 'Mayotte',
+    'country_Congo' => 'Kongo',
+    'country_Congo, the Democratic Republic of the' => 'Kongo, Demokratische Republik',
+    'country_Cook Islands' => 'Cook Inseln',
+    'country_Costa Rica' => 'Costa Rica',
+    'country_Croatia' => 'Kroatien',
+    'country_Cuba' => 'Kuba',
+    'country_Cyprus' => 'Zypern',
+    'country_Czech Republic' => 'Tschechische Republik',
+    'country_Benin' => 'Benin',
+    'country_Denmark' => 'Dänemark',
+    'country_Dominica' => 'Dominica',
+    'country_Dominican Republic' => 'Dominikanische Republik',
+    'country_Ecuador' => 'Ecuador',
+    'country_El Salvador' => 'El Salvador',
+    'country_Equatorial Guinea' => 'Äquatorialguinea',
+    'country_Ethiopia' => 'Äthiopien',
+    'country_Eritrea' => 'Eritrea',
+    'country_Estonia' => 'Estland',
+    'country_Faroe Islands' => 'Färöer-Inseln',
+    'country_Falkland Islands (Malvinas)' => 'Falklandinseln',
+    'country_South Georgia and the South Sandwich Islands' => 'Südgeorgien und die Südlichen Sandwichinseln',
+    'country_Fiji' => 'Fidschi',
+    'country_Finland' => 'Finnland',
+    'country_Åland Islands' => 'Åland',
+    'country_France' => 'Frankreich',
+    'country_French Guiana' => 'Französisch-Guayana',
+    'country_French Polynesia' => 'Französisch-Polynesien',
+    'country_French Southern Territories' => 'Französische Süd- und Antarktisgebiete',
+    'country_Djibouti' => 'Dschibuti',
+    'country_Gabon' => 'Gabun',
+    'country_Georgia' => 'Georgien',
+    'country_Gambia' => 'Gambia',
+    'country_Palestinian Territory, Occupied' => 'Palästinensische Autonomiegebiete',
+    'country_Germany' => 'Deutschland',
+    'country_Ghana' => 'Ghana',
+    'country_Gibraltar' => 'Gibraltar',
+    'country_Kiribati' => 'Kiribati',
+    'country_Greece' => 'Griechenland',
+    'country_Greenland' => 'Grönland',
+    '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 und McDonaldinseln',
+    'country_Holy See (Vatican City State)' => 'Vatikanstadt',
+    'country_Honduras' => 'Honduras',
+    'country_Hong Kong' => 'Hongkong',
+    'country_Hungary' => 'Ungarn',
+    'country_Iceland' => 'Island',
+    'country_India' => 'Indien',
+    'country_Indonesia' => 'Indonesien',
+    'country_Iran, Islamic Republic of' => 'Iran',
+    'country_Iraq' => 'Irak',
+    'country_Ireland' => 'Irland',
+    'country_Israel' => 'Israel',
+    'country_Italy' => 'Italien',
+    'country_Côte d\'Ivoire' => 'Elfenbeinküste',
+    'country_Jamaica' => 'Jamaica',
+    'country_Japan' => 'Japan',
+    'country_Kazakhstan' => 'Kasachstan',
+    'country_Jordan' => 'Jordanien',
+    'country_Kenya' => 'Kenia',
+    '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' => 'Kirgisistan',
+    'country_Lao People\'s Democratic Republic' => 'Lao People\'s Democratic Republic',
+    'country_Lebanon' => 'Libanon',
+    'country_Lesotho' => 'Lesotho',
+    'country_Latvia' => 'Lettland',
+    'country_Liberia' => 'Liberia',
+    'country_Libya' => 'Lybien',
+    'country_Liechtenstein' => 'Lichtenstein',
+    'country_Lithuania' => 'Litauen',
+    'country_Luxembourg' => 'Luxembourg',
+    'country_Macao' => 'Macao',
+    'country_Madagascar' => 'Madagascar',
+    'country_Malawi' => 'Malawi',
+    'country_Malaysia' => 'Malaysia',
+    'country_Maldives' => 'Malediven',
+    'country_Mali' => 'Mali',
+    'country_Malta' => 'Malta',
+    'country_Martinique' => 'Martinique',
+    'country_Mauritania' => 'Mauretanien',
+    'country_Mauritius' => 'Mauritius',
+    'country_Mexico' => 'Mexiko',
+    'country_Monaco' => 'Monaco',
+    'country_Mongolia' => 'Mongolei',
+    'country_Moldova, Republic of' => 'Moldova, Republic of',
+    'country_Montenegro' => 'Montenegro',
+    'country_Montserrat' => 'Montserrat',
+    'country_Morocco' => 'Marokko',
+    'country_Mozambique' => 'Mosambique',
+    'country_Oman' => 'Oman',
+    'country_Namibia' => 'Namibia',
+    'country_Nauru' => 'Nauru',
+    'country_Nepal' => 'Nepal',
+    'country_Netherlands' => 'Niederlande',
+    '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' => 'Neuseeland',
+    'country_Nicaragua' => 'Nicaragua',
+    'country_Niger' => 'Niger',
+    'country_Nigeria' => 'Nigeria',
+    'country_Niue' => 'Niue',
+    'country_Norfolk Island' => 'Norfolkinsel',
+    'country_Norway' => 'Norwegen',
+    'country_Northern Mariana Islands' => 'Nördliche Marianen',
+    'country_United States Minor Outlying Islands' => 'United States Minor Outlying Islands',
+    'country_Micronesia, Federated States of' => 'Micronesia, Federated States of',
+    'country_Marshall Islands' => 'Marshallinseln',
+    'country_Palau' => 'Palau',
+    'country_Pakistan' => 'Pakistan',
+    'country_Panama' => 'Panama',
+    'country_Papua New Guinea' => 'Papua-Neuguinea',
+    'country_Paraguay' => 'Paraguay',
+    'country_Peru' => 'Peru',
+    'country_Philippines' => 'Philippienen',
+    'country_Pitcairn' => 'Pitcairninseln',
+    'country_Poland' => 'Polen',
+    'country_Portugal' => 'Portugal',
+    'country_Guinea-Bissau' => 'Guinea-Bissau',
+    'country_Timor-Leste' => 'Osttimor',
+    'country_Puerto Rico' => 'Puerto Rico',
+    'country_Qatar' => 'Katar',
+    'country_Réunion' => 'Réunion',
+    'country_Romania' => 'Rumänien',
+    'country_Russian Federation' => 'Russland',
+    'country_Rwanda' => 'Ruanda',
+    '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' => 'St. Kitts und 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-Arabien',
+    'country_Senegal' => 'Senegal',
+    'country_Serbia' => 'Serbien',
+    'country_Seychelles' => 'Seychellen',
+    'country_Sierra Leone' => 'Sierra Leone',
+    'country_Singapore' => 'Singapur',
+    'country_Slovakia' => 'Slowakei',
+    'country_Viet Nam' => 'Vietnam',
+    'country_Slovenia' => 'Slovenien',
+    'country_Somalia' => 'Somalia',
+    'country_South Africa' => 'Südafrika',
+    'country_Zimbabwe' => 'Simbabwe',
+    'country_Spain' => 'Spanien',
+    'country_South Sudan' => 'Südsudan',
+    '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' => 'Schweden',
+    'country_Switzerland' => 'Schweiz',
+    'country_Syrian Arab Republic' => 'Syrian Arab Republic',
+    'country_Tajikistan' => 'Tadschikistan',
+    'country_Thailand' => 'Thailand',
+    'country_Togo' => 'Togo',
+    'country_Tokelau' => 'Tokelau',
+    'country_Tonga' => 'Tonga',
+    'country_Trinidad and Tobago' => 'Trinidad und Tobago',
+    'country_United Arab Emirates' => 'Vereinigte Arabische Emirate',
+    'country_Tunisia' => 'Tunesien',
+    'country_Turkey' => 'Türkei',
+    'country_Turkmenistan' => 'Turkmenistan',
+    'country_Turks and Caicos Islands' => 'Turks- und Caicosinseln',
+    'country_Tuvalu' => 'Tuvalu',
+    'country_Uganda' => 'Uganda',
+    'country_Ukraine' => 'Ukraine',
+    'country_Macedonia, the former Yugoslav Republic of' => 'Mazedonien',
+    'country_Egypt' => 'Ägypten',
+    'country_United Kingdom' => 'Vereinigtes Königreich',
+    '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' => 'Vereinigte Staaten von Amerika',
+    'country_Virgin Islands, U.S.' => 'Jungferninseln',
+    'country_Burkina Faso' => 'Burkina Faso',
+    'country_Uruguay' => 'Uruguay',
+    'country_Uzbekistan' => 'Usbekistan',
+    'country_Venezuela, Bolivarian Republic of' => 'Venezuela',
+    'country_Wallis and Futuna' => 'Wallis und Futuna',
+    'country_Samoa' => 'Samoa',
+    'country_Yemen' => 'Jemen',
+    'country_Zambi' => 'Sambia',
+
+    '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',
+
+
 );
 
 return $LANG;
 
-?>
\ No newline at end of file
+?>
diff --git a/resources/lang/es/texts.php b/resources/lang/es/texts.php
index 9dad0dd9af7f..5c2889ce35cc 100644
--- a/resources/lang/es/texts.php
+++ b/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',
+
 
 );
 
diff --git a/resources/lang/es_ES/texts.php b/resources/lang/es_ES/texts.php
index 275b21a4e460..2b2ac5fe09ec 100644
--- a/resources/lang/es_ES/texts.php
+++ b/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',
+
 
 );
 
diff --git a/resources/lang/fr/texts.php b/resources/lang/fr/texts.php
index 75a2be95a4ed..2ad3c333e9ed 100644
--- a/resources/lang/fr/texts.php
+++ b/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',
+
 
 );
 
diff --git a/resources/lang/fr_CA/texts.php b/resources/lang/fr_CA/texts.php
index ed3e4c8456ff..4b3d52a2649c 100644
--- a/resources/lang/fr_CA/texts.php
+++ b/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',
+
 
 );
 
diff --git a/resources/lang/hr/texts.php b/resources/lang/hr/texts.php
index 18170932bddd..2b52a85c4678 100644
--- a/resources/lang/hr/texts.php
+++ b/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',
+
 
 );
 
diff --git a/resources/lang/it/texts.php b/resources/lang/it/texts.php
index 0e65daa23d18..d27a20a0308e 100644
--- a/resources/lang/it/texts.php
+++ b/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',
+
 
 );
 
diff --git a/resources/lang/ja/texts.php b/resources/lang/ja/texts.php
index ef8f48fd3b64..1cd3610a5901 100644
--- a/resources/lang/ja/texts.php
+++ b/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',
+
 
 );
 
diff --git a/resources/lang/lt/texts.php b/resources/lang/lt/texts.php
index 3db70f9eabba..c2bcf261fd25 100644
--- a/resources/lang/lt/texts.php
+++ b/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',
+
 
 );
 
diff --git a/resources/lang/nb_NO/texts.php b/resources/lang/nb_NO/texts.php
index ce0e88a226ac..70edbbc12d6b 100644
--- a/resources/lang/nb_NO/texts.php
+++ b/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',
+
 
 );
 
diff --git a/resources/lang/nl/texts.php b/resources/lang/nl/texts.php
index 5d6e89e77124..518f3b28ff80 100644
--- a/resources/lang/nl/texts.php
+++ b/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',
+
 
 );
 
diff --git a/resources/lang/pl/texts.php b/resources/lang/pl/texts.php
index 97eb20ac770f..931b8201505f 100644
--- a/resources/lang/pl/texts.php
+++ b/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',
+
 
 );
 
diff --git a/resources/lang/pt_BR/texts.php b/resources/lang/pt_BR/texts.php
index 6df4af6f8e69..a6e656fb2dc4 100644
--- a/resources/lang/pt_BR/texts.php
+++ b/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',
+
 
 );
 
diff --git a/resources/lang/sv/texts.php b/resources/lang/sv/texts.php
index 117870247ebf..d7a7b45eb80b 100644
--- a/resources/lang/sv/texts.php
+++ b/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',
+
 
 );
 
diff --git a/resources/lang/th/texts.php b/resources/lang/th/texts.php
index 33870af85fc3..d920fe7aab90 100644
--- a/resources/lang/th/texts.php
+++ b/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',
+
 
 );