Merge with master

2018-01-03 16:51:59 +01:00 · 2018-01-03 16:51:59 +01:00 · e458987f67
parent cae37d5d6a 41b9352455
commit e458987f67
47 changed files with 215 additions and 514 deletions
--- a/app.js
+++ b/app.js
@ -20,10 +20,8 @@ window.onload = function ()

 function main (req)
 {
-	var keys = req.keys ();
-
-	for (var i = 0; i < keys.length; i++)
-		Vn.Locale.add (req (keys[i]));
+	if (req)
+		onLocaleLoad (req);

 	hederaWeb = new Hedera.App ();
 	hederaWeb.run ();
@ -34,6 +32,9 @@ function loadLocale (cb)
 	Vn.Locale.init ();
 	var lang = Vn.Locale.language;

+	var req = require.context ('js', true, /locale\/en.json$/);
+	onLocaleLoad (req);
+
 	switch (lang)
 	{
 		case 'ca':
@ -57,7 +58,14 @@ function loadLocale (cb)
 				cb (require.context ('js', true, /locale\/pt.json$/)); });
 			break;
 		default:
-			require ([], function () {	
-				cb (require.context ('js', true, /locale\/en.json$/)); });
+			cb ();
 	}
 }
+
+function onLocaleLoad (req)
+{
+	var keys = req.keys ();
+
+	for (var i = 0; i < keys.length; i++)
+		Vn.Locale.add (req (keys[i]));
+}
--- a/forms/account/address-list/locale/mn.json
+++ b/forms/account/address-list/locale/mn.json
@ -1,11 +0,0 @@
-{
-	 "Addresses": "Addresses"
-	
-	,"Return": "Return"
-	,"AddAddress": "Add address"
-	
-	,"SetAsDefault": "Set as default"
-	,"RemoveAddress": "Remove address"
-	,"EditAddress": "Edit address"
-	,"AreYouSureDeleteAddress": "Are you sure you want to delete the address?"
-}
--- a/forms/account/address-list/locale/pt.json
+++ b/forms/account/address-list/locale/pt.json
@ -1,11 +1,11 @@
 {
-	 "Addresses": "Endereços"
+	 "Addresses": "Moradas"
 	
 	,"Return": "Voltar"
-	,"AddAddress": "Adicionar Endereço"
+	,"AddAddress": "Adicionar Morada"
 	
 	,"SetAsDefault": "Selecionar como pre-determinado"
-	,"RemoveAddress": "Eliminar Endereço"
-	,"EditAddress": "Modificar Endereço"
-	,"AreYouSureDeleteAddress": "Tens certeza que queres eliminar este endereço?"
+	,"RemoveAddress": "Eliminar Morada"
+	,"EditAddress": "Modificar Morada"
+	,"AreYouSureDeleteAddress": "Tens certeza que queres eliminar esta morada?"
 }
--- a/forms/account/address/locale/mn.json
+++ b/forms/account/address/locale/mn.json
@ -1,15 +0,0 @@
-{
-	"AddEditAddress": "Add or edit address"
-
-	,"Name": "Consignee"
-	,"Address": "Address"
-	,"City": "City"
-	,"ZipCode": "Zip code"
-	,"Country": "Country"
-	,"Province": "Province"
-
-	,"Return": "Return"
-	,"Accept": "Accept"
-	
-	,"AddressChangedSuccessfully": "Address changed successfully"
-}
--- a/forms/account/address/locale/pt.json
+++ b/forms/account/address/locale/pt.json
@ -1,9 +1,9 @@
 {
-	"AddEditAddress": "Adicionar ou modificar endereço"
+	"AddEditAddress": "Adicionar ou modificar morada"

 	,"Name": "Consignatario"
-	,"Address": "Endereço"
-	,"City": "Municipio"
+	,"Address": "Morada"
+	,"City": "Concelho"
 	,"ZipCode": "Código postal"
 	,"Country": "País"
 	,"Province": "Distrito"
@ -11,5 +11,5 @@
 	,"Return": "Voltar"
 	,"Accept": "Aceitar"
 	
-	,"AddressChangedSuccessfully": "Endereço modificado corretamente"
+	,"AddressChangedSuccessfully": "Morada modificada corretamente"
 }
--- a/forms/account/conf/locale/mn.json
+++ b/forms/account/conf/locale/mn.json
@ -1,30 +0,0 @@
-{
-	"Configuration": "Configuration"
-
-	,"Username": "Username"
-	,"Password": "Password"
-	,"Email": "Email"
-	,"Billing": "Billing"
-	,"Receive invoices by email": "Receive invoices by email"
-	
-	,"Old password": "Old password"
-	,"New password": "New password"
-	,"Repeat password": "Repeat password"
-	,"Info": "Info"
-	,"Modify": "Modify"
-	
-	,"Password requirements": "Password requirements"
-	,"characters long": "characters long"
-	,"alphabetic characters": "alphabetic characters"
-	,"capital letters": "capital letters"
-	,"digits": "digits"
-	,"symbols": "symbols. Ej: $%&."
-
-	,"Password changed!": "Password changed!"
-	,"Password doesn't meet the requirements": "Password doesn't meet the requirements, press info button for more details"
-	,"Passwords doesn't match": "Passwords doesn't match"
-	,"Passwords empty": "Passwords empty"
-	
-	,"Addresses": "Addresses"
-	,"Change password": "Change password"
-}
--- a/forms/account/conf/locale/pt.json
+++ b/forms/account/conf/locale/pt.json
@ -5,7 +5,7 @@
 	,"Password": "Palavra-Passe"
 	,"Email": "E-Mail"
 	,"Display name": "Nome para mostrar"
-	,"Language": "Linguagem"
+	,"Language": "Idioma"
 	,"Billing": "Facturação"
 	,"Receive invoices by email": "Receber facturas por e-mail"
 	
@ -27,6 +27,6 @@
 	,"Passwords doesn't match": "As Palavras-Passe não coincidem!"
 	,"Passwords empty": "Palavra-Passe vazia"
 	
-	,"Addresses": "Endereços"
+	,"Addresses": "Moradas"
 	,"Change password": "Mudar Palavra-Passe"
 }
--- a/forms/admin/access-log/locale/mn.json
+++ b/forms/admin/access-log/locale/mn.json
@ -1,15 +0,0 @@
-{
-	 "AccessLog": "Access log"
-
-	,"UserNumber:": "User Number:"
-	,"User:": "User:"
-	,"Phone:": "Phone:"
-	,"Mobile:": "Mobile:"
-
-	,"Access": "Access"
-	,"OS": "OS"
-	,"Browser": "Browser"
-	,"Version": "Version"
-	,"Javascript": "Javascript"
-	,"Cookies": "Cookies"
-}
--- a/forms/admin/items/locale/pt.json
+++ b/forms/admin/items/locale/pt.json
@ -1,4 +1,4 @@
 {
-	 "Items": "Artigos",
+	 "Items": "Ítens",
 	 "Enter a search term": "Digite um termo de pesquisa"
 }
--- a/forms/admin/links/locale/mn.json
+++ b/forms/admin/links/locale/mn.json
@ -1,6 +0,0 @@
-{
-	 "ControlPanel": "Control panel"
-
-	,"Module": "Module"
-	,"Description": "Description"
-}
--- a/forms/admin/photos/locale/mn.json
+++ b/forms/admin/photos/locale/mn.json
@ -1,17 +0,0 @@
-{
-	 "Images": "Images"
-
-	,"Collection": "Collection"
-	,"Click or drop files here": "Click or drop files here"
-
-	,"Clear all": "Clear all"
-	,"Upload files": "Upload files"
-
-	,"Waiting for upload": "Waiting for upload"
-	,"Uploading file": "Uploading file"
-	,"Image uploaded": "Image uploaded"
-
-	,"Upload finished successfully": "Upload finished successfully"
-	,"Some errors happened on upload": "Some errors happened on upload"
-	,"There are no files to upload": "There are no files to upload"
-}
--- a/forms/admin/photos/locale/pt.json
+++ b/forms/admin/photos/locale/pt.json
@ -2,16 +2,16 @@
 	 "Images": "Imagens"

 	,"Collection": "Coleção"
-	,"Click or drop files here": "Clique ou soltar arquivos aqui"
+	,"Click or drop files here": "Clique ou solte arquivos aqui"

-	,"Clear all": "Clear All"
+	,"Clear all": "Limpar tudo"
 	,"Upload files": "Fazer upload de arquivos"

 	,"Waiting for upload": "Esperando para enviar"
 	,"Uploading file": "Enviando arquivo"
-	,"Image uploaded": "Arquivo enviado"
+	,"Image uploaded": "Imagem Enviada"

 	,"Upload finished successfully": "Upload concluído com sucesso"
-	,"Some errors happened on upload": "Ocurrieron erros ao subir alguma das imagens"
+	,"Some errors happened on upload": "Ocorreram erros ao subir alguma das imagens"
 	,"There are no files to upload": "Não há arquivos selecionados para upload"
 }
--- a/forms/admin/queries/locale/mn.json
+++ b/forms/admin/queries/locale/mn.json
@ -1,11 +0,0 @@
-{
-	 "Queries": "Queries"
-
-	,"Execute": "Execute"
-	,"Clean": "Clean"
-
-	,"SQL query": "SQL query"
-	,"Updatable": "Updatable"
-	
-	,"Query executed!": "Query executed!"
-}
--- a/forms/admin/queries/locale/pt.json
+++ b/forms/admin/queries/locale/pt.json
@ -1,11 +1,11 @@
 {
-	 "Queries": "Queries"
+	 "Queries": "Consultas"

-	,"Execute": "Execute"
-	,"Clean": "Clean"
+	,"Execute": "Executar"
+	,"Clean": "Limpar"

-	,"SQL query": "SQL query"
-	,"Updatable": "Updatable"
+	,"SQL query": "Consulta SQL"
+	,"Updatable": "Actualizável"
 	
-	,"Query executed!": "Query executed!"
+	,"Query executed!": "Consulta executada!"
 }
--- a/forms/admin/users/locale/mn.json
+++ b/forms/admin/users/locale/mn.json
@ -1,7 +0,0 @@
-{
-	"User management": "User management"
-	
-	,"Disabled": "Disabled"
-	,"Impersonate user": "Impersonate user"
-	,"Access log": "Access log"
-}
--- a/forms/agencies/packages/locale/mn.json
+++ b/forms/agencies/packages/locale/mn.json
@ -1,9 +0,0 @@
-{
-	 "ListByAgency": "Bundles by agency"
-
-	,"ShowByProvince": "Show breakdown by province"
-	,"Agency": "Agency"
-	,"Exps": "Exps."
-	,"Bundles": "Bundles"
-	,"Prevision": "Prev."
-}
--- a/forms/agencies/provinces/locale/mn.json
+++ b/forms/agencies/provinces/locale/mn.json
@ -1,10 +0,0 @@
-{
-	 "ByProvince": "Breakdown by province"
-
-	,"Return": "Return"
-	
-	,"SelectAgency": "Select an agency"
-	,"Province": "Province"
-	,"Expeditions": "Exps."
-	,"Left": "Left"
-}
--- a/forms/cms/about/locale/mn.json
+++ b/forms/cms/about/locale/mn.json
@ -1,47 +0,0 @@
-{
-	"QualityAndVariety": "Quality, variety and service"
-
-	,"MaximumFreshness": "Verdnatura offers a product guarantee maximum freshness thanks to their daily flowers and plants from Holland, South America, or from the same producer receptions."
-	,"SquareMeters": "Over facilities 13,000m"
-	,"AboutRealms": "With cut flowers, green, artificial and accessories"
-	,"AboutLocation": "Settled in Valencia, Madrid, Barcelona, Holland and France, we offer direct sales in our facilities and distribution throughout Spain by own service or agency."
-	,"PurchaseThroughWeb": "Purchase through our website and receive your order comfortably in your florist.In less than 24 hours!"
-
-	,"WhatMakeUsDifferent": "What makes us different?"
-
-	,"DesignVariety": "The variety in design, quality of materials used and our service delivery, will provide a showcase of dynamic genre, always fresh and appealing."
-	,"AdaptToYourNeeds": "Verdnatura adapts to the needs of each customer by offering a wide range of products, always guaranteed."
-	,"TheBestQuality": "The best quality at the best price. Without forgetting the design."
-
-	,"AtYourService": "We are at your service"
-
-	,"BuyersAndTraders": "9 specialized trade buyers and our 20 advise you on everything you need."
-	
-	,"Verdnatura training": "Verdnatura training"
-
-	,"GoodTraining": "In Verdnatura we know that a good education is essential for the optimal development of any activity, and of course, also the florist."
-	,"SpecialTrainingPrices": "For the school budget does not affect the quality of your training, we work with special pricing policy for all schools that request it take courses in our facilities Verdnatura chair."
-	,"YoutubeChannel": "And do not miss Verdnatura videos on Youtube Channel. Where you'll find plenty of interesting tips on handling of the flower."
-	
-	,"HowWeWork": "How we work?"
-
-	,"FirstQualityControl": "First quality control"
-	,"SecondQualityControl": "Second quality control"
-	,"ThirdQualityControl": "Third quality control"
-	,"FourthQualityControl": "Fourth quality control"
-
-	,"AalsmeerAuction": "At 5: 00h, our purchasing managers acquire, in the auction of Aalsmeer and Noaldwijk, gender, the producer has reaped the previous day."
-	,"BeforeAuction": "After purchase, the genre quickly enters Verdnatura Holland BV, our company Flora Holland in Aalsmeer."
-	,"DirectlyFromProviders": "Besides buying through the Dutch auction, we buy directly from producers Colombia, Ecuador, Thailand, Malaysia, Africa and Australia. These products are directly supervised by our delegates Purchase located in each area. This merchandise will travel to Amsterdam, subjected to a process Vaacum and in less than two hours after landing, you will be at our facility in Aalsmeer."
-	,"GoodsDischarge": "At 7: 00h our fellow Aalsmeer start receiving the purchased goods, having a first quality control, and creating it in stock. Now available for our customers on the web."
-	,"GoodsTravel": "The goods travel for a day and a half trucks watertight compartments at different temperatures, so that the cold chain is not broken trip in the best conditions."
-	,"GoodsReception": "Upon receipt of the merchandise responsible for the purchase reviewed state that arrives, accepting or rejecting it as appropriate, it discharged cold and quickly enters our camera."
-	,"CustomerOrders": "Our customers can place their orders via the web, by phone or coming directly to our facilities. We have a team of specialized commercial advise you on your purchase and inform you the latest news and articles that may be of interest, so that your purchase meets your needs and stay totally satisfied."
-	,"AfterOrder": "Once placed the order, turn to the production department. During the preparation of this new quality control (third) in which the poor will be discarded merchandise it is made."
-	,"BuyerControl": "As the preparation is completed, a new control (fourth) where a specialist account is made and check the status of products. If they do not meet the quality standards required rejects and replaces the right."
-	,"EmbeddedSection": "Then takes embedded section, where the order is suitable for proper delivery. Each type of delivery requires a method suitable for embedded gender protected books and reaches the customer in perfect condition."
-	,"AfterEmbedAgency": "Once the product has been fitted it is stored again in the chamber until they leave by agency or own deal, receiving the customer within 24 hours in the case of the agency or the same day for the cast, comfortably at home ."
-	,"FreshnessGuaranteed": "This way of working ensures freshness by rapid processes and maintaining the cold chain from purchase to receipt by our customer."
-
-	,"AboutSummary": "75 people spread over almost everybody so that our client has the broadest portfolio in the industry, coolest flower, plant newest, latest accessories, and fastest service possible."
-}
--- a/forms/cms/contact/locale/mn.json
+++ b/forms/cms/contact/locale/mn.json
@ -1,20 +0,0 @@
-{
-	 "IWantCustomer": "I want to be a customer!"	
-	
-	,"FillFormData": "Fill the form with your details and we will contact you soon."
-	,"OrCallUs": "Or if you prefer, call us at 963 242 100."
-	,"AllFieldsMandatory": "* All fields are mandatory."
-	
-	,"Name": "Name"
-	,"Surname": "Surname"
-	,"EMail": "Email"
-	,"Message": "Message"
-	,"Address": "Address"
-	,"PC": "Zip code"
-	,"City": "City"
-	,"Phone": "Phone"
-	,"Send": "Send"
-
-	,"DataSentSuccess": "Your details have been sent successfully. Shortly we will contact you."
-	,"ErrorSendingData": "Failed to send the data. Please check that you have filled in all the fields and you entered the anti-spam code correctly."
-}
--- a/forms/cms/contact/locale/pt.json
+++ b/forms/cms/contact/locale/pt.json
@ -1,7 +1,7 @@
 {
 	 "IWantCustomer": "Quero ser cliente!"	
 	
-	,"FillFormData": "Preencha o formulário com seus dados e em breve nos colocaremos em contacto contigo."
+	,"FillFormData": "Preencha o formulário com seus dados e em breve contactaremos consigo."
 	,"OrCallUs": "Ou se preferes ligue-nos ao +34 963 242 100."
 	,"AllFieldsMandatory": "* Todos os campos são obrigatorios."
 	
@ -9,12 +9,12 @@
 	,"Surname": "Apelidos"
 	,"EMail": "E-Mail"
 	,"Message": "Menssagem"
-	,"Address": "Endereço"
+	,"Address": "Morada"
 	,"PC": "Código postal"
-	,"City": "Município"
+	,"City": "Concelho"
 	,"Phone": "Telefone"
 	,"Send": "Enviar dados"

-	,"DataSentSuccess": "Seus dados foram enviados corretamente.Em breve nos colocaremos em contacto contigo."
-	,"ErrorSendingData": "Erro ao enviar os dados. Por favor, comprove que há preenchido todos os campos e que há introduzido o código anti-spam corretamente."
+	,"DataSentSuccess": "Seus dados foram enviados corretamente.Em breve nos colocaremos em contacto consigo."
+	,"ErrorSendingData": "Erro ao enviar os dados. Por favor, comprove que preenchestes todos os campos e que há introduzido o código anti-spam corretamente."
 }
--- a/forms/cms/home/locale/pt.json
+++ b/forms/cms/home/locale/pt.json
@ -1,5 +1,5 @@
 {
-	 "Start order": "Comece uma ordem"
+	 "Start order": "Comece uma encomenda"

 	,"Sent": "Enviado"
 	,"Author": "Autor"
--- a/forms/cms/location/locale/mn.json
+++ b/forms/cms/location/locale/mn.json
@ -1,3 +0,0 @@
-{
-	 "ShowMap": "Show map"
-}
--- a/forms/cms/training/locale/mn.json
+++ b/forms/cms/training/locale/mn.json
@ -1 +0,0 @@
-{}
--- a/forms/cms/why/locale/mn.json
+++ b/forms/cms/why/locale/mn.json
@ -1,25 +0,0 @@
-{
-	 "AboutCompany": "Why Verdnatura?"
-	,"StorePhoto": "Store photo"
-
-	,"BecauseOurBigCatalog": "Because we have the largest catalog in the sector, renewed daily."
-	,"BecauseThisWeb": "Because this website, with real time stock always at your disposal."
-	,"BecauseOurShoppingDep": "For our purchasing department with 9 specialized buyers."
-	,"BecauseOrderIsEasy": "Because it is very easy to place your order by web, phone or coming."
-	,"BecauseOurPlant": "Because our premises, come and visit us. You'll love."
-	,"BecauseOurSalesDep": "For our commercial department, with professionals who will always find a solution to your needs."
-	,"BecauseOurWorkShop": "Because we have a sewing shop to help you."
-	,"BecauseWeHaveWhatYouNeed": "Because we have what you need when you need it ..."
-
-	,"AboutDesc":
-		 "We are a company engaged in the wholesale and distribution of a wide range of accessories, greens and flowers to florists or other wholesalers."
-	
-	,"AboutService":
-		 "We have home delivery service with our vehicles throughout the province of Valencia and limited areas of Castellón, Alicante, Murcia, Albacete and Madrid send the rest of the peninsula by transportation agencies with 24/48 hours service (Zeleris, via express) . We also do direct sales to florists in any of our facilities."
-	
-	,"AboutDisp":
-		 "Our company has over 50 employees and several branches. The main is located in Valencia and has more than 8000 m2. We also have a warehouse located in Mercaflor - Mercavalencia (Valencia) that perform direct sales only."
-	
-	,"AboutOrder":
-		 "You can make your orders and reservations by telephone at 96 324 21 00, online through our website or directly in our facilities."
-}
--- a/forms/ecomerce/basket/locale/mn.json
+++ b/forms/ecomerce/basket/locale/mn.json
@ -1,29 +0,0 @@
-{
-	 "ShoppingBasket": "Shopping basket"
-
-	,"Delete": "Delete order"
-	,"GoToCatalog": "Go to catalog"
-	,"ConfigureOrder": "Configure order"
-	,"Checkout": "Checkout"
-
-	,"OrderNumber": "Order number"
-	,"DateExit": "Shipping date"
-	,"Warehouse": "Store"
-	,"OrderTotal": "Total"
-
-	,"Amount": "Amount"
-	,"Pack": "Pack"
-	,"Stems": "Stems"
-	,"Avail": "Avail"
-	,"Item": "Item"
-	,"Cat": "Cat"
-	,"S1": "Siz"
-	,"Color": "Color"
-	,"Origin": "Origin"
-	,"Price": "Price"
-	,"Disc": "Desc"
-	,"Subtotal": "Subtotal"
-	
-	,"Order items updated": "Your order takes too long and has been updated, prices or quantities of your items may have changed"
-	,"RememberReconfiguringImpact": "Remember that if you reconfigure your order prices or quantities of your items may change"
-}
--- a/forms/ecomerce/basket/locale/pt.json
+++ b/forms/ecomerce/basket/locale/pt.json
@ -1,19 +1,19 @@
 {
 	 "ShoppingBasket": "Cesta da compra"

-	,"Delete": "Eliminar pedido"
+	,"Delete": "Eliminar encomenda"
 	,"GoToCatalog": "Ir ao catálogo"
-	,"ConfigureOrder": "Configurar pedido"
-	,"Checkout": "Finalizar pedido"
+	,"ConfigureOrder": "Configurar encomenda"
+	,"Checkout": "Finalizar encomenda"

-	,"OrderNumber": "Nº pedido"
+	,"OrderNumber": "Nº encomenda"
 	,"DateExit": "Data de saída"
 	,"Warehouse": "Armazém"
 	,"OrderTotal": "Total"

 	,"Amount": "Quantidade"
 	,"Pack": "Pack"
-	,"Stems": "Talos"
+	,"Stems": "Pés"
 	,"Avail": "Disp"
 	,"Item": "Item"
 	,"Cat": "Cat"
@ -24,6 +24,6 @@
 	,"Disc": "Desc"
 	,"Subtotal": "Sub-total"
 	
-	,"Order items updated": "Seu pedido leva muito tiempo aberto foi atualizado, os preços ou quantidades de seus ítens podem haver modificado"
-	,"RememberReconfiguringImpact": "Lembre-se que si voltas a configurar o pedido os preços ou quantidades de ítens poderíam modificar"
+	,"Order items updated": "Seu pedido leva muito tiempo aberto foi atualizado, os preços ou quantidades de seus ítens podem haver variado"
+	,"RememberReconfiguringImpact": "Lembre-se que si voltas a configurar a encomenda os preços ou quantidades de ítens poderíam variar"
 }
--- a/forms/ecomerce/catalog/locale/mn.json
+++ b/forms/ecomerce/catalog/locale/mn.json
@ -1,57 +0,0 @@
-{
-	 "Catalog": "Catalog"
-	,"SearchResults": "Search results"
-
-	,"SelectFamily": "Select family"
-	,"Choose filter from right menu": "Choose a filter from the right menu"
-	,"Choose a realm": "Choose a realm"
-	,"ArticleNotFound": "Item not found"
-	,"ArticleNotAvailable": "Item not available"
-
-	,"List view": "List view"
-	,"Grid view": "Grid view"
-	,"Switch view": "Switch view"
-	,"StartOrder": "Start order"
-	,"ShoppingBasket": "Shopping basket"
-	
-	,"Agency": "Agency"
-	,"Warehouse": "Warehouse"
-	
-	,"Filter by": "Filter by"
-	,"Order by": "Order by"
-
-	,"Search": "Search"
-	,"Change": "Change"
-	,"Available": "Available"
-	,"Size": "Size"
-	,"Realm": "Realm"
-	,"Family": "Family"
-	,"Color": "Color"
-	,"Producer": "Producer"
-	,"Origin": "Origin"
-	,"Category": "Category"
-	,"Remove filters": "Remove filters"
-	,"Relevancy": "хамаарал"
-
-	,"Price": "Price"
-	,"Amount": "Amount"
-	,"Name": "Name"
-	,"Pack": "Pack"
-	,"Lower price": "Lower price"
-	,"Higher price": "Higher price"
-	,"Lower size": "Lower size"
-	,"Higher size": "Higher size"
-	,", %.0d Units": ", %.0d Units"
-	
-	,"from": "from"
-	,"from %.2d€": "from %.2d€"
-	,"AddToBasket": "Add to basket"
-	,"Add": "Add"
-	,"Erase": "Remove"
-	,"Confirm": "Confirm"
-
-	,"IndicativePhotos": "* Photos are indicative"
-	
-	,"Added%dOf%s": "Added %d of %s"
-	,"NoMoreAmountAvailable": "No more amount available"
-}
--- a/forms/ecomerce/catalog/locale/pt.json
+++ b/forms/ecomerce/catalog/locale/pt.json
@ -11,7 +11,7 @@
 	,"List view": "Ver como lista"
 	,"Grid view": "Vista em modo de grade"
 	,"Switch view": "Modificar vista"
-	,"StartOrder": "Iniciar pedido"
+	,"StartOrder": "Iniciar encomenda"
 	,"ShoppingBasket": "Cesta da compra"
 	
 	,"Agency": "Agência"
--- a/forms/ecomerce/checkout/locale/pt.json
+++ b/forms/ecomerce/checkout/locale/pt.json
@ -1,20 +1,20 @@
 {
-	 "ConfigureOrder": "Configurar pedido"
+	 "ConfigureOrder": "Configurar encomenda"

 	,"Cancel": "Cancelar"
 	,"Next": "Seguir"
 	
-	,"DeliveryOrPickupQuestion": "Queres receber ou recolher o pedido?"
+	,"DeliveryOrPickupQuestion": "Queres receber ou levantar a encomenda?"
 	,"ReceiveThroughtAgency": "Receber por agência"
 	,"ReceiveThroughtRoute": "Transporte Verdnatura"
-	,"PickupInStore": "Recolher no armazém"
+	,"PickupInStore": "Levantar no armazém"
 	,"Select agency": "Selecione uma agência"
 	
-	,"OrderDateDeliveryQuestion": "Que dia queres receber o pedido?"
-	,"OrderDatePickupQuestion": "Que dia queres recolher o pedido?"
-	,"AddressQuestion": "Onde queres receber o pedido?"
-	,"AgencyQuestion": "Por que agência queres receber o pedido?"
-	,"PickupWarehouseQuestion": "Em que armazém queres recolher o pedido?"
+	,"OrderDateDeliveryQuestion": "Que dia queres receber a encomenda?"
+	,"OrderDatePickupQuestion": "Que dia queres levantar a encomenda?"
+	,"AddressQuestion": "Onde queres receber a encomenda?"
+	,"AgencyQuestion": "Por qual agência queres receber a encomenda?"
+	,"PickupWarehouseQuestion": "Em qual armazém queres levantar a encomenda?"

 	,"ConfirmToAccessCatalog": "Confirme os dados para entrar no catálogo"
 	,"Arrival": "Chegada"
@ -23,9 +23,9 @@
 	,"Warehouse": "Armazém"
 	,"Confirm": "Confirmar"

-	,"OrderStarted": "Pedido iniciado"
-	,"OrderUpdated": "Pedido atualizado"
+	,"OrderStarted": "Encomenda iniciada"
+	,"OrderUpdated": "Encomenda actualizada"
 	
-	,"NoAgeciesAvailableForDate": "Não há agências disponíveis para a data e o consignatario seleccionado, modifique a data de envío do pedido"
-	,"NoWarehousesAvailableForDate": "Não há armazéns disponíveis pa a data seleccionada, modifique a data de recolhida do pedido"
+	,"NoAgeciesAvailableForDate": "Não há agências disponíveis para a data e o consignatario escolhido, modifique a data de envío do pedido"
+	,"NoWarehousesAvailableForDate": "Não há armazéns disponíveis para a data seleccionada, modifique a data para levantar a encomenda"
 }
--- a/forms/ecomerce/confirm/locale/mn.json
+++ b/forms/ecomerce/confirm/locale/mn.json
@ -1,36 +0,0 @@
-{
-	 "Checkout": "Checkout"
-
-	,"Order summary": "Order summary"
-	,"Delivery at": "Delivery at"
-	,"Agency": "Agency"
-	,"Warehouse": "Store"
-	
-	,"Previous balance": "Previous balance"
-	,"Order total": "Order total"
-	,"Order VAT": "Order VAT"
-	,"Total debt": "Total debt"
-	,"Credit": "Credit"
-	,"Exceeded credit": "Exceeded credit"
-	
-	,"Amount to pay": "Amount to pay"
-	,"Pay method": "Pay method"
-
-	,"Use my balance": "Use my balance"
-	,"You have a favorable balance.": "You do not need to perform any payment, you have a favorable balance."
-	,"Use my credit": "Use my credit"
-	,"You have a favorable credit.": "You do not need to pay now, you have a favorable credit."
-	,"Credit card": "Credit card"
-	,"You will be redirected to the payment.": "By confirming the order you will be redirected to the payment platform."
-	,"Bank Transfer": "Bank Transfer"
-	,"Make a transfer to one account.": "Make a transfer to one of the following accounts and send the receipt to your salesperson."
-	,"Pay later": "Pay later"
-
-	,"Modify": "Modify"
-	,"Confirm": "Confirm"
-	
-	,"Order confirmed successfully": "Your order has been confirmed successfully"
-	,"Accept": "Accept"
-	
-	,"You have exceeded your credit.": "You have exceeded your credit, in order to prepare your order please pay your debt."
-}
--- a/forms/ecomerce/confirm/locale/pt.json
+++ b/forms/ecomerce/confirm/locale/pt.json
@ -1,29 +1,29 @@
 {
-	 "Checkout": "Finalizar pedido"
+	 "Checkout": "Finalizar encomenda"

-	,"Order summary": "Resumo do pedido"
+	,"Order summary": "Resumo da encomenda"
 	,"Delivery at": "Entrega na"
 	,"Agency": "Agência"
 	,"Warehouse": "Armazém"
 	
-	,"Previous balance": "Equilíbrio anterior"
+	,"Previous balance": "Saldo anterior"
 	,"Order total": "Total pedido"
-	,"Order VAT": "IVA pedido"
-	,"Total debt": "Total deuda"
+	,"Order VAT": "IVA"
+	,"Total debt": "Total dívida"
 	,"Credit": "Crédito"
 	,"Exceeded credit": "Crédito excedido"
 	
-	,"Amount to pay": "Valor devido"
+	,"Amount to pay": "Valor a pagar"
 	,"Pay method": "Método de pagamento"

-	,"Use my balance": "Use o meu equilíbrio"
-	,"You have a favorable balance.": "Não há necessidade de pagar qualquer coisa, você tem um saldo favorável."
-	,"Use my credit": "Use o meu crédito"
-	,"You have a favorable credit.": "Não há necessidade de pagar nada, você favorável de crédito."
-	,"Credit card": "Cartão de crédito"
-	,"You will be redirected to the payment.": "Ao confirmar o pedido, você será redirecionado para a plataforma de pagamento."
+	,"Use my balance": "Usar meu saldo"
+	,"You have a favorable balance.": "Não há necessidade de pagar, tens um crédito a seu favor."
+	,"Use my credit": "Usar meu crédito"
+	,"You have a favorable credit.": "Não há necessidade de pagar, tens um crédito à favor."
+	,"Credit card": "Cartão de crédito/debito"
+	,"You will be redirected to the payment.": "Ao confirmar a encomenda, serás re-direcionado à plataforma de pagamento."
 	,"Bank Transfer": "Transferência bancária"
-	,"Make a transfer to one account.": "Faça Transferido para uma das seguintes contas e enviar o comprovante para o seu negócio."
+	,"Make a transfer to one account.": "Faça a transferencia para uma das seguintes contas e envie o comprovativo para seu comercial."
 	,"Pay later": "Pagar mais tarde"

 	,"Modify": "Modificar"
@ -32,5 +32,5 @@
 	,"Order confirmed successfully": "Seu pedido foi realizado com êxito"
 	,"Accept": "Aceitar"
 	
-	,"You have exceeded your credit.": "Você ultrapassou o seu crédito, por favor, fazer o pagamento para que possamos preparar a sua ordem."
+	,"You have exceeded your credit.": "Ultrapassastes seu crédito, por favor, faça o pagamento para que possamos preparar sua encomenda."
 }
--- a/forms/ecomerce/invoices/locale/pt.json
+++ b/forms/ecomerce/invoices/locale/pt.json
@ -6,5 +6,5 @@
 	,"Serial": "Serie"
 	,"Date": "Data"
 	,"Import": "Importe"
-	,"Download PDF": "Descarregar PDF"
+	,"Download PDF": "Baixar PDF"
 }
--- a/forms/ecomerce/orders/locale/pt.json
+++ b/forms/ecomerce/orders/locale/pt.json
@ -1,14 +1,14 @@
 {
-	 "OpenOrders": "Pedidos abertos"
+	 "OpenOrders": "Abrir encomendas"

-	,"StartOrder": "Iniciar pedido"
-	,"ContinueOrder": "Continuar pedido"
+	,"StartOrder": "Iniciar encomenda"
+	,"ContinueOrder": "Continuar encomenda"
 	,"OrderNumber": "Nº pedido"
 	,"DateMake": "Data de criação"
 	,"DateExit": "Data de saída"
 	,"SendMethod": "Forma de envío"

-	,"LastOrders": "Últimos pedidos"
+	,"LastOrders": "Últimas encomendas"

 	,"Show orders from": "Mostrar ordens de"
 	,"Balance:": "Saldo:"
@ -20,16 +20,16 @@
 	,"Basket": "Cesta"
 	,"ShoppingBasket": "Cesta da compra"

-	,"SeeOrder": "Mostrar detalhe do pedido"
+	,"SeeOrder": "Ver encomenda"
 	,"Delivery": "Entrega"
-	,"TicketNumber": "Nº ticket"
+	,"TicketNumber": "Nº encomenda"
 	,"SentAddress": "Endereço de envío"
 	,"Consignee": "Consignatario"
 	,"Boxes": "Bultos"
 	,"TotalWithVAT": "Total com IVA"
-	,"PayOrder": "Pagar pedido"
+	,"PayOrder": "Pagar encomenda"
 	
-	,"An error has been in the payment": "Parece que não houve um erro no pagamento"
+	,"An error has been in the payment": "Parece que houve um erro no pagamento"
 	,"Retry": "Tentar novamente"
 	,"Accept": "Aceitar"
 }
--- a/forms/ecomerce/ticket/locale/pt.json
+++ b/forms/ecomerce/ticket/locale/pt.json
@ -1,20 +1,20 @@
 {
-	 "OrderDetail": "Detalhe do pedido"
+	 "OrderDetail": "Detalhes da encomenda"

-	,"Delivery note": "Guía de remessa"
+	,"Delivery note": "Nota de entrega"

 	,"Delivery": "Entrega"
 	,"Total": "Total"
-	,"Total + tax": "Total + imposto"
-	,"Tax base": "Tributável"
+	,"Total + tax": "Total + IVA"
+	,"Tax base": "Base tributável"
 	,"VAT": "IVA"

-	,"ItemNumber": "Nº artículo"
+	,"ItemNumber": "Nº Ítem"
 	,"Amount": "Qtde"
 	,"Item": "Ítem"
 	,"Category": "Categoría"
 	,"S1": "Med"
-	,"Stems": "Talos"
+	,"Stems": "Pés"
 	,"Color": "Cor"
 	,"Origin": "Orígem"
 	,"Price": "Preço"
--- a/forms/news/new/locale/mn.json
+++ b/forms/news/new/locale/mn.json
@ -1,13 +0,0 @@
-{
-	 "AddEditNew": "Add or edit new"
-
-	,"Title": "Title"
-	,"NewBody": "New body"
-	,"Tag": "Tag"
-	,"Priority": "Priority"
-
-	,"Return": "Return"
-	,"Accept": "Accept"
-	
-	,"NewChangedSuccessfully": "New changed successfully"
-}
--- a/forms/news/news/locale/mn.json
+++ b/forms/news/news/locale/mn.json
@ -1,12 +0,0 @@
-{
-	 "NewsManagement": "News management"
-
-	,"AddNew": "Add new"
-	,"EditNew": "Edit new"
-
-	,"NewNum": "New number"
-	,"Date": "Date"
-	,"Author": "Author"
-	,"Title": "Title"
-	,"Priority": "Priority"
-}
--- a/forms/reports/items-form/locale/mn.json
+++ b/forms/reports/items-form/locale/mn.json
@ -1,9 +0,0 @@
-{
-	 "Item list": "Item list"
-
-	,"Store": "Store"
-	,"Realm": "Realm"
-	,"Rate": "Rate"
-
-	,"Preview": "Preview"
-}
--- a/js/db/locale/mn.json
+++ b/js/db/locale/mn.json
@ -1,7 +0,0 @@
-{
-	 "ConnError": "Connection failed"
-	,"BadServerReply": "Bad server reply"
-	,"ModelNotUpdatable": "Model not updatable"
-	,"RowNotExists": "The record does not exist or has been deleted"
-	,"ColNotExists": "The column does not exist"
-}
--- a/js/db/locale/pt.json
+++ b/js/db/locale/pt.json
@ -1,7 +1,7 @@
 {
 	 "ConnError": "Erro de conexão"
-	,"BadServerReply": "Resposta do servidor incorreta"
-	,"ModelNotUpdatable": "Este modelo não é actualizável"
+	,"BadServerReply": "Má Resposta do servidor"
+	,"ModelNotUpdatable": "Este modelo não está actualizado"
 	,"RowNotExists": "O Registro não existe ou foi apagado"
 	,"ColNotExists": "A Coluna não existe"
 }
--- a/js/hedera/locale/pt.json
+++ b/js/hedera/locale/pt.json
@ -3,18 +3,18 @@
 	,"Password": "Palavra-Passe"
 	,"Beta": "Beta"
 	,"Do not sign out": "Não finalizar Sessão"
-	,"Log in as guest": "Digite como convidado"
+	,"Log in as guest": "Entrar como convidado"
 	,"Enter": "Entrar"
 	,"Login mail": "clientes@verdnatura.es"
 	,"Login phone": "+34 963 242 100"
-	,"Password forgotten? Push here": "Contra-senha? empurre aqui"
-	,"Yet you are not a customer?": "No entanto, você não é um cliente?"
-	,"Sign up": "Inscrever-se"
+	,"Password forgotten? Push here": "Não lembro minha palavra-passe"
+	,"Yet you are not a customer?": "Ainda não és cliente?"
+	,"Sign up": "Cadastrar-se"

 	,"You've been too idle": "Muito tempo de inatividade, a sessão foi finalizada"
 	,"Invalid login": "Usuário ou Palavra-Passe incorreto, lembre-se de diferenciar maiusculas e minusculas"
 	,"Please write your user name": "Por favor, escreva seu nome de usuário"
-	,"A mail has been sent wich you can recover your password": "Um e-mail foi enviado a qual poderá recuperar sua senha"
+	,"A mail has been sent wich you can recover your password": "Um e-mail foi enviado para recuperar sua palavra-passe"

 	,"Menu": "Menú"
 	,"Exit": "Sair"
@ -28,19 +28,19 @@

 	,"Error loading form": "Erro ao carregar formulario"
 	,"Error loading report": "Erro ao carregar o informe"
-	,"By using this site you accept cookies": "Ao utilizar esta pagina web, aceitar o uso de cookies para a personalização de conteúdos e análise."
-	,"New version available": "Existe uma nova atualização, a página se atualizará automaticamente para descarregar-la"
+	,"By using this site you accept cookies": "Ao utilizar esta pagina web, aceitas o uso de cookies para a personalização de conteúdos e análise."
+	,"New version available": "Existe uma nova atualização, a página se atualizará automaticamente"
 	
 	,"AppName": "VerdNatura"

 	,"Home": "Principio"
-	,"Orders": "Pedidos"
+	,"Orders": "Encomendas"
 		,"Basket": "Cesta"
-		,"Last orders": "Últimos pedidos"
+		,"Last orders": "Últimas encomendas"
 		,"Invoices": "Facturas"
 	,"Catalog": "Catálogo"
 	,"About": "Conheça-nos"
-		,"About us": "Sobre a gente"
+		,"About us": "Sobre nós"
 		,"Why": "Por quê?"
 	,"Location": "Localização"
 	,"Administration": "Administração"
@ -59,7 +59,7 @@
 	,"Agencies": "Agências"
 	,"Configuration": "Configuração"
 		,"Account": "Conta"
-		,"Addresses": "Endereços"
+		,"Addresses": "Moradas"
 		
 	,"AmountToPay:": "Quantidade a pagar (€):"
 	,"AmountError": "A quantidade deve ser um número positivo"
--- a/js/htk/locale/pt.json
+++ b/js/htk/locale/pt.json
@ -10,7 +10,7 @@
 	,"Remove": "Eliminar"
 	,"Loading": "Carregando"
 	,"Loading...": "Carregando..."
-	,"ReallyDelete": "Tens certeza que queres apagar esta linha?"
+	,"ReallyDelete": "Tens certeza que queres eliminar esta linha?"
 	,"YouMustBeLoggedIn": "Deves estar registrado como usuario"
 	,"EmptyList": "Lista vazia"
 	,"NoData": "Sem dados"
--- a/js/vn/locale.js
+++ b/js/vn/locale.js
@ -7,13 +7,14 @@ vnLocaleStrings = {};
 module.exports =
 {
 	language: null
+	,defaultLang: 'en'
 	
 	,init: function ()
 	{
 		if (this.language)
 			return;

-		var language = 'en';
+		var language = this.defaultLang;
 		var languages = navigator.languages;

 		if (languages && languages.length > 0)
@ -28,12 +29,72 @@ module.exports =
 	{
 		this.init ();

-		var file = path +'/locale/'+ this.language +'.json'+ Vn.getVersion ();
+		var data = {
+			path: path,
+			callback: callback,
+			defOk: false,
+			orgOk: this.defaultLang === this.language
+		};
+
+		data.def = this.createRequest (data, true, this.defaultLang);
+
+		if (!data.orgOk)
+			data.org = this.createRequest (data, false, this.language);
+	}
+
+	,createRequest: function (data, isDef, lang)
+	{
+		var langFile = this.getLocalePath (data.path, lang);

 		var request = new XMLHttpRequest ();
-		request.open ('GET', file, true);
-		request.onreadystatechange = this.loadDone.bind (this, request, callback);
+		request.open ('get', langFile, true);
+		request.onreadystatechange =
+			this.onRequestReady.bind (this, request, data, isDef);
 		request.send ();
+		return request;
+	}
+
+	,onRequestReady: function (request, data, isDef)
+	{
+		if (request.readyState != 4)
+			return;
+
+		if (isDef)
+		{
+			this.loadFromRequest (request);
+			data.defOk = true;
+		}
+		else
+			data.orgOk = true;
+
+		if (data.orgOk && data.defOk)
+		{
+			if (data.org != null)
+				this.loadFromRequest (data.org)
+			if (data.callback)
+				data.callback ();
+		}
+	}
+
+	,loadFromRequest: function (request)
+	{
+		if (request.status !== 200)
+			return false;
+	
+		try {
+			this.add (JSON.parse (request.responseText));
+			return true;
+		}
+		catch (e) {
+			console.error (e);
+		}
+
+		return false
+	}
+
+	,getLocalePath: function (path, lang)
+	{
+		return path +'/locale/'+ lang +'.json'+ Vn.getVersion ();
 	}
 	
 	,loadScript: function (path, callback)
@ -42,27 +103,6 @@ module.exports =
 		Vn.includeJs (path +'/locale/'+ this.language, callback);
 	}
 	
-	,loadDone: function (request, callback)
-	{
-		if (request.readyState != 4)
-			return;
-			
-		var success = false;
-
-		if (request.status == 200)
-		{
-			try {
-				this.add (JSON.parse (request.responseText));
-				success = true;
-			}
-			catch (e) {
-				console.log ('Locale: %s', e);
-			}
-		}		
-
-		callback (success);
-	}
-	
 	,add: function (translations)
 	{
 		for (var str in translations)
@ -73,6 +113,6 @@ module.exports =
 window._ = function (stringId)
 {
 	var string = vnLocaleStrings[stringId];
-	return (string) ? string : stringId;
+	return string ? string : stringId;
 }

--- a/pages/update-browser/locale/pt.json
+++ b/pages/update-browser/locale/pt.json
@ -1,4 +1,4 @@
 {
-	 "UpdateYourBrowser": "Atualiza seu navegador"
+	 "UpdateYourBrowser": "Atualize seu navegador"
 	,"ContinueAnyway": "Continuar de todas maneiras"
 }
--- a/reports/recover-password/locale/pt.json
+++ b/reports/recover-password/locale/pt.json
@ -0,0 +1,5 @@
+{
+	 "Recover password": "Recuperar palavra-passe"
+	,"Press on the following link to change your password.":
+		"Pressione o botão para modificar sua palavra-passe."
+}
--- a/reports/shelves-report/locale/pt.json
+++ b/reports/shelves-report/locale/pt.json
@ -0,0 +1,5 @@
+{
+	 "Start": "Inicio"
+	,"End": "Final"
+	,"Pallet": "Palete"
+}
--- a/rest/image/locale/pt.json
+++ b/rest/image/locale/pt.json
@ -0,0 +1,28 @@
+{
+	 "Cant lock cache": "O cache não pôde ser bloqueado"
+	,"Bad file format": "Formato de arquivo inválido"
+	,"File not choosed": "Não selecionastes nenhum arquivo"
+	,"Permission denied": "Não estas autorizado a subir o arquivo"
+	,"File upload error": "Erro ao subir o arquivo, verifique o tamanho"
+	,"File save error": "Erro ao salvar o arquivo: %s"
+	,"File size error": "O arquivo não deve ser maior que: %.2f MB"
+	,"Bad file name": "O nome do arquivo deve conter somente letras minusculas, numeros  ou '_' "
+	,"Bad schema name": "Nome de esquema inválido"
+	,"Schema not exists": "Esquema não existe"
+	,"Unreferenced file": "O arquivo não é referenciado pelo banco de dados"
+	,"Com error": "Erro de comunicação com o servidor"
+	,"Image open error": "Erro ao abrir a imagem"
+	,"Operation disabled": "Operação desativada por segurança"
+	,"Image added": "Imagem adicionada corretamente"
+	
+	,"ErrIniSize": "Arquivo supera o tamanho maximo de protocolo em php.ini"
+	,"ErrFormSize": "Arquivo supera o tamanho maximo de protocolo em HTML form"
+	,"ErrPartial": "Arquivo subido parcialmente"
+	,"ErrNoFile": "Nenhum arquivo subido"
+	,"ErrNoTmpDir": "Falta a pasta de arquivo temporal"
+	,"ErrCantWrite": "Erro ao gravar arquivo no disco"
+	,"ErrExtension": "Erro de extensão do arquivo"
+	,"ErrDefault": "Erro desconhecido ao subir arquivo"
+
+	,"Sync complete": "Sincronização completa"
+}
--- a/web/locale/pt.json
+++ b/web/locale/pt.json
@ -0,0 +1,5 @@
+{
+	 "Something went wrong": "Algo deu errado"
+	,"You don't have enough privileges": "Não tens previlegios suficientes"
+	,"Missing parameters": "Faltam parametros"
+}