From 2478c19fc2f3466a0559aef77196a4d65f260fe9 Mon Sep 17 00:00:00 2001
From: Juan Ferrer Toribio <juan.ferrer.toribio@gmail.com>
Date: Thu, 30 Jul 2015 19:50:43 +0200
Subject: [PATCH] Traducciones actualizadas

---
 .../usr/share/hedera-web/forms/ecomerce/confirm/ui.xml |  2 +-
 .../share/hedera-web/locale/ca/forms/account/conf.json | 10 +++++-----
 .../share/hedera-web/locale/ca/forms/cms/training.json |  1 +
 .../hedera-web/locale/ca/forms/ecomerce/checkout.json  |  2 +-
 .../hedera-web/locale/ca/forms/ecomerce/orders.json    |  2 ++
 .../share/hedera-web/locale/es/forms/cms/training.json |  1 +
 .../share/hedera-web/locale/fr/forms/account/conf.json | 10 +++++-----
 .../share/hedera-web/locale/fr/forms/cms/contact.json  |  2 +-
 .../share/hedera-web/locale/fr/forms/cms/training.json |  1 +
 .../hedera-web/locale/fr/forms/ecomerce/orders.json    |  2 ++
 .../share/hedera-web/locale/mn/forms/cms/training.json |  1 +
 package/usr/share/hedera-web/pages/web/html.php        |  4 +---
 package/usr/share/hedera-web/pages/web/web.js          |  3 +++
 13 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/package/usr/share/hedera-web/forms/ecomerce/confirm/ui.xml b/package/usr/share/hedera-web/forms/ecomerce/confirm/ui.xml
index da5e521c..730f6f12 100755
--- a/package/usr/share/hedera-web/forms/ecomerce/confirm/ui.xml
+++ b/package/usr/share/hedera-web/forms/ecomerce/confirm/ui.xml
@@ -35,7 +35,7 @@
 		<div class="form">
 			<div class="section">
 				<p>
-					<t>Llegada</t> 
+					<t>Arrival</t> 
 					<htk-text format="_%A, %e of %B" form="order-form" column="date_send"/>
 				</p>
 				<p class="small">
diff --git a/package/usr/share/hedera-web/locale/ca/forms/account/conf.json b/package/usr/share/hedera-web/locale/ca/forms/account/conf.json
index 366d4c44..0dfa287d 100755
--- a/package/usr/share/hedera-web/locale/ca/forms/account/conf.json
+++ b/package/usr/share/hedera-web/locale/ca/forms/account/conf.json
@@ -1,12 +1,12 @@
 {
 	 "Configuration": "Configuració"
 
-	,"UserNumber": "N d'usuari:"
-	,"UserName": "Nom d'usuari:"
-	,"Password": "Contrasenya:"
-	,"Email": "Correu electrònic:"
+	,"UserNumber": "N d'usuari"
+	,"UserName": "Nom d'usuari"
+	,"Password": "Contrasenya"
+	,"Email": "Correu electrònic"
 	,"Billing": "Facturació"
-	,"ReceiveInvoicesByEmail": "Rebre factures per correu electrònic:"
+	,"ReceiveInvoicesByEmail": "Rebre factures per correu electrònic"
 	
 	,"NewPassword": "Nova contrasenya"
 	,"RepeatPassword": "Repetir contrasenya"
diff --git a/package/usr/share/hedera-web/locale/ca/forms/cms/training.json b/package/usr/share/hedera-web/locale/ca/forms/cms/training.json
index e69de29b..0967ef42 100755
--- a/package/usr/share/hedera-web/locale/ca/forms/cms/training.json
+++ b/package/usr/share/hedera-web/locale/ca/forms/cms/training.json
@@ -0,0 +1 @@
+{}
diff --git a/package/usr/share/hedera-web/locale/ca/forms/ecomerce/checkout.json b/package/usr/share/hedera-web/locale/ca/forms/ecomerce/checkout.json
index 7a2713aa..0e5ee4c2 100755
--- a/package/usr/share/hedera-web/locale/ca/forms/ecomerce/checkout.json
+++ b/package/usr/share/hedera-web/locale/ca/forms/ecomerce/checkout.json
@@ -24,5 +24,5 @@
 	,"Confirm": "Confirmar"
 
 	,"OrderStarted": "Comanda començada"
-	,"OrderUpdated": "Pedido actualitzada"
+	,"OrderUpdated": "Comanda actualitzada"
 }
diff --git a/package/usr/share/hedera-web/locale/ca/forms/ecomerce/orders.json b/package/usr/share/hedera-web/locale/ca/forms/ecomerce/orders.json
index 26962491..1732efab 100755
--- a/package/usr/share/hedera-web/locale/ca/forms/ecomerce/orders.json
+++ b/package/usr/share/hedera-web/locale/ca/forms/ecomerce/orders.json
@@ -16,6 +16,8 @@
 	,"Company": "Empresa"
 	,"Pending": "Pendent"
 	,"Pay": "Pagar"
+	,"Basket": "Cistella"
+	,"ShoppingBasket": "Cistella de la compra"
 
 	,"SeeOrder": "Mostrar detall de l'encàrrec"
 	,"TicketNumber": "N ticket"
diff --git a/package/usr/share/hedera-web/locale/es/forms/cms/training.json b/package/usr/share/hedera-web/locale/es/forms/cms/training.json
index e69de29b..0967ef42 100755
--- a/package/usr/share/hedera-web/locale/es/forms/cms/training.json
+++ b/package/usr/share/hedera-web/locale/es/forms/cms/training.json
@@ -0,0 +1 @@
+{}
diff --git a/package/usr/share/hedera-web/locale/fr/forms/account/conf.json b/package/usr/share/hedera-web/locale/fr/forms/account/conf.json
index 32a3001a..589191c9 100755
--- a/package/usr/share/hedera-web/locale/fr/forms/account/conf.json
+++ b/package/usr/share/hedera-web/locale/fr/forms/account/conf.json
@@ -1,12 +1,12 @@
 {
 	 "Configuration": "Configuration"
 
-	,"UserNumber": "Numéro utilisateur:"
-	,"UserName": "Utilisateur:"
-	,"Password": "Mot de passe:"
-	,"Email": "Courrier électronique:"
+	,"UserNumber": "Numéro utilisateur"
+	,"UserName": "Utilisateur"
+	,"Password": "Mot de passe"
+	,"Email": "Courrier électronique"
 	,"Billing": "Facturation"
-	,"ReceiveInvoicesByEmail": "Recevoir des factures par e-mail:"
+	,"ReceiveInvoicesByEmail": "Recevoir des factures par e-mail"
 	
 	,"NewPassword": "Nouveau mot de passe"
 	,"RepeatPassword": "Répéter le mot de passe"
diff --git a/package/usr/share/hedera-web/locale/fr/forms/cms/contact.json b/package/usr/share/hedera-web/locale/fr/forms/cms/contact.json
index 66cfcb15..b36e85d1 100755
--- a/package/usr/share/hedera-web/locale/fr/forms/cms/contact.json
+++ b/package/usr/share/hedera-web/locale/fr/forms/cms/contact.json
@@ -3,7 +3,7 @@
 	
 	,"FillFormData": "Remplissez le formulaire avec vos coordonnées et nous prendrons contact avec vous sous peu."
 	,"OrCallUs": "Ou si vous préférez nous appeler au 0033 781 533 900."
-	,"AllFieldsMandatory": "* Todos los campos son obligatorios."
+	,"AllFieldsMandatory": "* Tous les champs sont obligatoires."
 	
 	,"Name": "Nom"
 	,"Surname": "Nom"
diff --git a/package/usr/share/hedera-web/locale/fr/forms/cms/training.json b/package/usr/share/hedera-web/locale/fr/forms/cms/training.json
index e69de29b..0967ef42 100755
--- a/package/usr/share/hedera-web/locale/fr/forms/cms/training.json
+++ b/package/usr/share/hedera-web/locale/fr/forms/cms/training.json
@@ -0,0 +1 @@
+{}
diff --git a/package/usr/share/hedera-web/locale/fr/forms/ecomerce/orders.json b/package/usr/share/hedera-web/locale/fr/forms/ecomerce/orders.json
index 7ab7a4b0..bcac297a 100755
--- a/package/usr/share/hedera-web/locale/fr/forms/ecomerce/orders.json
+++ b/package/usr/share/hedera-web/locale/fr/forms/ecomerce/orders.json
@@ -16,6 +16,8 @@
 	,"Company": "Entreprise"
 	,"Pending": "Pente"
 	,"Pay": "Payer"
+	,"Basket": "Panier"
+	,"ShoppingBasket": "Panier"
 
 	,"SeeOrder": "Votre panier"
 	,"TicketNumber": "Numéro ticket"
diff --git a/package/usr/share/hedera-web/locale/mn/forms/cms/training.json b/package/usr/share/hedera-web/locale/mn/forms/cms/training.json
index e69de29b..0967ef42 100755
--- a/package/usr/share/hedera-web/locale/mn/forms/cms/training.json
+++ b/package/usr/share/hedera-web/locale/mn/forms/cms/training.json
@@ -0,0 +1 @@
+{}
diff --git a/package/usr/share/hedera-web/pages/web/html.php b/package/usr/share/hedera-web/pages/web/html.php
index 5826a97a..44a1446d 100755
--- a/package/usr/share/hedera-web/pages/web/html.php
+++ b/package/usr/share/hedera-web/pages/web/html.php
@@ -30,9 +30,7 @@
 	<div id="content">
 		<div id="menu-box">
 			<div id="menu-overflow">
-				<a id="test-link" href="//test-www.verdnatura.es">
-					<?=s('TestTheNewWebsite')?>
-				</a>
+				<a id="test-link" href="//test-www.verdnatura.es"></a>
 				<ul id="menu"></ul>
 			</div>
 			<div id="links">
diff --git a/package/usr/share/hedera-web/pages/web/web.js b/package/usr/share/hedera-web/pages/web/web.js
index b156476d..07ea61d7 100755
--- a/package/usr/share/hedera-web/pages/web/web.js
+++ b/package/usr/share/hedera-web/pages/web/web.js
@@ -113,7 +113,10 @@ Vn.Web =
 				$('test-link').href = res.get ('production_domain');
 			}
 			else
+			{
+				Vn.Node.setText ($('test-link'), _('TestTheNewWebsite'));
 				$('test-link').href = res.get ('test_domain');
+			}
 		}
 		else
 			Vn.Node.hide ($('test-link'));