diff --git a/database/setup.sql b/database/setup.sql
index be4a9f6d9908..ef109b13a0a2 100644
--- a/database/setup.sql
+++ b/database/setup.sql
@@ -790,7 +790,7 @@ CREATE TABLE `countries` (
 
 LOCK TABLES `countries` WRITE;
 /*!40000 ALTER TABLE `countries` DISABLE KEYS */;
-INSERT INTO `countries` VALUES (4,'Kabul','Afghan','004','afghani','AFN','pul','Islamic Republic of Afghanistan','AF','AFG','Afghanistan','142','034',0,0,0,NULL,NULL),(8,'Tirana','Albanian','008','lek','ALL','(qindar (pl. qindarka))','Republic of Albania','AL','ALB','Albania','150','039',0,0,0,NULL,NULL),(10,'Antartica','of Antartica','010','','','','Antarctica','AQ','ATA','Antarctica','','',0,0,0,NULL,NULL),(12,'Algiers','Algerian','012','Algerian dinar','DZD','centime','People’s Democratic Republic of Algeria','DZ','DZA','Algeria','002','015',0,0,0,NULL,NULL),(16,'Pago Pago','American Samoan','016','US dollar','USD','cent','Territory of American','AS','ASM','American Samoa','009','061',0,0,0,NULL,NULL),(20,'Andorra la Vella','Andorran','020','euro','EUR','cent','Principality of Andorra','AD','AND','Andorra','150','039',0,0,0,NULL,NULL),(24,'Luanda','Angolan','024','kwanza','AOA','cêntimo','Republic of Angola','AO','AGO','Angola','002','017',0,0,0,NULL,NULL),(28,'St John’s','of Antigua and Barbuda','028','East Caribbean dollar','XCD','cent','Antigua and Barbuda','AG','ATG','Antigua and Barbuda','019','029',0,0,0,NULL,NULL),(31,'Baku','Azerbaijani','031','Azerbaijani manat','AZN','kepik (inv.)','Republic of Azerbaijan','AZ','AZE','Azerbaijan','142','145',0,0,0,NULL,NULL),(32,'Buenos Aires','Argentinian','032','Argentine peso','ARS','centavo','Argentine Republic','AR','ARG','Argentina','019','005',0,1,0,NULL,NULL),(36,'Canberra','Australian','036','Australian dollar','AUD','cent','Commonwealth of Australia','AU','AUS','Australia','009','053',0,0,0,NULL,NULL),(40,'Vienna','Austrian','040','euro','EUR','cent','Republic of Austria','AT','AUT','Austria','150','155',1,1,1,NULL,NULL),(44,'Nassau','Bahamian','044','Bahamian dollar','BSD','cent','Commonwealth of the Bahamas','BS','BHS','Bahamas','019','029',0,0,0,NULL,NULL),(48,'Manama','Bahraini','048','Bahraini dinar','BHD','fils (inv.)','Kingdom of Bahrain','BH','BHR','Bahrain','142','145',0,0,0,NULL,NULL),(50,'Dhaka','Bangladeshi','050','taka (inv.)','BDT','poisha (inv.)','People’s Republic of Bangladesh','BD','BGD','Bangladesh','142','034',0,0,0,NULL,NULL),(51,'Yerevan','Armenian','051','dram (inv.)','AMD','luma','Republic of Armenia','AM','ARM','Armenia','142','145',0,0,0,NULL,NULL),(52,'Bridgetown','Barbadian','052','Barbados dollar','BBD','cent','Barbados','BB','BRB','Barbados','019','029',0,0,0,NULL,NULL),(56,'Brussels','Belgian','056','euro','EUR','cent','Kingdom of Belgium','BE','BEL','Belgium','150','155',1,1,0,NULL,NULL),(60,'Hamilton','Bermudian','060','Bermuda dollar','BMD','cent','Bermuda','BM','BMU','Bermuda','019','021',0,0,0,NULL,NULL),(64,'Thimphu','Bhutanese','064','ngultrum (inv.)','BTN','chhetrum (inv.)','Kingdom of Bhutan','BT','BTN','Bhutan','142','034',0,0,0,NULL,NULL),(68,'Sucre (BO1)','Bolivian','068','boliviano','BOB','centavo','Plurinational State of Bolivia','BO','BOL','Bolivia, Plurinational State of','019','005',0,0,0,NULL,NULL),(70,'Sarajevo','of Bosnia and Herzegovina','070','convertible mark','BAM','fening','Bosnia and Herzegovina','BA','BIH','Bosnia and Herzegovina','150','039',0,0,0,NULL,NULL),(72,'Gaborone','Botswanan','072','pula (inv.)','BWP','thebe (inv.)','Republic of Botswana','BW','BWA','Botswana','002','018',0,0,0,NULL,NULL),(74,'Bouvet island','of Bouvet island','074','','','','Bouvet Island','BV','BVT','Bouvet Island','','',0,0,0,NULL,NULL),(76,'Brasilia','Brazilian','076','real (pl. reais)','BRL','centavo','Federative Republic of Brazil','BR','BRA','Brazil','019','005',0,0,0,NULL,NULL),(84,'Belmopan','Belizean','084','Belize dollar','BZD','cent','Belize','BZ','BLZ','Belize','019','013',0,0,0,NULL,NULL),(86,'Diego Garcia','Changosian','086','US dollar','USD','cent','British Indian Ocean Territory','IO','IOT','British Indian Ocean Territory','','',0,0,0,NULL,NULL),(90,'Honiara','Solomon Islander','090','Solomon Islands dollar','SBD','cent','Solomon Islands','SB','SLB','Solomon Islands','009','054',0,0,0,NULL,NULL),(92,'Road Town','British Virgin Islander;','092','US dollar','USD','cent','British Virgin Islands','VG','VGB','Virgin Islands, British','019','029',0,0,0,NULL,NULL),(96,'Bandar Seri Begawan','Bruneian','096','Brunei dollar','BND','sen (inv.)','Brunei Darussalam','BN','BRN','Brunei Darussalam','142','035',0,0,0,NULL,NULL),(100,'Sofia','Bulgarian','100','lev (pl. leva)','BGN','stotinka','Republic of Bulgaria','BG','BGR','Bulgaria','150','151',1,0,1,NULL,NULL),(104,'Yangon','Burmese','104','kyat','MMK','pya','Union of Myanmar/','MM','MMR','Myanmar','142','035',0,0,0,NULL,NULL),(108,'Bujumbura','Burundian','108','Burundi franc','BIF','centime','Republic of Burundi','BI','BDI','Burundi','002','014',0,0,0,NULL,NULL),(112,'Minsk','Belarusian','112','Belarusian rouble','BYR','kopek','Republic of Belarus','BY','BLR','Belarus','150','151',0,0,0,NULL,NULL),(116,'Phnom Penh','Cambodian','116','riel','KHR','sen (inv.)','Kingdom of Cambodia','KH','KHM','Cambodia','142','035',0,0,0,NULL,NULL),(120,'Yaoundé','Cameroonian','120','CFA franc (BEAC)','XAF','centime','Republic of Cameroon','CM','CMR','Cameroon','002','017',0,0,0,NULL,NULL),(124,'Ottawa','Canadian','124','Canadian dollar','CAD','cent','Canada','CA','CAN','Canada','019','021',0,0,0,NULL,NULL),(132,'Praia','Cape Verdean','132','Cape Verde escudo','CVE','centavo','Republic of Cape Verde','CV','CPV','Cape Verde','002','011',0,0,0,NULL,NULL),(136,'George Town','Caymanian','136','Cayman Islands dollar','KYD','cent','Cayman Islands','KY','CYM','Cayman Islands','019','029',0,0,0,NULL,NULL),(140,'Bangui','Central African','140','CFA franc (BEAC)','XAF','centime','Central African Republic','CF','CAF','Central African Republic','002','017',0,0,0,NULL,NULL),(144,'Colombo','Sri Lankan','144','Sri Lankan rupee','LKR','cent','Democratic Socialist Republic of Sri Lanka','LK','LKA','Sri Lanka','142','034',0,0,0,NULL,NULL),(148,'N’Djamena','Chadian','148','CFA franc (BEAC)','XAF','centime','Republic of Chad','TD','TCD','Chad','002','017',0,0,0,NULL,NULL),(152,'Santiago','Chilean','152','Chilean peso','CLP','centavo','Republic of Chile','CL','CHL','Chile','019','005',0,0,0,NULL,NULL),(156,'Beijing','Chinese','156','renminbi-yuan (inv.)','CNY','jiao (10)','People’s Republic of China','CN','CHN','China','142','030',0,0,0,NULL,NULL),(158,'Taipei','Taiwanese','158','new Taiwan dollar','TWD','fen (inv.)','Republic of China, Taiwan (TW1)','TW','TWN','Taiwan, Province of China','142','030',0,0,0,NULL,NULL),(162,'Flying Fish Cove','Christmas Islander','162','Australian dollar','AUD','cent','Christmas Island Territory','CX','CXR','Christmas Island','','',0,0,0,NULL,NULL),(166,'Bantam','Cocos Islander','166','Australian dollar','AUD','cent','Territory of Cocos (Keeling) Islands','CC','CCK','Cocos (Keeling) Islands','','',0,0,0,NULL,NULL),(170,'Santa Fe de Bogotá','Colombian','170','Colombian peso','COP','centavo','Republic of Colombia','CO','COL','Colombia','019','005',0,0,0,NULL,NULL),(174,'Moroni','Comorian','174','Comorian franc','KMF','','Union of the Comoros','KM','COM','Comoros','002','014',0,0,0,NULL,NULL),(175,'Mamoudzou','Mahorais','175','euro','EUR','cent','Departmental Collectivity of Mayotte','YT','MYT','Mayotte','002','014',0,0,0,NULL,NULL),(178,'Brazzaville','Congolese','178','CFA franc (BEAC)','XAF','centime','Republic of the Congo','CG','COG','Congo','002','017',0,0,0,NULL,NULL),(180,'Kinshasa','Congolese','180','Congolese franc','CDF','centime','Democratic Republic of the Congo','CD','COD','Congo, the Democratic Republic of the','002','017',0,0,0,NULL,NULL),(184,'Avarua','Cook Islander','184','New Zealand dollar','NZD','cent','Cook Islands','CK','COK','Cook Islands','009','061',0,0,0,NULL,NULL),(188,'San José','Costa Rican','188','Costa Rican colón (pl. colones)','CRC','céntimo','Republic of Costa Rica','CR','CRI','Costa Rica','019','013',0,0,0,NULL,NULL),(191,'Zagreb','Croatian','191','kuna (inv.)','HRK','lipa (inv.)','Republic of Croatia','HR','HRV','Croatia','150','039',1,0,1,NULL,NULL),(192,'Havana','Cuban','192','Cuban peso','CUP','centavo','Republic of Cuba','CU','CUB','Cuba','019','029',0,0,0,NULL,NULL),(196,'Nicosia','Cypriot','196','euro','EUR','cent','Republic of Cyprus','CY','CYP','Cyprus','142','145',1,0,0,NULL,NULL),(203,'Prague','Czech','203','Czech koruna (pl. koruny)','CZK','halér','Czech Republic','CZ','CZE','Czech Republic','150','151',1,0,1,NULL,NULL),(204,'Porto Novo (BJ1)','Beninese','204','CFA franc (BCEAO)','XOF','centime','Republic of Benin','BJ','BEN','Benin','002','011',0,0,0,NULL,NULL),(208,'Copenhagen','Danish','208','Danish krone','DKK','øre (inv.)','Kingdom of Denmark','DK','DNK','Denmark','150','154',1,1,0,NULL,NULL),(212,'Roseau','Dominican','212','East Caribbean dollar','XCD','cent','Commonwealth of Dominica','DM','DMA','Dominica','019','029',0,0,0,NULL,NULL),(214,'Santo Domingo','Dominican','214','Dominican peso','DOP','centavo','Dominican Republic','DO','DOM','Dominican Republic','019','029',0,0,0,NULL,NULL),(218,'Quito','Ecuadorian','218','US dollar','USD','cent','Republic of Ecuador','EC','ECU','Ecuador','019','005',0,0,0,NULL,NULL),(222,'San Salvador','Salvadoran','222','Salvadorian colón (pl. colones)','SVC','centavo','Republic of El Salvador','SV','SLV','El Salvador','019','013',0,0,0,NULL,NULL),(226,'Malabo','Equatorial Guinean','226','CFA franc (BEAC)','XAF','centime','Republic of Equatorial Guinea','GQ','GNQ','Equatorial Guinea','002','017',0,0,0,NULL,NULL),(231,'Addis Ababa','Ethiopian','231','birr (inv.)','ETB','cent','Federal Democratic Republic of Ethiopia','ET','ETH','Ethiopia','002','014',0,0,0,NULL,NULL),(232,'Asmara','Eritrean','232','nakfa','ERN','cent','State of Eritrea','ER','ERI','Eritrea','002','014',0,0,0,NULL,NULL),(233,'Tallinn','Estonian','233','euro','EUR','cent','Republic of Estonia','EE','EST','Estonia','150','154',1,0,1,NULL,NULL),(234,'Tórshavn','Faeroese','234','Danish krone','DKK','øre (inv.)','Faeroe Islands','FO','FRO','Faroe Islands','150','154',0,0,0,NULL,NULL),(238,'Stanley','Falkland Islander','238','Falkland Islands pound','FKP','new penny','Falkland Islands','FK','FLK','Falkland Islands (Malvinas)','019','005',0,0,0,NULL,NULL),(239,'King Edward Point (Grytviken)','of South Georgia and the South Sandwich Islands','239','','','','South Georgia and the South Sandwich Islands','GS','SGS','South Georgia and the South Sandwich Islands','','',0,0,0,NULL,NULL),(242,'Suva','Fijian','242','Fiji dollar','FJD','cent','Republic of Fiji','FJ','FJI','Fiji','009','054',0,0,0,NULL,NULL),(246,'Helsinki','Finnish','246','euro','EUR','cent','Republic of Finland','FI','FIN','Finland','150','154',1,1,1,NULL,NULL),(248,'Mariehamn','Åland Islander','248','euro','EUR','cent','Åland Islands','AX','ALA','Åland Islands','150','154',0,0,0,NULL,NULL),(250,'Paris','French','250','euro','EUR','cent','French Republic','FR','FRA','France','150','155',1,1,1,NULL,NULL),(254,'Cayenne','Guianese','254','euro','EUR','cent','French Guiana','GF','GUF','French Guiana','019','005',0,0,0,NULL,NULL),(258,'Papeete','Polynesian','258','CFP franc','XPF','centime','French Polynesia','PF','PYF','French Polynesia','009','061',0,0,0,NULL,NULL),(260,'Port-aux-Francais','of French Southern and Antarctic Lands','260','euro','EUR','cent','French Southern and Antarctic Lands','TF','ATF','French Southern Territories','','',0,0,0,NULL,NULL),(262,'Djibouti','Djiboutian','262','Djibouti franc','DJF','','Republic of Djibouti','DJ','DJI','Djibouti','002','014',0,0,0,NULL,NULL),(266,'Libreville','Gabonese','266','CFA franc (BEAC)','XAF','centime','Gabonese Republic','GA','GAB','Gabon','002','017',0,0,0,NULL,NULL),(268,'Tbilisi','Georgian','268','lari','GEL','tetri (inv.)','Georgia','GE','GEO','Georgia','142','145',0,0,0,NULL,NULL),(270,'Banjul','Gambian','270','dalasi (inv.)','GMD','butut','Republic of the Gambia','GM','GMB','Gambia','002','011',0,0,0,NULL,NULL),(275,NULL,'Palestinian','275',NULL,NULL,NULL,NULL,'PS','PSE','Palestinian Territory, Occupied','142','145',0,0,0,NULL,NULL),(276,'Berlin','German','276','euro','EUR','cent','Federal Republic of Germany','DE','DEU','Germany','150','155',1,1,1,NULL,NULL),(288,'Accra','Ghanaian','288','Ghana cedi','GHS','pesewa','Republic of Ghana','GH','GHA','Ghana','002','011',0,0,0,NULL,NULL),(292,'Gibraltar','Gibraltarian','292','Gibraltar pound','GIP','penny','Gibraltar','GI','GIB','Gibraltar','150','039',0,0,0,NULL,NULL),(296,'Tarawa','Kiribatian','296','Australian dollar','AUD','cent','Republic of Kiribati','KI','KIR','Kiribati','009','057',0,0,0,NULL,NULL),(300,'Athens','Greek','300','euro','EUR','cent','Hellenic Republic','GR','GRC','Greece','150','039',1,0,1,NULL,NULL),(304,'Nuuk','Greenlander','304','Danish krone','DKK','øre (inv.)','Greenland','GL','GRL','Greenland','019','021',0,1,0,NULL,NULL),(308,'St George’s','Grenadian','308','East Caribbean dollar','XCD','cent','Grenada','GD','GRD','Grenada','019','029',0,0,0,NULL,NULL),(312,'Basse Terre','Guadeloupean','312','euro','EUR ','cent','Guadeloupe','GP','GLP','Guadeloupe','019','029',0,0,0,NULL,NULL),(316,'Agaña (Hagåtña)','Guamanian','316','US dollar','USD','cent','Territory of Guam','GU','GUM','Guam','009','057',0,0,0,NULL,NULL),(320,'Guatemala City','Guatemalan','320','quetzal (pl. quetzales)','GTQ','centavo','Republic of Guatemala','GT','GTM','Guatemala','019','013',0,0,0,NULL,NULL),(324,'Conakry','Guinean','324','Guinean franc','GNF','','Republic of Guinea','GN','GIN','Guinea','002','011',0,0,0,NULL,NULL),(328,'Georgetown','Guyanese','328','Guyana dollar','GYD','cent','Cooperative Republic of Guyana','GY','GUY','Guyana','019','005',0,0,0,NULL,NULL),(332,'Port-au-Prince','Haitian','332','gourde','HTG','centime','Republic of Haiti','HT','HTI','Haiti','019','029',0,0,0,NULL,NULL),(334,'Territory of Heard Island and McDonald Islands','of Territory of Heard Island and McDonald Islands','334','','','','Territory of Heard Island and McDonald Islands','HM','HMD','Heard Island and McDonald Islands','','',0,0,0,NULL,NULL),(336,'Vatican City','of the Holy See/of the Vatican','336','euro','EUR','cent','the Holy See/ Vatican City State','VA','VAT','Holy See (Vatican City State)','150','039',0,0,0,NULL,NULL),(340,'Tegucigalpa','Honduran','340','lempira','HNL','centavo','Republic of Honduras','HN','HND','Honduras','019','013',0,0,0,NULL,NULL),(344,'(HK3)','Hong Kong Chinese','344','Hong Kong dollar','HKD','cent','Hong Kong Special Administrative Region of the People’s Republic of China (HK2)','HK','HKG','Hong Kong','142','030',0,0,0,NULL,NULL),(348,'Budapest','Hungarian','348','forint (inv.)','HUF','(fillér (inv.))','Republic of Hungary','HU','HUN','Hungary','150','151',1,0,1,NULL,NULL),(352,'Reykjavik','Icelander','352','króna (pl. krónur)','ISK','','Republic of Iceland','IS','ISL','Iceland','150','154',1,1,1,NULL,NULL),(356,'New Delhi','Indian','356','Indian rupee','INR','paisa','Republic of India','IN','IND','India','142','034',0,0,0,NULL,NULL),(360,'Jakarta','Indonesian','360','Indonesian rupiah (inv.)','IDR','sen (inv.)','Republic of Indonesia','ID','IDN','Indonesia','142','035',0,0,0,NULL,NULL),(364,'Tehran','Iranian','364','Iranian rial','IRR','(dinar) (IR1)','Islamic Republic of Iran','IR','IRN','Iran, Islamic Republic of','142','034',0,0,0,NULL,NULL),(368,'Baghdad','Iraqi','368','Iraqi dinar','IQD','fils (inv.)','Republic of Iraq','IQ','IRQ','Iraq','142','145',0,0,0,NULL,NULL),(372,'Dublin','Irish','372','euro','EUR','cent','Ireland (IE1)','IE','IRL','Ireland','150','154',1,0,0,',','.'),(376,'(IL1)','Israeli','376','shekel','ILS','agora','State of Israel','IL','ISR','Israel','142','145',0,1,0,NULL,NULL),(380,'Rome','Italian','380','euro','EUR','cent','Italian Republic','IT','ITA','Italy','150','039',1,1,1,NULL,NULL),(384,'Yamoussoukro (CI1)','Ivorian','384','CFA franc (BCEAO)','XOF','centime','Republic of Côte d’Ivoire','CI','CIV','Côte d\'Ivoire','002','011',0,0,0,NULL,NULL),(388,'Kingston','Jamaican','388','Jamaica dollar','JMD','cent','Jamaica','JM','JAM','Jamaica','019','029',0,0,0,NULL,NULL),(392,'Tokyo','Japanese','392','yen (inv.)','JPY','(sen (inv.)) (JP1)','Japan','JP','JPN','Japan','142','030',0,1,1,NULL,NULL),(398,'Astana','Kazakh','398','tenge (inv.)','KZT','tiyn','Republic of Kazakhstan','KZ','KAZ','Kazakhstan','142','143',0,0,0,NULL,NULL),(400,'Amman','Jordanian','400','Jordanian dinar','JOD','100 qirsh','Hashemite Kingdom of Jordan','JO','JOR','Jordan','142','145',0,0,0,NULL,NULL),(404,'Nairobi','Kenyan','404','Kenyan shilling','KES','cent','Republic of Kenya','KE','KEN','Kenya','002','014',0,0,0,NULL,NULL),(408,'Pyongyang','North Korean','408','North Korean won (inv.)','KPW','chun (inv.)','Democratic People’s Republic of Korea','KP','PRK','Korea, Democratic People\'s Republic of','142','030',0,0,0,NULL,NULL),(410,'Seoul','South Korean','410','South Korean won (inv.)','KRW','(chun (inv.))','Republic of Korea','KR','KOR','Korea, Republic of','142','030',0,0,0,NULL,NULL),(414,'Kuwait City','Kuwaiti','414','Kuwaiti dinar','KWD','fils (inv.)','State of Kuwait','KW','KWT','Kuwait','142','145',0,0,0,NULL,NULL),(417,'Bishkek','Kyrgyz','417','som','KGS','tyiyn','Kyrgyz Republic','KG','KGZ','Kyrgyzstan','142','143',0,0,0,NULL,NULL),(418,'Vientiane','Lao','418','kip (inv.)','LAK','(at (inv.))','Lao People’s Democratic Republic','LA','LAO','Lao People\'s Democratic Republic','142','035',0,0,0,NULL,NULL),(422,'Beirut','Lebanese','422','Lebanese pound','LBP','(piastre)','Lebanese Republic','LB','LBN','Lebanon','142','145',0,0,0,NULL,NULL),(426,'Maseru','Basotho','426','loti (pl. maloti)','LSL','sente','Kingdom of Lesotho','LS','LSO','Lesotho','002','018',0,0,0,NULL,NULL),(428,'Riga','Latvian','428','euro','EUR','cent','Republic of Latvia','LV','LVA','Latvia','150','154',1,0,0,NULL,NULL),(430,'Monrovia','Liberian','430','Liberian dollar','LRD','cent','Republic of Liberia','LR','LBR','Liberia','002','011',0,0,0,NULL,NULL),(434,'Tripoli','Libyan','434','Libyan dinar','LYD','dirham','Socialist People’s Libyan Arab Jamahiriya','LY','LBY','Libya','002','015',0,0,0,NULL,NULL),(438,'Vaduz','Liechtensteiner','438','Swiss franc','CHF','centime','Principality of Liechtenstein','LI','LIE','Liechtenstein','150','155',1,0,0,NULL,NULL),(440,'Vilnius','Lithuanian','440','euro','EUR','cent','Republic of Lithuania','LT','LTU','Lithuania','150','154',1,0,1,NULL,NULL),(442,'Luxembourg','Luxembourger','442','euro','EUR','cent','Grand Duchy of Luxembourg','LU','LUX','Luxembourg','150','155',1,1,0,NULL,NULL),(446,'Macao (MO3)','Macanese','446','pataca','MOP','avo','Macao Special Administrative Region of the People’s Republic of China (MO2)','MO','MAC','Macao','142','030',0,0,0,NULL,NULL),(450,'Antananarivo','Malagasy','450','ariary','MGA','iraimbilanja (inv.)','Republic of Madagascar','MG','MDG','Madagascar','002','014',0,0,0,NULL,NULL),(454,'Lilongwe','Malawian','454','Malawian kwacha (inv.)','MWK','tambala (inv.)','Republic of Malawi','MW','MWI','Malawi','002','014',0,0,0,NULL,NULL),(458,'Kuala Lumpur (MY1)','Malaysian','458','ringgit (inv.)','MYR','sen (inv.)','Malaysia','MY','MYS','Malaysia','142','035',0,1,0,NULL,NULL),(462,'Malé','Maldivian','462','rufiyaa','MVR','laari (inv.)','Republic of Maldives','MV','MDV','Maldives','142','034',0,0,0,NULL,NULL),(466,'Bamako','Malian','466','CFA franc (BCEAO)','XOF','centime','Republic of Mali','ML','MLI','Mali','002','011',0,0,0,NULL,NULL),(470,'Valletta','Maltese','470','euro','EUR','cent','Republic of Malta','MT','MLT','Malta','150','039',1,0,0,NULL,NULL),(474,'Fort-de-France','Martinican','474','euro','EUR','cent','Martinique','MQ','MTQ','Martinique','019','029',0,0,0,NULL,NULL),(478,'Nouakchott','Mauritanian','478','ouguiya','MRO','khoum','Islamic Republic of Mauritania','MR','MRT','Mauritania','002','011',0,0,0,NULL,NULL),(480,'Port Louis','Mauritian','480','Mauritian rupee','MUR','cent','Republic of Mauritius','MU','MUS','Mauritius','002','014',0,0,0,NULL,NULL),(484,'Mexico City','Mexican','484','Mexican peso','MXN','centavo','United Mexican States','MX','MEX','Mexico','019','013',0,1,0,NULL,NULL),(492,'Monaco','Monegasque','492','euro','EUR','cent','Principality of Monaco','MC','MCO','Monaco','150','155',0,0,0,NULL,NULL),(496,'Ulan Bator','Mongolian','496','tugrik','MNT','möngö (inv.)','Mongolia','MN','MNG','Mongolia','142','030',0,0,0,NULL,NULL),(498,'Chisinau','Moldovan','498','Moldovan leu (pl. lei)','MDL','ban','Republic of Moldova','MD','MDA','Moldova, Republic of','150','151',0,0,0,NULL,NULL),(499,'Podgorica','Montenegrin','499','euro','EUR','cent','Montenegro','ME','MNE','Montenegro','150','039',0,0,0,NULL,NULL),(500,'Plymouth (MS2)','Montserratian','500','East Caribbean dollar','XCD','cent','Montserrat','MS','MSR','Montserrat','019','029',0,0,0,NULL,NULL),(504,'Rabat','Moroccan','504','Moroccan dirham','MAD','centime','Kingdom of Morocco','MA','MAR','Morocco','002','015',0,0,0,NULL,NULL),(508,'Maputo','Mozambican','508','metical','MZN','centavo','Republic of Mozambique','MZ','MOZ','Mozambique','002','014',0,0,0,NULL,NULL),(512,'Muscat','Omani','512','Omani rial','OMR','baiza','Sultanate of Oman','OM','OMN','Oman','142','145',0,0,0,NULL,NULL),(516,'Windhoek','Namibian','516','Namibian dollar','NAD','cent','Republic of Namibia','NA','NAM','Namibia','002','018',0,0,0,NULL,NULL),(520,'Yaren','Nauruan','520','Australian dollar','AUD','cent','Republic of Nauru','NR','NRU','Nauru','009','057',0,0,0,NULL,NULL),(524,'Kathmandu','Nepalese','524','Nepalese rupee','NPR','paisa (inv.)','Nepal','NP','NPL','Nepal','142','034',0,0,0,NULL,NULL),(528,'Amsterdam (NL2)','Dutch','528','euro','EUR','cent','Kingdom of the Netherlands','NL','NLD','Netherlands','150','155',1,1,0,NULL,NULL),(531,'Willemstad','Curaçaoan','531','Netherlands Antillean guilder (CW1)','ANG','cent','Curaçao','CW','CUW','Curaçao','019','029',0,0,0,NULL,NULL),(533,'Oranjestad','Aruban','533','Aruban guilder','AWG','cent','Aruba','AW','ABW','Aruba','019','029',0,0,0,NULL,NULL),(534,'Philipsburg','Sint Maartener','534','Netherlands Antillean guilder (SX1)','ANG','cent','Sint Maarten','SX','SXM','Sint Maarten (Dutch part)','019','029',0,0,0,NULL,NULL),(535,NULL,'of Bonaire, Sint Eustatius and Saba','535','US dollar','USD','cent',NULL,'BQ','BES','Bonaire, Sint Eustatius and Saba','019','029',0,0,0,NULL,NULL),(540,'Nouméa','New Caledonian','540','CFP franc','XPF','centime','New Caledonia','NC','NCL','New Caledonia','009','054',0,0,0,NULL,NULL),(548,'Port Vila','Vanuatuan','548','vatu (inv.)','VUV','','Republic of Vanuatu','VU','VUT','Vanuatu','009','054',0,0,0,NULL,NULL),(554,'Wellington','New Zealander','554','New Zealand dollar','NZD','cent','New Zealand','NZ','NZL','New Zealand','009','053',0,0,0,NULL,NULL),(558,'Managua','Nicaraguan','558','córdoba oro','NIO','centavo','Republic of Nicaragua','NI','NIC','Nicaragua','019','013',0,0,0,NULL,NULL),(562,'Niamey','Nigerien','562','CFA franc (BCEAO)','XOF','centime','Republic of Niger','NE','NER','Niger','002','011',0,0,0,NULL,NULL),(566,'Abuja','Nigerian','566','naira (inv.)','NGN','kobo (inv.)','Federal Republic of Nigeria','NG','NGA','Nigeria','002','011',0,0,0,NULL,NULL),(570,'Alofi','Niuean','570','New Zealand dollar','NZD','cent','Niue','NU','NIU','Niue','009','061',0,0,0,NULL,NULL),(574,'Kingston','Norfolk Islander','574','Australian dollar','AUD','cent','Territory of Norfolk Island','NF','NFK','Norfolk Island','009','053',0,0,0,NULL,NULL),(578,'Oslo','Norwegian','578','Norwegian krone (pl. kroner)','NOK','øre (inv.)','Kingdom of Norway','NO','NOR','Norway','150','154',1,0,0,NULL,NULL),(580,'Saipan','Northern Mariana Islander','580','US dollar','USD','cent','Commonwealth of the Northern Mariana Islands','MP','MNP','Northern Mariana Islands','009','057',0,0,0,NULL,NULL),(581,'United States Minor Outlying Islands','of United States Minor Outlying Islands','581','US dollar','USD','cent','United States Minor Outlying Islands','UM','UMI','United States Minor Outlying Islands','','',0,0,0,NULL,NULL),(583,'Palikir','Micronesian','583','US dollar','USD','cent','Federated States of Micronesia','FM','FSM','Micronesia, Federated States of','009','057',0,0,0,NULL,NULL),(584,'Majuro','Marshallese','584','US dollar','USD','cent','Republic of the Marshall Islands','MH','MHL','Marshall Islands','009','057',0,0,0,NULL,NULL),(585,'Melekeok','Palauan','585','US dollar','USD','cent','Republic of Palau','PW','PLW','Palau','009','057',0,0,0,NULL,NULL),(586,'Islamabad','Pakistani','586','Pakistani rupee','PKR','paisa','Islamic Republic of Pakistan','PK','PAK','Pakistan','142','034',0,0,0,NULL,NULL),(591,'Panama City','Panamanian','591','balboa','PAB','centésimo','Republic of Panama','PA','PAN','Panama','019','013',0,0,0,NULL,NULL),(598,'Port Moresby','Papua New Guinean','598','kina (inv.)','PGK','toea (inv.)','Independent State of Papua New Guinea','PG','PNG','Papua New Guinea','009','054',0,0,0,NULL,NULL),(600,'Asunción','Paraguayan','600','guaraní','PYG','céntimo','Republic of Paraguay','PY','PRY','Paraguay','019','005',0,0,0,NULL,NULL),(604,'Lima','Peruvian','604','new sol','PEN','céntimo','Republic of Peru','PE','PER','Peru','019','005',0,0,0,NULL,NULL),(608,'Manila','Filipino','608','Philippine peso','PHP','centavo','Republic of the Philippines','PH','PHL','Philippines','142','035',0,0,0,NULL,NULL),(612,'Adamstown','Pitcairner','612','New Zealand dollar','NZD','cent','Pitcairn Islands','PN','PCN','Pitcairn','009','061',0,0,0,NULL,NULL),(616,'Warsaw','Polish','616','zloty','PLN','grosz (pl. groszy)','Republic of Poland','PL','POL','Poland','150','151',1,1,1,NULL,NULL),(620,'Lisbon','Portuguese','620','euro','EUR','cent','Portuguese Republic','PT','PRT','Portugal','150','039',1,1,1,NULL,NULL),(624,'Bissau','Guinea-Bissau national','624','CFA franc (BCEAO)','XOF','centime','Republic of Guinea-Bissau','GW','GNB','Guinea-Bissau','002','011',0,0,0,NULL,NULL),(626,'Dili','East Timorese','626','US dollar','USD','cent','Democratic Republic of East Timor','TL','TLS','Timor-Leste','142','035',0,0,0,NULL,NULL),(630,'San Juan','Puerto Rican','630','US dollar','USD','cent','Commonwealth of Puerto Rico','PR','PRI','Puerto Rico','019','029',0,0,0,NULL,NULL),(634,'Doha','Qatari','634','Qatari riyal','QAR','dirham','State of Qatar','QA','QAT','Qatar','142','145',0,0,0,NULL,NULL),(638,'Saint-Denis','Reunionese','638','euro','EUR','cent','Réunion','RE','REU','Réunion','002','014',0,0,0,NULL,NULL),(642,'Bucharest','Romanian','642','Romanian leu (pl. lei)','RON','ban (pl. bani)','Romania','RO','ROU','Romania','150','151',1,0,1,NULL,NULL),(643,'Moscow','Russian','643','Russian rouble','RUB','kopek','Russian Federation','RU','RUS','Russian Federation','150','151',0,0,0,NULL,NULL),(646,'Kigali','Rwandan; Rwandese','646','Rwandese franc','RWF','centime','Republic of Rwanda','RW','RWA','Rwanda','002','014',0,0,0,NULL,NULL),(652,'Gustavia','of Saint Barthélemy','652','euro','EUR','cent','Collectivity of Saint Barthélemy','BL','BLM','Saint Barthélemy','019','029',0,0,0,NULL,NULL),(654,'Jamestown','Saint Helenian','654','Saint Helena pound','SHP','penny','Saint Helena, Ascension and Tristan da Cunha','SH','SHN','Saint Helena, Ascension and Tristan da Cunha','002','011',0,0,0,NULL,NULL),(659,'Basseterre','Kittsian; Nevisian','659','East Caribbean dollar','XCD','cent','Federation of Saint Kitts and Nevis','KN','KNA','Saint Kitts and Nevis','019','029',0,0,0,NULL,NULL),(660,'The Valley','Anguillan','660','East Caribbean dollar','XCD','cent','Anguilla','AI','AIA','Anguilla','019','029',0,0,0,NULL,NULL),(662,'Castries','Saint Lucian','662','East Caribbean dollar','XCD','cent','Saint Lucia','LC','LCA','Saint Lucia','019','029',0,0,0,NULL,NULL),(663,'Marigot','of Saint Martin','663','euro','EUR','cent','Collectivity of Saint Martin','MF','MAF','Saint Martin (French part)','019','029',0,0,0,NULL,NULL),(666,'Saint-Pierre','St-Pierrais; Miquelonnais','666','euro','EUR','cent','Territorial Collectivity of Saint Pierre and Miquelon','PM','SPM','Saint Pierre and Miquelon','019','021',0,0,0,NULL,NULL),(670,'Kingstown','Vincentian','670','East Caribbean dollar','XCD','cent','Saint Vincent and the Grenadines','VC','VCT','Saint Vincent and the Grenadines','019','029',0,0,0,NULL,NULL),(674,'San Marino','San Marinese','674','euro','EUR ','cent','Republic of San Marino','SM','SMR','San Marino','150','039',0,0,0,NULL,NULL),(678,'São Tomé','São Toméan','678','dobra','STD','centavo','Democratic Republic of São Tomé and Príncipe','ST','STP','Sao Tome and Principe','002','017',0,0,0,NULL,NULL),(682,'Riyadh','Saudi Arabian','682','riyal','SAR','halala','Kingdom of Saudi Arabia','SA','SAU','Saudi Arabia','142','145',0,0,0,NULL,NULL),(686,'Dakar','Senegalese','686','CFA franc (BCEAO)','XOF','centime','Republic of Senegal','SN','SEN','Senegal','002','011',0,0,0,NULL,NULL),(688,'Belgrade','Serb','688','Serbian dinar','RSD','para (inv.)','Republic of Serbia','RS','SRB','Serbia','150','039',0,0,0,NULL,NULL),(690,'Victoria','Seychellois','690','Seychelles rupee','SCR','cent','Republic of Seychelles','SC','SYC','Seychelles','002','014',0,0,0,NULL,NULL),(694,'Freetown','Sierra Leonean','694','leone','SLL','cent','Republic of Sierra Leone','SL','SLE','Sierra Leone','002','011',0,0,0,NULL,NULL),(702,'Singapore','Singaporean','702','Singapore dollar','SGD','cent','Republic of Singapore','SG','SGP','Singapore','142','035',0,0,0,NULL,NULL),(703,'Bratislava','Slovak','703','euro','EUR','cent','Slovak Republic','SK','SVK','Slovakia','150','151',1,0,1,NULL,NULL),(704,'Hanoi','Vietnamese','704','dong','VND','(10 hào','Socialist Republic of Vietnam','VN','VNM','Viet Nam','142','035',0,0,0,NULL,NULL),(705,'Ljubljana','Slovene','705','euro','EUR','cent','Republic of Slovenia','SI','SVN','Slovenia','150','039',1,0,1,NULL,NULL),(706,'Mogadishu','Somali','706','Somali shilling','SOS','cent','Somali Republic','SO','SOM','Somalia','002','014',0,0,0,NULL,NULL),(710,'Pretoria (ZA1)','South African','710','rand','ZAR','cent','Republic of South Africa','ZA','ZAF','South Africa','002','018',0,0,0,NULL,NULL),(716,'Harare','Zimbabwean','716','Zimbabwe dollar (ZW1)','ZWL','cent','Republic of Zimbabwe','ZW','ZWE','Zimbabwe','002','014',0,0,0,NULL,NULL),(724,'Madrid','Spaniard','724','euro','EUR','cent','Kingdom of Spain','ES','ESP','Spain','150','039',1,1,1,NULL,NULL),(728,'Juba','South Sudanese','728','South Sudanese pound','SSP','piaster','Republic of South Sudan','SS','SSD','South Sudan','002','015',0,0,0,NULL,NULL),(729,'Khartoum','Sudanese','729','Sudanese pound','SDG','piastre','Republic of the Sudan','SD','SDN','Sudan','002','015',0,0,0,NULL,NULL),(732,'Al aaiun','Sahrawi','732','Moroccan dirham','MAD','centime','Western Sahara','EH','ESH','Western Sahara','002','015',0,0,0,NULL,NULL),(740,'Paramaribo','Surinamese','740','Surinamese dollar','SRD','cent','Republic of Suriname','SR','SUR','Suriname','019','005',0,0,0,NULL,NULL),(744,'Longyearbyen','of Svalbard','744','Norwegian krone (pl. kroner)','NOK','øre (inv.)','Svalbard and Jan Mayen','SJ','SJM','Svalbard and Jan Mayen','150','154',0,0,0,NULL,NULL),(748,'Mbabane','Swazi','748','lilangeni','SZL','cent','Kingdom of Swaziland','SZ','SWZ','Swaziland','002','018',0,0,0,NULL,NULL),(752,'Stockholm','Swedish','752','krona (pl. kronor)','SEK','öre (inv.)','Kingdom of Sweden','SE','SWE','Sweden','150','154',1,1,1,NULL,NULL),(756,'Berne','Swiss','756','Swiss franc','CHF','centime','Swiss Confederation','CH','CHE','Switzerland','150','155',1,1,0,NULL,NULL),(760,'Damascus','Syrian','760','Syrian pound','SYP','piastre','Syrian Arab Republic','SY','SYR','Syrian Arab Republic','142','145',0,0,0,NULL,NULL),(762,'Dushanbe','Tajik','762','somoni','TJS','diram','Republic of Tajikistan','TJ','TJK','Tajikistan','142','143',0,0,0,NULL,NULL),(764,'Bangkok','Thai','764','baht (inv.)','THB','satang (inv.)','Kingdom of Thailand','TH','THA','Thailand','142','035',0,0,0,NULL,NULL),(768,'Lomé','Togolese','768','CFA franc (BCEAO)','XOF','centime','Togolese Republic','TG','TGO','Togo','002','011',0,0,0,NULL,NULL),(772,'(TK2)','Tokelauan','772','New Zealand dollar','NZD','cent','Tokelau','TK','TKL','Tokelau','009','061',0,0,0,NULL,NULL),(776,'Nuku’alofa','Tongan','776','pa’anga (inv.)','TOP','seniti (inv.)','Kingdom of Tonga','TO','TON','Tonga','009','061',0,0,0,NULL,NULL),(780,'Port of Spain','Trinidadian; Tobagonian','780','Trinidad and Tobago dollar','TTD','cent','Republic of Trinidad and Tobago','TT','TTO','Trinidad and Tobago','019','029',0,0,0,NULL,NULL),(784,'Abu Dhabi','Emirian','784','UAE dirham','AED','fils (inv.)','United Arab Emirates','AE','ARE','United Arab Emirates','142','145',0,0,0,NULL,NULL),(788,'Tunis','Tunisian','788','Tunisian dinar','TND','millime','Republic of Tunisia','TN','TUN','Tunisia','002','015',0,0,0,NULL,NULL),(792,'Ankara','Turk','792','Turkish lira (inv.)','TRY','kurus (inv.)','Republic of Turkey','TR','TUR','Turkey','142','145',0,0,0,NULL,NULL),(795,'Ashgabat','Turkmen','795','Turkmen manat (inv.)','TMT','tenge (inv.)','Turkmenistan','TM','TKM','Turkmenistan','142','143',0,0,0,NULL,NULL),(796,'Cockburn Town','Turks and Caicos Islander','796','US dollar','USD','cent','Turks and Caicos Islands','TC','TCA','Turks and Caicos Islands','019','029',0,0,0,NULL,NULL),(798,'Funafuti','Tuvaluan','798','Australian dollar','AUD','cent','Tuvalu','TV','TUV','Tuvalu','009','061',0,0,0,NULL,NULL),(800,'Kampala','Ugandan','800','Uganda shilling','UGX','cent','Republic of Uganda','UG','UGA','Uganda','002','014',0,0,0,NULL,NULL),(804,'Kiev','Ukrainian','804','hryvnia','UAH','kopiyka','Ukraine','UA','UKR','Ukraine','150','151',0,0,0,NULL,NULL),(807,'Skopje','of the former Yugoslav Republic of Macedonia','807','denar (pl. denars)','MKD','deni (inv.)','the former Yugoslav Republic of Macedonia','MK','MKD','Macedonia, the former Yugoslav Republic of','150','039',0,0,0,NULL,NULL),(818,'Cairo','Egyptian','818','Egyptian pound','EGP','piastre','Arab Republic of Egypt','EG','EGY','Egypt','002','015',0,0,0,NULL,NULL),(826,'London','British','826','pound sterling','GBP','penny (pl. pence)','United Kingdom of Great Britain and Northern Ireland','GB','GBR','United Kingdom','150','154',1,0,0,NULL,NULL),(831,'St Peter Port','of Guernsey','831','Guernsey pound (GG2)','GGP (GG2)','penny (pl. pence)','Bailiwick of Guernsey','GG','GGY','Guernsey','150','154',0,0,0,NULL,NULL),(832,'St Helier','of Jersey','832','Jersey pound (JE2)','JEP (JE2)','penny (pl. pence)','Bailiwick of Jersey','JE','JEY','Jersey','150','154',0,0,0,NULL,NULL),(833,'Douglas','Manxman; Manxwoman','833','Manx pound (IM2)','IMP (IM2)','penny (pl. pence)','Isle of Man','IM','IMN','Isle of Man','150','154',0,0,0,NULL,NULL),(834,'Dodoma (TZ1)','Tanzanian','834','Tanzanian shilling','TZS','cent','United Republic of Tanzania','TZ','TZA','Tanzania, United Republic of','002','014',0,0,0,NULL,NULL),(840,'Washington DC','American','840','US dollar','USD','cent','United States of America','US','USA','United States','019','021',0,0,0,',','.'),(850,'Charlotte Amalie','US Virgin Islander','850','US dollar','USD','cent','United States Virgin Islands','VI','VIR','Virgin Islands, U.S.','019','029',0,0,0,NULL,NULL),(854,'Ouagadougou','Burkinabe','854','CFA franc (BCEAO)','XOF','centime','Burkina Faso','BF','BFA','Burkina Faso','002','011',0,0,0,NULL,NULL),(858,'Montevideo','Uruguayan','858','Uruguayan peso','UYU','centésimo','Eastern Republic of Uruguay','UY','URY','Uruguay','019','005',0,1,0,NULL,NULL),(860,'Tashkent','Uzbek','860','sum (inv.)','UZS','tiyin (inv.)','Republic of Uzbekistan','UZ','UZB','Uzbekistan','142','143',0,0,0,NULL,NULL),(862,'Caracas','Venezuelan','862','bolívar fuerte (pl. bolívares fuertes)','VEF','céntimo','Bolivarian Republic of Venezuela','VE','VEN','Venezuela, Bolivarian Republic of','019','005',0,0,0,NULL,NULL),(876,'Mata-Utu','Wallisian; Futunan; Wallis and Futuna Islander','876','CFP franc','XPF','centime','Wallis and Futuna','WF','WLF','Wallis and Futuna','009','061',0,0,0,NULL,NULL),(882,'Apia','Samoan','882','tala (inv.)','WST','sene (inv.)','Independent State of Samoa','WS','WSM','Samoa','009','061',0,0,0,NULL,NULL),(887,'San’a','Yemenite','887','Yemeni rial','YER','fils (inv.)','Republic of Yemen','YE','YEM','Yemen','142','145',0,0,0,NULL,NULL),(894,'Lusaka','Zambian','894','Zambian kwacha (inv.)','ZMW','ngwee (inv.)','Republic of Zambia','ZM','ZMB','Zambia','002','014',0,0,0,NULL,NULL);
+INSERT INTO `countries` VALUES (4,'Kabul','Afghan','004','afghani','AFN','pul','Islamic Republic of Afghanistan','AF','AFG','Afghanistan','142','034',0,0,0,NULL,NULL),(8,'Tirana','Albanian','008','lek','ALL','(qindar (pl. qindarka))','Republic of Albania','AL','ALB','Albania','150','039',0,0,0,NULL,NULL),(10,'Antartica','of Antartica','010','','','','Antarctica','AQ','ATA','Antarctica','','',0,0,0,NULL,NULL),(12,'Algiers','Algerian','012','Algerian dinar','DZD','centime','People’s Democratic Republic of Algeria','DZ','DZA','Algeria','002','015',0,0,0,NULL,NULL),(16,'Pago Pago','American Samoan','016','US dollar','USD','cent','Territory of American','AS','ASM','American Samoa','009','061',0,0,0,NULL,NULL),(20,'Andorra la Vella','Andorran','020','euro','EUR','cent','Principality of Andorra','AD','AND','Andorra','150','039',0,0,0,NULL,NULL),(24,'Luanda','Angolan','024','kwanza','AOA','cêntimo','Republic of Angola','AO','AGO','Angola','002','017',0,0,0,NULL,NULL),(28,'St John’s','of Antigua and Barbuda','028','East Caribbean dollar','XCD','cent','Antigua and Barbuda','AG','ATG','Antigua and Barbuda','019','029',0,0,0,NULL,NULL),(31,'Baku','Azerbaijani','031','Azerbaijani manat','AZN','kepik (inv.)','Republic of Azerbaijan','AZ','AZE','Azerbaijan','142','145',0,0,0,NULL,NULL),(32,'Buenos Aires','Argentinian','032','Argentine peso','ARS','centavo','Argentine Republic','AR','ARG','Argentina','019','005',0,1,0,NULL,NULL),(36,'Canberra','Australian','036','Australian dollar','AUD','cent','Commonwealth of Australia','AU','AUS','Australia','009','053',0,0,0,NULL,NULL),(40,'Vienna','Austrian','040','euro','EUR','cent','Republic of Austria','AT','AUT','Austria','150','155',1,1,1,NULL,NULL),(44,'Nassau','Bahamian','044','Bahamian dollar','BSD','cent','Commonwealth of the Bahamas','BS','BHS','Bahamas','019','029',0,0,0,NULL,NULL),(48,'Manama','Bahraini','048','Bahraini dinar','BHD','fils (inv.)','Kingdom of Bahrain','BH','BHR','Bahrain','142','145',0,0,0,NULL,NULL),(50,'Dhaka','Bangladeshi','050','taka (inv.)','BDT','poisha (inv.)','People’s Republic of Bangladesh','BD','BGD','Bangladesh','142','034',0,0,0,NULL,NULL),(51,'Yerevan','Armenian','051','dram (inv.)','AMD','luma','Republic of Armenia','AM','ARM','Armenia','142','145',0,0,0,NULL,NULL),(52,'Bridgetown','Barbadian','052','Barbados dollar','BBD','cent','Barbados','BB','BRB','Barbados','019','029',0,0,0,NULL,NULL),(56,'Brussels','Belgian','056','euro','EUR','cent','Kingdom of Belgium','BE','BEL','Belgium','150','155',1,1,0,NULL,NULL),(60,'Hamilton','Bermudian','060','Bermuda dollar','BMD','cent','Bermuda','BM','BMU','Bermuda','019','021',0,0,0,NULL,NULL),(64,'Thimphu','Bhutanese','064','ngultrum (inv.)','BTN','chhetrum (inv.)','Kingdom of Bhutan','BT','BTN','Bhutan','142','034',0,0,0,NULL,NULL),(68,'Sucre (BO1)','Bolivian','068','boliviano','BOB','centavo','Plurinational State of Bolivia','BO','BOL','Bolivia, Plurinational State of','019','005',0,0,0,NULL,NULL),(70,'Sarajevo','of Bosnia and Herzegovina','070','convertible mark','BAM','fening','Bosnia and Herzegovina','BA','BIH','Bosnia and Herzegovina','150','039',0,0,0,NULL,NULL),(72,'Gaborone','Botswanan','072','pula (inv.)','BWP','thebe (inv.)','Republic of Botswana','BW','BWA','Botswana','002','018',0,0,0,NULL,NULL),(74,'Bouvet island','of Bouvet island','074','','','','Bouvet Island','BV','BVT','Bouvet Island','','',0,0,0,NULL,NULL),(76,'Brasilia','Brazilian','076','real (pl. reais)','BRL','centavo','Federative Republic of Brazil','BR','BRA','Brazil','019','005',0,0,0,NULL,NULL),(84,'Belmopan','Belizean','084','Belize dollar','BZD','cent','Belize','BZ','BLZ','Belize','019','013',0,0,0,NULL,NULL),(86,'Diego Garcia','Changosian','086','US dollar','USD','cent','British Indian Ocean Territory','IO','IOT','British Indian Ocean Territory','','',0,0,0,NULL,NULL),(90,'Honiara','Solomon Islander','090','Solomon Islands dollar','SBD','cent','Solomon Islands','SB','SLB','Solomon Islands','009','054',0,0,0,NULL,NULL),(92,'Road Town','British Virgin Islander;','092','US dollar','USD','cent','British Virgin Islands','VG','VGB','Virgin Islands, British','019','029',0,0,0,NULL,NULL),(96,'Bandar Seri Begawan','Bruneian','096','Brunei dollar','BND','sen (inv.)','Brunei Darussalam','BN','BRN','Brunei Darussalam','142','035',0,0,0,NULL,NULL),(100,'Sofia','Bulgarian','100','lev (pl. leva)','BGN','stotinka','Republic of Bulgaria','BG','BGR','Bulgaria','150','151',1,0,1,NULL,NULL),(104,'Yangon','Burmese','104','kyat','MMK','pya','Union of Myanmar/','MM','MMR','Myanmar','142','035',0,0,0,NULL,NULL),(108,'Bujumbura','Burundian','108','Burundi franc','BIF','centime','Republic of Burundi','BI','BDI','Burundi','002','014',0,0,0,NULL,NULL),(112,'Minsk','Belarusian','112','Belarusian rouble','BYR','kopek','Republic of Belarus','BY','BLR','Belarus','150','151',0,0,0,NULL,NULL),(116,'Phnom Penh','Cambodian','116','riel','KHR','sen (inv.)','Kingdom of Cambodia','KH','KHM','Cambodia','142','035',0,0,0,NULL,NULL),(120,'Yaoundé','Cameroonian','120','CFA franc (BEAC)','XAF','centime','Republic of Cameroon','CM','CMR','Cameroon','002','017',0,0,0,NULL,NULL),(124,'Ottawa','Canadian','124','Canadian dollar','CAD','cent','Canada','CA','CAN','Canada','019','021',0,0,0,NULL,NULL),(132,'Praia','Cape Verdean','132','Cape Verde escudo','CVE','centavo','Republic of Cape Verde','CV','CPV','Cape Verde','002','011',0,0,0,NULL,NULL),(136,'George Town','Caymanian','136','Cayman Islands dollar','KYD','cent','Cayman Islands','KY','CYM','Cayman Islands','019','029',0,0,0,NULL,NULL),(140,'Bangui','Central African','140','CFA franc (BEAC)','XAF','centime','Central African Republic','CF','CAF','Central African Republic','002','017',0,0,0,NULL,NULL),(144,'Colombo','Sri Lankan','144','Sri Lankan rupee','LKR','cent','Democratic Socialist Republic of Sri Lanka','LK','LKA','Sri Lanka','142','034',0,0,0,NULL,NULL),(148,'N’Djamena','Chadian','148','CFA franc (BEAC)','XAF','centime','Republic of Chad','TD','TCD','Chad','002','017',0,0,0,NULL,NULL),(152,'Santiago','Chilean','152','Chilean peso','CLP','centavo','Republic of Chile','CL','CHL','Chile','019','005',0,0,0,NULL,NULL),(156,'Beijing','Chinese','156','renminbi-yuan (inv.)','CNY','jiao (10)','People’s Republic of China','CN','CHN','China','142','030',0,0,0,NULL,NULL),(158,'Taipei','Taiwanese','158','new Taiwan dollar','TWD','fen (inv.)','Republic of China, Taiwan (TW1)','TW','TWN','Taiwan, Province of China','142','030',0,0,0,NULL,NULL),(162,'Flying Fish Cove','Christmas Islander','162','Australian dollar','AUD','cent','Christmas Island Territory','CX','CXR','Christmas Island','','',0,0,0,NULL,NULL),(166,'Bantam','Cocos Islander','166','Australian dollar','AUD','cent','Territory of Cocos (Keeling) Islands','CC','CCK','Cocos (Keeling) Islands','','',0,0,0,NULL,NULL),(170,'Santa Fe de Bogotá','Colombian','170','Colombian peso','COP','centavo','Republic of Colombia','CO','COL','Colombia','019','005',0,0,0,NULL,NULL),(174,'Moroni','Comorian','174','Comorian franc','KMF','','Union of the Comoros','KM','COM','Comoros','002','014',0,0,0,NULL,NULL),(175,'Mamoudzou','Mahorais','175','euro','EUR','cent','Departmental Collectivity of Mayotte','YT','MYT','Mayotte','002','014',0,0,0,NULL,NULL),(178,'Brazzaville','Congolese','178','CFA franc (BEAC)','XAF','centime','Republic of the Congo','CG','COG','Congo','002','017',0,0,0,NULL,NULL),(180,'Kinshasa','Congolese','180','Congolese franc','CDF','centime','Democratic Republic of the Congo','CD','COD','Congo, the Democratic Republic of the','002','017',0,0,0,NULL,NULL),(184,'Avarua','Cook Islander','184','New Zealand dollar','NZD','cent','Cook Islands','CK','COK','Cook Islands','009','061',0,0,0,NULL,NULL),(188,'San José','Costa Rican','188','Costa Rican colón (pl. colones)','CRC','céntimo','Republic of Costa Rica','CR','CRI','Costa Rica','019','013',0,0,0,NULL,NULL),(191,'Zagreb','Croatian','191','kuna (inv.)','HRK','lipa (inv.)','Republic of Croatia','HR','HRV','Croatia','150','039',1,0,1,NULL,NULL),(192,'Havana','Cuban','192','Cuban peso','CUP','centavo','Republic of Cuba','CU','CUB','Cuba','019','029',0,0,0,NULL,NULL),(196,'Nicosia','Cypriot','196','euro','EUR','cent','Republic of Cyprus','CY','CYP','Cyprus','142','145',1,0,0,NULL,NULL),(203,'Prague','Czech','203','Czech koruna (pl. koruny)','CZK','halér','Czech Republic','CZ','CZE','Czech Republic','150','151',1,0,1,NULL,NULL),(204,'Porto Novo (BJ1)','Beninese','204','CFA franc (BCEAO)','XOF','centime','Republic of Benin','BJ','BEN','Benin','002','011',0,0,0,NULL,NULL),(208,'Copenhagen','Danish','208','Danish krone','DKK','øre (inv.)','Kingdom of Denmark','DK','DNK','Denmark','150','154',1,1,0,NULL,NULL),(212,'Roseau','Dominican','212','East Caribbean dollar','XCD','cent','Commonwealth of Dominica','DM','DMA','Dominica','019','029',0,0,0,NULL,NULL),(214,'Santo Domingo','Dominican','214','Dominican peso','DOP','centavo','Dominican Republic','DO','DOM','Dominican Republic','019','029',0,0,0,NULL,NULL),(218,'Quito','Ecuadorian','218','US dollar','USD','cent','Republic of Ecuador','EC','ECU','Ecuador','019','005',0,0,0,NULL,NULL),(222,'San Salvador','Salvadoran','222','Salvadorian colón (pl. colones)','SVC','centavo','Republic of El Salvador','SV','SLV','El Salvador','019','013',0,0,0,NULL,NULL),(226,'Malabo','Equatorial Guinean','226','CFA franc (BEAC)','XAF','centime','Republic of Equatorial Guinea','GQ','GNQ','Equatorial Guinea','002','017',0,0,0,NULL,NULL),(231,'Addis Ababa','Ethiopian','231','birr (inv.)','ETB','cent','Federal Democratic Republic of Ethiopia','ET','ETH','Ethiopia','002','014',0,0,0,NULL,NULL),(232,'Asmara','Eritrean','232','nakfa','ERN','cent','State of Eritrea','ER','ERI','Eritrea','002','014',0,0,0,NULL,NULL),(233,'Tallinn','Estonian','233','euro','EUR','cent','Republic of Estonia','EE','EST','Estonia','150','154',1,0,1,NULL,NULL),(234,'Tórshavn','Faeroese','234','Danish krone','DKK','øre (inv.)','Faeroe Islands','FO','FRO','Faroe Islands','150','154',0,0,0,NULL,NULL),(238,'Stanley','Falkland Islander','238','Falkland Islands pound','FKP','new penny','Falkland Islands','FK','FLK','Falkland Islands (Malvinas)','019','005',0,0,0,NULL,NULL),(239,'King Edward Point (Grytviken)','of South Georgia and the South Sandwich Islands','239','','','','South Georgia and the South Sandwich Islands','GS','SGS','South Georgia and the South Sandwich Islands','','',0,0,0,NULL,NULL),(242,'Suva','Fijian','242','Fiji dollar','FJD','cent','Republic of Fiji','FJ','FJI','Fiji','009','054',0,0,0,NULL,NULL),(246,'Helsinki','Finnish','246','euro','EUR','cent','Republic of Finland','FI','FIN','Finland','150','154',1,1,1,NULL,NULL),(248,'Mariehamn','Åland Islander','248','euro','EUR','cent','Åland Islands','AX','ALA','Åland Islands','150','154',0,0,0,NULL,NULL),(250,'Paris','French','250','euro','EUR','cent','French Republic','FR','FRA','France','150','155',1,1,1,NULL,NULL),(254,'Cayenne','Guianese','254','euro','EUR','cent','French Guiana','GF','GUF','French Guiana','019','005',0,0,0,NULL,NULL),(258,'Papeete','Polynesian','258','CFP franc','XPF','centime','French Polynesia','PF','PYF','French Polynesia','009','061',0,0,0,NULL,NULL),(260,'Port-aux-Francais','of French Southern and Antarctic Lands','260','euro','EUR','cent','French Southern and Antarctic Lands','TF','ATF','French Southern Territories','','',0,0,0,NULL,NULL),(262,'Djibouti','Djiboutian','262','Djibouti franc','DJF','','Republic of Djibouti','DJ','DJI','Djibouti','002','014',0,0,0,NULL,NULL),(266,'Libreville','Gabonese','266','CFA franc (BEAC)','XAF','centime','Gabonese Republic','GA','GAB','Gabon','002','017',0,0,0,NULL,NULL),(268,'Tbilisi','Georgian','268','lari','GEL','tetri (inv.)','Georgia','GE','GEO','Georgia','142','145',0,0,0,NULL,NULL),(270,'Banjul','Gambian','270','dalasi (inv.)','GMD','butut','Republic of the Gambia','GM','GMB','Gambia','002','011',0,0,0,NULL,NULL),(275,NULL,'Palestinian','275',NULL,NULL,NULL,NULL,'PS','PSE','Palestinian Territory, Occupied','142','145',0,0,0,NULL,NULL),(276,'Berlin','German','276','euro','EUR','cent','Federal Republic of Germany','DE','DEU','Germany','150','155',1,1,1,NULL,NULL),(288,'Accra','Ghanaian','288','Ghana cedi','GHS','pesewa','Republic of Ghana','GH','GHA','Ghana','002','011',0,0,0,NULL,NULL),(292,'Gibraltar','Gibraltarian','292','Gibraltar pound','GIP','penny','Gibraltar','GI','GIB','Gibraltar','150','039',0,0,0,NULL,NULL),(296,'Tarawa','Kiribatian','296','Australian dollar','AUD','cent','Republic of Kiribati','KI','KIR','Kiribati','009','057',0,0,0,NULL,NULL),(300,'Athens','Greek','300','euro','EUR','cent','Hellenic Republic','GR','GRC','Greece','150','039',1,0,1,NULL,NULL),(304,'Nuuk','Greenlander','304','Danish krone','DKK','øre (inv.)','Greenland','GL','GRL','Greenland','019','021',0,1,0,NULL,NULL),(308,'St George’s','Grenadian','308','East Caribbean dollar','XCD','cent','Grenada','GD','GRD','Grenada','019','029',0,0,0,NULL,NULL),(312,'Basse Terre','Guadeloupean','312','euro','EUR ','cent','Guadeloupe','GP','GLP','Guadeloupe','019','029',0,0,0,NULL,NULL),(316,'Agaña (Hagåtña)','Guamanian','316','US dollar','USD','cent','Territory of Guam','GU','GUM','Guam','009','057',0,0,0,NULL,NULL),(320,'Guatemala City','Guatemalan','320','quetzal (pl. quetzales)','GTQ','centavo','Republic of Guatemala','GT','GTM','Guatemala','019','013',0,0,0,NULL,NULL),(324,'Conakry','Guinean','324','Guinean franc','GNF','','Republic of Guinea','GN','GIN','Guinea','002','011',0,0,0,NULL,NULL),(328,'Georgetown','Guyanese','328','Guyana dollar','GYD','cent','Cooperative Republic of Guyana','GY','GUY','Guyana','019','005',0,0,0,NULL,NULL),(332,'Port-au-Prince','Haitian','332','gourde','HTG','centime','Republic of Haiti','HT','HTI','Haiti','019','029',0,0,0,NULL,NULL),(334,'Territory of Heard Island and McDonald Islands','of Territory of Heard Island and McDonald Islands','334','','','','Territory of Heard Island and McDonald Islands','HM','HMD','Heard Island and McDonald Islands','','',0,0,0,NULL,NULL),(336,'Vatican City','of the Holy See/of the Vatican','336','euro','EUR','cent','the Holy See/ Vatican City State','VA','VAT','Holy See (Vatican City State)','150','039',0,0,0,NULL,NULL),(340,'Tegucigalpa','Honduran','340','lempira','HNL','centavo','Republic of Honduras','HN','HND','Honduras','019','013',0,0,0,NULL,NULL),(344,'(HK3)','Hong Kong Chinese','344','Hong Kong dollar','HKD','cent','Hong Kong Special Administrative Region of the People’s Republic of China (HK2)','HK','HKG','Hong Kong','142','030',0,0,0,NULL,NULL),(348,'Budapest','Hungarian','348','forint (inv.)','HUF','(fillér (inv.))','Republic of Hungary','HU','HUN','Hungary','150','151',1,0,1,NULL,NULL),(352,'Reykjavik','Icelander','352','króna (pl. krónur)','ISK','','Republic of Iceland','IS','ISL','Iceland','150','154',0,1,1,NULL,NULL),(356,'New Delhi','Indian','356','Indian rupee','INR','paisa','Republic of India','IN','IND','India','142','034',0,0,0,NULL,NULL),(360,'Jakarta','Indonesian','360','Indonesian rupiah (inv.)','IDR','sen (inv.)','Republic of Indonesia','ID','IDN','Indonesia','142','035',0,0,0,NULL,NULL),(364,'Tehran','Iranian','364','Iranian rial','IRR','(dinar) (IR1)','Islamic Republic of Iran','IR','IRN','Iran, Islamic Republic of','142','034',0,0,0,NULL,NULL),(368,'Baghdad','Iraqi','368','Iraqi dinar','IQD','fils (inv.)','Republic of Iraq','IQ','IRQ','Iraq','142','145',0,0,0,NULL,NULL),(372,'Dublin','Irish','372','euro','EUR','cent','Ireland (IE1)','IE','IRL','Ireland','150','154',1,0,0,',','.'),(376,'(IL1)','Israeli','376','shekel','ILS','agora','State of Israel','IL','ISR','Israel','142','145',0,1,0,NULL,NULL),(380,'Rome','Italian','380','euro','EUR','cent','Italian Republic','IT','ITA','Italy','150','039',1,1,1,NULL,NULL),(384,'Yamoussoukro (CI1)','Ivorian','384','CFA franc (BCEAO)','XOF','centime','Republic of Côte d’Ivoire','CI','CIV','Côte d\'Ivoire','002','011',0,0,0,NULL,NULL),(388,'Kingston','Jamaican','388','Jamaica dollar','JMD','cent','Jamaica','JM','JAM','Jamaica','019','029',0,0,0,NULL,NULL),(392,'Tokyo','Japanese','392','yen (inv.)','JPY','(sen (inv.)) (JP1)','Japan','JP','JPN','Japan','142','030',0,1,1,NULL,NULL),(398,'Astana','Kazakh','398','tenge (inv.)','KZT','tiyn','Republic of Kazakhstan','KZ','KAZ','Kazakhstan','142','143',0,0,0,NULL,NULL),(400,'Amman','Jordanian','400','Jordanian dinar','JOD','100 qirsh','Hashemite Kingdom of Jordan','JO','JOR','Jordan','142','145',0,0,0,NULL,NULL),(404,'Nairobi','Kenyan','404','Kenyan shilling','KES','cent','Republic of Kenya','KE','KEN','Kenya','002','014',0,0,0,NULL,NULL),(408,'Pyongyang','North Korean','408','North Korean won (inv.)','KPW','chun (inv.)','Democratic People’s Republic of Korea','KP','PRK','Korea, Democratic People\'s Republic of','142','030',0,0,0,NULL,NULL),(410,'Seoul','South Korean','410','South Korean won (inv.)','KRW','(chun (inv.))','Republic of Korea','KR','KOR','Korea, Republic of','142','030',0,0,0,NULL,NULL),(414,'Kuwait City','Kuwaiti','414','Kuwaiti dinar','KWD','fils (inv.)','State of Kuwait','KW','KWT','Kuwait','142','145',0,0,0,NULL,NULL),(417,'Bishkek','Kyrgyz','417','som','KGS','tyiyn','Kyrgyz Republic','KG','KGZ','Kyrgyzstan','142','143',0,0,0,NULL,NULL),(418,'Vientiane','Lao','418','kip (inv.)','LAK','(at (inv.))','Lao People’s Democratic Republic','LA','LAO','Lao People\'s Democratic Republic','142','035',0,0,0,NULL,NULL),(422,'Beirut','Lebanese','422','Lebanese pound','LBP','(piastre)','Lebanese Republic','LB','LBN','Lebanon','142','145',0,0,0,NULL,NULL),(426,'Maseru','Basotho','426','loti (pl. maloti)','LSL','sente','Kingdom of Lesotho','LS','LSO','Lesotho','002','018',0,0,0,NULL,NULL),(428,'Riga','Latvian','428','euro','EUR','cent','Republic of Latvia','LV','LVA','Latvia','150','154',1,0,0,NULL,NULL),(430,'Monrovia','Liberian','430','Liberian dollar','LRD','cent','Republic of Liberia','LR','LBR','Liberia','002','011',0,0,0,NULL,NULL),(434,'Tripoli','Libyan','434','Libyan dinar','LYD','dirham','Socialist People’s Libyan Arab Jamahiriya','LY','LBY','Libya','002','015',0,0,0,NULL,NULL),(438,'Vaduz','Liechtensteiner','438','Swiss franc','CHF','centime','Principality of Liechtenstein','LI','LIE','Liechtenstein','150','155',0,0,0,NULL,NULL),(440,'Vilnius','Lithuanian','440','euro','EUR','cent','Republic of Lithuania','LT','LTU','Lithuania','150','154',1,0,1,NULL,NULL),(442,'Luxembourg','Luxembourger','442','euro','EUR','cent','Grand Duchy of Luxembourg','LU','LUX','Luxembourg','150','155',1,1,0,NULL,NULL),(446,'Macao (MO3)','Macanese','446','pataca','MOP','avo','Macao Special Administrative Region of the People’s Republic of China (MO2)','MO','MAC','Macao','142','030',0,0,0,NULL,NULL),(450,'Antananarivo','Malagasy','450','ariary','MGA','iraimbilanja (inv.)','Republic of Madagascar','MG','MDG','Madagascar','002','014',0,0,0,NULL,NULL),(454,'Lilongwe','Malawian','454','Malawian kwacha (inv.)','MWK','tambala (inv.)','Republic of Malawi','MW','MWI','Malawi','002','014',0,0,0,NULL,NULL),(458,'Kuala Lumpur (MY1)','Malaysian','458','ringgit (inv.)','MYR','sen (inv.)','Malaysia','MY','MYS','Malaysia','142','035',0,1,0,NULL,NULL),(462,'Malé','Maldivian','462','rufiyaa','MVR','laari (inv.)','Republic of Maldives','MV','MDV','Maldives','142','034',0,0,0,NULL,NULL),(466,'Bamako','Malian','466','CFA franc (BCEAO)','XOF','centime','Republic of Mali','ML','MLI','Mali','002','011',0,0,0,NULL,NULL),(470,'Valletta','Maltese','470','euro','EUR','cent','Republic of Malta','MT','MLT','Malta','150','039',1,0,0,NULL,NULL),(474,'Fort-de-France','Martinican','474','euro','EUR','cent','Martinique','MQ','MTQ','Martinique','019','029',0,0,0,NULL,NULL),(478,'Nouakchott','Mauritanian','478','ouguiya','MRO','khoum','Islamic Republic of Mauritania','MR','MRT','Mauritania','002','011',0,0,0,NULL,NULL),(480,'Port Louis','Mauritian','480','Mauritian rupee','MUR','cent','Republic of Mauritius','MU','MUS','Mauritius','002','014',0,0,0,NULL,NULL),(484,'Mexico City','Mexican','484','Mexican peso','MXN','centavo','United Mexican States','MX','MEX','Mexico','019','013',0,1,0,NULL,NULL),(492,'Monaco','Monegasque','492','euro','EUR','cent','Principality of Monaco','MC','MCO','Monaco','150','155',0,0,0,NULL,NULL),(496,'Ulan Bator','Mongolian','496','tugrik','MNT','möngö (inv.)','Mongolia','MN','MNG','Mongolia','142','030',0,0,0,NULL,NULL),(498,'Chisinau','Moldovan','498','Moldovan leu (pl. lei)','MDL','ban','Republic of Moldova','MD','MDA','Moldova, Republic of','150','151',0,0,0,NULL,NULL),(499,'Podgorica','Montenegrin','499','euro','EUR','cent','Montenegro','ME','MNE','Montenegro','150','039',0,0,0,NULL,NULL),(500,'Plymouth (MS2)','Montserratian','500','East Caribbean dollar','XCD','cent','Montserrat','MS','MSR','Montserrat','019','029',0,0,0,NULL,NULL),(504,'Rabat','Moroccan','504','Moroccan dirham','MAD','centime','Kingdom of Morocco','MA','MAR','Morocco','002','015',0,0,0,NULL,NULL),(508,'Maputo','Mozambican','508','metical','MZN','centavo','Republic of Mozambique','MZ','MOZ','Mozambique','002','014',0,0,0,NULL,NULL),(512,'Muscat','Omani','512','Omani rial','OMR','baiza','Sultanate of Oman','OM','OMN','Oman','142','145',0,0,0,NULL,NULL),(516,'Windhoek','Namibian','516','Namibian dollar','NAD','cent','Republic of Namibia','NA','NAM','Namibia','002','018',0,0,0,NULL,NULL),(520,'Yaren','Nauruan','520','Australian dollar','AUD','cent','Republic of Nauru','NR','NRU','Nauru','009','057',0,0,0,NULL,NULL),(524,'Kathmandu','Nepalese','524','Nepalese rupee','NPR','paisa (inv.)','Nepal','NP','NPL','Nepal','142','034',0,0,0,NULL,NULL),(528,'Amsterdam (NL2)','Dutch','528','euro','EUR','cent','Kingdom of the Netherlands','NL','NLD','Netherlands','150','155',1,1,0,NULL,NULL),(531,'Willemstad','Curaçaoan','531','Netherlands Antillean guilder (CW1)','ANG','cent','Curaçao','CW','CUW','Curaçao','019','029',0,0,0,NULL,NULL),(533,'Oranjestad','Aruban','533','Aruban guilder','AWG','cent','Aruba','AW','ABW','Aruba','019','029',0,0,0,NULL,NULL),(534,'Philipsburg','Sint Maartener','534','Netherlands Antillean guilder (SX1)','ANG','cent','Sint Maarten','SX','SXM','Sint Maarten (Dutch part)','019','029',0,0,0,NULL,NULL),(535,NULL,'of Bonaire, Sint Eustatius and Saba','535','US dollar','USD','cent',NULL,'BQ','BES','Bonaire, Sint Eustatius and Saba','019','029',0,0,0,NULL,NULL),(540,'Nouméa','New Caledonian','540','CFP franc','XPF','centime','New Caledonia','NC','NCL','New Caledonia','009','054',0,0,0,NULL,NULL),(548,'Port Vila','Vanuatuan','548','vatu (inv.)','VUV','','Republic of Vanuatu','VU','VUT','Vanuatu','009','054',0,0,0,NULL,NULL),(554,'Wellington','New Zealander','554','New Zealand dollar','NZD','cent','New Zealand','NZ','NZL','New Zealand','009','053',0,0,0,NULL,NULL),(558,'Managua','Nicaraguan','558','córdoba oro','NIO','centavo','Republic of Nicaragua','NI','NIC','Nicaragua','019','013',0,0,0,NULL,NULL),(562,'Niamey','Nigerien','562','CFA franc (BCEAO)','XOF','centime','Republic of Niger','NE','NER','Niger','002','011',0,0,0,NULL,NULL),(566,'Abuja','Nigerian','566','naira (inv.)','NGN','kobo (inv.)','Federal Republic of Nigeria','NG','NGA','Nigeria','002','011',0,0,0,NULL,NULL),(570,'Alofi','Niuean','570','New Zealand dollar','NZD','cent','Niue','NU','NIU','Niue','009','061',0,0,0,NULL,NULL),(574,'Kingston','Norfolk Islander','574','Australian dollar','AUD','cent','Territory of Norfolk Island','NF','NFK','Norfolk Island','009','053',0,0,0,NULL,NULL),(578,'Oslo','Norwegian','578','Norwegian krone (pl. kroner)','NOK','øre (inv.)','Kingdom of Norway','NO','NOR','Norway','150','154',0,0,0,NULL,NULL),(580,'Saipan','Northern Mariana Islander','580','US dollar','USD','cent','Commonwealth of the Northern Mariana Islands','MP','MNP','Northern Mariana Islands','009','057',0,0,0,NULL,NULL),(581,'United States Minor Outlying Islands','of United States Minor Outlying Islands','581','US dollar','USD','cent','United States Minor Outlying Islands','UM','UMI','United States Minor Outlying Islands','','',0,0,0,NULL,NULL),(583,'Palikir','Micronesian','583','US dollar','USD','cent','Federated States of Micronesia','FM','FSM','Micronesia, Federated States of','009','057',0,0,0,NULL,NULL),(584,'Majuro','Marshallese','584','US dollar','USD','cent','Republic of the Marshall Islands','MH','MHL','Marshall Islands','009','057',0,0,0,NULL,NULL),(585,'Melekeok','Palauan','585','US dollar','USD','cent','Republic of Palau','PW','PLW','Palau','009','057',0,0,0,NULL,NULL),(586,'Islamabad','Pakistani','586','Pakistani rupee','PKR','paisa','Islamic Republic of Pakistan','PK','PAK','Pakistan','142','034',0,0,0,NULL,NULL),(591,'Panama City','Panamanian','591','balboa','PAB','centésimo','Republic of Panama','PA','PAN','Panama','019','013',0,0,0,NULL,NULL),(598,'Port Moresby','Papua New Guinean','598','kina (inv.)','PGK','toea (inv.)','Independent State of Papua New Guinea','PG','PNG','Papua New Guinea','009','054',0,0,0,NULL,NULL),(600,'Asunción','Paraguayan','600','guaraní','PYG','céntimo','Republic of Paraguay','PY','PRY','Paraguay','019','005',0,0,0,NULL,NULL),(604,'Lima','Peruvian','604','new sol','PEN','céntimo','Republic of Peru','PE','PER','Peru','019','005',0,0,0,NULL,NULL),(608,'Manila','Filipino','608','Philippine peso','PHP','centavo','Republic of the Philippines','PH','PHL','Philippines','142','035',0,0,0,NULL,NULL),(612,'Adamstown','Pitcairner','612','New Zealand dollar','NZD','cent','Pitcairn Islands','PN','PCN','Pitcairn','009','061',0,0,0,NULL,NULL),(616,'Warsaw','Polish','616','zloty','PLN','grosz (pl. groszy)','Republic of Poland','PL','POL','Poland','150','151',1,1,1,NULL,NULL),(620,'Lisbon','Portuguese','620','euro','EUR','cent','Portuguese Republic','PT','PRT','Portugal','150','039',1,1,1,NULL,NULL),(624,'Bissau','Guinea-Bissau national','624','CFA franc (BCEAO)','XOF','centime','Republic of Guinea-Bissau','GW','GNB','Guinea-Bissau','002','011',0,0,0,NULL,NULL),(626,'Dili','East Timorese','626','US dollar','USD','cent','Democratic Republic of East Timor','TL','TLS','Timor-Leste','142','035',0,0,0,NULL,NULL),(630,'San Juan','Puerto Rican','630','US dollar','USD','cent','Commonwealth of Puerto Rico','PR','PRI','Puerto Rico','019','029',0,0,0,NULL,NULL),(634,'Doha','Qatari','634','Qatari riyal','QAR','dirham','State of Qatar','QA','QAT','Qatar','142','145',0,0,0,NULL,NULL),(638,'Saint-Denis','Reunionese','638','euro','EUR','cent','Réunion','RE','REU','Réunion','002','014',0,0,0,NULL,NULL),(642,'Bucharest','Romanian','642','Romanian leu (pl. lei)','RON','ban (pl. bani)','Romania','RO','ROU','Romania','150','151',1,0,1,NULL,NULL),(643,'Moscow','Russian','643','Russian rouble','RUB','kopek','Russian Federation','RU','RUS','Russian Federation','150','151',0,0,0,NULL,NULL),(646,'Kigali','Rwandan; Rwandese','646','Rwandese franc','RWF','centime','Republic of Rwanda','RW','RWA','Rwanda','002','014',0,0,0,NULL,NULL),(652,'Gustavia','of Saint Barthélemy','652','euro','EUR','cent','Collectivity of Saint Barthélemy','BL','BLM','Saint Barthélemy','019','029',0,0,0,NULL,NULL),(654,'Jamestown','Saint Helenian','654','Saint Helena pound','SHP','penny','Saint Helena, Ascension and Tristan da Cunha','SH','SHN','Saint Helena, Ascension and Tristan da Cunha','002','011',0,0,0,NULL,NULL),(659,'Basseterre','Kittsian; Nevisian','659','East Caribbean dollar','XCD','cent','Federation of Saint Kitts and Nevis','KN','KNA','Saint Kitts and Nevis','019','029',0,0,0,NULL,NULL),(660,'The Valley','Anguillan','660','East Caribbean dollar','XCD','cent','Anguilla','AI','AIA','Anguilla','019','029',0,0,0,NULL,NULL),(662,'Castries','Saint Lucian','662','East Caribbean dollar','XCD','cent','Saint Lucia','LC','LCA','Saint Lucia','019','029',0,0,0,NULL,NULL),(663,'Marigot','of Saint Martin','663','euro','EUR','cent','Collectivity of Saint Martin','MF','MAF','Saint Martin (French part)','019','029',0,0,0,NULL,NULL),(666,'Saint-Pierre','St-Pierrais; Miquelonnais','666','euro','EUR','cent','Territorial Collectivity of Saint Pierre and Miquelon','PM','SPM','Saint Pierre and Miquelon','019','021',0,0,0,NULL,NULL),(670,'Kingstown','Vincentian','670','East Caribbean dollar','XCD','cent','Saint Vincent and the Grenadines','VC','VCT','Saint Vincent and the Grenadines','019','029',0,0,0,NULL,NULL),(674,'San Marino','San Marinese','674','euro','EUR ','cent','Republic of San Marino','SM','SMR','San Marino','150','039',0,0,0,NULL,NULL),(678,'São Tomé','São Toméan','678','dobra','STD','centavo','Democratic Republic of São Tomé and Príncipe','ST','STP','Sao Tome and Principe','002','017',0,0,0,NULL,NULL),(682,'Riyadh','Saudi Arabian','682','riyal','SAR','halala','Kingdom of Saudi Arabia','SA','SAU','Saudi Arabia','142','145',0,0,0,NULL,NULL),(686,'Dakar','Senegalese','686','CFA franc (BCEAO)','XOF','centime','Republic of Senegal','SN','SEN','Senegal','002','011',0,0,0,NULL,NULL),(688,'Belgrade','Serb','688','Serbian dinar','RSD','para (inv.)','Republic of Serbia','RS','SRB','Serbia','150','039',0,0,0,NULL,NULL),(690,'Victoria','Seychellois','690','Seychelles rupee','SCR','cent','Republic of Seychelles','SC','SYC','Seychelles','002','014',0,0,0,NULL,NULL),(694,'Freetown','Sierra Leonean','694','leone','SLL','cent','Republic of Sierra Leone','SL','SLE','Sierra Leone','002','011',0,0,0,NULL,NULL),(702,'Singapore','Singaporean','702','Singapore dollar','SGD','cent','Republic of Singapore','SG','SGP','Singapore','142','035',0,0,0,NULL,NULL),(703,'Bratislava','Slovak','703','euro','EUR','cent','Slovak Republic','SK','SVK','Slovakia','150','151',1,0,1,NULL,NULL),(704,'Hanoi','Vietnamese','704','dong','VND','(10 hào','Socialist Republic of Vietnam','VN','VNM','Viet Nam','142','035',0,0,0,NULL,NULL),(705,'Ljubljana','Slovene','705','euro','EUR','cent','Republic of Slovenia','SI','SVN','Slovenia','150','039',1,0,1,NULL,NULL),(706,'Mogadishu','Somali','706','Somali shilling','SOS','cent','Somali Republic','SO','SOM','Somalia','002','014',0,0,0,NULL,NULL),(710,'Pretoria (ZA1)','South African','710','rand','ZAR','cent','Republic of South Africa','ZA','ZAF','South Africa','002','018',0,0,0,NULL,NULL),(716,'Harare','Zimbabwean','716','Zimbabwe dollar (ZW1)','ZWL','cent','Republic of Zimbabwe','ZW','ZWE','Zimbabwe','002','014',0,0,0,NULL,NULL),(724,'Madrid','Spaniard','724','euro','EUR','cent','Kingdom of Spain','ES','ESP','Spain','150','039',1,1,1,NULL,NULL),(728,'Juba','South Sudanese','728','South Sudanese pound','SSP','piaster','Republic of South Sudan','SS','SSD','South Sudan','002','015',0,0,0,NULL,NULL),(729,'Khartoum','Sudanese','729','Sudanese pound','SDG','piastre','Republic of the Sudan','SD','SDN','Sudan','002','015',0,0,0,NULL,NULL),(732,'Al aaiun','Sahrawi','732','Moroccan dirham','MAD','centime','Western Sahara','EH','ESH','Western Sahara','002','015',0,0,0,NULL,NULL),(740,'Paramaribo','Surinamese','740','Surinamese dollar','SRD','cent','Republic of Suriname','SR','SUR','Suriname','019','005',0,0,0,NULL,NULL),(744,'Longyearbyen','of Svalbard','744','Norwegian krone (pl. kroner)','NOK','øre (inv.)','Svalbard and Jan Mayen','SJ','SJM','Svalbard and Jan Mayen','150','154',0,0,0,NULL,NULL),(748,'Mbabane','Swazi','748','lilangeni','SZL','cent','Kingdom of Swaziland','SZ','SWZ','Swaziland','002','018',0,0,0,NULL,NULL),(752,'Stockholm','Swedish','752','krona (pl. kronor)','SEK','öre (inv.)','Kingdom of Sweden','SE','SWE','Sweden','150','154',1,1,1,NULL,NULL),(756,'Berne','Swiss','756','Swiss franc','CHF','centime','Swiss Confederation','CH','CHE','Switzerland','150','155',0,1,0,NULL,NULL),(760,'Damascus','Syrian','760','Syrian pound','SYP','piastre','Syrian Arab Republic','SY','SYR','Syrian Arab Republic','142','145',0,0,0,NULL,NULL),(762,'Dushanbe','Tajik','762','somoni','TJS','diram','Republic of Tajikistan','TJ','TJK','Tajikistan','142','143',0,0,0,NULL,NULL),(764,'Bangkok','Thai','764','baht (inv.)','THB','satang (inv.)','Kingdom of Thailand','TH','THA','Thailand','142','035',0,0,0,NULL,NULL),(768,'Lomé','Togolese','768','CFA franc (BCEAO)','XOF','centime','Togolese Republic','TG','TGO','Togo','002','011',0,0,0,NULL,NULL),(772,'(TK2)','Tokelauan','772','New Zealand dollar','NZD','cent','Tokelau','TK','TKL','Tokelau','009','061',0,0,0,NULL,NULL),(776,'Nuku’alofa','Tongan','776','pa’anga (inv.)','TOP','seniti (inv.)','Kingdom of Tonga','TO','TON','Tonga','009','061',0,0,0,NULL,NULL),(780,'Port of Spain','Trinidadian; Tobagonian','780','Trinidad and Tobago dollar','TTD','cent','Republic of Trinidad and Tobago','TT','TTO','Trinidad and Tobago','019','029',0,0,0,NULL,NULL),(784,'Abu Dhabi','Emirian','784','UAE dirham','AED','fils (inv.)','United Arab Emirates','AE','ARE','United Arab Emirates','142','145',0,0,0,NULL,NULL),(788,'Tunis','Tunisian','788','Tunisian dinar','TND','millime','Republic of Tunisia','TN','TUN','Tunisia','002','015',0,0,0,NULL,NULL),(792,'Ankara','Turk','792','Turkish lira (inv.)','TRY','kurus (inv.)','Republic of Turkey','TR','TUR','Turkey','142','145',0,0,0,NULL,NULL),(795,'Ashgabat','Turkmen','795','Turkmen manat (inv.)','TMT','tenge (inv.)','Turkmenistan','TM','TKM','Turkmenistan','142','143',0,0,0,NULL,NULL),(796,'Cockburn Town','Turks and Caicos Islander','796','US dollar','USD','cent','Turks and Caicos Islands','TC','TCA','Turks and Caicos Islands','019','029',0,0,0,NULL,NULL),(798,'Funafuti','Tuvaluan','798','Australian dollar','AUD','cent','Tuvalu','TV','TUV','Tuvalu','009','061',0,0,0,NULL,NULL),(800,'Kampala','Ugandan','800','Uganda shilling','UGX','cent','Republic of Uganda','UG','UGA','Uganda','002','014',0,0,0,NULL,NULL),(804,'Kiev','Ukrainian','804','hryvnia','UAH','kopiyka','Ukraine','UA','UKR','Ukraine','150','151',0,0,0,NULL,NULL),(807,'Skopje','of the former Yugoslav Republic of Macedonia','807','denar (pl. denars)','MKD','deni (inv.)','the former Yugoslav Republic of Macedonia','MK','MKD','Macedonia, the former Yugoslav Republic of','150','039',0,0,0,NULL,NULL),(818,'Cairo','Egyptian','818','Egyptian pound','EGP','piastre','Arab Republic of Egypt','EG','EGY','Egypt','002','015',0,0,0,NULL,NULL),(826,'London','British','826','pound sterling','GBP','penny (pl. pence)','United Kingdom of Great Britain and Northern Ireland','GB','GBR','United Kingdom','150','154',1,0,0,NULL,NULL),(831,'St Peter Port','of Guernsey','831','Guernsey pound (GG2)','GGP (GG2)','penny (pl. pence)','Bailiwick of Guernsey','GG','GGY','Guernsey','150','154',0,0,0,NULL,NULL),(832,'St Helier','of Jersey','832','Jersey pound (JE2)','JEP (JE2)','penny (pl. pence)','Bailiwick of Jersey','JE','JEY','Jersey','150','154',0,0,0,NULL,NULL),(833,'Douglas','Manxman; Manxwoman','833','Manx pound (IM2)','IMP (IM2)','penny (pl. pence)','Isle of Man','IM','IMN','Isle of Man','150','154',0,0,0,NULL,NULL),(834,'Dodoma (TZ1)','Tanzanian','834','Tanzanian shilling','TZS','cent','United Republic of Tanzania','TZ','TZA','Tanzania, United Republic of','002','014',0,0,0,NULL,NULL),(840,'Washington DC','American','840','US dollar','USD','cent','United States of America','US','USA','United States','019','021',0,0,0,',','.'),(850,'Charlotte Amalie','US Virgin Islander','850','US dollar','USD','cent','United States Virgin Islands','VI','VIR','Virgin Islands, U.S.','019','029',0,0,0,NULL,NULL),(854,'Ouagadougou','Burkinabe','854','CFA franc (BCEAO)','XOF','centime','Burkina Faso','BF','BFA','Burkina Faso','002','011',0,0,0,NULL,NULL),(858,'Montevideo','Uruguayan','858','Uruguayan peso','UYU','centésimo','Eastern Republic of Uruguay','UY','URY','Uruguay','019','005',0,1,0,NULL,NULL),(860,'Tashkent','Uzbek','860','sum (inv.)','UZS','tiyin (inv.)','Republic of Uzbekistan','UZ','UZB','Uzbekistan','142','143',0,0,0,NULL,NULL),(862,'Caracas','Venezuelan','862','bolívar fuerte (pl. bolívares fuertes)','VEF','céntimo','Bolivarian Republic of Venezuela','VE','VEN','Venezuela, Bolivarian Republic of','019','005',0,0,0,NULL,NULL),(876,'Mata-Utu','Wallisian; Futunan; Wallis and Futuna Islander','876','CFP franc','XPF','centime','Wallis and Futuna','WF','WLF','Wallis and Futuna','009','061',0,0,0,NULL,NULL),(882,'Apia','Samoan','882','tala (inv.)','WST','sene (inv.)','Independent State of Samoa','WS','WSM','Samoa','009','061',0,0,0,NULL,NULL),(887,'San’a','Yemenite','887','Yemeni rial','YER','fils (inv.)','Republic of Yemen','YE','YEM','Yemen','142','145',0,0,0,NULL,NULL),(894,'Lusaka','Zambian','894','Zambian kwacha (inv.)','ZMW','ngwee (inv.)','Republic of Zambia','ZM','ZMB','Zambia','002','014',0,0,0,NULL,NULL);
 /*!40000 ALTER TABLE `countries` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -855,7 +855,7 @@ CREATE TABLE `currencies` (
   `code` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
   `swap_currency_symbol` tinyint(1) NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=68 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=69 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -864,7 +864,7 @@ CREATE TABLE `currencies` (
 
 LOCK TABLES `currencies` WRITE;
 /*!40000 ALTER TABLE `currencies` DISABLE KEYS */;
-INSERT INTO `currencies` VALUES (1,'US Dollar','$','2',',','.','USD',0),(2,'British Pound','£','2',',','.','GBP',0),(3,'Euro','€','2','.',',','EUR',0),(4,'South African Rand','R','2','.',',','ZAR',0),(5,'Danish Krone','kr','2','.',',','DKK',1),(6,'Israeli Shekel','NIS ','2',',','.','ILS',0),(7,'Swedish Krona','kr','2','.',',','SEK',1),(8,'Kenyan Shilling','KSh ','2',',','.','KES',0),(9,'Canadian Dollar','C$','2',',','.','CAD',0),(10,'Philippine Peso','P ','2',',','.','PHP',0),(11,'Indian Rupee','Rs. ','2',',','.','INR',0),(12,'Australian Dollar','$','2',',','.','AUD',0),(13,'Singapore Dollar','','2',',','.','SGD',0),(14,'Norske Kroner','kr','2','.',',','NOK',1),(15,'New Zealand Dollar','$','2',',','.','NZD',0),(16,'Vietnamese Dong','','0','.',',','VND',0),(17,'Swiss Franc','','2','\'','.','CHF',0),(18,'Guatemalan Quetzal','Q','2',',','.','GTQ',0),(19,'Malaysian Ringgit','RM','2',',','.','MYR',0),(20,'Brazilian Real','R$','2','.',',','BRL',0),(21,'Thai Baht','','2',',','.','THB',0),(22,'Nigerian Naira','','2',',','.','NGN',0),(23,'Argentine Peso','$','2','.',',','ARS',0),(24,'Bangladeshi Taka','Tk','2',',','.','BDT',0),(25,'United Arab Emirates Dirham','DH ','2',',','.','AED',0),(26,'Hong Kong Dollar','','2',',','.','HKD',0),(27,'Indonesian Rupiah','Rp','2',',','.','IDR',0),(28,'Mexican Peso','$','2',',','.','MXN',0),(29,'Egyptian Pound','E£','2',',','.','EGP',0),(30,'Colombian Peso','$','2','.',',','COP',0),(31,'West African Franc','CFA ','2',',','.','XOF',0),(32,'Chinese Renminbi','RMB ','2',',','.','CNY',0),(33,'Rwandan Franc','RF ','2',',','.','RWF',0),(34,'Tanzanian Shilling','TSh ','2',',','.','TZS',0),(35,'Netherlands Antillean Guilder','','2','.',',','ANG',0),(36,'Trinidad and Tobago Dollar','TT$','2',',','.','TTD',0),(37,'East Caribbean Dollar','EC$','2',',','.','XCD',0),(38,'Ghanaian Cedi','','2',',','.','GHS',0),(39,'Bulgarian Lev','','2',' ','.','BGN',0),(40,'Aruban Florin','Afl. ','2',' ','.','AWG',0),(41,'Turkish Lira','TL ','2','.',',','TRY',0),(42,'Romanian New Leu','','2',',','.','RON',0),(43,'Croatian Kuna','kn','2','.',',','HRK',0),(44,'Saudi Riyal','','2',',','.','SAR',0),(45,'Japanese Yen','¥','0',',','.','JPY',0),(46,'Maldivian Rufiyaa','','2',',','.','MVR',0),(47,'Costa Rican Colón','','2',',','.','CRC',0),(48,'Pakistani Rupee','Rs ','0',',','.','PKR',0),(49,'Polish Zloty','zł','2',' ',',','PLN',1),(50,'Sri Lankan Rupee','LKR','2',',','.','LKR',1),(51,'Czech Koruna','Kč','2',' ',',','CZK',1),(52,'Uruguayan Peso','$','2','.',',','UYU',0),(53,'Namibian Dollar','$','2',',','.','NAD',0),(54,'Tunisian Dinar','','2',',','.','TND',0),(55,'Russian Ruble','','2',',','.','RUB',0),(56,'Mozambican Metical','MT','2','.',',','MZN',1),(57,'Omani Rial','','2',',','.','OMR',0),(58,'Ukrainian Hryvnia','','2',',','.','UAH',0),(59,'Macanese Pataca','MOP$','2',',','.','MOP',0),(60,'Taiwan New Dollar','NT$','2',',','.','TWD',0),(61,'Dominican Peso','RD$','2',',','.','DOP',0),(62,'Chilean Peso','$','0','.',',','CLP',0),(63,'Icelandic Króna','kr','2','.',',','ISK',1),(64,'Papua New Guinean Kina','K','2',',','.','PGK',0),(65,'Jordanian Dinar','','2',',','.','JOD',0),(66,'Myanmar Kyat','K','2',',','.','MMK',0),(67,'Peruvian Sol','S/ ','2',',','.','PEN',0);
+INSERT INTO `currencies` VALUES (1,'US Dollar','$','2',',','.','USD',0),(2,'British Pound','£','2',',','.','GBP',0),(3,'Euro','€','2','.',',','EUR',0),(4,'South African Rand','R','2','.',',','ZAR',0),(5,'Danish Krone','kr','2','.',',','DKK',1),(6,'Israeli Shekel','NIS ','2',',','.','ILS',0),(7,'Swedish Krona','kr','2','.',',','SEK',1),(8,'Kenyan Shilling','KSh ','2',',','.','KES',0),(9,'Canadian Dollar','C$','2',',','.','CAD',0),(10,'Philippine Peso','P ','2',',','.','PHP',0),(11,'Indian Rupee','Rs. ','2',',','.','INR',0),(12,'Australian Dollar','$','2',',','.','AUD',0),(13,'Singapore Dollar','','2',',','.','SGD',0),(14,'Norske Kroner','kr','2','.',',','NOK',1),(15,'New Zealand Dollar','$','2',',','.','NZD',0),(16,'Vietnamese Dong','','0','.',',','VND',0),(17,'Swiss Franc','','2','\'','.','CHF',0),(18,'Guatemalan Quetzal','Q','2',',','.','GTQ',0),(19,'Malaysian Ringgit','RM','2',',','.','MYR',0),(20,'Brazilian Real','R$','2','.',',','BRL',0),(21,'Thai Baht','','2',',','.','THB',0),(22,'Nigerian Naira','','2',',','.','NGN',0),(23,'Argentine Peso','$','2','.',',','ARS',0),(24,'Bangladeshi Taka','Tk','2',',','.','BDT',0),(25,'United Arab Emirates Dirham','DH ','2',',','.','AED',0),(26,'Hong Kong Dollar','','2',',','.','HKD',0),(27,'Indonesian Rupiah','Rp','2',',','.','IDR',0),(28,'Mexican Peso','$','2',',','.','MXN',0),(29,'Egyptian Pound','E£','2',',','.','EGP',0),(30,'Colombian Peso','$','2','.',',','COP',0),(31,'West African Franc','CFA ','2',',','.','XOF',0),(32,'Chinese Renminbi','RMB ','2',',','.','CNY',0),(33,'Rwandan Franc','RF ','2',',','.','RWF',0),(34,'Tanzanian Shilling','TSh ','2',',','.','TZS',0),(35,'Netherlands Antillean Guilder','','2','.',',','ANG',0),(36,'Trinidad and Tobago Dollar','TT$','2',',','.','TTD',0),(37,'East Caribbean Dollar','EC$','2',',','.','XCD',0),(38,'Ghanaian Cedi','','2',',','.','GHS',0),(39,'Bulgarian Lev','','2',' ','.','BGN',0),(40,'Aruban Florin','Afl. ','2',' ','.','AWG',0),(41,'Turkish Lira','TL ','2','.',',','TRY',0),(42,'Romanian New Leu','','2',',','.','RON',0),(43,'Croatian Kuna','kn','2','.',',','HRK',0),(44,'Saudi Riyal','','2',',','.','SAR',0),(45,'Japanese Yen','¥','0',',','.','JPY',0),(46,'Maldivian Rufiyaa','','2',',','.','MVR',0),(47,'Costa Rican Colón','','2',',','.','CRC',0),(48,'Pakistani Rupee','Rs ','0',',','.','PKR',0),(49,'Polish Zloty','zł','2',' ',',','PLN',1),(50,'Sri Lankan Rupee','LKR','2',',','.','LKR',1),(51,'Czech Koruna','Kč','2',' ',',','CZK',1),(52,'Uruguayan Peso','$','2','.',',','UYU',0),(53,'Namibian Dollar','$','2',',','.','NAD',0),(54,'Tunisian Dinar','','2',',','.','TND',0),(55,'Russian Ruble','','2',',','.','RUB',0),(56,'Mozambican Metical','MT','2','.',',','MZN',1),(57,'Omani Rial','','2',',','.','OMR',0),(58,'Ukrainian Hryvnia','','2',',','.','UAH',0),(59,'Macanese Pataca','MOP$','2',',','.','MOP',0),(60,'Taiwan New Dollar','NT$','2',',','.','TWD',0),(61,'Dominican Peso','RD$','2',',','.','DOP',0),(62,'Chilean Peso','$','0','.',',','CLP',0),(63,'Icelandic Króna','kr','2','.',',','ISK',1),(64,'Papua New Guinean Kina','K','2',',','.','PGK',0),(65,'Jordanian Dinar','','2',',','.','JOD',0),(66,'Myanmar Kyat','K','2',',','.','MMK',0),(67,'Peruvian Sol','S/ ','2',',','.','PEN',0),(68,'Botswana Pula','P','2',',','.','BWP',0);
 /*!40000 ALTER TABLE `currencies` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -1187,7 +1187,7 @@ CREATE TABLE `gateway_types` (
   `alias` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
   `name` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=9 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=10 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1196,7 +1196,7 @@ CREATE TABLE `gateway_types` (
 
 LOCK TABLES `gateway_types` WRITE;
 /*!40000 ALTER TABLE `gateway_types` DISABLE KEYS */;
-INSERT INTO `gateway_types` VALUES (1,'credit_card','Credit Card'),(2,'bank_transfer','Bank Transfer'),(3,'paypal','PayPal'),(4,'bitcoin','Bitcoin'),(5,'dwolla','Dwolla'),(6,'custom','Custom'),(7,'alipay','Alipay'),(8,'sofort','Sofort');
+INSERT INTO `gateway_types` VALUES (1,'credit_card','Credit Card'),(2,'bank_transfer','Bank Transfer'),(3,'paypal','PayPal'),(4,'bitcoin','Bitcoin'),(5,'dwolla','Dwolla'),(6,'custom','Custom'),(7,'alipay','Alipay'),(8,'sofort','Sofort'),(9,'sepa','SEPA');
 /*!40000 ALTER TABLE `gateway_types` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -1223,7 +1223,7 @@ CREATE TABLE `gateways` (
   PRIMARY KEY (`id`),
   KEY `gateways_payment_library_id_foreign` (`payment_library_id`),
   CONSTRAINT `gateways_payment_library_id_foreign` FOREIGN KEY (`payment_library_id`) REFERENCES `payment_libraries` (`id`) ON DELETE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=65 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=66 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1232,7 +1232,7 @@ CREATE TABLE `gateways` (
 
 LOCK TABLES `gateways` WRITE;
 /*!40000 ALTER TABLE `gateways` DISABLE KEYS */;
-INSERT INTO `gateways` VALUES (1,'2017-09-10 03:46:49','2017-09-10 03:46:49','Authorize.Net AIM','AuthorizeNet_AIM',1,1,4,0,NULL,0,0),(2,'2017-09-10 03:46:49','2017-09-10 03:46:49','Authorize.Net SIM','AuthorizeNet_SIM',1,2,10000,0,NULL,0,0),(3,'2017-09-10 03:46:49','2017-09-10 03:46:49','CardSave','CardSave',1,1,10000,0,NULL,0,0),(4,'2017-09-10 03:46:49','2017-09-10 03:46:49','Eway Rapid','Eway_RapidShared',1,1,10000,0,NULL,1,0),(5,'2017-09-10 03:46:49','2017-09-10 03:46:49','FirstData Connect','FirstData_Connect',1,1,10000,0,NULL,0,0),(6,'2017-09-10 03:46:49','2017-09-10 03:46:49','GoCardless','GoCardless',1,2,10000,0,NULL,1,0),(7,'2017-09-10 03:46:49','2017-09-10 03:46:49','Migs ThreeParty','Migs_ThreeParty',1,1,10000,0,NULL,0,0),(8,'2017-09-10 03:46:49','2017-09-10 03:46:49','Migs TwoParty','Migs_TwoParty',1,1,10000,0,NULL,0,0),(9,'2017-09-10 03:46:49','2017-09-10 03:46:49','Mollie','Mollie',1,1,7,0,NULL,1,0),(10,'2017-09-10 03:46:49','2017-09-10 03:46:49','MultiSafepay','MultiSafepay',1,1,10000,0,NULL,0,0),(11,'2017-09-10 03:46:49','2017-09-10 03:46:49','Netaxept','Netaxept',1,1,10000,0,NULL,0,0),(12,'2017-09-10 03:46:49','2017-09-10 03:46:49','NetBanx','NetBanx',1,1,10000,0,NULL,0,0),(13,'2017-09-10 03:46:49','2017-09-10 03:46:49','PayFast','PayFast',1,1,10000,0,NULL,1,0),(14,'2017-09-10 03:46:49','2017-09-10 03:46:49','Payflow Pro','Payflow_Pro',1,1,10000,0,NULL,0,0),(15,'2017-09-10 03:46:49','2017-09-10 03:46:49','PaymentExpress PxPay','PaymentExpress_PxPay',1,1,10000,0,NULL,0,0),(16,'2017-09-10 03:46:49','2017-09-10 03:46:49','PaymentExpress PxPost','PaymentExpress_PxPost',1,1,10000,0,NULL,0,0),(17,'2017-09-10 03:46:49','2017-09-10 03:46:49','PayPal Express','PayPal_Express',1,1,3,0,NULL,1,0),(18,'2017-09-10 03:46:49','2017-09-10 03:46:49','PayPal Pro','PayPal_Pro',1,1,10000,0,NULL,0,0),(19,'2017-09-10 03:46:49','2017-09-10 03:46:49','Pin','Pin',1,1,10000,0,NULL,0,0),(20,'2017-09-10 03:46:49','2017-09-10 03:46:49','SagePay Direct','SagePay_Direct',1,1,10000,0,NULL,0,0),(21,'2017-09-10 03:46:49','2017-09-10 03:46:49','SagePay Server','SagePay_Server',1,1,10000,0,NULL,0,0),(22,'2017-09-10 03:46:49','2017-09-10 03:46:49','SecurePay DirectPost','SecurePay_DirectPost',1,1,10000,0,NULL,0,0),(23,'2017-09-10 03:46:50','2017-09-10 03:46:50','Stripe','Stripe',1,1,1,0,NULL,0,0),(24,'2017-09-10 03:46:50','2017-09-10 03:46:50','TargetPay Direct eBanking','TargetPay_Directebanking',1,1,10000,0,NULL,0,0),(25,'2017-09-10 03:46:50','2017-09-10 03:46:50','TargetPay Ideal','TargetPay_Ideal',1,1,10000,0,NULL,0,0),(26,'2017-09-10 03:46:50','2017-09-10 03:46:50','TargetPay Mr Cash','TargetPay_Mrcash',1,1,10000,0,NULL,0,0),(27,'2017-09-10 03:46:50','2017-09-10 03:46:50','TwoCheckout','TwoCheckout',1,1,10000,0,NULL,1,0),(28,'2017-09-10 03:46:50','2017-09-10 03:46:50','WorldPay','WorldPay',1,1,10000,0,NULL,0,0),(29,'2017-09-10 03:46:50','2017-09-10 03:46:50','BeanStream','BeanStream',1,2,10000,0,NULL,0,0),(30,'2017-09-10 03:46:50','2017-09-10 03:46:50','Psigate','Psigate',1,2,10000,0,NULL,0,0),(31,'2017-09-10 03:46:50','2017-09-10 03:46:50','moolah','AuthorizeNet_AIM',1,1,10000,0,NULL,0,0),(32,'2017-09-10 03:46:50','2017-09-10 03:46:50','Alipay','Alipay_Express',1,1,10000,0,NULL,0,0),(33,'2017-09-10 03:46:50','2017-09-10 03:46:50','Buckaroo','Buckaroo_CreditCard',1,1,10000,0,NULL,0,0),(34,'2017-09-10 03:46:50','2017-09-10 03:46:50','Coinbase','Coinbase',1,1,10000,0,NULL,0,0),(35,'2017-09-10 03:46:50','2017-09-10 03:46:50','DataCash','DataCash',1,1,10000,0,NULL,0,0),(36,'2017-09-10 03:46:50','2017-09-10 03:46:50','Neteller','Neteller',1,2,10000,0,NULL,0,0),(37,'2017-09-10 03:46:50','2017-09-10 03:46:50','Pacnet','Pacnet',1,1,10000,0,NULL,0,0),(38,'2017-09-10 03:46:50','2017-09-10 03:46:50','PaymentSense','PaymentSense',1,2,10000,0,NULL,0,0),(39,'2017-09-10 03:46:50','2017-09-10 03:46:50','Realex','Realex_Remote',1,1,10000,0,NULL,0,0),(40,'2017-09-10 03:46:50','2017-09-10 03:46:50','Sisow','Sisow',1,1,10000,0,NULL,0,0),(41,'2017-09-10 03:46:50','2017-09-10 03:46:50','Skrill','Skrill',1,1,10000,0,NULL,1,0),(42,'2017-09-10 03:46:50','2017-09-10 03:46:50','BitPay','BitPay',1,1,6,0,NULL,1,0),(43,'2017-09-10 03:46:50','2017-09-10 03:46:50','Dwolla','Dwolla',1,1,5,0,NULL,1,0),(44,'2017-09-10 03:46:50','2017-09-10 03:46:50','AGMS','Agms',1,1,10000,0,NULL,0,0),(45,'2017-09-10 03:46:50','2017-09-10 03:46:50','Barclays','BarclaysEpdq\\Essential',1,1,10000,0,NULL,0,0),(46,'2017-09-10 03:46:50','2017-09-10 03:46:50','Cardgate','Cardgate',1,1,10000,0,NULL,0,0),(47,'2017-09-10 03:46:50','2017-09-10 03:46:50','Checkout.com','CheckoutCom',1,1,10000,0,NULL,0,0),(48,'2017-09-10 03:46:50','2017-09-10 03:46:50','Creditcall','Creditcall',1,1,10000,0,NULL,0,0),(49,'2017-09-10 03:46:50','2017-09-10 03:46:50','Cybersource','Cybersource',1,1,10000,0,NULL,0,0),(50,'2017-09-10 03:46:50','2017-09-10 03:46:50','ecoPayz','Ecopayz',1,1,10000,0,NULL,0,0),(51,'2017-09-10 03:46:50','2017-09-10 03:46:50','Fasapay','Fasapay',1,1,10000,0,NULL,0,0),(52,'2017-09-10 03:46:50','2017-09-10 03:46:50','Komoju','Komoju',1,1,10000,0,NULL,0,0),(53,'2017-09-10 03:46:50','2017-09-10 03:46:50','Multicards','Multicards',1,1,10000,0,NULL,0,0),(54,'2017-09-10 03:46:50','2017-09-10 03:46:50','Pagar.Me','Pagarme',1,2,10000,0,NULL,0,0),(55,'2017-09-10 03:46:50','2017-09-10 03:46:50','Paysafecard','Paysafecard',1,1,10000,0,NULL,0,0),(56,'2017-09-10 03:46:50','2017-09-10 03:46:50','Paytrace','Paytrace_CreditCard',1,1,10000,0,NULL,0,0),(57,'2017-09-10 03:46:50','2017-09-10 03:46:50','Secure Trading','SecureTrading',1,1,10000,0,NULL,0,0),(58,'2017-09-10 03:46:50','2017-09-10 03:46:50','SecPay','SecPay',1,1,10000,0,NULL,0,0),(59,'2017-09-10 03:46:50','2017-09-10 03:46:50','WeChat Express','WeChat_Express',1,2,10000,0,NULL,0,0),(60,'2017-09-10 03:46:50','2017-09-10 03:46:50','WePay','WePay',1,1,10000,0,NULL,0,0),(61,'2017-09-10 03:46:50','2017-09-10 03:46:50','Braintree','Braintree',1,1,2,0,NULL,0,0),(62,'2017-09-10 03:46:50','2017-09-10 03:46:50','Custom','Custom',1,1,9,0,NULL,1,0),(63,'2017-09-10 03:46:50','2017-09-10 03:46:50','FirstData Payeezy','FirstData_Payeezy',1,1,10000,0,NULL,0,0),(64,'2017-09-10 03:46:50','2017-09-10 03:46:50','GoCardless','GoCardlessV2\\Redirect',1,1,8,0,NULL,1,0);
+INSERT INTO `gateways` VALUES (1,'2017-10-15 08:07:04','2017-10-15 08:07:04','Authorize.Net AIM','AuthorizeNet_AIM',1,1,4,0,NULL,0,0),(2,'2017-10-15 08:07:04','2017-10-15 08:07:04','Authorize.Net SIM','AuthorizeNet_SIM',1,2,10000,0,NULL,0,0),(3,'2017-10-15 08:07:04','2017-10-15 08:07:04','CardSave','CardSave',1,1,10000,0,NULL,0,0),(4,'2017-10-15 08:07:04','2017-10-15 08:07:04','Eway Rapid','Eway_RapidShared',1,1,10000,0,NULL,1,0),(5,'2017-10-15 08:07:04','2017-10-15 08:07:04','FirstData Connect','FirstData_Connect',1,1,10000,0,NULL,0,0),(6,'2017-10-15 08:07:04','2017-10-15 08:07:04','GoCardless','GoCardless',1,2,10000,0,NULL,1,0),(7,'2017-10-15 08:07:04','2017-10-15 08:07:04','Migs ThreeParty','Migs_ThreeParty',1,1,10000,0,NULL,0,0),(8,'2017-10-15 08:07:04','2017-10-15 08:07:04','Migs TwoParty','Migs_TwoParty',1,1,10000,0,NULL,0,0),(9,'2017-10-15 08:07:04','2017-10-15 08:07:04','Mollie','Mollie',1,1,7,0,NULL,1,0),(10,'2017-10-15 08:07:04','2017-10-15 08:07:04','MultiSafepay','MultiSafepay',1,1,10000,0,NULL,0,0),(11,'2017-10-15 08:07:04','2017-10-15 08:07:04','Netaxept','Netaxept',1,1,10000,0,NULL,0,0),(12,'2017-10-15 08:07:04','2017-10-15 08:07:04','NetBanx','NetBanx',1,1,10000,0,NULL,0,0),(13,'2017-10-15 08:07:04','2017-10-15 08:07:04','PayFast','PayFast',1,1,10000,0,NULL,1,0),(14,'2017-10-15 08:07:04','2017-10-15 08:07:04','Payflow Pro','Payflow_Pro',1,1,10000,0,NULL,0,0),(15,'2017-10-15 08:07:04','2017-10-15 08:07:04','PaymentExpress PxPay','PaymentExpress_PxPay',1,1,10000,0,NULL,0,0),(16,'2017-10-15 08:07:04','2017-10-15 08:07:04','PaymentExpress PxPost','PaymentExpress_PxPost',1,1,10000,0,NULL,0,0),(17,'2017-10-15 08:07:04','2017-10-15 08:07:04','PayPal Express','PayPal_Express',1,1,3,0,NULL,1,0),(18,'2017-10-15 08:07:04','2017-10-15 08:07:04','PayPal Pro','PayPal_Pro',1,1,10000,0,NULL,0,0),(19,'2017-10-15 08:07:04','2017-10-15 08:07:04','Pin','Pin',1,1,10000,0,NULL,0,0),(20,'2017-10-15 08:07:04','2017-10-15 08:07:04','SagePay Direct','SagePay_Direct',1,1,10000,0,NULL,0,0),(21,'2017-10-15 08:07:04','2017-10-15 08:07:04','SagePay Server','SagePay_Server',1,1,10000,0,NULL,0,0),(22,'2017-10-15 08:07:04','2017-10-15 08:07:04','SecurePay DirectPost','SecurePay_DirectPost',1,1,10000,0,NULL,0,0),(23,'2017-10-15 08:07:04','2017-10-15 08:07:04','Stripe','Stripe',1,1,1,0,NULL,0,0),(24,'2017-10-15 08:07:04','2017-10-15 08:07:04','TargetPay Direct eBanking','TargetPay_Directebanking',1,1,10000,0,NULL,0,0),(25,'2017-10-15 08:07:04','2017-10-15 08:07:04','TargetPay Ideal','TargetPay_Ideal',1,1,10000,0,NULL,0,0),(26,'2017-10-15 08:07:04','2017-10-15 08:07:04','TargetPay Mr Cash','TargetPay_Mrcash',1,1,10000,0,NULL,0,0),(27,'2017-10-15 08:07:04','2017-10-15 08:07:04','TwoCheckout','TwoCheckout',1,1,10000,0,NULL,1,0),(28,'2017-10-15 08:07:04','2017-10-15 08:07:04','WorldPay','WorldPay',1,1,10000,0,NULL,0,0),(29,'2017-10-15 08:07:04','2017-10-15 08:07:04','BeanStream','BeanStream',1,2,10000,0,NULL,0,0),(30,'2017-10-15 08:07:04','2017-10-15 08:07:04','Psigate','Psigate',1,2,10000,0,NULL,0,0),(31,'2017-10-15 08:07:04','2017-10-15 08:07:04','moolah','AuthorizeNet_AIM',1,1,10000,0,NULL,0,0),(32,'2017-10-15 08:07:04','2017-10-15 08:07:04','Alipay','Alipay_Express',1,1,10000,0,NULL,0,0),(33,'2017-10-15 08:07:04','2017-10-15 08:07:04','Buckaroo','Buckaroo_CreditCard',1,1,10000,0,NULL,0,0),(34,'2017-10-15 08:07:04','2017-10-15 08:07:04','Coinbase','Coinbase',1,1,10000,0,NULL,0,0),(35,'2017-10-15 08:07:04','2017-10-15 08:07:04','DataCash','DataCash',1,1,10000,0,NULL,0,0),(36,'2017-10-15 08:07:04','2017-10-15 08:07:04','Neteller','Neteller',1,2,10000,0,NULL,0,0),(37,'2017-10-15 08:07:04','2017-10-15 08:07:04','Pacnet','Pacnet',1,1,10000,0,NULL,0,0),(38,'2017-10-15 08:07:04','2017-10-15 08:07:04','PaymentSense','PaymentSense',1,2,10000,0,NULL,0,0),(39,'2017-10-15 08:07:04','2017-10-15 08:07:04','Realex','Realex_Remote',1,1,10000,0,NULL,0,0),(40,'2017-10-15 08:07:04','2017-10-15 08:07:04','Sisow','Sisow',1,1,10000,0,NULL,0,0),(41,'2017-10-15 08:07:04','2017-10-15 08:07:04','Skrill','Skrill',1,1,10000,0,NULL,1,0),(42,'2017-10-15 08:07:05','2017-10-15 08:07:05','BitPay','BitPay',1,1,6,0,NULL,1,0),(43,'2017-10-15 08:07:05','2017-10-15 08:07:05','Dwolla','Dwolla',1,1,5,0,NULL,1,0),(44,'2017-10-15 08:07:05','2017-10-15 08:07:05','AGMS','Agms',1,1,10000,0,NULL,0,0),(45,'2017-10-15 08:07:05','2017-10-15 08:07:05','Barclays','BarclaysEpdq\\Essential',1,1,10000,0,NULL,0,0),(46,'2017-10-15 08:07:05','2017-10-15 08:07:05','Cardgate','Cardgate',1,1,10000,0,NULL,0,0),(47,'2017-10-15 08:07:05','2017-10-15 08:07:05','Checkout.com','CheckoutCom',1,1,10000,0,NULL,0,0),(48,'2017-10-15 08:07:05','2017-10-15 08:07:05','Creditcall','Creditcall',1,1,10000,0,NULL,0,0),(49,'2017-10-15 08:07:05','2017-10-15 08:07:05','Cybersource','Cybersource',1,1,10000,0,NULL,0,0),(50,'2017-10-15 08:07:05','2017-10-15 08:07:05','ecoPayz','Ecopayz',1,1,10000,0,NULL,0,0),(51,'2017-10-15 08:07:05','2017-10-15 08:07:05','Fasapay','Fasapay',1,1,10000,0,NULL,0,0),(52,'2017-10-15 08:07:05','2017-10-15 08:07:05','Komoju','Komoju',1,1,10000,0,NULL,0,0),(53,'2017-10-15 08:07:05','2017-10-15 08:07:05','Multicards','Multicards',1,1,10000,0,NULL,0,0),(54,'2017-10-15 08:07:05','2017-10-15 08:07:05','Pagar.Me','Pagarme',1,2,10000,0,NULL,0,0),(55,'2017-10-15 08:07:05','2017-10-15 08:07:05','Paysafecard','Paysafecard',1,1,10000,0,NULL,0,0),(56,'2017-10-15 08:07:05','2017-10-15 08:07:05','Paytrace','Paytrace_CreditCard',1,1,10000,0,NULL,0,0),(57,'2017-10-15 08:07:05','2017-10-15 08:07:05','Secure Trading','SecureTrading',1,1,10000,0,NULL,0,0),(58,'2017-10-15 08:07:05','2017-10-15 08:07:05','SecPay','SecPay',1,1,10000,0,NULL,0,0),(59,'2017-10-15 08:07:05','2017-10-15 08:07:05','WeChat Express','WeChat_Express',1,2,10000,0,NULL,0,0),(60,'2017-10-15 08:07:05','2017-10-15 08:07:05','WePay','WePay',1,1,10000,0,NULL,0,0),(61,'2017-10-15 08:07:05','2017-10-15 08:07:05','Braintree','Braintree',1,1,2,0,NULL,0,0),(62,'2017-10-15 08:07:05','2017-10-15 08:07:05','Custom','Custom',1,1,9,0,NULL,1,0),(63,'2017-10-15 08:07:05','2017-10-15 08:07:05','FirstData Payeezy','FirstData_Payeezy',1,1,10000,0,NULL,0,0),(64,'2017-10-15 08:07:05','2017-10-15 08:07:05','GoCardless','GoCardlessV2\\Redirect',1,1,8,0,NULL,1,0),(65,'2017-10-15 08:07:05','2017-10-15 08:07:05','PagSeguro','PagSeguro',1,1,10000,0,NULL,0,0);
 /*!40000 ALTER TABLE `gateways` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -1824,7 +1824,7 @@ CREATE TABLE `payment_libraries` (
 
 LOCK TABLES `payment_libraries` WRITE;
 /*!40000 ALTER TABLE `payment_libraries` DISABLE KEYS */;
-INSERT INTO `payment_libraries` VALUES (1,'2017-09-10 03:46:48','2017-09-10 03:46:48','Omnipay',1),(2,'2017-09-10 03:46:48','2017-09-10 03:46:48','PHP-Payments [Deprecated]',1);
+INSERT INTO `payment_libraries` VALUES (1,'2017-10-15 08:07:03','2017-10-15 08:07:03','Omnipay',1),(2,'2017-10-15 08:07:03','2017-10-15 08:07:03','PHP-Payments [Deprecated]',1);
 /*!40000 ALTER TABLE `payment_libraries` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -1934,7 +1934,7 @@ CREATE TABLE `payment_terms` (
 
 LOCK TABLES `payment_terms` WRITE;
 /*!40000 ALTER TABLE `payment_terms` DISABLE KEYS */;
-INSERT INTO `payment_terms` VALUES (1,7,'Net 7','2017-09-10 03:46:48','2017-09-10 03:46:48',NULL,0,0,1),(2,10,'Net 10','2017-09-10 03:46:48','2017-09-10 03:46:48',NULL,0,0,2),(3,14,'Net 14','2017-09-10 03:46:48','2017-09-10 03:46:48',NULL,0,0,3),(4,15,'Net 15','2017-09-10 03:46:48','2017-09-10 03:46:48',NULL,0,0,4),(5,30,'Net 30','2017-09-10 03:46:48','2017-09-10 03:46:48',NULL,0,0,5),(6,60,'Net 60','2017-09-10 03:46:48','2017-09-10 03:46:48',NULL,0,0,6),(7,90,'Net 90','2017-09-10 03:46:48','2017-09-10 03:46:48',NULL,0,0,7),(8,-1,'Net 0','2017-09-10 03:46:51','2017-09-10 03:46:51',NULL,0,0,0);
+INSERT INTO `payment_terms` VALUES (1,7,'Net 7','2017-10-15 08:07:03','2017-10-15 08:07:03',NULL,0,0,1),(2,10,'Net 10','2017-10-15 08:07:03','2017-10-15 08:07:03',NULL,0,0,2),(3,14,'Net 14','2017-10-15 08:07:03','2017-10-15 08:07:03',NULL,0,0,3),(4,15,'Net 15','2017-10-15 08:07:03','2017-10-15 08:07:03',NULL,0,0,4),(5,30,'Net 30','2017-10-15 08:07:03','2017-10-15 08:07:03',NULL,0,0,5),(6,60,'Net 60','2017-10-15 08:07:03','2017-10-15 08:07:03',NULL,0,0,6),(7,90,'Net 90','2017-10-15 08:07:03','2017-10-15 08:07:03',NULL,0,0,7),(8,-1,'Net 0','2017-10-15 08:07:06','2017-10-15 08:07:06',NULL,0,0,0);
 /*!40000 ALTER TABLE `payment_terms` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -1952,7 +1952,7 @@ CREATE TABLE `payment_types` (
   PRIMARY KEY (`id`),
   KEY `payment_types_gateway_type_id_foreign` (`gateway_type_id`),
   CONSTRAINT `payment_types_gateway_type_id_foreign` FOREIGN KEY (`gateway_type_id`) REFERENCES `gateway_types` (`id`) ON DELETE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=30 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=31 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1961,7 +1961,7 @@ CREATE TABLE `payment_types` (
 
 LOCK TABLES `payment_types` WRITE;
 /*!40000 ALTER TABLE `payment_types` DISABLE KEYS */;
-INSERT INTO `payment_types` VALUES (1,'Apply Credit',NULL),(2,'Bank Transfer',2),(3,'Cash',NULL),(4,'Debit',1),(5,'ACH',2),(6,'Visa Card',1),(7,'MasterCard',1),(8,'American Express',1),(9,'Discover Card',1),(10,'Diners Card',1),(11,'EuroCard',1),(12,'Nova',1),(13,'Credit Card Other',1),(14,'PayPal',3),(15,'Google Wallet',NULL),(16,'Check',NULL),(17,'Carte Blanche',1),(18,'UnionPay',1),(19,'JCB',1),(20,'Laser',1),(21,'Maestro',1),(22,'Solo',1),(23,'Switch',1),(24,'iZettle',1),(25,'Swish',2),(26,'Venmo',NULL),(27,'Money Order',NULL),(28,'Alipay',7),(29,'Sofort',8);
+INSERT INTO `payment_types` VALUES (1,'Apply Credit',NULL),(2,'Bank Transfer',2),(3,'Cash',NULL),(4,'Debit',1),(5,'ACH',2),(6,'Visa Card',1),(7,'MasterCard',1),(8,'American Express',1),(9,'Discover Card',1),(10,'Diners Card',1),(11,'EuroCard',1),(12,'Nova',1),(13,'Credit Card Other',1),(14,'PayPal',3),(15,'Google Wallet',NULL),(16,'Check',NULL),(17,'Carte Blanche',1),(18,'UnionPay',1),(19,'JCB',1),(20,'Laser',1),(21,'Maestro',1),(22,'Solo',1),(23,'Switch',1),(24,'iZettle',1),(25,'Swish',2),(26,'Venmo',NULL),(27,'Money Order',NULL),(28,'Alipay',7),(29,'Sofort',8),(30,'SEPA',9);
 /*!40000 ALTER TABLE `payment_types` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -2592,4 +2592,4 @@ UNLOCK TABLES;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2017-09-10  9:46:52
+-- Dump completed on 2017-10-15 14:07:07
diff --git a/resources/lang/ca/texts.php b/resources/lang/ca/texts.php
index 1f9b502d0e1b..b234733d79a9 100644
--- a/resources/lang/ca/texts.php
+++ b/resources/lang/ca/texts.php
@@ -60,7 +60,7 @@ $LANG = array(
     'download_pdf' => 'Download PDF',
     'pay_now' => 'Pay Now',
     'save_invoice' => 'Save Invoice',
-    'clone_invoice' => 'Clone Invoice',
+    'clone_invoice' => 'Clone To Invoice',
     'archive_invoice' => 'Archive Invoice',
     'delete_invoice' => 'Delete Invoice',
     'email_invoice' => 'Email Invoice',
@@ -323,7 +323,7 @@ $LANG = array(
     'delete_quote' => 'Delete Quote',
     'save_quote' => 'Save Quote',
     'email_quote' => 'Email Quote',
-    'clone_quote' => 'Clone Quote',
+    'clone_quote' => 'Clone To Quote',
     'convert_to_invoice' => 'Convert to Invoice',
     'view_invoice' => 'View Invoice',
     'view_client' => 'View Client',
@@ -655,7 +655,7 @@ $LANG = array(
     'created_by_invoice' => 'Created by :invoice',
     'primary_user' => 'Primary User',
     'help' => 'Help',
-    'customize_help' => '<p>We use <a href="http://pdfmake.org/" target="_blank">pdfmake</a> to define the invoice designs declaratively. The pdfmake <a href="http://pdfmake.org/playground.html" target="_blank">playground</a> provide\'s a great way to see the library in action.</p>
+    'customize_help' => '<p>We use <a href="http://pdfmake.org/" target="_blank">pdfmake</a> to define the invoice designs declaratively. The pdfmake <a href="http://pdfmake.org/playground.html" target="_blank">playground</a> provides a great way to see the library in action.</p>
                         <p>You can access a child property using dot notation. For example to show the client name you could use <code>$client.name</code>.</p>
                         <p>If you need help figuring something out post a question to our <a href="https://www.invoiceninja.com/forums/forum/support/" target="_blank">support forum</a> with the design you\'re using.</p>',
     'invoice_due_date' => 'Due Date',
@@ -996,6 +996,7 @@ $LANG = array(
     'enable_https' => 'We strongly recommend using HTTPS to accept credit card details online.',
     'quote_issued_to' => 'Quote issued to',
     'show_currency_code' => 'Currency Code',
+    'free_year_message' => 'Your account has been upgraded to the pro plan for one year at no cost.',
     'trial_message' => 'Your account will receive a free two week trial of our pro plan.',
     'trial_footer' => 'Your free pro plan trial lasts :count more days, :link to upgrade now.',
     'trial_footer_last_day' => 'This is the last day of your free pro plan trial, :link to upgrade now.',
@@ -1412,6 +1413,7 @@ $LANG = array(
     'payment_type_Swish' => 'Swish',
     'payment_type_Alipay' => 'Alipay',
     'payment_type_Sofort' => 'Sofort',
+    'payment_type_SEPA' => 'SEPA Direct Debit',
 
     // Industries
     'industry_Accounting & Legal' => 'Accounting & Legal',
@@ -1724,6 +1726,7 @@ $LANG = array(
     'lang_Turkish - Turkey' => 'Turkish - Turkey',
     'lang_Portuguese - Brazilian' => 'Portuguese - Brazilian',
     'lang_Portuguese - Portugal' => 'Portuguese - Portugal',
+    'lang_Thai' => 'Thai',
 
     // Frequencies
     'freq_weekly' => 'Weekly',
@@ -2391,6 +2394,7 @@ $LANG = array(
     'currency_jordanian_dinar' => 'Jordanian Dinar',
     'currency_myanmar_kyat' => 'Myanmar Kyat',
     'currency_peruvian_sol' => 'Peruvian Sol',
+    'currency_botswana_pula' => 'Botswana Pula',
     'review_app_help' => 'We hope you\'re enjoying using the app.<br/>If you\'d consider <a href="http://www.capterra.com/p/145215/Invoice-Ninja/" target="_blank">writing a review</a> we\'d greatly appreciate it!',
 
     'use_english_version' => 'Make sure to use the English version of the files.<br/>We use the column headers to match the fields.',
@@ -2441,11 +2445,43 @@ $LANG = array(
 
     'alipay' => 'Alipay',
     'sofort' => 'Sofort',
+    'sepa' => 'SEPA Direct Debit',
     'enable_alipay' => 'Accept Alipay',
     'enable_sofort' => 'Accept EU bank transfers',
     'stripe_alipay_help' => 'These gateways also need to be activated in :link.',
     'gocardless_webhook_help_link_text' => 'add this URL as an endpoint in GoCardless',
+    'calendar' => 'Calendar',
+    'pro_plan_calendar' => ':link to enable the calendar by joining the Pro Plan',
 
+    'what_are_you_working_on' => 'What are you working on?',
+    'time_tracker' => 'Time Tracker',
+    'refresh' => 'Refresh',
+    'filter_sort' => 'Filter/Sort',
+    'no_description' => 'No Description',
+    'time_tracker_login' => 'Time Tracker Login',
+    'save_or_discard' => 'Save or discard your changes',
+    'discard_changes' => 'Discard Changes',
+    'tasks_not_enabled' => 'Tasks are not enabled.',
+    'started_task' => 'Successfully started task',
+    'create_client' => 'Create Client',
+
+    'download_desktop_app' => 'Download the desktop app',
+    'download_iphone_app' => 'Download the iPhone app',
+    'download_android_app' => 'Download the Android app',
+    'time_tracker_mobile_help' => 'Double tap a task to select it',
+    'stopped' => 'Stopped',
+    'ascending' => 'Ascending',
+    'descending' => 'Descending',
+    'sort_field' => 'Sort By',
+    'sort_direction' => 'Direction',
+    'discard' => 'Discard',
+    'time_am' => 'AM',
+    'time_pm' => 'PM',
+    'time_mins' => 'mins',
+    'time_hr' => 'hr',
+    'time_hrs' => 'hrs',
+    'clear' => 'Clear',
+    'warn_payment_gateway' => 'Note: to accept online payments :link to add a payment gateway.',
 );
 
 return $LANG;
diff --git a/resources/lang/cs/texts.php b/resources/lang/cs/texts.php
index 87f9fa61d14f..78294afffd67 100644
--- a/resources/lang/cs/texts.php
+++ b/resources/lang/cs/texts.php
@@ -60,7 +60,7 @@ $LANG = array(
     'download_pdf' => 'Stáhnout PDF',
     'pay_now' => 'Zaplatit nyní',
     'save_invoice' => 'Uložit fakturu',
-    'clone_invoice' => 'Zduplikovat fakturu',
+    'clone_invoice' => 'Clone To Invoice',
     'archive_invoice' => 'Archivovat fakturu',
     'delete_invoice' => 'Smazat fakturu',
     'email_invoice' => 'Poslat fakturu emailem',
@@ -322,7 +322,7 @@ $LANG = array(
     'delete_quote' => 'Smazat nabídku',
     'save_quote' => 'Uložit nabídku',
     'email_quote' => 'Odeslat nabídku emailem',
-    'clone_quote' => 'Duplikovat nabídku',
+    'clone_quote' => 'Clone To Quote',
     'convert_to_invoice' => 'Změnit na fakturu',
     'view_invoice' => 'Zobrazit fakturu',
     'view_client' => 'Zobrazit klienta',
@@ -656,7 +656,7 @@ $LANG = array(
     'created_by_invoice' => 'Vytvořeno  :invoice',
     'primary_user' => 'Primární uživatel',
     'help' => 'Pomoc',
-    'customize_help' => '<p>We use <a href="http://pdfmake.org/" target="_blank">pdfmake</a> to define the invoice designs declaratively. The pdfmake <a href="http://pdfmake.org/playground.html" target="_blank">playground</a> provide\'s a great way to see the library in action.</p>
+    'customize_help' => '<p>We use <a href="http://pdfmake.org/" target="_blank">pdfmake</a> to define the invoice designs declaratively. The pdfmake <a href="http://pdfmake.org/playground.html" target="_blank">playground</a> provides a great way to see the library in action.</p>
                         <p>You can access a child property using dot notation. For example to show the client name you could use <code>$client.name</code>.</p>
                         <p>If you need help figuring something out post a question to our <a href="https://www.invoiceninja.com/forums/forum/support/" target="_blank">support forum</a> with the design you\'re using.</p>',
     'invoice_due_date' => 'Datum splatnosti',
@@ -998,6 +998,7 @@ $LANG = array(
     'enable_https' => 'Pro akceptování platebních karet online používejte vždy HTTPS.',
     'quote_issued_to' => 'Náklad je vystaven',
     'show_currency_code' => 'Kód měny',
+    'free_year_message' => 'Your account has been upgraded to the pro plan for one year at no cost.',
     'trial_message' => 'Váš účet získá zdarma 2 týdny zkušební verze Profi plánu.',
     'trial_footer' => 'Your free pro plan trial lasts :count more days, :link to upgrade now.',
     'trial_footer_last_day' => 'This is the last day of your free pro plan trial, :link to upgrade now.',
@@ -1414,6 +1415,7 @@ $LANG = array(
     'payment_type_Swish' => 'Swish',
     'payment_type_Alipay' => 'Alipay',
     'payment_type_Sofort' => 'Sofort',
+    'payment_type_SEPA' => 'SEPA Direct Debit',
 
     // Industries
     'industry_Accounting & Legal' => 'Accounting & Legal',
@@ -1726,6 +1728,7 @@ $LANG = array(
     'lang_Turkish - Turkey' => 'Turkish - Turkey',
     'lang_Portuguese - Brazilian' => 'Portuguese - Brazilian',
     'lang_Portuguese - Portugal' => 'Portuguese - Portugal',
+    'lang_Thai' => 'Thai',
 
     // Frequencies
     'freq_weekly' => 'Weekly',
@@ -2393,6 +2396,7 @@ $LANG = array(
     'currency_jordanian_dinar' => 'Jordanian Dinar',
     'currency_myanmar_kyat' => 'Myanmar Kyat',
     'currency_peruvian_sol' => 'Peruvian Sol',
+    'currency_botswana_pula' => 'Botswana Pula',
     'review_app_help' => 'We hope you\'re enjoying using the app.<br/>If you\'d consider <a href="http://www.capterra.com/p/145215/Invoice-Ninja/" target="_blank">writing a review</a> we\'d greatly appreciate it!',
 
     'use_english_version' => 'Make sure to use the English version of the files.<br/>We use the column headers to match the fields.',
@@ -2443,11 +2447,43 @@ $LANG = array(
 
     'alipay' => 'Alipay',
     'sofort' => 'Sofort',
+    'sepa' => 'SEPA Direct Debit',
     'enable_alipay' => 'Accept Alipay',
     'enable_sofort' => 'Accept EU bank transfers',
     'stripe_alipay_help' => 'These gateways also need to be activated in :link.',
     'gocardless_webhook_help_link_text' => 'add this URL as an endpoint in GoCardless',
+    'calendar' => 'Calendar',
+    'pro_plan_calendar' => ':link to enable the calendar by joining the Pro Plan',
 
+    'what_are_you_working_on' => 'What are you working on?',
+    'time_tracker' => 'Time Tracker',
+    'refresh' => 'Refresh',
+    'filter_sort' => 'Filter/Sort',
+    'no_description' => 'No Description',
+    'time_tracker_login' => 'Time Tracker Login',
+    'save_or_discard' => 'Save or discard your changes',
+    'discard_changes' => 'Discard Changes',
+    'tasks_not_enabled' => 'Tasks are not enabled.',
+    'started_task' => 'Successfully started task',
+    'create_client' => 'Create Client',
+
+    'download_desktop_app' => 'Download the desktop app',
+    'download_iphone_app' => 'Download the iPhone app',
+    'download_android_app' => 'Download the Android app',
+    'time_tracker_mobile_help' => 'Double tap a task to select it',
+    'stopped' => 'Stopped',
+    'ascending' => 'Ascending',
+    'descending' => 'Descending',
+    'sort_field' => 'Sort By',
+    'sort_direction' => 'Direction',
+    'discard' => 'Discard',
+    'time_am' => 'AM',
+    'time_pm' => 'PM',
+    'time_mins' => 'mins',
+    'time_hr' => 'hr',
+    'time_hrs' => 'hrs',
+    'clear' => 'Clear',
+    'warn_payment_gateway' => 'Note: to accept online payments :link to add a payment gateway.',
 );
 
 return $LANG;
diff --git a/resources/lang/da/texts.php b/resources/lang/da/texts.php
index 59963b930bc3..626e7b5171aa 100644
--- a/resources/lang/da/texts.php
+++ b/resources/lang/da/texts.php
@@ -60,7 +60,7 @@ $LANG = array(
     'download_pdf' => 'Hent PDF',
     'pay_now' => 'Betal nu',
     'save_invoice' => 'Gem faktura',
-    'clone_invoice' => 'Kopier faktura',
+    'clone_invoice' => 'Clone To Invoice',
     'archive_invoice' => 'Arkiver faktura',
     'delete_invoice' => 'Slet faktura',
     'email_invoice' => 'Send faktura som e-mail',
@@ -323,7 +323,7 @@ $LANG = array(
     'delete_quote' => 'Slet tilbud',
     'save_quote' => 'Gem tilbud',
     'email_quote' => 'E-mail tilbudet',
-    'clone_quote' => 'Kopier tilbud',
+    'clone_quote' => 'Clone To Quote',
     'convert_to_invoice' => 'Konverter til en faktura',
     'view_invoice' => 'Se faktura',
     'view_client' => 'Vis klient',
@@ -655,7 +655,7 @@ $LANG = array(
     'created_by_invoice' => 'Oprettet fra :invoice',
     'primary_user' => 'Primær bruger',
     'help' => 'Hjælp',
-    'customize_help' => '<p>We use <a href="http://pdfmake.org/" target="_blank">pdfmake</a> to define the invoice designs declaratively. The pdfmake <a href="http://pdfmake.org/playground.html" target="_blank">playground</a> provide\'s a great way to see the library in action.</p>
+    'customize_help' => '<p>We use <a href="http://pdfmake.org/" target="_blank">pdfmake</a> to define the invoice designs declaratively. The pdfmake <a href="http://pdfmake.org/playground.html" target="_blank">playground</a> provides a great way to see the library in action.</p>
                         <p>You can access a child property using dot notation. For example to show the client name you could use <code>$client.name</code>.</p>
                         <p>If you need help figuring something out post a question to our <a href="https://www.invoiceninja.com/forums/forum/support/" target="_blank">support forum</a> with the design you\'re using.</p>',
     'invoice_due_date' => 'Due Date',
@@ -996,6 +996,7 @@ $LANG = array(
     'enable_https' => 'We strongly recommend using HTTPS to accept credit card details online.',
     'quote_issued_to' => 'Quote issued to',
     'show_currency_code' => 'Currency Code',
+    'free_year_message' => 'Your account has been upgraded to the pro plan for one year at no cost.',
     'trial_message' => 'Your account will receive a free two week trial of our pro plan.',
     'trial_footer' => 'Din gratis pro plan prøveperiode udløber om :count dage, :link for at opgradere nu.',
     'trial_footer_last_day' => 'Dette er den sidste dag i din gratis pro plan prøveperiode, :link for at opgradere nu.',
@@ -1412,6 +1413,7 @@ $LANG = array(
     'payment_type_Swish' => 'Swish',
     'payment_type_Alipay' => 'Alipay',
     'payment_type_Sofort' => 'Sofort',
+    'payment_type_SEPA' => 'SEPA Direct Debit',
 
     // Industries
     'industry_Accounting & Legal' => 'Accounting & Legal',
@@ -1724,6 +1726,7 @@ $LANG = array(
     'lang_Turkish - Turkey' => 'Turkish - Turkey',
     'lang_Portuguese - Brazilian' => 'Portuguese - Brazilian',
     'lang_Portuguese - Portugal' => 'Portuguese - Portugal',
+    'lang_Thai' => 'Thai',
 
     // Frequencies
     'freq_weekly' => 'Ugentlig',
@@ -2391,6 +2394,7 @@ $LANG = array(
     'currency_jordanian_dinar' => 'Jordanian Dinar',
     'currency_myanmar_kyat' => 'Myanmar Kyat',
     'currency_peruvian_sol' => 'Peruvian Sol',
+    'currency_botswana_pula' => 'Botswana Pula',
     'review_app_help' => 'We hope you\'re enjoying using the app.<br/>If you\'d consider <a href="http://www.capterra.com/p/145215/Invoice-Ninja/" target="_blank">writing a review</a> we\'d greatly appreciate it!',
 
     'use_english_version' => 'Make sure to use the English version of the files.<br/>We use the column headers to match the fields.',
@@ -2441,11 +2445,43 @@ $LANG = array(
 
     'alipay' => 'Alipay',
     'sofort' => 'Sofort',
+    'sepa' => 'SEPA Direct Debit',
     'enable_alipay' => 'Accept Alipay',
     'enable_sofort' => 'Accept EU bank transfers',
     'stripe_alipay_help' => 'These gateways also need to be activated in :link.',
     'gocardless_webhook_help_link_text' => 'add this URL as an endpoint in GoCardless',
+    'calendar' => 'Calendar',
+    'pro_plan_calendar' => ':link to enable the calendar by joining the Pro Plan',
 
+    'what_are_you_working_on' => 'What are you working on?',
+    'time_tracker' => 'Time Tracker',
+    'refresh' => 'Refresh',
+    'filter_sort' => 'Filter/Sort',
+    'no_description' => 'No Description',
+    'time_tracker_login' => 'Time Tracker Login',
+    'save_or_discard' => 'Save or discard your changes',
+    'discard_changes' => 'Discard Changes',
+    'tasks_not_enabled' => 'Tasks are not enabled.',
+    'started_task' => 'Successfully started task',
+    'create_client' => 'Create Client',
+
+    'download_desktop_app' => 'Download the desktop app',
+    'download_iphone_app' => 'Download the iPhone app',
+    'download_android_app' => 'Download the Android app',
+    'time_tracker_mobile_help' => 'Double tap a task to select it',
+    'stopped' => 'Stopped',
+    'ascending' => 'Ascending',
+    'descending' => 'Descending',
+    'sort_field' => 'Sort By',
+    'sort_direction' => 'Direction',
+    'discard' => 'Discard',
+    'time_am' => 'AM',
+    'time_pm' => 'PM',
+    'time_mins' => 'mins',
+    'time_hr' => 'hr',
+    'time_hrs' => 'hrs',
+    'clear' => 'Clear',
+    'warn_payment_gateway' => 'Note: to accept online payments :link to add a payment gateway.',
 );
 
 return $LANG;
diff --git a/resources/lang/de/texts.php b/resources/lang/de/texts.php
index 58b2788bdc97..0db72138df3e 100644
--- a/resources/lang/de/texts.php
+++ b/resources/lang/de/texts.php
@@ -60,7 +60,7 @@ $LANG = array(
     'download_pdf' => 'PDF herunterladen',
     'pay_now' => 'Jetzt bezahlen',
     'save_invoice' => 'Rechnung speichern',
-    'clone_invoice' => 'Rechnung duplizieren',
+    'clone_invoice' => 'Clone To Invoice',
     'archive_invoice' => 'Rechnung archivieren',
     'delete_invoice' => 'Rechnung löschen',
     'email_invoice' => 'Rechnung versenden',
@@ -323,7 +323,7 @@ $LANG = array(
     'delete_quote' => 'Angebot löschen',
     'save_quote' => 'Angebot speichern',
     'email_quote' => 'Angebot per E-Mail senden',
-    'clone_quote' => 'Angebot duplizieren',
+    'clone_quote' => 'Clone To Quote',
     'convert_to_invoice' => 'In Rechnung umwandeln',
     'view_invoice' => 'Rechnung anschauen',
     'view_client' => 'Kunde anschauen',
@@ -395,7 +395,7 @@ $LANG = array(
     'more_designs_self_host_text' => '',
     'buy' => 'Kaufen',
     'bought_designs' => 'Die zusätzliche Rechnungsdesigns wurden erfolgreich hinzugefügt',
-    'sent' => 'Sent',
+    'sent' => 'Versendet',
     'vat_number' => 'USt-IdNr.',
     'timesheets' => 'Zeittabellen',
     'payment_title' => 'Geben Sie Ihre Rechnungsadresse und Ihre Kreditkarteninformationen ein',
@@ -655,9 +655,9 @@ $LANG = array(
     'created_by_invoice' => 'Erstellt durch :invoice',
     'primary_user' => 'Primärer Benutzer',
     'help' => 'Hilfe',
-    'customize_help' => '<p>Wir nutzen <a href="http://pdfmake.org/" target="_blank">pdfmake</a> um Rechnungs-Designs zu erstellen. Der pdfmake <a href="http://pdfmake.org/playground.html" target="_blank">"Spielplatz"</a> bietet eine gute Möglichkeit diese Programmbibliothek im Einsatz zu sehen.</p>
-<p>Sie können per Punktnotation auf ein Kind-Attribut zugreifen. Beispielsweise können Sie <code>$client.name</code> nutzen, um den Kundennamen anzuzeigen.</p>
-<p>Sollten Sie Verständnisprobleme haben, hinterlassen Sie doch bitte einen Forenbeitrag in unserem <a href="https://www.invoiceninja.com/forums/forum/support/" target="_blank">Support Forum</a> mit dem Design, welches Sie verwenden.</p>',
+    'customize_help' => '<p>We use <a href="http://pdfmake.org/" target="_blank">pdfmake</a> to define the invoice designs declaratively. The pdfmake <a href="http://pdfmake.org/playground.html" target="_blank">playground</a> provides a great way to see the library in action.</p>
+                        <p>You can access a child property using dot notation. For example to show the client name you could use <code>$client.name</code>.</p>
+                        <p>If you need help figuring something out post a question to our <a href="https://www.invoiceninja.com/forums/forum/support/" target="_blank">support forum</a> with the design you\'re using.</p>',
     'invoice_due_date' => 'Fälligkeitsdatum',
     'quote_due_date' => 'Gültig bis',
     'valid_until' => 'Gültig bis',
@@ -670,7 +670,7 @@ $LANG = array(
     'status_viewed' => 'Angesehen',
     'status_partial' => 'Teilweise',
     'status_paid' => 'Bezahlt',
-    'status_unpaid' => 'Unpaid',
+    'status_unpaid' => 'Unbezahlt',
     'status_all' => 'All',
     'show_line_item_tax' => '<b>Steuern für Belegpositionen</b> in der jeweiligen Zeile anzeigen',
     'iframe_url' => 'Webseite',
@@ -996,6 +996,7 @@ $LANG = array(
     'enable_https' => 'Wir empfehlen dringend HTTPS zu verwenden, um Kreditkarten online zu akzeptieren.',
     'quote_issued_to' => 'Angebot ausgefertigt an',
     'show_currency_code' => 'Währungscode',
+    'free_year_message' => 'Your account has been upgraded to the pro plan for one year at no cost.',
     'trial_message' => 'Ihr Account erhält zwei Wochen Probemitgliedschaft für unseren Pro-Plan.',
     'trial_footer' => 'Your free pro plan trial lasts :count more days, :link to upgrade now.',
     'trial_footer_last_day' => 'This is the last day of your free pro plan trial, :link to upgrade now.',
@@ -1015,8 +1016,8 @@ $LANG = array(
 
     'pro_plan_remove_logo' => ':link, um das InvoiceNinja-Logo zu entfernen, indem du dem Pro Plan beitrittst',
     'pro_plan_remove_logo_link' => 'Klicke hier',
-    'invitation_status_sent' => 'sent',
-    'invitation_status_opened' => 'Geöffnet',
+    'invitation_status_sent' => 'versendet',
+    'invitation_status_opened' => 'Opened',
     'invitation_status_viewed' => 'Gesehen',
     'email_error_inactive_client' => 'Emails können nicht zu inaktiven Kunden gesendet werden',
     'email_error_inactive_contact' => 'Emails können nicht zu inaktiven Kontakten gesendet werden',
@@ -1176,7 +1177,7 @@ $LANG = array(
     'list_vendors' => 'Lieferanten anzeigen',
     'add_users_not_supported' => 'Führen Sie ein Upgrade auf den Enterprise-Plan durch, um zusätzliche Nutzer zu Ihrem Account hinzufügen zu können.',
     'enterprise_plan_features' => 'Der Enterprise-Plan fügt Unterstützung für mehrere Nutzer und Dateianhänge hinzu. :link um die vollständige Liste der Features zu sehen.',
-    'return_to_app' => 'Return To App',
+    'return_to_app' => 'Zurück zur App',
 
 
     // Payment updates
@@ -1411,7 +1412,8 @@ Sobald Sie die Beträge erhalten haben, kommen Sie bitte wieder zurück zu diese
     'payment_type_iZettle' => 'iZettle',
     'payment_type_Swish' => 'Swish',
     'payment_type_Alipay' => 'Alipay',
-    'payment_type_Sofort' => 'Sofort',
+    'payment_type_Sofort' => 'SOFORT-Überweisung',
+    'payment_type_SEPA' => 'SEPA Direct Debit',
 
     // Industries
     'industry_Accounting & Legal' => 'Buchhaltung und Rechnungswesen',
@@ -1724,6 +1726,7 @@ Sobald Sie die Beträge erhalten haben, kommen Sie bitte wieder zurück zu diese
     'lang_Turkish - Turkey' => 'Türkisch',
     'lang_Portuguese - Brazilian' => 'Portugiesisch - Brasilien',
     'lang_Portuguese - Portugal' => 'Portugiesisch - Portugal',
+    'lang_Thai' => 'Thai',
 
     // Frequencies
     'freq_weekly' => 'Wöchentlich',
@@ -2237,10 +2240,10 @@ Sobald Sie die Beträge erhalten haben, kommen Sie bitte wieder zurück zu diese
     'white_label_license_error' => 'Failed to validate the license, check storage/logs/laravel-error.log for more details.',
     'plan_price' => 'Plan Price',
     'wrong_confirmation' => 'Incorrect confirmation code',
-    'oauth_taken' => 'The account is already registered',
+    'oauth_taken' => 'Dieses Konto ist bereits registriert',
     'emailed_payment' => 'Zahlungs eMail erfolgreich gesendet',
     'email_payment' => 'Sende Zahlungs eMail',
-    'sent' => 'Sent',
+    'sent' => 'Versendet',
     'invoiceplane_import' => 'Use :link to migrate your data from InvoicePlane.',
     'duplicate_expense_warning' => 'Warning: This :link may be a duplicate',
     'expense_link' => 'Ausgabe',
@@ -2391,6 +2394,7 @@ Sobald Sie die Beträge erhalten haben, kommen Sie bitte wieder zurück zu diese
     'currency_jordanian_dinar' => 'Jordanian Dinar',
     'currency_myanmar_kyat' => 'Myanmar Kyat',
     'currency_peruvian_sol' => 'Peruvian Sol',
+    'currency_botswana_pula' => 'Botswana Pula',
     'review_app_help' => 'We hope you\'re enjoying using the app.<br/>If you\'d consider <a href="http://www.capterra.com/p/145215/Invoice-Ninja/" target="_blank">writing a review</a> we\'d greatly appreciate it!',
 
     'use_english_version' => 'Make sure to use the English version of the files.<br/>We use the column headers to match the fields.',
@@ -2440,12 +2444,44 @@ Sobald Sie die Beträge erhalten haben, kommen Sie bitte wieder zurück zu diese
     'deleted_account_details' => 'Your account (:account) has been successfully deleted.',
 
     'alipay' => 'Alipay',
-    'sofort' => 'Sofort',
+    'sofort' => 'SOFORT-Überweisung',
+    'sepa' => 'SEPA Direct Debit',
     'enable_alipay' => 'Accept Alipay',
     'enable_sofort' => 'Accept EU bank transfers',
     'stripe_alipay_help' => 'These gateways also need to be activated in :link.',
     'gocardless_webhook_help_link_text' => 'add this URL as an endpoint in GoCardless',
+    'calendar' => 'Calendar',
+    'pro_plan_calendar' => ':link to enable the calendar by joining the Pro Plan',
 
+    'what_are_you_working_on' => 'What are you working on?',
+    'time_tracker' => 'Time Tracker',
+    'refresh' => 'Refresh',
+    'filter_sort' => 'Filter/Sort',
+    'no_description' => 'No Description',
+    'time_tracker_login' => 'Time Tracker Login',
+    'save_or_discard' => 'Save or discard your changes',
+    'discard_changes' => 'Discard Changes',
+    'tasks_not_enabled' => 'Tasks are not enabled.',
+    'started_task' => 'Successfully started task',
+    'create_client' => 'Create Client',
+
+    'download_desktop_app' => 'Download the desktop app',
+    'download_iphone_app' => 'Download the iPhone app',
+    'download_android_app' => 'Download the Android app',
+    'time_tracker_mobile_help' => 'Double tap a task to select it',
+    'stopped' => 'Stopped',
+    'ascending' => 'Ascending',
+    'descending' => 'Descending',
+    'sort_field' => 'Sort By',
+    'sort_direction' => 'Direction',
+    'discard' => 'Discard',
+    'time_am' => 'AM',
+    'time_pm' => 'PM',
+    'time_mins' => 'mins',
+    'time_hr' => 'hr',
+    'time_hrs' => 'hrs',
+    'clear' => 'Clear',
+    'warn_payment_gateway' => 'Note: to accept online payments :link to add a payment gateway.',
 );
 
 return $LANG;
diff --git a/resources/lang/el/texts.php b/resources/lang/el/texts.php
index 89a9fe592274..d11f76954a5e 100644
--- a/resources/lang/el/texts.php
+++ b/resources/lang/el/texts.php
@@ -60,7 +60,7 @@ $LANG = array(
     'download_pdf' => 'Κατέβασμα PDF',
     'pay_now' => 'Πληρώστε Τώρα',
     'save_invoice' => 'Αποθήκευση Τιμολογίου',
-    'clone_invoice' => 'Κλωνοποίηση Τιμολογίου',
+    'clone_invoice' => 'Clone To Invoice',
     'archive_invoice' => 'Αρχειοθέτηση Τιμολογίου',
     'delete_invoice' => 'Διαγραφή Τιμολογίου',
     'email_invoice' => 'Αποστολή Τιμολογίου με email',
@@ -323,7 +323,7 @@ email που είναι συνδεδεμένη με το λογαριασμό σ
     'delete_quote' => 'Διαγραφή Προσφοράς',
     'save_quote' => 'Αποθήκευση Προσφοράς',
     'email_quote' => 'Αποστολή Προσφοράς',
-    'clone_quote' => 'Κλωνοποίηση Προσφοράς',
+    'clone_quote' => 'Clone To Quote',
     'convert_to_invoice' => 'Μετατροπή σε Τιμολόγιο',
     'view_invoice' => 'Προβολή Τιμολογίου',
     'view_client' => 'Προβολή Πελάτη',
@@ -655,9 +655,9 @@ email που είναι συνδεδεμένη με το λογαριασμό σ
     'created_by_invoice' => 'Δημιουργήθηκε από :invoice',
     'primary_user' => 'Κύριος Χρήστης',
     'help' => 'Βοήθεια',
-    'customize_help' => '<p>Χρησιμοποιούμε την εφαρμογή <a href="http://pdfmake.org/" target="_blank">pdfmake</a> για να ορίσουμε τα σχέδια τιμολογίων ξεκάθαρα. Ο <a href="http://pdfmake.org/playground.html" target="_blank">πειραματικός χώρος</a> του pdfmake μας προσφέρει ένα πολύ καλό τρόπο να δούμε τη βιβλιοθήκη λογισμικού στην πράξη.</p>
-                        <p>Μπορείτε να έχετε πρόσβαση σε μία παιδική ιδιότητα χρησομοποιώντας την κωδικοποίηση τελείας. Για παράδειγμα για να εμφανίσετε το όνομα πελάτη μπορείτε να χρησιμοποιήσετε το <code>$client.name</code>.</p>
-                        <p>Αν χρειάζεστε βοήθεια στην κατανόηση, στείλτε μία ερώτηση στο <a href="https://www.invoiceninja.com/forums/forum/support/" target="_blank">forum υποστήριξης</a> με το σχεδιασμό που χρησιμοποιείτε.</p>',
+    'customize_help' => '<p>Χρησιμοποιούμε το <a href="http://pdfmake.org/" target="_blank">pdfmake</a> για να ορίσουμε τα σχέδια των τιμολογίων. Το pdfmake <a href="http://pdfmake.org/playground.html" target="_blank">playground</a> προσφέρει ένα υπέροχο τρόπο για να δείτε τη βιβλιοθήκη στην πράξη.</p>
+                        <p>Μπορείτε να έχετε πρόσβαση σε μία ιδιότητα χρησιμοποιώντας την  σήμανση τελείας. Για παράδειγμα για να εμφανίσετε τον όνομα του πελάτη μπορείτε να χρησιμοποιήσετε το <code>$client.name</code>.</p>
+                        <p>Εάν χρειάζεστε βοήθεια στην κατανόηση κάποιου θέματος μπορείτε να υποβάλετε μία ερώτηση στο  <a href="https://www.invoiceninja.com/forums/forum/support/" target="_blank">forum υποστήριξης</a> με την εμφάνιση που χρησιμοποιείτε.</p>',
     'invoice_due_date' => 'Ημερομηνία Πληρωμής',
     'quote_due_date' => 'Έγκυρο Έως',
     'valid_until' => 'Έγκυρο Έως',
@@ -996,6 +996,7 @@ email που είναι συνδεδεμένη με το λογαριασμό σ
     'enable_https' => 'Σας προτείνουμε να χρησιμοποιήσετε HTTPS για να δέχεστε πιστωτικές κάρτες online.',
     'quote_issued_to' => 'Έκδοση προσφοράς προς',
     'show_currency_code' => 'Κωδικός Νομίσματος',
+    'free_year_message' => 'Ο λογαριασμός σας αναβαθμίστηκε στο επαγγελματικό πακέτο για ένα χρόνο χωρίς κόστος.',
     'trial_message' => 'Ο λογαριασμός σας θα δεχθεί μια δωρεάν δοκιμαστική περίοδο δύο εβδομάδων στο επαγγελματικό μας πλάνο.',
     'trial_footer' => 'Η δωρεάν δοκιμαστική περίοδο ισχύει για :count ακόμα ημέρες, :link για να αναβαθμίσετε τώρα.',
     'trial_footer_last_day' => 'Αυτή είναι η τελευταία ημέρα της δωρεάν δοκιμαστικής περιόδου, :link για να αναβαθμίσετε τώρα.',
@@ -1016,7 +1017,7 @@ email που είναι συνδεδεμένη με το λογαριασμό σ
     'pro_plan_remove_logo' => ':link για να αφαιρέσετε το λογότυπο Invoice Ninja και να συμμετέχετε στο Επαγγελματικό Πλάνο',
     'pro_plan_remove_logo_link' => 'Πατήστε εδώ',
     'invitation_status_sent' => 'απεστάλη',
-    'invitation_status_opened' => 'Ανοιγμένα',
+    'invitation_status_opened' => 'Opened',
     'invitation_status_viewed' => 'Εμφανισμένα',
     'email_error_inactive_client' => 'Δεν μπορούν να αποσταλούν emails σε ανενεργούς πελάτες',
     'email_error_inactive_contact' => 'Δεν μπορούν να αποσταλούν emails σε ανενεργές επαφές',
@@ -1412,6 +1413,7 @@ email που είναι συνδεδεμένη με το λογαριασμό σ
     'payment_type_Swish' => 'Swish',
     'payment_type_Alipay' => 'Alipay',
     'payment_type_Sofort' => 'Sofort',
+    'payment_type_SEPA' => 'Απευθείας πίστωση SEPA',
 
     // Industries
     'industry_Accounting & Legal' => 'Λογιστικά & Νομικά',
@@ -1724,6 +1726,7 @@ email που είναι συνδεδεμένη με το λογαριασμό σ
     'lang_Turkish - Turkey' => 'Τουρκικά - Τουρκία',
     'lang_Portuguese - Brazilian' => 'Πορτογαλικά - Βραζιλία',
     'lang_Portuguese - Portugal' => 'Πορτογαλικά - Πορτογαλία',
+    'lang_Thai' => 'Ταϊλανδέζικα',
 
     // Frequencies
     'freq_weekly' => 'Εβδομάδα',
@@ -2391,6 +2394,7 @@ email που είναι συνδεδεμένη με το λογαριασμό σ
     'currency_jordanian_dinar' => 'Δηνάριο Ιορδανίας',
     'currency_myanmar_kyat' => 'Κιάτ Νιανμάρ',
     'currency_peruvian_sol' => 'Σολ Περού',
+    'currency_botswana_pula' => 'Πούλα Μποτσουάνας',
     'review_app_help' => 'Ελπίζουμε να απολαμβάνετε τη χρήση της εφαρμογής.<br/>Εάν θα θέλατε <a href="http://www.capterra.com/p/145215/Invoice-Ninja/" target="_blank">να γράψετε μια κριτική</a> θα το εκτιμούσαμε ιδιαίτερα!',
 
     'use_english_version' => 'Σιγουρευτείτε ότι χρησιμοποιείτε την Αγγλική έκδοση των αρχείων.<br/>Χρησιμοποιούμε τις κεφαλίδες των στηλών για να ταιριάξουμε τα πεδία.',
@@ -2441,11 +2445,43 @@ email που είναι συνδεδεμένη με το λογαριασμό σ
 
     'alipay' => 'Alipay',
     'sofort' => 'Sofort',
+    'sepa' => 'Απευθείας πίστωση SEPA',
     'enable_alipay' => 'Αποδοχή Alipay',
     'enable_sofort' => 'Αποδοχή τραπεζικών εμβασμάτων από τράπεζες της Ευρώπης',
     'stripe_alipay_help' => 'Αυτές οι πύλες πληρωμών πρέπει επίσης να ενεργοποιηθούν στο :link.',
     'gocardless_webhook_help_link_text' => 'προσθέστε αυτή τη διεύθυνση internet στο τέλος της διεύθυνσης internet στο GoCardless',
+    'calendar' => 'Ημερολόγιο',
+    'pro_plan_calendar' => ':link για να ενεργοποιήσετε το ημερολόγιο συμμετέχοντας στο Επαγγελματικό Πλάνο',
 
+    'what_are_you_working_on' => 'Σε τι εργάζεστε;',
+    'time_tracker' => 'Παρακολούθηση Χρόνου',
+    'refresh' => 'Ανανέωση',
+    'filter_sort' => 'Φιλτράρισμα/Ταξινόμηση',
+    'no_description' => 'Καμία Περιγραφή',
+    'time_tracker_login' => 'Εισαγωγή στην Παρακολούθηση Χρόνου',
+    'save_or_discard' => 'Αποθήκευση ή απόρριψη των αλλαγών σας',
+    'discard_changes' => 'Απόρριψη Αλλαγών',
+    'tasks_not_enabled' => 'Οι εργασίες δεν έχουν ενεργοποιηθεί.',
+    'started_task' => 'Επιτυχής έναρξη εργασίας',
+    'create_client' => 'Δημιουργία Πελάτη',
+
+    'download_desktop_app' => 'Λήψη της εφαρμογής για Desktop',
+    'download_iphone_app' => 'Λήψη της εφαρμογής για IPhone',
+    'download_android_app' => 'Λήψη της εφαρμογής για Android',
+    'time_tracker_mobile_help' => 'κάντε διπλό κλικ στην εργασία για να την επιλέξετε',
+    'stopped' => 'Διακόπηκε',
+    'ascending' => 'Αύξουσα σειρά',
+    'descending' => 'Φθίνουσα σειρά',
+    'sort_field' => 'Ταξινόμηση κατά',
+    'sort_direction' => 'Κατεύθυνση',
+    'discard' => 'Απόρριψη',
+    'time_am' => 'πμ',
+    'time_pm' => 'μμ',
+    'time_mins' => 'λ',
+    'time_hr' => 'ω',
+    'time_hrs' => 'ω',
+    'clear' => 'Καθαρισμός',
+    'warn_payment_gateway' => 'Note: to accept online payments :link to add a payment gateway.',
 );
 
 return $LANG;
diff --git a/resources/lang/en/texts.php b/resources/lang/en/texts.php
index 8c6f7b3fb3bf..b234733d79a9 100644
--- a/resources/lang/en/texts.php
+++ b/resources/lang/en/texts.php
@@ -60,7 +60,7 @@ $LANG = array(
     'download_pdf' => 'Download PDF',
     'pay_now' => 'Pay Now',
     'save_invoice' => 'Save Invoice',
-    'clone_invoice' => 'Clone Invoice',
+    'clone_invoice' => 'Clone To Invoice',
     'archive_invoice' => 'Archive Invoice',
     'delete_invoice' => 'Delete Invoice',
     'email_invoice' => 'Email Invoice',
@@ -323,7 +323,7 @@ $LANG = array(
     'delete_quote' => 'Delete Quote',
     'save_quote' => 'Save Quote',
     'email_quote' => 'Email Quote',
-    'clone_quote' => 'Clone Quote',
+    'clone_quote' => 'Clone To Quote',
     'convert_to_invoice' => 'Convert to Invoice',
     'view_invoice' => 'View Invoice',
     'view_client' => 'View Client',
diff --git a/resources/lang/es/texts.php b/resources/lang/es/texts.php
index f54644c604a3..c73e0db4d0e2 100644
--- a/resources/lang/es/texts.php
+++ b/resources/lang/es/texts.php
@@ -60,7 +60,7 @@ $LANG = array(
     'download_pdf' => 'Descargar PDF',
     'pay_now' => 'Pagar ahora',
     'save_invoice' => 'Guardar factura',
-    'clone_invoice' => 'Clonar factura',
+    'clone_invoice' => 'Clone To Invoice',
     'archive_invoice' => 'Archivar factura',
     'delete_invoice' => 'Eliminar factura',
     'email_invoice' => 'Enviar factura por correo',
@@ -81,7 +81,7 @@ $LANG = array(
     'guest' => 'Invitado',
     'company_details' => 'Detalles de la Empresa',
     'online_payments' => 'Pagos Online',
-    'notifications' => 'Notifications',
+    'notifications' => 'Notificaciones',
     'import_export' => 'Importar/Exportar',
     'done' => 'Hecho',
     'save' => 'Guardar',
@@ -238,7 +238,7 @@ $LANG = array(
     'confirmation_subject' => 'Corfimación de tu cuenta en Invoice Ninja',
     'confirmation_header' => 'Confirmación de Cuenta',
     'confirmation_message' => 'Por favor, haz clic en el enlace abajo para confirmar tu cuenta.',
-    'invoice_subject' => 'New invoice :number from :account',
+    'invoice_subject' => 'Nueva factura :invoice de :account',
     'invoice_message' => 'Para visualizar tu factura por el valor de :amount, haga click en el enlace a continuación.',
     'payment_subject' => 'Pago recibido',
     'payment_message' => 'Gracias por su pago de :amount.',
@@ -317,7 +317,7 @@ $LANG = array(
     'delete_quote' => 'Eliminar Cotización',
     'save_quote' => 'Guardar Cotización',
     'email_quote' => 'Enviar Cotización',
-    'clone_quote' => 'Clonar Cotización',
+    'clone_quote' => 'Clone To Quote',
     'convert_to_invoice' => 'Convertir a Factura',
     'view_invoice' => 'Ver Factura',
     'view_client' => 'Ver Cliente',
@@ -331,7 +331,7 @@ $LANG = array(
     'deleted_quote' => 'Cotizaciónes eliminadas con éxito',
     'deleted_quotes' => ':count cotizaciones eliminadas con exito',
     'converted_to_invoice' => 'Cotización convertida a factura con éxito',
-    'quote_subject' => 'New quote :number from :account',
+    'quote_subject' => 'Nuevo presupuesto :quote de :account',
     'quote_message' => 'Para visualizar la cotización por valor de :amount, haz click en el enlace abajo.',
     'quote_link_message' => 'Para visualizar tu cotización haz click en el enlace abajo:',
     'notification_quote_sent_subject' => 'Cotización :invoice enviada a el cliente :client',
@@ -363,7 +363,7 @@ $LANG = array(
     'confirm_email_quote' => '¿Estás seguro que quieres enviar esta cotización?',
     'confirm_recurring_email_invoice' => 'Se ha marcado esta factura como recurrente, estás seguro que quieres enviar esta factura?',
     'cancel_account' => 'Cancelar Cuenta',
-    'cancel_account_message' => 'Warning: This will permanently delete your account, there is no undo.',
+    'cancel_account_message' => 'AVISO: Esta acción eliminará su cuenta de forma permanente.',
     'go_back' => 'Atrás',
     'data_visualizations' => 'Visualización de Datos',
     'sample_data' => 'Datos de Ejemplo',
@@ -389,7 +389,7 @@ $LANG = array(
     'more_designs_self_host_text' => '',
     'buy' => 'Comprar',
     'bought_designs' => 'Diseños adicionales de facturas agregados con éxito',
-    'sent' => 'Sent',
+    'sent' => 'Enviado',
     'vat_number' => 'Número de Impuesto',
     'timesheets' => 'Hojas de Tiempo',
     'payment_title' => 'Ingresa la Dirección de Facturación de tu Tareta de Crédito',
@@ -505,7 +505,7 @@ $LANG = array(
     'partial_remaining' => ':partial de :balance',
     'more_fields' => 'Más Campos',
     'less_fields' => 'Menos Campos',
-    'client_name' => 'Client Name',
+    'client_name' => 'Nombre del Cliente',
     'pdf_settings' => 'Configuración de PDF',
     'product_settings' => 'Configuración del Producto',
     'auto_wrap' => 'Ajuste Automático de Línea',
@@ -550,12 +550,12 @@ $LANG = array(
     'timer' => 'Temporizador',
     'manual' => 'Manual',
     'date_and_time' => 'Fecha y Hora',
-    'second' => 'Second',
-    'seconds' => 'Seconds',
-    'minute' => 'Minute',
-    'minutes' => 'Minutes',
-    'hour' => 'Hour',
-    'hours' => 'Hours',
+    'second' => 'Segundo',
+    'seconds' => 'Segundos',
+    'minute' => 'Minuto',
+    'minutes' => 'Minutos',
+    'hour' => 'Hora',
+    'hours' => 'Horas',
     'task_details' => 'Detalles de la Tarea',
     'duration' => 'Duración',
     'end_time' => 'Tiempo Final',
@@ -618,7 +618,7 @@ $LANG = array(
     'times' => 'Tiempos',
     'set_now' => 'Asignar ahora',
     'dark_mode' => 'Modo Oscuro',
-    'dark_mode_help' => 'Use a dark background for the sidebars',
+    'dark_mode_help' => 'Usar un fondo oscuro en la barra lateral',
     'add_to_invoice' => 'Agregar a cuenta :invoice',
     'create_new_invoice' => 'Crear Nueva Cuenta',
     'task_errors' => 'Por favor corrija cualquier tiempo que se sobreponga con otro',
@@ -649,7 +649,7 @@ $LANG = array(
     'created_by_invoice' => 'Creado por :invoice',
     'primary_user' => 'Usuario Principal',
     'help' => 'Ayuda',
-    'customize_help' => '<p>We use <a href="http://pdfmake.org/" target="_blank">pdfmake</a> to define the invoice designs declaratively. The pdfmake <a href="http://pdfmake.org/playground.html" target="_blank">playground</a> provide\'s a great way to see the library in action.</p>
+    'customize_help' => '<p>We use <a href="http://pdfmake.org/" target="_blank">pdfmake</a> to define the invoice designs declaratively. The pdfmake <a href="http://pdfmake.org/playground.html" target="_blank">playground</a> provides a great way to see the library in action.</p>
                         <p>You can access a child property using dot notation. For example to show the client name you could use <code>$client.name</code>.</p>
                         <p>If you need help figuring something out post a question to our <a href="https://www.invoiceninja.com/forums/forum/support/" target="_blank">support forum</a> with the design you\'re using.</p>',
     'invoice_due_date' => 'Fecha de Vencimiento',
@@ -657,15 +657,15 @@ $LANG = array(
     'valid_until' => 'Válida Hasta',
     'reset_terms' => 'Reiniciar términos',
     'reset_footer' => 'Reiniciar pie de página',
-    'invoice_sent' => ':count invoice sent',
-    'invoices_sent' => ':count invoices sent',
+    'invoice_sent' => ':count factura enviada',
+    'invoices_sent' => ':count facturas enviadas',
     'status_draft' => 'Borrador',
     'status_sent' => 'Enviado',
     'status_viewed' => 'Visto',
     'status_partial' => 'Parcial',
     'status_paid' => 'Pagado',
-    'status_unpaid' => 'Unpaid',
-    'status_all' => 'All',
+    'status_unpaid' => 'Sin pagar',
+    'status_all' => 'Todas',
     'show_line_item_tax' => ' Mostrar <b>impuestos por cada item</b> en línea.',
     'iframe_url' => 'Sitio Web',
     'iframe_url_help1' => 'Copia el siguiente código en una página de tu sitio web.',
@@ -697,7 +697,7 @@ $LANG = array(
     'oneclick_login' => 'Ingresar con un Click',
     'disable' => 'Deshabilitado',
     'invoice_quote_number' => 'Números de Cotización y Factura',
-    'invoice_charges' => 'Invoice Surcharges',
+    'invoice_charges' => 'Cargos de Factura',
     'notification_invoice_bounced' => 'No nos fue posible entregar la Factura :invoice a :contact.',
     'notification_invoice_bounced_subject' => 'No fue posible entregar la Factura :invoice',
     'notification_quote_bounced' => 'No nos fue posible entregar la Cotización :invoice a :contact.',
@@ -788,7 +788,7 @@ $LANG = array(
     'default_invoice_footer' => 'Asignar pie de página por defecto para la factura',
     'quote_footer' => 'Pie de la Cotización',
     'free' => 'Gratis',
-    'quote_is_approved' => 'The quote has been approved',
+    'quote_is_approved' => 'El presupuesto ha sido aprobado',
     'apply_credit' => 'Aplicar Crédito',
     'system_settings' => 'Configuración del Sistema',
     'archive_token' => 'Archivar Token',
@@ -828,7 +828,7 @@ $LANG = array(
     'disabled' => 'Deshabilitado',
     'show_archived_users' => 'Mostrar usuarios archivados',
     'notes' => 'Notas',
-    'invoice_will_create' => 'invoice will be created',
+    'invoice_will_create' => 'la factura será creada',
     'invoices_will_create' => 'facturas seran creadas',
     'failed_to_import' => 'Los siguientes registros fallaron al importar',
     'publishable_key' => 'Clave pública',
@@ -847,7 +847,7 @@ $LANG = array(
     'dark' => 'Oscuro',
     'industry_help' => 'Usado para proporcionar comparaciones de las medias de las empresas de tamaño y industria similar.',
     'subdomain_help' => 'Asigne el suubdominio o mostrar la factura en su propio sitio web.',
-    'website_help' => 'Display the invoice in an iFrame on your own website',
+    'website_help' => 'Mostrar la factura en un iFrame de su sitio web',
     'invoice_number_help' => 'Especifique un prefijo o utilice un patrón a medida para establecer dinámicamente el número de factura.',
     'quote_number_help' => 'Especifique un prefijo o utilice un patrón a medida para establecer dinámicamente el número de presupuesto.',
     'custom_client_fields_helps' => 'Add a field when creating a client and optionally display the label and value on the PDF.',
@@ -989,6 +989,7 @@ $LANG = array(
     'enable_https' => 'We strongly recommend using HTTPS to accept credit card details online.',
     'quote_issued_to' => 'Cotización emitida para',
     'show_currency_code' => 'Código de Divisa',
+    'free_year_message' => 'Your account has been upgraded to the pro plan for one year at no cost.',
     'trial_message' => 'Your account will receive a free two week trial of our pro plan.',
     'trial_footer' => 'Your free pro plan trial lasts :count more days, :link to upgrade now.',
     'trial_footer_last_day' => 'This is the last day of your free pro plan trial, :link to upgrade now.',
@@ -1008,8 +1009,8 @@ $LANG = array(
 
     'pro_plan_remove_logo' => ':link haz click para eliminar el logo de Invoice Ninja',
     'pro_plan_remove_logo_link' => 'Haz clic aquí',
-    'invitation_status_sent' => 'sent',
-    'invitation_status_opened' => 'Abierto',
+    'invitation_status_sent' => 'enviado',
+    'invitation_status_opened' => 'Opened',
     'invitation_status_viewed' => 'Visto',
     'email_error_inactive_client' => 'No se pueden enviar correos a Clientes inactivos',
     'email_error_inactive_contact' => 'No se pueden enviar correos a Contactos inactivos',
@@ -1169,7 +1170,7 @@ $LANG = array(
     'list_vendors' => 'List Vendors',
     'add_users_not_supported' => 'Upgrade to the Enterprise plan to add additional users to your account.',
     'enterprise_plan_features' => 'The Enterprise plan adds support for multiple users and file attachments, :link to see the full list of features.',
-    'return_to_app' => 'Return To App',
+    'return_to_app' => 'Regresar a la App',
 
 
     // Payment updates
@@ -1405,6 +1406,7 @@ $LANG = array(
     'payment_type_Swish' => 'Silbido',
     'payment_type_Alipay' => 'Alipay',
     'payment_type_Sofort' => 'Sofort',
+    'payment_type_SEPA' => 'SEPA Direct Debit',
 
     // Industries
     'industry_Accounting & Legal' => 'Accounting & Legal',
@@ -1649,7 +1651,7 @@ $LANG = array(
     'country_Somalia' => 'Somalia',
     'country_South Africa' => 'South Africa',
     'country_Zimbabwe' => 'Zimbabwe',
-    'country_Spain' => 'Spain',
+    'country_Spain' => 'España',
     'country_South Sudan' => 'South Sudan',
     'country_Sudan' => 'Sudan',
     'country_Western Sahara' => 'Western Sahara',
@@ -1707,7 +1709,7 @@ $LANG = array(
     'lang_Norwegian' => 'Norwegian',
     'lang_Polish' => 'Polish',
     'lang_Spanish' => 'Spanish',
-    'lang_Spanish - Spain' => 'Spanish - Spain',
+    'lang_Spanish - Spain' => 'Español - España',
     'lang_Swedish' => 'Swedish',
     'lang_Albanian' => 'Albanian',
     'lang_English - United Kingdom' => 'English - United Kingdom',
@@ -1717,6 +1719,7 @@ $LANG = array(
     'lang_Turkish - Turkey' => 'Turkish - Turkey',
     'lang_Portuguese - Brazilian' => 'Portuguese - Brazilian',
     'lang_Portuguese - Portugal' => 'Portuguese - Portugal',
+    'lang_Thai' => 'Thai',
 
     // Frequencies
     'freq_weekly' => 'Weekly',
@@ -1857,7 +1860,7 @@ $LANG = array(
     'week' => 'Week',
     'month' => 'Month',
     'inactive_logout' => 'You have been logged out due to inactivity',
-    'reports' => 'Reports',
+    'reports' => 'Informes',
     'total_profit' => 'Total Profit',
     'total_expenses' => 'Total Expenses',
     'quote_to' => 'Quote to',
@@ -2226,14 +2229,14 @@ $LANG = array(
     'custom_variables' => 'Custom Variables',
     'invalid_file' => 'Invalid file type',
     'add_documents_to_invoice' => 'Add documents to invoice',
-    'mark_expense_paid' => 'Mark paid',
+    'mark_expense_paid' => 'Marcar como Pagado',
     'white_label_license_error' => 'Failed to validate the license, check storage/logs/laravel-error.log for more details.',
     'plan_price' => 'Plan Price',
     'wrong_confirmation' => 'Incorrect confirmation code',
     'oauth_taken' => 'The account is already registered',
     'emailed_payment' => 'Successfully emailed payment',
     'email_payment' => 'Email Payment',
-    'sent' => 'Sent',
+    'sent' => 'Enviado',
     'invoiceplane_import' => 'Use :link to migrate your data from InvoicePlane.',
     'duplicate_expense_warning' => 'Warning: This :link may be a duplicate',
     'expense_link' => 'expense',
@@ -2304,7 +2307,7 @@ $LANG = array(
     'late_fee_amount' => 'Late Fee Amount',
     'late_fee_percent' => 'Late Fee Percent',
     'late_fee_added' => 'Late fee added on :date',
-    'download_invoice' => 'Download Invoice',
+    'download_invoice' => 'Descargar factura',
     'download_quote' => 'Download Quote',
     'invoices_are_attached' => 'Your invoice PDFs are attached.',
     'downloaded_invoice' => 'An email will be sent with the invoice PDF',
@@ -2384,6 +2387,7 @@ $LANG = array(
     'currency_jordanian_dinar' => 'Jordanian Dinar',
     'currency_myanmar_kyat' => 'Myanmar Kyat',
     'currency_peruvian_sol' => 'Peruvian Sol',
+    'currency_botswana_pula' => 'Botswana Pula',
     'review_app_help' => 'We hope you\'re enjoying using the app.<br/>If you\'d consider <a href="http://www.capterra.com/p/145215/Invoice-Ninja/" target="_blank">writing a review</a> we\'d greatly appreciate it!',
 
     'use_english_version' => 'Make sure to use the English version of the files.<br/>We use the column headers to match the fields.',
@@ -2434,11 +2438,43 @@ $LANG = array(
 
     'alipay' => 'Alipay',
     'sofort' => 'Sofort',
+    'sepa' => 'SEPA Direct Debit',
     'enable_alipay' => 'Accept Alipay',
     'enable_sofort' => 'Accept EU bank transfers',
     'stripe_alipay_help' => 'These gateways also need to be activated in :link.',
     'gocardless_webhook_help_link_text' => 'add this URL as an endpoint in GoCardless',
+    'calendar' => 'Calendar',
+    'pro_plan_calendar' => ':link to enable the calendar by joining the Pro Plan',
 
+    'what_are_you_working_on' => 'What are you working on?',
+    'time_tracker' => 'Time Tracker',
+    'refresh' => 'Refresh',
+    'filter_sort' => 'Filter/Sort',
+    'no_description' => 'No Description',
+    'time_tracker_login' => 'Time Tracker Login',
+    'save_or_discard' => 'Save or discard your changes',
+    'discard_changes' => 'Discard Changes',
+    'tasks_not_enabled' => 'Tasks are not enabled.',
+    'started_task' => 'Successfully started task',
+    'create_client' => 'Create Client',
+
+    'download_desktop_app' => 'Download the desktop app',
+    'download_iphone_app' => 'Download the iPhone app',
+    'download_android_app' => 'Download the Android app',
+    'time_tracker_mobile_help' => 'Double tap a task to select it',
+    'stopped' => 'Stopped',
+    'ascending' => 'Ascending',
+    'descending' => 'Descending',
+    'sort_field' => 'Sort By',
+    'sort_direction' => 'Direction',
+    'discard' => 'Discard',
+    'time_am' => 'AM',
+    'time_pm' => 'PM',
+    'time_mins' => 'mins',
+    'time_hr' => 'hr',
+    'time_hrs' => 'hrs',
+    'clear' => 'Clear',
+    'warn_payment_gateway' => 'Note: to accept online payments :link to add a payment gateway.',
 );
 
 return $LANG;
diff --git a/resources/lang/es_ES/texts.php b/resources/lang/es_ES/texts.php
index 5e509d62eaeb..b1121cbc81e5 100644
--- a/resources/lang/es_ES/texts.php
+++ b/resources/lang/es_ES/texts.php
@@ -60,7 +60,7 @@ $LANG = array(
     'download_pdf' => 'Descargar PDF',
     'pay_now' => 'Pagar Ahora',
     'save_invoice' => 'Guardar factura',
-    'clone_invoice' => 'Clonar factura',
+    'clone_invoice' => 'Clone To Invoice',
     'archive_invoice' => 'Archivar factura',
     'delete_invoice' => 'Eliminar factura',
     'email_invoice' => 'Enviar factura por email',
@@ -200,7 +200,7 @@ $LANG = array(
     'limit_clients' => 'Lo sentimos, se ha pasado del límite de :count clientes',
     'payment_error' => 'Ha habido un error en el proceso de tu pago. Inténtalo de nuevo más tarde.',
     'registration_required' => 'Inscríbete para enviar una factura',
-    'confirmation_required' => 'Please confirm your email address, <a href=\'/resend_confirmation\'>click here</a> to resend the confirmation email.',
+    'confirmation_required' => 'Por favor confirma to email, <a href=\'/resend_confirmation\'>presiona aquí</a> para reenviar el email de confirmación.',
     'updated_client' => 'Cliente actualizado correctamente',
     'created_client' => 'cliente creado con éxito',
     'archived_client' => 'Cliente archivado correctamente',
@@ -238,7 +238,7 @@ $LANG = array(
     'confirmation_subject' => 'Corfimación de tu cuenta en Invoice Ninja',
     'confirmation_header' => 'Confirmación de Cuenta',
     'confirmation_message' => 'Por favor, haz clic en el enlace abajo para confirmar tu cuenta.',
-    'invoice_subject' => 'New invoice :number from :account',
+    'invoice_subject' => 'Nueva factura :number de :account',
     'invoice_message' => 'Para visualizar tu factura por el valor de :amount, haz click en el enlace de abajo.',
     'payment_subject' => 'Pago recibido',
     'payment_message' => 'Gracias por su pago de :amount.',
@@ -317,7 +317,7 @@ $LANG = array(
     'delete_quote' => 'Eliminar Presupuesto',
     'save_quote' => 'Guardar Presupuesto',
     'email_quote' => 'Enviar Presupuesto',
-    'clone_quote' => 'Clonar Presupuesto',
+    'clone_quote' => 'Clone To Quote',
     'convert_to_invoice' => 'Convertir a factura',
     'view_invoice' => 'Ver factura',
     'view_client' => 'Ver Cliente',
@@ -331,7 +331,7 @@ $LANG = array(
     'deleted_quote' => 'Presupuesto eliminado con éxito',
     'deleted_quotes' => ':count Presupuestos eliminados con exito',
     'converted_to_invoice' => 'Presupuesto convertido a factura con éxito',
-    'quote_subject' => 'New quote :number from :account',
+    'quote_subject' => 'Nuevo presupuesto :number de :account',
     'quote_message' => 'Para ver el presupuesto por un importe de :amount, haga click en el enlace de abajo.',
     'quote_link_message' => 'Para ver su presupuesto haga click en el enlace de abajo:',
     'notification_quote_sent_subject' => 'El presupuesto :invoice enviado al cliente :client',
@@ -363,7 +363,7 @@ $LANG = array(
     'confirm_email_quote' => '¿Estás seguro que quieres enviar este presupuesto?',
     'confirm_recurring_email_invoice' => 'Se ha marcado esta factura como recurrente, estás seguro que quieres enviar esta factura?',
     'cancel_account' => 'Cancelar Cuenta',
-    'cancel_account_message' => 'Warning: This will permanently delete your account, there is no undo.',
+    'cancel_account_message' => 'Atención: Esta acción eliminará permanentemente tu cuenta y no se podrá deshacer.',
     'go_back' => 'Atrás',
     'data_visualizations' => 'Visualización de Datos',
     'sample_data' => 'Datos de Ejemplo',
@@ -488,7 +488,7 @@ $LANG = array(
     'email_address' => 'Dirección de Email',
     'lets_go' => 'Acceder',
     'password_recovery' => 'Recuperar Contraseña',
-    'send_email' => 'Send Email',
+    'send_email' => 'Enviar Email',
     'set_password' => 'Establecer Contraseña',
     'converted' => 'Modificada',
     'email_approved' => 'Avísame por correo cuando un presupuesto sea <b>aprobado</b>',
@@ -505,7 +505,7 @@ $LANG = array(
     'partial_remaining' => ':partial de :balance',
     'more_fields' => 'Mas campos',
     'less_fields' => 'Menos campos',
-    'client_name' => 'Client Name',
+    'client_name' => 'Nombre del cliente',
     'pdf_settings' => 'Configuracion PDF',
     'product_settings' => 'Configuracion de Producto',
     'auto_wrap' => 'Auto ajuste de línea',
@@ -517,7 +517,7 @@ $LANG = array(
     'www' => 'www',
     'logo' => 'Logo',
     'subdomain' => 'Subdominio',
-    'provide_name_or_email' => 'Please provide a name or email',
+    'provide_name_or_email' => 'Por favor provea su nombre y correo',
     'charts_and_reports' => 'Gráficos e Informes',
     'chart' => 'gráfico',
     'report' => 'Informe',
@@ -619,7 +619,7 @@ Acceder a 10 hermosos diseños de Factura',
     'times' => 'Tiempos',
     'set_now' => 'Establecer ahora',
     'dark_mode' => 'Modo Oscuro',
-    'dark_mode_help' => 'Use a dark background for the sidebars',
+    'dark_mode_help' => 'Usar fondo oscuro en barras laterales',
     'add_to_invoice' => 'Añadir a la factura :invoice',
     'create_new_invoice' => 'Crear una nueva factura',
     'task_errors' => 'Por favor corrija los tiempos solapados',
@@ -638,7 +638,7 @@ Acceder a 10 hermosos diseños de Factura',
     'custom' => 'Personalizado',
     'invoice_to' => 'Factura para',
     'invoice_no' => 'N.º Factura',
-    'quote_no' => 'Quote No.',
+    'quote_no' => 'Nº de presupuesto',
     'recent_payments' => 'Pagos recientes',
     'outstanding' => 'Pendiente de Cobro',
     'manage_companies' => 'Gestionar compañías',
@@ -650,7 +650,7 @@ Acceder a 10 hermosos diseños de Factura',
     'created_by_invoice' => 'Creado por :invoice',
     'primary_user' => 'Usuario Principal',
     'help' => 'Ayuda',
-    'customize_help' => '<p>We use <a href="http://pdfmake.org/" target="_blank">pdfmake</a> to define the invoice designs declaratively. The pdfmake <a href="http://pdfmake.org/playground.html" target="_blank">playground</a> provide\'s a great way to see the library in action.</p>
+    'customize_help' => '<p>We use <a href="http://pdfmake.org/" target="_blank">pdfmake</a> to define the invoice designs declaratively. The pdfmake <a href="http://pdfmake.org/playground.html" target="_blank">playground</a> provides a great way to see the library in action.</p>
                         <p>You can access a child property using dot notation. For example to show the client name you could use <code>$client.name</code>.</p>
                         <p>If you need help figuring something out post a question to our <a href="https://www.invoiceninja.com/forums/forum/support/" target="_blank">support forum</a> with the design you\'re using.</p>',
     'invoice_due_date' => 'Fecha de Pago',
@@ -658,15 +658,15 @@ Acceder a 10 hermosos diseños de Factura',
     'valid_until' => 'Válido hasta',
     'reset_terms' => 'Reiniciar terminos',
     'reset_footer' => 'Reiniciar pie',
-    'invoice_sent' => ':count invoice sent',
-    'invoices_sent' => ':count invoices sent',
+    'invoice_sent' => 'Factura :count enviada',
+    'invoices_sent' => ':count facturas enviadas',
     'status_draft' => 'Borrador',
     'status_sent' => 'Enviada',
     'status_viewed' => 'Vista',
     'status_partial' => 'Parcial',
     'status_paid' => 'Pagada',
-    'status_unpaid' => 'Unpaid',
-    'status_all' => 'All',
+    'status_unpaid' => 'Impaga',
+    'status_all' => 'Todo',
     'show_line_item_tax' => 'Mostrar <b>impuesto para cada concepto de factura</b>',
     'iframe_url' => 'Website',
     'iframe_url_help1' => 'Copia el siguiente codigo para una pagina de si sitio web.',
@@ -992,6 +992,7 @@ Atención! tu password puede estar transmitida como texto plano, considera habil
     'enable_https' => 'Recomendamos encarecidamente usar HTTPS para aceptar detalles de tarjetas de credito online',
     'quote_issued_to' => 'Presupuesto emitido a',
     'show_currency_code' => 'Código de Moneda',
+    'free_year_message' => 'Your account has been upgraded to the pro plan for one year at no cost.',
     'trial_message' => 'Tu cuenta recibirá dos semanas gratuitas de nuestro  plan Pro.',
     'trial_footer' => 'Your free pro plan trial lasts :count more days, :link to upgrade now.',
     'trial_footer_last_day' => 'This is the last day of your free pro plan trial, :link to upgrade now.',
@@ -1119,7 +1120,7 @@ Atención! tu password puede estar transmitida como texto plano, considera habil
     'enable_client_portal_dashboard_help' => 'Show/hide the dashboard page in the client portal.',
 
     // Plans
-    'account_management' => 'Administración de la cuetna',
+    'account_management' => 'Administración de la cuenta',
     'plan_status' => 'Plan Status',
 
     'plan_upgrade' => 'Upgrade',
@@ -1203,7 +1204,7 @@ Atención! tu password puede estar transmitida como texto plano, considera habil
     'card_maestro' => 'Maestro',
     'card_mastercard' => 'MasterCard',
     'card_solo' => 'Solo',
-    'card_switch' => 'Switch',
+    'card_switch' => 'Cambiar',
     'card_visacard' => 'Visa',
     'card_ach' => 'ACH',
 
@@ -1213,17 +1214,17 @@ Atención! tu password puede estar transmitida como texto plano, considera habil
     'stripe_ach_help' => 'ACH support must also be enabled in :link.',
     'ach_disabled' => 'Ya existe otra pasarela configurada para débito directo.',
 
-    'plaid' => 'Plaid',
-    'client_id' => 'Client Id',
+    'plaid' => 'Pagado',
+    'client_id' => 'Id del cliente',
     'secret' => 'Secret',
-    'public_key' => 'Public Key',
-    'plaid_optional' => '(optional)',
+    'public_key' => 'Llave pública',
+    'plaid_optional' => '(opcional)',
     'plaid_environment_help' => 'When a Stripe test key is given, Plaid\'s development environement (tartan) will be used.',
     'other_providers' => 'Otros proveedores',
     'country_not_supported' => 'Este país no está soportado.',
     'invalid_routing_number' => 'The routing number is not valid.',
-    'invalid_account_number' => 'The account number is not valid.',
-    'account_number_mismatch' => 'The account numbers do not match.',
+    'invalid_account_number' => 'El número de cuenta no es valido',
+    'account_number_mismatch' => 'Los números de cuenta no coinciden.',
     'missing_account_holder_type' => 'Please select an individual or company account.',
     'missing_account_holder_name' => 'Please enter the account holder\'s name.',
     'routing_number' => 'Routing Number',
@@ -1234,8 +1235,8 @@ Atención! tu password puede estar transmitida como texto plano, considera habil
     'add_account' => 'Add Account',
     'payment_methods' => 'Payment Methods',
     'complete_verification' => 'Complete Verification',
-    'verification_amount1' => 'Amount 1',
-    'verification_amount2' => 'Amount 2',
+    'verification_amount1' => 'Cantidad 1',
+    'verification_amount2' => 'Cantidad 2',
     'payment_method_verified' => 'Verification completed successfully',
     'verification_failed' => 'Verification Failed',
     'remove_payment_method' => 'Remove Payment Method',
@@ -1408,6 +1409,7 @@ Atención! tu password puede estar transmitida como texto plano, considera habil
     'payment_type_Swish' => 'Swish',
     'payment_type_Alipay' => 'Alipay',
     'payment_type_Sofort' => 'Sofort',
+    'payment_type_SEPA' => 'SEPA Direct Debit',
 
     // Industries
     'industry_Accounting & Legal' => 'Contabilidad y legal',
@@ -1678,12 +1680,12 @@ Atención! tu password puede estar transmitida como texto plano, considera habil
     'country_Ukraine' => 'Ukraine',
     'country_Macedonia, the former Yugoslav Republic of' => 'Macedonia, the former Yugoslav Republic of',
     'country_Egypt' => 'Egypt',
-    'country_United Kingdom' => 'United Kingdom',
+    'country_United Kingdom' => 'Reino unido',
     'country_Guernsey' => 'Guernsey',
     'country_Jersey' => 'Jersey',
     'country_Isle of Man' => 'Isle of Man',
     'country_Tanzania, United Republic of' => 'Tanzania, United Republic of',
-    'country_United States' => 'United States',
+    'country_United States' => 'Estados unidos',
     'country_Virgin Islands, U.S.' => 'Virgin Islands, U.S.',
     'country_Burkina Faso' => 'Burkina Faso',
     'country_Uruguay' => 'Uruguay',
@@ -1720,6 +1722,7 @@ Atención! tu password puede estar transmitida como texto plano, considera habil
     'lang_Turkish - Turkey' => 'Turkish - Turkey',
     'lang_Portuguese - Brazilian' => 'Portuguese - Brazilian',
     'lang_Portuguese - Portugal' => 'Portuguese - Portugal',
+    'lang_Thai' => 'Thai',
 
     // Frequencies
     'freq_weekly' => 'Weekly',
@@ -1839,7 +1842,7 @@ Atención! tu password puede estar transmitida como texto plano, considera habil
     'update_invoiceninja_available' => 'Está disponible una nueva versión de Invoice Ninja.',
     'update_invoiceninja_unavailable' => 'No hay ninguna versión nueva de Invoice Ninja.',
     'update_invoiceninja_instructions' => 'Please install the new version <strong>:version</strong> by clicking the <em>Update now</em> button below. Afterwards you\'ll be redirected to the dashboard.',
-    'update_invoiceninja_update_start' => 'Update now',
+    'update_invoiceninja_update_start' => 'Actualizar ahora',
     'update_invoiceninja_download_start' => 'Download :version',
     'create_new' => 'Create New',
 
@@ -1873,22 +1876,22 @@ Atención! tu password puede estar transmitida como texto plano, considera habil
     'set_limits' => 'Set :gateway_type Limits',
     'enable_min' => 'Enable min',
     'enable_max' => 'Enable max',
-    'min' => 'Min',
-    'max' => 'Max',
+    'min' => 'Mínimo',
+    'max' => 'Máximo',
     'limits_not_met' => 'This invoice does not meet the limits for that payment type.',
 
-    'date_range' => 'Date Range',
+    'date_range' => 'Rango de fechas',
     'raw' => 'Raw',
     'raw_html' => 'Raw HTML',
-    'update' => 'Update',
-    'invoice_fields_help' => 'Drag and drop fields to change their order and location',
-    'new_category' => 'New Category',
-    'restore_product' => 'Restore Product',
+    'update' => 'Actualizar',
+    'invoice_fields_help' => 'Arrastre los campos para cambiarlos el orden y ubicación',
+    'new_category' => 'Nueva categoría',
+    'restore_product' => 'Restaurar Presupuesto',
     'blank' => 'Blank',
-    'invoice_save_error' => 'There was an error saving your invoice',
+    'invoice_save_error' => 'Ha habido un error guardando la factura',
     'enable_recurring' => 'Habilitar facturas periódicas',
     'disable_recurring' => 'Deshabilitar facturas periódicas',
-    'text' => 'Text',
+    'text' => 'Texto',
     'expense_will_create' => 'expense will be created',
     'expenses_will_create' => 'expenses will be created',
     'created_expenses' => 'Successfully created :count expense(s)',
@@ -1905,22 +1908,22 @@ Atención! tu password puede estar transmitida como texto plano, considera habil
     'pro_upgrade_feature2' => '¡Personaliza cada detalle de tu factura!',
     'enterprise_upgrade_feature1' => 'Set permissions for multiple-users',
     'enterprise_upgrade_feature2' => 'Attach 3rd party files to invoices & expenses',
-    'much_more' => 'Much More!',
+    'much_more' => '¡Mucho mas!',
 
     'currency_symbol' => 'Símbolo',
     'currency_code' => 'Código',
 
-    'buy_license' => 'Buy License',
-    'apply_license' => 'Apply License',
-    'submit' => 'Submit',
-    'white_label_license_key' => 'License Key',
+    'buy_license' => 'Comprar la licencia',
+    'apply_license' => 'Renovar licencia',
+    'submit' => 'Enviar',
+    'white_label_license_key' => 'Número de licencia',
     'invalid_white_label_license' => 'The white label license is not valid',
-    'created_by' => 'Created by :name',
+    'created_by' => 'Creado por :name',
     'modules' => 'Modules',
     'financial_year_start' => 'Primer mes del año',
     'authentication' => 'Authentication',
     'checkbox' => 'Checkbox',
-    'invoice_signature' => 'Signature',
+    'invoice_signature' => 'Firma',
     'show_accept_invoice_terms' => 'Invoice Terms Checkbox',
     'show_accept_invoice_terms_help' => 'Require client to confirm that they accept the invoice terms.',
     'show_accept_quote_terms' => 'Quote Terms Checkbox',
@@ -1929,10 +1932,10 @@ Atención! tu password puede estar transmitida como texto plano, considera habil
     'require_invoice_signature_help' => 'Require client to provide their signature.',
     'require_quote_signature' => 'Quote Signature',
     'require_quote_signature_help' => 'Require client to provide their signature.',
-    'i_agree' => 'I Agree To The Terms',
-    'sign_here' => 'Please sign here:',
+    'i_agree' => 'Estoy de acuerdo con los terminos',
+    'sign_here' => 'Por favor firme aquí:',
     'authorization' => 'Authorization',
-    'signed' => 'Signed',
+    'signed' => 'Frimado',
 
 	// BlueVine
 	'bluevine_promo' => 'Get flexible business lines of credit and invoice factoring using BlueVine.',
@@ -2011,7 +2014,7 @@ Atención! tu password puede estar transmitida como texto plano, considera habil
     'user_guide' => 'User Guide',
     'promo_message' => 'Upgrade before :expires and get :amount OFF your first year of our Pro or Enterprise packages.',
     'discount_message' => ':amount off expires :expires',
-    'mark_paid' => 'Mark Paid',
+    'mark_paid' => 'Marcar como pagado',
     'marked_sent_invoice' => 'Successfully marked invoice sent',
     'marked_sent_invoices' => 'Successfully marked invoices sent',
     'invoice_name' => 'Invoice',
@@ -2079,8 +2082,8 @@ Atención! tu password puede estar transmitida como texto plano, considera habil
     'profit_and_loss' => 'Profit and Loss',
     'revenue' => 'Revenue',
     'profit' => 'Profit',
-    'group_when_sorted' => 'Group When Sorted',
-    'group_dates_by' => 'Group Dates By',
+    'group_when_sorted' => 'Agrupar cuando estan ordenadas',
+    'group_dates_by' => 'Agrupar fechas por',
     'year' => 'Year',
     'view_statement' => 'View Statement',
     'statement' => 'Statement',
@@ -2218,7 +2221,7 @@ Atención! tu password puede estar transmitida como texto plano, considera habil
     'surcharge_label' => 'Surcharge Label',
     'contact_fields' => 'Contact Fields',
     'custom_contact_fields_help' => 'Add a field when creating a contact and optionally display the label and value on the PDF.',
-    'datatable_info' => 'Showing :start to :end of :total entries',
+    'datatable_info' => 'Mostrando de :start a :end de :total entradas',
     'credit_total' => 'Credit Total',
     'mark_billable' => 'Mark billable',
     'billed' => 'Billed',
@@ -2387,6 +2390,7 @@ Atención! tu password puede estar transmitida como texto plano, considera habil
     'currency_jordanian_dinar' => 'Jordanian Dinar',
     'currency_myanmar_kyat' => 'Myanmar Kyat',
     'currency_peruvian_sol' => 'Peruvian Sol',
+    'currency_botswana_pula' => 'Botswana Pula',
     'review_app_help' => 'We hope you\'re enjoying using the app.<br/>If you\'d consider <a href="http://www.capterra.com/p/145215/Invoice-Ninja/" target="_blank">writing a review</a> we\'d greatly appreciate it!',
 
     'use_english_version' => 'Make sure to use the English version of the files.<br/>We use the column headers to match the fields.',
@@ -2437,11 +2441,43 @@ Atención! tu password puede estar transmitida como texto plano, considera habil
 
     'alipay' => 'Alipay',
     'sofort' => 'Sofort',
+    'sepa' => 'SEPA Direct Debit',
     'enable_alipay' => 'Accept Alipay',
     'enable_sofort' => 'Accept EU bank transfers',
     'stripe_alipay_help' => 'These gateways also need to be activated in :link.',
     'gocardless_webhook_help_link_text' => 'add this URL as an endpoint in GoCardless',
+    'calendar' => 'Calendar',
+    'pro_plan_calendar' => ':link to enable the calendar by joining the Pro Plan',
 
+    'what_are_you_working_on' => 'What are you working on?',
+    'time_tracker' => 'Time Tracker',
+    'refresh' => 'Refresh',
+    'filter_sort' => 'Filter/Sort',
+    'no_description' => 'No Description',
+    'time_tracker_login' => 'Time Tracker Login',
+    'save_or_discard' => 'Save or discard your changes',
+    'discard_changes' => 'Discard Changes',
+    'tasks_not_enabled' => 'Tasks are not enabled.',
+    'started_task' => 'Successfully started task',
+    'create_client' => 'Create Client',
+
+    'download_desktop_app' => 'Download the desktop app',
+    'download_iphone_app' => 'Download the iPhone app',
+    'download_android_app' => 'Download the Android app',
+    'time_tracker_mobile_help' => 'Double tap a task to select it',
+    'stopped' => 'Stopped',
+    'ascending' => 'Ascending',
+    'descending' => 'Descending',
+    'sort_field' => 'Sort By',
+    'sort_direction' => 'Direction',
+    'discard' => 'Discard',
+    'time_am' => 'AM',
+    'time_pm' => 'PM',
+    'time_mins' => 'mins',
+    'time_hr' => 'hr',
+    'time_hrs' => 'hrs',
+    'clear' => 'Clear',
+    'warn_payment_gateway' => 'Note: to accept online payments :link to add a payment gateway.',
 );
 
 return $LANG;
diff --git a/resources/lang/fi/texts.php b/resources/lang/fi/texts.php
index 490a4a4c5cda..4b371591f6be 100644
--- a/resources/lang/fi/texts.php
+++ b/resources/lang/fi/texts.php
@@ -60,7 +60,7 @@ $LANG = array(
     'download_pdf' => 'Lataa PDF',
     'pay_now' => 'Maksa nyt',
     'save_invoice' => 'Tallenna lasku',
-    'clone_invoice' => 'Kopioi lasku',
+    'clone_invoice' => 'Clone To Invoice',
     'archive_invoice' => 'Arkistoi lasku',
     'delete_invoice' => 'Poista lasku',
     'email_invoice' => 'Lähetä lasku sähköpostitse',
@@ -325,7 +325,7 @@ Lasku poistettiin (if only one, alternative)',
     'delete_quote' => 'Poista tarjous',
     'save_quote' => 'Tallenna tarjous',
     'email_quote' => 'Lähetä tarjous',
-    'clone_quote' => 'Kopioi tarjous',
+    'clone_quote' => 'Clone To Quote',
     'convert_to_invoice' => 'Muuta laskuksi',
     'view_invoice' => 'Katso lasku',
     'view_client' => 'Katso asiakasta',
@@ -657,7 +657,7 @@ Lasku poistettiin (if only one, alternative)',
     'created_by_invoice' => 'Luotu laskulla :invoice',
     'primary_user' => 'Pääasiallinen käyttäjä',
     'help' => 'Ohje',
-    'customize_help' => '<p>We use <a href="http://pdfmake.org/" target="_blank">pdfmake</a> to define the invoice designs declaratively. The pdfmake <a href="http://pdfmake.org/playground.html" target="_blank">playground</a> provide\'s a great way to see the library in action.</p>
+    'customize_help' => '<p>We use <a href="http://pdfmake.org/" target="_blank">pdfmake</a> to define the invoice designs declaratively. The pdfmake <a href="http://pdfmake.org/playground.html" target="_blank">playground</a> provides a great way to see the library in action.</p>
                         <p>You can access a child property using dot notation. For example to show the client name you could use <code>$client.name</code>.</p>
                         <p>If you need help figuring something out post a question to our <a href="https://www.invoiceninja.com/forums/forum/support/" target="_blank">support forum</a> with the design you\'re using.</p>',
     'invoice_due_date' => 'Eräpäivä',
@@ -998,6 +998,7 @@ Lasku poistettiin (if only one, alternative)',
     'enable_https' => 'We strongly recommend using HTTPS to accept credit card details online.',
     'quote_issued_to' => 'Quote issued to',
     'show_currency_code' => 'Currency Code',
+    'free_year_message' => 'Your account has been upgraded to the pro plan for one year at no cost.',
     'trial_message' => 'Your account will receive a free two week trial of our pro plan.',
     'trial_footer' => 'Your free pro plan trial lasts :count more days, :link to upgrade now.',
     'trial_footer_last_day' => 'This is the last day of your free pro plan trial, :link to upgrade now.',
@@ -1414,6 +1415,7 @@ Lasku poistettiin (if only one, alternative)',
     'payment_type_Swish' => 'Swish',
     'payment_type_Alipay' => 'Alipay',
     'payment_type_Sofort' => 'Sofort',
+    'payment_type_SEPA' => 'SEPA Direct Debit',
 
     // Industries
     'industry_Accounting & Legal' => 'Accounting & Legal',
@@ -1726,6 +1728,7 @@ Lasku poistettiin (if only one, alternative)',
     'lang_Turkish - Turkey' => 'Turkish - Turkey',
     'lang_Portuguese - Brazilian' => 'Portuguese - Brazilian',
     'lang_Portuguese - Portugal' => 'Portuguese - Portugal',
+    'lang_Thai' => 'Thai',
 
     // Frequencies
     'freq_weekly' => 'Weekly',
@@ -2393,6 +2396,7 @@ Lasku poistettiin (if only one, alternative)',
     'currency_jordanian_dinar' => 'Jordanian Dinar',
     'currency_myanmar_kyat' => 'Myanmar Kyat',
     'currency_peruvian_sol' => 'Peruvian Sol',
+    'currency_botswana_pula' => 'Botswana Pula',
     'review_app_help' => 'We hope you\'re enjoying using the app.<br/>If you\'d consider <a href="http://www.capterra.com/p/145215/Invoice-Ninja/" target="_blank">writing a review</a> we\'d greatly appreciate it!',
 
     'use_english_version' => 'Make sure to use the English version of the files.<br/>We use the column headers to match the fields.',
@@ -2443,11 +2447,43 @@ Lasku poistettiin (if only one, alternative)',
 
     'alipay' => 'Alipay',
     'sofort' => 'Sofort',
+    'sepa' => 'SEPA Direct Debit',
     'enable_alipay' => 'Accept Alipay',
     'enable_sofort' => 'Accept EU bank transfers',
     'stripe_alipay_help' => 'These gateways also need to be activated in :link.',
     'gocardless_webhook_help_link_text' => 'add this URL as an endpoint in GoCardless',
+    'calendar' => 'Calendar',
+    'pro_plan_calendar' => ':link to enable the calendar by joining the Pro Plan',
 
+    'what_are_you_working_on' => 'What are you working on?',
+    'time_tracker' => 'Time Tracker',
+    'refresh' => 'Refresh',
+    'filter_sort' => 'Filter/Sort',
+    'no_description' => 'No Description',
+    'time_tracker_login' => 'Time Tracker Login',
+    'save_or_discard' => 'Save or discard your changes',
+    'discard_changes' => 'Discard Changes',
+    'tasks_not_enabled' => 'Tasks are not enabled.',
+    'started_task' => 'Successfully started task',
+    'create_client' => 'Create Client',
+
+    'download_desktop_app' => 'Download the desktop app',
+    'download_iphone_app' => 'Download the iPhone app',
+    'download_android_app' => 'Download the Android app',
+    'time_tracker_mobile_help' => 'Double tap a task to select it',
+    'stopped' => 'Stopped',
+    'ascending' => 'Ascending',
+    'descending' => 'Descending',
+    'sort_field' => 'Sort By',
+    'sort_direction' => 'Direction',
+    'discard' => 'Discard',
+    'time_am' => 'AM',
+    'time_pm' => 'PM',
+    'time_mins' => 'mins',
+    'time_hr' => 'hr',
+    'time_hrs' => 'hrs',
+    'clear' => 'Clear',
+    'warn_payment_gateway' => 'Note: to accept online payments :link to add a payment gateway.',
 );
 
 return $LANG;
diff --git a/resources/lang/fr/texts.php b/resources/lang/fr/texts.php
index 3edef4f7217f..e467d9ee4988 100644
--- a/resources/lang/fr/texts.php
+++ b/resources/lang/fr/texts.php
@@ -60,7 +60,7 @@ $LANG = array(
     'download_pdf' => 'Télécharger le PDF',
     'pay_now' => 'Payer maintenant',
     'save_invoice' => 'Sauvegarder la facture',
-    'clone_invoice' => 'Dupliquer la facture',
+    'clone_invoice' => 'Clone To Invoice',
     'archive_invoice' => 'Archiver la facture',
     'delete_invoice' => 'Supprimer la facture',
     'email_invoice' => 'Envoyer la facture par courriel',
@@ -317,7 +317,7 @@ $LANG = array(
     'delete_quote' => 'Supprimer ce devis',
     'save_quote' => 'Enregistrer ce devis',
     'email_quote' => 'Envoyer ce devis par courriel',
-    'clone_quote' => 'Dupliquer ce devis',
+    'clone_quote' => 'Clone To Quote',
     'convert_to_invoice' => 'Convertir en facture',
     'view_invoice' => 'Voir la facture',
     'view_client' => 'Voir le client',
@@ -649,9 +649,9 @@ $LANG = array(
     'created_by_invoice' => 'Créé par :invoice',
     'primary_user' => 'Utilisateur principal',
     'help' => 'Aide',
-    'customize_help' => 'Nous utilisons <a href="http://pdfmake.org/" target="_blank">pdfmake</a> pour définir la présentation graphique des factures de manière déclarative. Pdfmake <a href="http://pdfmake.org/playground.html" target="_blank">playground</a> fournit une excellente façon de voir la bibliothèque en action.
-Vous pouvez accéder une propriété héritée en utilisant la notation par point. Par exemple, pour afficher le nom du client, vous pouvez utiliser <code>$client.name</code>.
-Si vous avez besoin d\'aide à ce sujet, vous pouvez publier une question sur notre <a href="https://www.invoiceninja.com/forums/forum/support/" target="_blank">forum d\'aide</a> en indiquant le modèle de facture que vous utilisez.</p>',
+    'customize_help' => '<p>We use <a href="http://pdfmake.org/" target="_blank">pdfmake</a> to define the invoice designs declaratively. The pdfmake <a href="http://pdfmake.org/playground.html" target="_blank">playground</a> provides a great way to see the library in action.</p>
+                        <p>You can access a child property using dot notation. For example to show the client name you could use <code>$client.name</code>.</p>
+                        <p>If you need help figuring something out post a question to our <a href="https://www.invoiceninja.com/forums/forum/support/" target="_blank">support forum</a> with the design you\'re using.</p>',
     'invoice_due_date' => 'Date limite',
     'quote_due_date' => 'Date limite',
     'valid_until' => 'Valide jusqu\'au',
@@ -990,6 +990,7 @@ Si vous avez besoin d\'aide à ce sujet, vous pouvez publier une question sur no
     'enable_https' => 'Nous vous recommandons fortement d\'activer le HTTPS si vous acceptez les paiements en ligne.',
     'quote_issued_to' => 'Devis à l\'attention de',
     'show_currency_code' => 'Code de la devise',
+    'free_year_message' => 'Your account has been upgraded to the pro plan for one year at no cost.',
     'trial_message' => 'Votre compte va être crédité d\'un essai gratuit de 2 semaines de notre Plan pro.',
     'trial_footer' => 'Il vous reste :count jours d\'essai sur notre offre Pro, :link modifiez votre abonnement maintenant.',
     'trial_footer_last_day' => 'C\'est votre dernier jour d\'essai sur notre offre Pro, :link modifiez votre abonnement maintenant.',
@@ -1010,7 +1011,7 @@ Si vous avez besoin d\'aide à ce sujet, vous pouvez publier une question sur no
     'pro_plan_remove_logo' => ':link pour supprimer le logo Invoice Ninja en souscrivant au Plan Pro',
     'pro_plan_remove_logo_link' => 'Cliquez ici',
     'invitation_status_sent' => 'sent',
-    'invitation_status_opened' => 'Ouvert',
+    'invitation_status_opened' => 'Opened',
     'invitation_status_viewed' => 'Consulté',
     'email_error_inactive_client' => 'Les mails ne peuvent être envoyés aux clients inactifs',
     'email_error_inactive_contact' => 'Les mails ne peuvent être envoyés aux contacts inactifs',
@@ -1406,6 +1407,7 @@ Lorsque les montant apparaîtront sur votre relevé, veuillez revenir sur cette
     'payment_type_Swish' => 'Swish',
     'payment_type_Alipay' => 'Alipay',
     'payment_type_Sofort' => 'Sofort',
+    'payment_type_SEPA' => 'SEPA Direct Debit',
 
     // Industries
     'industry_Accounting & Legal' => 'Comptabilité & Légal',
@@ -1718,6 +1720,7 @@ Lorsque les montant apparaîtront sur votre relevé, veuillez revenir sur cette
     'lang_Turkish - Turkey' => 'Turkish - Turkey',
     'lang_Portuguese - Brazilian' => 'Portugais - Brésil',
     'lang_Portuguese - Portugal' => 'Portugais - Portugal',
+    'lang_Thai' => 'Thai',
 
     // Frequencies
     'freq_weekly' => 'Hebdomadaire',
@@ -2385,6 +2388,7 @@ Lorsque les montant apparaîtront sur votre relevé, veuillez revenir sur cette
     'currency_jordanian_dinar' => 'Jordanian Dinar',
     'currency_myanmar_kyat' => 'Myanmar Kyat',
     'currency_peruvian_sol' => 'Peruvian Sol',
+    'currency_botswana_pula' => 'Botswana Pula',
     'review_app_help' => 'We hope you\'re enjoying using the app.<br/>If you\'d consider <a href="http://www.capterra.com/p/145215/Invoice-Ninja/" target="_blank">writing a review</a> we\'d greatly appreciate it!',
 
     'use_english_version' => 'Make sure to use the English version of the files.<br/>We use the column headers to match the fields.',
@@ -2435,11 +2439,43 @@ Lorsque les montant apparaîtront sur votre relevé, veuillez revenir sur cette
 
     'alipay' => 'Alipay',
     'sofort' => 'Sofort',
+    'sepa' => 'SEPA Direct Debit',
     'enable_alipay' => 'Accept Alipay',
     'enable_sofort' => 'Accept EU bank transfers',
     'stripe_alipay_help' => 'These gateways also need to be activated in :link.',
     'gocardless_webhook_help_link_text' => 'add this URL as an endpoint in GoCardless',
+    'calendar' => 'Calendar',
+    'pro_plan_calendar' => ':link to enable the calendar by joining the Pro Plan',
 
+    'what_are_you_working_on' => 'What are you working on?',
+    'time_tracker' => 'Time Tracker',
+    'refresh' => 'Refresh',
+    'filter_sort' => 'Filter/Sort',
+    'no_description' => 'No Description',
+    'time_tracker_login' => 'Time Tracker Login',
+    'save_or_discard' => 'Save or discard your changes',
+    'discard_changes' => 'Discard Changes',
+    'tasks_not_enabled' => 'Tasks are not enabled.',
+    'started_task' => 'Successfully started task',
+    'create_client' => 'Create Client',
+
+    'download_desktop_app' => 'Download the desktop app',
+    'download_iphone_app' => 'Download the iPhone app',
+    'download_android_app' => 'Download the Android app',
+    'time_tracker_mobile_help' => 'Double tap a task to select it',
+    'stopped' => 'Stopped',
+    'ascending' => 'Ascending',
+    'descending' => 'Descending',
+    'sort_field' => 'Sort By',
+    'sort_direction' => 'Direction',
+    'discard' => 'Discard',
+    'time_am' => 'AM',
+    'time_pm' => 'PM',
+    'time_mins' => 'mins',
+    'time_hr' => 'hr',
+    'time_hrs' => 'hrs',
+    'clear' => 'Clear',
+    'warn_payment_gateway' => 'Note: to accept online payments :link to add a payment gateway.',
 );
 
 return $LANG;
diff --git a/resources/lang/fr_CA/texts.php b/resources/lang/fr_CA/texts.php
index 672ec4fea2a2..16df23a93b91 100644
--- a/resources/lang/fr_CA/texts.php
+++ b/resources/lang/fr_CA/texts.php
@@ -60,7 +60,7 @@ $LANG = array(
     'download_pdf' => 'PDF',
     'pay_now' => 'Payer maintenant',
     'save_invoice' => 'Sauvegarder la facture',
-    'clone_invoice' => 'Dupliquer la facture',
+    'clone_invoice' => 'Clone To Invoice',
     'archive_invoice' => 'Archiver la facture',
     'delete_invoice' => 'Supprimer la facture',
     'email_invoice' => 'Envoyer par courriel',
@@ -317,7 +317,7 @@ $LANG = array(
     'delete_quote' => 'Supprimer la soumission',
     'save_quote' => 'Enregistrer la soumission',
     'email_quote' => 'Envoyer la soumission par courriel',
-    'clone_quote' => 'Dupliquer la soumission',
+    'clone_quote' => 'Clone To Quote',
     'convert_to_invoice' => 'Convertir en facture',
     'view_invoice' => 'Voir la facture',
     'view_client' => 'Voir le client',
@@ -649,9 +649,9 @@ $LANG = array(
     'created_by_invoice' => 'Créée par :invoice',
     'primary_user' => 'Utilisateur principal',
     'help' => 'Aide',
-    'customize_help' => '<p>Nous utilisons <a href="http://pdfmake.org/" target="_blank">pdfmake</a> pour définir la présentation graphique des factures de manière déclarative. Pdfmake <a href="http://pdfmake.org/playground.html" target="_blank">playground</a> fournit une excellente façon de voir la librairie en action.</p>
-                        <p>Vous pouvez accéder une propriété enfant en utilisant la notation par point. Par exemple, pour afficher le nom du client, vous pouvez utiliser <code>$client.name</code>.</p>
-                        <p>Si vous avez besoin d\'aide à ce sujet, vous pouvez publier une question sur notre <a href="https://www.invoiceninja.com/forums/forum/support/" target="_blank">forum d\'aide</a> avec la présentation graphique que vous utilisez.</p>',
+    'customize_help' => '<p>Nous utilisons <a href="http://pdfmake.org/" target="_blank">pdfmake</a> pour définir déclarativement le design des factures. L\'environnement <a href="http://pdfmake.org/playground.html" target="_blank">pdfmake</a> offre d\'intéressantes pistes pour voir la librairie en action.</p>
+                        <p>Vous pouvez accéder aux propriétés enfants en utilisant la notation par point. Par exemple, pour afficher le nom du client, vous pourriez utiliser <code>$client.name</code>.</p>
+                        <p>Si vous avez besoin d\'aide, consultez notre <a href="https://www.invoiceninja.com/forums/forum/support/" target="_blank">forum de support</a> avec le design que vous utilisez.</p>',
     'invoice_due_date' => 'Échéance',
     'quote_due_date' => 'Échéance',
     'valid_until' => 'Échéance',
@@ -987,6 +987,7 @@ $LANG = array(
     'enable_https' => 'Nous vous recommandons fortement d\'activer le HTTPS pour la réception de paiement par carte de crédit en ligne.',
     'quote_issued_to' => 'La soumission a été émise pour',
     'show_currency_code' => 'Code de devise',
+    'free_year_message' => 'Votre compte a été mis à niveau gratuitement vers le Plan Pro pour une année.',
     'trial_message' => 'Vous allez bénéficier d\'un essai gratuit de 2 semaines au Plan Pro.',
     'trial_footer' => 'Vous avez encore :count jours pour votre essai gratuit Pro Plan, :link pour s\'inscrire.',
     'trial_footer_last_day' => 'C\'est le dernier jour de votre essai gratuit Pro Plan, :link pour s\'inscrire.',
@@ -1403,6 +1404,7 @@ Lorsque les montant apparaîtront sur votre relevé, veuillez revenir sur cette
     'payment_type_Swish' => 'Swish',
     'payment_type_Alipay' => 'Alipay',
     'payment_type_Sofort' => 'Sofort',
+    'payment_type_SEPA' => 'SEPA Débit direct',
 
     // Industries
     'industry_Accounting & Legal' => 'Administration',
@@ -1715,6 +1717,7 @@ Lorsque les montant apparaîtront sur votre relevé, veuillez revenir sur cette
     'lang_Turkish - Turkey' => 'Turc - Turquie',
     'lang_Portuguese - Brazilian' => 'Portugais - Brésil',
     'lang_Portuguese - Portugal' => 'Portugais - Portugal',
+    'lang_Thai' => 'Baht thaïlandais',
 
     // Frequencies
     'freq_weekly' => 'Hebdomadaire',
@@ -1857,7 +1860,7 @@ Lorsque les montant apparaîtront sur votre relevé, veuillez revenir sur cette
     'inactive_logout' => 'Vous avez été déconnecté en raison de l\'inactivité.',
     'reports' => 'Rapports',
     'total_profit' => 'Total des profits',
-    'total_expenses' => 'Total des dépenses',
+    'total_expenses' => 'Dépenses',
     'quote_to' => 'Soumission pour',
 
     // Limits
@@ -1893,10 +1896,10 @@ Lorsque les montant apparaîtront sur votre relevé, veuillez revenir sur cette
 
     'go_ninja_pro' => 'Devenez Ninja Pro',
     'go_enterprise' => 'Devenez Entreprise!',
-    'upgrade_for_features' => 'Mettre à jour pour plus de fonctionnalités',
+    'upgrade_for_features' => 'Mise à jour pour plus de fonctionnalités',
     'pay_annually_discount' => 'Payez annuellement pour 10 mois + 2 gratuits',
     'pro_upgrade_title' => 'Ninja Pro',
-    'pro_upgrade_feature1' => 'VotreMarque.InvoiceNinja.com',
+    'pro_upgrade_feature1' => 'votrenom.invoiceninja.com',
     'pro_upgrade_feature2' => 'Personnalisez tous les aspects de votre facture',
     'enterprise_upgrade_feature1' => 'Définissez les permissions pour plusieurs utilisateurs',
     'enterprise_upgrade_feature2' => 'Ajoutez des fichiers joints aux factures et dépenses',
@@ -1932,7 +1935,7 @@ Lorsque les montant apparaîtront sur votre relevé, veuillez revenir sur cette
 	// BlueVine
 	'bluevine_promo' => 'Obtenez des marges de crédit et d\'affacturages d\'affaires flexible en utilisant BlueVIne.',
 	'bluevine_modal_label' => 'Inscrivez-vous avec BlueVine',
-	'bluevine_modal_text' => '<h3>Finacement rapide pour votre entreprise. Pas de paperasse.</h3>
+	'bluevine_modal_text' => '<h3>Financement rapide pour votre entreprise. Pas de paperasse.</h3>
 <ul><li>Marges de crédit et affacturage d\'affaires flexibles.</li></ul>',
 	'bluevine_create_account' => 'Créer un compte',
 	'quote_types' => 'Obtenir une soumission pour',
@@ -2383,6 +2386,7 @@ Lorsque les montant apparaîtront sur votre relevé, veuillez revenir sur cette
     'currency_jordanian_dinar' => 'Dinar jordanien',
     'currency_myanmar_kyat' => 'Kyat birman',
     'currency_peruvian_sol' => 'Nouveau sol péruvien',
+    'currency_botswana_pula' => 'Pula botswanais',
     'review_app_help' => 'Nous espérons que votre utilisation de cette application vous est agréable.<br/>Veuillez considérer <a href="http://www.capterra.com/p/145215/Invoice-Ninja/" target="_blank">de laisser un commentaire.</a> Ce serait grandement apprécié!',
 
     'use_english_version' => 'Veuillez vous assurer d\'utiliser la version anglaise des fichiers.<br/>Les entêtes de colonnes sont utilisées pour correspondre aux champs.',
@@ -2433,11 +2437,43 @@ Lorsque les montant apparaîtront sur votre relevé, veuillez revenir sur cette
 
     'alipay' => 'Alipay',
     'sofort' => 'Sofort',
+    'sepa' => 'SEPA Débit direct',
     'enable_alipay' => 'Accepter Alipay',
     'enable_sofort' => 'Accepter les tranferts de banques EU',
     'stripe_alipay_help' => 'Ces passerelles doivent aussi être activées dans :link.',
     'gocardless_webhook_help_link_text' => 'ajoute cette URL comme terminal dans GoCardless',
+    'calendar' => 'Calendrier',
+    'pro_plan_calendar' => ':link pour activer le calendrier en joignant le Plan Pro',
 
+    'what_are_you_working_on' => 'Sur quoi travaillez-vous ?',
+    'time_tracker' => 'Minuteur',
+    'refresh' => 'Actualiser',
+    'filter_sort' => 'Filtrer/trier',
+    'no_description' => 'Aucune description',
+    'time_tracker_login' => 'Connexion au minuteur',
+    'save_or_discard' => 'Sauvegarder ou annuler les changements',
+    'discard_changes' => 'Annuler les changements',
+    'tasks_not_enabled' => 'Les tâches ne sont pas activées.',
+    'started_task' => 'La tâche est démarée',
+    'create_client' => 'Créer un client',
+
+    'download_desktop_app' => 'Télécharger l\'app. de bureau',
+    'download_iphone_app' => 'Télécharger l\'app. iPhone',
+    'download_android_app' => 'Télécharger l\'app. Android',
+    'time_tracker_mobile_help' => 'Double-tapez une tâche pour la sélectionner',
+    'stopped' => 'Arrêtée',
+    'ascending' => 'Ascendant',
+    'descending' => 'Descendant',
+    'sort_field' => 'Trié par',
+    'sort_direction' => 'Direction',
+    'discard' => 'Annuler',
+    'time_am' => 'AM',
+    'time_pm' => 'PM',
+    'time_mins' => 'min',
+    'time_hr' => 'h',
+    'time_hrs' => 'hrs',
+    'clear' => 'Remettre à zéro',
+    'warn_payment_gateway' => 'Note: to accept online payments :link to add a payment gateway.',
 );
 
 return $LANG;
diff --git a/resources/lang/hr/texts.php b/resources/lang/hr/texts.php
index b2f4fe92bc0c..640cb40eba2f 100644
--- a/resources/lang/hr/texts.php
+++ b/resources/lang/hr/texts.php
@@ -60,7 +60,7 @@ $LANG = array(
     'download_pdf' => 'Preuzmi PDF',
     'pay_now' => 'Plati odmah',
     'save_invoice' => 'Pohrani račun',
-    'clone_invoice' => 'Kloniraj račun',
+    'clone_invoice' => 'Clone To Invoice',
     'archive_invoice' => 'Arhiviraj račun',
     'delete_invoice' => 'Obriši račun',
     'email_invoice' => 'Pošalji e-poštom',
@@ -323,7 +323,7 @@ $LANG = array(
     'delete_quote' => 'Obriši ponudu',
     'save_quote' => 'Pohrani ponudu',
     'email_quote' => 'Šalji ponudu e-poštom',
-    'clone_quote' => 'Kloniraj ponudu',
+    'clone_quote' => 'Clone To Quote',
     'convert_to_invoice' => 'Konverzija računa',
     'view_invoice' => 'Pregled računa',
     'view_client' => 'Pregled klijenta',
@@ -655,7 +655,7 @@ $LANG = array(
     'created_by_invoice' => 'Kreiran od :invoice',
     'primary_user' => 'Primarni korisnik',
     'help' => 'Pomoć',
-    'customize_help' => '<p>We use <a href="http://pdfmake.org/" target="_blank">pdfmake</a> to define the invoice designs declaratively. The pdfmake <a href="http://pdfmake.org/playground.html" target="_blank">playground</a> provide\'s a great way to see the library in action.</p>
+    'customize_help' => '<p>We use <a href="http://pdfmake.org/" target="_blank">pdfmake</a> to define the invoice designs declaratively. The pdfmake <a href="http://pdfmake.org/playground.html" target="_blank">playground</a> provides a great way to see the library in action.</p>
                         <p>You can access a child property using dot notation. For example to show the client name you could use <code>$client.name</code>.</p>
                         <p>If you need help figuring something out post a question to our <a href="https://www.invoiceninja.com/forums/forum/support/" target="_blank">support forum</a> with the design you\'re using.</p>',
     'invoice_due_date' => 'Datum valute',
@@ -996,6 +996,7 @@ $LANG = array(
     'enable_https' => 'Snažno preporučujemo korištenje HTTPS za prihvat detalja kreditnih kartica online.',
     'quote_issued_to' => 'Ponuda napravljena za',
     'show_currency_code' => 'Kod valute',
+    'free_year_message' => 'Your account has been upgraded to the pro plan for one year at no cost.',
     'trial_message' => 'Vaš račun će primiti besplatni dvotjedni probni rok za naš pro plan.',
     'trial_footer' => 'Your free pro plan trial lasts :count more days, :link to upgrade now.',
     'trial_footer_last_day' => 'This is the last day of your free pro plan trial, :link to upgrade now.',
@@ -1412,6 +1413,7 @@ $LANG = array(
     'payment_type_Swish' => 'Swish',
     'payment_type_Alipay' => 'Alipay',
     'payment_type_Sofort' => 'Sofort',
+    'payment_type_SEPA' => 'SEPA Direct Debit',
 
     // Industries
     'industry_Accounting & Legal' => 'Accounting & Legal',
@@ -1724,6 +1726,7 @@ $LANG = array(
     'lang_Turkish - Turkey' => 'Turkish - Turkey',
     'lang_Portuguese - Brazilian' => 'Portuguese - Brazilian',
     'lang_Portuguese - Portugal' => 'Portuguese - Portugal',
+    'lang_Thai' => 'Thai',
 
     // Frequencies
     'freq_weekly' => 'Weekly',
@@ -2391,6 +2394,7 @@ $LANG = array(
     'currency_jordanian_dinar' => 'Jordanian Dinar',
     'currency_myanmar_kyat' => 'Myanmar Kyat',
     'currency_peruvian_sol' => 'Peruvian Sol',
+    'currency_botswana_pula' => 'Botswana Pula',
     'review_app_help' => 'We hope you\'re enjoying using the app.<br/>If you\'d consider <a href="http://www.capterra.com/p/145215/Invoice-Ninja/" target="_blank">writing a review</a> we\'d greatly appreciate it!',
 
     'use_english_version' => 'Make sure to use the English version of the files.<br/>We use the column headers to match the fields.',
@@ -2441,11 +2445,43 @@ $LANG = array(
 
     'alipay' => 'Alipay',
     'sofort' => 'Sofort',
+    'sepa' => 'SEPA Direct Debit',
     'enable_alipay' => 'Accept Alipay',
     'enable_sofort' => 'Accept EU bank transfers',
     'stripe_alipay_help' => 'These gateways also need to be activated in :link.',
     'gocardless_webhook_help_link_text' => 'add this URL as an endpoint in GoCardless',
+    'calendar' => 'Calendar',
+    'pro_plan_calendar' => ':link to enable the calendar by joining the Pro Plan',
 
+    'what_are_you_working_on' => 'What are you working on?',
+    'time_tracker' => 'Time Tracker',
+    'refresh' => 'Refresh',
+    'filter_sort' => 'Filter/Sort',
+    'no_description' => 'No Description',
+    'time_tracker_login' => 'Time Tracker Login',
+    'save_or_discard' => 'Save or discard your changes',
+    'discard_changes' => 'Discard Changes',
+    'tasks_not_enabled' => 'Tasks are not enabled.',
+    'started_task' => 'Successfully started task',
+    'create_client' => 'Create Client',
+
+    'download_desktop_app' => 'Download the desktop app',
+    'download_iphone_app' => 'Download the iPhone app',
+    'download_android_app' => 'Download the Android app',
+    'time_tracker_mobile_help' => 'Double tap a task to select it',
+    'stopped' => 'Stopped',
+    'ascending' => 'Ascending',
+    'descending' => 'Descending',
+    'sort_field' => 'Sort By',
+    'sort_direction' => 'Direction',
+    'discard' => 'Discard',
+    'time_am' => 'AM',
+    'time_pm' => 'PM',
+    'time_mins' => 'mins',
+    'time_hr' => 'hr',
+    'time_hrs' => 'hrs',
+    'clear' => 'Clear',
+    'warn_payment_gateway' => 'Note: to accept online payments :link to add a payment gateway.',
 );
 
 return $LANG;
diff --git a/resources/lang/it/texts.php b/resources/lang/it/texts.php
index edaad4e54087..b4377cc7b02d 100644
--- a/resources/lang/it/texts.php
+++ b/resources/lang/it/texts.php
@@ -60,7 +60,7 @@ $LANG = array(
     'download_pdf' => 'Scarica PDF',
     'pay_now' => 'Paga Adesso',
     'save_invoice' => 'Salva Fattura',
-    'clone_invoice' => 'Duplica Fattura',
+    'clone_invoice' => 'Clone To Invoice',
     'archive_invoice' => 'Archivia Fattura',
     'delete_invoice' => 'Elimina Fattura',
     'email_invoice' => 'Invia Fattura',
@@ -317,7 +317,7 @@ $LANG = array(
     'delete_quote' => 'Cancella Preventivo',
     'save_quote' => 'Salva Preventivo',
     'email_quote' => 'Invia Preventivo via Email',
-    'clone_quote' => 'Clona Preventivo',
+    'clone_quote' => 'Clone To Quote',
     'convert_to_invoice' => 'Converti a Fattura',
     'view_invoice' => 'Vedi Fattura',
     'view_client' => 'Vedi Cliente',
@@ -649,9 +649,9 @@ $LANG = array(
     'created_by_invoice' => 'Created by :invoice',
     'primary_user' => 'Primary User',
     'help' => 'Help',
-    'customize_help' => '<p>Noi usiamo <a href="http://pdfmake.org/" target="_blank">pdfmake</a>per definire il template della fattura in maniera dichiarativa.  Pdfmake <a href="http://pdfmake.org/playground.html" target="_blank">playground</a> provide\'s a great way to see the library in action.</p>
-<p>Puoi accedere  alla child property usando la "dot notation". Ad esempio per mostrare  il nome cliente puoi usare<code>$client.name</code>.</p>
-<p>If you need help figuring something out post a question to our <a href="https://www.invoiceninja.com/forums/forum/support/" target="_blank">support forum</a> with the design you\'re using.</p>',
+    'customize_help' => '<p>We use <a href="http://pdfmake.org/" target="_blank">pdfmake</a> to define the invoice designs declaratively. The pdfmake <a href="http://pdfmake.org/playground.html" target="_blank">playground</a> provides a great way to see the library in action.</p>
+                        <p>You can access a child property using dot notation. For example to show the client name you could use <code>$client.name</code>.</p>
+                        <p>If you need help figuring something out post a question to our <a href="https://www.invoiceninja.com/forums/forum/support/" target="_blank">support forum</a> with the design you\'re using.</p>',
     'invoice_due_date' => 'Scadenza fattura',
     'quote_due_date' => 'Validità preventivo',
     'valid_until' => 'Valido fino a',
@@ -990,6 +990,7 @@ $LANG = array(
     'enable_https' => 'We strongly recommend using HTTPS to accept credit card details online.',
     'quote_issued_to' => 'Quote issued to',
     'show_currency_code' => 'Currency Code',
+    'free_year_message' => 'Your account has been upgraded to the pro plan for one year at no cost.',
     'trial_message' => 'Your account will receive a free two week trial of our pro plan.',
     'trial_footer' => 'Your free pro plan trial lasts :count more days, :link to upgrade now.',
     'trial_footer_last_day' => 'This is the last day of your free pro plan trial, :link to upgrade now.',
@@ -1010,7 +1011,7 @@ $LANG = array(
     'pro_plan_remove_logo' => ':link per rimuovere il logo di Invoice Ninja aderendo al programma pro',
     'pro_plan_remove_logo_link' => 'Clicca qui',
     'invitation_status_sent' => 'sent',
-    'invitation_status_opened' => 'Aperto',
+    'invitation_status_opened' => 'Opened',
     'invitation_status_viewed' => 'Visto',
     'email_error_inactive_client' => 'Emails can not be sent to inactive clients',
     'email_error_inactive_contact' => 'Emails can not be sent to inactive contacts',
@@ -1405,6 +1406,7 @@ $LANG = array(
     'payment_type_Swish' => 'Swish',
     'payment_type_Alipay' => 'Alipay',
     'payment_type_Sofort' => 'Sofort',
+    'payment_type_SEPA' => 'SEPA Direct Debit',
 
     // Industries
     'industry_Accounting & Legal' => 'Accounting & Legal',
@@ -1717,6 +1719,7 @@ $LANG = array(
     'lang_Turkish - Turkey' => 'Turkish - Turkey',
     'lang_Portuguese - Brazilian' => 'Portuguese - Brazilian',
     'lang_Portuguese - Portugal' => 'Portuguese - Portugal',
+    'lang_Thai' => 'Thai',
 
     // Frequencies
     'freq_weekly' => 'Weekly',
@@ -2384,6 +2387,7 @@ $LANG = array(
     'currency_jordanian_dinar' => 'Jordanian Dinar',
     'currency_myanmar_kyat' => 'Myanmar Kyat',
     'currency_peruvian_sol' => 'Peruvian Sol',
+    'currency_botswana_pula' => 'Botswana Pula',
     'review_app_help' => 'We hope you\'re enjoying using the app.<br/>If you\'d consider <a href="http://www.capterra.com/p/145215/Invoice-Ninja/" target="_blank">writing a review</a> we\'d greatly appreciate it!',
 
     'use_english_version' => 'Make sure to use the English version of the files.<br/>We use the column headers to match the fields.',
@@ -2434,11 +2438,43 @@ $LANG = array(
 
     'alipay' => 'Alipay',
     'sofort' => 'Sofort',
+    'sepa' => 'SEPA Direct Debit',
     'enable_alipay' => 'Accept Alipay',
     'enable_sofort' => 'Accept EU bank transfers',
     'stripe_alipay_help' => 'These gateways also need to be activated in :link.',
     'gocardless_webhook_help_link_text' => 'add this URL as an endpoint in GoCardless',
+    'calendar' => 'Calendar',
+    'pro_plan_calendar' => ':link to enable the calendar by joining the Pro Plan',
 
+    'what_are_you_working_on' => 'What are you working on?',
+    'time_tracker' => 'Time Tracker',
+    'refresh' => 'Refresh',
+    'filter_sort' => 'Filter/Sort',
+    'no_description' => 'No Description',
+    'time_tracker_login' => 'Time Tracker Login',
+    'save_or_discard' => 'Save or discard your changes',
+    'discard_changes' => 'Discard Changes',
+    'tasks_not_enabled' => 'Tasks are not enabled.',
+    'started_task' => 'Successfully started task',
+    'create_client' => 'Create Client',
+
+    'download_desktop_app' => 'Download the desktop app',
+    'download_iphone_app' => 'Download the iPhone app',
+    'download_android_app' => 'Download the Android app',
+    'time_tracker_mobile_help' => 'Double tap a task to select it',
+    'stopped' => 'Stopped',
+    'ascending' => 'Ascending',
+    'descending' => 'Descending',
+    'sort_field' => 'Sort By',
+    'sort_direction' => 'Direction',
+    'discard' => 'Discard',
+    'time_am' => 'AM',
+    'time_pm' => 'PM',
+    'time_mins' => 'mins',
+    'time_hr' => 'hr',
+    'time_hrs' => 'hrs',
+    'clear' => 'Clear',
+    'warn_payment_gateway' => 'Note: to accept online payments :link to add a payment gateway.',
 );
 
 return $LANG;
diff --git a/resources/lang/ja/texts.php b/resources/lang/ja/texts.php
index 68bd8e31c39e..87159974f622 100644
--- a/resources/lang/ja/texts.php
+++ b/resources/lang/ja/texts.php
@@ -60,7 +60,7 @@ $LANG = array(
     'download_pdf' => 'PDFダウンロード',
     'pay_now' => 'Pay Now',
     'save_invoice' => '請求書を保存',
-    'clone_invoice' => '請求書を複製',
+    'clone_invoice' => 'Clone To Invoice',
     'archive_invoice' => '請求書をアーカイブ',
     'delete_invoice' => '請求書を削除',
     'email_invoice' => '請求書をメールする',
@@ -323,7 +323,7 @@ $LANG = array(
     'delete_quote' => '見積書を削除',
     'save_quote' => '見積書を保存',
     'email_quote' => '見積書をメール',
-    'clone_quote' => '見積書を複製',
+    'clone_quote' => 'Clone To Quote',
     'convert_to_invoice' => '請求書に変換',
     'view_invoice' => '請求書を表示',
     'view_client' => '顧客を表示',
@@ -655,7 +655,7 @@ $LANG = array(
     'created_by_invoice' => 'Created by :invoice',
     'primary_user' => 'プライマリ・ユーザ',
     'help' => 'ヘルプ',
-    'customize_help' => '<p>We use <a href="http://pdfmake.org/" target="_blank">pdfmake</a> to define the invoice designs declaratively. The pdfmake <a href="http://pdfmake.org/playground.html" target="_blank">playground</a> provide\'s a great way to see the library in action.</p>
+    'customize_help' => '<p>We use <a href="http://pdfmake.org/" target="_blank">pdfmake</a> to define the invoice designs declaratively. The pdfmake <a href="http://pdfmake.org/playground.html" target="_blank">playground</a> provides a great way to see the library in action.</p>
                         <p>You can access a child property using dot notation. For example to show the client name you could use <code>$client.name</code>.</p>
                         <p>If you need help figuring something out post a question to our <a href="https://www.invoiceninja.com/forums/forum/support/" target="_blank">support forum</a> with the design you\'re using.</p>',
     'invoice_due_date' => '支払期日',
@@ -996,6 +996,7 @@ $LANG = array(
     'enable_https' => 'We strongly recommend using HTTPS to accept credit card details online.',
     'quote_issued_to' => 'Quote issued to',
     'show_currency_code' => '通貨コード',
+    'free_year_message' => 'Your account has been upgraded to the pro plan for one year at no cost.',
     'trial_message' => 'Your account will receive a free two week trial of our pro plan.',
     'trial_footer' => 'Your free pro plan trial lasts :count more days, :link to upgrade now.',
     'trial_footer_last_day' => 'This is the last day of your free pro plan trial, :link to upgrade now.',
@@ -1412,6 +1413,7 @@ $LANG = array(
     'payment_type_Swish' => 'Swish',
     'payment_type_Alipay' => 'Alipay',
     'payment_type_Sofort' => 'Sofort',
+    'payment_type_SEPA' => 'SEPA Direct Debit',
 
     // Industries
     'industry_Accounting & Legal' => 'Accounting & Legal',
@@ -1724,6 +1726,7 @@ $LANG = array(
     'lang_Turkish - Turkey' => 'Turkish - Turkey',
     'lang_Portuguese - Brazilian' => 'Portuguese - Brazilian',
     'lang_Portuguese - Portugal' => 'Portuguese - Portugal',
+    'lang_Thai' => 'Thai',
 
     // Frequencies
     'freq_weekly' => 'Weekly',
@@ -2391,6 +2394,7 @@ $LANG = array(
     'currency_jordanian_dinar' => 'Jordanian Dinar',
     'currency_myanmar_kyat' => 'Myanmar Kyat',
     'currency_peruvian_sol' => 'Peruvian Sol',
+    'currency_botswana_pula' => 'Botswana Pula',
     'review_app_help' => 'We hope you\'re enjoying using the app.<br/>If you\'d consider <a href="http://www.capterra.com/p/145215/Invoice-Ninja/" target="_blank">writing a review</a> we\'d greatly appreciate it!',
 
     'use_english_version' => 'Make sure to use the English version of the files.<br/>We use the column headers to match the fields.',
@@ -2441,11 +2445,43 @@ $LANG = array(
 
     'alipay' => 'Alipay',
     'sofort' => 'Sofort',
+    'sepa' => 'SEPA Direct Debit',
     'enable_alipay' => 'Accept Alipay',
     'enable_sofort' => 'Accept EU bank transfers',
     'stripe_alipay_help' => 'These gateways also need to be activated in :link.',
     'gocardless_webhook_help_link_text' => 'add this URL as an endpoint in GoCardless',
+    'calendar' => 'Calendar',
+    'pro_plan_calendar' => ':link to enable the calendar by joining the Pro Plan',
 
+    'what_are_you_working_on' => 'What are you working on?',
+    'time_tracker' => 'Time Tracker',
+    'refresh' => 'Refresh',
+    'filter_sort' => 'Filter/Sort',
+    'no_description' => 'No Description',
+    'time_tracker_login' => 'Time Tracker Login',
+    'save_or_discard' => 'Save or discard your changes',
+    'discard_changes' => 'Discard Changes',
+    'tasks_not_enabled' => 'Tasks are not enabled.',
+    'started_task' => 'Successfully started task',
+    'create_client' => 'Create Client',
+
+    'download_desktop_app' => 'Download the desktop app',
+    'download_iphone_app' => 'Download the iPhone app',
+    'download_android_app' => 'Download the Android app',
+    'time_tracker_mobile_help' => 'Double tap a task to select it',
+    'stopped' => 'Stopped',
+    'ascending' => 'Ascending',
+    'descending' => 'Descending',
+    'sort_field' => 'Sort By',
+    'sort_direction' => 'Direction',
+    'discard' => 'Discard',
+    'time_am' => 'AM',
+    'time_pm' => 'PM',
+    'time_mins' => 'mins',
+    'time_hr' => 'hr',
+    'time_hrs' => 'hrs',
+    'clear' => 'Clear',
+    'warn_payment_gateway' => 'Note: to accept online payments :link to add a payment gateway.',
 );
 
 return $LANG;
diff --git a/resources/lang/lt/texts.php b/resources/lang/lt/texts.php
index 095898477c96..fa0ec557dd15 100644
--- a/resources/lang/lt/texts.php
+++ b/resources/lang/lt/texts.php
@@ -60,7 +60,7 @@ $LANG = array(
     'download_pdf' => 'Atsisiųsti PDF',
     'pay_now' => 'Apmokėti dabar',
     'save_invoice' => 'Išsaugoti sąskaitą',
-    'clone_invoice' => 'Kopijuoti sąskaitą',
+    'clone_invoice' => 'Clone To Invoice',
     'archive_invoice' => 'Archyvuoti sąskaitą',
     'delete_invoice' => 'Ištrinti sąskaitą',
     'email_invoice' => 'Išsiųsti el. paštu sąskaitą',
@@ -323,7 +323,7 @@ $LANG = array(
     'delete_quote' => 'Delete Quote',
     'save_quote' => 'Save Quote',
     'email_quote' => 'Email Quote',
-    'clone_quote' => 'Clone Quote',
+    'clone_quote' => 'Clone To Quote',
     'convert_to_invoice' => 'Convert to Invoice',
     'view_invoice' => 'Rodyti sąskaitą',
     'view_client' => 'Rodyti klientą',
@@ -655,7 +655,7 @@ $LANG = array(
     'created_by_invoice' => 'Sukurta :invoice',
     'primary_user' => 'Primary User',
     'help' => 'Pagalba',
-    'customize_help' => '<p>We use <a href="http://pdfmake.org/" target="_blank">pdfmake</a> to define the invoice designs declaratively. The pdfmake <a href="http://pdfmake.org/playground.html" target="_blank">playground</a> provide\'s a great way to see the library in action.</p>
+    'customize_help' => '<p>We use <a href="http://pdfmake.org/" target="_blank">pdfmake</a> to define the invoice designs declaratively. The pdfmake <a href="http://pdfmake.org/playground.html" target="_blank">playground</a> provides a great way to see the library in action.</p>
                         <p>You can access a child property using dot notation. For example to show the client name you could use <code>$client.name</code>.</p>
                         <p>If you need help figuring something out post a question to our <a href="https://www.invoiceninja.com/forums/forum/support/" target="_blank">support forum</a> with the design you\'re using.</p>',
     'invoice_due_date' => 'Terminas',
@@ -996,6 +996,7 @@ $LANG = array(
     'enable_https' => 'We strongly recommend using HTTPS to accept credit card details online.',
     'quote_issued_to' => 'Quote issued to',
     'show_currency_code' => 'Valiutos kodas',
+    'free_year_message' => 'Your account has been upgraded to the pro plan for one year at no cost.',
     'trial_message' => 'Your account will receive a free two week trial of our pro plan.',
     'trial_footer' => 'Your free pro plan trial lasts :count more days, :link to upgrade now.',
     'trial_footer_last_day' => 'This is the last day of your free pro plan trial, :link to upgrade now.',
@@ -1412,6 +1413,7 @@ $LANG = array(
     'payment_type_Swish' => 'Swish',
     'payment_type_Alipay' => 'Alipay',
     'payment_type_Sofort' => 'Sofort',
+    'payment_type_SEPA' => 'SEPA Direct Debit',
 
     // Industries
     'industry_Accounting & Legal' => 'Accounting & Legal',
@@ -1724,6 +1726,7 @@ $LANG = array(
     'lang_Turkish - Turkey' => 'Turkish - Turkey',
     'lang_Portuguese - Brazilian' => 'Portuguese - Brazilian',
     'lang_Portuguese - Portugal' => 'Portuguese - Portugal',
+    'lang_Thai' => 'Thai',
 
     // Frequencies
     'freq_weekly' => 'Weekly',
@@ -2391,6 +2394,7 @@ $LANG = array(
     'currency_jordanian_dinar' => 'Jordanian Dinar',
     'currency_myanmar_kyat' => 'Myanmar Kyat',
     'currency_peruvian_sol' => 'Peruvian Sol',
+    'currency_botswana_pula' => 'Botswana Pula',
     'review_app_help' => 'We hope you\'re enjoying using the app.<br/>If you\'d consider <a href="http://www.capterra.com/p/145215/Invoice-Ninja/" target="_blank">writing a review</a> we\'d greatly appreciate it!',
 
     'use_english_version' => 'Make sure to use the English version of the files.<br/>We use the column headers to match the fields.',
@@ -2441,11 +2445,43 @@ $LANG = array(
 
     'alipay' => 'Alipay',
     'sofort' => 'Sofort',
+    'sepa' => 'SEPA Direct Debit',
     'enable_alipay' => 'Accept Alipay',
     'enable_sofort' => 'Accept EU bank transfers',
     'stripe_alipay_help' => 'These gateways also need to be activated in :link.',
     'gocardless_webhook_help_link_text' => 'add this URL as an endpoint in GoCardless',
+    'calendar' => 'Calendar',
+    'pro_plan_calendar' => ':link to enable the calendar by joining the Pro Plan',
 
+    'what_are_you_working_on' => 'What are you working on?',
+    'time_tracker' => 'Time Tracker',
+    'refresh' => 'Refresh',
+    'filter_sort' => 'Filter/Sort',
+    'no_description' => 'No Description',
+    'time_tracker_login' => 'Time Tracker Login',
+    'save_or_discard' => 'Save or discard your changes',
+    'discard_changes' => 'Discard Changes',
+    'tasks_not_enabled' => 'Tasks are not enabled.',
+    'started_task' => 'Successfully started task',
+    'create_client' => 'Create Client',
+
+    'download_desktop_app' => 'Download the desktop app',
+    'download_iphone_app' => 'Download the iPhone app',
+    'download_android_app' => 'Download the Android app',
+    'time_tracker_mobile_help' => 'Double tap a task to select it',
+    'stopped' => 'Stopped',
+    'ascending' => 'Ascending',
+    'descending' => 'Descending',
+    'sort_field' => 'Sort By',
+    'sort_direction' => 'Direction',
+    'discard' => 'Discard',
+    'time_am' => 'AM',
+    'time_pm' => 'PM',
+    'time_mins' => 'mins',
+    'time_hr' => 'hr',
+    'time_hrs' => 'hrs',
+    'clear' => 'Clear',
+    'warn_payment_gateway' => 'Note: to accept online payments :link to add a payment gateway.',
 );
 
 return $LANG;
diff --git a/resources/lang/nb_NO/texts.php b/resources/lang/nb_NO/texts.php
index 5aaf1cfc43d3..e31982af5731 100644
--- a/resources/lang/nb_NO/texts.php
+++ b/resources/lang/nb_NO/texts.php
@@ -60,7 +60,7 @@ $LANG = array(
     'download_pdf' => 'Last ned PDF',
     'pay_now' => 'Betal Nå',
     'save_invoice' => 'Lagre Faktura',
-    'clone_invoice' => 'Kopier Faktura',
+    'clone_invoice' => 'Clone To Invoice',
     'archive_invoice' => 'Arkiver Faktura',
     'delete_invoice' => 'Slett Faktura',
     'email_invoice' => 'E-post Faktura',
@@ -323,7 +323,7 @@ $LANG = array(
     'delete_quote' => 'Slett tilbud',
     'save_quote' => 'Lagre tilbud',
     'email_quote' => 'E-post tilbudet',
-    'clone_quote' => 'Kopier tilbud',
+    'clone_quote' => 'Clone To Quote',
     'convert_to_invoice' => 'Konverter til en faktura',
     'view_invoice' => 'Se faktura',
     'view_client' => 'Vis klient',
@@ -655,7 +655,7 @@ $LANG = array(
     'created_by_invoice' => 'Laget av :invoice',
     'primary_user' => 'Hovedbruker',
     'help' => 'Hjelp',
-    'customize_help' => '<p>We use <a href="http://pdfmake.org/" target="_blank">pdfmake</a> to define the invoice designs declaratively. The pdfmake <a href="http://pdfmake.org/playground.html" target="_blank">playground</a> provide\'s a great way to see the library in action.</p>
+    'customize_help' => '<p>We use <a href="http://pdfmake.org/" target="_blank">pdfmake</a> to define the invoice designs declaratively. The pdfmake <a href="http://pdfmake.org/playground.html" target="_blank">playground</a> provides a great way to see the library in action.</p>
                         <p>You can access a child property using dot notation. For example to show the client name you could use <code>$client.name</code>.</p>
                         <p>If you need help figuring something out post a question to our <a href="https://www.invoiceninja.com/forums/forum/support/" target="_blank">support forum</a> with the design you\'re using.</p>',
     'invoice_due_date' => 'Tidsfrist',
@@ -996,6 +996,7 @@ $LANG = array(
     'enable_https' => 'We strongly recommend using HTTPS to accept credit card details online.',
     'quote_issued_to' => 'Quote issued to',
     'show_currency_code' => 'Currency Code',
+    'free_year_message' => 'Your account has been upgraded to the pro plan for one year at no cost.',
     'trial_message' => 'Your account will receive a free two week trial of our pro plan.',
     'trial_footer' => 'Your free pro plan trial lasts :count more days, :link to upgrade now.',
     'trial_footer_last_day' => 'This is the last day of your free pro plan trial, :link to upgrade now.',
@@ -1412,6 +1413,7 @@ $LANG = array(
     'payment_type_Swish' => 'Swish',
     'payment_type_Alipay' => 'Alipay',
     'payment_type_Sofort' => 'Sofort',
+    'payment_type_SEPA' => 'SEPA Direct Debit',
 
     // Industries
     'industry_Accounting & Legal' => 'Accounting & Legal',
@@ -1724,6 +1726,7 @@ $LANG = array(
     'lang_Turkish - Turkey' => 'Turkish - Turkey',
     'lang_Portuguese - Brazilian' => 'Portuguese - Brazilian',
     'lang_Portuguese - Portugal' => 'Portuguese - Portugal',
+    'lang_Thai' => 'Thai',
 
     // Frequencies
     'freq_weekly' => 'Weekly',
@@ -2391,6 +2394,7 @@ $LANG = array(
     'currency_jordanian_dinar' => 'Jordanian Dinar',
     'currency_myanmar_kyat' => 'Myanmar Kyat',
     'currency_peruvian_sol' => 'Peruvian Sol',
+    'currency_botswana_pula' => 'Botswana Pula',
     'review_app_help' => 'We hope you\'re enjoying using the app.<br/>If you\'d consider <a href="http://www.capterra.com/p/145215/Invoice-Ninja/" target="_blank">writing a review</a> we\'d greatly appreciate it!',
 
     'use_english_version' => 'Make sure to use the English version of the files.<br/>We use the column headers to match the fields.',
@@ -2441,11 +2445,43 @@ $LANG = array(
 
     'alipay' => 'Alipay',
     'sofort' => 'Sofort',
+    'sepa' => 'SEPA Direct Debit',
     'enable_alipay' => 'Accept Alipay',
     'enable_sofort' => 'Accept EU bank transfers',
     'stripe_alipay_help' => 'These gateways also need to be activated in :link.',
     'gocardless_webhook_help_link_text' => 'add this URL as an endpoint in GoCardless',
+    'calendar' => 'Calendar',
+    'pro_plan_calendar' => ':link to enable the calendar by joining the Pro Plan',
 
+    'what_are_you_working_on' => 'What are you working on?',
+    'time_tracker' => 'Time Tracker',
+    'refresh' => 'Refresh',
+    'filter_sort' => 'Filter/Sort',
+    'no_description' => 'No Description',
+    'time_tracker_login' => 'Time Tracker Login',
+    'save_or_discard' => 'Save or discard your changes',
+    'discard_changes' => 'Discard Changes',
+    'tasks_not_enabled' => 'Tasks are not enabled.',
+    'started_task' => 'Successfully started task',
+    'create_client' => 'Create Client',
+
+    'download_desktop_app' => 'Download the desktop app',
+    'download_iphone_app' => 'Download the iPhone app',
+    'download_android_app' => 'Download the Android app',
+    'time_tracker_mobile_help' => 'Double tap a task to select it',
+    'stopped' => 'Stopped',
+    'ascending' => 'Ascending',
+    'descending' => 'Descending',
+    'sort_field' => 'Sort By',
+    'sort_direction' => 'Direction',
+    'discard' => 'Discard',
+    'time_am' => 'AM',
+    'time_pm' => 'PM',
+    'time_mins' => 'mins',
+    'time_hr' => 'hr',
+    'time_hrs' => 'hrs',
+    'clear' => 'Clear',
+    'warn_payment_gateway' => 'Note: to accept online payments :link to add a payment gateway.',
 );
 
 return $LANG;
diff --git a/resources/lang/nl/texts.php b/resources/lang/nl/texts.php
index f0e6b846f3bb..3d2cee260cfa 100644
--- a/resources/lang/nl/texts.php
+++ b/resources/lang/nl/texts.php
@@ -60,7 +60,7 @@ $LANG = array(
     'download_pdf' => 'Download PDF',
     'pay_now' => 'Betaal nu',
     'save_invoice' => 'Factuur opslaan',
-    'clone_invoice' => 'Kopieer factuur',
+    'clone_invoice' => 'Clone To Invoice',
     'archive_invoice' => 'Archiveer factuur',
     'delete_invoice' => 'Verwijder factuur',
     'email_invoice' => 'E-mail factuur',
@@ -317,7 +317,7 @@ $LANG = array(
     'delete_quote' => 'Verwijder offerte',
     'save_quote' => 'Bewaar offerte',
     'email_quote' => 'E-mail offerte',
-    'clone_quote' => 'Kloon offerte',
+    'clone_quote' => 'Clone To Quote',
     'convert_to_invoice' => 'Zet om naar factuur',
     'view_invoice' => 'Bekijk factuur',
     'view_client' => 'Bekijk klant',
@@ -649,9 +649,9 @@ $LANG = array(
     'created_by_invoice' => 'Aangemaakt door :invoice',
     'primary_user' => 'Primaire gebruiker',
     'help' => 'Help',
-    'customize_help' => '<p>We gebruiken <a href="http://pdfmake.org/" target="_blank">pdfmake</a> om de factuurontwerpen te definieren. De pdfmake <a href="http://pdfmake.org/playground.html" target="_blank">playground</a> is een interessante manier om de bibliotheek in actie te zien.</p>
-<p>Gebruik puntnotatie om een "dochter eigenschap" te gebruiken. Bijvoorbeeld: om de naam van een klant te tonen gebruik je <code>$client.name</code>.</p>
-<p>Als je ergens hulp bij nodig hebt, stel dan een vraag op ons <a href="https://www.invoiceninja.com/forums/forum/support/" target="_blank">support forum</a>.</p>',
+    'customize_help' => '<p>We use <a href="http://pdfmake.org/" target="_blank">pdfmake</a> to define the invoice designs declaratively. The pdfmake <a href="http://pdfmake.org/playground.html" target="_blank">playground</a> provides a great way to see the library in action.</p>
+                        <p>You can access a child property using dot notation. For example to show the client name you could use <code>$client.name</code>.</p>
+                        <p>If you need help figuring something out post a question to our <a href="https://www.invoiceninja.com/forums/forum/support/" target="_blank">support forum</a> with the design you\'re using.</p>',
     'invoice_due_date' => 'Vervaldatum',
     'quote_due_date' => 'Geldig tot',
     'valid_until' => 'Geldig tot',
@@ -987,6 +987,7 @@ $LANG = array(
     'enable_https' => 'We raden u dringend aan om HTTPS te gebruiken om creditcard informatie digitaal te accepteren.',
     'quote_issued_to' => 'Offerte uitgeschreven voor',
     'show_currency_code' => 'Valutacode',
+    'free_year_message' => 'Your account has been upgraded to the pro plan for one year at no cost.',
     'trial_message' => 'Uw account zal een gratis twee weken durende probeerversie van ons pro plan krijgen.',
     'trial_footer' => 'Uw gratis probeerversie duurt nog :count dagen, :link om direct te upgraden.',
     'trial_footer_last_day' => 'Dit is de laatste dag van uw gratis probeerversie, :link om direct te upgraden.',
@@ -1007,7 +1008,7 @@ $LANG = array(
     'pro_plan_remove_logo' => ':link om het InvoiceNinja logo te verwijderen door het pro plan te nemen',
     'pro_plan_remove_logo_link' => 'Klik hier',
     'invitation_status_sent' => 'sent',
-    'invitation_status_opened' => 'Geopend',
+    'invitation_status_opened' => 'Opened',
     'invitation_status_viewed' => 'Bekenen',
     'email_error_inactive_client' => 'E-mails kunnen niet worden verstuurd naar inactieve klanten',
     'email_error_inactive_contact' => 'E-mails kunnen niet worden verstuurd naar inactieve contactpersonen',
@@ -1403,6 +1404,7 @@ Kom terug naar deze betalingsmethode pagina zodra u de bedragen heeft ontvangen
     'payment_type_Swish' => 'Swish',
     'payment_type_Alipay' => 'Alipay',
     'payment_type_Sofort' => 'Sofort',
+    'payment_type_SEPA' => 'SEPA Direct Debit',
 
     // Industries
     'industry_Accounting & Legal' => 'Boekhouding & juridisch',
@@ -1716,6 +1718,7 @@ Kom terug naar deze betalingsmethode pagina zodra u de bedragen heeft ontvangen
     'lang_Turkish - Turkey' => 'Turks - Turkije',
     'lang_Portuguese - Brazilian' => 'Portugees - Braziliaans',
     'lang_Portuguese - Portugal' => 'Portugees - Portugal',
+    'lang_Thai' => 'Thai',
 
     // Frequencies
     'freq_weekly' => 'Wekelijks',
@@ -2383,6 +2386,7 @@ Kom terug naar deze betalingsmethode pagina zodra u de bedragen heeft ontvangen
     'currency_jordanian_dinar' => 'Jordaanse Dinar',
     'currency_myanmar_kyat' => 'Myanmar Kyat',
     'currency_peruvian_sol' => 'Peruaanse Sol',
+    'currency_botswana_pula' => 'Botswana Pula',
     'review_app_help' => 'We hope you\'re enjoying using the app.<br/>If you\'d consider <a href="http://www.capterra.com/p/145215/Invoice-Ninja/" target="_blank">writing a review</a> we\'d greatly appreciate it!',
 
     'use_english_version' => 'Zorg ervoor dat u de Engelse versie van de bestanden gebruikt.<br/>We gebruiken de kolomkoppen om de velden aan te passen.',
@@ -2433,11 +2437,43 @@ Kom terug naar deze betalingsmethode pagina zodra u de bedragen heeft ontvangen
 
     'alipay' => 'Alipay',
     'sofort' => 'Sofort',
+    'sepa' => 'SEPA Direct Debit',
     'enable_alipay' => 'Accept Alipay',
     'enable_sofort' => 'Accept EU bank transfers',
     'stripe_alipay_help' => 'These gateways also need to be activated in :link.',
     'gocardless_webhook_help_link_text' => 'add this URL as an endpoint in GoCardless',
+    'calendar' => 'Calendar',
+    'pro_plan_calendar' => ':link to enable the calendar by joining the Pro Plan',
 
+    'what_are_you_working_on' => 'What are you working on?',
+    'time_tracker' => 'Time Tracker',
+    'refresh' => 'Refresh',
+    'filter_sort' => 'Filter/Sort',
+    'no_description' => 'No Description',
+    'time_tracker_login' => 'Time Tracker Login',
+    'save_or_discard' => 'Save or discard your changes',
+    'discard_changes' => 'Discard Changes',
+    'tasks_not_enabled' => 'Tasks are not enabled.',
+    'started_task' => 'Successfully started task',
+    'create_client' => 'Create Client',
+
+    'download_desktop_app' => 'Download the desktop app',
+    'download_iphone_app' => 'Download the iPhone app',
+    'download_android_app' => 'Download the Android app',
+    'time_tracker_mobile_help' => 'Double tap a task to select it',
+    'stopped' => 'Stopped',
+    'ascending' => 'Ascending',
+    'descending' => 'Descending',
+    'sort_field' => 'Sort By',
+    'sort_direction' => 'Direction',
+    'discard' => 'Discard',
+    'time_am' => 'AM',
+    'time_pm' => 'PM',
+    'time_mins' => 'mins',
+    'time_hr' => 'hr',
+    'time_hrs' => 'hrs',
+    'clear' => 'Clear',
+    'warn_payment_gateway' => 'Note: to accept online payments :link to add a payment gateway.',
 );
 
 return $LANG;
diff --git a/resources/lang/pl/texts.php b/resources/lang/pl/texts.php
index 4dc36d8cec80..647078f9c3ac 100644
--- a/resources/lang/pl/texts.php
+++ b/resources/lang/pl/texts.php
@@ -60,7 +60,7 @@ $LANG = array(
     'download_pdf' => 'Pobierz PDF',
     'pay_now' => 'Zapłać teraz',
     'save_invoice' => 'Zapisz fakturę',
-    'clone_invoice' => 'Skopiuj fakturę',
+    'clone_invoice' => 'Clone To Invoice',
     'archive_invoice' => 'Zarchiwizuj fakturę',
     'delete_invoice' => 'Usuń fakturę',
     'email_invoice' => 'Wyślij fakturę',
@@ -323,7 +323,7 @@ $LANG = array(
     'delete_quote' => 'Usuń ofertę',
     'save_quote' => 'Zapisz ofertę',
     'email_quote' => 'Wyślij ofertę',
-    'clone_quote' => 'Skopiuj ofertę',
+    'clone_quote' => 'Clone To Quote',
     'convert_to_invoice' => 'Konwertuj do faktury',
     'view_invoice' => 'Zobacz fakturę',
     'view_client' => 'Zobacz klienta',
@@ -655,7 +655,7 @@ $LANG = array(
     'created_by_invoice' => 'Utworzona przez :invoice',
     'primary_user' => 'Główny użytkownik',
     'help' => 'Pomoc',
-    'customize_help' => '<p>We use <a href="http://pdfmake.org/" target="_blank">pdfmake</a> to define the invoice designs declaratively. The pdfmake <a href="http://pdfmake.org/playground.html" target="_blank">playground</a> provide\'s a great way to see the library in action.</p>
+    'customize_help' => '<p>We use <a href="http://pdfmake.org/" target="_blank">pdfmake</a> to define the invoice designs declaratively. The pdfmake <a href="http://pdfmake.org/playground.html" target="_blank">playground</a> provides a great way to see the library in action.</p>
                         <p>You can access a child property using dot notation. For example to show the client name you could use <code>$client.name</code>.</p>
                         <p>If you need help figuring something out post a question to our <a href="https://www.invoiceninja.com/forums/forum/support/" target="_blank">support forum</a> with the design you\'re using.</p>',
     'invoice_due_date' => 'Termin Płatności',
@@ -996,6 +996,7 @@ $LANG = array(
     'enable_https' => 'Zalecamy korzystanie z protokołu HTTPS do przetwarzania online danych kart kredytowych.',
     'quote_issued_to' => 'Oferta wydana do',
     'show_currency_code' => 'Kod waluty',
+    'free_year_message' => 'Your account has been upgraded to the pro plan for one year at no cost.',
     'trial_message' => 'Twoje konto otrzyma bezpłatny dwutygodniowy okres próbny naszego pro planu.',
     'trial_footer' => 'Your free pro plan trial lasts :count more days, :link to upgrade now.',
     'trial_footer_last_day' => 'This is the last day of your free pro plan trial, :link to upgrade now.',
@@ -1016,7 +1017,7 @@ $LANG = array(
     'pro_plan_remove_logo' => ':link to remove the Invoice Ninja logo by joining the Pro Plan',
     'pro_plan_remove_logo_link' => 'Kliknij tutaj',
     'invitation_status_sent' => 'sent',
-    'invitation_status_opened' => 'Otwarto',
+    'invitation_status_opened' => 'Opened',
     'invitation_status_viewed' => 'Wyświetlono',
     'email_error_inactive_client' => 'E-maile nie mogą być wysyłane do klientów nieaktywnych',
     'email_error_inactive_contact' => 'E-mail nie może zostać wysłany do nieaktywnych kontaktów',
@@ -1412,6 +1413,7 @@ Gdy przelewy zostaną zaksięgowane na Twoim koncie, wróć do tej strony i klik
     'payment_type_Swish' => 'Swish',
     'payment_type_Alipay' => 'Alipay',
     'payment_type_Sofort' => 'Sofort',
+    'payment_type_SEPA' => 'SEPA Direct Debit',
 
     // Industries
     'industry_Accounting & Legal' => 'Księgowość i prawo',
@@ -1724,6 +1726,7 @@ Gdy przelewy zostaną zaksięgowane na Twoim koncie, wróć do tej strony i klik
     'lang_Turkish - Turkey' => 'Turkish - Turkey',
     'lang_Portuguese - Brazilian' => 'Portuguese - Brazilian',
     'lang_Portuguese - Portugal' => 'Portuguese - Portugal',
+    'lang_Thai' => 'Thai',
 
     // Frequencies
     'freq_weekly' => 'Co tydzień',
@@ -2391,6 +2394,7 @@ Gdy przelewy zostaną zaksięgowane na Twoim koncie, wróć do tej strony i klik
     'currency_jordanian_dinar' => 'Jordanian Dinar',
     'currency_myanmar_kyat' => 'Myanmar Kyat',
     'currency_peruvian_sol' => 'Peruvian Sol',
+    'currency_botswana_pula' => 'Botswana Pula',
     'review_app_help' => 'We hope you\'re enjoying using the app.<br/>If you\'d consider <a href="http://www.capterra.com/p/145215/Invoice-Ninja/" target="_blank">writing a review</a> we\'d greatly appreciate it!',
 
     'use_english_version' => 'Make sure to use the English version of the files.<br/>We use the column headers to match the fields.',
@@ -2441,11 +2445,43 @@ Gdy przelewy zostaną zaksięgowane na Twoim koncie, wróć do tej strony i klik
 
     'alipay' => 'Alipay',
     'sofort' => 'Sofort',
+    'sepa' => 'SEPA Direct Debit',
     'enable_alipay' => 'Accept Alipay',
     'enable_sofort' => 'Accept EU bank transfers',
     'stripe_alipay_help' => 'These gateways also need to be activated in :link.',
     'gocardless_webhook_help_link_text' => 'add this URL as an endpoint in GoCardless',
+    'calendar' => 'Calendar',
+    'pro_plan_calendar' => ':link to enable the calendar by joining the Pro Plan',
 
+    'what_are_you_working_on' => 'What are you working on?',
+    'time_tracker' => 'Time Tracker',
+    'refresh' => 'Refresh',
+    'filter_sort' => 'Filter/Sort',
+    'no_description' => 'No Description',
+    'time_tracker_login' => 'Time Tracker Login',
+    'save_or_discard' => 'Save or discard your changes',
+    'discard_changes' => 'Discard Changes',
+    'tasks_not_enabled' => 'Tasks are not enabled.',
+    'started_task' => 'Successfully started task',
+    'create_client' => 'Create Client',
+
+    'download_desktop_app' => 'Download the desktop app',
+    'download_iphone_app' => 'Download the iPhone app',
+    'download_android_app' => 'Download the Android app',
+    'time_tracker_mobile_help' => 'Double tap a task to select it',
+    'stopped' => 'Stopped',
+    'ascending' => 'Ascending',
+    'descending' => 'Descending',
+    'sort_field' => 'Sort By',
+    'sort_direction' => 'Direction',
+    'discard' => 'Discard',
+    'time_am' => 'AM',
+    'time_pm' => 'PM',
+    'time_mins' => 'mins',
+    'time_hr' => 'hr',
+    'time_hrs' => 'hrs',
+    'clear' => 'Clear',
+    'warn_payment_gateway' => 'Note: to accept online payments :link to add a payment gateway.',
 );
 
 return $LANG;
diff --git a/resources/lang/pt_BR/texts.php b/resources/lang/pt_BR/texts.php
index c26c4627cc8e..66495bffc053 100644
--- a/resources/lang/pt_BR/texts.php
+++ b/resources/lang/pt_BR/texts.php
@@ -2,9 +2,9 @@
 
 $LANG = array(
 
-    'organization' => 'Organização',
+    'organization' => 'Empresa',
     'name' => 'Nome',
-    'website' => 'Website',
+    'website' => 'Site',
     'work_phone' => 'Telefone',
     'address' => 'Endereço',
     'address1' => 'Rua',
@@ -14,12 +14,12 @@ $LANG = array(
     'postal_code' => 'CEP',
     'country_id' => 'País',
     'contacts' => 'Contatos',
-    'first_name' => 'Primeiro Nome',
-    'last_name' => 'Último Nome',
+    'first_name' => 'Nome',
+    'last_name' => 'Sobrenome',
     'phone' => 'Telefone',
     'email' => 'E-mail',
     'additional_info' => 'Informações Adicionais',
-    'payment_terms' => 'Condições de Pagamento',
+    'payment_terms' => 'Forma de Pagamento',
     'currency_id' => 'Moeda',
     'size_id' => 'Tamanho',
     'industry_id' => 'Empresa',
@@ -29,20 +29,20 @@ $LANG = array(
     'invoice_date' => 'Data da Fatura',
     'due_date' => 'Data de Vencimento',
     'invoice_number' => 'Número da Fatura',
-    'invoice_number_short' => 'Fatura #',
-    'po_number' => 'Núm. Ordem de Serviço',
-    'po_number_short' => 'OS #',
+    'invoice_number_short' => 'Nº da Fatura',
+    'po_number' => 'Caixa Postal',
+    'po_number_short' => 'Caixa Postal',
     'frequency_id' => 'Frequência',
     'discount' => 'Desconto',
     'taxes' => 'Taxas',
     'tax' => 'Taxa',
     'item' => 'Item',
     'description' => 'Descrição',
-    'unit_cost' => 'Custo Unitário',
+    'unit_cost' => 'Preço Unitário',
     'quantity' => 'Quantidade',
     'line_total' => 'Total',
     'subtotal' => 'Subtotal',
-    'paid_to_date' => 'Pagamento até a data',
+    'paid_to_date' => 'Pagamentos até o momento',
     'balance_due' => 'Valor',
     'invoice_design_id' => 'Modelo',
     'terms' => 'Condições',
@@ -60,7 +60,7 @@ $LANG = array(
     'download_pdf' => 'Baixar PDF',
     'pay_now' => 'Pagar agora',
     'save_invoice' => 'Salvar Fatura',
-    'clone_invoice' => 'Clonar Fatura',
+    'clone_invoice' => 'Clone To Invoice',
     'archive_invoice' => 'Arquivar Fatura',
     'delete_invoice' => 'Apagar Fatura',
     'email_invoice' => 'Enviar Fatura',
@@ -238,7 +238,7 @@ $LANG = array(
     'confirmation_subject' => 'Confirmação de Conta do Invoice Ninja',
     'confirmation_header' => 'Confirmação de Conta',
     'confirmation_message' => 'Favor acessar o link abaixo para confirmar a sua conta.',
-    'invoice_subject' => 'New invoice :number from :account',
+    'invoice_subject' => 'Nova fatura :numer de :account',
     'invoice_message' => 'Para visualizar a sua fatura de :amount, clique no link abaixo.',
     'payment_subject' => 'Recebimento de pagamento de',
     'payment_message' => 'Obrigado, pagamento de :amount confirmado',
@@ -317,7 +317,7 @@ $LANG = array(
     'delete_quote' => 'Deletar Orçamento',
     'save_quote' => 'Salvar Oçamento',
     'email_quote' => 'Enviar Orçamento',
-    'clone_quote' => 'Clonar Orçamento',
+    'clone_quote' => 'Clone To Quote',
     'convert_to_invoice' => 'Faturar Orçamento',
     'view_invoice' => 'Visualizar fatura',
     'view_client' => 'Visualizar Cliente',
@@ -331,7 +331,7 @@ $LANG = array(
     'deleted_quote' => 'Orçamento deletado',
     'deleted_quotes' => ':count Orçamento(s) deletado(s)',
     'converted_to_invoice' => 'Orçamento faturado',
-    'quote_subject' => 'New quote :number from :account',
+    'quote_subject' => 'Novo orçamento :number de :account',
     'quote_message' => 'Para visualizar o oçamento de :amount, clique no link abaixo.',
     'quote_link_message' => 'Para visualizar o orçamento clique no link abaixo',
     'notification_quote_sent_subject' => 'Orçamento :invoice enviado para :client',
@@ -649,7 +649,7 @@ $LANG = array(
     'created_by_invoice' => 'Criada a partir da Fatura :invoice',
     'primary_user' => 'Usuário Principal',
     'help' => 'Ajuda',
-    'customize_help' => '<p>Utilizamos<a href="http://pdfmake.org/" target="_blank">pdfmake</a> configuração visual das faturas. O pdfmake <a href="http://pdfmake.org/playground.html" target="_blank">playground</a> permite visualizar e testar as configurações .</p>
+    'customize_help' => '<p>We use <a href="http://pdfmake.org/" target="_blank">pdfmake</a> to define the invoice designs declaratively. The pdfmake <a href="http://pdfmake.org/playground.html" target="_blank">playground</a> provides a great way to see the library in action.</p>
                         <p>You can access a child property using dot notation. For example to show the client name you could use <code>$client.name</code>.</p>
                         <p>If you need help figuring something out post a question to our <a href="https://www.invoiceninja.com/forums/forum/support/" target="_blank">support forum</a> with the design you\'re using.</p>',
     'invoice_due_date' => 'Data de vencimento',
@@ -987,6 +987,7 @@ $LANG = array(
     'enable_https' => 'Recomendamos a utilização de HTTPS para receber os detalhes do cartão de crédito online.',
     'quote_issued_to' => 'Orçamento emitido para',
     'show_currency_code' => 'Código da Moeda',
+    'free_year_message' => 'Your account has been upgraded to the pro plan for one year at no cost.',
     'trial_message' => 'Sua conta receberá duas semanas receberá duas semanas gratuitamente para testar nosso plano pro.',
     'trial_footer' => 'Your free pro plan trial lasts :count more days, :link to upgrade now.',
     'trial_footer_last_day' => 'This is the last day of your free pro plan trial, :link to upgrade now.',
@@ -1007,7 +1008,7 @@ $LANG = array(
     'pro_plan_remove_logo' => ':link para remover a logo do Invoice Ninja contratando o plano profissional',
     'pro_plan_remove_logo_link' => 'Clique aqui',
     'invitation_status_sent' => 'enviado',
-    'invitation_status_opened' => 'Aberto',
+    'invitation_status_opened' => 'Opened',
     'invitation_status_viewed' => 'Visto',
     'email_error_inactive_client' => 'Não é possível enviar e-mails para clientes intativos',
     'email_error_inactive_contact' => 'Não é possível enviar e-mails para contatos intativos',
@@ -1403,6 +1404,7 @@ Quando tiver os valores dos depósitos, volte a esta pagina e complete a verific
     'payment_type_Swish' => 'Swish',
     'payment_type_Alipay' => 'Alipay',
     'payment_type_Sofort' => 'Sofort',
+    'payment_type_SEPA' => 'SEPA Direct Debit',
 
     // Industries
     'industry_Accounting & Legal' => 'Accounting & Legal',
@@ -1715,6 +1717,7 @@ Quando tiver os valores dos depósitos, volte a esta pagina e complete a verific
     'lang_Turkish - Turkey' => 'Turkish - Turkey',
     'lang_Portuguese - Brazilian' => 'Portuguese - Brazilian',
     'lang_Portuguese - Portugal' => 'Portuguese - Portugal',
+    'lang_Thai' => 'Thai',
 
     // Frequencies
     'freq_weekly' => 'Weekly',
@@ -2382,6 +2385,7 @@ Quando tiver os valores dos depósitos, volte a esta pagina e complete a verific
     'currency_jordanian_dinar' => 'Jordanian Dinar',
     'currency_myanmar_kyat' => 'Myanmar Kyat',
     'currency_peruvian_sol' => 'Peruvian Sol',
+    'currency_botswana_pula' => 'Botswana Pula',
     'review_app_help' => 'We hope you\'re enjoying using the app.<br/>If you\'d consider <a href="http://www.capterra.com/p/145215/Invoice-Ninja/" target="_blank">writing a review</a> we\'d greatly appreciate it!',
 
     'use_english_version' => 'Make sure to use the English version of the files.<br/>We use the column headers to match the fields.',
@@ -2432,11 +2436,43 @@ Quando tiver os valores dos depósitos, volte a esta pagina e complete a verific
 
     'alipay' => 'Alipay',
     'sofort' => 'Sofort',
+    'sepa' => 'SEPA Direct Debit',
     'enable_alipay' => 'Accept Alipay',
     'enable_sofort' => 'Accept EU bank transfers',
     'stripe_alipay_help' => 'These gateways also need to be activated in :link.',
     'gocardless_webhook_help_link_text' => 'add this URL as an endpoint in GoCardless',
+    'calendar' => 'Calendar',
+    'pro_plan_calendar' => ':link to enable the calendar by joining the Pro Plan',
 
+    'what_are_you_working_on' => 'What are you working on?',
+    'time_tracker' => 'Time Tracker',
+    'refresh' => 'Refresh',
+    'filter_sort' => 'Filter/Sort',
+    'no_description' => 'No Description',
+    'time_tracker_login' => 'Time Tracker Login',
+    'save_or_discard' => 'Save or discard your changes',
+    'discard_changes' => 'Discard Changes',
+    'tasks_not_enabled' => 'Tasks are not enabled.',
+    'started_task' => 'Successfully started task',
+    'create_client' => 'Create Client',
+
+    'download_desktop_app' => 'Download the desktop app',
+    'download_iphone_app' => 'Download the iPhone app',
+    'download_android_app' => 'Download the Android app',
+    'time_tracker_mobile_help' => 'Double tap a task to select it',
+    'stopped' => 'Stopped',
+    'ascending' => 'Ascending',
+    'descending' => 'Descending',
+    'sort_field' => 'Sort By',
+    'sort_direction' => 'Direction',
+    'discard' => 'Discard',
+    'time_am' => 'AM',
+    'time_pm' => 'PM',
+    'time_mins' => 'mins',
+    'time_hr' => 'hr',
+    'time_hrs' => 'hrs',
+    'clear' => 'Clear',
+    'warn_payment_gateway' => 'Note: to accept online payments :link to add a payment gateway.',
 );
 
 return $LANG;
diff --git a/resources/lang/pt_PT/texts.php b/resources/lang/pt_PT/texts.php
index a9821ae4869b..bfd50a96d6e9 100644
--- a/resources/lang/pt_PT/texts.php
+++ b/resources/lang/pt_PT/texts.php
@@ -60,7 +60,7 @@ $LANG = array(
     'download_pdf' => 'Download PDF',
     'pay_now' => 'Pagar agora',
     'save_invoice' => 'Guardar Nota Pag.',
-    'clone_invoice' => 'Clonar Nota Pag.',
+    'clone_invoice' => 'Clone To Invoice',
     'archive_invoice' => 'Arquivar Nota Pag.',
     'delete_invoice' => 'Apagar Nota Pag.',
     'email_invoice' => 'Enviar Nota Pag.',
@@ -317,7 +317,7 @@ $LANG = array(
     'delete_quote' => 'Apagar Orçamento',
     'save_quote' => 'Guardar Oçamento',
     'email_quote' => 'Enviar Orçamento',
-    'clone_quote' => 'Clonar Orçamento',
+    'clone_quote' => 'Clone To Quote',
     'convert_to_invoice' => 'Converter em Nota de Pag.',
     'view_invoice' => 'Visualizar nota de pag.',
     'view_client' => 'Visualizar Cliente',
@@ -649,7 +649,7 @@ $LANG = array(
     'created_by_invoice' => 'Criada a partir da Nota de Pagamento :invoice',
     'primary_user' => 'Utilizador Principal',
     'help' => 'Ajuda',
-    'customize_help' => '<p>Utilizamos<a href="http://pdfmake.org/" target="_blank">pdfmake</a> configuração visual das nota de pagamentos. O pdfmake <a href="http://pdfmake.org/playground.html" target="_blank">playground</a> permite visualizar e testar as configurações .</p>
+    'customize_help' => '<p>We use <a href="http://pdfmake.org/" target="_blank">pdfmake</a> to define the invoice designs declaratively. The pdfmake <a href="http://pdfmake.org/playground.html" target="_blank">playground</a> provides a great way to see the library in action.</p>
                         <p>You can access a child property using dot notation. For example to show the client name you could use <code>$client.name</code>.</p>
                         <p>If you need help figuring something out post a question to our <a href="https://www.invoiceninja.com/forums/forum/support/" target="_blank">support forum</a> with the design you\'re using.</p>',
     'invoice_due_date' => 'Data de vencimento',
@@ -987,6 +987,7 @@ $LANG = array(
     'enable_https' => 'Recomendamos a utilização de HTTPS para receber os detalhes do cartão de crédito online.',
     'quote_issued_to' => 'Orçamento emitido para',
     'show_currency_code' => 'Código da Moeda',
+    'free_year_message' => 'Your account has been upgraded to the pro plan for one year at no cost.',
     'trial_message' => 'A sua conta receberá gratuitamente duas semanas para testar nosso plano pro.',
     'trial_footer' => 'Your free pro plan trial lasts :count more days, :link to upgrade now.',
     'trial_footer_last_day' => 'This is the last day of your free pro plan trial, :link to upgrade now.',
@@ -1007,7 +1008,7 @@ $LANG = array(
     'pro_plan_remove_logo' => ':link para remover a logo do Invoice Ninja contratando o plano profissional',
     'pro_plan_remove_logo_link' => 'Clique aqui',
     'invitation_status_sent' => 'sent',
-    'invitation_status_opened' => 'Aberto',
+    'invitation_status_opened' => 'Opened',
     'invitation_status_viewed' => 'Visto',
     'email_error_inactive_client' => 'Não é possível enviar e-mails para clientes inativos',
     'email_error_inactive_contact' => 'Não é possível enviar e-mails para contatos inativos',
@@ -1403,6 +1404,7 @@ Quando tiver os valores dos depósitos, volte a esta página e conclua a verific
     'payment_type_Swish' => 'Swish',
     'payment_type_Alipay' => 'Alipay',
     'payment_type_Sofort' => 'Sofort',
+    'payment_type_SEPA' => 'SEPA Direct Debit',
 
     // Industries
     'industry_Accounting & Legal' => 'Contabilidade & Legislação',
@@ -1715,6 +1717,7 @@ Quando tiver os valores dos depósitos, volte a esta página e conclua a verific
     'lang_Turkish - Turkey' => 'Turkish - Turkey',
     'lang_Portuguese - Brazilian' => 'Portuguese - Brazilian',
     'lang_Portuguese - Portugal' => 'Portuguese - Portugal',
+    'lang_Thai' => 'Thai',
 
     // Frequencies
     'freq_weekly' => 'Semanal',
@@ -2383,6 +2386,7 @@ Quando tiver os valores dos depósitos, volte a esta página e conclua a verific
     'currency_jordanian_dinar' => 'Jordanian Dinar',
     'currency_myanmar_kyat' => 'Myanmar Kyat',
     'currency_peruvian_sol' => 'Peruvian Sol',
+    'currency_botswana_pula' => 'Botswana Pula',
     'review_app_help' => 'We hope you\'re enjoying using the app.<br/>If you\'d consider <a href="http://www.capterra.com/p/145215/Invoice-Ninja/" target="_blank">writing a review</a> we\'d greatly appreciate it!',
 
     'use_english_version' => 'Make sure to use the English version of the files.<br/>We use the column headers to match the fields.',
@@ -2433,11 +2437,43 @@ Quando tiver os valores dos depósitos, volte a esta página e conclua a verific
 
     'alipay' => 'Alipay',
     'sofort' => 'Sofort',
+    'sepa' => 'SEPA Direct Debit',
     'enable_alipay' => 'Accept Alipay',
     'enable_sofort' => 'Accept EU bank transfers',
     'stripe_alipay_help' => 'These gateways also need to be activated in :link.',
     'gocardless_webhook_help_link_text' => 'add this URL as an endpoint in GoCardless',
+    'calendar' => 'Calendar',
+    'pro_plan_calendar' => ':link to enable the calendar by joining the Pro Plan',
 
+    'what_are_you_working_on' => 'What are you working on?',
+    'time_tracker' => 'Time Tracker',
+    'refresh' => 'Refresh',
+    'filter_sort' => 'Filter/Sort',
+    'no_description' => 'No Description',
+    'time_tracker_login' => 'Time Tracker Login',
+    'save_or_discard' => 'Save or discard your changes',
+    'discard_changes' => 'Discard Changes',
+    'tasks_not_enabled' => 'Tasks are not enabled.',
+    'started_task' => 'Successfully started task',
+    'create_client' => 'Create Client',
+
+    'download_desktop_app' => 'Download the desktop app',
+    'download_iphone_app' => 'Download the iPhone app',
+    'download_android_app' => 'Download the Android app',
+    'time_tracker_mobile_help' => 'Double tap a task to select it',
+    'stopped' => 'Stopped',
+    'ascending' => 'Ascending',
+    'descending' => 'Descending',
+    'sort_field' => 'Sort By',
+    'sort_direction' => 'Direction',
+    'discard' => 'Discard',
+    'time_am' => 'AM',
+    'time_pm' => 'PM',
+    'time_mins' => 'mins',
+    'time_hr' => 'hr',
+    'time_hrs' => 'hrs',
+    'clear' => 'Clear',
+    'warn_payment_gateway' => 'Note: to accept online payments :link to add a payment gateway.',
 );
 
 return $LANG;
diff --git a/resources/lang/ro/texts.php b/resources/lang/ro/texts.php
index d5822cc573d3..2b7f0f2dc152 100644
--- a/resources/lang/ro/texts.php
+++ b/resources/lang/ro/texts.php
@@ -60,7 +60,7 @@ $LANG = array(
     'download_pdf' => 'Descarca PDF',
     'pay_now' => 'Plateste acum',
     'save_invoice' => 'Salveaza factura',
-    'clone_invoice' => 'Dubleaza factura',
+    'clone_invoice' => 'Clone To Invoice',
     'archive_invoice' => 'Arhiveaza factura',
     'delete_invoice' => 'Sterge factura',
     'email_invoice' => 'Trimite email',
@@ -323,7 +323,7 @@ $LANG = array(
     'delete_quote' => 'Sterge Proforma',
     'save_quote' => 'Salveaza Proforma',
     'email_quote' => 'Trimite Proforma',
-    'clone_quote' => 'Multiplică Ofertă',
+    'clone_quote' => 'Clone To Quote',
     'convert_to_invoice' => 'Transformă în Factură',
     'view_invoice' => 'Vizualizare Factură',
     'view_client' => 'Vizualizare Client',
@@ -657,7 +657,7 @@ Atentie: Folosește Legacy API Key, nu Token API',
     'created_by_invoice' => 'Created by :invoice',
     'primary_user' => 'Primary User',
     'help' => 'Help',
-    'customize_help' => '<p>We use <a href="http://pdfmake.org/" target="_blank">pdfmake</a> to define the invoice designs declaratively. The pdfmake <a href="http://pdfmake.org/playground.html" target="_blank">playground</a> provide\'s a great way to see the library in action.</p>
+    'customize_help' => '<p>We use <a href="http://pdfmake.org/" target="_blank">pdfmake</a> to define the invoice designs declaratively. The pdfmake <a href="http://pdfmake.org/playground.html" target="_blank">playground</a> provides a great way to see the library in action.</p>
                         <p>You can access a child property using dot notation. For example to show the client name you could use <code>$client.name</code>.</p>
                         <p>If you need help figuring something out post a question to our <a href="https://www.invoiceninja.com/forums/forum/support/" target="_blank">support forum</a> with the design you\'re using.</p>',
     'invoice_due_date' => 'Due Date',
@@ -998,6 +998,7 @@ Atentie: Folosește Legacy API Key, nu Token API',
     'enable_https' => 'We strongly recommend using HTTPS to accept credit card details online.',
     'quote_issued_to' => 'Quote issued to',
     'show_currency_code' => 'Currency Code',
+    'free_year_message' => 'Your account has been upgraded to the pro plan for one year at no cost.',
     'trial_message' => 'Your account will receive a free two week trial of our pro plan.',
     'trial_footer' => 'Your free pro plan trial lasts :count more days, :link to upgrade now.',
     'trial_footer_last_day' => 'This is the last day of your free pro plan trial, :link to upgrade now.',
@@ -1414,6 +1415,7 @@ Atentie: Folosește Legacy API Key, nu Token API',
     'payment_type_Swish' => 'Swish',
     'payment_type_Alipay' => 'Alipay',
     'payment_type_Sofort' => 'Sofort',
+    'payment_type_SEPA' => 'SEPA Direct Debit',
 
     // Industries
     'industry_Accounting & Legal' => 'Accounting & Legal',
@@ -1726,6 +1728,7 @@ Atentie: Folosește Legacy API Key, nu Token API',
     'lang_Turkish - Turkey' => 'Turkish - Turkey',
     'lang_Portuguese - Brazilian' => 'Portuguese - Brazilian',
     'lang_Portuguese - Portugal' => 'Portuguese - Portugal',
+    'lang_Thai' => 'Thai',
 
     // Frequencies
     'freq_weekly' => 'Săptămânal',
@@ -2393,6 +2396,7 @@ Atentie: Folosește Legacy API Key, nu Token API',
     'currency_jordanian_dinar' => 'Jordanian Dinar',
     'currency_myanmar_kyat' => 'Myanmar Kyat',
     'currency_peruvian_sol' => 'Peruvian Sol',
+    'currency_botswana_pula' => 'Botswana Pula',
     'review_app_help' => 'We hope you\'re enjoying using the app.<br/>If you\'d consider <a href="http://www.capterra.com/p/145215/Invoice-Ninja/" target="_blank">writing a review</a> we\'d greatly appreciate it!',
 
     'use_english_version' => 'Make sure to use the English version of the files.<br/>We use the column headers to match the fields.',
@@ -2443,11 +2447,43 @@ Atentie: Folosește Legacy API Key, nu Token API',
 
     'alipay' => 'Alipay',
     'sofort' => 'Sofort',
+    'sepa' => 'SEPA Direct Debit',
     'enable_alipay' => 'Accept Alipay',
     'enable_sofort' => 'Accept EU bank transfers',
     'stripe_alipay_help' => 'These gateways also need to be activated in :link.',
     'gocardless_webhook_help_link_text' => 'add this URL as an endpoint in GoCardless',
+    'calendar' => 'Calendar',
+    'pro_plan_calendar' => ':link to enable the calendar by joining the Pro Plan',
 
+    'what_are_you_working_on' => 'What are you working on?',
+    'time_tracker' => 'Time Tracker',
+    'refresh' => 'Refresh',
+    'filter_sort' => 'Filter/Sort',
+    'no_description' => 'No Description',
+    'time_tracker_login' => 'Time Tracker Login',
+    'save_or_discard' => 'Save or discard your changes',
+    'discard_changes' => 'Discard Changes',
+    'tasks_not_enabled' => 'Tasks are not enabled.',
+    'started_task' => 'Successfully started task',
+    'create_client' => 'Create Client',
+
+    'download_desktop_app' => 'Download the desktop app',
+    'download_iphone_app' => 'Download the iPhone app',
+    'download_android_app' => 'Download the Android app',
+    'time_tracker_mobile_help' => 'Double tap a task to select it',
+    'stopped' => 'Stopped',
+    'ascending' => 'Ascending',
+    'descending' => 'Descending',
+    'sort_field' => 'Sort By',
+    'sort_direction' => 'Direction',
+    'discard' => 'Discard',
+    'time_am' => 'AM',
+    'time_pm' => 'PM',
+    'time_mins' => 'mins',
+    'time_hr' => 'hr',
+    'time_hrs' => 'hrs',
+    'clear' => 'Clear',
+    'warn_payment_gateway' => 'Note: to accept online payments :link to add a payment gateway.',
 );
 
 return $LANG;
diff --git a/resources/lang/sl/texts.php b/resources/lang/sl/texts.php
index 084c2900fb70..37f914aaa3b7 100644
--- a/resources/lang/sl/texts.php
+++ b/resources/lang/sl/texts.php
@@ -60,7 +60,7 @@ $LANG = array(
     'download_pdf' => 'Prenesi PDF',
     'pay_now' => 'Plačaj Sedaj',
     'save_invoice' => 'Shrani Račun',
-    'clone_invoice' => 'Kloniraj Račun',
+    'clone_invoice' => 'Clone To Invoice',
     'archive_invoice' => 'Arhiviraj Račun',
     'delete_invoice' => 'Zbriši Račun',
     'email_invoice' => 'Pošlji Račun na Email',
@@ -321,7 +321,7 @@ Ne morete najti računa? Potrebujete dodatno pomoč? Z veseljem bomo pomagali. P
     'delete_quote' => 'Odstrani Ponudbo',
     'save_quote' => 'Shrani Ponudbo',
     'email_quote' => 'E-pošlji Ponudbo',
-    'clone_quote' => 'Kloniraj Ponudbo',
+    'clone_quote' => 'Clone To Quote',
     'convert_to_invoice' => 'Pretvori v Račun',
     'view_invoice' => 'Ogled Računa',
     'view_client' => 'Ogled Stranke',
@@ -654,7 +654,7 @@ Prijava v račun',
     'created_by_invoice' => 'Naredil: :invoice',
     'primary_user' => 'Primarni Uporabnik',
     'help' => 'Pomoč',
-    'customize_help' => '<p>We use <a href="http://pdfmake.org/" target="_blank">pdfmake</a> to define the invoice designs declaratively. The pdfmake <a href="http://pdfmake.org/playground.html" target="_blank">playground</a> provide\'s a great way to see the library in action.</p>
+    'customize_help' => '<p>We use <a href="http://pdfmake.org/" target="_blank">pdfmake</a> to define the invoice designs declaratively. The pdfmake <a href="http://pdfmake.org/playground.html" target="_blank">playground</a> provides a great way to see the library in action.</p>
                         <p>You can access a child property using dot notation. For example to show the client name you could use <code>$client.name</code>.</p>
                         <p>If you need help figuring something out post a question to our <a href="https://www.invoiceninja.com/forums/forum/support/" target="_blank">support forum</a> with the design you\'re using.</p>',
     'invoice_due_date' => 'Veljavnost',
@@ -995,6 +995,7 @@ Prijava v račun',
     'enable_https' => 'Pri spletnem sprejemanju kreditnih kartic močno priporočamo uporabo HTTPS.',
     'quote_issued_to' => 'Ponudba izdana za',
     'show_currency_code' => 'Valuta',
+    'free_year_message' => 'Your account has been upgraded to the pro plan for one year at no cost.',
     'trial_message' => 'Vaš račun bo prejel dva tedna brezplačne uporabe našega pro načrta.',
     'trial_footer' => 'Your free pro plan trial lasts :count more days, :link to upgrade now.',
     'trial_footer_last_day' => 'This is the last day of your free pro plan trial, :link to upgrade now.',
@@ -1015,7 +1016,7 @@ Prijava v račun',
     'pro_plan_remove_logo' => ':link za odstranitev logotipa Invoice Ninja z vstopom v Pro Plan',
     'pro_plan_remove_logo_link' => 'Klikni tu',
     'invitation_status_sent' => 'sent',
-    'invitation_status_opened' => 'Odprto',
+    'invitation_status_opened' => 'Opened',
     'invitation_status_viewed' => 'Ogledano',
     'email_error_inactive_client' => 'E-pošte se ne more pošiljati neaktivnim strankam',
     'email_error_inactive_contact' => 'E-pošte se ne more pošiljati neaktivnim kontaktom',
@@ -1413,6 +1414,7 @@ Ko imate zneske, se vrnite na to stran plačilnega sredstva in kliknite na "Comp
     'payment_type_Swish' => 'Swish',
     'payment_type_Alipay' => 'Alipay',
     'payment_type_Sofort' => 'Sofort',
+    'payment_type_SEPA' => 'SEPA Direct Debit',
 
     // Industries
     'industry_Accounting & Legal' => 'Računovodstvo in Pravosodje',
@@ -1726,6 +1728,7 @@ Biotehnologija',
     'lang_Turkish - Turkey' => 'Turkish - Turkey',
     'lang_Portuguese - Brazilian' => 'Portuguese - Brazilian',
     'lang_Portuguese - Portugal' => 'Portuguese - Portugal',
+    'lang_Thai' => 'Thai',
 
     // Frequencies
     'freq_weekly' => 'Tedensko',
@@ -2396,6 +2399,7 @@ Nekaj ​​je šlo narobe',
     'currency_jordanian_dinar' => 'Jordanian Dinar',
     'currency_myanmar_kyat' => 'Myanmar Kyat',
     'currency_peruvian_sol' => 'Peruvian Sol',
+    'currency_botswana_pula' => 'Botswana Pula',
     'review_app_help' => 'We hope you\'re enjoying using the app.<br/>If you\'d consider <a href="http://www.capterra.com/p/145215/Invoice-Ninja/" target="_blank">writing a review</a> we\'d greatly appreciate it!',
 
     'use_english_version' => 'Make sure to use the English version of the files.<br/>We use the column headers to match the fields.',
@@ -2446,11 +2450,43 @@ Nekaj ​​je šlo narobe',
 
     'alipay' => 'Alipay',
     'sofort' => 'Sofort',
+    'sepa' => 'SEPA Direct Debit',
     'enable_alipay' => 'Accept Alipay',
     'enable_sofort' => 'Accept EU bank transfers',
     'stripe_alipay_help' => 'These gateways also need to be activated in :link.',
     'gocardless_webhook_help_link_text' => 'add this URL as an endpoint in GoCardless',
+    'calendar' => 'Calendar',
+    'pro_plan_calendar' => ':link to enable the calendar by joining the Pro Plan',
 
+    'what_are_you_working_on' => 'What are you working on?',
+    'time_tracker' => 'Time Tracker',
+    'refresh' => 'Refresh',
+    'filter_sort' => 'Filter/Sort',
+    'no_description' => 'No Description',
+    'time_tracker_login' => 'Time Tracker Login',
+    'save_or_discard' => 'Save or discard your changes',
+    'discard_changes' => 'Discard Changes',
+    'tasks_not_enabled' => 'Tasks are not enabled.',
+    'started_task' => 'Successfully started task',
+    'create_client' => 'Create Client',
+
+    'download_desktop_app' => 'Download the desktop app',
+    'download_iphone_app' => 'Download the iPhone app',
+    'download_android_app' => 'Download the Android app',
+    'time_tracker_mobile_help' => 'Double tap a task to select it',
+    'stopped' => 'Stopped',
+    'ascending' => 'Ascending',
+    'descending' => 'Descending',
+    'sort_field' => 'Sort By',
+    'sort_direction' => 'Direction',
+    'discard' => 'Discard',
+    'time_am' => 'AM',
+    'time_pm' => 'PM',
+    'time_mins' => 'mins',
+    'time_hr' => 'hr',
+    'time_hrs' => 'hrs',
+    'clear' => 'Clear',
+    'warn_payment_gateway' => 'Note: to accept online payments :link to add a payment gateway.',
 );
 
 return $LANG;
diff --git a/resources/lang/sq/texts.php b/resources/lang/sq/texts.php
index c30e47bcf7a3..5f58c7dbfb91 100755
--- a/resources/lang/sq/texts.php
+++ b/resources/lang/sq/texts.php
@@ -60,7 +60,7 @@ $LANG = array(
     'download_pdf' => 'Shkarko PDF',
     'pay_now' => 'Paguaj Tani',
     'save_invoice' => 'Ruaj faturën',
-    'clone_invoice' => 'Klono faturën',
+    'clone_invoice' => 'Clone To Invoice',
     'archive_invoice' => 'Arkivo faturën',
     'delete_invoice' => 'Fshi faturën',
     'email_invoice' => 'Dërgo faturën me email',
@@ -320,7 +320,7 @@ $LANG = array(
     'delete_quote' => 'Fshi Ofertën',
     'save_quote' => 'Ruaj Ofertën',
     'email_quote' => 'Dërgo me email Ofertën',
-    'clone_quote' => 'Klono Ofertën',
+    'clone_quote' => 'Clone To Quote',
     'convert_to_invoice' => 'Ktheje Ofertën në Faturë',
     'view_invoice' => 'Shiko Faturën',
     'view_client' => 'Shiko Klientin',
@@ -652,9 +652,9 @@ $LANG = array(
     'created_by_invoice' => 'Krijuar nga :invoice',
     'primary_user' => 'Përdoruesi kryesor',
     'help' => 'Ndihmë',
-    'customize_help' => '<p>Ne përdorim <a href="http://pdfmake.org/" target="_blank">pdfmake</a> për të krijuar faturat PDF dhe dizajnin e tyre. pdfmake <a href="http://pdfmake.org/playground.html" target="_blank">playground</a> ofron mundësi të mirë për të parë librarinë në veprim. </p>
-                        <p>Ju mund t\'i qaseni të dhënave duke përdorur kodet. Për shembull për të parë emrin e klientit ju mund të përdorni <code>$client.name</code>.</p>
-                        <p>Nëse ju duhet ndihmë për të qartësuar diçka ose për të bërë ndonjë pytje mund të na shkruani në <a href="https://www.invoiceninja.com/forums/forum/support/" target="_blank">forumin tonë</a> me dizajnin që jeni duke përdorur.</p>',
+    'customize_help' => '<p>We use <a href="http://pdfmake.org/" target="_blank">pdfmake</a> to define the invoice designs declaratively. The pdfmake <a href="http://pdfmake.org/playground.html" target="_blank">playground</a> provides a great way to see the library in action.</p>
+                        <p>You can access a child property using dot notation. For example to show the client name you could use <code>$client.name</code>.</p>
+                        <p>If you need help figuring something out post a question to our <a href="https://www.invoiceninja.com/forums/forum/support/" target="_blank">support forum</a> with the design you\'re using.</p>',
     'invoice_due_date' => 'Deri më datë',
     'quote_due_date' => 'Valide deri',
     'valid_until' => 'Valide deri',
@@ -993,6 +993,7 @@ $LANG = array(
     'enable_https' => 'Ju rekomandojmë të përdorni HTTPS për të pranuar detajet e kredit kartave online.',
     'quote_issued_to' => 'Oferta i është lëshuar',
     'show_currency_code' => 'Kodi i valutës',
+    'free_year_message' => 'Your account has been upgraded to the pro plan for one year at no cost.',
     'trial_message' => 'Llogaria juaj do të pranojë një periudhë testuese dyjavore të Pro planit që ofrojmë.',
     'trial_footer' => 'Your free pro plan trial lasts :count more days, :link to upgrade now.',
     'trial_footer_last_day' => 'This is the last day of your free pro plan trial, :link to upgrade now.',
@@ -1410,6 +1411,7 @@ Pasi të keni pranuar shumat, kthehuni në faqen e metodave të pagesës dhe kli
     'payment_type_Swish' => 'Swish',
     'payment_type_Alipay' => 'Alipay',
     'payment_type_Sofort' => 'Sofort',
+    'payment_type_SEPA' => 'SEPA Direct Debit',
 
     // Industries
     'industry_Accounting & Legal' => 'Kontabilitet & Ligjore',
@@ -1722,6 +1724,7 @@ Pasi të keni pranuar shumat, kthehuni në faqen e metodave të pagesës dhe kli
     'lang_Turkish - Turkey' => 'Turkish - Turkey',
     'lang_Portuguese - Brazilian' => 'Portuguese - Brazilian',
     'lang_Portuguese - Portugal' => 'Portuguese - Portugal',
+    'lang_Thai' => 'Thai',
 
     // Frequencies
     'freq_weekly' => 'Javore',
@@ -2389,6 +2392,7 @@ Pasi të keni pranuar shumat, kthehuni në faqen e metodave të pagesës dhe kli
     'currency_jordanian_dinar' => 'Jordanian Dinar',
     'currency_myanmar_kyat' => 'Myanmar Kyat',
     'currency_peruvian_sol' => 'Peruvian Sol',
+    'currency_botswana_pula' => 'Botswana Pula',
     'review_app_help' => 'We hope you\'re enjoying using the app.<br/>If you\'d consider <a href="http://www.capterra.com/p/145215/Invoice-Ninja/" target="_blank">writing a review</a> we\'d greatly appreciate it!',
 
     'use_english_version' => 'Make sure to use the English version of the files.<br/>We use the column headers to match the fields.',
@@ -2439,11 +2443,43 @@ Pasi të keni pranuar shumat, kthehuni në faqen e metodave të pagesës dhe kli
 
     'alipay' => 'Alipay',
     'sofort' => 'Sofort',
+    'sepa' => 'SEPA Direct Debit',
     'enable_alipay' => 'Accept Alipay',
     'enable_sofort' => 'Accept EU bank transfers',
     'stripe_alipay_help' => 'These gateways also need to be activated in :link.',
     'gocardless_webhook_help_link_text' => 'add this URL as an endpoint in GoCardless',
+    'calendar' => 'Calendar',
+    'pro_plan_calendar' => ':link to enable the calendar by joining the Pro Plan',
 
+    'what_are_you_working_on' => 'What are you working on?',
+    'time_tracker' => 'Time Tracker',
+    'refresh' => 'Refresh',
+    'filter_sort' => 'Filter/Sort',
+    'no_description' => 'No Description',
+    'time_tracker_login' => 'Time Tracker Login',
+    'save_or_discard' => 'Save or discard your changes',
+    'discard_changes' => 'Discard Changes',
+    'tasks_not_enabled' => 'Tasks are not enabled.',
+    'started_task' => 'Successfully started task',
+    'create_client' => 'Create Client',
+
+    'download_desktop_app' => 'Download the desktop app',
+    'download_iphone_app' => 'Download the iPhone app',
+    'download_android_app' => 'Download the Android app',
+    'time_tracker_mobile_help' => 'Double tap a task to select it',
+    'stopped' => 'Stopped',
+    'ascending' => 'Ascending',
+    'descending' => 'Descending',
+    'sort_field' => 'Sort By',
+    'sort_direction' => 'Direction',
+    'discard' => 'Discard',
+    'time_am' => 'AM',
+    'time_pm' => 'PM',
+    'time_mins' => 'mins',
+    'time_hr' => 'hr',
+    'time_hrs' => 'hrs',
+    'clear' => 'Clear',
+    'warn_payment_gateway' => 'Note: to accept online payments :link to add a payment gateway.',
 );
 
 return $LANG;
diff --git a/resources/lang/sv/texts.php b/resources/lang/sv/texts.php
index a6c06f42d2ef..ceacbffd0781 100644
--- a/resources/lang/sv/texts.php
+++ b/resources/lang/sv/texts.php
@@ -60,7 +60,7 @@ $LANG = array(
     'download_pdf' => 'Ladda ner PDF',
     'pay_now' => 'Betala nu',
     'save_invoice' => 'Spara faktura',
-    'clone_invoice' => 'Kopiera faktura',
+    'clone_invoice' => 'Clone To Invoice',
     'archive_invoice' => 'Arkivera faktura',
     'delete_invoice' => 'Ta bort faktura',
     'email_invoice' => 'E-posta faktura',
@@ -322,7 +322,7 @@ $LANG = array(
     'delete_quote' => 'Ta bort offert',
     'save_quote' => 'Spara offert',
     'email_quote' => 'E-posta offert',
-    'clone_quote' => 'Kopiera offert',
+    'clone_quote' => 'Clone To Quote',
     'convert_to_invoice' => 'Omvandla till faktura',
     'view_invoice' => 'Visa faktura',
     'view_client' => 'Visa kund',
@@ -394,7 +394,7 @@ $LANG = array(
     'more_designs_self_host_text' => '',
     'buy' => 'Köp',
     'bought_designs' => 'Fler fakturalayouter tillagda',
-    'sent' => 'Sent',
+    'sent' => 'Skickat',
     'vat_number' => 'Momsregistreringsnummer',
     'timesheets' => 'Tidrapporter',
     'payment_title' => 'Ange din fakturaadress och betalkortsinformation',
@@ -654,9 +654,9 @@ $LANG = array(
     'created_by_invoice' => 'Skapad av :invoice',
     'primary_user' => 'Primär användare',
     'help' => 'Hjälp',
-    'customize_help' => '<P> Vi använder <a href="http://pdfmake.org/" target="_blank"> pdfmake </a> för att definiera fakturadesign deklarativt. pdfmake <a href="http://pdfmake.org/playground.html" target="_blank"> lekplats </a> ger en bra möjlighet att se bibliotek i drift. </ P> 
-<P> Du kan komma åt en child property med hjälp punktnotation. Till exempel för att visa kundens namn, kan du använda <code> $ client.name </ code>. </ P>
-<P> Om du behöver hjälp, posta en fråga på vår <a href="https://www.invoiceninja.com/forums/forum/support/" target="_blank"> supportforum </a> med designen du använder. </ p>',
+    'customize_help' => '<p>We use <a href="http://pdfmake.org/" target="_blank">pdfmake</a> to define the invoice designs declaratively. The pdfmake <a href="http://pdfmake.org/playground.html" target="_blank">playground</a> provides a great way to see the library in action.</p>
+                        <p>You can access a child property using dot notation. For example to show the client name you could use <code>$client.name</code>.</p>
+                        <p>If you need help figuring something out post a question to our <a href="https://www.invoiceninja.com/forums/forum/support/" target="_blank">support forum</a> with the design you\'re using.</p>',
     'invoice_due_date' => 'Förfallodatum',
     'quote_due_date' => 'Giltig till',
     'valid_until' => 'Giltig till',
@@ -669,8 +669,8 @@ $LANG = array(
     'status_viewed' => 'Granskad/Tittad på',
     'status_partial' => 'Del',
     'status_paid' => 'Betald',
-    'status_unpaid' => 'Unpaid',
-    'status_all' => 'All',
+    'status_unpaid' => 'Obetald',
+    'status_all' => 'Alla',
     'show_line_item_tax' => 'Visa <b>Linje produkt moms i kö</b>',
     'iframe_url' => 'Webbsida',
     'iframe_url_help1' => 'Kopiera följande kod till en sida på din webbplats',
@@ -995,6 +995,7 @@ $LANG = array(
     'enable_https' => 'Vi rekommenderar starkt att ni använder HTTPS för att acceptera kreditkorts detaljer på nätet.',
     'quote_issued_to' => 'Offert utfärdad till',
     'show_currency_code' => 'Valuta kod',
+    'free_year_message' => 'Your account has been upgraded to the pro plan for one year at no cost.',
     'trial_message' => 'Ditt konto kommer att få två veckor pröva-på-tid av på pro plan.',
     'trial_footer' => 'Your free pro plan trial lasts :count more days, :link to upgrade now.',
     'trial_footer_last_day' => 'This is the last day of your free pro plan trial, :link to upgrade now.',
@@ -1014,8 +1015,8 @@ $LANG = array(
 
     'pro_plan_remove_logo' => ':link för att ta bort Invoice Ninja-logotypen genom att uppgradera till Pro nivå',
     'pro_plan_remove_logo_link' => 'Klicka här',
-    'invitation_status_sent' => 'sent',
-    'invitation_status_opened' => 'Öppnad',
+    'invitation_status_sent' => 'skickat',
+    'invitation_status_opened' => 'Opened',
     'invitation_status_viewed' => 'Visad',
     'email_error_inactive_client' => 'E-post kan inte skickas till inaktiva klienter',
     'email_error_inactive_contact' => 'E-post kan inte skickas till inaktiva kontakter',
@@ -1411,6 +1412,7 @@ När ni har pengarna, kom tillbaka till denna betalningsmetods sida och klicka p
     'payment_type_Swish' => 'Swish',
     'payment_type_Alipay' => 'Alipay',
     'payment_type_Sofort' => 'Sofort',
+    'payment_type_SEPA' => 'SEPA Direct Debit',
 
     // Industries
     'industry_Accounting & Legal' => 'Redovisning & Legala',
@@ -1729,6 +1731,7 @@ Nya Kaledonien',
     'lang_Turkish - Turkey' => 'Turkish - Turkey',
     'lang_Portuguese - Brazilian' => 'Portuguese - Brazilian',
     'lang_Portuguese - Portugal' => 'Portuguese - Portugal',
+    'lang_Thai' => 'Thai',
 
     // Frequencies
     'freq_weekly' => 'Veckovis',
@@ -2247,7 +2250,7 @@ Den här funktionen kräver att en produkt skapas och en betalningsgateway är k
     'oauth_taken' => 'Kontot är redan registerat',
     'emailed_payment' => 'Epostade betalningen utan problem',
     'email_payment' => 'Eposta betalning',
-    'sent' => 'Sent',
+    'sent' => 'Skickat',
     'invoiceplane_import' => 'Använd :link för att migrera din data från InvoicePlane.',
     'duplicate_expense_warning' => 'Varning: Denna :link kan vara en dubblett',
     'expense_link' => 'utgifter',
@@ -2398,6 +2401,7 @@ Den här funktionen kräver att en produkt skapas och en betalningsgateway är k
     'currency_jordanian_dinar' => 'Jordanian Dinar',
     'currency_myanmar_kyat' => 'Myanmar Kyat',
     'currency_peruvian_sol' => 'Peruvian Sol',
+    'currency_botswana_pula' => 'Botswana Pula',
     'review_app_help' => 'We hope you\'re enjoying using the app.<br/>If you\'d consider <a href="http://www.capterra.com/p/145215/Invoice-Ninja/" target="_blank">writing a review</a> we\'d greatly appreciate it!',
 
     'use_english_version' => 'Säkerställ att du använder Engelska versionen av filerna<br/>Vi använder kolumn headern för att matcha fälten.',
@@ -2411,7 +2415,7 @@ Den här funktionen kräver att en produkt skapas och en betalningsgateway är k
     'contact_last_name' => 'Contact Last Name',
     'contact_custom1' => 'Contact First Custom',
     'contact_custom2' => 'Contact Second Custom',
-    'currency' => 'Currency',
+    'currency' => 'Valuta',
     'ofx_help' => 'In most cases the default values should work, if you\'re unable to connect it may help to adjust the settings.',
 
     'item_product' => 'Item Product',
@@ -2423,7 +2427,7 @@ Den här funktionen kräver att en produkt skapas och en betalningsgateway är k
     'item_tax1' => 'Item Tax1',
     'item_tax2' => 'Item Tax2',
 
-    'delete_company' => 'Delete Company',
+    'delete_company' => 'Ta bort företag',
     'delete_company_help' => 'Permanently delete the company along with all data and setting.',
     'delete_company_message' => 'Warning: This will permanently delete your company, there is no undo.',
 
@@ -2435,8 +2439,8 @@ Den här funktionen kräver att en produkt skapas och en betalningsgateway är k
     'include_errors_help' => 'Include :link from storage/logs/laravel-error.log',
     'recent_errors' => 'recent errors',
     'add_item' => 'Add Item',
-    'customer' => 'Customer',
-    'customers' => 'Customers',
+    'customer' => 'Kund',
+    'customers' => 'Kunder',
     'created_customer' => 'Successfully created customer',
     'created_customers' => 'Successfully created :count customers',
 
@@ -2448,11 +2452,43 @@ Den här funktionen kräver att en produkt skapas och en betalningsgateway är k
 
     'alipay' => 'Alipay',
     'sofort' => 'Sofort',
+    'sepa' => 'SEPA Direct Debit',
     'enable_alipay' => 'Accept Alipay',
     'enable_sofort' => 'Accept EU bank transfers',
     'stripe_alipay_help' => 'These gateways also need to be activated in :link.',
     'gocardless_webhook_help_link_text' => 'add this URL as an endpoint in GoCardless',
+    'calendar' => 'Calendar',
+    'pro_plan_calendar' => ':link to enable the calendar by joining the Pro Plan',
 
+    'what_are_you_working_on' => 'What are you working on?',
+    'time_tracker' => 'Time Tracker',
+    'refresh' => 'Refresh',
+    'filter_sort' => 'Filter/Sort',
+    'no_description' => 'No Description',
+    'time_tracker_login' => 'Time Tracker Login',
+    'save_or_discard' => 'Save or discard your changes',
+    'discard_changes' => 'Discard Changes',
+    'tasks_not_enabled' => 'Tasks are not enabled.',
+    'started_task' => 'Successfully started task',
+    'create_client' => 'Create Client',
+
+    'download_desktop_app' => 'Download the desktop app',
+    'download_iphone_app' => 'Download the iPhone app',
+    'download_android_app' => 'Download the Android app',
+    'time_tracker_mobile_help' => 'Double tap a task to select it',
+    'stopped' => 'Stopped',
+    'ascending' => 'Ascending',
+    'descending' => 'Descending',
+    'sort_field' => 'Sort By',
+    'sort_direction' => 'Direction',
+    'discard' => 'Discard',
+    'time_am' => 'AM',
+    'time_pm' => 'PM',
+    'time_mins' => 'mins',
+    'time_hr' => 'hr',
+    'time_hrs' => 'hrs',
+    'clear' => 'Clear',
+    'warn_payment_gateway' => 'Note: to accept online payments :link to add a payment gateway.',
 );
 
 return $LANG;
diff --git a/resources/lang/th/texts.php b/resources/lang/th/texts.php
index 80e37076d268..b09688ee84ca 100644
--- a/resources/lang/th/texts.php
+++ b/resources/lang/th/texts.php
@@ -60,7 +60,7 @@ $LANG = array(
     'download_pdf' => 'ดาวน์โหลด PDF',
     'pay_now' => 'จ่ายเดี๋ยวนี้',
     'save_invoice' => 'บันทึกใบแจ้งหนี้',
-    'clone_invoice' => 'ทำใบแจ้งหนี้ซ้ำ',
+    'clone_invoice' => 'Clone To Invoice',
     'archive_invoice' => 'เก็บบันทึกใบแจ้งหนี้',
     'delete_invoice' => 'ลบใบแจ้งหนี้',
     'email_invoice' => 'ส่งอีเมล',
@@ -323,7 +323,7 @@ $LANG = array(
     'delete_quote' => 'ลบใบเสนอราคา',
     'save_quote' => 'บันทึกใบเสนอราคา',
     'email_quote' => 'อีเมล์ใบเสนอราคา',
-    'clone_quote' => 'ทำซ้ำใบเสนอราคา',
+    'clone_quote' => 'Clone To Quote',
     'convert_to_invoice' => 'แปลงเป็นใบแจ้งหนี้',
     'view_invoice' => 'ดูใบแจ้งหนี้',
     'view_client' => 'ดูลูกค้า',
@@ -655,9 +655,9 @@ $LANG = array(
     'created_by_invoice' => 'สร้างโดย   :invoice',
     'primary_user' => 'ผู้ใช้หลัก',
     'help' => 'ช่วยเหลือ',
-    'customize_help' => '<p>เราใช้<a href="http://pdfmake.org/" target="_blank">2pdfmake2</a>เพื่อกำหนดการออกแบบใบแจ้งหนี้โดยเปิดเผย. The pdfmake <a href="http://pdfmake.org/playground.html" target="_blank">playground</a>ให้วิธีที่ยอดเยี่ยมในการดูการดำเนินการ</p>
-                          <p>คุณสามารถเข้าถึงคุณสมบัติโดยใช้เครื่องหมายจุดได้ ตัวอย่างเช่นเพื่อแสดงชื่อลูกค้าที่คุณสามารถใช้<code>$client.name</code>.</p>
-                          <p>หากคุณต้องการความช่วยเหลือการแก้ไขค่าโพสต์คำถามที่เรา<a href="https://www.invoiceninja.com/forums/forum/support/" target="_blank">support forum</a>ด้วยการออกแบบที่คุณใช้อยู่</p>',
+    'customize_help' => '<p>We use <a href="http://pdfmake.org/" target="_blank">pdfmake</a> to define the invoice designs declaratively. The pdfmake <a href="http://pdfmake.org/playground.html" target="_blank">playground</a> provides a great way to see the library in action.</p>
+                        <p>You can access a child property using dot notation. For example to show the client name you could use <code>$client.name</code>.</p>
+                        <p>If you need help figuring something out post a question to our <a href="https://www.invoiceninja.com/forums/forum/support/" target="_blank">support forum</a> with the design you\'re using.</p>',
     'invoice_due_date' => 'วันครบกำหนด',
     'quote_due_date' => 'ใช้ได้ถึงวันที่',
     'valid_until' => 'ใช้ได้ถึงวันที่',
@@ -998,6 +998,7 @@ $LANG = array(
     'enable_https' => 'เราขอแนะนำให้ใช้ HTTPS เพื่อรับรายละเอียดบัตรเครดิตทางออนไลน์',
     'quote_issued_to' => 'ใบเสนอราคาที่ออกให้กับ',
     'show_currency_code' => 'รหัสสกุลเงิน',
+    'free_year_message' => 'Your account has been upgraded to the pro plan for one year at no cost.',
     'trial_message' => 'บัญชีของคุณจะได้รับการทดลองใช้ฟรีเป็นระยะเวลาสองสัปดาห์',
     'trial_footer' => 'การทดลองใช้ Pro Pro ฟรีของคุณมีจำกัด :count วันเพิ่มขึ้น :link เพื่ออัปเกรดทันที',
     'trial_footer_last_day' => 'นี่เป็นวันสุดท้ายของการทดลอง Pro Plan ของคุณ :link เพื่ออัปเกรดทันที',
@@ -1018,7 +1019,7 @@ $LANG = array(
     'pro_plan_remove_logo' => ':link ลบโลโก้ Invoice Ninja โดยการเข้าร่วม Pro Plan',
     'pro_plan_remove_logo_link' => 'คลิกที่นี่',
     'invitation_status_sent' => 'sent',
-    'invitation_status_opened' => 'ได้เปิดแล้ว',
+    'invitation_status_opened' => 'Opened',
     'invitation_status_viewed' => 'มุมมอง',
     'email_error_inactive_client' => 'อีเมลไม่สามารถส่งไปยังลูกค้าที่ไม่ได้ใช้งานได้',
     'email_error_inactive_contact' => 'ไม่สามารถส่งอีเมลไปยังที่อยู่ติดต่อที่ไม่ใช้งานได้',
@@ -1414,6 +1415,7 @@ $LANG = array(
     'payment_type_Swish' => 'Swish',
     'payment_type_Alipay' => 'Alipay',
     'payment_type_Sofort' => 'Sofort',
+    'payment_type_SEPA' => 'SEPA Direct Debit',
 
     // Industries
     'industry_Accounting & Legal' => 'การบัญชีและกฎหมาย',
@@ -1726,6 +1728,7 @@ $LANG = array(
     'lang_Turkish - Turkey' => 'ตุรกี - ตุรกี',
     'lang_Portuguese - Brazilian' => 'โปรตุเกส - บราซิล',
     'lang_Portuguese - Portugal' => 'โปรตุเกส - โปรตุเกส',
+    'lang_Thai' => 'Thai',
 
     // Frequencies
     'freq_weekly' => 'รายสัปดาห์',
@@ -2393,6 +2396,7 @@ $LANG = array(
     'currency_jordanian_dinar' => 'จอร์แดน ดีนาร์จอร์แดน',
     'currency_myanmar_kyat' => 'พม่า จัตพม่า',
     'currency_peruvian_sol' => 'เปรู นูโวซอล',
+    'currency_botswana_pula' => 'Botswana Pula',
     'review_app_help' => 'We hope you\'re enjoying using the app.<br/>If you\'d consider <a href="http://www.capterra.com/p/145215/Invoice-Ninja/" target="_blank">writing a review</a> we\'d greatly appreciate it!',
 
     'use_english_version' => 'คุณแน่ใจว่าใช้ไฟล์นี้ด้วยภาษาอังกฤษ.<br/>เราใช้คอลัมนี้เพื่อให้ตรงกับช่องที่กำหนด',
@@ -2443,11 +2447,43 @@ $LANG = array(
 
     'alipay' => 'Alipay',
     'sofort' => 'Sofort',
+    'sepa' => 'SEPA Direct Debit',
     'enable_alipay' => 'Accept Alipay',
     'enable_sofort' => 'Accept EU bank transfers',
     'stripe_alipay_help' => 'These gateways also need to be activated in :link.',
     'gocardless_webhook_help_link_text' => 'add this URL as an endpoint in GoCardless',
+    'calendar' => 'Calendar',
+    'pro_plan_calendar' => ':link to enable the calendar by joining the Pro Plan',
 
+    'what_are_you_working_on' => 'What are you working on?',
+    'time_tracker' => 'Time Tracker',
+    'refresh' => 'Refresh',
+    'filter_sort' => 'Filter/Sort',
+    'no_description' => 'No Description',
+    'time_tracker_login' => 'Time Tracker Login',
+    'save_or_discard' => 'Save or discard your changes',
+    'discard_changes' => 'Discard Changes',
+    'tasks_not_enabled' => 'Tasks are not enabled.',
+    'started_task' => 'Successfully started task',
+    'create_client' => 'Create Client',
+
+    'download_desktop_app' => 'Download the desktop app',
+    'download_iphone_app' => 'Download the iPhone app',
+    'download_android_app' => 'Download the Android app',
+    'time_tracker_mobile_help' => 'Double tap a task to select it',
+    'stopped' => 'Stopped',
+    'ascending' => 'Ascending',
+    'descending' => 'Descending',
+    'sort_field' => 'Sort By',
+    'sort_direction' => 'Direction',
+    'discard' => 'Discard',
+    'time_am' => 'AM',
+    'time_pm' => 'PM',
+    'time_mins' => 'mins',
+    'time_hr' => 'hr',
+    'time_hrs' => 'hrs',
+    'clear' => 'Clear',
+    'warn_payment_gateway' => 'Note: to accept online payments :link to add a payment gateway.',
 );
 
 return $LANG;
diff --git a/resources/lang/tr_TR/texts.php b/resources/lang/tr_TR/texts.php
index 513c23bc11ea..eeebb855fcb1 100644
--- a/resources/lang/tr_TR/texts.php
+++ b/resources/lang/tr_TR/texts.php
@@ -60,7 +60,7 @@ $LANG = array(
     'download_pdf' => 'PDF indir',
     'pay_now' => 'Şimdi Öde',
     'save_invoice' => 'Faturayı Kaydet',
-    'clone_invoice' => 'Faturayı çoğalt',
+    'clone_invoice' => 'Clone To Invoice',
     'archive_invoice' => 'Faturayı Arşivle',
     'delete_invoice' => 'Faturayı Sil',
     'email_invoice' => 'Faturayı E-Posta ile gönder',
@@ -322,7 +322,7 @@ adresine gönderildi. Müthiş tüm özelliklerin kilidini açmak için lütfen
     'delete_quote' => 'Teklif Sil',
     'save_quote' => 'Teklif Kaydet',
     'email_quote' => 'Teklifi E-Posta ile Gönder',
-    'clone_quote' => 'Teklif Çoğalt',
+    'clone_quote' => 'Clone To Quote',
     'convert_to_invoice' => 'Faturaya Dönüştür',
     'view_invoice' => 'Fatura Görüntüle',
     'view_client' => 'Müşteri Görüntüle',
@@ -654,9 +654,9 @@ adresine gönderildi. Müthiş tüm özelliklerin kilidini açmak için lütfen
     'created_by_invoice' => 'Tarafından oluşturulan :invoice',
     'primary_user' => 'Birincil Kullanıcı',
     'help' => 'Yardım',
-    'customize_help' => '<p>Fatura tasarımlarını tanımlamak için <a href="http://pdfmake.org/" target="_blank">pdfmake</a> kullanıyoruz. Pdfmake <a href="http://pdfmake.org/playground.html" target="_blank">playground</a>  kütüphaneyi harekete geçirmek için harika bir yoldur.</p>
-<p>Nokta gösterimi kullanarak bir alt mülke erişebilirsiniz. Örneğin, müşteri adını göstermek için <code>$client.name</ code> kullanabilirsiniz.</p>
-<p>Bir şeyi bulmak için yardıma ihtiyacınız varsa  <a href="https://www.invoiceninja.com/forums/forum/support/" target="_blank">destek forumuna</a> kullandığınız dizaynla birlikte sorunuzu gönderin.</p>',
+    'customize_help' => '<p>We use <a href="http://pdfmake.org/" target="_blank">pdfmake</a> to define the invoice designs declaratively. The pdfmake <a href="http://pdfmake.org/playground.html" target="_blank">playground</a> provides a great way to see the library in action.</p>
+                        <p>You can access a child property using dot notation. For example to show the client name you could use <code>$client.name</code>.</p>
+                        <p>If you need help figuring something out post a question to our <a href="https://www.invoiceninja.com/forums/forum/support/" target="_blank">support forum</a> with the design you\'re using.</p>',
     'invoice_due_date' => 'Vade',
     'quote_due_date' => 'Geçerlilik Tarihi',
     'valid_until' => 'Geçerlilik Tarihi',
@@ -995,6 +995,7 @@ adresine gönderildi. Müthiş tüm özelliklerin kilidini açmak için lütfen
     'enable_https' => 'We strongly recommend using HTTPS to accept credit card details online.',
     'quote_issued_to' => 'Quote issued to',
     'show_currency_code' => 'Currency Code',
+    'free_year_message' => 'Your account has been upgraded to the pro plan for one year at no cost.',
     'trial_message' => 'Your account will receive a free two week trial of our pro plan.',
     'trial_footer' => 'Your free pro plan trial lasts :count more days, :link to upgrade now.',
     'trial_footer_last_day' => 'This is the last day of your free pro plan trial, :link to upgrade now.',
@@ -1411,6 +1412,7 @@ adresine gönderildi. Müthiş tüm özelliklerin kilidini açmak için lütfen
     'payment_type_Swish' => 'Swish',
     'payment_type_Alipay' => 'Alipay',
     'payment_type_Sofort' => 'Sofort',
+    'payment_type_SEPA' => 'SEPA Direct Debit',
 
     // Industries
     'industry_Accounting & Legal' => 'Accounting & Legal',
@@ -1723,6 +1725,7 @@ adresine gönderildi. Müthiş tüm özelliklerin kilidini açmak için lütfen
     'lang_Turkish - Turkey' => 'Turkish - Turkey',
     'lang_Portuguese - Brazilian' => 'Portuguese - Brazilian',
     'lang_Portuguese - Portugal' => 'Portuguese - Portugal',
+    'lang_Thai' => 'Thai',
 
     // Frequencies
     'freq_weekly' => 'Weekly',
@@ -2390,6 +2393,7 @@ adresine gönderildi. Müthiş tüm özelliklerin kilidini açmak için lütfen
     'currency_jordanian_dinar' => 'Jordanian Dinar',
     'currency_myanmar_kyat' => 'Myanmar Kyat',
     'currency_peruvian_sol' => 'Peruvian Sol',
+    'currency_botswana_pula' => 'Botswana Pula',
     'review_app_help' => 'We hope you\'re enjoying using the app.<br/>If you\'d consider <a href="http://www.capterra.com/p/145215/Invoice-Ninja/" target="_blank">writing a review</a> we\'d greatly appreciate it!',
 
     'use_english_version' => 'Make sure to use the English version of the files.<br/>We use the column headers to match the fields.',
@@ -2440,11 +2444,43 @@ adresine gönderildi. Müthiş tüm özelliklerin kilidini açmak için lütfen
 
     'alipay' => 'Alipay',
     'sofort' => 'Sofort',
+    'sepa' => 'SEPA Direct Debit',
     'enable_alipay' => 'Accept Alipay',
     'enable_sofort' => 'Accept EU bank transfers',
     'stripe_alipay_help' => 'These gateways also need to be activated in :link.',
     'gocardless_webhook_help_link_text' => 'add this URL as an endpoint in GoCardless',
+    'calendar' => 'Calendar',
+    'pro_plan_calendar' => ':link to enable the calendar by joining the Pro Plan',
 
+    'what_are_you_working_on' => 'What are you working on?',
+    'time_tracker' => 'Time Tracker',
+    'refresh' => 'Refresh',
+    'filter_sort' => 'Filter/Sort',
+    'no_description' => 'No Description',
+    'time_tracker_login' => 'Time Tracker Login',
+    'save_or_discard' => 'Save or discard your changes',
+    'discard_changes' => 'Discard Changes',
+    'tasks_not_enabled' => 'Tasks are not enabled.',
+    'started_task' => 'Successfully started task',
+    'create_client' => 'Create Client',
+
+    'download_desktop_app' => 'Download the desktop app',
+    'download_iphone_app' => 'Download the iPhone app',
+    'download_android_app' => 'Download the Android app',
+    'time_tracker_mobile_help' => 'Double tap a task to select it',
+    'stopped' => 'Stopped',
+    'ascending' => 'Ascending',
+    'descending' => 'Descending',
+    'sort_field' => 'Sort By',
+    'sort_direction' => 'Direction',
+    'discard' => 'Discard',
+    'time_am' => 'AM',
+    'time_pm' => 'PM',
+    'time_mins' => 'mins',
+    'time_hr' => 'hr',
+    'time_hrs' => 'hrs',
+    'clear' => 'Clear',
+    'warn_payment_gateway' => 'Note: to accept online payments :link to add a payment gateway.',
 );
 
 return $LANG;