diff --git a/.eslintrc.yml b/.eslintrc.yml
index cbeacb9c..dd8a09cc 100644
--- a/.eslintrc.yml
+++ b/.eslintrc.yml
@@ -1,7 +1,6 @@
 extends: eslint:recommended
-env:
-    es6: true
 parserOptions:
+    ecmaVersion: 2017
     sourceType: module
 rules:
     no-undef: 0
diff --git a/app.js b/app.js
index fd178a78..0481dfe5 100644
--- a/app.js
+++ b/app.js
@@ -32,30 +32,30 @@ function loadLocale (cb)
 	Vn.Locale.init ();
 	var lang = Vn.Locale.language;
 
-	var req = require.context ('js', true, /locale\/en.json$/);
+	var req = require.context ('js', true, /locale\/en.yml$/);
 	onLocaleLoad (req);
 
 	switch (lang)
 	{
 		case 'ca':
 			require ([], function () {
-				cb (require.context ('js', true, /locale\/ca.json$/)); });
+				cb (require.context ('js', true, /locale\/ca.yml$/)); });
 			break;
 		case 'es':
 			require ([], function () {
-				cb (require.context ('js', true, /locale\/es.json$/)); });
+				cb (require.context ('js', true, /locale\/es.yml$/)); });
 			break;
 		case 'fr':
 			require ([], function () {	
-				cb (require.context ('js', true, /locale\/fr.json$/)); });
+				cb (require.context ('js', true, /locale\/fr.yml$/)); });
 			break;
 		case 'mn':
 			require ([], function () {	
-				cb (require.context ('js', true, /locale\/mn.json$/)); });
+				cb (require.context ('js', true, /locale\/mn.yml$/)); });
 			break;
 		case 'pt':
 			require ([], function () {	
-				cb (require.context ('js', true, /locale\/pt.json$/)); });
+				cb (require.context ('js', true, /locale\/pt.yml$/)); });
 			break;
 		default:
 			cb ();
diff --git a/conf/apache.conf b/conf/apache.conf
index d572f9cb..7bd45de6 100644
--- a/conf/apache.conf
+++ b/conf/apache.conf
@@ -1,12 +1,16 @@
 # Alias /hedera-web /usr/share/hedera-web/
 # Alias /image-db /var/lib/hedera-web/image-db/
 
+<IfModule mod_mime.c>
+	AddType text/x-yaml .yml
+</IfModule>
+
 <Directory /usr/share/hedera-web/>
 	Options -Indexes -FollowSymLinks
 	AllowOverride None
 	Require all granted
 	
-	<FilesMatch "\.(css|js|json|php|xml|html|svg)$">
+	<FilesMatch "\.(css|js|json|yml|php|xml|html|svg)$">
 		SetOutputFilter DEFLATE
 	</FilesMatch>
 	
diff --git a/debian/changelog b/debian/changelog
index e4b7bb61..bd52f907 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-hedera-web (1.405.76) stable; urgency=low
+hedera-web (1.405.77) stable; urgency=low
 
   * Initial Release.
 
diff --git a/env.php b/env.php
index 3ddf9c0a..55bbbf13 100644
--- a/env.php
+++ b/env.php
@@ -11,4 +11,3 @@ const _DEV_MODE = TRUE;
 const _CONFIG_DIR = __DIR__.'/../../.config';
 const _LOG_DIR = '/tmp';
 const _DATA_DIR = '/tmp';
-
diff --git a/forms/account/address-list/locale/ca.json b/forms/account/address-list/locale/ca.json
deleted file mode 100644
index 9d1b959e..00000000
--- a/forms/account/address-list/locale/ca.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	 "Addresses": "Direccions"
-	
-	,"Return": "Tornar"
-	,"AddAddress": "Afegir adreça"
-	
-	,"SetAsDefault": "Establir com per defecte"
-	,"RemoveAddress": "Esborrar direcció"
-	,"EditAddress": "Modificar direcció"
-	,"AreYouSureDeleteAddress": "Estàs segur de que vols eliminar la direcció?"
-}
diff --git a/forms/account/address-list/locale/ca.yml b/forms/account/address-list/locale/ca.yml
new file mode 100644
index 00000000..cf541723
--- /dev/null
+++ b/forms/account/address-list/locale/ca.yml
@@ -0,0 +1,7 @@
+Addresses: Direccions
+Return: Tornar
+AddAddress: Afegir adreça
+SetAsDefault: Establir com per defecte
+RemoveAddress: Esborrar direcció
+EditAddress: Modificar direcció
+AreYouSureDeleteAddress: Estàs segur de que vols eliminar la direcció?
diff --git a/forms/account/address-list/locale/en.json b/forms/account/address-list/locale/en.json
deleted file mode 100644
index 8d531c98..00000000
--- a/forms/account/address-list/locale/en.json
+++ /dev/null
@@ -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?"
-}
diff --git a/forms/account/address-list/locale/en.yml b/forms/account/address-list/locale/en.yml
new file mode 100644
index 00000000..df5b564f
--- /dev/null
+++ b/forms/account/address-list/locale/en.yml
@@ -0,0 +1,7 @@
+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?
diff --git a/forms/account/address-list/locale/es.json b/forms/account/address-list/locale/es.json
deleted file mode 100644
index db745085..00000000
--- a/forms/account/address-list/locale/es.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	 "Addresses": "Direcciones"
-	
-	,"Return": "Volver"
-	,"AddAddress": "Añadir dirección"
-	
-	,"SetAsDefault": "Establecer como predeterminada"
-	,"RemoveAddress": "Borrar dirección"
-	,"EditAddress": "Modificar dirección"
-	,"AreYouSureDeleteAddress": "¿Estás seguro de que quieres borrar la dirección?"
-}
diff --git a/forms/account/address-list/locale/es.yml b/forms/account/address-list/locale/es.yml
new file mode 100644
index 00000000..66c4576d
--- /dev/null
+++ b/forms/account/address-list/locale/es.yml
@@ -0,0 +1,7 @@
+Addresses: Direcciones
+Return: Volver
+AddAddress: Añadir dirección
+SetAsDefault: Establecer como predeterminada
+RemoveAddress: Borrar dirección
+EditAddress: Modificar dirección
+AreYouSureDeleteAddress: ¿Estás seguro de que quieres borrar la dirección?
diff --git a/forms/account/address-list/locale/fr.json b/forms/account/address-list/locale/fr.json
deleted file mode 100644
index 2f380f0c..00000000
--- a/forms/account/address-list/locale/fr.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	 "Addresses": "Adresses"
-	
-	,"Return": "Retour"
-	,"AddAddress": "Ajouter une adresse"
-	
-	,"SetAsDefault": "Définir par défaut"
-	,"RemoveAddress": "Supprimer l'adresse"
-	,"EditAddress": "Changement d'adresse"
-	,"AreYouSureDeleteAddress": "Souhaitez-vous vraiment supprier l'adresse?"
-}
diff --git a/forms/account/address-list/locale/fr.yml b/forms/account/address-list/locale/fr.yml
new file mode 100644
index 00000000..9126d4fb
--- /dev/null
+++ b/forms/account/address-list/locale/fr.yml
@@ -0,0 +1,7 @@
+Addresses: Adresses
+Return: Retour
+AddAddress: Ajouter une adresse
+SetAsDefault: Définir par défaut
+RemoveAddress: Supprimer l'adresse
+EditAddress: Changement d'adresse
+AreYouSureDeleteAddress: Souhaitez-vous vraiment supprier l'adresse?
diff --git a/forms/account/address-list/locale/pt.json b/forms/account/address-list/locale/pt.json
deleted file mode 100644
index 0d9fb3fc..00000000
--- a/forms/account/address-list/locale/pt.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	 "Addresses": "Moradas"
-	
-	,"Return": "Voltar"
-	,"AddAddress": "Adicionar Morada"
-	
-	,"SetAsDefault": "Selecionar como pre-determinado"
-	,"RemoveAddress": "Eliminar Morada"
-	,"EditAddress": "Modificar Morada"
-	,"AreYouSureDeleteAddress": "Tens certeza que queres eliminar esta morada?"
-}
diff --git a/forms/account/address-list/locale/pt.yml b/forms/account/address-list/locale/pt.yml
new file mode 100644
index 00000000..4f5fd79a
--- /dev/null
+++ b/forms/account/address-list/locale/pt.yml
@@ -0,0 +1,7 @@
+Addresses: Moradas
+Return: Voltar
+AddAddress: Adicionar Morada
+SetAsDefault: Selecionar como pre-determinado
+RemoveAddress: Eliminar Morada
+EditAddress: Modificar Morada
+AreYouSureDeleteAddress: Tens certeza que queres eliminar esta morada?
diff --git a/forms/account/address/locale/ca.json b/forms/account/address/locale/ca.json
deleted file mode 100644
index 79c204a8..00000000
--- a/forms/account/address/locale/ca.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"AddEditAddress": "Afegir o modificar adreça"
-
-	,"Name": "Consignatari"
-	,"Address": "Direcció"
-	,"City": "Ciutat"
-	,"ZipCode": "Codi postal"
-	,"Country": "País"
-	,"Province": "Província"
-
-	,"Return": "Tornar"
-	,"Accept": "Acceptar"
-	
-	,"AddressChangedSuccessfully": "Adreça modificada correctament"
-}
diff --git a/forms/account/address/locale/ca.yml b/forms/account/address/locale/ca.yml
new file mode 100644
index 00000000..16c63cf3
--- /dev/null
+++ b/forms/account/address/locale/ca.yml
@@ -0,0 +1,10 @@
+AddEditAddress: Afegir o modificar adreça
+Name: Consignatari
+Address: Direcció
+City: Ciutat
+ZipCode: Codi postal
+Country: País
+Province: Província
+Return: Tornar
+Accept: Acceptar
+AddressChangedSuccessfully: Adreça modificada correctament
diff --git a/forms/account/address/locale/en.json b/forms/account/address/locale/en.json
deleted file mode 100644
index a807bb5f..00000000
--- a/forms/account/address/locale/en.json
+++ /dev/null
@@ -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"
-}
diff --git a/forms/account/address/locale/en.yml b/forms/account/address/locale/en.yml
new file mode 100644
index 00000000..38fe889e
--- /dev/null
+++ b/forms/account/address/locale/en.yml
@@ -0,0 +1,10 @@
+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
diff --git a/forms/account/address/locale/es.json b/forms/account/address/locale/es.json
deleted file mode 100644
index 613fbf17..00000000
--- a/forms/account/address/locale/es.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"AddEditAddress": "Añadir o modificar dirección"
-
-	,"Name": "Consignatario"
-	,"Address": "Dirección"
-	,"City": "Ciudad"
-	,"ZipCode": "Código postal"
-	,"Country": "País"
-	,"Province": "Provincia"
-
-	,"Return": "Volver"
-	,"Accept": "Aceptar"
-	
-	,"AddressChangedSuccessfully": "Dirección modificada correctamente"
-}
diff --git a/forms/account/address/locale/es.yml b/forms/account/address/locale/es.yml
new file mode 100644
index 00000000..19674310
--- /dev/null
+++ b/forms/account/address/locale/es.yml
@@ -0,0 +1,10 @@
+AddEditAddress: Añadir o modificar dirección
+Name: Consignatario
+Address: Dirección
+City: Ciudad
+ZipCode: Código postal
+Country: País
+Province: Provincia
+Return: Volver
+Accept: Aceptar
+AddressChangedSuccessfully: Dirección modificada correctamente
diff --git a/forms/account/address/locale/fr.json b/forms/account/address/locale/fr.json
deleted file mode 100644
index 58b54eb0..00000000
--- a/forms/account/address/locale/fr.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"AddEditAddress": "Ajouter ou modifier l'adresse"
-
-	,"Name": "Destinataire"
-	,"Address": "Numéro Rue"
-	,"City": "Ville"
-	,"ZipCode": "Code postal"
-	,"Country": "Pays"
-	,"Province": "Province"
-
-	,"Return": "Reviens"
-	,"Accept": "Accepter"
-	
-	,"AddressChangedSuccessfully": "Adresse modifié avec succès"
-}
diff --git a/forms/account/address/locale/fr.yml b/forms/account/address/locale/fr.yml
new file mode 100644
index 00000000..ed739095
--- /dev/null
+++ b/forms/account/address/locale/fr.yml
@@ -0,0 +1,10 @@
+AddEditAddress: Ajouter ou modifier l'adresse
+Name: Destinataire
+Address: Numéro Rue
+City: Ville
+ZipCode: Code postal
+Country: Pays
+Province: Province
+Return: Reviens
+Accept: Accepter
+AddressChangedSuccessfully: Adresse modifié avec succès
diff --git a/forms/account/address/locale/pt.json b/forms/account/address/locale/pt.json
deleted file mode 100644
index f6defd9d..00000000
--- a/forms/account/address/locale/pt.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"AddEditAddress": "Adicionar ou modificar morada"
-
-	,"Name": "Consignatario"
-	,"Address": "Morada"
-	,"City": "Concelho"
-	,"ZipCode": "Código postal"
-	,"Country": "País"
-	,"Province": "Distrito"
-
-	,"Return": "Voltar"
-	,"Accept": "Aceitar"
-	
-	,"AddressChangedSuccessfully": "Morada modificada corretamente"
-}
diff --git a/forms/account/address/locale/pt.yml b/forms/account/address/locale/pt.yml
new file mode 100644
index 00000000..4aaa30d3
--- /dev/null
+++ b/forms/account/address/locale/pt.yml
@@ -0,0 +1,10 @@
+AddEditAddress: Adicionar ou modificar morada
+Name: Consignatario
+Address: Morada
+City: Concelho
+ZipCode: Código postal
+Country: País
+Province: Distrito
+Return: Voltar
+Accept: Aceitar
+AddressChangedSuccessfully: Morada modificada corretamente
diff --git a/forms/account/conf/locale/ca.json b/forms/account/conf/locale/ca.json
deleted file mode 100644
index abbae588..00000000
--- a/forms/account/conf/locale/ca.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-	"Configuration": "Configuració"
-
-	,"Username": "Nom d'usuari"
-	,"Password": "Contrasenya"
-	,"Email": "Correu electrònic"
-	,"Display name": "Nom a mostrar"
-	,"Language": "Idioma"
-	,"Billing": "Facturació"
-	,"Receive invoices by email": "Rebre factures per correu electrònic"
-	
-	,"Old password": "Contrasenya antiga"
-	,"New password": "Nova contrasenya"
-	,"Repeat password": "Repetir contrasenya"
-	,"Info": "Info"
-	,"Modify": "Modificar"
-	
-	,"Password requirements": "Requisits de contrasenya"
-	,"characters long": "caràcters de longitud"
-	,"alphabetic characters": "caràcters alfabètics"
-	,"capital letters": "majúscules"
-	,"digits": "dígits"
-	,"symbols": "símbols"
-
-	,"Password changed!": "Contrasenya modificada!"
-	,"Password doesn't meet the requirements": ""
-	,"Passwords doesn't match": "Les contrasenyes no coincideixen!"
-	,"Passwords empty": "Les contrasenyes en blanc"
-	
-	,"Addresses": "Adreces"
-	,"Change password": "Canvia la contrasenya"
-}
diff --git a/forms/account/conf/locale/ca.yml b/forms/account/conf/locale/ca.yml
new file mode 100644
index 00000000..82241540
--- /dev/null
+++ b/forms/account/conf/locale/ca.yml
@@ -0,0 +1,25 @@
+Configuration: Configuració
+Username: Nom d'usuari
+Password: Contrasenya
+Email: Correu electrònic
+Display name: Nom a mostrar
+Language: Idioma
+Billing: Facturació
+Receive invoices by email: Rebre factures per correu electrònic
+Old password: Contrasenya antiga
+New password: Nova contrasenya
+Repeat password: Repetir contrasenya
+Info: Info
+Modify: Modificar
+Password requirements: Requisits de contrasenya
+characters long: caràcters de longitud
+alphabetic characters: caràcters alfabètics
+capital letters: majúscules
+digits: dígits
+symbols: símbols
+Password changed!: Contrasenya modificada!
+Password doesn't meet the requirements: ''
+Passwords doesn't match: Les contrasenyes no coincideixen!
+Passwords empty: Les contrasenyes en blanc
+Addresses: Adreces
+Change password: Canvia la contrasenya
diff --git a/forms/account/conf/locale/en.json b/forms/account/conf/locale/en.json
deleted file mode 100644
index 9c17ba83..00000000
--- a/forms/account/conf/locale/en.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-	"Configuration": "Configuration"
-
-	,"Username": "Username"
-	,"Password": "Password"
-	,"Email": "Email"
-	,"Display name": "Display name"
-	,"Language": "Language"
-	,"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"
-}
diff --git a/forms/account/conf/locale/en.yml b/forms/account/conf/locale/en.yml
new file mode 100644
index 00000000..20de204a
--- /dev/null
+++ b/forms/account/conf/locale/en.yml
@@ -0,0 +1,25 @@
+Configuration: Configuration
+Username: Username
+Password: Password
+Email: Email
+Display name: Display name
+Language: Language
+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
diff --git a/forms/account/conf/locale/es.json b/forms/account/conf/locale/es.json
deleted file mode 100644
index 3fada437..00000000
--- a/forms/account/conf/locale/es.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-	"Configuration": "Configuración"
-
-	,"Username": "Nombre de usuario"
-	,"Password": "Contraseña"
-	,"Email": "Correo electrónico"
-	,"Display name": "Nombre a mostrar"
-	,"Language": "Idioma"
-	,"Billing": "Facturación"
-	,"Receive invoices by email": "Recibir facturas por correo electrónico"
-	
-	,"Old password": "Contaseña antigua"
-	,"New password": "Nueva contraseña"
-	,"Repeat password": "Repetir contraseña"
-	,"Info": "Info"
-	,"Modify": "Modificar"
-	
-	,"Password requirements": "Requisitos de constraseña"
-	,"characters long": "carácteres de longitud"
-	,"alphabetic characters": "carácteres alfabéticos"
-	,"capital letters": "letras mayúsculas"
-	,"digits": "dígitos"
-	,"symbols": "símbolos. Ej: $%&."
-
-	,"Password changed!": "¡Contraseña modificada!"
-	,"Password doesn't meet the requirements": "La nueva contraseña no reune los requisitos de seguridad necesarios, pulsa en info para más detalle"
-	,"Passwords doesn't match": "¡Las contraseñas no coinciden!"
-	,"Passwords empty": "Contraseña vacía"
-	
-	,"Addresses": "Direcciones"
-	,"Change password": "Cambiar contraseña"
-}
diff --git a/forms/account/conf/locale/es.yml b/forms/account/conf/locale/es.yml
new file mode 100644
index 00000000..66992c54
--- /dev/null
+++ b/forms/account/conf/locale/es.yml
@@ -0,0 +1,27 @@
+Configuration: Configuración
+Username: Nombre de usuario
+Password: Contraseña
+Email: Correo electrónico
+Display name: Nombre a mostrar
+Language: Idioma
+Billing: Facturación
+Receive invoices by email: Recibir facturas por correo electrónico
+Old password: Contaseña antigua
+New password: Nueva contraseña
+Repeat password: Repetir contraseña
+Info: Info
+Modify: Modificar
+Password requirements: Requisitos de constraseña
+characters long: carácteres de longitud
+alphabetic characters: carácteres alfabéticos
+capital letters: letras mayúsculas
+digits: dígitos
+symbols: 'símbolos. Ej: $%&.'
+Password changed!: ¡Contraseña modificada!
+Password doesn't meet the requirements: >-
+  La nueva contraseña no reune los requisitos de seguridad necesarios, pulsa en
+  info para más detalle
+Passwords doesn't match: ¡Las contraseñas no coinciden!
+Passwords empty: Contraseña vacía
+Addresses: Direcciones
+Change password: Cambiar contraseña
diff --git a/forms/account/conf/locale/fr.json b/forms/account/conf/locale/fr.json
deleted file mode 100644
index 893cbbf4..00000000
--- a/forms/account/conf/locale/fr.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-	"Configuration": "Configuration"
-
-	,"Username": "Utilisateur"
-	,"Password": "Mot de passe"
-	,"Email": "Courriel"
-	,"Display name": "Nom à afficher"
-	,"Language": "Langage"
-	,"Billing": "Facturation"
-	,"Receive invoices by email": "Recevoir des factures par e-mail"
-	
-	,"Old password": "Ancien mot de passe"
-	,"New password": "Nouveau mot de passe"
-	,"Repeat password": "Répéter le mot de passe"
-	,"Info": "Info"
-	,"Modify": "Modifier"
-	
-	,"Password requirements": "Mot de passe exigences"
-	,"characters long": "Longs caractères"
-	,"alphabetic characters": "les caractères alphabétiques"
-	,"capital letters": "lettres majuscules"
-	,"digits": "chiffres"
-	,"symbols": "symboles. Ej: $%&."
-
-	,"Password changed!": "Mot de passe modifié!"
-	,"Password doesn't meet the requirements": ""
-	,"Passwords doesn't match": "Les mots de passe ne correspondent pas!"
-	,"Passwords empty": ""
-	
-	,"Addresses": "Adresses"
-	,"Change password": "Changer le mot de passe"
-}
diff --git a/forms/account/conf/locale/fr.yml b/forms/account/conf/locale/fr.yml
new file mode 100644
index 00000000..ba47177f
--- /dev/null
+++ b/forms/account/conf/locale/fr.yml
@@ -0,0 +1,25 @@
+Configuration: Configuration
+Username: Utilisateur
+Password: Mot de passe
+Email: Courriel
+Display name: Nom à afficher
+Language: Langage
+Billing: Facturation
+Receive invoices by email: Recevoir des factures par e-mail
+Old password: Ancien mot de passe
+New password: Nouveau mot de passe
+Repeat password: Répéter le mot de passe
+Info: Info
+Modify: Modifier
+Password requirements: Mot de passe exigences
+characters long: Longs caractères
+alphabetic characters: les caractères alphabétiques
+capital letters: lettres majuscules
+digits: chiffres
+symbols: 'symboles. Ej: $%&.'
+Password changed!: Mot de passe modifié!
+Password doesn't meet the requirements: ''
+Passwords doesn't match: Les mots de passe ne correspondent pas!
+Passwords empty: ''
+Addresses: Adresses
+Change password: Changer le mot de passe
diff --git a/forms/account/conf/locale/pt.json b/forms/account/conf/locale/pt.json
deleted file mode 100644
index 3eb8c18d..00000000
--- a/forms/account/conf/locale/pt.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-	"Configuration": "Configuração"
-
-	,"Username": "Nome de usuario"
-	,"Password": "Palavra-Passe"
-	,"Email": "E-Mail"
-	,"Display name": "Nome para mostrar"
-	,"Language": "Idioma"
-	,"Billing": "Facturação"
-	,"Receive invoices by email": "Receber facturas por e-mail"
-	
-	,"Old password": "Palavra-Passe antiga"
-	,"New password": "Nova Palavra-Passe"
-	,"Repeat password": "Repetir Palavra-Passe"
-	,"Info": "Info"
-	,"Modify": "Modificar"
-	
-	,"Password requirements": "Requisitos de Palavra-Passe"
-	,"characters long": "caracteres"
-	,"alphabetic characters": "caracteres alfabéticos"
-	,"capital letters": "letras maiúsculas"
-	,"digits": "dígitos"
-	,"symbols": "símbolos. Ej: $%&."
-
-	,"Password changed!": "Palavra-Passe Modificada!"
-	,"Password doesn't meet the requirements": "Palavra-Passe não atende aos requisitos"
-	,"Passwords doesn't match": "As Palavras-Passe não coincidem!"
-	,"Passwords empty": "Palavra-Passe vazia"
-	
-	,"Addresses": "Moradas"
-	,"Change password": "Mudar Palavra-Passe"
-}
diff --git a/forms/account/conf/locale/pt.yml b/forms/account/conf/locale/pt.yml
new file mode 100644
index 00000000..a7430e50
--- /dev/null
+++ b/forms/account/conf/locale/pt.yml
@@ -0,0 +1,25 @@
+Configuration: Configuração
+Username: Nome de usuario
+Password: Palavra-Passe
+Email: E-Mail
+Display name: Nome para mostrar
+Language: Idioma
+Billing: Facturação
+Receive invoices by email: Receber facturas por e-mail
+Old password: Palavra-Passe antiga
+New password: Nova Palavra-Passe
+Repeat password: Repetir Palavra-Passe
+Info: Info
+Modify: Modificar
+Password requirements: Requisitos de Palavra-Passe
+characters long: caracteres
+alphabetic characters: caracteres alfabéticos
+capital letters: letras maiúsculas
+digits: dígitos
+symbols: 'símbolos. Ej: $%&.'
+Password changed!: Palavra-Passe Modificada!
+Password doesn't meet the requirements: Palavra-Passe não atende aos requisitos
+Passwords doesn't match: As Palavras-Passe não coincidem!
+Passwords empty: Palavra-Passe vazia
+Addresses: Moradas
+Change password: Mudar Palavra-Passe
diff --git a/forms/admin/access-log/locale/ca.json b/forms/admin/access-log/locale/ca.json
deleted file mode 100644
index 811c8490..00000000
--- a/forms/admin/access-log/locale/ca.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	 "AccessLog": "Registre d'accessos"
-
-	,"UserNumber:": "N d'usuari:"
-	,"User:": "Usuari:"
-	,"Phone:": "Telèfon:"
-	,"Mobile:": "Mòbil:"
-
-	,"Access": "Accés"
-	,"OS": "SO"
-	,"Browser": "Navegador"
-	,"Version": "Versió"
-	,"Javascript": "Javascript"
-	,"Cookies": "Cookies"
-}
diff --git a/forms/admin/access-log/locale/ca.yml b/forms/admin/access-log/locale/ca.yml
new file mode 100644
index 00000000..94f2c89f
--- /dev/null
+++ b/forms/admin/access-log/locale/ca.yml
@@ -0,0 +1,11 @@
+AccessLog: Registre d'accessos
+'UserNumber:': 'N d''usuari:'
+'User:': 'Usuari:'
+'Phone:': 'Telèfon:'
+'Mobile:': 'Mòbil:'
+Access: Accés
+OS: SO
+Browser: Navegador
+Version: Versió
+Javascript: Javascript
+Cookies: Cookies
diff --git a/forms/admin/access-log/locale/en.json b/forms/admin/access-log/locale/en.json
deleted file mode 100644
index d0b38f3c..00000000
--- a/forms/admin/access-log/locale/en.json
+++ /dev/null
@@ -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"
-}
diff --git a/forms/admin/access-log/locale/en.yml b/forms/admin/access-log/locale/en.yml
new file mode 100644
index 00000000..7a975465
--- /dev/null
+++ b/forms/admin/access-log/locale/en.yml
@@ -0,0 +1,11 @@
+AccessLog: Access log
+'UserNumber:': 'User Number:'
+'User:': 'User:'
+'Phone:': 'Phone:'
+'Mobile:': 'Mobile:'
+Access: Access
+OS: OS
+Browser: Browser
+Version: Version
+Javascript: Javascript
+Cookies: Cookies
diff --git a/forms/admin/access-log/locale/es.json b/forms/admin/access-log/locale/es.json
deleted file mode 100644
index 49042a77..00000000
--- a/forms/admin/access-log/locale/es.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	 "AccessLog": "Registro de accesos"
-
-	,"UserNumber:": "Nº usuario:"
-	,"User:": "Usuario:"
-	,"Phone:": "Teléfono:"
-	,"Mobile:": "Móvil:"
-
-	,"Access": "Acceso"
-	,"OS": "SO"
-	,"Browser": "Navegador"
-	,"Version": "Versión"
-	,"Javascript": "Javascript"
-	,"Cookies": "Cookies"
-}
diff --git a/forms/admin/access-log/locale/es.yml b/forms/admin/access-log/locale/es.yml
new file mode 100644
index 00000000..dad42443
--- /dev/null
+++ b/forms/admin/access-log/locale/es.yml
@@ -0,0 +1,11 @@
+AccessLog: Registro de accesos
+'UserNumber:': 'Nº usuario:'
+'User:': 'Usuario:'
+'Phone:': 'Teléfono:'
+'Mobile:': 'Móvil:'
+Access: Acceso
+OS: SO
+Browser: Navegador
+Version: Versión
+Javascript: Javascript
+Cookies: Cookies
diff --git a/forms/admin/access-log/locale/fr.json b/forms/admin/access-log/locale/fr.json
deleted file mode 100644
index bcaeaba6..00000000
--- a/forms/admin/access-log/locale/fr.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	 "AccessLog": "Fiche d'accès"
-
-	,"UserNumber:": "Numéro utilisateur:"
-	,"User:": "Utilisateur:"
-	,"Phone:": "Téléphone:"
-	,"Mobile:": "Portable:"
-
-	,"Access": "Accès"
-	,"OS": "OS"
-	,"Browser": "Navigateur"
-	,"Version": "Version"
-	,"Javascript": "Javascript"
-	,"Cookies": "Cookies"
-}
diff --git a/forms/admin/access-log/locale/fr.yml b/forms/admin/access-log/locale/fr.yml
new file mode 100644
index 00000000..ff1f58b6
--- /dev/null
+++ b/forms/admin/access-log/locale/fr.yml
@@ -0,0 +1,11 @@
+AccessLog: Fiche d'accès
+'UserNumber:': 'Numéro utilisateur:'
+'User:': 'Utilisateur:'
+'Phone:': 'Téléphone:'
+'Mobile:': 'Portable:'
+Access: Accès
+OS: OS
+Browser: Navigateur
+Version: Version
+Javascript: Javascript
+Cookies: Cookies
diff --git a/forms/admin/access-log/locale/pt.json b/forms/admin/access-log/locale/pt.json
deleted file mode 100644
index 0cc3ee47..00000000
--- a/forms/admin/access-log/locale/pt.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	 "AccessLog": "Registro de acessos"
-
-	,"UserNumber:": "Nº usuario:"
-	,"User:": "Usuario:"
-	,"Phone:": "Telefone:"
-	,"Mobile:": "Telemóvel:"
-
-	,"Access": "Acceso"
-	,"OS": "OS"
-	,"Browser": "Navegador"
-	,"Version": "Versão"
-	,"Javascript": "Javascript"
-	,"Cookies": "Cookies"
-}
diff --git a/forms/admin/access-log/locale/pt.yml b/forms/admin/access-log/locale/pt.yml
new file mode 100644
index 00000000..b8eec2f3
--- /dev/null
+++ b/forms/admin/access-log/locale/pt.yml
@@ -0,0 +1,11 @@
+AccessLog: Registro de acessos
+'UserNumber:': 'Nº usuario:'
+'User:': 'Usuario:'
+'Phone:': 'Telefone:'
+'Mobile:': 'Telemóvel:'
+Access: Acceso
+OS: OS
+Browser: Navegador
+Version: Versão
+Javascript: Javascript
+Cookies: Cookies
diff --git a/forms/admin/connections/locale/ca.json b/forms/admin/connections/locale/ca.json
deleted file mode 100644
index 58201417..00000000
--- a/forms/admin/connections/locale/ca.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-	 "Connections": "Connexions"
-
-	,"Refresh": "Actualitzar"
-	,"Visits": "Visites"
-	
-	,"connections": "connexions"
-}
diff --git a/forms/admin/connections/locale/ca.yml b/forms/admin/connections/locale/ca.yml
new file mode 100644
index 00000000..25b19fd7
--- /dev/null
+++ b/forms/admin/connections/locale/ca.yml
@@ -0,0 +1,4 @@
+Connections: Connexions
+Refresh: Actualitzar
+Visits: Visites
+connections: connexions
diff --git a/forms/admin/connections/locale/en.json b/forms/admin/connections/locale/en.json
deleted file mode 100644
index 11a75f5b..00000000
--- a/forms/admin/connections/locale/en.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-	 "Connections": "Connections"
-
-	,"Refresh": "Refresh"
-	,"Visits": "Visits"
-	
-	,"connections": "connections"
-}
diff --git a/forms/admin/connections/locale/en.yml b/forms/admin/connections/locale/en.yml
new file mode 100644
index 00000000..8547d70a
--- /dev/null
+++ b/forms/admin/connections/locale/en.yml
@@ -0,0 +1,4 @@
+Connections: Connections
+Refresh: Refresh
+Visits: Visits
+connections: connections
diff --git a/forms/admin/connections/locale/es.json b/forms/admin/connections/locale/es.json
deleted file mode 100644
index 4ef5a84a..00000000
--- a/forms/admin/connections/locale/es.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-	 "Connections": "Conexiones"
-
-	,"Refresh": "Actualizar"
-	,"Visits": "Visitas"
-	
-	,"connections": "conexiones"
-}
diff --git a/forms/admin/connections/locale/es.yml b/forms/admin/connections/locale/es.yml
new file mode 100644
index 00000000..6c514d0d
--- /dev/null
+++ b/forms/admin/connections/locale/es.yml
@@ -0,0 +1,4 @@
+Connections: Conexiones
+Refresh: Actualizar
+Visits: Visitas
+connections: conexiones
diff --git a/forms/admin/connections/locale/fr.json b/forms/admin/connections/locale/fr.json
deleted file mode 100644
index f8e16b3b..00000000
--- a/forms/admin/connections/locale/fr.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-	 "Connections": "Connexions"
-
-	,"Refresh": "Actualiser"
-	,"Visits": "Visites"
-	
-	,"connections": "connexions"
-}
diff --git a/forms/admin/connections/locale/fr.yml b/forms/admin/connections/locale/fr.yml
new file mode 100644
index 00000000..8fdf9e00
--- /dev/null
+++ b/forms/admin/connections/locale/fr.yml
@@ -0,0 +1,4 @@
+Connections: Connexions
+Refresh: Actualiser
+Visits: Visites
+connections: connexions
diff --git a/forms/admin/connections/locale/mn.json b/forms/admin/connections/locale/mn.json
deleted file mode 100644
index 76c41fc0..00000000
--- a/forms/admin/connections/locale/mn.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-	 "Connections": "холболт"
-
-	,"Refresh": "Сэргээх"
-	,"Visits": "уулзалт"
-	
-	,"connections": "холболт"
-}
diff --git a/forms/admin/connections/locale/mn.yml b/forms/admin/connections/locale/mn.yml
new file mode 100644
index 00000000..9746c720
--- /dev/null
+++ b/forms/admin/connections/locale/mn.yml
@@ -0,0 +1,4 @@
+Connections: холболт
+Refresh: Сэргээх
+Visits: уулзалт
+connections: холболт
diff --git a/forms/admin/connections/locale/pt.json b/forms/admin/connections/locale/pt.json
deleted file mode 100644
index 62244264..00000000
--- a/forms/admin/connections/locale/pt.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-	 "Connections": "Conexões"
-
-	,"Refresh": "actualização"
-	,"Visits": "Visualizações"
-	
-	,"connections": "conexões"
-}
diff --git a/forms/admin/connections/locale/pt.yml b/forms/admin/connections/locale/pt.yml
new file mode 100644
index 00000000..33a1e5c1
--- /dev/null
+++ b/forms/admin/connections/locale/pt.yml
@@ -0,0 +1,4 @@
+Connections: Conexões
+Refresh: actualização
+Visits: Visualizações
+connections: conexões
diff --git a/forms/admin/items/locale/ca.json b/forms/admin/items/locale/ca.json
deleted file mode 100644
index eab281b3..00000000
--- a/forms/admin/items/locale/ca.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-	 "Items": "Artícles",
-	 "Enter a search term": "Introdueix un terme de cerca"
-}
diff --git a/forms/admin/items/locale/ca.yml b/forms/admin/items/locale/ca.yml
new file mode 100644
index 00000000..28be78e9
--- /dev/null
+++ b/forms/admin/items/locale/ca.yml
@@ -0,0 +1,2 @@
+Items: Artícles
+Enter a search term: Introdueix un terme de cerca
diff --git a/forms/admin/items/locale/en.json b/forms/admin/items/locale/en.json
deleted file mode 100644
index b59e1d2f..00000000
--- a/forms/admin/items/locale/en.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-	 "Items": "Items",
-	 "Enter a search term": "Enter a search term"
-}
\ No newline at end of file
diff --git a/forms/admin/items/locale/en.yml b/forms/admin/items/locale/en.yml
new file mode 100644
index 00000000..c7e9edd8
--- /dev/null
+++ b/forms/admin/items/locale/en.yml
@@ -0,0 +1,2 @@
+Items: Items
+Enter a search term: Enter a search term
diff --git a/forms/admin/items/locale/es.json b/forms/admin/items/locale/es.json
deleted file mode 100644
index 649219de..00000000
--- a/forms/admin/items/locale/es.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-	 "Items": "Artículos",
-	 "Enter a search term": "Introduce un término de búsqueda"
-}
diff --git a/forms/admin/items/locale/es.yml b/forms/admin/items/locale/es.yml
new file mode 100644
index 00000000..23757015
--- /dev/null
+++ b/forms/admin/items/locale/es.yml
@@ -0,0 +1,2 @@
+Items: Artículos
+Enter a search term: Introduce un término de búsqueda
diff --git a/forms/admin/items/locale/fr.json b/forms/admin/items/locale/fr.json
deleted file mode 100644
index bf70e9ab..00000000
--- a/forms/admin/items/locale/fr.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-	 "Items": "Articles",
-	 "Enter a search term": "Entrez un terme de recherche"
-}
\ No newline at end of file
diff --git a/forms/admin/items/locale/fr.yml b/forms/admin/items/locale/fr.yml
new file mode 100644
index 00000000..47d12ed7
--- /dev/null
+++ b/forms/admin/items/locale/fr.yml
@@ -0,0 +1,2 @@
+Items: Articles
+Enter a search term: Entrez un terme de recherche
diff --git a/forms/admin/items/locale/pt.json b/forms/admin/items/locale/pt.json
deleted file mode 100644
index 63b4ad44..00000000
--- a/forms/admin/items/locale/pt.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-	 "Items": "Ítens",
-	 "Enter a search term": "Digite um termo de pesquisa"
-}
\ No newline at end of file
diff --git a/forms/admin/items/locale/pt.yml b/forms/admin/items/locale/pt.yml
new file mode 100644
index 00000000..d44892ac
--- /dev/null
+++ b/forms/admin/items/locale/pt.yml
@@ -0,0 +1,2 @@
+Items: Ítens
+Enter a search term: Digite um termo de pesquisa
diff --git a/forms/admin/links/locale/ca.json b/forms/admin/links/locale/ca.json
deleted file mode 100644
index b5e398ab..00000000
--- a/forms/admin/links/locale/ca.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-	 "ControlPanel": "Panell de control"
-
-	,"Module": "Mòdul"
-	,"Description": "Descripció"
-}
diff --git a/forms/admin/links/locale/ca.yml b/forms/admin/links/locale/ca.yml
new file mode 100644
index 00000000..efd56c6e
--- /dev/null
+++ b/forms/admin/links/locale/ca.yml
@@ -0,0 +1,3 @@
+ControlPanel: Panell de control
+Module: Mòdul
+Description: Descripció
diff --git a/forms/admin/links/locale/en.json b/forms/admin/links/locale/en.json
deleted file mode 100644
index cfe8bb34..00000000
--- a/forms/admin/links/locale/en.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-	 "ControlPanel": "Control panel"
-
-	,"Module": "Module"
-	,"Description": "Description"
-}
diff --git a/forms/admin/links/locale/en.yml b/forms/admin/links/locale/en.yml
new file mode 100644
index 00000000..c4763aae
--- /dev/null
+++ b/forms/admin/links/locale/en.yml
@@ -0,0 +1,3 @@
+ControlPanel: Control panel
+Module: Module
+Description: Description
diff --git a/forms/admin/links/locale/es.json b/forms/admin/links/locale/es.json
deleted file mode 100644
index 6ce5e497..00000000
--- a/forms/admin/links/locale/es.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-	 "ControlPanel": "Panel de control"
-
-	,"Module": "Módulo"
-	,"Description": "Descripción"
-}
diff --git a/forms/admin/links/locale/es.yml b/forms/admin/links/locale/es.yml
new file mode 100644
index 00000000..91314eab
--- /dev/null
+++ b/forms/admin/links/locale/es.yml
@@ -0,0 +1,3 @@
+ControlPanel: Panel de control
+Module: Módulo
+Description: Descripción
diff --git a/forms/admin/links/locale/fr.json b/forms/admin/links/locale/fr.json
deleted file mode 100644
index 522f747b..00000000
--- a/forms/admin/links/locale/fr.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-	 "ControlPanel": "Panneau de configuration"
-
-	,"Module": "Module"
-	,"Description": "Description"
-}
diff --git a/forms/admin/links/locale/fr.yml b/forms/admin/links/locale/fr.yml
new file mode 100644
index 00000000..53fd0f17
--- /dev/null
+++ b/forms/admin/links/locale/fr.yml
@@ -0,0 +1,3 @@
+ControlPanel: Panneau de configuration
+Module: Module
+Description: Description
diff --git a/forms/admin/links/locale/pt.json b/forms/admin/links/locale/pt.json
deleted file mode 100644
index a72be2e0..00000000
--- a/forms/admin/links/locale/pt.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-	 "ControlPanel": "Painel de controle"
-
-	,"Module": "Módulo"
-	,"Description": "Descrição"
-}
diff --git a/forms/admin/links/locale/pt.yml b/forms/admin/links/locale/pt.yml
new file mode 100644
index 00000000..f53680aa
--- /dev/null
+++ b/forms/admin/links/locale/pt.yml
@@ -0,0 +1,3 @@
+ControlPanel: Painel de controle
+Module: Módulo
+Description: Descrição
diff --git a/forms/admin/photos/locale/ca.json b/forms/admin/photos/locale/ca.json
deleted file mode 100644
index 60d2a788..00000000
--- a/forms/admin/photos/locale/ca.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	 "Images": "Imatges"
-
-	,"Collection": "Col·lecció"
-	,"Click or drop files here": "Prem o deixa anar els arxius aquí"
-
-	,"Clear all": "Netejar tot"
-	,"Upload files": "Pujar arxius"
-
-	,"Waiting for upload": "Esperant per pujar"
-	,"Uploading file": "Pujant fitxer"
-	,"Image uploaded": "Imatge pujada"
-
-	,"Upload finished successfully": "Imatges pujades correctament"
-	,"Some errors happened on upload": "Van ocórrer errors en pujar alguna de les imatges"
-	,"There are no files to upload": "No s'ha seleccionat arxius per pujar"
-}
diff --git a/forms/admin/photos/locale/ca.yml b/forms/admin/photos/locale/ca.yml
new file mode 100644
index 00000000..f158448c
--- /dev/null
+++ b/forms/admin/photos/locale/ca.yml
@@ -0,0 +1,11 @@
+Images: Imatges
+Collection: Col·lecció
+Click or drop files here: Prem o deixa anar els arxius aquí
+Clear all: Netejar tot
+Upload files: Pujar arxius
+Waiting for upload: Esperant per pujar
+Uploading file: Pujant fitxer
+Image uploaded: Imatge pujada
+Upload finished successfully: Imatges pujades correctament
+Some errors happened on upload: Van ocórrer errors en pujar alguna de les imatges
+There are no files to upload: No s'ha seleccionat arxius per pujar
diff --git a/forms/admin/photos/locale/en.json b/forms/admin/photos/locale/en.json
deleted file mode 100644
index dd46d4af..00000000
--- a/forms/admin/photos/locale/en.json
+++ /dev/null
@@ -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"
-}
\ No newline at end of file
diff --git a/forms/admin/photos/locale/en.yml b/forms/admin/photos/locale/en.yml
new file mode 100644
index 00000000..09c860c8
--- /dev/null
+++ b/forms/admin/photos/locale/en.yml
@@ -0,0 +1,11 @@
+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
diff --git a/forms/admin/photos/locale/es.json b/forms/admin/photos/locale/es.json
deleted file mode 100644
index 57a426a5..00000000
--- a/forms/admin/photos/locale/es.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	 "Images": "Imágenes"
-
-	,"Collection": "Colección"
-	,"Click or drop files here": "Pulsa o suelta los archivos aquí"
-
-	,"Clear all": "Limpiar todo"
-	,"Upload files": "Subir archivos"
-
-	,"Waiting for upload": "Esperando para subir"
-	,"Uploading file": "Subiendo fichero"
-	,"Image uploaded": "Imagen subida"
-
-	,"Upload finished successfully": "Imágenes subidas correctamente"
-	,"Some errors happened on upload": "Ocurrieron errores al subir alguna de las imágenes"
-	,"There are no files to upload": "No se han seleccionado archivos para subir"
-}
diff --git a/forms/admin/photos/locale/es.yml b/forms/admin/photos/locale/es.yml
new file mode 100644
index 00000000..a41f2605
--- /dev/null
+++ b/forms/admin/photos/locale/es.yml
@@ -0,0 +1,11 @@
+Images: Imágenes
+Collection: Colección
+Click or drop files here: Pulsa o suelta los archivos aquí
+Clear all: Limpiar todo
+Upload files: Subir archivos
+Waiting for upload: Esperando para subir
+Uploading file: Subiendo fichero
+Image uploaded: Imagen subida
+Upload finished successfully: Imágenes subidas correctamente
+Some errors happened on upload: Ocurrieron errores al subir alguna de las imágenes
+There are no files to upload: No se han seleccionado archivos para subir
diff --git a/forms/admin/photos/locale/fr.json b/forms/admin/photos/locale/fr.json
deleted file mode 100644
index 4242b592..00000000
--- a/forms/admin/photos/locale/fr.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	 "Images": "Images"
-
-	,"Collection": "Collection"
-	,"Click or drop files here": "Cliquez ici ou déposer des fichiers"
-
-	,"Clear all": "Tout effacer"
-	,"Upload files": "Upload Files"
-
-	,"Waiting for upload": "En attente de télécharger"
-	,"Uploading file": "Uploader des fichiers"
-	,"Image uploaded": "Fichier uploadé"
-
-	,"Upload finished successfully": "Les images téléchargées correctement"
-	,"Some errors happened on upload": "Des erreurs sont survenues lors du téléchargement des images"
-	,"There are no files to upload": "Aucun fichier sélectionné pour télécharger"
-}
\ No newline at end of file
diff --git a/forms/admin/photos/locale/fr.yml b/forms/admin/photos/locale/fr.yml
new file mode 100644
index 00000000..9dd683f8
--- /dev/null
+++ b/forms/admin/photos/locale/fr.yml
@@ -0,0 +1,11 @@
+Images: Images
+Collection: Collection
+Click or drop files here: Cliquez ici ou déposer des fichiers
+Clear all: Tout effacer
+Upload files: Upload Files
+Waiting for upload: En attente de télécharger
+Uploading file: Uploader des fichiers
+Image uploaded: Fichier uploadé
+Upload finished successfully: Les images téléchargées correctement
+Some errors happened on upload: Des erreurs sont survenues lors du téléchargement des images
+There are no files to upload: Aucun fichier sélectionné pour télécharger
diff --git a/forms/admin/photos/locale/pt.json b/forms/admin/photos/locale/pt.json
deleted file mode 100644
index 88d59127..00000000
--- a/forms/admin/photos/locale/pt.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	 "Images": "Imagens"
-
-	,"Collection": "Coleção"
-	,"Click or drop files here": "Clique ou solte arquivos aqui"
-
-	,"Clear all": "Limpar tudo"
-	,"Upload files": "Fazer upload de arquivos"
-
-	,"Waiting for upload": "Esperando para enviar"
-	,"Uploading file": "Enviando arquivo"
-	,"Image uploaded": "Imagem Enviada"
-
-	,"Upload finished successfully": "Upload concluído com sucesso"
-	,"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"
-}
\ No newline at end of file
diff --git a/forms/admin/photos/locale/pt.yml b/forms/admin/photos/locale/pt.yml
new file mode 100644
index 00000000..bafcc81d
--- /dev/null
+++ b/forms/admin/photos/locale/pt.yml
@@ -0,0 +1,11 @@
+Images: Imagens
+Collection: Coleção
+Click or drop files here: Clique ou solte arquivos aqui
+Clear all: Limpar tudo
+Upload files: Fazer upload de arquivos
+Waiting for upload: Esperando para enviar
+Uploading file: Enviando arquivo
+Image uploaded: Imagem Enviada
+Upload finished successfully: Upload concluído com sucesso
+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
diff --git a/forms/admin/queries/locale/ca.json b/forms/admin/queries/locale/ca.json
deleted file mode 100644
index d98cc882..00000000
--- a/forms/admin/queries/locale/ca.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	 "Queries": "Consultes"
-
-	,"Execute": "Executar"
-	,"Clean": "Netejar"
-
-	,"SQL query": "Consulta SQL"
-	,"Updatable": "Actualitzable"
-	
-	,"Query executed!": "Consulta executada!"
-}
diff --git a/forms/admin/queries/locale/ca.yml b/forms/admin/queries/locale/ca.yml
new file mode 100644
index 00000000..ecc96548
--- /dev/null
+++ b/forms/admin/queries/locale/ca.yml
@@ -0,0 +1,6 @@
+Queries: Consultes
+Execute: Executar
+Clean: Netejar
+SQL query: Consulta SQL
+Updatable: Actualitzable
+Query executed!: Consulta executada!
diff --git a/forms/admin/queries/locale/en.json b/forms/admin/queries/locale/en.json
deleted file mode 100644
index 37175281..00000000
--- a/forms/admin/queries/locale/en.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	 "Queries": "Queries"
-
-	,"Execute": "Execute"
-	,"Clean": "Clean"
-
-	,"SQL query": "SQL query"
-	,"Updatable": "Updatable"
-	
-	,"Query executed!": "Query executed!"
-}
diff --git a/forms/admin/queries/locale/en.yml b/forms/admin/queries/locale/en.yml
new file mode 100644
index 00000000..b8a3bcdb
--- /dev/null
+++ b/forms/admin/queries/locale/en.yml
@@ -0,0 +1,6 @@
+Queries: Queries
+Execute: Execute
+Clean: Clean
+SQL query: SQL query
+Updatable: Updatable
+Query executed!: Query executed!
diff --git a/forms/admin/queries/locale/es.json b/forms/admin/queries/locale/es.json
deleted file mode 100644
index 420d4384..00000000
--- a/forms/admin/queries/locale/es.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	 "Queries": "Consultas"
-
-	,"Execute": "Ejecutar"
-	,"Clean": "Limpiar"
-
-	,"SQL query": "Consulta SQL"
-	,"Updatable": "Actualizable"
-	
-	,"Query executed!": "¡Consulta ejecutada!"
-}
diff --git a/forms/admin/queries/locale/es.yml b/forms/admin/queries/locale/es.yml
new file mode 100644
index 00000000..3a67c14b
--- /dev/null
+++ b/forms/admin/queries/locale/es.yml
@@ -0,0 +1,6 @@
+Queries: Consultas
+Execute: Ejecutar
+Clean: Limpiar
+SQL query: Consulta SQL
+Updatable: Actualizable
+Query executed!: ¡Consulta ejecutada!
diff --git a/forms/admin/queries/locale/fr.json b/forms/admin/queries/locale/fr.json
deleted file mode 100644
index 37175281..00000000
--- a/forms/admin/queries/locale/fr.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	 "Queries": "Queries"
-
-	,"Execute": "Execute"
-	,"Clean": "Clean"
-
-	,"SQL query": "SQL query"
-	,"Updatable": "Updatable"
-	
-	,"Query executed!": "Query executed!"
-}
diff --git a/forms/admin/queries/locale/fr.yml b/forms/admin/queries/locale/fr.yml
new file mode 100644
index 00000000..b8a3bcdb
--- /dev/null
+++ b/forms/admin/queries/locale/fr.yml
@@ -0,0 +1,6 @@
+Queries: Queries
+Execute: Execute
+Clean: Clean
+SQL query: SQL query
+Updatable: Updatable
+Query executed!: Query executed!
diff --git a/forms/admin/queries/locale/pt.json b/forms/admin/queries/locale/pt.json
deleted file mode 100644
index dc629cc9..00000000
--- a/forms/admin/queries/locale/pt.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	 "Queries": "Consultas"
-
-	,"Execute": "Executar"
-	,"Clean": "Limpar"
-
-	,"SQL query": "Consulta SQL"
-	,"Updatable": "Actualizável"
-	
-	,"Query executed!": "Consulta executada!"
-}
diff --git a/forms/admin/queries/locale/pt.yml b/forms/admin/queries/locale/pt.yml
new file mode 100644
index 00000000..6556a81f
--- /dev/null
+++ b/forms/admin/queries/locale/pt.yml
@@ -0,0 +1,6 @@
+Queries: Consultas
+Execute: Executar
+Clean: Limpar
+SQL query: Consulta SQL
+Updatable: Actualizável
+Query executed!: Consulta executada!
diff --git a/forms/admin/users/locale/ca.json b/forms/admin/users/locale/ca.json
deleted file mode 100644
index 308cf05e..00000000
--- a/forms/admin/users/locale/ca.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-	 "User management": "Gestió d'usuaris"
-
-	,"Disabled": "Deshabilitat"
-	,"Impersonate user": "Suplantar usuari"
-	,"Access log": "Registre d'accessos"
-}
diff --git a/forms/admin/users/locale/ca.yml b/forms/admin/users/locale/ca.yml
new file mode 100644
index 00000000..243425a2
--- /dev/null
+++ b/forms/admin/users/locale/ca.yml
@@ -0,0 +1,4 @@
+User management: Gestió d'usuaris
+Disabled: Deshabilitat
+Impersonate user: Suplantar usuari
+Access log: Registre d'accessos
diff --git a/forms/admin/users/locale/en.json b/forms/admin/users/locale/en.json
deleted file mode 100644
index 541b4619..00000000
--- a/forms/admin/users/locale/en.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-	"User management": "User management"
-	
-	,"Disabled": "Disabled"
-	,"Impersonate user": "Impersonate user"
-	,"Access log": "Access log"
-}
diff --git a/forms/admin/users/locale/en.yml b/forms/admin/users/locale/en.yml
new file mode 100644
index 00000000..3786cc93
--- /dev/null
+++ b/forms/admin/users/locale/en.yml
@@ -0,0 +1,4 @@
+User management: User management
+Disabled: Disabled
+Impersonate user: Impersonate user
+Access log: Access log
diff --git a/forms/admin/users/locale/es.json b/forms/admin/users/locale/es.json
deleted file mode 100644
index 646128f5..00000000
--- a/forms/admin/users/locale/es.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-	"User management": "Gestión de usuarios"
-	
-	,"Disabled": "Desactivado"
-	,"Impersonate user": "Suplantar usuario"
-	,"Access log": "Registro de accesos"
-}
diff --git a/forms/admin/users/locale/es.yml b/forms/admin/users/locale/es.yml
new file mode 100644
index 00000000..c3679194
--- /dev/null
+++ b/forms/admin/users/locale/es.yml
@@ -0,0 +1,4 @@
+User management: Gestión de usuarios
+Disabled: Desactivado
+Impersonate user: Suplantar usuario
+Access log: Registro de accesos
diff --git a/forms/admin/users/locale/fr.json b/forms/admin/users/locale/fr.json
deleted file mode 100644
index 70ebff1b..00000000
--- a/forms/admin/users/locale/fr.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-	"User management": "Gestion des utilisateurs"
-	
-	,"Disabled": "Désactivé"
-	,"Impersonate user": "Accès utilisateur"
-	,"Access log": "Journal des accès"
-}
diff --git a/forms/admin/users/locale/fr.yml b/forms/admin/users/locale/fr.yml
new file mode 100644
index 00000000..a59f6320
--- /dev/null
+++ b/forms/admin/users/locale/fr.yml
@@ -0,0 +1,4 @@
+User management: Gestion des utilisateurs
+Disabled: Désactivé
+Impersonate user: Accès utilisateur
+Access log: Journal des accès
diff --git a/forms/admin/users/locale/pt.json b/forms/admin/users/locale/pt.json
deleted file mode 100644
index b029f115..00000000
--- a/forms/admin/users/locale/pt.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-	"User management": "Gestão de usuarios"
-	
-	,"Disabled": "Desativado"
-	,"Impersonate user": "Suplantar usuario"
-	,"Access log": "Registro de acessos"
-}
diff --git a/forms/admin/users/locale/pt.yml b/forms/admin/users/locale/pt.yml
new file mode 100644
index 00000000..84423836
--- /dev/null
+++ b/forms/admin/users/locale/pt.yml
@@ -0,0 +1,4 @@
+User management: Gestão de usuarios
+Disabled: Desativado
+Impersonate user: Suplantar usuario
+Access log: Registro de acessos
diff --git a/forms/admin/visits/locale/ca.json b/forms/admin/visits/locale/ca.json
deleted file mode 100644
index 6d8747ee..00000000
--- a/forms/admin/visits/locale/ca.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	 "Visits": "Visites"
-
-	,"Refresh": "Actualitzar"
-	,"Connections": "Connexions"
-
-	,"From": "Desde"
-	,"To": "Fins"
-	,"Select date interval": "Selecciona un interval de dates"
-
-	,"visits": "visites"
-	,"news": "noves"
-	,"%a, %e %b %Y at %T": "%a, %e %b %Y a les %T"
-}
diff --git a/forms/admin/visits/locale/ca.yml b/forms/admin/visits/locale/ca.yml
new file mode 100644
index 00000000..b34fdf41
--- /dev/null
+++ b/forms/admin/visits/locale/ca.yml
@@ -0,0 +1,9 @@
+Visits: Visites
+Refresh: Actualitzar
+Connections: Connexions
+From: Desde
+To: Fins
+Select date interval: Selecciona un interval de dates
+visits: visites
+news: noves
+'%a, %e %b %Y at %T': '%a, %e %b %Y a les %T'
diff --git a/forms/admin/visits/locale/en.json b/forms/admin/visits/locale/en.json
deleted file mode 100644
index cdb52a6e..00000000
--- a/forms/admin/visits/locale/en.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	 "Visits": "Visits"
-
-	,"Refresh": "Refresh"
-	,"Connections": "Connections"
-
-	,"From": "From"
-	,"To": "To"
-	,"Select date interval": "Select date interval"
-
-	,"visits": "visits"
-	,"news": "news"
-	,"%a, %e %b %Y at %T": "%a, %e %b %Y at %T"
-}
diff --git a/forms/admin/visits/locale/en.yml b/forms/admin/visits/locale/en.yml
new file mode 100644
index 00000000..379e2005
--- /dev/null
+++ b/forms/admin/visits/locale/en.yml
@@ -0,0 +1,9 @@
+Visits: Visits
+Refresh: Refresh
+Connections: Connections
+From: From
+To: To
+Select date interval: Select date interval
+visits: visits
+news: news
+'%a, %e %b %Y at %T': '%a, %e %b %Y at %T'
diff --git a/forms/admin/visits/locale/es.json b/forms/admin/visits/locale/es.json
deleted file mode 100644
index 26d18c86..00000000
--- a/forms/admin/visits/locale/es.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	 "Visits": "Visitas"
-
-	,"Refresh": "Actualizar"
-	,"Connections": "Conexiones"
-
-	,"From": "Desde"
-	,"To": "Hasta"
-	,"Select date interval": "Selecciona un intérvalo de fechas"
-
-	,"visits": "visitas"
-	,"news": "nuevas"
-	,"%a, %e %b %Y at %T": "%a, %e %b %Y a las %T"
-}
diff --git a/forms/admin/visits/locale/es.yml b/forms/admin/visits/locale/es.yml
new file mode 100644
index 00000000..9b96d380
--- /dev/null
+++ b/forms/admin/visits/locale/es.yml
@@ -0,0 +1,9 @@
+Visits: Visitas
+Refresh: Actualizar
+Connections: Conexiones
+From: Desde
+To: Hasta
+Select date interval: Selecciona un intérvalo de fechas
+visits: visitas
+news: nuevas
+'%a, %e %b %Y at %T': '%a, %e %b %Y a las %T'
diff --git a/forms/admin/visits/locale/fr.json b/forms/admin/visits/locale/fr.json
deleted file mode 100644
index c9ff95de..00000000
--- a/forms/admin/visits/locale/fr.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	 "Visits": "Visites"
-
-	,"Refresh": "Actualiser"
-	,"Connections": "Connexions"
-
-	,"From": "À partir de"
-	,"To": "À"
-	,"Select date interval": "Sélectionnez une plage de dates"
-
-	,"visits": "visites"
-	,"news": "nouvelles"
-	,"%a, %e %b %Y at %T": "%a, %e %b %Y à %T"
-}
diff --git a/forms/admin/visits/locale/fr.yml b/forms/admin/visits/locale/fr.yml
new file mode 100644
index 00000000..7b40a3b4
--- /dev/null
+++ b/forms/admin/visits/locale/fr.yml
@@ -0,0 +1,9 @@
+Visits: Visites
+Refresh: Actualiser
+Connections: Connexions
+From: À partir de
+To: À
+Select date interval: Sélectionnez une plage de dates
+visits: visites
+news: nouvelles
+'%a, %e %b %Y at %T': '%a, %e %b %Y à %T'
diff --git a/forms/admin/visits/locale/mn.json b/forms/admin/visits/locale/mn.json
deleted file mode 100644
index 201867e5..00000000
--- a/forms/admin/visits/locale/mn.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	 "Visits": "уулзалт"
-
-	,"Refresh": "Сэргээх"
-	,"Connections": "холболт"
-
-	,"From": "эхлэн"
-	,"To": "нь"
-	,"Select date interval": "Сонгох огноо интервал"
-
-	,"visits": "уулзалт"
-	,"news": "мэдээ"
-	,"%a, %e %b %Y at %T": "%a, %e %b %Y нь %T"
-}
diff --git a/forms/admin/visits/locale/mn.yml b/forms/admin/visits/locale/mn.yml
new file mode 100644
index 00000000..c5c98ac4
--- /dev/null
+++ b/forms/admin/visits/locale/mn.yml
@@ -0,0 +1,9 @@
+Visits: уулзалт
+Refresh: Сэргээх
+Connections: холболт
+From: эхлэн
+To: нь
+Select date interval: Сонгох огноо интервал
+visits: уулзалт
+news: мэдээ
+'%a, %e %b %Y at %T': '%a, %e %b %Y нь %T'
diff --git a/forms/admin/visits/locale/pt.json b/forms/admin/visits/locale/pt.json
deleted file mode 100644
index 147fba11..00000000
--- a/forms/admin/visits/locale/pt.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	 "Visits": "Visualizações"
-
-	,"Refresh": "Actualização"
-	,"Connections": "Conexões"
-
-	,"From": "Desde"
-	,"To": "Até"
-	,"Select date interval": "Selecciona un intérvalo de datas"
-
-	,"visits": "Visualizações"
-	,"news": "novas"
-	,"%a, %e %b %Y at %T": "%a, %e %b %Y em %T"
-}
diff --git a/forms/admin/visits/locale/pt.yml b/forms/admin/visits/locale/pt.yml
new file mode 100644
index 00000000..c5fcc6a7
--- /dev/null
+++ b/forms/admin/visits/locale/pt.yml
@@ -0,0 +1,9 @@
+Visits: Visualizações
+Refresh: Actualização
+Connections: Conexões
+From: Desde
+To: Até
+Select date interval: Selecciona un intérvalo de datas
+visits: Visualizações
+news: novas
+'%a, %e %b %Y at %T': '%a, %e %b %Y em %T'
diff --git a/forms/agencies/packages/locale/ca.json b/forms/agencies/packages/locale/ca.json
deleted file mode 100644
index 81b0e3cb..00000000
--- a/forms/agencies/packages/locale/ca.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-	 "ListByAgency": "Paquets per agència"
-
-	,"ShowByProvince": "Mostrar desglose per província"
-	,"Agency": "Agència"
-	,"Exps": "Exps."
-	,"Bundles": "Paquets"
-	,"Prevision": "Prev."
-}
diff --git a/forms/agencies/packages/locale/ca.yml b/forms/agencies/packages/locale/ca.yml
new file mode 100644
index 00000000..12cbbe67
--- /dev/null
+++ b/forms/agencies/packages/locale/ca.yml
@@ -0,0 +1,6 @@
+ListByAgency: Paquets per agència
+ShowByProvince: Mostrar desglose per província
+Agency: Agència
+Exps: Exps.
+Bundles: Paquets
+Prevision: Prev.
diff --git a/forms/agencies/packages/locale/en.json b/forms/agencies/packages/locale/en.json
deleted file mode 100644
index d023aa49..00000000
--- a/forms/agencies/packages/locale/en.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-	 "ListByAgency": "Bundles by agency"
-
-	,"ShowByProvince": "Show breakdown by province"
-	,"Agency": "Agency"
-	,"Exps": "Exps."
-	,"Bundles": "Bundles"
-	,"Prevision": "Prev."
-}
diff --git a/forms/agencies/packages/locale/en.yml b/forms/agencies/packages/locale/en.yml
new file mode 100644
index 00000000..651dcfae
--- /dev/null
+++ b/forms/agencies/packages/locale/en.yml
@@ -0,0 +1,6 @@
+ListByAgency: Bundles by agency
+ShowByProvince: Show breakdown by province
+Agency: Agency
+Exps: Exps.
+Bundles: Bundles
+Prevision: Prev.
diff --git a/forms/agencies/packages/locale/es.json b/forms/agencies/packages/locale/es.json
deleted file mode 100644
index bf360ac3..00000000
--- a/forms/agencies/packages/locale/es.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-	 "ListByAgency": "Bultos por agencia"
-
-	,"ShowByProvince": "Mostrar desglose por provincia"
-	,"Agency": "Agencia"
-	,"Exps": "Exps."
-	,"Bundles": "Bultos"
-	,"Prevision": "Prev."
-}
diff --git a/forms/agencies/packages/locale/es.yml b/forms/agencies/packages/locale/es.yml
new file mode 100644
index 00000000..4532c554
--- /dev/null
+++ b/forms/agencies/packages/locale/es.yml
@@ -0,0 +1,6 @@
+ListByAgency: Bultos por agencia
+ShowByProvince: Mostrar desglose por provincia
+Agency: Agencia
+Exps: Exps.
+Bundles: Bultos
+Prevision: Prev.
diff --git a/forms/agencies/packages/locale/fr.json b/forms/agencies/packages/locale/fr.json
deleted file mode 100644
index ac44fd36..00000000
--- a/forms/agencies/packages/locale/fr.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-	 "ListByAgency": "Liste par agence"
-
-	,"ShowByProvince": "Montrer par province"
-	,"Agency": "Agence"
-	,"Exps": "Expéditeur"
-	,"Bundles": "Cartons"
-	,"Prevision": "Prévision"
-}
diff --git a/forms/agencies/packages/locale/fr.yml b/forms/agencies/packages/locale/fr.yml
new file mode 100644
index 00000000..a1999077
--- /dev/null
+++ b/forms/agencies/packages/locale/fr.yml
@@ -0,0 +1,6 @@
+ListByAgency: Liste par agence
+ShowByProvince: Montrer par province
+Agency: Agence
+Exps: Expéditeur
+Bundles: Cartons
+Prevision: Prévision
diff --git a/forms/agencies/packages/locale/pt.json b/forms/agencies/packages/locale/pt.json
deleted file mode 100644
index 9cc4da5c..00000000
--- a/forms/agencies/packages/locale/pt.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-	 "ListByAgency": "Bultos por agencia"
-
-	,"ShowByProvince": "Mostrar desglosse por Distrito"
-	,"Agency": "Agencia"
-	,"Exps": "Exps."
-	,"Bundles": "Bultos"
-	,"Prevision": "Prev."
-}
diff --git a/forms/agencies/packages/locale/pt.yml b/forms/agencies/packages/locale/pt.yml
new file mode 100644
index 00000000..ae5bef89
--- /dev/null
+++ b/forms/agencies/packages/locale/pt.yml
@@ -0,0 +1,6 @@
+ListByAgency: Bultos por agencia
+ShowByProvince: Mostrar desglosse por Distrito
+Agency: Agencia
+Exps: Exps.
+Bundles: Bultos
+Prevision: Prev.
diff --git a/forms/agencies/provinces/locale/ca.json b/forms/agencies/provinces/locale/ca.json
deleted file mode 100644
index 16dba728..00000000
--- a/forms/agencies/provinces/locale/ca.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	 "ByProvince": "Desglose per província"
-
-	,"Return": "Tornar"
-	
-	,"SelectAgency": "Selecciona una agència al llistat de l'esquerra"
-	,"Province": "Província"
-	,"Expeditions": "Exps."
-	,"Left": "Falten"
-}
diff --git a/forms/agencies/provinces/locale/ca.yml b/forms/agencies/provinces/locale/ca.yml
new file mode 100644
index 00000000..c46b70c3
--- /dev/null
+++ b/forms/agencies/provinces/locale/ca.yml
@@ -0,0 +1,6 @@
+ByProvince: Desglose per província
+Return: Tornar
+SelectAgency: Selecciona una agència al llistat de l'esquerra
+Province: Província
+Expeditions: Exps.
+Left: Falten
diff --git a/forms/agencies/provinces/locale/en.json b/forms/agencies/provinces/locale/en.json
deleted file mode 100644
index 77b81126..00000000
--- a/forms/agencies/provinces/locale/en.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	 "ByProvince": "Breakdown by province"
-
-	,"Return": "Return"
-	
-	,"SelectAgency": "Select an agency"
-	,"Province": "Province"
-	,"Expeditions": "Exps."
-	,"Left": "Left"
-}
diff --git a/forms/agencies/provinces/locale/en.yml b/forms/agencies/provinces/locale/en.yml
new file mode 100644
index 00000000..f72295d0
--- /dev/null
+++ b/forms/agencies/provinces/locale/en.yml
@@ -0,0 +1,6 @@
+ByProvince: Breakdown by province
+Return: Return
+SelectAgency: Select an agency
+Province: Province
+Expeditions: Exps.
+Left: Left
diff --git a/forms/agencies/provinces/locale/es.json b/forms/agencies/provinces/locale/es.json
deleted file mode 100644
index 91fec022..00000000
--- a/forms/agencies/provinces/locale/es.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	 "ByProvince": "Desglose por provincia"
-
-	,"Return": "Volver"
-	
-	,"SelectAgency": "Selecciona una agencia"
-	,"Province": "Provincia"
-	,"Expeditions": "Exps."
-	,"Left": "Faltan"
-}
diff --git a/forms/agencies/provinces/locale/es.yml b/forms/agencies/provinces/locale/es.yml
new file mode 100644
index 00000000..f04d3d2e
--- /dev/null
+++ b/forms/agencies/provinces/locale/es.yml
@@ -0,0 +1,6 @@
+ByProvince: Desglose por provincia
+Return: Volver
+SelectAgency: Selecciona una agencia
+Province: Provincia
+Expeditions: Exps.
+Left: Faltan
diff --git a/forms/agencies/provinces/locale/fr.json b/forms/agencies/provinces/locale/fr.json
deleted file mode 100644
index 38a88f27..00000000
--- a/forms/agencies/provinces/locale/fr.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	 "ByProvince": "Par province"
-
-	,"Return": "Retour"
-	
-	,"SelectAgency": "Sélectionnez une agence"
-	,"Province": "Province"
-	,"Expeditions": "Expéditions"
-	,"Left": "Restant"
-}
diff --git a/forms/agencies/provinces/locale/fr.yml b/forms/agencies/provinces/locale/fr.yml
new file mode 100644
index 00000000..e289766b
--- /dev/null
+++ b/forms/agencies/provinces/locale/fr.yml
@@ -0,0 +1,6 @@
+ByProvince: Par province
+Return: Retour
+SelectAgency: Sélectionnez une agence
+Province: Province
+Expeditions: Expéditions
+Left: Restant
diff --git a/forms/agencies/provinces/locale/pt.json b/forms/agencies/provinces/locale/pt.json
deleted file mode 100644
index 7518cbed..00000000
--- a/forms/agencies/provinces/locale/pt.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	 "ByProvince": "Desglosse por Distritos"
-
-	,"Return": "Voltar"
-	
-	,"SelectAgency": "Seleccione uma agência"
-	,"Province": "Distrito"
-	,"Expeditions": "Exps."
-	,"Left": "Faltam"
-}
diff --git a/forms/agencies/provinces/locale/pt.yml b/forms/agencies/provinces/locale/pt.yml
new file mode 100644
index 00000000..815c8d5c
--- /dev/null
+++ b/forms/agencies/provinces/locale/pt.yml
@@ -0,0 +1,6 @@
+ByProvince: Desglosse por Distritos
+Return: Voltar
+SelectAgency: Seleccione uma agência
+Province: Distrito
+Expeditions: Exps.
+Left: Faltam
diff --git a/forms/cms/about/locale/ca.json b/forms/cms/about/locale/ca.json
deleted file mode 100644
index e3e3942a..00000000
--- a/forms/cms/about/locale/ca.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-	"QualityAndVariety": "Qualitat, varietat i servei"
-
-	,"MaximumFreshness": "Verdnatura t'ofereix un producte amb la màxima frescor garantida, gràcies als seus recepcions diàries de flor i planta procedents d'Holanda, Sud-amèrica, o des del mateix productor."
-	,"SquareMeters": "Més de 13.000m d'instal·lacions"
-	,"AboutRealms": "Amb flor tallada, verds, artificial i complements"
-	,"AboutLocation": "Assentats a València, Madrid, Barcelona, Holanda i França, oferim venda directa a les nostres instal·lacions i repartiment a tot Espanya mitjançant servei propi o agència."
-	,"PurchaseThroughWeb": "Compra a través de la nostra web i rep la teva comanda còmodament a la teua floristeria. ¡En menys de 24 hores!"
-
-	,"WhatMakeUsDifferent": "Que ens fa diferents?"
-
-	,"DesignVariety": "La varietat en el disseny, la qualitat dels materials utilitzats i el nostre servei de repartiment, et garanteixen un mostrari de gènere dinàmic, sempre fresc i atractiu."
-	,"AdaptToYourNeeds": "Verdnatura s'adapta a les necessitats de cada client oferint un ampli ventall de productes, garantit sempre."
-	,"TheBestQuality": "La millor qualitat al millor preu. Sense oblidar mai el disseny."
-
-	,"AtYourService": "Estem al teu servei"
-
-	,"BuyersAndTraders": "9 compradors especialitzats i els nostres 20 comercials t'assessoraran en tot el que necessitis."
-	
-	,"Verdnatura training": "Verdnatura formació"
-
-	,"GoodTraining": "En Verdnatura sabem que una bona formació és imprescindible per al desenvolupament òptim de qualsevol activitat, i com no, també la de florista."
-	,"SpecialTrainingPrices": "Perquè el pressupost d'una escola no repercuteixi en la qualitat de la teva formació, col·laborem amb una política de preus especials per a totes aquelles escoles que ho sol·licitin realitzar cursos a les nostres instal·lacions de Verdnatura Silla."
-	,"YoutubeChannel": "I no et perdis els vídeos de Canal Verdnatura a Youtube. On trobaràs un munt de consells molt interessants sobre el maneig de la flor."
-	
-	,"HowWeWork": "Com treballem?"
-
-	,"FirstQualityControl": "1º control de qualitat"
-	,"SecondQualityControl": "2º control de qualitat"
-	,"ThirdQualityControl": "3º control de qualitat"
-	,"FourthQualityControl": "4º control de qualitat"
-
-	,"AalsmeerAuction": "A les 5: 00h, els nostres responsables de compres adquireixen, en la subhasta d'Aalsmeer i Noaldwijk, el gènere que el productor ha collit el dia anterior."
-	,"BeforeAuction": "Després de la seva compra, aquest gènere entra ràpidament en Verdnatura Holland BV, la nostra empresa de Flora Holland, en Aalsmeer."
-	,"DirectlyFromProviders": "A més de comprar a través de la subhasta Holandesa, també comprem directament a productors de Colòmbia, Equador, Tailàndia, Malàisia, Àfrica i Austràlia. Aquests productes són supervisats directament pels nostres delegats de compra situats a cada zona. Aquesta mercaderia viatjarà a Amsterdam, sotmesa a un procés de Vaacum i en menys de dues hores des del seu aterratge, estarà a les nostres instal·lacions d'Aalsmeer."
-	,"GoodsDischarge": "A les 7: 00h els nostres companys de Aalsmeer comencen a rebre la mercaderia comprada, passant un primer control de qualitat, i donant-la d'alta al nostre estoc. Ja està disponible per als nostres clients a la web."
-	,"GoodsTravel": "La mercaderia viatja durant dia i mig a camions amb compartiments estancs a temperatures diferents, de manera que no es trenqui la cadena de fred i viatge en les millors condicions."
-	,"GoodsReception": "A la recepció de la mercaderia el responsable de la seva compra revisa l'estat en què arriba, acceptant-la o rebutjant-la segons el cas, es descarrega en fred i ràpidament entra a la nostra càmera."
-	,"CustomerOrders": "Els nostres clients poden fer les seves comandes a través del web, per telèfon o venint directament a les nostres instal·lacions. Tenim un equip de comercials especialitzats que t'assessorarà en la teva compra i que t'informarà de les novetats i articles que puguin ser del teu interès, de manera que la teva compra s'ajusti a les teves necessitats i quedis totalment satisfet."
-	,"AfterOrder": "Un cop realitzada la comanda, passa al departament de producció. Durant la preparació d'aquest es realitza un nou control de qualitat (el tercer) en què es rebutjarà la mercaderia deficient."
-	,"BuyerControl": "Quant es finalitza la preparació, es realitza un nou control (el quart) on un especialista conta i revisa l'estat dels productes. En cas que aquests no compleixin amb els estàndards de qualitat exigits els rebutja i els substitueix per els adequats."
-	,"EmbeddedSection": "Seguidament es porta a la secció de encaixat, on la comanda és condicionada per la seva correcta entrega. Cada tipus de lliurament requereix un mètode de encaixat adequat perquè el gènere viatge protegit i arribi al client en perfectes condicions."
-	,"AfterEmbedAgency": "Quant el producte ha estat encaixat s'emmagatzema de nou a la cambra fins a la seva sortida per agència o per repartiment propi, rebent el client, en 24h en el cas de l'agència o el mateix dia en el cas del repartiment, còmodament al seu domicili ."
-	,"FreshnessGuaranteed": "Aquesta forma de treball garanteix la major frescor per la rapidesa dels processos i pel manteniment de la cadena de fred desde la compra fins a la seva recepció pel nostre client."
-
-	,"AboutSummary": "75 persones repartides per tothom perquè el nostre client tingui el més ampli catàleg del sector, la flor més fresca, la planta més innovadora, els complements més actuals, i el servei més ràpid possible."
-}
diff --git a/forms/cms/about/locale/ca.yml b/forms/cms/about/locale/ca.yml
new file mode 100644
index 00000000..b5e58a70
--- /dev/null
+++ b/forms/cms/about/locale/ca.yml
@@ -0,0 +1,103 @@
+QualityAndVariety: 'Qualitat, varietat i servei'
+MaximumFreshness: >-
+  Verdnatura t'ofereix un producte amb la màxima frescor garantida, gràcies als
+  seus recepcions diàries de flor i planta procedents d'Holanda, Sud-amèrica, o
+  des del mateix productor.
+SquareMeters: Més de 13.000m d'instal·lacions
+AboutRealms: 'Amb flor tallada, verds, artificial i complements'
+AboutLocation: >-
+  Assentats a València, Madrid, Barcelona, Holanda i França, oferim venda
+  directa a les nostres instal·lacions i repartiment a tot Espanya mitjançant
+  servei propi o agència.
+PurchaseThroughWeb: >-
+  Compra a través de la nostra web i rep la teva comanda còmodament a la teua
+  floristeria. ¡En menys de 24 hores!
+WhatMakeUsDifferent: Que ens fa diferents?
+DesignVariety: >-
+  La varietat en el disseny, la qualitat dels materials utilitzats i el nostre
+  servei de repartiment, et garanteixen un mostrari de gènere dinàmic, sempre
+  fresc i atractiu.
+AdaptToYourNeeds: >-
+  Verdnatura s'adapta a les necessitats de cada client oferint un ampli ventall
+  de productes, garantit sempre.
+TheBestQuality: La millor qualitat al millor preu. Sense oblidar mai el disseny.
+AtYourService: Estem al teu servei
+BuyersAndTraders: >-
+  9 compradors especialitzats i els nostres 20 comercials t'assessoraran en tot
+  el que necessitis.
+Verdnatura training: Verdnatura formació
+GoodTraining: >-
+  En Verdnatura sabem que una bona formació és imprescindible per al
+  desenvolupament òptim de qualsevol activitat, i com no, també la de florista.
+SpecialTrainingPrices: >-
+  Perquè el pressupost d'una escola no repercuteixi en la qualitat de la teva
+  formació, col·laborem amb una política de preus especials per a totes aquelles
+  escoles que ho sol·licitin realitzar cursos a les nostres instal·lacions de
+  Verdnatura Silla.
+YoutubeChannel: >-
+  I no et perdis els vídeos de Canal Verdnatura a Youtube. On trobaràs un munt
+  de consells molt interessants sobre el maneig de la flor.
+HowWeWork: Com treballem?
+FirstQualityControl: 1º control de qualitat
+SecondQualityControl: 2º control de qualitat
+ThirdQualityControl: 3º control de qualitat
+FourthQualityControl: 4º control de qualitat
+AalsmeerAuction: >-
+  A les 5: 00h, els nostres responsables de compres adquireixen, en la subhasta
+  d'Aalsmeer i Noaldwijk, el gènere que el productor ha collit el dia anterior.
+BeforeAuction: >-
+  Després de la seva compra, aquest gènere entra ràpidament en Verdnatura
+  Holland BV, la nostra empresa de Flora Holland, en Aalsmeer.
+DirectlyFromProviders: >-
+  A més de comprar a través de la subhasta Holandesa, també comprem directament
+  a productors de Colòmbia, Equador, Tailàndia, Malàisia, Àfrica i Austràlia.
+  Aquests productes són supervisats directament pels nostres delegats de compra
+  situats a cada zona. Aquesta mercaderia viatjarà a Amsterdam, sotmesa a un
+  procés de Vaacum i en menys de dues hores des del seu aterratge, estarà a les
+  nostres instal·lacions d'Aalsmeer.
+GoodsDischarge: >-
+  A les 7: 00h els nostres companys de Aalsmeer comencen a rebre la mercaderia
+  comprada, passant un primer control de qualitat, i donant-la d'alta al nostre
+  estoc. Ja està disponible per als nostres clients a la web.
+GoodsTravel: >-
+  La mercaderia viatja durant dia i mig a camions amb compartiments estancs a
+  temperatures diferents, de manera que no es trenqui la cadena de fred i viatge
+  en les millors condicions.
+GoodsReception: >-
+  A la recepció de la mercaderia el responsable de la seva compra revisa l'estat
+  en què arriba, acceptant-la o rebutjant-la segons el cas, es descarrega en
+  fred i ràpidament entra a la nostra càmera.
+CustomerOrders: >-
+  Els nostres clients poden fer les seves comandes a través del web, per telèfon
+  o venint directament a les nostres instal·lacions. Tenim un equip de
+  comercials especialitzats que t'assessorarà en la teva compra i que
+  t'informarà de les novetats i articles que puguin ser del teu interès, de
+  manera que la teva compra s'ajusti a les teves necessitats i quedis totalment
+  satisfet.
+AfterOrder: >-
+  Un cop realitzada la comanda, passa al departament de producció. Durant la
+  preparació d'aquest es realitza un nou control de qualitat (el tercer) en què
+  es rebutjarà la mercaderia deficient.
+BuyerControl: >-
+  Quant es finalitza la preparació, es realitza un nou control (el quart) on un
+  especialista conta i revisa l'estat dels productes. En cas que aquests no
+  compleixin amb els estàndards de qualitat exigits els rebutja i els
+  substitueix per els adequats.
+EmbeddedSection: >-
+  Seguidament es porta a la secció de encaixat, on la comanda és condicionada
+  per la seva correcta entrega. Cada tipus de lliurament requereix un mètode de
+  encaixat adequat perquè el gènere viatge protegit i arribi al client en
+  perfectes condicions.
+AfterEmbedAgency: >-
+  Quant el producte ha estat encaixat s'emmagatzema de nou a la cambra fins a la
+  seva sortida per agència o per repartiment propi, rebent el client, en 24h en
+  el cas de l'agència o el mateix dia en el cas del repartiment, còmodament al
+  seu domicili .
+FreshnessGuaranteed: >-
+  Aquesta forma de treball garanteix la major frescor per la rapidesa dels
+  processos i pel manteniment de la cadena de fred desde la compra fins a la
+  seva recepció pel nostre client.
+AboutSummary: >-
+  75 persones repartides per tothom perquè el nostre client tingui el més ampli
+  catàleg del sector, la flor més fresca, la planta més innovadora, els
+  complements més actuals, i el servei més ràpid possible.
diff --git a/forms/cms/about/locale/en.json b/forms/cms/about/locale/en.json
deleted file mode 100644
index 00f38993..00000000
--- a/forms/cms/about/locale/en.json
+++ /dev/null
@@ -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."
-}
diff --git a/forms/cms/about/locale/en.yml b/forms/cms/about/locale/en.yml
new file mode 100644
index 00000000..bef2b510
--- /dev/null
+++ b/forms/cms/about/locale/en.yml
@@ -0,0 +1,92 @@
+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.
diff --git a/forms/cms/about/locale/es.json b/forms/cms/about/locale/es.json
deleted file mode 100644
index ce9fad98..00000000
--- a/forms/cms/about/locale/es.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-	"QualityAndVariety": "Calidad, variedad y servicio"
-
-	,"MaximumFreshness": "Verdnatura te ofrece un producto con la máxima frescura garantizada, gracias a sus recepciones diarias de flor y planta procedentes de Holanda, Sudamérica, o desde el mismo productor."
-	,"SquareMeters": "Más de 13.000m de instalaciones"
-	,"AboutRealms": "Con flor cortada, verdes, artificial y complementos"
-	,"AboutLocation": "Asentados en Valencia, Madrid, Barcelona, Holanda y Francia, ofrecemos venta directa en nuestras instalaciones y reparto a toda España mediante servicio propio o agencia."
-	,"PurchaseThroughWeb": "Compra a través de nuestra web y recibe tu pedido cómodamente en tu floristería. ¡En menos de 24 horas!"
-
-	,"WhatMakeUsDifferent": "¿Que nos hace diferentes?"
-
-	,"DesignVariety": "La variedad en el diseño, la calidad de los materiales utilizados y nuestro servicio de reparto, te garantizan un muestrario de género dinámico, siempre fresco y atractivo."
-	,"AdaptToYourNeeds": "Verdnatura se adapta a las necesidades de cada cliente ofreciéndote un amplio abanico de productos, garantizado siempre."
-	,"TheBestQuality": "La mejor calidad al mejor precio. Sin olvidar nunca el diseño."
-
-	,"AtYourService": "Estamos a tu servicio"
-
-	,"BuyersAndTraders": "9 compradores especializados y nuestros 20 comerciales te asesorarán en todo lo que necesites."
-	
-	,"Verdnatura training": "Verdnatura formación"
-
-	,"GoodTraining": "En Verdnatura sabemos que una buena formación es imprescindible para el desarrollo óptimo de cualquier actividad, y cómo no, también la de florista."
-	,"SpecialTrainingPrices": "Para que el presupuesto de una escuela no repercuta en la calidad de tu formación, colaboramos con una política de precios especiales para todas aquellas escuelas que lo soliciten realizar cursos en nuestras instalaciones de Verdnatura Silla."
-	,"YoutubeChannel": "Y no te pierdas los vídeos de Canal Verdnatura en Youtube. Donde encontrarás un montón de consejos muy interesantes sobre el manejo de la flor."
-	
-	,"HowWeWork": "¿Cómo trabajamos?"
-
-	,"FirstQualityControl": "1º control de calidad"
-	,"SecondQualityControl": "2º control de calidad"
-	,"ThirdQualityControl": "3º control de calidad"
-	,"FourthQualityControl": "4º control de calidad"
-
-	,"AalsmeerAuction": "A las 5:00h, nuestros responsables de compras adquieren, en la subasta de Aalsmeer y Noaldwijk, el género que el productor ha cosechado el día anterior."
-	,"BeforeAuction": "Tras su compra, este género entra rápidamente en Verdnatura Holland BV, nuestra empresa de Flora Holland, en Aalsmeer."
-	,"DirectlyFromProviders": "Además de comprar a través de la subasta Holandesa, también compramos directamente a productores de Colombia, Ecuador, Thailandia, Malasia, África y Australia. Estos productos son supervisados directamente por nuestros delegados de compra ubicados en cada zona. Esta mercancía viajará a Amsterdam, sometida a un proceso de Vaacum y en menos de dos horas desde su aterrizaje, estará en nuestras instalaciones de Aalsmeer."
-	,"GoodsDischarge": "A las 7:00h nuestros compañeros de Aalsmeer empiezan a recibir la mercancía comprada, pasando un primer control de calidad, y dándola de alta en nuestro stock. Ya está disponible para nuestros clientes en la web."
-	,"GoodsTravel": "La mercancía viaja durante día y medio en camiones con compartimentos estancos a temperaturas diferentes, de manera que no se rompa la cadena de frío y viaje en las mejores condiciones."
-	,"GoodsReception": "A la recepción de la mercancía el responsable de su compra revisa el estado en el que llega, aceptándola o rechazándola según el caso, se descarga en frío y rápidamente entra en nuestra cámara."
-	,"CustomerOrders": "Nuestros clientes pueden hacer sus pedidos a través de la web, por teléfono o viniendo directamente a nuestras instalaciones. Tenemos un equipo de comerciales especializados que te asesorará en tu compra y que te informará de las novedades y artículos que puedan ser de tu interés, de forma que tu compra se ajuste a tus necesidades y quedes totalmente satisfecho."
-	,"AfterOrder": "Una vez realizado el pedido, pasa al departamento de producción. Durante la preparación de este se realiza un nuevo control de calidad (el tercero) en el que se desechará la mercancía deficiente."
-	,"BuyerControl": "En cuanto se finaliza la preparación, se realiza un nuevo control (el cuarto) donde un especialista cuenta y revisa el estado de los productos. En caso de que estos no cumplan con los estándares de calidad exigidos los rechaza y los sustituye por los adecuados."
-	,"EmbeddedSection": "Seguidamente se lleva a la sección de encajado, donde el pedido es acondicionado para su correcta entrega. Cada tipo de entrega requiere un método de encajado adecuado para que el género viaje protegido y llegue al cliente en perfectas condiciones."
-	,"AfterEmbedAgency": "En cuanto el producto ha sido encajado se almacena de nuevo en la cámara hasta su salida por agencia o por reparto propio, recibiéndolo el cliente, en 24h en el caso de la agencia o el mismo día en el caso del reparto, cómodamente en su domicilio."
-	,"FreshnessGuaranteed": "Esta forma de trabajo garantiza la mayor frescura por la rapidez los procesos y por el mantenimiento de la cadena de frío desde compra hasta su recepción por nuestro cliente."
-
-	,"AboutSummary": "75 personas repartidas por casi todo el mundo para que nuestro cliente tenga el más amplio catálogo del sector, la flor más fresca, la planta más novedosa, los complementos más actuales, y el servicio más rápido posible."
-}
diff --git a/forms/cms/about/locale/es.yml b/forms/cms/about/locale/es.yml
new file mode 100644
index 00000000..3b56cec5
--- /dev/null
+++ b/forms/cms/about/locale/es.yml
@@ -0,0 +1,102 @@
+QualityAndVariety: 'Calidad, variedad y servicio'
+MaximumFreshness: >-
+  Verdnatura te ofrece un producto con la máxima frescura garantizada, gracias a
+  sus recepciones diarias de flor y planta procedentes de Holanda, Sudamérica, o
+  desde el mismo productor.
+SquareMeters: Más de 13.000m de instalaciones
+AboutRealms: 'Con flor cortada, verdes, artificial y complementos'
+AboutLocation: >-
+  Asentados en Valencia, Madrid, Barcelona, Holanda y Francia, ofrecemos venta
+  directa en nuestras instalaciones y reparto a toda España mediante servicio
+  propio o agencia.
+PurchaseThroughWeb: >-
+  Compra a través de nuestra web y recibe tu pedido cómodamente en tu
+  floristería. ¡En menos de 24 horas!
+WhatMakeUsDifferent: ¿Que nos hace diferentes?
+DesignVariety: >-
+  La variedad en el diseño, la calidad de los materiales utilizados y nuestro
+  servicio de reparto, te garantizan un muestrario de género dinámico, siempre
+  fresco y atractivo.
+AdaptToYourNeeds: >-
+  Verdnatura se adapta a las necesidades de cada cliente ofreciéndote un amplio
+  abanico de productos, garantizado siempre.
+TheBestQuality: La mejor calidad al mejor precio. Sin olvidar nunca el diseño.
+AtYourService: Estamos a tu servicio
+BuyersAndTraders: >-
+  9 compradores especializados y nuestros 20 comerciales te asesorarán en todo
+  lo que necesites.
+Verdnatura training: Verdnatura formación
+GoodTraining: >-
+  En Verdnatura sabemos que una buena formación es imprescindible para el
+  desarrollo óptimo de cualquier actividad, y cómo no, también la de florista.
+SpecialTrainingPrices: >-
+  Para que el presupuesto de una escuela no repercuta en la calidad de tu
+  formación, colaboramos con una política de precios especiales para todas
+  aquellas escuelas que lo soliciten realizar cursos en nuestras instalaciones
+  de Verdnatura Silla.
+YoutubeChannel: >-
+  Y no te pierdas los vídeos de Canal Verdnatura en Youtube. Donde encontrarás
+  un montón de consejos muy interesantes sobre el manejo de la flor.
+HowWeWork: ¿Cómo trabajamos?
+FirstQualityControl: 1º control de calidad
+SecondQualityControl: 2º control de calidad
+ThirdQualityControl: 3º control de calidad
+FourthQualityControl: 4º control de calidad
+AalsmeerAuction: >-
+  A las 5:00h, nuestros responsables de compras adquieren, en la subasta de
+  Aalsmeer y Noaldwijk, el género que el productor ha cosechado el día anterior.
+BeforeAuction: >-
+  Tras su compra, este género entra rápidamente en Verdnatura Holland BV,
+  nuestra empresa de Flora Holland, en Aalsmeer.
+DirectlyFromProviders: >-
+  Además de comprar a través de la subasta Holandesa, también compramos
+  directamente a productores de Colombia, Ecuador, Thailandia, Malasia, África y
+  Australia. Estos productos son supervisados directamente por nuestros
+  delegados de compra ubicados en cada zona. Esta mercancía viajará a Amsterdam,
+  sometida a un proceso de Vaacum y en menos de dos horas desde su aterrizaje,
+  estará en nuestras instalaciones de Aalsmeer.
+GoodsDischarge: >-
+  A las 7:00h nuestros compañeros de Aalsmeer empiezan a recibir la mercancía
+  comprada, pasando un primer control de calidad, y dándola de alta en nuestro
+  stock. Ya está disponible para nuestros clientes en la web.
+GoodsTravel: >-
+  La mercancía viaja durante día y medio en camiones con compartimentos estancos
+  a temperaturas diferentes, de manera que no se rompa la cadena de frío y viaje
+  en las mejores condiciones.
+GoodsReception: >-
+  A la recepción de la mercancía el responsable de su compra revisa el estado en
+  el que llega, aceptándola o rechazándola según el caso, se descarga en frío y
+  rápidamente entra en nuestra cámara.
+CustomerOrders: >-
+  Nuestros clientes pueden hacer sus pedidos a través de la web, por teléfono o
+  viniendo directamente a nuestras instalaciones. Tenemos un equipo de
+  comerciales especializados que te asesorará en tu compra y que te informará de
+  las novedades y artículos que puedan ser de tu interés, de forma que tu compra
+  se ajuste a tus necesidades y quedes totalmente satisfecho.
+AfterOrder: >-
+  Una vez realizado el pedido, pasa al departamento de producción. Durante la
+  preparación de este se realiza un nuevo control de calidad (el tercero) en el
+  que se desechará la mercancía deficiente.
+BuyerControl: >-
+  En cuanto se finaliza la preparación, se realiza un nuevo control (el cuarto)
+  donde un especialista cuenta y revisa el estado de los productos. En caso de
+  que estos no cumplan con los estándares de calidad exigidos los rechaza y los
+  sustituye por los adecuados.
+EmbeddedSection: >-
+  Seguidamente se lleva a la sección de encajado, donde el pedido es
+  acondicionado para su correcta entrega. Cada tipo de entrega requiere un
+  método de encajado adecuado para que el género viaje protegido y llegue al
+  cliente en perfectas condiciones.
+AfterEmbedAgency: >-
+  En cuanto el producto ha sido encajado se almacena de nuevo en la cámara hasta
+  su salida por agencia o por reparto propio, recibiéndolo el cliente, en 24h en
+  el caso de la agencia o el mismo día en el caso del reparto, cómodamente en su
+  domicilio.
+FreshnessGuaranteed: >-
+  Esta forma de trabajo garantiza la mayor frescura por la rapidez los procesos
+  y por el mantenimiento de la cadena de frío desde compra hasta su recepción
+  por nuestro cliente.
+AboutSummary: >-
+  75 personas repartidas por casi todo el mundo para que nuestro cliente tenga
+  el más amplio catálogo del sector, la flor más fresca, la planta más novedosa,
+  los complementos más actuales, y el servicio más rápido posible.
diff --git a/forms/cms/about/locale/fr.json b/forms/cms/about/locale/fr.json
deleted file mode 100644
index 16b95654..00000000
--- a/forms/cms/about/locale/fr.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-	"QualityAndVariety": "Qualité, variété et le service"
-
-	,"MaximumFreshness": "Verdnatura offre une garantie de produit maximales de fraîcheur grâce à leurs fleurs quotidiens et plantes de Hollande, Amérique du Sud, ou à partir des mêmes réceptions de producteurs."
-	,"SquareMeters": "Sur des installations 13,000m"
-	,"AboutRealms": "Avec les fleurs coupées, vert, artificielle et accessoires"
-	,"AboutLocation": "Installé à Valence, Madrid, Barcelone, la Hollande et la France, offrir des ventes directes dans nos installations et la distribution dans toute l'Espagne par propre service ou organisme."
-	,"PurchaseThroughWeb": "Achetez sur notre site et recevoir votre commande confortablement dans votre fleuriste. En moins de 24 heures!"
-
-	,"WhatMakeUsDifferent": "Qu'est-ce qui nous rend différents?"
-
-	,"DesignVariety": "La variété dans la conception, la qualité des matériaux utilisés et de notre prestation de service, fournira une vitrine de genre dynamique, toujours frais et attrayant."
-	,"AdaptToYourNeeds": "Verdnatura adapte aux besoins de chaque client en offrant une large gamme de produits, toujours garanti."
-	,"TheBestQuality": "La meilleure qualité au meilleur prix. Sans oublier la conception."
-
-	,"AtYourService": "Nous sommes à votre service"
-
-	,"BuyersAndTraders": "9 acheteurs commerciaux spécialisés et notre 20 conseillera dans tout ce que vous avez besoin."
-	
-	,"Verdnatura training": "Formation Verdnatura"
-
-	,"GoodTraining": "Dans Verdnatura sait qu'une bonne éducation est essentielle pour le développement optimal de toute activité, et bien sûr, aussi le fleuriste."
-	,"SpecialTrainingPrices": "Pour le budget d'une école n'a aucun effet sur la qualité de votre formation, travailler avec la politique de tarification spéciale pour toutes les écoles qui le demandent de suivre des cours dans nos installations chaise Verdnatura."
-	,"YoutubeChannel": "Et ne manquez pas les vidéos Verdnatura sur Youtube Channel. Où vous trouverez beaucoup de conseils intéressants sur la manipulation de la fleur."
-	
-	,"HowWeWork": "Comment travaillons-nous?"
-
-	,"FirstQualityControl": "QC 1"
-	,"SecondQualityControl": "QC 2"
-	,"ThirdQualityControl": "QC 3"
-	,"FourthQualityControl": "QC 4"
-
-	,"AalsmeerAuction": "À 5: 00h, nos directeurs d'achat acquièrent, dans la vente aux enchères d'Aalsmeer et Noaldwijk, le sexe, le producteur a récolté la journée précédente."
-	,"BeforeAuction": "Après l'achat, le genre pénètre rapidement Verdnatura Holland BV, notre société Flora Holland à Aalsmeer."
-	,"DirectlyFromProviders": "Outre l'achat par l'adjudication à la hollandaise, achète directement auprès des producteurs de la Colombie, l'Equateur, Thaïlande, Malaisie, Afrique et Australie. Ces produits sont directement supervisés par nos délégués achat situés dans chaque zone. Cette marchandise se rendra à Amsterdam, soumis à un processus Vaacum et en moins de deux heures après l'atterrissage, sera dans notre usine de Aalsmeer."
-	,"GoodsDischarge": "À 7: 00h notre compagnon Aalsmeer commencer à recevoir les marchandises achetées, ayant un premier contrôle de la qualité, et la création en stock. Maintenant disponible pour nos clients sur le web."
-	,"GoodsTravel": "Les marchandises voyagent pendant un jour et un camion demi compartiments étanches à des températures différentes, de sorte que la chaîne du froid est pas cassé voyage dans les meilleures conditions."
-	,"GoodsReception": "Dès réception de la marchandise responsable de l'achat Etat examiné qui arrive, d'accepter ou de rejeter le cas échéant, déchargé froid et pénètre rapidement notre caméra."
-	,"CustomerOrders": "Nos clients peuvent passer leurs commandes via le Web, par téléphone ou venir directement à nos installations. Nous avons une équipe spécialisée de conseil commercial, vous sur votre achat et vous informons les dernières nouvelles et des articles qui peuvent être d'intérêt, pour que votre achat répond à vos besoins et de rester totalement satisfait."
-	,"AfterOrder": "Une fois placé l'ordre, se tourner vers le département de production. Lors de la préparation de ce nouveau contrôle de la qualité (troisième) dans laquelle les pauvres seront rejetés marchandise est faite."
-	,"BuyerControl": "Comme la préparation est terminée, un nouveau contrôle (quatrième), où un compte de spécialiste est faite et vérifier l'état des produits. Si elles ne répondent pas aux normes de qualité requises rejets et remplace le droit."
-	,"EmbeddedSection": "Prend alors la section embarqué, où l'ordre est approprié pour la livraison appropriée. Chaque type de prestation requiert une méthode appropriée pour les livres de genre protégée embarqués et atteint le client en parfait état."
-	,"AfterEmbedAgency": "Une fois que le produit a été installé il est stocké à nouveau dans la chambre jusqu'à ce qu'ils quittent par agence ou propre affaire, recevoir le client dans les 24 heures dans le cas de l'agence ou le même jour pour le casting, confortablement à la maison."
-	,"FreshnessGuaranteed": "Cette méthode de travail garantit la fraîcheur par des processus rapides et le maintien de la chaîne du froid, de l'achat à la réception par notre client."
-
-	,"AboutSummary": "75 personnes réparties sur presque tout le monde pour que notre client a le plus vaste portefeuille de l'industrie, plus cool fleur, plante récentes, les derniers accessoires, et le service le plus rapide possible."
-}
diff --git a/forms/cms/about/locale/fr.yml b/forms/cms/about/locale/fr.yml
new file mode 100644
index 00000000..83268ec4
--- /dev/null
+++ b/forms/cms/about/locale/fr.yml
@@ -0,0 +1,99 @@
+QualityAndVariety: 'Qualité, variété et le service'
+MaximumFreshness: >-
+  Verdnatura offre une garantie de produit maximales de fraîcheur grâce à leurs
+  fleurs quotidiens et plantes de Hollande, Amérique du Sud, ou à partir des
+  mêmes réceptions de producteurs.
+SquareMeters: 'Sur des installations 13,000m'
+AboutRealms: 'Avec les fleurs coupées, vert, artificielle et accessoires'
+AboutLocation: >-
+  Installé à Valence, Madrid, Barcelone, la Hollande et la France, offrir des
+  ventes directes dans nos installations et la distribution dans toute l'Espagne
+  par propre service ou organisme.
+PurchaseThroughWeb: >-
+  Achetez sur notre site et recevoir votre commande confortablement dans votre
+  fleuriste. En moins de 24 heures!
+WhatMakeUsDifferent: Qu'est-ce qui nous rend différents?
+DesignVariety: >-
+  La variété dans la conception, la qualité des matériaux utilisés et de notre
+  prestation de service, fournira une vitrine de genre dynamique, toujours frais
+  et attrayant.
+AdaptToYourNeeds: >-
+  Verdnatura adapte aux besoins de chaque client en offrant une large gamme de
+  produits, toujours garanti.
+TheBestQuality: La meilleure qualité au meilleur prix. Sans oublier la conception.
+AtYourService: Nous sommes à votre service
+BuyersAndTraders: >-
+  9 acheteurs commerciaux spécialisés et notre 20 conseillera dans tout ce que
+  vous avez besoin.
+Verdnatura training: Formation Verdnatura
+GoodTraining: >-
+  Dans Verdnatura sait qu'une bonne éducation est essentielle pour le
+  développement optimal de toute activité, et bien sûr, aussi le fleuriste.
+SpecialTrainingPrices: >-
+  Pour le budget d'une école n'a aucun effet sur la qualité de votre formation,
+  travailler avec la politique de tarification spéciale pour toutes les écoles
+  qui le demandent de suivre des cours dans nos installations chaise Verdnatura.
+YoutubeChannel: >-
+  Et ne manquez pas les vidéos Verdnatura sur Youtube Channel. Où vous trouverez
+  beaucoup de conseils intéressants sur la manipulation de la fleur.
+HowWeWork: Comment travaillons-nous?
+FirstQualityControl: QC 1
+SecondQualityControl: QC 2
+ThirdQualityControl: QC 3
+FourthQualityControl: QC 4
+AalsmeerAuction: >-
+  À 5: 00h, nos directeurs d'achat acquièrent, dans la vente aux enchères
+  d'Aalsmeer et Noaldwijk, le sexe, le producteur a récolté la journée
+  précédente.
+BeforeAuction: >-
+  Après l'achat, le genre pénètre rapidement Verdnatura Holland BV, notre
+  société Flora Holland à Aalsmeer.
+DirectlyFromProviders: >-
+  Outre l'achat par l'adjudication à la hollandaise, achète directement auprès
+  des producteurs de la Colombie, l'Equateur, Thaïlande, Malaisie, Afrique et
+  Australie. Ces produits sont directement supervisés par nos délégués achat
+  situés dans chaque zone. Cette marchandise se rendra à Amsterdam, soumis à un
+  processus Vaacum et en moins de deux heures après l'atterrissage, sera dans
+  notre usine de Aalsmeer.
+GoodsDischarge: >-
+  À 7: 00h notre compagnon Aalsmeer commencer à recevoir les marchandises
+  achetées, ayant un premier contrôle de la qualité, et la création en stock.
+  Maintenant disponible pour nos clients sur le web.
+GoodsTravel: >-
+  Les marchandises voyagent pendant un jour et un camion demi compartiments
+  étanches à des températures différentes, de sorte que la chaîne du froid est
+  pas cassé voyage dans les meilleures conditions.
+GoodsReception: >-
+  Dès réception de la marchandise responsable de l'achat Etat examiné qui
+  arrive, d'accepter ou de rejeter le cas échéant, déchargé froid et pénètre
+  rapidement notre caméra.
+CustomerOrders: >-
+  Nos clients peuvent passer leurs commandes via le Web, par téléphone ou venir
+  directement à nos installations. Nous avons une équipe spécialisée de conseil
+  commercial, vous sur votre achat et vous informons les dernières nouvelles et
+  des articles qui peuvent être d'intérêt, pour que votre achat répond à vos
+  besoins et de rester totalement satisfait.
+AfterOrder: >-
+  Une fois placé l'ordre, se tourner vers le département de production. Lors de
+  la préparation de ce nouveau contrôle de la qualité (troisième) dans laquelle
+  les pauvres seront rejetés marchandise est faite.
+BuyerControl: >-
+  Comme la préparation est terminée, un nouveau contrôle (quatrième), où un
+  compte de spécialiste est faite et vérifier l'état des produits. Si elles ne
+  répondent pas aux normes de qualité requises rejets et remplace le droit.
+EmbeddedSection: >-
+  Prend alors la section embarqué, où l'ordre est approprié pour la livraison
+  appropriée. Chaque type de prestation requiert une méthode appropriée pour les
+  livres de genre protégée embarqués et atteint le client en parfait état.
+AfterEmbedAgency: >-
+  Une fois que le produit a été installé il est stocké à nouveau dans la chambre
+  jusqu'à ce qu'ils quittent par agence ou propre affaire, recevoir le client
+  dans les 24 heures dans le cas de l'agence ou le même jour pour le casting,
+  confortablement à la maison.
+FreshnessGuaranteed: >-
+  Cette méthode de travail garantit la fraîcheur par des processus rapides et le
+  maintien de la chaîne du froid, de l'achat à la réception par notre client.
+AboutSummary: >-
+  75 personnes réparties sur presque tout le monde pour que notre client a le
+  plus vaste portefeuille de l'industrie, plus cool fleur, plante récentes, les
+  derniers accessoires, et le service le plus rapide possible.
diff --git a/forms/cms/about/locale/pt.json b/forms/cms/about/locale/pt.json
deleted file mode 100644
index 99e48c3d..00000000
--- a/forms/cms/about/locale/pt.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-	"QualityAndVariety": "Qualidade, variedade e serviço"
-
-	,"MaximumFreshness": "Verdnatura lhe ofrece um produto com a máxima frescura garantida, graças a suas recepções diárias de flor e planta procedentes de Holanda, América do Sul, ou desde o mesmo produtor."
-	,"SquareMeters": "Mais de 13.000m de instalações"
-	,"AboutRealms": "Com flor cortada, verdes, artificial e complementos"
-	,"AboutLocation": "Asentados em Valencia, Madrid, Barcelona, Holanda e França, oferecemos venta direta em nossas instalações e Entregamos a toda Espanha mediante serviço proprio ou agência."
-	,"PurchaseThroughWeb": "Compra a través de nossa web e receba o pedido cômodamente em sua florista."
-
-	,"WhatMakeUsDifferent": "O Que nos faz diferentes?"
-
-	,"DesignVariety": "A variedade no desenho, a qualidade dos materiais utilizados e nosso serviço de entrega, te garantizam uma amostra de produto dinámico, sempre fresco e atrativo."
-	,"AdaptToYourNeeds": "Verdnatura se adapta às necessidades de cada cliente oferecendo-te um amplo leque de produtos, garantido sempre."
-	,"TheBestQuality": "A melhor qualidade ao melhor preço. Sen esquecer nunca do desenho."
-
-	,"AtYourService": "Estamos a seu serviço"
-
-	,"BuyersAndTraders": "9 compradores especializados e nossos 20 comerciais te asessorarão em tudo o que necessites."
-	
-	,"Verdnatura training": "Verdnatura formação"
-
-	,"GoodTraining": "Em Verdnatura sabemos que uma boa formação é imprescindível para o desenvolvimento ótimo de qualqer atividade, e como não, também a de florista."
-	,"SpecialTrainingPrices": "Para que o orçamento de uma escola não repercuta na qualidade da sua formação, colaboramos com uma política de preços especiais para todas aquelas escolas que solicitem realizar cursos em nossas instalações de Verdnatura Silla."
-	,"YoutubeChannel": "E não perdas os vídeos do Canal Verdnatura em Youtube. Onde vas a encontrar um montão de conselhos muito interessantes sobre o manuseio da flor."
-	
-	,"HowWeWork": "Como Trabalhamos?"
-
-	,"FirstQualityControl": "1º controle de qualidade"
-	,"SecondQualityControl": "2º controle de qualidade"
-	,"ThirdQualityControl": "3º controle de qualidade"
-	,"FourthQualityControl": "4º controle de qualidade"
-
-	,"AalsmeerAuction": "Às 5:00h, nossos responsáveis de compras adquirem, no leilão de Aalsmeer e Noaldwijk, o material que o produtor colheu no dia día anterior."
-	,"BeforeAuction": "Após sua compra, este material entra rápidamente em Verdnatura Holland BV, nossa empresa de Flora Holland, em Aalsmeer."
-	,"DirectlyFromProviders": "Além de comprar a través do leilão Holandes, também compramos diretamente a produtores de Colombia, Equador, Thailandia, Malasia, África e Australia. Estes productos são supervisados diretamente por nossos delegados de compra ubicados em cada zona. Esta mercadoria viajará a Amsterdam, submetida a um proceso de Vaacum e em menos de duas horas desde sua aterrizagem, estará em nossas instalações de Aalsmeer."
-	,"GoodsDischarge": "Às 7:00h nossos companheiros de Aalsmeer começam a receber a mercadoria comprada, passando um primeiro controle de qualidade, e registrando-a em nosso estoque. Já está disponivel para nossos clientes em nossa pagina online."
-	,"GoodsTravel": "A mercadoria viaja durante um día e meio em camiões com compartimentos herméticos com temperaturas diferentes, de maneira que não se interrompa a cadeia de frío e viaje nas melhores condições."
-	,"GoodsReception": "Na recepção da mercadoria o responsável da compra revisa o estado em que chega, aceitándo-la ou recuzando-a segundo o caso, se descarrega em frío e rápidamente entra em nossa câmara."
-	,"CustomerOrders": "Nossos clientes podem fazer seus pedidos a través da pagina web, por telefone ou vindo diretamente a nossas instalações. Temos uma equipa de comerciais especializados que lhe vai a asesorar em sua compra e lhe informará das novidades e ítens que possam ser de seu interesse, de forma que sua compra se ajuste às suas necessidades, e fique totalmente satisfeito."
-	,"AfterOrder": "Uma vez realizado o pedido, passa ao departamento de produção. Durante a preparação deste, se realiza um novo controle de qualidade (o terceiro), no qual se eliminará a mercadoria deficiente."
-	,"BuyerControl": "Quando se finaliza a preparação, se realiza um novo controle (o quarto) onde um especialista conta e revisa o estado dos produtos. Em caso de que estes não cumpram com o estandard de qualidade exigidos os recusa e os substitue pelos adequados."
-	,"EmbeddedSection": "Seguidamente se leva à sessão de encaixado, onde o pedido é acondicionado para sua correta entrega. Cada tipo de entrega requer un método de encaixado adequado para que o produto viaje protegido e chegue ao cliente em perfeitas condições."
-	,"AfterEmbedAgency": "Quando producto já foi encaixado se armazena de novo na câmara até sua saída por agência ou pelo nosso transporte proprio, recibiéndolo el cliente, em 24h no caso de agência ou no mesmo dia no caso de nosso transporte, cômodamente em sua morada."
-	,"FreshnessGuaranteed": "Esta forma de trabalho garante a maior frescura pela rapidez dos processos e pela manutenção da cadeia de frio desde a compra até sua recepção por nosso cliente."
-
-	,"AboutSummary": "75 pessoas divididas por quase todo o mundo para que nosso cliente tenha o mais amplo catálogo do sector, a flor mais fresca, a planta mais novedosa, os complementos mais actuais e o serviço mais rápido possível."
-}
diff --git a/forms/cms/about/locale/pt.yml b/forms/cms/about/locale/pt.yml
new file mode 100644
index 00000000..2ab5be0a
--- /dev/null
+++ b/forms/cms/about/locale/pt.yml
@@ -0,0 +1,99 @@
+QualityAndVariety: 'Qualidade, variedade e serviço'
+MaximumFreshness: >-
+  Verdnatura lhe ofrece um produto com a máxima frescura garantida, graças a
+  suas recepções diárias de flor e planta procedentes de Holanda, América do
+  Sul, ou desde o mesmo produtor.
+SquareMeters: Mais de 13.000m de instalações
+AboutRealms: 'Com flor cortada, verdes, artificial e complementos'
+AboutLocation: >-
+  Asentados em Valencia, Madrid, Barcelona, Holanda e França, oferecemos venta
+  direta em nossas instalações e Entregamos a toda Espanha mediante serviço
+  proprio ou agência.
+PurchaseThroughWeb: Compra a través de nossa web e receba o pedido cômodamente em sua florista.
+WhatMakeUsDifferent: O Que nos faz diferentes?
+DesignVariety: >-
+  A variedade no desenho, a qualidade dos materiais utilizados e nosso serviço
+  de entrega, te garantizam uma amostra de produto dinámico, sempre fresco e
+  atrativo.
+AdaptToYourNeeds: >-
+  Verdnatura se adapta às necessidades de cada cliente oferecendo-te um amplo
+  leque de produtos, garantido sempre.
+TheBestQuality: A melhor qualidade ao melhor preço. Sen esquecer nunca do desenho.
+AtYourService: Estamos a seu serviço
+BuyersAndTraders: >-
+  9 compradores especializados e nossos 20 comerciais te asessorarão em tudo o
+  que necessites.
+Verdnatura training: Verdnatura formação
+GoodTraining: >-
+  Em Verdnatura sabemos que uma boa formação é imprescindível para o
+  desenvolvimento ótimo de qualqer atividade, e como não, também a de florista.
+SpecialTrainingPrices: >-
+  Para que o orçamento de uma escola não repercuta na qualidade da sua formação,
+  colaboramos com uma política de preços especiais para todas aquelas escolas
+  que solicitem realizar cursos em nossas instalações de Verdnatura Silla.
+YoutubeChannel: >-
+  E não perdas os vídeos do Canal Verdnatura em Youtube. Onde vas a encontrar um
+  montão de conselhos muito interessantes sobre o manuseio da flor.
+HowWeWork: Como Trabalhamos?
+FirstQualityControl: 1º controle de qualidade
+SecondQualityControl: 2º controle de qualidade
+ThirdQualityControl: 3º controle de qualidade
+FourthQualityControl: 4º controle de qualidade
+AalsmeerAuction: >-
+  Às 5:00h, nossos responsáveis de compras adquirem, no leilão de Aalsmeer e
+  Noaldwijk, o material que o produtor colheu no dia día anterior.
+BeforeAuction: >-
+  Após sua compra, este material entra rápidamente em Verdnatura Holland BV,
+  nossa empresa de Flora Holland, em Aalsmeer.
+DirectlyFromProviders: >-
+  Além de comprar a través do leilão Holandes, também compramos diretamente a
+  produtores de Colombia, Equador, Thailandia, Malasia, África e Australia.
+  Estes productos são supervisados diretamente por nossos delegados de compra
+  ubicados em cada zona. Esta mercadoria viajará a Amsterdam, submetida a um
+  proceso de Vaacum e em menos de duas horas desde sua aterrizagem, estará em
+  nossas instalações de Aalsmeer.
+GoodsDischarge: >-
+  Às 7:00h nossos companheiros de Aalsmeer começam a receber a mercadoria
+  comprada, passando um primeiro controle de qualidade, e registrando-a em nosso
+  estoque. Já está disponivel para nossos clientes em nossa pagina online.
+GoodsTravel: >-
+  A mercadoria viaja durante um día e meio em camiões com compartimentos
+  herméticos com temperaturas diferentes, de maneira que não se interrompa a
+  cadeia de frío e viaje nas melhores condições.
+GoodsReception: >-
+  Na recepção da mercadoria o responsável da compra revisa o estado em que
+  chega, aceitándo-la ou recuzando-a segundo o caso, se descarrega em frío e
+  rápidamente entra em nossa câmara.
+CustomerOrders: >-
+  Nossos clientes podem fazer seus pedidos a través da pagina web, por telefone
+  ou vindo diretamente a nossas instalações. Temos uma equipa de comerciais
+  especializados que lhe vai a asesorar em sua compra e lhe informará das
+  novidades e ítens que possam ser de seu interesse, de forma que sua compra se
+  ajuste às suas necessidades, e fique totalmente satisfeito.
+AfterOrder: >-
+  Uma vez realizado o pedido, passa ao departamento de produção. Durante a
+  preparação deste, se realiza um novo controle de qualidade (o terceiro), no
+  qual se eliminará a mercadoria deficiente.
+BuyerControl: >-
+  Quando se finaliza a preparação, se realiza um novo controle (o quarto) onde
+  um especialista conta e revisa o estado dos produtos. Em caso de que estes não
+  cumpram com o estandard de qualidade exigidos os recusa e os substitue pelos
+  adequados.
+EmbeddedSection: >-
+  Seguidamente se leva à sessão de encaixado, onde o pedido é acondicionado para
+  sua correta entrega. Cada tipo de entrega requer un método de encaixado
+  adequado para que o produto viaje protegido e chegue ao cliente em perfeitas
+  condições.
+AfterEmbedAgency: >-
+  Quando producto já foi encaixado se armazena de novo na câmara até sua saída
+  por agência ou pelo nosso transporte proprio, recibiéndolo el cliente, em 24h
+  no caso de agência ou no mesmo dia no caso de nosso transporte, cômodamente em
+  sua morada.
+FreshnessGuaranteed: >-
+  Esta forma de trabalho garante a maior frescura pela rapidez dos processos e
+  pela manutenção da cadeia de frio desde a compra até sua recepção por nosso
+  cliente.
+AboutSummary: >-
+  75 pessoas divididas por quase todo o mundo para que nosso cliente tenha o
+  mais amplo catálogo do sector, a flor mais fresca, a planta mais novedosa, os
+  complementos mais actuais e o serviço mais rápido possível.
diff --git a/forms/cms/contact/locale/ca.json b/forms/cms/contact/locale/ca.json
deleted file mode 100644
index cd909224..00000000
--- a/forms/cms/contact/locale/ca.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	 "IWantCustomer": "Vull ser client!"	
-	
-	,"FillFormData": "Ompli el formulari amb les teves dades i en breu ens posarem en contacte amb tu."
-	,"OrCallUs": "O si ho prefereixes truca'ns al 963 242 100."
-	,"AllFieldsMandatory": "* Tots els camps són obligatoris."
-	
-	,"Name": "Nom"
-	,"Surname": "Cognoms"
-	,"EMail": "Correu electrònic"
-	,"Message": "Missatge"
-	,"Address": "Adreça"
-	,"PC": "Codi postal"
-	,"City": "Ciutat"
-	,"Phone": "Telèfon"
-	,"Send": "Enviar dades"
-
-	,"DataSentSuccess": "Les teves dades han estat enviades correctament. En breu ens posarem en contacte amb tu."
-	,"ErrorSendingData": "Error en enviar les dades. Si us plau, comprova que has omplert tots els camps i que has introduït el codi antispam correctament."
-}
diff --git a/forms/cms/contact/locale/ca.yml b/forms/cms/contact/locale/ca.yml
new file mode 100644
index 00000000..a6bcf847
--- /dev/null
+++ b/forms/cms/contact/locale/ca.yml
@@ -0,0 +1,21 @@
+IWantCustomer: Vull ser client!
+FillFormData: >-
+  Ompli el formulari amb les teves dades i en breu ens posarem en contacte amb
+  tu.
+OrCallUs: O si ho prefereixes truca'ns al 963 242 100.
+AllFieldsMandatory: '* Tots els camps són obligatoris.'
+Name: Nom
+Surname: Cognoms
+EMail: Correu electrònic
+Message: Missatge
+Address: Adreça
+PC: Codi postal
+City: Ciutat
+Phone: Telèfon
+Send: Enviar dades
+DataSentSuccess: >-
+  Les teves dades han estat enviades correctament. En breu ens posarem en
+  contacte amb tu.
+ErrorSendingData: >-
+  Error en enviar les dades. Si us plau, comprova que has omplert tots els camps
+  i que has introduït el codi antispam correctament.
diff --git a/forms/cms/contact/locale/en.json b/forms/cms/contact/locale/en.json
deleted file mode 100644
index b8c61ac0..00000000
--- a/forms/cms/contact/locale/en.json
+++ /dev/null
@@ -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."
-}
diff --git a/forms/cms/contact/locale/en.yml b/forms/cms/contact/locale/en.yml
new file mode 100644
index 00000000..b011f7f8
--- /dev/null
+++ b/forms/cms/contact/locale/en.yml
@@ -0,0 +1,17 @@
+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.
diff --git a/forms/cms/contact/locale/es.json b/forms/cms/contact/locale/es.json
deleted file mode 100644
index 8cc1ec53..00000000
--- a/forms/cms/contact/locale/es.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	 "IWantCustomer": "¡Quiero ser cliente!"	
-	
-	,"FillFormData": "Rellena el formulario con tus datos y en breve nos pondremos en contacto contigo."
-	,"OrCallUs": "O si lo prefieres llámanos al 963 242 100."
-	,"AllFieldsMandatory": "* Todos los campos son obligatorios."
-	
-	,"Name": "Nombre"
-	,"Surname": "Apellidos"
-	,"EMail": "Correo electrónico"
-	,"Message": "Mensaje"
-	,"Address": "Dirección"
-	,"PC": "Código postal"
-	,"City": "Ciudad"
-	,"Phone": "Teléfono"
-	,"Send": "Enviar datos"
-
-	,"DataSentSuccess": "Tus datos han sido enviados correctamente. En breve nos pondremos en contacto contigo."
-	,"ErrorSendingData": "Error al enviar los datos. Por favor, comprueba que has rellenado todos los campos y que has introducido el código anti-spam correctamente."
-}
diff --git a/forms/cms/contact/locale/es.yml b/forms/cms/contact/locale/es.yml
new file mode 100644
index 00000000..d8a6aeb6
--- /dev/null
+++ b/forms/cms/contact/locale/es.yml
@@ -0,0 +1,21 @@
+IWantCustomer: ¡Quiero ser cliente!
+FillFormData: >-
+  Rellena el formulario con tus datos y en breve nos pondremos en contacto
+  contigo.
+OrCallUs: O si lo prefieres llámanos al 963 242 100.
+AllFieldsMandatory: '* Todos los campos son obligatorios.'
+Name: Nombre
+Surname: Apellidos
+EMail: Correo electrónico
+Message: Mensaje
+Address: Dirección
+PC: Código postal
+City: Ciudad
+Phone: Teléfono
+Send: Enviar datos
+DataSentSuccess: >-
+  Tus datos han sido enviados correctamente. En breve nos pondremos en contacto
+  contigo.
+ErrorSendingData: >-
+  Error al enviar los datos. Por favor, comprueba que has rellenado todos los
+  campos y que has introducido el código anti-spam correctamente.
diff --git a/forms/cms/contact/locale/fr.json b/forms/cms/contact/locale/fr.json
deleted file mode 100644
index 7310573a..00000000
--- a/forms/cms/contact/locale/fr.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	 "IWantCustomer": "Je veux devenir client!"	
-	
-	,"FillFormData": "Remplissez le formulaire avec vos coordonnées et nous prendrons contact avec vous."
-	,"OrCallUs": "Ou si vous préférez nous appeler au 0033 781 533 900."
-	,"AllFieldsMandatory": "* Tous les champs sont obligatoires."
-	
-	,"Name": "Prénom"
-	,"Surname": "Nom"
-	,"EMail": "Email"
-	,"Message": "Message"
-	,"Address": "Adresse"
-	,"PC": "Code postal"
-	,"City": "Ville"
-	,"Phone": "Téléphone"
-	,"Send": "Envoyer des données"
-
-	,"DataSentSuccess": "Vos détails ont été envoyés avec succès. Rapidement nous vous contacterons."
-	,"ErrorSendingData": "Échec de l'envoi de vos données. S'il vous plaît vérifiez que vous avez rempli tous les champs et mis en place le code anti-spam correctement."
-}
diff --git a/forms/cms/contact/locale/fr.yml b/forms/cms/contact/locale/fr.yml
new file mode 100644
index 00000000..dfcc16b3
--- /dev/null
+++ b/forms/cms/contact/locale/fr.yml
@@ -0,0 +1,19 @@
+IWantCustomer: Je veux devenir client!
+FillFormData: >-
+  Remplissez le formulaire avec vos coordonnées et nous prendrons contact avec
+  vous.
+OrCallUs: Ou si vous préférez nous appeler au 0033 781 533 900.
+AllFieldsMandatory: '* Tous les champs sont obligatoires.'
+Name: Prénom
+Surname: Nom
+EMail: Email
+Message: Message
+Address: Adresse
+PC: Code postal
+City: Ville
+Phone: Téléphone
+Send: Envoyer des données
+DataSentSuccess: Vos détails ont été envoyés avec succès. Rapidement nous vous contacterons.
+ErrorSendingData: >-
+  Échec de l'envoi de vos données. S'il vous plaît vérifiez que vous avez rempli
+  tous les champs et mis en place le code anti-spam correctement.
diff --git a/forms/cms/contact/locale/pt.json b/forms/cms/contact/locale/pt.json
deleted file mode 100644
index 31dc49db..00000000
--- a/forms/cms/contact/locale/pt.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	 "IWantCustomer": "Quero ser cliente!"	
-	
-	,"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."
-	
-	,"Name": "Nome"
-	,"Surname": "Apelidos"
-	,"EMail": "E-Mail"
-	,"Message": "Menssagem"
-	,"Address": "Morada"
-	,"PC": "Código postal"
-	,"City": "Concelho"
-	,"Phone": "Telefone"
-	,"Send": "Enviar dados"
-
-	,"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."
-}
diff --git a/forms/cms/contact/locale/pt.yml b/forms/cms/contact/locale/pt.yml
new file mode 100644
index 00000000..7e2fb7ef
--- /dev/null
+++ b/forms/cms/contact/locale/pt.yml
@@ -0,0 +1,19 @@
+IWantCustomer: Quero ser cliente!
+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.'
+Name: Nome
+Surname: Apelidos
+EMail: E-Mail
+Message: Menssagem
+Address: Morada
+PC: Código postal
+City: Concelho
+Phone: Telefone
+Send: Enviar dados
+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.
diff --git a/forms/cms/home/locale/ca.json b/forms/cms/home/locale/ca.json
deleted file mode 100644
index ec7b073e..00000000
--- a/forms/cms/home/locale/ca.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	 "Start order": "Començar comanda"
-
-	,"Sent": "Enviat"
-	,"Author": "Autor"
-	,"votes": "vots"
-	,"NoAnswerSelected": "No has seleccionat cap resposta"
-	,"ThanksForVote": "Gràcies pel teu vot!"
-	,"Vote": "Votar"
-	,"Total": "Total"
-	,"BrownserRecommend":
-		 "Verdnatura recomana utilitzar el navegador web Mozilla Firefox per a obtindre tota la funcionalitat del nostre lloc web."
-	,"PressHere": "Clica aquí per descarregar Firefox"
-}
-
diff --git a/forms/cms/home/locale/ca.yml b/forms/cms/home/locale/ca.yml
new file mode 100644
index 00000000..2b7a8db8
--- /dev/null
+++ b/forms/cms/home/locale/ca.yml
@@ -0,0 +1,12 @@
+Start order: Començar comanda
+Sent: Enviat
+Author: Autor
+votes: vots
+NoAnswerSelected: No has seleccionat cap resposta
+ThanksForVote: Gràcies pel teu vot!
+Vote: Votar
+Total: Total
+BrownserRecommend: >-
+  Verdnatura recomana utilitzar el navegador web Mozilla Firefox per a obtindre
+  tota la funcionalitat del nostre lloc web.
+PressHere: Clica aquí per descarregar Firefox
diff --git a/forms/cms/home/locale/en.json b/forms/cms/home/locale/en.json
deleted file mode 100644
index 3179c27e..00000000
--- a/forms/cms/home/locale/en.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	 "Start order": "Start order"
-
-	,"Sent": "Sent"
-	,"Author": "Author"
-	,"votes": "votes"
-	,"NoAnswerSelected": "No answer selected"
-	,"ThanksForVote": "Thanks for your vote!"
-	,"Vote": "Vote"
-	,"Total": "Total"
-	,"BrownserRecommend":
-		 "Verdnatura recommend using the Mozilla Firefox web browser for full functionality of our website."
-	,"PressHere": "Click here to download Firefox"
-}
-
diff --git a/forms/cms/home/locale/en.yml b/forms/cms/home/locale/en.yml
new file mode 100644
index 00000000..445ff36a
--- /dev/null
+++ b/forms/cms/home/locale/en.yml
@@ -0,0 +1,12 @@
+Start order: Start order
+Sent: Sent
+Author: Author
+votes: votes
+NoAnswerSelected: No answer selected
+ThanksForVote: Thanks for your vote!
+Vote: Vote
+Total: Total
+BrownserRecommend: >-
+  Verdnatura recommend using the Mozilla Firefox web browser for full
+  functionality of our website.
+PressHere: Click here to download Firefox
diff --git a/forms/cms/home/locale/es.json b/forms/cms/home/locale/es.json
deleted file mode 100644
index 3da49277..00000000
--- a/forms/cms/home/locale/es.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	 "Start order": "Empezar pedido"
-
-	,"Sent": "Enviado"
-	,"Author": "Autor"
-	,"votes": "votos"
-	,"NoAnswerSelected": "No has seleccionado ninguna respuesta"
-	,"ThanksForVote": "¡Gracias por tu voto!"
-	,"Vote": "Votar"
-	,"Total": "Total"
-	,"BrownserRecommend":
-		 "Verdnatura recomienda utilizar el navegador web Mozilla Firefox para obtener toda la funcionalidad de nuestra página web."
-	,"PressHere": "Pulsa aquí para descargar Firefox"
-}
-
diff --git a/forms/cms/home/locale/es.yml b/forms/cms/home/locale/es.yml
new file mode 100644
index 00000000..ab9ea5cc
--- /dev/null
+++ b/forms/cms/home/locale/es.yml
@@ -0,0 +1,12 @@
+Start order: Empezar pedido
+Sent: Enviado
+Author: Autor
+votes: votos
+NoAnswerSelected: No has seleccionado ninguna respuesta
+ThanksForVote: ¡Gracias por tu voto!
+Vote: Votar
+Total: Total
+BrownserRecommend: >-
+  Verdnatura recomienda utilizar el navegador web Mozilla Firefox para obtener
+  toda la funcionalidad de nuestra página web.
+PressHere: Pulsa aquí para descargar Firefox
diff --git a/forms/cms/home/locale/fr.json b/forms/cms/home/locale/fr.json
deleted file mode 100644
index 3aef63d2..00000000
--- a/forms/cms/home/locale/fr.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	 "Start order": "Lancer commande"
-
-	,"Sent": "Envoyé"
-	,"Author": "Auteur"
-	,"votes": "votes"
-	,"NoAnswerSelected": "Vous avez pas sélectionné de réponse"
-	,"ThanksForVote": "Merci pour votre vote!"
-	,"Vote": "Voter"
-	,"Total": "Total"
-	,"BrownserRecommend":
-		 "Verdnatura recommande d'utiliser le navigateur Web Mozilla Firefox pour obtenir toutes les fonctionnalités de notre site web."
-	,"PressHere": "Cliquez ici pour télécharger Firefox"
-}
diff --git a/forms/cms/home/locale/fr.yml b/forms/cms/home/locale/fr.yml
new file mode 100644
index 00000000..a90007ea
--- /dev/null
+++ b/forms/cms/home/locale/fr.yml
@@ -0,0 +1,12 @@
+Start order: Lancer commande
+Sent: Envoyé
+Author: Auteur
+votes: votes
+NoAnswerSelected: Vous avez pas sélectionné de réponse
+ThanksForVote: Merci pour votre vote!
+Vote: Voter
+Total: Total
+BrownserRecommend: >-
+  Verdnatura recommande d'utiliser le navigateur Web Mozilla Firefox pour
+  obtenir toutes les fonctionnalités de notre site web.
+PressHere: Cliquez ici pour télécharger Firefox
diff --git a/forms/cms/home/locale/mn.json b/forms/cms/home/locale/mn.json
deleted file mode 100644
index 40b2b3f7..00000000
--- a/forms/cms/home/locale/mn.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	 "Start order": "Захиалга эхлэх"
-
-	,"Sent": "Sent"
-	,"Author": "Author"
-	,"votes": "votes"
-	,"NoAnswerSelected": "No answer selected"
-	,"ThanksForVote": "Thanks for your vote!"
-	,"Vote": "Vote"
-	,"Total": "Total"
-	,"BrownserRecommend":
-		 "Verdnatura recommend using the Mozilla Firefox web browser for full functionality of our website."
-	,"PressHere": "Click here to download Firefox"
-}
-
diff --git a/forms/cms/home/locale/mn.yml b/forms/cms/home/locale/mn.yml
new file mode 100644
index 00000000..d59a1ad1
--- /dev/null
+++ b/forms/cms/home/locale/mn.yml
@@ -0,0 +1,12 @@
+Start order: Захиалга эхлэх
+Sent: Sent
+Author: Author
+votes: votes
+NoAnswerSelected: No answer selected
+ThanksForVote: Thanks for your vote!
+Vote: Vote
+Total: Total
+BrownserRecommend: >-
+  Verdnatura recommend using the Mozilla Firefox web browser for full
+  functionality of our website.
+PressHere: Click here to download Firefox
diff --git a/forms/cms/home/locale/pt.json b/forms/cms/home/locale/pt.json
deleted file mode 100644
index 7841b671..00000000
--- a/forms/cms/home/locale/pt.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	 "Start order": "Comece uma encomenda"
-
-	,"Sent": "Enviado"
-	,"Author": "Autor"
-	,"votes": "votos"
-	,"NoAnswerSelected": "Não seleccionou nenhuma resposta"
-	,"ThanksForVote": "Obrigado por seu voto!"
-	,"Vote": "Votar"
-	,"Total": "Total"
-	,"BrownserRecommend":
-		 "Verdnatura recomenda utilizar o navegador web Mozilla Firefox para obter toda a funcionalidade de nossa página web."
-	,"PressHere": "Pulse aquí para baixar Firefox"
-}
-
diff --git a/forms/cms/home/locale/pt.yml b/forms/cms/home/locale/pt.yml
new file mode 100644
index 00000000..4dcdd229
--- /dev/null
+++ b/forms/cms/home/locale/pt.yml
@@ -0,0 +1,12 @@
+Start order: Comece uma encomenda
+Sent: Enviado
+Author: Autor
+votes: votos
+NoAnswerSelected: Não seleccionou nenhuma resposta
+ThanksForVote: Obrigado por seu voto!
+Vote: Votar
+Total: Total
+BrownserRecommend: >-
+  Verdnatura recomenda utilizar o navegador web Mozilla Firefox para obter toda
+  a funcionalidade de nossa página web.
+PressHere: Pulse aquí para baixar Firefox
diff --git a/forms/cms/location/locale/ca.json b/forms/cms/location/locale/ca.json
deleted file mode 100644
index 2cf84827..00000000
--- a/forms/cms/location/locale/ca.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-	 "ShowMap": "Mostrar mapa"
-}
diff --git a/forms/cms/location/locale/ca.yml b/forms/cms/location/locale/ca.yml
new file mode 100644
index 00000000..6e6d99e8
--- /dev/null
+++ b/forms/cms/location/locale/ca.yml
@@ -0,0 +1 @@
+ShowMap: Mostrar mapa
diff --git a/forms/cms/location/locale/en.json b/forms/cms/location/locale/en.json
deleted file mode 100644
index ca65d3a6..00000000
--- a/forms/cms/location/locale/en.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-	 "ShowMap": "Show map"
-}
diff --git a/forms/cms/location/locale/en.yml b/forms/cms/location/locale/en.yml
new file mode 100644
index 00000000..81bf9390
--- /dev/null
+++ b/forms/cms/location/locale/en.yml
@@ -0,0 +1 @@
+ShowMap: Show map
diff --git a/forms/cms/location/locale/es.json b/forms/cms/location/locale/es.json
deleted file mode 100644
index 2cf84827..00000000
--- a/forms/cms/location/locale/es.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-	 "ShowMap": "Mostrar mapa"
-}
diff --git a/forms/cms/location/locale/es.yml b/forms/cms/location/locale/es.yml
new file mode 100644
index 00000000..6e6d99e8
--- /dev/null
+++ b/forms/cms/location/locale/es.yml
@@ -0,0 +1 @@
+ShowMap: Mostrar mapa
diff --git a/forms/cms/location/locale/fr.json b/forms/cms/location/locale/fr.json
deleted file mode 100644
index 34d64d35..00000000
--- a/forms/cms/location/locale/fr.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-	 "ShowMap": "Montrer la carte"
-}
diff --git a/forms/cms/location/locale/fr.yml b/forms/cms/location/locale/fr.yml
new file mode 100644
index 00000000..fbc94b57
--- /dev/null
+++ b/forms/cms/location/locale/fr.yml
@@ -0,0 +1 @@
+ShowMap: Montrer la carte
diff --git a/forms/cms/location/locale/pt.json b/forms/cms/location/locale/pt.json
deleted file mode 100644
index 2cf84827..00000000
--- a/forms/cms/location/locale/pt.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-	 "ShowMap": "Mostrar mapa"
-}
diff --git a/forms/cms/location/locale/pt.yml b/forms/cms/location/locale/pt.yml
new file mode 100644
index 00000000..6e6d99e8
--- /dev/null
+++ b/forms/cms/location/locale/pt.yml
@@ -0,0 +1 @@
+ShowMap: Mostrar mapa
diff --git a/forms/reports/shelves/locale/fr.json b/forms/cms/training/locale/ca.yml
similarity index 100%
rename from forms/reports/shelves/locale/fr.json
rename to forms/cms/training/locale/ca.yml
diff --git a/forms/reports/shelves/locale/ca.json b/forms/cms/training/locale/en.yml
similarity index 100%
rename from forms/reports/shelves/locale/ca.json
rename to forms/cms/training/locale/en.yml
diff --git a/forms/cms/training/locale/pt.json b/forms/cms/training/locale/es.yml
similarity index 100%
rename from forms/cms/training/locale/pt.json
rename to forms/cms/training/locale/es.yml
diff --git a/forms/cms/training/locale/fr.json b/forms/cms/training/locale/fr.yml
similarity index 100%
rename from forms/cms/training/locale/fr.json
rename to forms/cms/training/locale/fr.yml
diff --git a/forms/cms/training/locale/es.json b/forms/cms/training/locale/pt.yml
similarity index 100%
rename from forms/cms/training/locale/es.json
rename to forms/cms/training/locale/pt.yml
diff --git a/forms/cms/why/locale/ca.json b/forms/cms/why/locale/ca.json
deleted file mode 100644
index d958b451..00000000
--- a/forms/cms/why/locale/ca.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-	 "AboutCompany": "Per què Verdnatura?"
-	,"StorePhoto": "Foto magatzem"
-
-	,"BecauseOurBigCatalog": "Perquè tenim el catàleg més gran del sector, renovat diariament."
-	,"BecauseThisWeb": "Per aquest lloc web, amb stock en temps real sempre a la teua disposició."
-	,"BecauseOurShoppingDep": "Per el nostre departament de compres, amb 9 compradors especialitzats."
-	,"BecauseOrderIsEasy": "Perquè és molt fàcil realitzar el teu encàrrec mitjançant la web, per telèfon o venint."
-	,"BecauseOurPlant": "Per les nostres instal·lacions, vine i visita'ns. T'encantaran."
-	,"BecauseOurSalesDep": "Pel nostre departament comercial, amb professionals que sempre ofereixen amb una solució adaptada a les teues necessitats."
-	,"BecauseOurWorkShop": "Perquè tenim un taller de confecció per ajudar-te."
-	,"BecauseWeHaveWhatYouNeed": "Perquè tenim el que necessites quan ho necessites..."
-
-	,"AboutDesc":
-		 "Som una empresa dedicada a la venta a l'engrós i distribució d'una amplia gama de complements, verds i flors naturals a frloristeries o altres majoristes."
-	
-	,"AboutService":
-		 "Disposem de servei de repartiment a domicili amb els nostres vehícles per tota la provincia de València i arees limitades de Castelló, Alacant, Murcia, Albacete i Madrid. A la resta de la península enviem mitjançan agències de transport amb servei 24/48 hores (Zeleris, Viaexpress). També realitzaem venda directa a floristes en qualsevol de les nostres instal·lacions."
-	
-	,"AboutDisp":
-		 "La nostra empresa disposa de més de 50 treballadors i diferents sucursals. La principal es troba a València i disposa de més de 8000 m2. També disposem d'un magatzem situat a Mercaflor - Mercavalencia (València) en el qual solament realitzem venda directa."
-	
-	,"AboutOrder":
-		 "Pots realitzar els teus encarrecs i reserves telefonant al +34 607 562 391, per Internet mitjançant el nostre lloc web o bé directament a les nostres instal·lacions."
-}
diff --git a/forms/cms/why/locale/ca.yml b/forms/cms/why/locale/ca.yml
new file mode 100644
index 00000000..4f8a89f3
--- /dev/null
+++ b/forms/cms/why/locale/ca.yml
@@ -0,0 +1,32 @@
+AboutCompany: Per què Verdnatura?
+StorePhoto: Foto magatzem
+BecauseOurBigCatalog: 'Perquè tenim el catàleg més gran del sector, renovat diariament.'
+BecauseThisWeb: 'Per aquest lloc web, amb stock en temps real sempre a la teua disposició.'
+BecauseOurShoppingDep: 'Per el nostre departament de compres, amb 9 compradors especialitzats.'
+BecauseOrderIsEasy: >-
+  Perquè és molt fàcil realitzar el teu encàrrec mitjançant la web, per telèfon
+  o venint.
+BecauseOurPlant: 'Per les nostres instal·lacions, vine i visita''ns. T''encantaran.'
+BecauseOurSalesDep: >-
+  Pel nostre departament comercial, amb professionals que sempre ofereixen amb
+  una solució adaptada a les teues necessitats.
+BecauseOurWorkShop: Perquè tenim un taller de confecció per ajudar-te.
+BecauseWeHaveWhatYouNeed: Perquè tenim el que necessites quan ho necessites...
+AboutDesc: >-
+  Som una empresa dedicada a la venta a l'engrós i distribució d'una amplia gama
+  de complements, verds i flors naturals a frloristeries o altres majoristes.
+AboutService: >-
+  Disposem de servei de repartiment a domicili amb els nostres vehícles per tota
+  la provincia de València i arees limitades de Castelló, Alacant, Murcia,
+  Albacete i Madrid. A la resta de la península enviem mitjançan agències de
+  transport amb servei 24/48 hores (Zeleris, Viaexpress). També realitzaem venda
+  directa a floristes en qualsevol de les nostres instal·lacions.
+AboutDisp: >-
+  La nostra empresa disposa de més de 50 treballadors i diferents sucursals. La
+  principal es troba a València i disposa de més de 8000 m2. També disposem d'un
+  magatzem situat a Mercaflor - Mercavalencia (València) en el qual solament
+  realitzem venda directa.
+AboutOrder: >-
+  Pots realitzar els teus encarrecs i reserves telefonant al +34 607 562 391,
+  per Internet mitjançant el nostre lloc web o bé directament a les nostres
+  instal·lacions.
diff --git a/forms/cms/why/locale/en.json b/forms/cms/why/locale/en.json
deleted file mode 100644
index 2cef3a58..00000000
--- a/forms/cms/why/locale/en.json
+++ /dev/null
@@ -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."
-}
diff --git a/forms/cms/why/locale/en.yml b/forms/cms/why/locale/en.yml
new file mode 100644
index 00000000..455d2c25
--- /dev/null
+++ b/forms/cms/why/locale/en.yml
@@ -0,0 +1,28 @@
+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.
diff --git a/forms/cms/why/locale/es.json b/forms/cms/why/locale/es.json
deleted file mode 100644
index e651302a..00000000
--- a/forms/cms/why/locale/es.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-	 "AboutCompany": "¿Por qué Verdnatura?"
-	,"StorePhoto": "Foto almacén"
-
-	,"BecauseOurBigCatalog": "Porque tenemos el catálogo más grande del sector, renovado diariamente."
-	,"BecauseThisWeb": "Por esta página web, con stock en tiempo real siempre a tu disposición."
-	,"BecauseOurShoppingDep": "Por nuestro departamento de compras con 9 compradores especializados."
-	,"BecauseOrderIsEasy": "Porque es muy fácil hacer tu pedido por web, por teléfono o viniendo."
-	,"BecauseOurPlant": "Por nuestras instalaciones, ven y visítanos. Te encantarán."
-	,"BecauseOurSalesDep": "Por nuestro departamento comercial, con profesionales que siempre encontrarán una solución a tus necesidades."
-	,"BecauseOurWorkShop": "Porque tenemos un taller de confección para ayudarte."
-	,"BecauseWeHaveWhatYouNeed": "Porque tenemos lo que necesitas cuando lo necesitas..."
-
-	,"AboutDesc":
-		 "Somos una empresa dedicada a la venta mayorista y distribución de una amplia gama de complementos, verdes y flores naturales a floristerías u otros mayoristas."
-	
-	,"AboutService":
-		 "Disponemos de servicio de reparto a domicilio con nuestros vehículos por toda la provincia de Valencia y áreas limitadas de Castellón, Alicante, Murcia, Albacete y Madrid enviamos al resto de la península mediante agencias de transporte con servicio 24/48 horas (Zeleris, Viaexpress). También realizamos venta directa a floristas en cualquiera de nuestras instalaciones."
-	
-	,"AboutDisp":
-		 "Nuestra empresa dispone de más de 50 trabajadores y varias sucursales. La principal se encuentra situada en Valencia y cuenta con más de 8000 m2. También disponemos de un almacén situado en Mercaflor - Mercavalencia (Valencia) en el que únicamente realizamos venta directa."
-	
-	,"AboutOrder":
-		 "Puedes realizar tus pedidos y reservas por teléfono llamando al 96 324 21 00, por Internet a través de nuestra página web o bien directamente en nuestras instalaciones."
-}
diff --git a/forms/cms/why/locale/es.yml b/forms/cms/why/locale/es.yml
new file mode 100644
index 00000000..c5c79d10
--- /dev/null
+++ b/forms/cms/why/locale/es.yml
@@ -0,0 +1,31 @@
+AboutCompany: ¿Por qué Verdnatura?
+StorePhoto: Foto almacén
+BecauseOurBigCatalog: 'Porque tenemos el catálogo más grande del sector, renovado diariamente.'
+BecauseThisWeb: 'Por esta página web, con stock en tiempo real siempre a tu disposición.'
+BecauseOurShoppingDep: Por nuestro departamento de compras con 9 compradores especializados.
+BecauseOrderIsEasy: 'Porque es muy fácil hacer tu pedido por web, por teléfono o viniendo.'
+BecauseOurPlant: 'Por nuestras instalaciones, ven y visítanos. Te encantarán.'
+BecauseOurSalesDep: >-
+  Por nuestro departamento comercial, con profesionales que siempre encontrarán
+  una solución a tus necesidades.
+BecauseOurWorkShop: Porque tenemos un taller de confección para ayudarte.
+BecauseWeHaveWhatYouNeed: Porque tenemos lo que necesitas cuando lo necesitas...
+AboutDesc: >-
+  Somos una empresa dedicada a la venta mayorista y distribución de una amplia
+  gama de complementos, verdes y flores naturales a floristerías u otros
+  mayoristas.
+AboutService: >-
+  Disponemos de servicio de reparto a domicilio con nuestros vehículos por toda
+  la provincia de Valencia y áreas limitadas de Castellón, Alicante, Murcia,
+  Albacete y Madrid enviamos al resto de la península mediante agencias de
+  transporte con servicio 24/48 horas (Zeleris, Viaexpress). También realizamos
+  venta directa a floristas en cualquiera de nuestras instalaciones.
+AboutDisp: >-
+  Nuestra empresa dispone de más de 50 trabajadores y varias sucursales. La
+  principal se encuentra situada en Valencia y cuenta con más de 8000 m2.
+  También disponemos de un almacén situado en Mercaflor - Mercavalencia
+  (Valencia) en el que únicamente realizamos venta directa.
+AboutOrder: >-
+  Puedes realizar tus pedidos y reservas por teléfono llamando al 96 324 21 00,
+  por Internet a través de nuestra página web o bien directamente en nuestras
+  instalaciones.
diff --git a/forms/cms/why/locale/fr.json b/forms/cms/why/locale/fr.json
deleted file mode 100644
index ccec5a16..00000000
--- a/forms/cms/why/locale/fr.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-	 "AboutCompany": "Pourquoi Verdnatura?"
-	,"StorePhoto": "Magasin de photo"
-
-	,"BecauseOurBigCatalog": "Parce que nous avons le plus grand catalogue dans le secteur, chaque jour renouvelé."
-	,"BecauseThisWeb": "Sur ce site, avec un stock en temps réel toujours à votre disposition."
-	,"BecauseOurShoppingDep": "Pour notre département achats 9 acheteurs spécialisés."
-	,"BecauseOrderIsEasy": "Parce qu'il est très facile de passer votre commande par Internet, par téléphone ou à venir."
-	,"BecauseOurPlant": "Chez nous, venez nous rendre visite. Vous allez adorer."
-	,"BecauseOurSalesDep": "Pour nos professionnels de service commercial qui sera toujours de trouver une solution à vos besoins."
-	,"BecauseOurWorkShop": "Parce que nous avons un atelier de couture pour aider."
-	,"BecauseWeHaveWhatYouNeed": "Parce que nous avons ce que vous avez besoin quand vous en avez besoin ..."
-
-	,"AboutDesc":
-		 "Nous sommes une société spécialisée dans le commerce de gros et de la distribution d'une large gamme d'accessoires, des verts et des fleurs à des fleuristes ou des autres grossistes."
-	
-	,"AboutService":
-		 "Nous avons un service de livraison à domicile avec nos véhicules dans la province de Valence et des zones limitées de Castellón, Alicante, Murcie, Albacete et Madrid envoyer le reste de la péninsule par les agences de transport avec le service 24/48 heures (Zeleris, Viaexpress). Nous faisons également des ventes directes aux fleuristes dans la totalité de nos installations."
-	
-	,"AboutDisp":
-		 "Notre société a plus de 100 employés et plusieurs branches. Le principal est situé à Valence et a plus de 8000 m2. Nous avons aussi un entrepôt situé à Mercaflor - Mercavalencia (Valencia) qui effectuent des ventes directes seulement."
-	
-	,"AboutOrder":
-		 "Vous pouvez faire vos commandes et réservations par téléphone au +33 781 533 900, en ligne grâce à notre site Internet ou directement dans nos installations."
-}
diff --git a/forms/cms/why/locale/fr.yml b/forms/cms/why/locale/fr.yml
new file mode 100644
index 00000000..5052a7b7
--- /dev/null
+++ b/forms/cms/why/locale/fr.yml
@@ -0,0 +1,36 @@
+AboutCompany: Pourquoi Verdnatura?
+StorePhoto: Magasin de photo
+BecauseOurBigCatalog: >-
+  Parce que nous avons le plus grand catalogue dans le secteur, chaque jour
+  renouvelé.
+BecauseThisWeb: 'Sur ce site, avec un stock en temps réel toujours à votre disposition.'
+BecauseOurShoppingDep: Pour notre département achats 9 acheteurs spécialisés.
+BecauseOrderIsEasy: >-
+  Parce qu'il est très facile de passer votre commande par Internet, par
+  téléphone ou à venir.
+BecauseOurPlant: 'Chez nous, venez nous rendre visite. Vous allez adorer.'
+BecauseOurSalesDep: >-
+  Pour nos professionnels de service commercial qui sera toujours de trouver une
+  solution à vos besoins.
+BecauseOurWorkShop: Parce que nous avons un atelier de couture pour aider.
+BecauseWeHaveWhatYouNeed: Parce que nous avons ce que vous avez besoin quand vous en avez besoin ...
+AboutDesc: >-
+  Nous sommes une société spécialisée dans le commerce de gros et de la
+  distribution d'une large gamme d'accessoires, des verts et des fleurs à des
+  fleuristes ou des autres grossistes.
+AboutService: >-
+  Nous avons un service de livraison à domicile avec nos véhicules dans la
+  province de Valence et des zones limitées de Castellón, Alicante, Murcie,
+  Albacete et Madrid envoyer le reste de la péninsule par les agences de
+  transport avec le service 24/48 heures (Zeleris, Viaexpress). Nous faisons
+  également des ventes directes aux fleuristes dans la totalité de nos
+  installations.
+AboutDisp: >-
+  Notre société a plus de 100 employés et plusieurs branches. Le principal est
+  situé à Valence et a plus de 8000 m2. Nous avons aussi un entrepôt situé à
+  Mercaflor - Mercavalencia (Valencia) qui effectuent des ventes directes
+  seulement.
+AboutOrder: >-
+  Vous pouvez faire vos commandes et réservations par téléphone au +33 781 533
+  900, en ligne grâce à notre site Internet ou directement dans nos
+  installations.
diff --git a/forms/cms/why/locale/pt.json b/forms/cms/why/locale/pt.json
deleted file mode 100644
index 6e186006..00000000
--- a/forms/cms/why/locale/pt.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-	 "AboutCompany": "Por quê Verdnatura?"
-	,"StorePhoto": "Foto armazém"
-
-	,"BecauseOurBigCatalog": "Porque temos o maior catálogo do sector, renovado diariamente."
-	,"BecauseThisWeb": "Por este site, com estoque em tempo real sempre à sua disposição."
-	,"BecauseOurShoppingDep": "Por nosso departamento de compras com 9 compradores especializados."
-	,"BecauseOrderIsEasy": "Porque é muito fácil fazer pedidos por internet, aplicativo ou telefone."
-	,"BecauseOurPlant": "Por nossas instalações, venha e visite-nos. Vas a adorar."
-	,"BecauseOurSalesDep": "Por nosso departamento comercial, com profissionais que sempre encontrarão uma solução para suas necessidades."
-	,"BecauseOurWorkShop": "Porque temos uma oficina de confecção para ajudar-te."
-	,"BecauseWeHaveWhatYouNeed": "Porque temos o que necessitas quando necessitas."
-
-	,"AboutDesc":
-		 "Somos uma empresa dedicada à venta grossista e distribuição de uma ampla gama de complementos, verdes e flores naturaise a floristas ou outros grossistas."
-	
-	,"AboutService":
-		 "Contamos com serviço de entrega a domicilio com nossos veículos por toda a provincia de Valencia e áreas limitadas de Castellón, Alicante, Murcia, Albacete e Madrid enviamos ao resto da península mediante agencias de transporte com serviço 24/48 horas (MRW, Zeleris, Viaexpress). Também realizamos venta directa a floristas em qualquer de nossas instalações."
-	
-	,"AboutDisp":
-		 "Nossa empresa tem mais de 50 trabalhadores e varias sucursais. A principal se encontra situada em Valencia e conta com mais de 8.000m2."
-	
-	,"AboutOrder":
-		 "Podes realizar seus pedidos e reservas por telefone ligando ao +34 96 324 21 00, por Internet a través de nossa página web, por nosso aplicativo para Android, ou diretamente em nossas instalações."
-}
diff --git a/forms/cms/why/locale/pt.yml b/forms/cms/why/locale/pt.yml
new file mode 100644
index 00000000..613fe14a
--- /dev/null
+++ b/forms/cms/why/locale/pt.yml
@@ -0,0 +1,28 @@
+AboutCompany: Por quê Verdnatura?
+StorePhoto: Foto armazém
+BecauseOurBigCatalog: 'Porque temos o maior catálogo do sector, renovado diariamente.'
+BecauseThisWeb: 'Por este site, com estoque em tempo real sempre à sua disposição.'
+BecauseOurShoppingDep: Por nosso departamento de compras com 9 compradores especializados.
+BecauseOrderIsEasy: 'Porque é muito fácil fazer pedidos por internet, aplicativo ou telefone.'
+BecauseOurPlant: 'Por nossas instalações, venha e visite-nos. Vas a adorar.'
+BecauseOurSalesDep: >-
+  Por nosso departamento comercial, com profissionais que sempre encontrarão uma
+  solução para suas necessidades.
+BecauseOurWorkShop: Porque temos uma oficina de confecção para ajudar-te.
+BecauseWeHaveWhatYouNeed: Porque temos o que necessitas quando necessitas.
+AboutDesc: >-
+  Somos uma empresa dedicada à venta grossista e distribuição de uma ampla gama
+  de complementos, verdes e flores naturaise a floristas ou outros grossistas.
+AboutService: >-
+  Contamos com serviço de entrega a domicilio com nossos veículos por toda a
+  provincia de Valencia e áreas limitadas de Castellón, Alicante, Murcia,
+  Albacete e Madrid enviamos ao resto da península mediante agencias de
+  transporte com serviço 24/48 horas (MRW, Zeleris, Viaexpress). Também
+  realizamos venta directa a floristas em qualquer de nossas instalações.
+AboutDisp: >-
+  Nossa empresa tem mais de 50 trabalhadores e varias sucursais. A principal se
+  encontra situada em Valencia e conta com mais de 8.000m2.
+AboutOrder: >-
+  Podes realizar seus pedidos e reservas por telefone ligando ao +34 96 324 21
+  00, por Internet a través de nossa página web, por nosso aplicativo para
+  Android, ou diretamente em nossas instalações.
diff --git a/forms/ecomerce/basket/locale/ca.json b/forms/ecomerce/basket/locale/ca.json
deleted file mode 100644
index 52df044f..00000000
--- a/forms/ecomerce/basket/locale/ca.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-	 "ShoppingBasket": "Cistella de la compra"
-
-	,"Delete": "Borrar encàrrec"
-	,"GoToCatalog": "Anar al catàleg"
-	,"ConfigureOrder": "Configurar encàrrec"
-	,"Checkout": "Tramitar encàrrec"
-
-	,"OrderNumber": "N encàrec"
-	,"DateExit": "Data d'eixida"
-	,"Warehouse": "Magatzem"
-	,"OrderTotal": "Total encàrrec"
-
-	,"Amount": "Quant"
-	,"Pack": "Pack"
-	,"Stems": "Tijes"
-	,"Avail": "Disp"
-	,"Item": "Artícle"
-	,"Cat": "Cat"
-	,"S1": "Mes"
-	,"Color": "Color"
-	,"Origin": "Orige"
-	,"Price": "Preu"
-	,"Disc": "Desc"
-	,"Subtotal": "Subtotal"
-	
-	,"Order items updated": "La teva comanda porta massa temps obert i ha estat actualitzat, els preus o quantitats dels teus articles poden haver canviat"
-	,"RememberReconfiguringImpact": "Recorda que si tornes a configurar la comanda els preus o quantitats dels teus articles podrien canviar"
-}
diff --git a/forms/ecomerce/basket/locale/ca.yml b/forms/ecomerce/basket/locale/ca.yml
new file mode 100644
index 00000000..d4a09b57
--- /dev/null
+++ b/forms/ecomerce/basket/locale/ca.yml
@@ -0,0 +1,27 @@
+ShoppingBasket: Cistella de la compra
+Delete: Borrar encàrrec
+GoToCatalog: Anar al catàleg
+ConfigureOrder: Configurar encàrrec
+Checkout: Tramitar encàrrec
+OrderNumber: N encàrec
+DateExit: Data d'eixida
+Warehouse: Magatzem
+OrderTotal: Total encàrrec
+Amount: Quant
+Pack: Pack
+Stems: Tijes
+Avail: Disp
+Item: Artícle
+Cat: Cat
+S1: Mes
+Color: Color
+Origin: Orige
+Price: Preu
+Disc: Desc
+Subtotal: Subtotal
+Order items updated: >-
+  La teva comanda porta massa temps obert i ha estat actualitzat, els preus o
+  quantitats dels teus articles poden haver canviat
+RememberReconfiguringImpact: >-
+  Recorda que si tornes a configurar la comanda els preus o quantitats dels teus
+  articles podrien canviar
diff --git a/forms/ecomerce/basket/locale/en.json b/forms/ecomerce/basket/locale/en.json
deleted file mode 100644
index 8da53003..00000000
--- a/forms/ecomerce/basket/locale/en.json
+++ /dev/null
@@ -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"
-}
diff --git a/forms/ecomerce/basket/locale/en.yml b/forms/ecomerce/basket/locale/en.yml
new file mode 100644
index 00000000..d1b3271a
--- /dev/null
+++ b/forms/ecomerce/basket/locale/en.yml
@@ -0,0 +1,27 @@
+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
diff --git a/forms/ecomerce/basket/locale/es.json b/forms/ecomerce/basket/locale/es.json
deleted file mode 100644
index 38df66bf..00000000
--- a/forms/ecomerce/basket/locale/es.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-	 "ShoppingBasket": "Cesta de la compra"
-
-	,"Delete": "Borrar pedido"
-	,"GoToCatalog": "Ir al catálogo"
-	,"ConfigureOrder": "Configurar pedido"
-	,"Checkout": "Finalizar pedido"
-
-	,"OrderNumber": "Nº pedido"
-	,"DateExit": "Fecha de salida"
-	,"Warehouse": "Almacén"
-	,"OrderTotal": "Total"
-
-	,"Amount": "Cantidad"
-	,"Pack": "Pack"
-	,"Stems": "Tallos"
-	,"Avail": "Disp"
-	,"Item": "Artículo"
-	,"Cat": "Cat"
-	,"S1": "Med"
-	,"Color": "Color"
-	,"Origin": "Origen"
-	,"Price": "Precio"
-	,"Disc": "Desc"
-	,"Subtotal": "Subtotal"
-	
-	,"Order items updated": "Tu pedido lleva demasiado tiempo abierto y ha sido actualizado, los precios o cantidades de tus artículos pueden haber cambiado"
-	,"RememberReconfiguringImpact": "Recuerda que si vuelves a configurar el pedido los precios o cantidades de tus artículos podrían cambiar"
-}
diff --git a/forms/ecomerce/basket/locale/es.yml b/forms/ecomerce/basket/locale/es.yml
new file mode 100644
index 00000000..4069ca0d
--- /dev/null
+++ b/forms/ecomerce/basket/locale/es.yml
@@ -0,0 +1,27 @@
+ShoppingBasket: Cesta de la compra
+Delete: Borrar pedido
+GoToCatalog: Ir al catálogo
+ConfigureOrder: Configurar pedido
+Checkout: Finalizar pedido
+OrderNumber: Nº pedido
+DateExit: Fecha de salida
+Warehouse: Almacén
+OrderTotal: Total
+Amount: Cantidad
+Pack: Pack
+Stems: Tallos
+Avail: Disp
+Item: Artículo
+Cat: Cat
+S1: Med
+Color: Color
+Origin: Origen
+Price: Precio
+Disc: Desc
+Subtotal: Subtotal
+Order items updated: >-
+  Tu pedido lleva demasiado tiempo abierto y ha sido actualizado, los precios o
+  cantidades de tus artículos pueden haber cambiado
+RememberReconfiguringImpact: >-
+  Recuerda que si vuelves a configurar el pedido los precios o cantidades de tus
+  artículos podrían cambiar
diff --git a/forms/ecomerce/basket/locale/fr.json b/forms/ecomerce/basket/locale/fr.json
deleted file mode 100644
index 29dafef2..00000000
--- a/forms/ecomerce/basket/locale/fr.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-	 "ShoppingBasket": "Panier"
-
-	,"Delete": "Effacer"
-	,"GoToCatalog": "Aller au catalogue"
-	,"ConfigureOrder": "Définissez l'ordre"
-	,"Checkout": "Caisse"
-
-	,"OrderNumber": "Numéro de commande"
-	,"DateExit": "Date de sortie"
-	,"Warehouse": "Magasin"
-	,"OrderTotal": "Total commande"
-
-	,"Amount": "Quant"
-	,"Pack": "Pack"
-	,"Stems": "Tige"
-	,"Avail": "Disp"
-	,"Item": "Nom"
-	,"Cat": "Cat"
-	,"S1": "Mes"
-	,"Color": "Couleur"
-	,"Origin": "Origine"
-	,"Price": "* Prix"
-	,"Disc": "Remise"
-	,"Subtotal": "Sous-total"
-	
-	,"Order items updated": "Ouvrir votre commande prend trop de temps et a été mis à jour, les prix ou les quantités de vos articles peuvent avoir changé"
-	,"RememberReconfiguringImpact": "Rappelez-vous que si jamais vous commandez des prix fixés ou les quantités de vos articles pourraient changer"
-}
diff --git a/forms/ecomerce/basket/locale/fr.yml b/forms/ecomerce/basket/locale/fr.yml
new file mode 100644
index 00000000..dba6194b
--- /dev/null
+++ b/forms/ecomerce/basket/locale/fr.yml
@@ -0,0 +1,27 @@
+ShoppingBasket: Panier
+Delete: Effacer
+GoToCatalog: Aller au catalogue
+ConfigureOrder: Définissez l'ordre
+Checkout: Caisse
+OrderNumber: Numéro de commande
+DateExit: Date de sortie
+Warehouse: Magasin
+OrderTotal: Total commande
+Amount: Quant
+Pack: Pack
+Stems: Tige
+Avail: Disp
+Item: Nom
+Cat: Cat
+S1: Mes
+Color: Couleur
+Origin: Origine
+Price: '* Prix'
+Disc: Remise
+Subtotal: Sous-total
+Order items updated: >-
+  Ouvrir votre commande prend trop de temps et a été mis à jour, les prix ou les
+  quantités de vos articles peuvent avoir changé
+RememberReconfiguringImpact: >-
+  Rappelez-vous que si jamais vous commandez des prix fixés ou les quantités de
+  vos articles pourraient changer
diff --git a/forms/ecomerce/basket/locale/pt.json b/forms/ecomerce/basket/locale/pt.json
deleted file mode 100644
index 57df2306..00000000
--- a/forms/ecomerce/basket/locale/pt.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-	 "ShoppingBasket": "Cesta da compra"
-
-	,"Delete": "Eliminar encomenda"
-	,"GoToCatalog": "Ir ao catálogo"
-	,"ConfigureOrder": "Configurar encomenda"
-	,"Checkout": "Finalizar encomenda"
-
-	,"OrderNumber": "Nº encomenda"
-	,"DateExit": "Data de saída"
-	,"Warehouse": "Armazém"
-	,"OrderTotal": "Total"
-
-	,"Amount": "Quantidade"
-	,"Pack": "Pack"
-	,"Stems": "Pés"
-	,"Avail": "Disp"
-	,"Item": "Item"
-	,"Cat": "Cat"
-	,"S1": "Med"
-	,"Color": "Cor"
-	,"Origin": "Origem"
-	,"Price": "Preço"
-	,"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 variado"
-	,"RememberReconfiguringImpact": "Lembre-se que si voltas a configurar a encomenda os preços ou quantidades de ítens poderíam variar"
-}
diff --git a/forms/ecomerce/basket/locale/pt.yml b/forms/ecomerce/basket/locale/pt.yml
new file mode 100644
index 00000000..0e3227b7
--- /dev/null
+++ b/forms/ecomerce/basket/locale/pt.yml
@@ -0,0 +1,27 @@
+ShoppingBasket: Cesta da compra
+Delete: Eliminar encomenda
+GoToCatalog: Ir ao catálogo
+ConfigureOrder: Configurar encomenda
+Checkout: Finalizar encomenda
+OrderNumber: Nº encomenda
+DateExit: Data de saída
+Warehouse: Armazém
+OrderTotal: Total
+Amount: Quantidade
+Pack: Pack
+Stems: Pés
+Avail: Disp
+Item: Item
+Cat: Cat
+S1: Med
+Color: Cor
+Origin: Origem
+Price: Preço
+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 variado
+RememberReconfiguringImpact: >-
+  Lembre-se que si voltas a configurar a encomenda os preços ou quantidades de
+  ítens poderíam variar
diff --git a/forms/ecomerce/catalog/locale/ca.json b/forms/ecomerce/catalog/locale/ca.json
deleted file mode 100644
index 583e5a50..00000000
--- a/forms/ecomerce/catalog/locale/ca.json
+++ /dev/null
@@ -1,57 +0,0 @@
-{
-	 "Catalog": "Catàleg"
-	,"SearchResults": "Resultats de cerca"
-
-	,"SelectFamily": "Selecciona una família"
-	,"Choose filter from right menu": "Tria un filtre en el menú de la dreta"
-	,"Choose a realm": "Tria un regne"
-	,"ArticleNotFound": "Artcle no trobat"
-	,"ArticleNotAvailable": "Article no disponible"
-
-	,"List view": "Vista de lista"
-	,"Grid view": "Vista de reixeta"
-	,"Switch view": "Canviar vista"
-	,"StartOrder": "Començar comanda"
-	,"ShoppingBasket": "Cistella de la compra"
-	
-	,"Agency": "Agència"
-	,"Warehouse": "Magatzem"
-	
-	,"Filter by": "Filtrar per"
-	,"Order by": "Ordenar per"
-	
-	,"Search": "Cercar"
-	,"Change": "Cambiar"
-	,"Available": "Displonible"
-	,"Size": "Mida"
-	,"Realm": "Regne"
-	,"Family": "Família"
-	,"Color": "Color"
-	,"Producer": "Productor"
-	,"Origin": "Origen"
-	,"Category": "Categoria"
-	,"Remove filters": "Esborrar filtres"
-	,"Relevancy": "Rellevància"
-
-	,"Price": "Precio"
-	,"Amount": "Quantitat"
-	,"Name": "Nom"
-	,"Pack": "Pack"
-	,"Lower price": "Preu més baix"
-	,"Higher price": "Preu més alt"
-	,"Lower size": "Mida més petita"
-	,"Higher size": "Mida més gran"
-	,", %.0d Units": ", %.0d Unitats"
-	
-	,"from": "des de"
-	,"from %.2d€": "des de %.2d€"
-	,"AddToBasket": "Afegir article"
-	,"Add": "Afegir"
-	,"Erase": "Esborrar"
-	,"Confirm": "Confirmar"
-
-	,"IndicativePhotos": "* Les fotos són orientatives"
-
-	,"Added%dOf%s": "Afegits %d de %s"
-	,"NoMoreAmountAvailable": "No hi ha més quantitat disponible"
-}
diff --git a/forms/ecomerce/catalog/locale/ca.yml b/forms/ecomerce/catalog/locale/ca.yml
new file mode 100644
index 00000000..8c08e22c
--- /dev/null
+++ b/forms/ecomerce/catalog/locale/ca.yml
@@ -0,0 +1,46 @@
+Catalog: Catàleg
+SearchResults: Resultats de cerca
+SelectFamily: Selecciona una família
+Choose filter from right menu: Tria un filtre en el menú de la dreta
+Choose a realm: Tria un regne
+ArticleNotFound: Artcle no trobat
+ArticleNotAvailable: Article no disponible
+List view: Vista de lista
+Grid view: Vista de reixeta
+Switch view: Canviar vista
+StartOrder: Començar comanda
+ShoppingBasket: Cistella de la compra
+Agency: Agència
+Warehouse: Magatzem
+Filter by: Filtrar per
+Order by: Ordenar per
+Search: Cercar
+Change: Cambiar
+Available: Displonible
+Size: Mida
+Realm: Regne
+Family: Família
+Color: Color
+Producer: Productor
+Origin: Origen
+Category: Categoria
+Remove filters: Esborrar filtres
+Relevancy: Rellevància
+Price: Precio
+Amount: Quantitat
+Name: Nom
+Pack: Pack
+Lower price: Preu més baix
+Higher price: Preu més alt
+Lower size: Mida més petita
+Higher size: Mida més gran
+', %.0d Units': ', %.0d Unitats'
+from: des de
+from %.2d€: des de %.2d€
+AddToBasket: Afegir article
+Add: Afegir
+Erase: Esborrar
+Confirm: Confirmar
+IndicativePhotos: '* Les fotos són orientatives'
+Added%dOf%s: Afegits %d de %s
+NoMoreAmountAvailable: No hi ha més quantitat disponible
diff --git a/forms/ecomerce/catalog/locale/en.json b/forms/ecomerce/catalog/locale/en.json
deleted file mode 100644
index d93ab1f9..00000000
--- a/forms/ecomerce/catalog/locale/en.json
+++ /dev/null
@@ -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": "Relevance"
-
-	,"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"
-}
diff --git a/forms/ecomerce/catalog/locale/en.yml b/forms/ecomerce/catalog/locale/en.yml
new file mode 100644
index 00000000..1d0991f3
--- /dev/null
+++ b/forms/ecomerce/catalog/locale/en.yml
@@ -0,0 +1,46 @@
+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: Relevance
+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
diff --git a/forms/ecomerce/catalog/locale/es.json b/forms/ecomerce/catalog/locale/es.json
deleted file mode 100644
index 012354e2..00000000
--- a/forms/ecomerce/catalog/locale/es.json
+++ /dev/null
@@ -1,57 +0,0 @@
-{
-	 "Catalog": "Catálogo"
-	,"SearchResults": "Resultados de búsqueda"
-
-	,"SelectFamily": "Selecciona una familia"
-	,"Choose filter from right menu": "Elige un filtro en el menú de la derecha"
-	,"Choose a realm": "Elige un reino"
-	,"ArticleNotFound": "Artículo no encontrado"
-	,"ArticleNotAvailable": "Artículo no disponible"
-
-	,"List view": "Vista de lista"
-	,"Grid view": "Vista de rejilla"
-	,"Switch view": "Cambiar vista"
-	,"StartOrder": "Empezar pedido"
-	,"ShoppingBasket": "Cesta de la compra"
-	
-	,"Agency": "Agencia"
-	,"Warehouse": "Almacén"
-	
-	,"Filter by": "Filtrar por"
-	,"Order by": "Ordenar por"
-	
-	,"Search": "Buscar"
-	,"Change": "Cambiar"
-	,"Available": "Disponible"
-	,"Size": "Medida"
-	,"Realm": "Reino"
-	,"Family": "Familia"
-	,"Color": "Color"
-	,"Producer": "Productor"
-	,"Origin": "Origen"
-	,"Category": "Categoría"
-	,"Remove filters": "Quitar filtros"
-
-	,"Price": "Precio"
-	,"Amount": "Cantidad"
-	,"Name": "Nombre"
-	,"Pack": "Pack"
-	,"Lower price": "Precio más bajo"
-	,"Higher price": "Precio más alto"
-	,"Lower size": "Medida más pequeña"
-	,"Higher size": "Medida más grande"
-	,"Relevancy": "Relevancia"
-
-	,", %.0d Units": ", %.0d Unidades"
-	,"from": "desde"
-	,"from %.2d€": "desde %.2d€"
-	,"AddToBasket": "Añadir artículo"
-	,"Add": "Añadir"
-	,"Erase": "Borrar"
-	,"Confirm": "Confirmar"
-
-	,"IndicativePhotos": "* Las fotos son orientativas"
-	
-	,"Added%dOf%s": "Añadidos %d de %s"
-	,"NoMoreAmountAvailable": "No hay más cantidad disponible"
-}
diff --git a/forms/ecomerce/catalog/locale/es.yml b/forms/ecomerce/catalog/locale/es.yml
new file mode 100644
index 00000000..36c8283b
--- /dev/null
+++ b/forms/ecomerce/catalog/locale/es.yml
@@ -0,0 +1,46 @@
+Catalog: Catálogo
+SearchResults: Resultados de búsqueda
+SelectFamily: Selecciona una familia
+Choose filter from right menu: Elige un filtro en el menú de la derecha
+Choose a realm: Elige un reino
+ArticleNotFound: Artículo no encontrado
+ArticleNotAvailable: Artículo no disponible
+List view: Vista de lista
+Grid view: Vista de rejilla
+Switch view: Cambiar vista
+StartOrder: Empezar pedido
+ShoppingBasket: Cesta de la compra
+Agency: Agencia
+Warehouse: Almacén
+Filter by: Filtrar por
+Order by: Ordenar por
+Search: Buscar
+Change: Cambiar
+Available: Disponible
+Size: Medida
+Realm: Reino
+Family: Familia
+Color: Color
+Producer: Productor
+Origin: Origen
+Category: Categoría
+Remove filters: Quitar filtros
+Price: Precio
+Amount: Cantidad
+Name: Nombre
+Pack: Pack
+Lower price: Precio más bajo
+Higher price: Precio más alto
+Lower size: Medida más pequeña
+Higher size: Medida más grande
+Relevancy: Relevancia
+', %.0d Units': ', %.0d Unidades'
+from: desde
+from %.2d€: desde %.2d€
+AddToBasket: Añadir artículo
+Add: Añadir
+Erase: Borrar
+Confirm: Confirmar
+IndicativePhotos: '* Las fotos son orientativas'
+Added%dOf%s: Añadidos %d de %s
+NoMoreAmountAvailable: No hay más cantidad disponible
diff --git a/forms/ecomerce/catalog/locale/fr.json b/forms/ecomerce/catalog/locale/fr.json
deleted file mode 100644
index 4bbdc865..00000000
--- a/forms/ecomerce/catalog/locale/fr.json
+++ /dev/null
@@ -1,57 +0,0 @@
-{
-	 "Catalog": "Catalogue"
-	,"SearchResults": "Résultats de la recherche"
-
-	,"SelectFamily": "Choisissez une famille"
-	,"Choose filter from right menu": "Choisissez un filtre dans le menu de droite"
-	,"Choose a realm": "Choisissez un royaume"
-	,"ArticleNotFound": "Article non trouvé"
-	,"ArticleNotAvailable": "Article non disponible"
-
-	,"List view": "Liste voir"
-	,"Grid view": "Grille voir"
-	,"Switch view": "Changer vue"
-	,"StartOrder": "Acheter"
-	,"ShoppingBasket": "Mon panier"
-	
-	,"Agency": "Agence"
-	,"Warehouse": "Entrepôt"
-	
-	,"Filter by": "Filtrer par"
-	,"Order by": "Trier par"
-	
-	,"Search": "Recherche"
-	,"Change": "Modifier"
-	,"Available": "Displonible"
-	,"Size": "Mesure"
-	,"Realm": "Famille"
-	,"Family": "Sous-genre"
-	,"Color": "Couleur"
-	,"Producer": "Producteur"
-	,"Origin": "Origine"
-	,"Category": "Catégorie"
-	,"Remove filters": "Retirer les filtres"
-	,"Relevancy": "Pertinence"
-
-	,"Price": "Prix"
-	,"Amount": "Quantité"
-	,"Name": "Nom"
-	,"Pack": "Pack"
-	,"Lower price": "Prix le plus bas"
-	,"Higher price": "Prix le plus élevé"
-	,"Lower size": "Taille le plus bas"
-	,"Higher size": "Taille le plus élevé"
-	,", %.0d Units": ", %.0d Unités"
-	
-	,"from": "pour"
-	,"from %.2d€": "pour %.2d€"
-	,"AddToBasket": "Ajouter article"
-	,"Add": "Ajouter"
-	,"Erase": "Effacer"
-	,"Confirm": "Confirmer"
-
-	,"IndicativePhotos": "* Photos sont indicatifs"
-	
-	,"Added%dOf%s": "Ajouté %d %s"
-	,"NoMoreAmountAvailable": "Pas plus disponible"
-}
diff --git a/forms/ecomerce/catalog/locale/fr.yml b/forms/ecomerce/catalog/locale/fr.yml
new file mode 100644
index 00000000..74b6567f
--- /dev/null
+++ b/forms/ecomerce/catalog/locale/fr.yml
@@ -0,0 +1,46 @@
+Catalog: Catalogue
+SearchResults: Résultats de la recherche
+SelectFamily: Choisissez une famille
+Choose filter from right menu: Choisissez un filtre dans le menu de droite
+Choose a realm: Choisissez un royaume
+ArticleNotFound: Article non trouvé
+ArticleNotAvailable: Article non disponible
+List view: Liste voir
+Grid view: Grille voir
+Switch view: Changer vue
+StartOrder: Acheter
+ShoppingBasket: Mon panier
+Agency: Agence
+Warehouse: Entrepôt
+Filter by: Filtrer par
+Order by: Trier par
+Search: Recherche
+Change: Modifier
+Available: Displonible
+Size: Mesure
+Realm: Famille
+Family: Sous-genre
+Color: Couleur
+Producer: Producteur
+Origin: Origine
+Category: Catégorie
+Remove filters: Retirer les filtres
+Relevancy: Pertinence
+Price: Prix
+Amount: Quantité
+Name: Nom
+Pack: Pack
+Lower price: Prix le plus bas
+Higher price: Prix le plus élevé
+Lower size: Taille le plus bas
+Higher size: Taille le plus élevé
+', %.0d Units': ', %.0d Unités'
+from: pour
+from %.2d€: pour %.2d€
+AddToBasket: Ajouter article
+Add: Ajouter
+Erase: Effacer
+Confirm: Confirmer
+IndicativePhotos: '* Photos sont indicatifs'
+Added%dOf%s: Ajouté %d %s
+NoMoreAmountAvailable: Pas plus disponible
diff --git a/forms/ecomerce/catalog/locale/pt.json b/forms/ecomerce/catalog/locale/pt.json
deleted file mode 100644
index 3ea7d666..00000000
--- a/forms/ecomerce/catalog/locale/pt.json
+++ /dev/null
@@ -1,57 +0,0 @@
-{
-	 "Catalog": "Catálogo"
-	,"SearchResults": "Resultados de busca"
-
-	,"SelectFamily": "Seleccione uma família"
-	,"Choose filter from right menu": "Escolha um filtro no menú da direita"
-	,"Choose a realm": "Escolha um reino"
-	,"ArticleNotFound": "Ítem não encontrado"
-	,"ArticleNotAvailable": "Ítem não disponível"
-
-	,"List view": "Ver como lista"
-	,"Grid view": "Vista em modo de grade"
-	,"Switch view": "Modificar vista"
-	,"StartOrder": "Iniciar encomenda"
-	,"ShoppingBasket": "Cesta da compra"
-	
-	,"Agency": "Agência"
-	,"Warehouse": "Armazém"
-	
-	,"Filter by": "Filtrar por"
-	,"Order by": "Ordenar por"
-	
-	,"Search": "Buscar"
-	,"Change": "Modificar"
-	,"Available": "Disponível"
-	,"Size": "Medida"
-	,"Realm": "Reino"
-	,"Family": "Família"
-	,"Color": "Cor"
-	,"Producer": "Produtor"
-	,"Origin": "Orígem"
-	,"Category": "Categoria"
-	,"Remove filters": "Eliminar filtros"
-	,"Relevancy": "Relevância"
-
-	,"Price": "Preço"
-	,"Amount": "Quantidade"
-	,"Name": "Nome"
-	,"Pack": "Pack"
-	,"Lower price": "Menor preço"
-	,"Higher price": "Maior preço"
-	,"Lower size": "Tamanho menor"
-	,"Higher size": "Tamanho maior"
-	,", %.0d Units": ", %.0d Unidades"
-	
-	,"from": "desde"
-	,"from %.2d€": "desde %.2d€"
-	,"AddToBasket": "Adicionar à Cesta"
-	,"Add": "Adicionar"
-	,"Erase": "Eliminar"
-	,"Confirm": "Confirmar"
-
-	,"IndicativePhotos": "* As Fotos São Orientativas"
-	
-	,"Added%dOf%s": "Adicionados %d de %s"
-	,"NoMoreAmountAvailable": "Não há mais quantidade disponível"
-}
diff --git a/forms/ecomerce/catalog/locale/pt.yml b/forms/ecomerce/catalog/locale/pt.yml
new file mode 100644
index 00000000..5cafd941
--- /dev/null
+++ b/forms/ecomerce/catalog/locale/pt.yml
@@ -0,0 +1,46 @@
+Catalog: Catálogo
+SearchResults: Resultados de busca
+SelectFamily: Seleccione uma família
+Choose filter from right menu: Escolha um filtro no menú da direita
+Choose a realm: Escolha um reino
+ArticleNotFound: Ítem não encontrado
+ArticleNotAvailable: Ítem não disponível
+List view: Ver como lista
+Grid view: Vista em modo de grade
+Switch view: Modificar vista
+StartOrder: Iniciar encomenda
+ShoppingBasket: Cesta da compra
+Agency: Agência
+Warehouse: Armazém
+Filter by: Filtrar por
+Order by: Ordenar por
+Search: Buscar
+Change: Modificar
+Available: Disponível
+Size: Medida
+Realm: Reino
+Family: Família
+Color: Cor
+Producer: Produtor
+Origin: Orígem
+Category: Categoria
+Remove filters: Eliminar filtros
+Relevancy: Relevância
+Price: Preço
+Amount: Quantidade
+Name: Nome
+Pack: Pack
+Lower price: Menor preço
+Higher price: Maior preço
+Lower size: Tamanho menor
+Higher size: Tamanho maior
+', %.0d Units': ', %.0d Unidades'
+from: desde
+from %.2d€: desde %.2d€
+AddToBasket: Adicionar à Cesta
+Add: Adicionar
+Erase: Eliminar
+Confirm: Confirmar
+IndicativePhotos: '* As Fotos São Orientativas'
+Added%dOf%s: Adicionados %d de %s
+NoMoreAmountAvailable: Não há mais quantidade disponível
diff --git a/forms/ecomerce/checkout/locale/ca.json b/forms/ecomerce/checkout/locale/ca.json
deleted file mode 100644
index f3d9c078..00000000
--- a/forms/ecomerce/checkout/locale/ca.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-	 "ConfigureOrder": "Configurar comanda"
-
-	,"Cancel": "Cancelar"
-	,"Next": "Següent"
-	
-	,"DeliveryOrPickupQuestion": "Vols rebre o recollir la comanda?"
-	,"Receive the order": "Rebre en mi tenda"
-	,"ReceiveThroughtRoute": "Repartiment Verdnatura"
-	,"PickupInStore": "Recollir en magatzem"
-	
-	,"OrderDateDeliveryQuestion": "Quin dia vols rebre la comanda?"
-	,"OrderDatePickupQuestion": "Quin dia vols recollir la comanda?"
-	,"AddressQuestion": "On vols rebre la comanda?"
-	,"AddressQuestionPickup": "A què direcció vols associar la comanda? (Opcional)"
-	,"AgencyQuestion": "Com vols rebre la comanda?"
-	,"PickupWarehouseQuestion": "En quin magatzem vols recollir la comanda?"
-
-	,"ConfirmToAccessCatalog": "Confirma les dades per accedir al catàleg"
-	,"Arrival": "Arribada"
-	,"Pickup": "Recollida"
-	,"Agency": "Agència"
-	,"Warehouse": "Magatzem"
-	,"Confirm": "Confirmar"
-
-	,"OrderStarted": "Comanda començada"
-	,"OrderUpdated": "Comanda actualitzada"
-	
-	,"NoAgeciesAvailableForDate": "No hi ha agències disponibles per a la data i el consignatari seleccionats, modifica la data d'enviament de la comanda"
-	,"NoWarehousesAvailableForDate": "No hi ha magatzems disponibles per a la data seleccionada, modifica la data de recollida de la comanda"
-}
diff --git a/forms/ecomerce/checkout/locale/ca.yml b/forms/ecomerce/checkout/locale/ca.yml
new file mode 100644
index 00000000..4df1aef4
--- /dev/null
+++ b/forms/ecomerce/checkout/locale/ca.yml
@@ -0,0 +1,27 @@
+ConfigureOrder: Configurar comanda
+Cancel: Cancelar
+Next: Següent
+DeliveryOrPickupQuestion: Vols rebre o recollir la comanda?
+Receive the order: Rebre en mi tenda
+ReceiveThroughtRoute: Repartiment Verdnatura
+PickupInStore: Recollir en magatzem
+OrderDateDeliveryQuestion: Quin dia vols rebre la comanda?
+OrderDatePickupQuestion: Quin dia vols recollir la comanda?
+AddressQuestion: On vols rebre la comanda?
+AddressQuestionPickup: A què direcció vols associar la comanda? (Opcional)
+AgencyQuestion: Com vols rebre la comanda?
+PickupWarehouseQuestion: En quin magatzem vols recollir la comanda?
+ConfirmToAccessCatalog: Confirma les dades per accedir al catàleg
+Arrival: Arribada
+Pickup: Recollida
+Agency: Agència
+Warehouse: Magatzem
+Confirm: Confirmar
+OrderStarted: Comanda començada
+OrderUpdated: Comanda actualitzada
+NoAgeciesAvailableForDate: >-
+  No hi ha agències disponibles per a la data i el consignatari seleccionats,
+  modifica la data d'enviament de la comanda
+NoWarehousesAvailableForDate: >-
+  No hi ha magatzems disponibles per a la data seleccionada, modifica la data de
+  recollida de la comanda
diff --git a/forms/ecomerce/checkout/locale/en.json b/forms/ecomerce/checkout/locale/en.json
deleted file mode 100644
index 1cbfc7f3..00000000
--- a/forms/ecomerce/checkout/locale/en.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-	 "ConfigureOrder": "Configure order"
-
-	,"Cancel": "Cancel"
-	,"Next": "Next"
-	
-	,"DeliveryOrPickupQuestion": "Do you want to receive or pickup the order?"
-	,"Receive the order": "Receive in my store"
-	,"ReceiveThroughtRoute": "Verdnatura delivery"
-	,"PickupInStore": "Store pickup"
-	
-	,"OrderDateDeliveryQuestion": "What day you want to receive the order?"
-	,"OrderDatePickupQuestion": "What day you want to pickup your order?"
-	,"AddressQuestion": "Where do you want to receive the order?"
-	,"AddressQuestionPickup": "To which address do you want to associate the order? (Optional)"
-	,"AgencyQuestion": "How you want to receive the order?"
-	,"PickupWarehouseQuestion": "What store you want to pickup your order?"
-
-	,"ConfirmToAccessCatalog": "Confirm the data to access the catalog"
-	,"Arrival": "Arrival"
-	,"Pickup": "Pickup"
-	,"Agency": "Agency"
-	,"Warehouse": "Store"
-	,"Confirm": "Confirm"
-
-	,"OrderStarted": "Order started"
-	,"OrderUpdated": "Order updated"
-	
-	,"NoAgeciesAvailableForDate": "No agencies available for the selected date and consignee, change the shipping date of your order"
-	,"NoWarehousesAvailableForDate": "No stores available for the selected date, change the pickup date of you order"
-}
diff --git a/forms/ecomerce/checkout/locale/en.yml b/forms/ecomerce/checkout/locale/en.yml
new file mode 100644
index 00000000..cb36b235
--- /dev/null
+++ b/forms/ecomerce/checkout/locale/en.yml
@@ -0,0 +1,25 @@
+ConfigureOrder: Configure order
+Cancel: Cancel
+Next: Next
+DeliveryOrPickupQuestion: Do you want to receive or pickup the order?
+Receive the order: Receive in my store
+ReceiveThroughtRoute: Verdnatura delivery
+PickupInStore: Store pickup
+OrderDateDeliveryQuestion: What day you want to receive the order?
+OrderDatePickupQuestion: What day you want to pickup your order?
+AddressQuestion: Where do you want to receive the order?
+AddressQuestionPickup: To which address do you want to associate the order? (Optional)
+AgencyQuestion: How you want to receive the order?
+PickupWarehouseQuestion: What store you want to pickup your order?
+ConfirmToAccessCatalog: Confirm the data to access the catalog
+Arrival: Arrival
+Pickup: Pickup
+Agency: Agency
+Warehouse: Store
+Confirm: Confirm
+OrderStarted: Order started
+OrderUpdated: Order updated
+NoAgeciesAvailableForDate: >-
+  No agencies available for the selected date and consignee, change the shipping
+  date of your order
+NoWarehousesAvailableForDate: 'No stores available for the selected date, change the pickup date of you order'
diff --git a/forms/ecomerce/checkout/locale/es.json b/forms/ecomerce/checkout/locale/es.json
deleted file mode 100644
index c7eea09e..00000000
--- a/forms/ecomerce/checkout/locale/es.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-	 "ConfigureOrder": "Configurar pedido"
-
-	,"Cancel": "Cancelar"
-	,"Next": "Siguiente"
-	
-	,"DeliveryOrPickupQuestion": "¿Quieres recibir o recoger el pedido?"
-	,"Receive the order": "Recibir en mi tienda"
-	,"ReceiveThroughtRoute": "Reparto Verdnatura"
-	,"PickupInStore": "Recoger en almacén"
-	
-	,"OrderDateDeliveryQuestion": "¿Qué día quieres recibir el pedido?"
-	,"OrderDatePickupQuestion": "¿Qué día quieres recoger el pedido?"
-	,"AddressQuestion": "¿Dónde quieres recibir el pedido?"
-	,"AddressQuestionPickup": "¿A qué dirección quieres asociar el pedido? (Opcional)"
-	,"AgencyQuestion": "¿Cómo quieres recibir el pedido?"
-	,"PickupWarehouseQuestion": "¿En qué almacén quieres recoger el pedido?"
-
-	,"ConfirmToAccessCatalog": "Confirma los datos para acceder al catálogo"
-	,"Arrival": "Llegada"
-	,"Pickup": "Recogida"
-	,"Agency": "Agencia"
-	,"Warehouse": "Almacén"
-	,"Confirm": "Confirmar"
-
-	,"OrderStarted": "Pedido empezado"
-	,"OrderUpdated": "Pedido actualizado"
-	
-	,"NoAgeciesAvailableForDate": "No hay agencias disponibles para la fecha y el consignatario seleccionados, modifica la fecha de envío del pedido"
-	,"NoWarehousesAvailableForDate": "No hay almacenes disponibles para la fecha seleccionada, modifica la fecha de recogida del pedido"
-}
diff --git a/forms/ecomerce/checkout/locale/es.yml b/forms/ecomerce/checkout/locale/es.yml
new file mode 100644
index 00000000..b1fb03cb
--- /dev/null
+++ b/forms/ecomerce/checkout/locale/es.yml
@@ -0,0 +1,27 @@
+ConfigureOrder: Configurar pedido
+Cancel: Cancelar
+Next: Siguiente
+DeliveryOrPickupQuestion: ¿Quieres recibir o recoger el pedido?
+Receive the order: Recibir en mi tienda
+ReceiveThroughtRoute: Reparto Verdnatura
+PickupInStore: Recoger en almacén
+OrderDateDeliveryQuestion: ¿Qué día quieres recibir el pedido?
+OrderDatePickupQuestion: ¿Qué día quieres recoger el pedido?
+AddressQuestion: ¿Dónde quieres recibir el pedido?
+AddressQuestionPickup: ¿A qué dirección quieres asociar el pedido? (Opcional)
+AgencyQuestion: ¿Cómo quieres recibir el pedido?
+PickupWarehouseQuestion: ¿En qué almacén quieres recoger el pedido?
+ConfirmToAccessCatalog: Confirma los datos para acceder al catálogo
+Arrival: Llegada
+Pickup: Recogida
+Agency: Agencia
+Warehouse: Almacén
+Confirm: Confirmar
+OrderStarted: Pedido empezado
+OrderUpdated: Pedido actualizado
+NoAgeciesAvailableForDate: >-
+  No hay agencias disponibles para la fecha y el consignatario seleccionados,
+  modifica la fecha de envío del pedido
+NoWarehousesAvailableForDate: >-
+  No hay almacenes disponibles para la fecha seleccionada, modifica la fecha de
+  recogida del pedido
diff --git a/forms/ecomerce/checkout/locale/fr.json b/forms/ecomerce/checkout/locale/fr.json
deleted file mode 100644
index a081a70d..00000000
--- a/forms/ecomerce/checkout/locale/fr.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-	 "ConfigureOrder": "Définir les types d'ordres"
-
-	,"Cancel": "Annuler"
-	,"Next": "Suivant"
-	
-	,"DeliveryOrPickupQuestion": "Voulez-vous recevoir ou récuperer l'ordre?"
-	,"Receive the order": "Recevez dans mon magasin"
-	,"ReceiveThroughtRoute": "Livraison par Verdnatura"
-	,"PickupInStore": "Livraison en magasin"
-	
-	,"OrderDateDeliveryQuestion": "Date de livraison?"
-	,"OrderDatePickupQuestion": "Date retrait commande?"
-	,"AddressQuestion": "Adresse livraison?"
-	,"AddressQuestionPickup": "À quelle adresse voulez-vous associer la commande? (Optionnel)"
-	,"AgencyQuestion": "Comment vous souhaitez recevoir la commande?"
-	,"PickupWarehouseQuestion": "Dans quel magasin vuoulez-vous retirer votre commande?"
-
-	,"ConfirmToAccessCatalog": "Confirme les coordonnées pour accéder au catalogue"
-	,"Arrival": "Arrivée"
-	,"Pickup": "Retrait"
-	,"Agency": "Agence"
-	,"Warehouse": "MAgasin"
-	,"Confirm": "Confirmer"
-
-	,"OrderStarted": "Commande a commencé"
-	,"OrderUpdated": "Mise à jour commande"
-	
-	,"NoAgeciesAvailableForDate": "Aucune agence disponibles pour la date et le destinataire sélectionné, changer la date d'envoi de la commande"
-	,"NoWarehousesAvailableForDate": "Pas de magasins disponibles à la date sélectionnée, changer la date de retrait"
-}
diff --git a/forms/ecomerce/checkout/locale/fr.yml b/forms/ecomerce/checkout/locale/fr.yml
new file mode 100644
index 00000000..822ef084
--- /dev/null
+++ b/forms/ecomerce/checkout/locale/fr.yml
@@ -0,0 +1,25 @@
+ConfigureOrder: Définir les types d'ordres
+Cancel: Annuler
+Next: Suivant
+DeliveryOrPickupQuestion: Voulez-vous recevoir ou récuperer l'ordre?
+Receive the order: Recevez dans mon magasin
+ReceiveThroughtRoute: Livraison par Verdnatura
+PickupInStore: Livraison en magasin
+OrderDateDeliveryQuestion: Date de livraison?
+OrderDatePickupQuestion: Date retrait commande?
+AddressQuestion: Adresse livraison?
+AddressQuestionPickup: À quelle adresse voulez-vous associer la commande? (Optionnel)
+AgencyQuestion: Comment vous souhaitez recevoir la commande?
+PickupWarehouseQuestion: Dans quel magasin vuoulez-vous retirer votre commande?
+ConfirmToAccessCatalog: Confirme les coordonnées pour accéder au catalogue
+Arrival: Arrivée
+Pickup: Retrait
+Agency: Agence
+Warehouse: MAgasin
+Confirm: Confirmer
+OrderStarted: Commande a commencé
+OrderUpdated: Mise à jour commande
+NoAgeciesAvailableForDate: >-
+  Aucune agence disponibles pour la date et le destinataire sélectionné, changer
+  la date d'envoi de la commande
+NoWarehousesAvailableForDate: 'Pas de magasins disponibles à la date sélectionnée, changer la date de retrait'
diff --git a/forms/ecomerce/checkout/locale/pt.json b/forms/ecomerce/checkout/locale/pt.json
deleted file mode 100644
index 07617eba..00000000
--- a/forms/ecomerce/checkout/locale/pt.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-	 "ConfigureOrder": "Configurar encomenda"
-
-	,"Cancel": "Cancelar"
-	,"Next": "Seguir"
-	
-	,"DeliveryOrPickupQuestion": "Queres receber ou levantar a encomenda?"
-	,"Receive the order": "Receber na minha loja"
-	,"ReceiveThroughtRoute": "Transporte Verdnatura"
-	,"PickupInStore": "Levantar no armazém"
-	
-	,"OrderDateDeliveryQuestion": "Que dia queres receber a encomenda?"
-	,"OrderDatePickupQuestion": "Que dia queres levantar a encomenda?"
-	,"AddressQuestion": "Onde queres receber a encomenda?"
-	,"AddressQuestionPickup": "Para qual endereço deseja associar o pedido? (Opcional)"
-	,"AgencyQuestion": "Como queres receber a encomenda?"
-	,"PickupWarehouseQuestion": "Em qual armazém queres levantar a encomenda?"
-
-	,"ConfirmToAccessCatalog": "Confirme os dados para entrar no catálogo"
-	,"Arrival": "Chegada"
-	,"Pickup": "Recolhida"
-	,"Agency": "Agência"
-	,"Warehouse": "Armazém"
-	,"Confirm": "Confirmar"
-
-	,"OrderStarted": "Encomenda iniciada"
-	,"OrderUpdated": "Encomenda actualizada"
-	
-	,"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"
-}
diff --git a/forms/ecomerce/checkout/locale/pt.yml b/forms/ecomerce/checkout/locale/pt.yml
new file mode 100644
index 00000000..b40d3423
--- /dev/null
+++ b/forms/ecomerce/checkout/locale/pt.yml
@@ -0,0 +1,27 @@
+ConfigureOrder: Configurar encomenda
+Cancel: Cancelar
+Next: Seguir
+DeliveryOrPickupQuestion: Queres receber ou levantar a encomenda?
+Receive the order: Receber na minha loja
+ReceiveThroughtRoute: Transporte Verdnatura
+PickupInStore: Levantar no armazém
+OrderDateDeliveryQuestion: Que dia queres receber a encomenda?
+OrderDatePickupQuestion: Que dia queres levantar a encomenda?
+AddressQuestion: Onde queres receber a encomenda?
+AddressQuestionPickup: Para qual endereço deseja associar o pedido? (Opcional)
+AgencyQuestion: Como queres receber a encomenda?
+PickupWarehouseQuestion: Em qual armazém queres levantar a encomenda?
+ConfirmToAccessCatalog: Confirme os dados para entrar no catálogo
+Arrival: Chegada
+Pickup: Recolhida
+Agency: Agência
+Warehouse: Armazém
+Confirm: Confirmar
+OrderStarted: Encomenda iniciada
+OrderUpdated: Encomenda actualizada
+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
diff --git a/forms/ecomerce/confirm/locale/ca.json b/forms/ecomerce/confirm/locale/ca.json
deleted file mode 100644
index 23040006..00000000
--- a/forms/ecomerce/confirm/locale/ca.json
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-	 "Checkout": "Finalitzar comanda"
-
-	,"Order summary": "Resum de la comanda"
-	,"Delivery at": "Lliurament el"
-	,"Agency": "Agència"
-	,"Warehouse": "Magatzem"
-	
-	,"Previous balance": "Saldo anterior"
-	,"Order total": "Total comanda"
-	,"Order VAT": "IVA comanda"
-	,"Total debt": "Total deute"
-	,"Credit": "Crèdit"
-	,"Exceeded credit": "Crèdit excedit"
-	
-	,"Amount to pay": "Quantitat a pagar"
-	,"Pay method": "Mètode de pagament"
-
-	,"Use my balance": "Utilitzar el meu saldo"
-	,"You have a favorable balance.": "No necessites pagar res, tens un saldo favorable."
-	,"Use my credit": "Utilitzar el meu crèdit"
-	,"You have a favorable credit.": "No necessites pagar res, tens crèdit favorable."
-	,"Credit card": "Targeta de crèdit"
-	,"You will be redirected to the payment.": "En confirmar la comanda seràs redirigit a la plataforma de pagament."
-	,"Bank Transfer": "Transferència bancària"
-	,"Make a transfer to one account.": "Fer una transferecia a una de les següents comptes i envia el justificant al teu comercial."
-	,"Pay later": "Pagar més tard"
-
-	,"Modify": "Modificar"
-	,"Confirm": "Confirmar"
-	
-	,"Order confirmed successfully": "La teva comanda ha estat realitzat amb èxit"
-	,"Accept": "D'acord"
-	
-	,"You have exceeded your credit.": "Has excedit el teu crèdit, si us plau realitza el pagament perquè puguem preparar la teva comanda."
-}
-
diff --git a/forms/ecomerce/confirm/locale/ca.yml b/forms/ecomerce/confirm/locale/ca.yml
new file mode 100644
index 00000000..969c8d00
--- /dev/null
+++ b/forms/ecomerce/confirm/locale/ca.yml
@@ -0,0 +1,31 @@
+Checkout: Finalitzar comanda
+Order summary: Resum de la comanda
+Delivery at: Lliurament el
+Agency: Agència
+Warehouse: Magatzem
+Previous balance: Saldo anterior
+Order total: Total comanda
+Order VAT: IVA comanda
+Total debt: Total deute
+Credit: Crèdit
+Exceeded credit: Crèdit excedit
+Amount to pay: Quantitat a pagar
+Pay method: Mètode de pagament
+Use my balance: Utilitzar el meu saldo
+You have a favorable balance.: 'No necessites pagar res, tens un saldo favorable.'
+Use my credit: Utilitzar el meu crèdit
+You have a favorable credit.: 'No necessites pagar res, tens crèdit favorable.'
+Credit card: Targeta de crèdit
+You will be redirected to the payment.: En confirmar la comanda seràs redirigit a la plataforma de pagament.
+Bank Transfer: Transferència bancària
+Make a transfer to one account.: >-
+  Fer una transferecia a una de les següents comptes i envia el justificant al
+  teu comercial.
+Pay later: Pagar més tard
+Modify: Modificar
+Confirm: Confirmar
+Order confirmed successfully: La teva comanda ha estat realitzat amb èxit
+Accept: D'acord
+You have exceeded your credit.: >-
+  Has excedit el teu crèdit, si us plau realitza el pagament perquè puguem
+  preparar la teva comanda.
diff --git a/forms/ecomerce/confirm/locale/en.json b/forms/ecomerce/confirm/locale/en.json
deleted file mode 100644
index 3348d945..00000000
--- a/forms/ecomerce/confirm/locale/en.json
+++ /dev/null
@@ -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."
-}
diff --git a/forms/ecomerce/confirm/locale/en.yml b/forms/ecomerce/confirm/locale/en.yml
new file mode 100644
index 00000000..e2b32f07
--- /dev/null
+++ b/forms/ecomerce/confirm/locale/en.yml
@@ -0,0 +1,31 @@
+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.
diff --git a/forms/ecomerce/confirm/locale/es.json b/forms/ecomerce/confirm/locale/es.json
deleted file mode 100644
index 5fac0a00..00000000
--- a/forms/ecomerce/confirm/locale/es.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-	 "Checkout": "Finalizar pedido"
-
-	,"Order summary": "Resumen del pedido"
-	,"Delivery at": "Entrega el"
-	,"Agency": "Agencia"
-	,"Warehouse": "Almacén"
-	
-	,"Previous balance": "Saldo anterior"
-	,"Order total": "Total pedido"
-	,"Order VAT": "IVA pedido"
-	,"Total debt": "Total deuda"
-	,"Credit": "Crédito"
-	,"Exceeded credit": "Crédito excedido"
-	
-	,"Amount to pay": "Cantidad a pagar"
-	,"Pay method": "Método de pago"
-
-	,"Use my balance": "Usar mi saldo"
-	,"You have a favorable balance.": "No necesitas pagar nada, tienes un saldo favorable."
-	,"Use my credit": "Usar mi crédito"
-	,"You have a favorable credit.": "No necesitas pagar nada, tienes crédito favorable."
-	,"Credit card": "Tarjeta de crédito"
-	,"You will be redirected to the payment.": "Al confirmar el pedido serás redirigido a la plataforma de pago."
-	,"Bank Transfer": "Transferencia bancaria"
-	,"Make a transfer to one account.": "Haz una transferecia a una de las siguientes cuentas y envía el justificante a tu comercial."
-	,"Pay later": "Pagar más tarde"
-
-	,"Modify": "Modificar"
-	,"Confirm": "Confirmar"
-	
-	,"Order confirmed successfully": "Tu pedido ha sido realizado con éxito"
-	,"Accept": "Aceptar"
-	
-	,"You have exceeded your credit.": "Has excedido tu crédito, por favor realiza el pago para que podamos preparar tu pedido."
-}
diff --git a/forms/ecomerce/confirm/locale/es.yml b/forms/ecomerce/confirm/locale/es.yml
new file mode 100644
index 00000000..e344c094
--- /dev/null
+++ b/forms/ecomerce/confirm/locale/es.yml
@@ -0,0 +1,31 @@
+Checkout: Finalizar pedido
+Order summary: Resumen del pedido
+Delivery at: Entrega el
+Agency: Agencia
+Warehouse: Almacén
+Previous balance: Saldo anterior
+Order total: Total pedido
+Order VAT: IVA pedido
+Total debt: Total deuda
+Credit: Crédito
+Exceeded credit: Crédito excedido
+Amount to pay: Cantidad a pagar
+Pay method: Método de pago
+Use my balance: Usar mi saldo
+You have a favorable balance.: 'No necesitas pagar nada, tienes un saldo favorable.'
+Use my credit: Usar mi crédito
+You have a favorable credit.: 'No necesitas pagar nada, tienes crédito favorable.'
+Credit card: Tarjeta de crédito
+You will be redirected to the payment.: Al confirmar el pedido serás redirigido a la plataforma de pago.
+Bank Transfer: Transferencia bancaria
+Make a transfer to one account.: >-
+  Haz una transferecia a una de las siguientes cuentas y envía el justificante a
+  tu comercial.
+Pay later: Pagar más tarde
+Modify: Modificar
+Confirm: Confirmar
+Order confirmed successfully: Tu pedido ha sido realizado con éxito
+Accept: Aceptar
+You have exceeded your credit.: >-
+  Has excedido tu crédito, por favor realiza el pago para que podamos preparar
+  tu pedido.
diff --git a/forms/ecomerce/confirm/locale/fr.json b/forms/ecomerce/confirm/locale/fr.json
deleted file mode 100644
index 31c202f1..00000000
--- a/forms/ecomerce/confirm/locale/fr.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-	 "Checkout": "Finir la commande"
-
-	,"Order summary": "Résumé de la commande"
-	,"Delivery at": "Livraison à"
-	,"Agency": "Agence"
-	,"Warehouse": "Entrepôt"
-	
-	,"Previous balance": "Solde précédent"
-	,"Order total": "Total de la commande"
-	,"Order VAT": "TVA de la commande"
-	,"Total debt": "Total de la dette"
-	,"Credit": "Crédit"
-	,"Exceeded credit": "Crédit dépassée"
-	
-	,"Amount to pay": "Montant à payer"
-	,"Pay method": "Mode de paiement"
-
-	,"Use my balance": "Utiliser mon équilibre"
-	,"You have a favorable balance.": "Pas besoin de payer quoi que ce soit, vous avez un solde favorable."
-	,"Use my credit": "Utiliser mon crédit"
-	,"You have a favorable credit.": "Pas besoin de payer quoi que ce soit, vous favorable crédit."
-	,"Credit card": "Carte de crédit"
-	,"You will be redirected to the payment.": "En confirmant la commande, vous serez redirigé vers la plateforme de paiement."
-	,"Bank Transfer": "Virement bancaire"
-	,"Make a transfer to one account.": "Faire Transféré à l'un des comptes suivants et envoyer le coupon à votre entreprise."
-	,"Pay later": "Payer plus tard"
-
-	,"Modify": "Modifier"
-	,"Confirm": "Confirmer"
-	
-	,"Order confirmed successfully": "Votre commande a été complété avec succès"
-	,"Accept": "OK"
-	
-	,"You have exceeded your credit.": "Vous avez dépassé votre crédit, s'il vous plaît effectuer le paiement afin que nous puissions préparer votre commande."
-}
diff --git a/forms/ecomerce/confirm/locale/fr.yml b/forms/ecomerce/confirm/locale/fr.yml
new file mode 100644
index 00000000..743b0222
--- /dev/null
+++ b/forms/ecomerce/confirm/locale/fr.yml
@@ -0,0 +1,31 @@
+Checkout: Finir la commande
+Order summary: Résumé de la commande
+Delivery at: Livraison à
+Agency: Agence
+Warehouse: Entrepôt
+Previous balance: Solde précédent
+Order total: Total de la commande
+Order VAT: TVA de la commande
+Total debt: Total de la dette
+Credit: Crédit
+Exceeded credit: Crédit dépassée
+Amount to pay: Montant à payer
+Pay method: Mode de paiement
+Use my balance: Utiliser mon équilibre
+You have a favorable balance.: 'Pas besoin de payer quoi que ce soit, vous avez un solde favorable.'
+Use my credit: Utiliser mon crédit
+You have a favorable credit.: 'Pas besoin de payer quoi que ce soit, vous favorable crédit.'
+Credit card: Carte de crédit
+You will be redirected to the payment.: 'En confirmant la commande, vous serez redirigé vers la plateforme de paiement.'
+Bank Transfer: Virement bancaire
+Make a transfer to one account.: >-
+  Faire Transféré à l'un des comptes suivants et envoyer le coupon à votre
+  entreprise.
+Pay later: Payer plus tard
+Modify: Modifier
+Confirm: Confirmer
+Order confirmed successfully: Votre commande a été complété avec succès
+Accept: OK
+You have exceeded your credit.: >-
+  Vous avez dépassé votre crédit, s'il vous plaît effectuer le paiement afin que
+  nous puissions préparer votre commande.
diff --git a/forms/ecomerce/confirm/locale/pt.json b/forms/ecomerce/confirm/locale/pt.json
deleted file mode 100644
index 0e70a85a..00000000
--- a/forms/ecomerce/confirm/locale/pt.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-	 "Checkout": "Finalizar encomenda"
-
-	,"Order summary": "Resumo da encomenda"
-	,"Delivery at": "Entrega na"
-	,"Agency": "Agência"
-	,"Warehouse": "Armazém"
-	
-	,"Previous balance": "Saldo anterior"
-	,"Order total": "Total pedido"
-	,"Order VAT": "IVA"
-	,"Total debt": "Total dívida"
-	,"Credit": "Crédito"
-	,"Exceeded credit": "Crédito excedido"
-	
-	,"Amount to pay": "Valor a pagar"
-	,"Pay method": "Método 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 a transferencia para uma das seguintes contas e envie o comprovativo para seu comercial."
-	,"Pay later": "Pagar mais tarde"
-
-	,"Modify": "Modificar"
-	,"Confirm": "Confirmar"
-	
-	,"Order confirmed successfully": "Seu pedido foi realizado com êxito"
-	,"Accept": "Aceitar"
-	
-	,"You have exceeded your credit.": "Ultrapassastes seu crédito, por favor, faça o pagamento para que possamos preparar sua encomenda."
-}
diff --git a/forms/ecomerce/confirm/locale/pt.yml b/forms/ecomerce/confirm/locale/pt.yml
new file mode 100644
index 00000000..efc04b53
--- /dev/null
+++ b/forms/ecomerce/confirm/locale/pt.yml
@@ -0,0 +1,31 @@
+Checkout: Finalizar encomenda
+Order summary: Resumo da encomenda
+Delivery at: Entrega na
+Agency: Agência
+Warehouse: Armazém
+Previous balance: Saldo anterior
+Order total: Total pedido
+Order VAT: IVA
+Total debt: Total dívida
+Credit: Crédito
+Exceeded credit: Crédito excedido
+Amount to pay: Valor a pagar
+Pay method: Método 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 a transferencia para uma das seguintes contas e envie o comprovativo para
+  seu comercial.
+Pay later: Pagar mais tarde
+Modify: Modificar
+Confirm: Confirmar
+Order confirmed successfully: Seu pedido foi realizado com êxito
+Accept: Aceitar
+You have exceeded your credit.: >-
+  Ultrapassastes seu crédito, por favor, faça o pagamento para que possamos
+  preparar sua encomenda.
diff --git a/forms/ecomerce/invoices/locale/ca.json b/forms/ecomerce/invoices/locale/ca.json
deleted file mode 100644
index 139e621e..00000000
--- a/forms/ecomerce/invoices/locale/ca.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-	 "Invoices": "Factures"
-
-	,"Serial": "Sèrie"
-	,"Date": "Data"
-	,"Import": "Import"
-	,"Donwload PDF": "Descarregar PDF"
-}
diff --git a/forms/ecomerce/invoices/locale/ca.yml b/forms/ecomerce/invoices/locale/ca.yml
new file mode 100644
index 00000000..25a01c0a
--- /dev/null
+++ b/forms/ecomerce/invoices/locale/ca.yml
@@ -0,0 +1,5 @@
+Invoices: Factures
+Serial: Sèrie
+Date: Data
+Import: Import
+Donwload PDF: Descarregar PDF
diff --git a/forms/ecomerce/invoices/locale/en.json b/forms/ecomerce/invoices/locale/en.json
deleted file mode 100644
index c599ed62..00000000
--- a/forms/ecomerce/invoices/locale/en.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-	 "Invoices": "Invoices"
-
-	,"Serial": "Serial"
-	,"Date": "Date"
-	,"Import": "Import"
-	,"Download PDF": "Download PDF"
-}
diff --git a/forms/ecomerce/invoices/locale/en.yml b/forms/ecomerce/invoices/locale/en.yml
new file mode 100644
index 00000000..a5e68780
--- /dev/null
+++ b/forms/ecomerce/invoices/locale/en.yml
@@ -0,0 +1,5 @@
+Invoices: Invoices
+Serial: Serial
+Date: Date
+Import: Import
+Download PDF: Download PDF
diff --git a/forms/ecomerce/invoices/locale/es.json b/forms/ecomerce/invoices/locale/es.json
deleted file mode 100644
index 059af357..00000000
--- a/forms/ecomerce/invoices/locale/es.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-	 "Invoices": "Facturas"
-
-	,"Serial": "Serie"
-	,"Date": "Fecha"
-	,"Import": "Importe"
-	,"Download PDF": "Descargar PDF"
-}
diff --git a/forms/ecomerce/invoices/locale/es.yml b/forms/ecomerce/invoices/locale/es.yml
new file mode 100644
index 00000000..9dd52f37
--- /dev/null
+++ b/forms/ecomerce/invoices/locale/es.yml
@@ -0,0 +1,5 @@
+Invoices: Facturas
+Serial: Serie
+Date: Fecha
+Import: Importe
+Download PDF: Descargar PDF
diff --git a/forms/ecomerce/invoices/locale/fr.json b/forms/ecomerce/invoices/locale/fr.json
deleted file mode 100644
index 62a04a0a..00000000
--- a/forms/ecomerce/invoices/locale/fr.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-	 "Invoices": "Factures"
-
-	,"Serial": "Série"
-	,"Date": "Date"
-	,"Import": "Montant"
-	,"Donwload PDF": "Télécharger le PDF"
-}
diff --git a/forms/ecomerce/invoices/locale/fr.yml b/forms/ecomerce/invoices/locale/fr.yml
new file mode 100644
index 00000000..4797e19b
--- /dev/null
+++ b/forms/ecomerce/invoices/locale/fr.yml
@@ -0,0 +1,5 @@
+Invoices: Factures
+Serial: Série
+Date: Date
+Import: Montant
+Donwload PDF: Télécharger le PDF
diff --git a/forms/ecomerce/invoices/locale/pt.json b/forms/ecomerce/invoices/locale/pt.json
deleted file mode 100644
index da637c32..00000000
--- a/forms/ecomerce/invoices/locale/pt.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-	 "Invoices": "Factura"
-
-	,"Serial": "Serie"
-	,"Date": "Data"
-	,"Import": "Importe"
-	,"Download PDF": "Baixar PDF"
-}
diff --git a/forms/ecomerce/invoices/locale/pt.yml b/forms/ecomerce/invoices/locale/pt.yml
new file mode 100644
index 00000000..97d610c3
--- /dev/null
+++ b/forms/ecomerce/invoices/locale/pt.yml
@@ -0,0 +1,5 @@
+Invoices: Factura
+Serial: Serie
+Date: Data
+Import: Importe
+Download PDF: Baixar PDF
diff --git a/forms/ecomerce/orders/locale/ca.json b/forms/ecomerce/orders/locale/ca.json
deleted file mode 100644
index a20fe3d2..00000000
--- a/forms/ecomerce/orders/locale/ca.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-	 "OpenOrders": "Comandes obertes"
-
-	,"StartOrder": "Començar encàrrec"
-	,"ContinueOrder": "Continuar encàrrec"
-	,"OrderNumber": "N encàrrec"
-	,"DateMake": "Data de creació"
-	,"DateExit": "Data d'eixida"
-	,"SendMethod": "Forma d'enviament"
-
-	,"LastOrders": "Últimes comandes"
-
-	,"Balance:": "Saldo:"
-	,"PaymentInfo": "La quantitat mostrada és el teu saldo pendent (negatiu) o favorable a dia d'avui, no té en compte comandes del futur. Perquè la teva comanda sigui enviat, aquesta quantitat ha de ser igual o més gran que 0. Si vols fer un lliurament a compte, prem el botó de pagament, esborra la quantitat suggerida e introdueix la quantitat que vulguis."
-	,"MakePayment": "Realitzar pagament"
-	,"Company": "Empresa"
-	,"Pending": "Pendent"
-	,"Pay": "Pagar"
-	,"Basket": "Cistella"
-	,"ShoppingBasket": "Cistella de la compra"
-
-	,"SeeOrder": "Mostrar detall de l'encàrrec"
-	,"Delivery": "Lliurament"
-	,"TicketNumber": "N ticket"
-	,"SentAddress": "Adreça d'enviament"
-	,"Consignee": "Consignatari"
-	,"Boxes": "Caixes"
-	,"TotalWithVAT": "Total amb IVA"
-	,"PayOrder": "Pagar encàrrec"
-	
-	,"AmountToPay:": "Quantitat a pagar (€):"
-	,"AmountError": "La quantitat ha de ser un nombre positiu i inferior o igual a l'import pendent"
-	,"PayError": "Error al realitzar el pagament"
-	
-	,"An error has been in the payment": "Sembla que hi ha hagut un error en el pagament"
-	,"Retry": "Reintenta"
-	,"Accept": "Acceptar"
-}
diff --git a/forms/ecomerce/orders/locale/ca.yml b/forms/ecomerce/orders/locale/ca.yml
new file mode 100644
index 00000000..f0a8b635
--- /dev/null
+++ b/forms/ecomerce/orders/locale/ca.yml
@@ -0,0 +1,35 @@
+OpenOrders: Comandes obertes
+StartOrder: Començar encàrrec
+ContinueOrder: Continuar encàrrec
+OrderNumber: N encàrrec
+DateMake: Data de creació
+DateExit: Data d'eixida
+SendMethod: Forma d'enviament
+LastOrders: Últimes comandes
+'Balance:': 'Saldo:'
+PaymentInfo: >-
+  La quantitat mostrada és el teu saldo pendent (negatiu) o favorable a dia
+  d'avui, no té en compte comandes del futur. Perquè la teva comanda sigui
+  enviat, aquesta quantitat ha de ser igual o més gran que 0. Si vols fer un
+  lliurament a compte, prem el botó de pagament, esborra la quantitat suggerida
+  e introdueix la quantitat que vulguis.
+MakePayment: Realitzar pagament
+Company: Empresa
+Pending: Pendent
+Pay: Pagar
+Basket: Cistella
+ShoppingBasket: Cistella de la compra
+SeeOrder: Mostrar detall de l'encàrrec
+Delivery: Lliurament
+TicketNumber: N ticket
+SentAddress: Adreça d'enviament
+Consignee: Consignatari
+Boxes: Caixes
+TotalWithVAT: Total amb IVA
+PayOrder: Pagar encàrrec
+'AmountToPay:': 'Quantitat a pagar (€):'
+AmountError: La quantitat ha de ser un nombre positiu i inferior o igual a l'import pendent
+PayError: Error al realitzar el pagament
+An error has been in the payment: Sembla que hi ha hagut un error en el pagament
+Retry: Reintenta
+Accept: Acceptar
diff --git a/forms/ecomerce/orders/locale/en.json b/forms/ecomerce/orders/locale/en.json
deleted file mode 100644
index cb586a8e..00000000
--- a/forms/ecomerce/orders/locale/en.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-	 "OpenOrders": "Open orders"
-
-	,"StartOrder": "Start order"
-	,"ContinueOrder": "Continue order"
-	,"OrderNumber": "Order number"
-	,"DateMake": "Creation date"
-	,"DateExit": "Shipping date"
-	,"SendMethod": "Delivery method"
-
-	,"LastOrders": "Last orders"
-
-	,"Balance:": "Balance:"
-	,"PaymentInfo": "The amount shown is your slope (negative) or favorable balance today, it disregards future orders. For get your order shipped, this amount must be equal to or greater than 0. If you want to make a down payment, click the payment button, delete the suggested amount and enter the amount you want."
-	,"MakePayment": "Make payment"
-	,"Company": "Company"
-	,"Pending": "Pending"
-	,"Pay": "Pay"
-	,"Basket": "Basket"
-	,"ShoppingBasket": "Shopping basket"
-
-	,"SeeOrder": "Show details of the order"
-	,"Delivery": "Delivery"
-	,"TicketNumber": "Ticket number"
-	,"SentAddress": "Delivery address"
-	,"Consignee": "Consignee"
-	,"Boxes": "Bundles"
-	,"TotalWithVAT": "Total with VAT"
-	,"PayOrder": "Pay order"
-
-	,"AmountToPay:": "Amount to pay (€):"
-	,"AmountError": "The amount must be a positive number less than or equal to the outstanding amount"
-	,"PayError": "Failed to make the payment"
-	
-	,"An error has been in the payment": "It seems that there has been an error in the payment"
-	,"Retry": "Retry"
-	,"Accept": "Accept"
-}
diff --git a/forms/ecomerce/orders/locale/en.yml b/forms/ecomerce/orders/locale/en.yml
new file mode 100644
index 00000000..1ecab04d
--- /dev/null
+++ b/forms/ecomerce/orders/locale/en.yml
@@ -0,0 +1,36 @@
+OpenOrders: Open orders
+StartOrder: Start order
+ContinueOrder: Continue order
+OrderNumber: Order number
+DateMake: Creation date
+DateExit: Shipping date
+SendMethod: Delivery method
+LastOrders: Last orders
+'Balance:': 'Balance:'
+PaymentInfo: >-
+  The amount shown is your slope (negative) or favorable balance today, it
+  disregards future orders. For get your order shipped, this amount must be
+  equal to or greater than 0. If you want to make a down payment, click the
+  payment button, delete the suggested amount and enter the amount you want.
+MakePayment: Make payment
+Company: Company
+Pending: Pending
+Pay: Pay
+Basket: Basket
+ShoppingBasket: Shopping basket
+SeeOrder: Show details of the order
+Delivery: Delivery
+TicketNumber: Ticket number
+SentAddress: Delivery address
+Consignee: Consignee
+Boxes: Bundles
+TotalWithVAT: Total with VAT
+PayOrder: Pay order
+'AmountToPay:': 'Amount to pay (€):'
+AmountError: >-
+  The amount must be a positive number less than or equal to the outstanding
+  amount
+PayError: Failed to make the payment
+An error has been in the payment: It seems that there has been an error in the payment
+Retry: Retry
+Accept: Accept
diff --git a/forms/ecomerce/orders/locale/es.json b/forms/ecomerce/orders/locale/es.json
deleted file mode 100644
index f03ad431..00000000
--- a/forms/ecomerce/orders/locale/es.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-	 "OpenOrders": "Pedidos abiertos"
-
-	,"StartOrder": "Empezar pedido"
-	,"ContinueOrder": "Continuar pedido"
-	,"OrderNumber": "Nº pedido"
-	,"DateMake": "Fecha de creación"
-	,"DateExit": "Fecha de salida"
-	,"SendMethod": "Forma de envío"
-
-	,"LastOrders": "Últimos pedidos"
-
-	,"Balance:": "Saldo:"
-	,"PaymentInfo": "La cantidad mostrada es tu saldo pendiente (negativa) o favorable a día de hoy, no tiene en cuenta pedidos del futuro. Para que tu pedido sea enviado, esta cantidad debe ser igual o mayor que 0. Si quieres realizar una entrega a cuenta, pulsa el botón de pago, borra la cantidad sugerida e introduce la cantidad que desees."
-	,"MakePayment": "Realizar pago"
-	,"Company": "Empresa"
-	,"Pending": "Pendiente"
-	,"Pay": "Pagar"
-	,"Basket": "Cesta"
-	,"ShoppingBasket": "Cesta de la compra"
-
-	,"SeeOrder": "Mostrar detalle del pedido"
-	,"Delivery": "Entrega"
-	,"TicketNumber": "Nº ticket"
-	,"SentAddress": "Dirección de envío"
-	,"Consignee": "Consignatario"
-	,"Boxes": "Bultos"
-	,"TotalWithVAT": "Total con IVA"
-	,"PayOrder": "Pagar pedido"
-
-	,"AmountToPay:": "Cantidad a pagar (€):"
-	,"AmountError": "La cantidad debe ser un número positivo e inferior o igual al importe pendiente"
-	,"PayError": "Error al realizar el pago"
-	
-	,"An error has been in the payment": "Parece que ha habido un error en el pago"
-	,"Retry": "Reintentar"
-	,"Accept": "Aceptar"
-}
diff --git a/forms/ecomerce/orders/locale/es.yml b/forms/ecomerce/orders/locale/es.yml
new file mode 100644
index 00000000..b649cddf
--- /dev/null
+++ b/forms/ecomerce/orders/locale/es.yml
@@ -0,0 +1,37 @@
+OpenOrders: Pedidos abiertos
+StartOrder: Empezar pedido
+ContinueOrder: Continuar pedido
+OrderNumber: Nº pedido
+DateMake: Fecha de creación
+DateExit: Fecha de salida
+SendMethod: Forma de envío
+LastOrders: Últimos pedidos
+'Balance:': 'Saldo:'
+PaymentInfo: >-
+  La cantidad mostrada es tu saldo pendiente (negativa) o favorable a día de
+  hoy, no tiene en cuenta pedidos del futuro. Para que tu pedido sea enviado,
+  esta cantidad debe ser igual o mayor que 0. Si quieres realizar una entrega a
+  cuenta, pulsa el botón de pago, borra la cantidad sugerida e introduce la
+  cantidad que desees.
+MakePayment: Realizar pago
+Company: Empresa
+Pending: Pendiente
+Pay: Pagar
+Basket: Cesta
+ShoppingBasket: Cesta de la compra
+SeeOrder: Mostrar detalle del pedido
+Delivery: Entrega
+TicketNumber: Nº ticket
+SentAddress: Dirección de envío
+Consignee: Consignatario
+Boxes: Bultos
+TotalWithVAT: Total con IVA
+PayOrder: Pagar pedido
+'AmountToPay:': 'Cantidad a pagar (€):'
+AmountError: >-
+  La cantidad debe ser un número positivo e inferior o igual al importe
+  pendiente
+PayError: Error al realizar el pago
+An error has been in the payment: Parece que ha habido un error en el pago
+Retry: Reintentar
+Accept: Aceptar
diff --git a/forms/ecomerce/orders/locale/fr.json b/forms/ecomerce/orders/locale/fr.json
deleted file mode 100644
index e37ed811..00000000
--- a/forms/ecomerce/orders/locale/fr.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-	 "OpenOrders": "Les commandes ouvertes"
-
-	,"StartOrder": "Acheter"
-	,"ContinueOrder": "Continuer la commande"
-	,"OrderNumber": "Numéro de commande"
-	,"DateMake": "Date de creation"
-	,"DateExit": "Date de sortie"
-	,"SendMethod": "Typo"
-
-	,"LastOrders": "Les dernières commandes"
-
-	,"Balance:": "Balance:"
-	,"PaymentInfo": "Le montant indiqué est votre pente (négative) ou balance favorable aujourd'hui, ne tient pas compte pour les commandes futures. Obtenir votre commande est expédiée, ce montant doit être égal ou supérieur à 0. Si vous voulez faire un versement, le montant suggéré effacé et entrez le montant que vous souhaitez."
-	,"MakePayment": "Effectuer un paiement"
-	,"Company": "Entreprise"
-	,"Pending": "Pente"
-	,"Pay": "Payer"
-	,"Basket": "Panier"
-	,"ShoppingBasket": "Panier"
-
-	,"SeeOrder": "Votre panier"
-	,"Delivery": "Livraison"
-	,"TicketNumber": "Numéro ticket"
-	,"SentAddress": "Adresse de livraison"
-	,"Consignee": "Destinataire"
-	,"Boxes": "Colis"
-	,"TotalWithVAT": "Total avec TVA"
-	,"PayOrder": "Payer la commande"
-	
-	,"AmountToPay:": "Montant à payer (€):"
-	,"AmountError": "La quantité doit être un neméro positif et inférieur ou égal  à la somme restant à payer"
-	,"PayError": "Impossible d'effectuer le paiement"
-	
-	,"An error has been in the payment": "Il semble qu'il ya eu une erreur dans le paiement"
-	,"Retry": "Réessayez"
-	,"Accept": "Accepter"
-}
diff --git a/forms/ecomerce/orders/locale/fr.yml b/forms/ecomerce/orders/locale/fr.yml
new file mode 100644
index 00000000..373840f3
--- /dev/null
+++ b/forms/ecomerce/orders/locale/fr.yml
@@ -0,0 +1,37 @@
+OpenOrders: Les commandes ouvertes
+StartOrder: Acheter
+ContinueOrder: Continuer la commande
+OrderNumber: Numéro de commande
+DateMake: Date de creation
+DateExit: Date de sortie
+SendMethod: Typo
+LastOrders: Les dernières commandes
+'Balance:': 'Balance:'
+PaymentInfo: >-
+  Le montant indiqué est votre pente (négative) ou balance favorable
+  aujourd'hui, ne tient pas compte pour les commandes futures. Obtenir votre
+  commande est expédiée, ce montant doit être égal ou supérieur à 0. Si vous
+  voulez faire un versement, le montant suggéré effacé et entrez le montant que
+  vous souhaitez.
+MakePayment: Effectuer un paiement
+Company: Entreprise
+Pending: Pente
+Pay: Payer
+Basket: Panier
+ShoppingBasket: Panier
+SeeOrder: Votre panier
+Delivery: Livraison
+TicketNumber: Numéro ticket
+SentAddress: Adresse de livraison
+Consignee: Destinataire
+Boxes: Colis
+TotalWithVAT: Total avec TVA
+PayOrder: Payer la commande
+'AmountToPay:': 'Montant à payer (€):'
+AmountError: >-
+  La quantité doit être un neméro positif et inférieur ou égal  à la somme
+  restant à payer
+PayError: Impossible d'effectuer le paiement
+An error has been in the payment: Il semble qu'il ya eu une erreur dans le paiement
+Retry: Réessayez
+Accept: Accepter
diff --git a/forms/ecomerce/orders/locale/mn.json b/forms/ecomerce/orders/locale/mn.json
deleted file mode 100644
index 887a95d1..00000000
--- a/forms/ecomerce/orders/locale/mn.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-	 "OpenOrders": "Open orders"
-
-	,"StartOrder": "Start order"
-	,"ContinueOrder": "Continue order"
-	,"OrderNumber": "Order number"
-	,"DateMake": "Creation date"
-	,"DateExit": "Shipping date"
-	,"SendMethod": "Delivery method"
-
-	,"LastOrders": "Last orders"
-
-	,"Balance:": "Balance:"
-	,"PaymentInfo": "Үзүүлсэн хэмжээ цаашид захиалга эзэлж биш, таны налуу (сөрөг), эсвэл тааламжтай тэнцвэр нь өнөөдөр юм. Хэрэв та дүн арилгаж гэж хэлж байсан нь доош нь төлбөр хийж, өөрийн хүссэн хэмжээгээр орж хүсэж байгаа бол таны захиалга ирдэг бол авах, энэ хэмжээ тэнцүү буюу 0-ээс их байх ёстой."
-	,"MakePayment": "Make payment"
-	,"Company": "Company"
-	,"Pending": "Pending"
-	,"Pay": "Pay"
-	,"Basket": "Basket"
-	,"ShoppingBasket": "Shopping basket"
-
-	,"SeeOrder": "Show details of the order"
-	,"Delivery": "Delivery"
-	,"TicketNumber": "Ticket number"
-	,"SentAddress": "Delivery address"
-	,"Consignee": "Consignee"
-	,"Boxes": "Bundles"
-	,"TotalWithVAT": "Total with VAT"
-	,"PayOrder": "Pay order"
-
-	,"AmountToPay:": "Amount to pay (€):"
-	,"AmountError": "The amount must be a positive number less than or equal to the outstanding amount"
-	,"PayError": "Failed to make the payment"
-	
-	,"An error has been in the payment": "It seems that there has been an error in the payment"
-	,"Retry": "Retry"
-	,"Accept": "Accept"
-}
diff --git a/forms/ecomerce/orders/locale/mn.yml b/forms/ecomerce/orders/locale/mn.yml
new file mode 100644
index 00000000..15c3c949
--- /dev/null
+++ b/forms/ecomerce/orders/locale/mn.yml
@@ -0,0 +1,36 @@
+OpenOrders: Open orders
+StartOrder: Start order
+ContinueOrder: Continue order
+OrderNumber: Order number
+DateMake: Creation date
+DateExit: Shipping date
+SendMethod: Delivery method
+LastOrders: Last orders
+'Balance:': 'Balance:'
+PaymentInfo: >-
+  Үзүүлсэн хэмжээ цаашид захиалга эзэлж биш, таны налуу (сөрөг), эсвэл
+  тааламжтай тэнцвэр нь өнөөдөр юм. Хэрэв та дүн арилгаж гэж хэлж байсан нь доош
+  нь төлбөр хийж, өөрийн хүссэн хэмжээгээр орж хүсэж байгаа бол таны захиалга
+  ирдэг бол авах, энэ хэмжээ тэнцүү буюу 0-ээс их байх ёстой.
+MakePayment: Make payment
+Company: Company
+Pending: Pending
+Pay: Pay
+Basket: Basket
+ShoppingBasket: Shopping basket
+SeeOrder: Show details of the order
+Delivery: Delivery
+TicketNumber: Ticket number
+SentAddress: Delivery address
+Consignee: Consignee
+Boxes: Bundles
+TotalWithVAT: Total with VAT
+PayOrder: Pay order
+'AmountToPay:': 'Amount to pay (€):'
+AmountError: >-
+  The amount must be a positive number less than or equal to the outstanding
+  amount
+PayError: Failed to make the payment
+An error has been in the payment: It seems that there has been an error in the payment
+Retry: Retry
+Accept: Accept
diff --git a/forms/ecomerce/orders/locale/pt.json b/forms/ecomerce/orders/locale/pt.json
deleted file mode 100644
index fafc2309..00000000
--- a/forms/ecomerce/orders/locale/pt.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-	 "OpenOrders": "Abrir encomendas"
-
-	,"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": "Últimas encomendas"
-
-	,"Balance:": "Saldo:"
-	,"PaymentInfo": "A quantidade mostrada é seu saldo pendente (negativo) ou favorável a dia de hoje, não se vincula a pedidos futuros. Para que seu pedido seja enviado, esta quantidade deve ser igual ou superior a 0. Se queres realizar um depósito à conta, clique no botão de pagamento, apague a quantidade sugerida e introduza a quantidade que deseje."
-	,"MakePayment": "Realizar pagamento"
-	,"Company": "Empresa"
-	,"Pending": "Pendente"
-	,"Pay": "Pagar"
-	,"Basket": "Cesta"
-	,"ShoppingBasket": "Cesta da compra"
-
-	,"SeeOrder": "Ver encomenda"
-	,"Delivery": "Entrega"
-	,"TicketNumber": "Nº encomenda"
-	,"SentAddress": "Endereço de envío"
-	,"Consignee": "Consignatario"
-	,"Boxes": "Bultos"
-	,"TotalWithVAT": "Total com IVA"
-	,"PayOrder": "Pagar encomenda"
-
-	,"AmountToPay:": "Quantidade a pagar (€):"
-	,"AmountError": "A quantidade deve ser um número positivo e inferior ou igual ao importe pendiente"
-	,"PayError": "Erro ao realizar o pagamento"
-	
-	,"An error has been in the payment": "Parece que houve um erro no pagamento"
-	,"Retry": "Tentar novamente"
-	,"Accept": "Aceitar"
-}
diff --git a/forms/ecomerce/orders/locale/pt.yml b/forms/ecomerce/orders/locale/pt.yml
new file mode 100644
index 00000000..ff127648
--- /dev/null
+++ b/forms/ecomerce/orders/locale/pt.yml
@@ -0,0 +1,37 @@
+OpenOrders: Abrir encomendas
+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: Últimas encomendas
+'Balance:': 'Saldo:'
+PaymentInfo: >-
+  A quantidade mostrada é seu saldo pendente (negativo) ou favorável a dia de
+  hoje, não se vincula a pedidos futuros. Para que seu pedido seja enviado, esta
+  quantidade deve ser igual ou superior a 0. Se queres realizar um depósito à
+  conta, clique no botão de pagamento, apague a quantidade sugerida e introduza
+  a quantidade que deseje.
+MakePayment: Realizar pagamento
+Company: Empresa
+Pending: Pendente
+Pay: Pagar
+Basket: Cesta
+ShoppingBasket: Cesta da compra
+SeeOrder: Ver encomenda
+Delivery: Entrega
+TicketNumber: Nº encomenda
+SentAddress: Endereço de envío
+Consignee: Consignatario
+Boxes: Bultos
+TotalWithVAT: Total com IVA
+PayOrder: Pagar encomenda
+'AmountToPay:': 'Quantidade a pagar (€):'
+AmountError: >-
+  A quantidade deve ser um número positivo e inferior ou igual ao importe
+  pendiente
+PayError: Erro ao realizar o pagamento
+An error has been in the payment: Parece que houve um erro no pagamento
+Retry: Tentar novamente
+Accept: Aceitar
diff --git a/forms/ecomerce/ticket/locale/ca.json b/forms/ecomerce/ticket/locale/ca.json
deleted file mode 100644
index eade92a5..00000000
--- a/forms/ecomerce/ticket/locale/ca.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-	 "OrderDetail": "Detall de l'encarrec"
-
-	,"Print delivery note": "Imprimir albarà"
-
-	,"Delivery": "Entrega"
-	,"Total": "Total"
-	,"Total + tax": "Total + IVA"
-	,"Tax base": "Base imposable"
-	,"VAT": "IVA"
-
-	,"ItemNumber": "N article"
-	,"Amount": "Quant"
-	,"Item": "Article"
-	,"Category": "Categoria"
-	,"S1": "Mes"
-	,"Stems": "Tijes"
-	,"Color": "Color"
-	,"Origin": "Orige"
-	,"Price": "Preu"
-	,"Disc": "Desc"
-	,"Subtotal": "Subtotal"
-}
diff --git a/forms/ecomerce/ticket/locale/ca.yml b/forms/ecomerce/ticket/locale/ca.yml
new file mode 100644
index 00000000..7c7c20a1
--- /dev/null
+++ b/forms/ecomerce/ticket/locale/ca.yml
@@ -0,0 +1,18 @@
+OrderDetail: Detall de l'encarrec
+Print delivery note: Imprimir albarà
+Delivery: Entrega
+Total: Total
+Total + tax: Total + IVA
+Tax base: Base imposable
+VAT: IVA
+ItemNumber: N article
+Amount: Quant
+Item: Article
+Category: Categoria
+S1: Mes
+Stems: Tijes
+Color: Color
+Origin: Orige
+Price: Preu
+Disc: Desc
+Subtotal: Subtotal
diff --git a/forms/ecomerce/ticket/locale/en.json b/forms/ecomerce/ticket/locale/en.json
deleted file mode 100644
index e151483b..00000000
--- a/forms/ecomerce/ticket/locale/en.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-	 "OrderDetail": "Order detail"
-
-	,"Print delivery note": "Print delivery note"
-
-	,"Delivery": "Delivery"
-	,"Total": "Total"
-	,"Total + tax": "Total + tax"
-	,"Tax base": "Tax base"
-	,"VAT": "VAT"
-
-	,"ItemNumber": "Item number"
-	,"Amount": "Amount"
-	,"Item": "Item"
-	,"Category": "Category"
-	,"S1": "Siz"
-	,"Stems": "Stems"
-	,"Color": "Color"
-	,"Origin": "Origin"
-	,"Price": "Price"
-	,"Disc": "Disc"
-	,"Subtotal": "Subtotal"
-}
diff --git a/forms/ecomerce/ticket/locale/en.yml b/forms/ecomerce/ticket/locale/en.yml
new file mode 100644
index 00000000..cf23090c
--- /dev/null
+++ b/forms/ecomerce/ticket/locale/en.yml
@@ -0,0 +1,18 @@
+OrderDetail: Order detail
+Print delivery note: Print delivery note
+Delivery: Delivery
+Total: Total
+Total + tax: Total + tax
+Tax base: Tax base
+VAT: VAT
+ItemNumber: Item number
+Amount: Amount
+Item: Item
+Category: Category
+S1: Siz
+Stems: Stems
+Color: Color
+Origin: Origin
+Price: Price
+Disc: Disc
+Subtotal: Subtotal
diff --git a/forms/ecomerce/ticket/locale/es.json b/forms/ecomerce/ticket/locale/es.json
deleted file mode 100644
index 76094125..00000000
--- a/forms/ecomerce/ticket/locale/es.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-	 "OrderDetail": "Detalle del pedido"
-
-	,"Print delivery note": "Imprimir albarán"
-
-	,"Delivery": "Entrega"
-	,"Total": "Total"
-	,"Total + tax": "Total + IVA"
-	,"Tax base": "Base imponible"
-	,"VAT": "IVA"
-
-	,"ItemNumber": "Nº artículo"
-	,"Amount": "Cant"
-	,"Item": "Artículo"
-	,"Category": "Categoría"
-	,"S1": "Med"
-	,"Stems": "Tallos"
-	,"Color": "Color"
-	,"Origin": "Origen"
-	,"Price": "Precio"
-	,"Disc": "Desc"
-	,"Subtotal": "Subtotal"
-}
diff --git a/forms/ecomerce/ticket/locale/es.yml b/forms/ecomerce/ticket/locale/es.yml
new file mode 100644
index 00000000..c7646033
--- /dev/null
+++ b/forms/ecomerce/ticket/locale/es.yml
@@ -0,0 +1,18 @@
+OrderDetail: Detalle del pedido
+Print delivery note: Imprimir albarán
+Delivery: Entrega
+Total: Total
+Total + tax: Total + IVA
+Tax base: Base imponible
+VAT: IVA
+ItemNumber: Nº artículo
+Amount: Cant
+Item: Artículo
+Category: Categoría
+S1: Med
+Stems: Tallos
+Color: Color
+Origin: Origen
+Price: Precio
+Disc: Desc
+Subtotal: Subtotal
diff --git a/forms/ecomerce/ticket/locale/fr.json b/forms/ecomerce/ticket/locale/fr.json
deleted file mode 100644
index 37a2d6d5..00000000
--- a/forms/ecomerce/ticket/locale/fr.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-	 "OrderDetail": "Détails de la commande"
-
-	,"Print delivery note": "Imprimer bulletin de livraison"
-
-	,"Delivery": "Livraison"
-	,"Total": "Total"
-	,"Total + tax": "Total + impôt"
-	,"Tax base": "Imposable"
-	,"VAT": "TVA"
-
-	,"ItemNumber": "Num article"
-	,"Amount": "Quant"
-	,"Item": "Article"
-	,"Category": "catégorie"
-	,"S1": "Mes"
-	,"Stems": "Tiges"
-	,"Color": "Couleur"
-	,"Origin": "Origine"
-	,"Price": "Prix"
-	,"Disc": "Remise"
-	,"Subtotal": "Sous-total"
-}
diff --git a/forms/ecomerce/ticket/locale/fr.yml b/forms/ecomerce/ticket/locale/fr.yml
new file mode 100644
index 00000000..5474ba32
--- /dev/null
+++ b/forms/ecomerce/ticket/locale/fr.yml
@@ -0,0 +1,18 @@
+OrderDetail: Détails de la commande
+Print delivery note: Imprimer bulletin de livraison
+Delivery: Livraison
+Total: Total
+Total + tax: Total + impôt
+Tax base: Imposable
+VAT: TVA
+ItemNumber: Num article
+Amount: Quant
+Item: Article
+Category: catégorie
+S1: Mes
+Stems: Tiges
+Color: Couleur
+Origin: Origine
+Price: Prix
+Disc: Remise
+Subtotal: Sous-total
diff --git a/forms/ecomerce/ticket/locale/pt.json b/forms/ecomerce/ticket/locale/pt.json
deleted file mode 100644
index 8e96e906..00000000
--- a/forms/ecomerce/ticket/locale/pt.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-	 "OrderDetail": "Detalhes da encomenda"
-
-	,"Print delivery note": "Imprimir nota de entrega"
-
-	,"Delivery": "Entrega"
-	,"Total": "Total"
-	,"Total + tax": "Total + IVA"
-	,"Tax base": "Base tributável"
-	,"VAT": "IVA"
-
-	,"ItemNumber": "Nº Ítem"
-	,"Amount": "Qtde"
-	,"Item": "Ítem"
-	,"Category": "Categoría"
-	,"S1": "Med"
-	,"Stems": "Pés"
-	,"Color": "Cor"
-	,"Origin": "Orígem"
-	,"Price": "Preço"
-	,"Disc": "Desc"
-	,"Subtotal": "Sub-total"
-}
diff --git a/forms/ecomerce/ticket/locale/pt.yml b/forms/ecomerce/ticket/locale/pt.yml
new file mode 100644
index 00000000..6b09c23d
--- /dev/null
+++ b/forms/ecomerce/ticket/locale/pt.yml
@@ -0,0 +1,18 @@
+OrderDetail: Detalhes da encomenda
+Print delivery note: Imprimir nota de entrega
+Delivery: Entrega
+Total: Total
+Total + tax: Total + IVA
+Tax base: Base tributável
+VAT: IVA
+ItemNumber: Nº Ítem
+Amount: Qtde
+Item: Ítem
+Category: Categoría
+S1: Med
+Stems: Pés
+Color: Cor
+Origin: Orígem
+Price: Preço
+Disc: Desc
+Subtotal: Sub-total
diff --git a/forms/news/new/locale/ca.json b/forms/news/new/locale/ca.json
deleted file mode 100644
index 4c85c5b0..00000000
--- a/forms/news/new/locale/ca.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	 "AddEditNew": "Afegir o editar notícia"
-
-	,"Title": "Títol"
-	,"NewBody": "Cos"
-	,"Tag": "Etiqueta"
-	,"Priority": "Prioritat"
-
-	,"Return": "Tornar"
-	,"Accept": "Acceptar"
-	
-	,"NewChangedSuccessfully": "Notícia modificada correctament"
-}
diff --git a/forms/news/new/locale/ca.yml b/forms/news/new/locale/ca.yml
new file mode 100644
index 00000000..405c0281
--- /dev/null
+++ b/forms/news/new/locale/ca.yml
@@ -0,0 +1,8 @@
+AddEditNew: Afegir o editar notícia
+Title: Títol
+NewBody: Cos
+Tag: Etiqueta
+Priority: Prioritat
+Return: Tornar
+Accept: Acceptar
+NewChangedSuccessfully: Notícia modificada correctament
diff --git a/forms/news/new/locale/en.json b/forms/news/new/locale/en.json
deleted file mode 100644
index c6c807b0..00000000
--- a/forms/news/new/locale/en.json
+++ /dev/null
@@ -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"
-}
diff --git a/forms/news/new/locale/en.yml b/forms/news/new/locale/en.yml
new file mode 100644
index 00000000..329071c1
--- /dev/null
+++ b/forms/news/new/locale/en.yml
@@ -0,0 +1,8 @@
+AddEditNew: Add or edit new
+Title: Title
+NewBody: New body
+Tag: Tag
+Priority: Priority
+Return: Return
+Accept: Accept
+NewChangedSuccessfully: New changed successfully
diff --git a/forms/news/new/locale/es.json b/forms/news/new/locale/es.json
deleted file mode 100644
index 2b9b2ca4..00000000
--- a/forms/news/new/locale/es.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	 "AddEditNew": "Añadir o editar noticia"
-
-	,"Title": "Título"
-	,"NewBody": "Cuerpo"
-	,"Tag": "Etiqueta"
-	,"Priority": "Prioridad"
-
-	,"Return": "Volver"
-	,"Accept": "Aceptar"
-	
-	,"NewChangedSuccessfully": "Noticia modificada correctamente"
-}
diff --git a/forms/news/new/locale/es.yml b/forms/news/new/locale/es.yml
new file mode 100644
index 00000000..6e53ffa3
--- /dev/null
+++ b/forms/news/new/locale/es.yml
@@ -0,0 +1,8 @@
+AddEditNew: Añadir o editar noticia
+Title: Título
+NewBody: Cuerpo
+Tag: Etiqueta
+Priority: Prioridad
+Return: Volver
+Accept: Aceptar
+NewChangedSuccessfully: Noticia modificada correctamente
diff --git a/forms/news/new/locale/fr.json b/forms/news/new/locale/fr.json
deleted file mode 100644
index a178493f..00000000
--- a/forms/news/new/locale/fr.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	 "AddEditNew": "Ajouter ou editer nouvelles"
-
-	,"Title": "Titre"
-	,"NewBody": "Corps"
-	,"Tag": "Tag"
-	,"Priority": "Priorité"
-
-	,"Return": "Reviens"
-	,"Accept": "Accepter"
-	
-	,"NewChangedSuccessfully": "Nouvelles modifié avec succès"
-}
diff --git a/forms/news/new/locale/fr.yml b/forms/news/new/locale/fr.yml
new file mode 100644
index 00000000..06e6291d
--- /dev/null
+++ b/forms/news/new/locale/fr.yml
@@ -0,0 +1,8 @@
+AddEditNew: Ajouter ou editer nouvelles
+Title: Titre
+NewBody: Corps
+Tag: Tag
+Priority: Priorité
+Return: Reviens
+Accept: Accepter
+NewChangedSuccessfully: Nouvelles modifié avec succès
diff --git a/forms/news/new/locale/pt.json b/forms/news/new/locale/pt.json
deleted file mode 100644
index e35497ff..00000000
--- a/forms/news/new/locale/pt.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	 "AddEditNew": "Adicionar ou editar notícia"
-
-	,"Title": "Título"
-	,"NewBody": "Corpo"
-	,"Tag": "Etiqueta"
-	,"Priority": "Prioridade"
-
-	,"Return": "Voltar"
-	,"Accept": "Aceitar"
-	
-	,"NewChangedSuccessfully": "Noticia modificada corretamente"
-}
diff --git a/forms/news/new/locale/pt.yml b/forms/news/new/locale/pt.yml
new file mode 100644
index 00000000..c789b2e7
--- /dev/null
+++ b/forms/news/new/locale/pt.yml
@@ -0,0 +1,8 @@
+AddEditNew: Adicionar ou editar notícia
+Title: Título
+NewBody: Corpo
+Tag: Etiqueta
+Priority: Prioridade
+Return: Voltar
+Accept: Aceitar
+NewChangedSuccessfully: Noticia modificada corretamente
diff --git a/forms/news/news/locale/ca.json b/forms/news/news/locale/ca.json
deleted file mode 100644
index 00f6b71a..00000000
--- a/forms/news/news/locale/ca.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	 "NewsManagement": "Gestió de noticies"
-
-	,"AddNew": "Afegir noticia"
-	,"EditNew": "Edita notícia"
-
-	,"NewNum": "N notícia"
-	,"Date": "Data"
-	,"Author": "Autor"
-	,"Title": "Títol"
-	,"Priority": "Prioritat"
-}
diff --git a/forms/news/news/locale/ca.yml b/forms/news/news/locale/ca.yml
new file mode 100644
index 00000000..53773038
--- /dev/null
+++ b/forms/news/news/locale/ca.yml
@@ -0,0 +1,8 @@
+NewsManagement: Gestió de noticies
+AddNew: Afegir noticia
+EditNew: Edita notícia
+NewNum: N notícia
+Date: Data
+Author: Autor
+Title: Títol
+Priority: Prioritat
diff --git a/forms/news/news/locale/en.json b/forms/news/news/locale/en.json
deleted file mode 100644
index b263c5d0..00000000
--- a/forms/news/news/locale/en.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	 "NewsManagement": "News management"
-
-	,"AddNew": "Add new"
-	,"EditNew": "Edit new"
-
-	,"NewNum": "New number"
-	,"Date": "Date"
-	,"Author": "Author"
-	,"Title": "Title"
-	,"Priority": "Priority"
-}
diff --git a/forms/news/news/locale/en.yml b/forms/news/news/locale/en.yml
new file mode 100644
index 00000000..3b49fc93
--- /dev/null
+++ b/forms/news/news/locale/en.yml
@@ -0,0 +1,8 @@
+NewsManagement: News management
+AddNew: Add new
+EditNew: Edit new
+NewNum: New number
+Date: Date
+Author: Author
+Title: Title
+Priority: Priority
diff --git a/forms/news/news/locale/es.json b/forms/news/news/locale/es.json
deleted file mode 100644
index 89bb2d28..00000000
--- a/forms/news/news/locale/es.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	 "NewsManagement": "Gestión de noticias"
-
-	,"AddNew": "Añadir noticia"
-	,"EditNew": "Editar noticia"
-
-	,"NewNum": "Nº noticia"
-	,"Date": "Fecha"
-	,"Author": "Autor"
-	,"Title": "Título"
-	,"Priority": "Prioridad"
-}
diff --git a/forms/news/news/locale/es.yml b/forms/news/news/locale/es.yml
new file mode 100644
index 00000000..17d42a6e
--- /dev/null
+++ b/forms/news/news/locale/es.yml
@@ -0,0 +1,8 @@
+NewsManagement: Gestión de noticias
+AddNew: Añadir noticia
+EditNew: Editar noticia
+NewNum: Nº noticia
+Date: Fecha
+Author: Autor
+Title: Título
+Priority: Prioridad
diff --git a/forms/news/news/locale/fr.json b/forms/news/news/locale/fr.json
deleted file mode 100644
index acd4ebf4..00000000
--- a/forms/news/news/locale/fr.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	 "NewsManagement": "Gestion des nouvelles"
-
-	,"AddNew": "Ajouter nouvelles"
-	,"EditNew": "Modifier nouvelles"
-
-	,"NewNum": "Nº nouvelles"
-	,"Date": "Date"
-	,"Author": "Auteur"
-	,"Title": "Titre"
-	,"Priority": "Priorité"
-}
diff --git a/forms/news/news/locale/fr.yml b/forms/news/news/locale/fr.yml
new file mode 100644
index 00000000..7df649c1
--- /dev/null
+++ b/forms/news/news/locale/fr.yml
@@ -0,0 +1,8 @@
+NewsManagement: Gestion des nouvelles
+AddNew: Ajouter nouvelles
+EditNew: Modifier nouvelles
+NewNum: Nº nouvelles
+Date: Date
+Author: Auteur
+Title: Titre
+Priority: Priorité
diff --git a/forms/news/news/locale/pt.json b/forms/news/news/locale/pt.json
deleted file mode 100644
index 4f7c611a..00000000
--- a/forms/news/news/locale/pt.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	 "NewsManagement": "Gestão de noticias"
-
-	,"AddNew": "Adicionar noticia"
-	,"EditNew": "Editar noticia"
-
-	,"NewNum": "Nº noticia"
-	,"Date": "Data"
-	,"Author": "Autor"
-	,"Title": "Título"
-	,"Priority": "Prioridade"
-}
diff --git a/forms/news/news/locale/pt.yml b/forms/news/news/locale/pt.yml
new file mode 100644
index 00000000..9503aac0
--- /dev/null
+++ b/forms/news/news/locale/pt.yml
@@ -0,0 +1,8 @@
+NewsManagement: Gestão de noticias
+AddNew: Adicionar noticia
+EditNew: Editar noticia
+NewNum: Nº noticia
+Date: Data
+Author: Autor
+Title: Título
+Priority: Prioridade
diff --git a/forms/reports/items-form/locale/en.json b/forms/reports/items-form/locale/en.json
deleted file mode 100644
index 53a2579c..00000000
--- a/forms/reports/items-form/locale/en.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-	 "Item list": "Item list"
-
-	,"Store": "Store"
-	,"Realm": "Realm"
-	,"Rate": "Rate"
-
-	,"Preview": "Preview"
-}
diff --git a/forms/reports/items-form/locale/en.yml b/forms/reports/items-form/locale/en.yml
new file mode 100644
index 00000000..3ef8e761
--- /dev/null
+++ b/forms/reports/items-form/locale/en.yml
@@ -0,0 +1,5 @@
+Item list: Item list
+Store: Store
+Realm: Realm
+Rate: Rate
+Preview: Preview
diff --git a/forms/reports/items-form/locale/es.json b/forms/reports/items-form/locale/es.json
deleted file mode 100644
index 68eee4ef..00000000
--- a/forms/reports/items-form/locale/es.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-	 "Item list": "Listado de artículos"
-
-	,"Store": "Almacén"
-	,"Realm": "Reino"
-	,"Rate": "Tarifa"
-
-	,"Preview": "Mostrar"
-}
diff --git a/forms/reports/items-form/locale/es.yml b/forms/reports/items-form/locale/es.yml
new file mode 100644
index 00000000..816be9c0
--- /dev/null
+++ b/forms/reports/items-form/locale/es.yml
@@ -0,0 +1,5 @@
+Item list: Listado de artículos
+Store: Almacén
+Realm: Reino
+Rate: Tarifa
+Preview: Mostrar
diff --git a/forms/reports/items-form/locale/pt.json b/forms/reports/items-form/locale/pt.json
deleted file mode 100644
index 8bf6f7f2..00000000
--- a/forms/reports/items-form/locale/pt.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-	 "Item list": "Lista de Ítens"
-
-	,"Store": "Armazém"
-	,"Realm": "Reino"
-	,"Rate": "Tarifa"
-
-	,"Preview": "Mostrar"
-}
diff --git a/forms/reports/items-form/locale/pt.yml b/forms/reports/items-form/locale/pt.yml
new file mode 100644
index 00000000..f38a6b34
--- /dev/null
+++ b/forms/reports/items-form/locale/pt.yml
@@ -0,0 +1,5 @@
+Item list: Lista de Ítens
+Store: Armazém
+Realm: Reino
+Rate: Tarifa
+Preview: Mostrar
diff --git a/forms/cms/training/locale/en.json b/forms/reports/shelves/locale/ca.yml
similarity index 100%
rename from forms/cms/training/locale/en.json
rename to forms/reports/shelves/locale/ca.yml
diff --git a/forms/reports/shelves/locale/en.json b/forms/reports/shelves/locale/en.json
deleted file mode 100644
index 7fb6f425..00000000
--- a/forms/reports/shelves/locale/en.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-	 "Configuration": "Configuration"
-	,"Select config": "Select config"
-	,"Reign": "Reign"
-	,"Family": "Family"
-	,"Store": "Store"
-	,"Date": "Date"
-	,"Shelf": "Shelf"
-	,"Name prefix": "Name prefix"
-	,"Limit amount per item": "Limit amount per item"
-	,"Title": "Title"
-	,"Show packing": "Show packing"
-	,"Stack different items": "Stack different items"
-	 
-	,"Preview": "Preview"
-
-	,"Pallets": "Pallets"
-	 
-	,"No items found, check that all fields are correct":
-		"No items found, check that all fields are correct"
-}
diff --git a/forms/reports/shelves/locale/en.yml b/forms/reports/shelves/locale/en.yml
new file mode 100644
index 00000000..67838b82
--- /dev/null
+++ b/forms/reports/shelves/locale/en.yml
@@ -0,0 +1,15 @@
+Configuration: Configuration
+Select config: Select config
+Reign: Reign
+Family: Family
+Store: Store
+Date: Date
+Shelf: Shelf
+Name prefix: Name prefix
+Limit amount per item: Limit amount per item
+Title: Title
+Show packing: Show packing
+Stack different items: Stack different items
+Preview: Preview
+Pallets: Pallets
+'No items found, check that all fields are correct': 'No items found, check that all fields are correct'
diff --git a/forms/reports/shelves/locale/es.json b/forms/reports/shelves/locale/es.json
deleted file mode 100644
index edf194ad..00000000
--- a/forms/reports/shelves/locale/es.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-	 "Configuration": "Configuración"
-	,"Select config": "Selecciona configuración"
-	,"Reign": "Reino"
-	,"Family": "Familia"
-	,"Store": "Almacén"
-	,"Date": "Fecha"
-	,"Shelf": "Estantería"
-	,"Name prefix": "Prefijo del nombre"
-	,"Limit amount per item": "Límite de cantidad por artículo"
-	,"Title": "Título"
-	,"Show packing": "Mostrar unidades por caja"
-	,"Stack different items": "Apilar artículos distintos"
-	 
-	,"Preview": "Mostrar"
-
-	,"Pallets": "Palets"
-	 
-	,"No items found, check that all fields are correct":
-		"No se han encontrado artículos, comprueba que todos los campos son correctos"
-}
diff --git a/forms/reports/shelves/locale/es.yml b/forms/reports/shelves/locale/es.yml
new file mode 100644
index 00000000..955788d2
--- /dev/null
+++ b/forms/reports/shelves/locale/es.yml
@@ -0,0 +1,15 @@
+Configuration: Configuración
+Select config: Selecciona configuración
+Reign: Reino
+Family: Familia
+Store: Almacén
+Date: Fecha
+Shelf: Estantería
+Name prefix: Prefijo del nombre
+Limit amount per item: Límite de cantidad por artículo
+Title: Título
+Show packing: Mostrar unidades por caja
+Stack different items: Apilar artículos distintos
+Preview: Mostrar
+Pallets: Palets
+'No items found, check that all fields are correct': 'No se han encontrado artículos, comprueba que todos los campos son correctos'
diff --git a/forms/cms/training/locale/ca.json b/forms/reports/shelves/locale/fr.yml
similarity index 100%
rename from forms/cms/training/locale/ca.json
rename to forms/reports/shelves/locale/fr.yml
diff --git a/forms/reports/shelves/locale/pt.json b/forms/reports/shelves/locale/pt.json
deleted file mode 100644
index 791de63d..00000000
--- a/forms/reports/shelves/locale/pt.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-	 "Configuration": "Configuração"
-	,"Select config": "Selecione a configuração"
-	,"Reign": "Reino"
-	,"Family": "Familia"
-	,"Store": "Armazém"
-	,"Date": "Data"
-	,"Shelf": "Pratilheira"
-	,"Name prefix": "Prefixo do nome"
-	,"Limit amount per item": "Limíte de quantidade por ítem"
-	,"Title": "Título"
-	,"Show packing": "Mostrar unidades por caixa"
-	,"Stack different items": "Empilhar ítens diferentes"
-	 
-	,"Preview": "Mostrar"
-
-	,"Pallets": "Palets"
-	 
-	,"No items found, check that all fields are correct":
-		"Nenhum ítem encontrado, comprove que todos os campos estão corretos"
-}
diff --git a/forms/reports/shelves/locale/pt.yml b/forms/reports/shelves/locale/pt.yml
new file mode 100644
index 00000000..3a02ba9d
--- /dev/null
+++ b/forms/reports/shelves/locale/pt.yml
@@ -0,0 +1,15 @@
+Configuration: Configuração
+Select config: Selecione a configuração
+Reign: Reino
+Family: Familia
+Store: Armazém
+Date: Data
+Shelf: Pratilheira
+Name prefix: Prefixo do nome
+Limit amount per item: Limíte de quantidade por ítem
+Title: Título
+Show packing: Mostrar unidades por caixa
+Stack different items: Empilhar ítens diferentes
+Preview: Mostrar
+Pallets: Palets
+'No items found, check that all fields are correct': 'Nenhum ítem encontrado, comprove que todos os campos estão corretos'
diff --git a/index.php b/index.php
index b9b0cad3..02b59a37 100644
--- a/index.php
+++ b/index.php
@@ -5,4 +5,3 @@ require_once 'vn-autoload.php';
 
 $webApp = new Vn\Web\App ('hedera-web');
 $webApp->run ();
-
diff --git a/js/db/locale/ca.json b/js/db/locale/ca.json
deleted file mode 100644
index 64e50adf..00000000
--- a/js/db/locale/ca.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-	 "ConnError": "Error en la conexió"
-	,"BadServerReply": "Resposta del servidor incorrecta"
-	,"ModelNotUpdatable": "Aquest model no és actualitzable"
-	,"RowNotExists": "El registre no existeix o ha sigut esborrat"
-	,"ColNotExists": "La columna no existeix"
-}
diff --git a/js/db/locale/ca.yml b/js/db/locale/ca.yml
new file mode 100644
index 00000000..8ab1a7b3
--- /dev/null
+++ b/js/db/locale/ca.yml
@@ -0,0 +1,5 @@
+ConnError: Error en la conexió
+BadServerReply: Resposta del servidor incorrecta
+ModelNotUpdatable: Aquest model no és actualitzable
+RowNotExists: El registre no existeix o ha sigut esborrat
+ColNotExists: La columna no existeix
diff --git a/js/db/locale/en.json b/js/db/locale/en.json
deleted file mode 100644
index 0ea58851..00000000
--- a/js/db/locale/en.json
+++ /dev/null
@@ -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"
-}
diff --git a/js/db/locale/en.yml b/js/db/locale/en.yml
new file mode 100644
index 00000000..576730a6
--- /dev/null
+++ b/js/db/locale/en.yml
@@ -0,0 +1,5 @@
+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
diff --git a/js/db/locale/es.json b/js/db/locale/es.json
deleted file mode 100644
index 91143f97..00000000
--- a/js/db/locale/es.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-	 "ConnError": "Error en la conexión"
-	,"BadServerReply": "Respuesta del servidor incorrecta"
-	,"ModelNotUpdatable": "Este modelo no es actualizable"
-	,"RowNotExists": "El registro no existe o a sido borrado"
-	,"ColNotExists": "La columna no existe"
-}
diff --git a/js/db/locale/es.yml b/js/db/locale/es.yml
new file mode 100644
index 00000000..24919c17
--- /dev/null
+++ b/js/db/locale/es.yml
@@ -0,0 +1,5 @@
+ConnError: Error en la conexión
+BadServerReply: Respuesta del servidor incorrecta
+ModelNotUpdatable: Este modelo no es actualizable
+RowNotExists: El registro no existe o a sido borrado
+ColNotExists: La columna no existe
diff --git a/js/db/locale/fr.json b/js/db/locale/fr.json
deleted file mode 100644
index 5a72cce1..00000000
--- a/js/db/locale/fr.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-	 "ConnError": "Échec de la connexion"
-	,"BadServerReply": "Réponse du serveur incorrecte"
-	,"ModelNotUpdatable": "Ce modèle n'est pas modifiable"
-	,"RowNotExists": "Le dossier n'existe pas ou a été supprimée"
-	,"ColNotExists": "N'existe pas la colonne"
-}
diff --git a/js/db/locale/fr.yml b/js/db/locale/fr.yml
new file mode 100644
index 00000000..61a6b792
--- /dev/null
+++ b/js/db/locale/fr.yml
@@ -0,0 +1,5 @@
+ConnError: Échec de la connexion
+BadServerReply: Réponse du serveur incorrecte
+ModelNotUpdatable: Ce modèle n'est pas modifiable
+RowNotExists: Le dossier n'existe pas ou a été supprimée
+ColNotExists: N'existe pas la colonne
diff --git a/js/db/locale/pt.json b/js/db/locale/pt.json
deleted file mode 100644
index 61a926dc..00000000
--- a/js/db/locale/pt.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-	 "ConnError": "Erro de conexão"
-	,"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"
-}
diff --git a/js/db/locale/pt.yml b/js/db/locale/pt.yml
new file mode 100644
index 00000000..1fff629c
--- /dev/null
+++ b/js/db/locale/pt.yml
@@ -0,0 +1,5 @@
+ConnError: Erro de conexão
+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
diff --git a/js/hedera/locale/ca.json b/js/hedera/locale/ca.json
deleted file mode 100644
index 4e07c231..00000000
--- a/js/hedera/locale/ca.json
+++ /dev/null
@@ -1,63 +0,0 @@
-{
-	 "User": "Usuari"
-	,"Password": "Contrasenya"
-	,"Beta": "Beta"
-	,"Do not sign out": "No tancar sessió"
-	,"Log in as guest": "Accedir com a convidat"
-	,"Enter": "Entrar"
-	,"Login mail": "clientes@verdnatura.es"
-	,"Login phone": "+34 607 562 391"
-	,"Password forgotten? Push here": "¿Has oblidat la teva contrasenya?"
-	,"Yet you are not a customer?": "Encara no ets client?"
-	,"Sign up": "Registrarme"
-	
-	,"You've been too idle": "Has estat massa temps inactiu i la sessió ha expirat"
-	,"Invalid login": "Usuari o contrasenya incorrectes, recorda que s'hi distingeix entre majúscula i minúscula"
-	,"Please write your user name": "Si us plau introdueix el teu nom d'usuari"
-	,"A mail has been sent wich you can recover your password": "T'hem enviat un correu on podràs recuperar la teva contrasenya"
-
-	,"Menu": "Menú"
-	,"Exit": "Sortir"
-	,"Test the new website": "Prova la nova web!"
-	,"Old website": "Web antiga"
-	,"Recent changes": "Canvis recents"
-
-	,"Print": "Imprimir"
-	,"Please unlock popups and try again":
-		"Si us plau, desbloqueja els popups i torna-ho a intentar"
-
-	,"Error loading form": "Error al carregar formulari"
-	,"Error loading report": "Error en carregar l'informe"
-	,"By using this site you accept cookies": "En utilitzar aquest lloc web acceptes l'ús de cookies per a la personalització de continguts i anàlisi."
-	,"New version available": "Hi ha una nova actualització, la pàgina recarregarà automàticament per descarregar-la"
-
-	,"AppName": "Verdnatura"
-
-	,"Home": "Inici"
-	,"Orders": "Encàrrecs"
-		,"Basket": "Cistella"
-		,"Last orders": "Últims comandes"
-		,"Invoices": "Factures"
-	,"Catalog": "Catàleg"
-	,"About": "Coneix-nos"
-		,"About us": "Quant a"
-		,"Why": "Per què?"
-	,"Location": "Localització"
-	,"Administration": "Administració"
-		,"Control panel": "Panell de control"
-		,"Users": "Usuaris"
-		,"Connections": "Conexions"
-		,"Visits": "Visites"
-		,"News": "Noticies"
-		,"Photos": "Fotos"
-		,"Items": "Artícles"
-	,"Reports": "Informes"
-		,"Shelves": "Estanterías"
-		,"Items list": "Llistat articles"
-	,"Contact": "Vull ser client"
-	,"Training": "Formació"
-	,"Agencies": "Agències"
-	,"Configuration": "Configuració"
-		,"Account": "Compte"
-		,"Addresses": "Direccions"
-}
diff --git a/js/hedera/locale/ca.yml b/js/hedera/locale/ca.yml
new file mode 100644
index 00000000..10db75d8
--- /dev/null
+++ b/js/hedera/locale/ca.yml
@@ -0,0 +1,60 @@
+User: Usuari
+Password: Contrasenya
+Beta: Beta
+Do not sign out: No tancar sessió
+Log in as guest: Accedir com a convidat
+Enter: Entrar
+Login mail: clientes@verdnatura.es
+Login phone: +34 607 562 391
+Password forgotten? Push here: ¿Has oblidat la teva contrasenya?
+Yet you are not a customer?: Encara no ets client?
+Sign up: Registrarme
+You've been too idle: Has estat massa temps inactiu i la sessió ha expirat
+Invalid login: >-
+  Usuari o contrasenya incorrectes, recorda que s'hi distingeix entre majúscula
+  i minúscula
+Please write your user name: Si us plau introdueix el teu nom d'usuari
+A mail has been sent wich you can recover your password: T'hem enviat un correu on podràs recuperar la teva contrasenya
+Menu: Menú
+Exit: Sortir
+Test the new website: Prova la nova web!
+Old website: Web antiga
+Recent changes: Canvis recents
+Print: Imprimir
+Please unlock popups and try again: 'Si us plau, desbloqueja els popups i torna-ho a intentar'
+Error loading form: Error al carregar formulari
+Error loading report: Error en carregar l'informe
+By using this site you accept cookies: >-
+  En utilitzar aquest lloc web acceptes l'ús de cookies per a la personalització
+  de continguts i anàlisi.
+New version available: >-
+  Hi ha una nova actualització, la pàgina recarregarà automàticament per
+  descarregar-la
+AppName: Verdnatura
+Home: Inici
+Orders: Encàrrecs
+Basket: Cistella
+Last orders: Últims comandes
+Invoices: Factures
+Catalog: Catàleg
+About: Coneix-nos
+About us: Quant a
+Why: Per què?
+Location: Localització
+Administration: Administració
+Control panel: Panell de control
+Users: Usuaris
+Connections: Conexions
+Visits: Visites
+News: Noticies
+Photos: Fotos
+Items: Artícles
+Reports: Informes
+Shelves: Estanterías
+Items list: Llistat articles
+Contact: Vull ser client
+Training: Formació
+Agencies: Agències
+Configuration: Configuració
+Account: Compte
+Addresses: Direccions
diff --git a/js/hedera/locale/en.json b/js/hedera/locale/en.json
deleted file mode 100644
index 2f599146..00000000
--- a/js/hedera/locale/en.json
+++ /dev/null
@@ -1,63 +0,0 @@
-{
-	 "User": "User"
-	,"Password": "Password"
-	,"Beta": "Beta"
-	,"Do not sign out": "Do not sign out"
-	,"Log in as guest": "Log in as guest"
-	,"Enter": "Enter"
-	,"Login mail": "clientes@verdnatura.es"
-	,"Login phone": "+34 607 562 391"
-	,"Password forgotten? Push here": "Password forgotten? Push here"
-	,"Yet you are not a customer?": "Yet you are not a customer?"
-	,"Sign up": "Sign up"
-
-	,"You've been too idle": "You have been idle too long and your session has expired"
-	,"Invalid login": "Username or password incorrect, remember that it is case-sensitive"
-	,"Please write your user name": "Please write your user name"
-	,"A mail has been sent wich you can recover your password": "A mail has been sent wich you can recover your password"
-
-	,"Menu": "Menu"
-	,"Exit": "Exit"
-	,"Test the new website": "Test the new website!"
-	,"Old website": "Old website"
-	,"Recent changes": "Recent changes"
-
-	,"Print": "Print"
-	,"Please unlock popups and try again":
-		"Please unlock popups and try again"
-
-	,"Error loading form": "Error while loading form"
-	,"Error loading report": "Error loading report"
-	,"By using this site you accept cookies": "By using this website you accept the use of cookies for customization of content and analysis."
-	,"New version available": "There is a new update, the page will automatically recharge to download it"
-	
-	,"AppName": "Verdnatura"
-
-	,"Home": "Home"
-	,"Orders": "Orders"
-		,"Basket": "Basket"
-		,"Last orders": "Last orders"
-		,"Invoices": "Invoices"
-	,"Catalog": "Catalog"
-	,"About": "About"
-		,"About us": "About us"
-		,"Why": "Why"
-	,"Location": "Location"
-	,"Administration": "Administration"
-		,"Control panel": "Control panel"
-		,"Users": "Users"
-		,"Connections": "Connections"
-		,"Visits": "Visits"
-		,"News": "News"
-		,"Photos": "Photos"
-		,"Items": "Items"
-	,"Reports": "Reports"
-		,"Shelves": "Shelves"
-		,"Items list": "Items list"
-	,"Contact": "Contact"
-	,"Training": "Training"
-	,"Agencies": "Agencies"
-	,"Configuration": "Configuration"
-		,"Account": "Account"
-		,"Addresses": "Addresses"
-}
diff --git a/js/hedera/locale/en.yml b/js/hedera/locale/en.yml
new file mode 100644
index 00000000..e71747dc
--- /dev/null
+++ b/js/hedera/locale/en.yml
@@ -0,0 +1,56 @@
+User: User
+Password: Password
+Beta: Beta
+Do not sign out: Do not sign out
+Log in as guest: Log in as guest
+Enter: Enter
+Login mail: clientes@verdnatura.es
+Login phone: +34 607 562 391
+Password forgotten? Push here: Password forgotten? Push here
+Yet you are not a customer?: Yet you are not a customer?
+Sign up: Sign up
+You've been too idle: You have been idle too long and your session has expired
+Invalid login: 'Username or password incorrect, remember that it is case-sensitive'
+Please write your user name: Please write your user name
+A mail has been sent wich you can recover your password: A mail has been sent wich you can recover your password
+Menu: Menu
+Exit: Exit
+Test the new website: Test the new website!
+Old website: Old website
+Recent changes: Recent changes
+Print: Print
+Please unlock popups and try again: Please unlock popups and try again
+Error loading form: Error while loading form
+Error loading report: Error loading report
+By using this site you accept cookies: >-
+  By using this website you accept the use of cookies for customization of
+  content and analysis.
+New version available: 'There is a new update, the page will automatically recharge to download it'
+AppName: Verdnatura
+Home: Home
+Orders: Orders
+Basket: Basket
+Last orders: Last orders
+Invoices: Invoices
+Catalog: Catalog
+About: About
+About us: About us
+Why: Why
+Location: Location
+Administration: Administration
+Control panel: Control panel
+Users: Users
+Connections: Connections
+Visits: Visits
+News: News
+Photos: Photos
+Items: Items
+Reports: Reports
+Shelves: Shelves
+Items list: Items list
+Contact: Contact
+Training: Training
+Agencies: Agencies
+Configuration: Configuration
+Account: Account
+Addresses: Addresses
diff --git a/js/hedera/locale/es.json b/js/hedera/locale/es.json
deleted file mode 100644
index 6efbf899..00000000
--- a/js/hedera/locale/es.json
+++ /dev/null
@@ -1,63 +0,0 @@
-{
-	 "User": "Usuario"
-	,"Password": "Contraseña"
-	,"Beta": "Beta"
-	,"Do not sign out": "No cerrar sesión"
-	,"Log in as guest": "Entrar como invitado"
-	,"Enter": "Entrar"
-	,"Login mail": "clientes@verdnatura.es"
-	,"Login phone": "+34 963 242 100"
-	,"Password forgotten? Push here": "¿Has olvidado tu contraseña?"
-	,"Yet you are not a customer?": "¿Todavía no eres cliente?"
-	,"Sign up": "Registrarme"
-
-	,"You've been too idle": "Has estado demasiado tiempo inactivo y la sesión ha expirado"
-	,"Invalid login": "Usuario o contraseña incorrectos, recuerda que se hace distinción entre mayúsculas y minúsculas"
-	,"Please write your user name": "Por favor escribe tu nombre de usuario"
-	,"A mail has been sent wich you can recover your password": "Te hemos enviado un correo donde podrás recuperar tu contraseña"
-
-	,"Menu": "Menú"
-	,"Exit": "Salir"
-	,"Test the new website": "¡Prueba la nueva web!"
-	,"Old website": "Web antigua"
-	,"Recent changes": "Cambios recientes"
-
-	,"Print": "Imprimir"
-	,"Please unlock popups and try again":
-		"Por favor, desbloquea los popups y vuélvelo a intentar"
-
-	,"Error loading form": "Error al cargar formulario"
-	,"Error loading report": "Error al cargar el informe"
-	,"By using this site you accept cookies": "Al utilizar este sitio web aceptas el uso de cookies para la personalización de contenidos y análisis."
-	,"New version available": "Hay una nueva actualización, la página se recargará automaticamente para descargarla"
-	
-	,"AppName": "Verdnatura"
-
-	,"Home": "Inicio"
-	,"Orders": "Pedidos"
-		,"Basket": "Cesta"
-		,"Last orders": "Últimos pedidos"
-		,"Invoices": "Facturas"
-	,"Catalog": "Catálogo"
-	,"About": "Conócenos"
-		,"About us": "Sobre nosotros"
-		,"Why": "¿Por qué?"
-	,"Location": "Localización"
-	,"Administration": "Administración"
-		,"Control panel": "Panel de control"
-		,"Users": "Usuarios"
-		,"Connections": "Conexiones"
-		,"Visits": "Visitas"
-		,"News": "Noticias"
-		,"Photos": "Fotos"
-		,"Items": "Artículos"
-	,"Reports": "Informes"
-		,"Shelves": "Estanterías"
-		,"Items list": "Listado artículos"
-	,"Contact": "Quiero ser cliente"
-	,"Training": "Formación"
-	,"Agencies": "Agencias"
-	,"Configuration": "Configuración"
-		,"Account": "Cuenta"
-		,"Addresses": "Direcciones"
-}
diff --git a/js/hedera/locale/es.yml b/js/hedera/locale/es.yml
new file mode 100644
index 00000000..8cbccf56
--- /dev/null
+++ b/js/hedera/locale/es.yml
@@ -0,0 +1,60 @@
+User: Usuario
+Password: Contraseña
+Beta: Beta
+Do not sign out: No cerrar sesión
+Log in as guest: Entrar como invitado
+Enter: Entrar
+Login mail: clientes@verdnatura.es
+Login phone: +34 963 242 100
+Password forgotten? Push here: ¿Has olvidado tu contraseña?
+Yet you are not a customer?: ¿Todavía no eres cliente?
+Sign up: Registrarme
+You've been too idle: Has estado demasiado tiempo inactivo y la sesión ha expirado
+Invalid login: >-
+  Usuario o contraseña incorrectos, recuerda que se hace distinción entre
+  mayúsculas y minúsculas
+Please write your user name: Por favor escribe tu nombre de usuario
+A mail has been sent wich you can recover your password: Te hemos enviado un correo donde podrás recuperar tu contraseña
+Menu: Menú
+Exit: Salir
+Test the new website: ¡Prueba la nueva web!
+Old website: Web antigua
+Recent changes: Cambios recientes
+Print: Imprimir
+Please unlock popups and try again: 'Por favor, desbloquea los popups y vuélvelo a intentar'
+Error loading form: Error al cargar formulario
+Error loading report: Error al cargar el informe
+By using this site you accept cookies: >-
+  Al utilizar este sitio web aceptas el uso de cookies para la personalización
+  de contenidos y análisis.
+New version available: >-
+  Hay una nueva actualización, la página se recargará automaticamente para
+  descargarla
+AppName: Verdnatura
+Home: Inicio
+Orders: Pedidos
+Basket: Cesta
+Last orders: Últimos pedidos
+Invoices: Facturas
+Catalog: Catálogo
+About: Conócenos
+About us: Sobre nosotros
+Why: ¿Por qué?
+Location: Localización
+Administration: Administración
+Control panel: Panel de control
+Users: Usuarios
+Connections: Conexiones
+Visits: Visitas
+News: Noticias
+Photos: Fotos
+Items: Artículos
+Reports: Informes
+Shelves: Estanterías
+Items list: Listado artículos
+Contact: Quiero ser cliente
+Training: Formación
+Agencies: Agencias
+Configuration: Configuración
+Account: Cuenta
+Addresses: Direcciones
diff --git a/js/hedera/locale/fr.json b/js/hedera/locale/fr.json
deleted file mode 100644
index e3c46d25..00000000
--- a/js/hedera/locale/fr.json
+++ /dev/null
@@ -1,63 +0,0 @@
-{
-	 "User": "Utilisateur"
-	,"Password": "Mot de passe"
-	,"Beta": "Beta"
-	,"Do not sign out": "Garder ma session active"
-	,"Log in as guest": "Entrez en tant qu'invité"
-	,"Enter": "Entrer"
-	,"Login mail": "ruben@verdnatura.es"
-	,"Login phone": "+33 781 533 900"
-	,"Password forgotten? Push here": "as tu oublié ton mot de passe?"
-	,"Yet you are not a customer?": "Êtes-vous Pas encore client?"
-	,"Sign up": "Inscription"
-
-	,"You've been too idle": "Il a eu le temps de trop paresseux et votre session a expiré"
-	,"Invalid login": "Utilisateur ou mot de passe incorrect, n'oubliez pas de distinction entre majuscules et minuscules"
-	,"Please write your user name": "S'il vous plaît entrer votre nom d'utilisateur"
-	,"A mail has been sent wich you can recover your password": "Nous avons envoyé un e-mail où vous pouvez récupérer votre mot de passe"
-
-	,"Menu": "Menu"
-	,"Exit": "Laisser"
-	,"Test the new website": "Testez le nouveau site!"
-	,"Old website": "Ancien site web"
-	,"Recent changes": "Modifications récentes"
-	
-	,"Print": "Imprimir"
-	,"Please unlock popups and try again":
-		"S'il vous plaît déverrouiller pop ups et essayez à nouveau"
-
-	,"Error loading form": "Forme erreur de chargement"
-	,"Error loading report": "Rapport erreur de chargement"
-	,"By using this site you accept cookies": "En utilisant ce site, vous acceptez l'utilisation de cookies pour personnaliser le contenu et l'analyse."
-	,"New version available": "Il ya une nouvelle mise à jour, la page sera automatiquement recargargará pour télécharger"
-	
-	,"AppName": "Verdnatura"
-	
-	,"Home": "Accueil"
-	,"Orders": "Commandes"
-		,"Basket": "Panier"
-		,"Last orders": "Dernières commandes"
-		,"Invoices": "Facturas"
-	,"Catalog": "Catalogue"
-	,"About": "Nous"
-		,"About us": "A propos de nous"
-		,"Why": "Pourquoi?"
-	,"Location": "Emplacement"
-	,"Administration": "Administration"
-		,"Control panel": "Panneau de contrôle"
-		,"Users": "Utilisateurs"
-	 	,"Connections": "Connexions"
-		,"Visits": "Visites"
-		,"News": "Nouvelles"
-		,"Photos": "Photos"
-		,"Items": "Articles"
-	,"Reports": "Rapport"
-		,"Shelves": "Etagères"
-		,"Items list": "Liste des articles"
-	,"Contact": "Je veux être client"
-	,"Training": "Formation"
-	,"Agencies": "Agences"
-	,"Configuration": "Configuration"
-		,"Account": "Compte"
-		,"Addresses": "Adresses"
-}
diff --git a/js/hedera/locale/fr.yml b/js/hedera/locale/fr.yml
new file mode 100644
index 00000000..5564407c
--- /dev/null
+++ b/js/hedera/locale/fr.yml
@@ -0,0 +1,60 @@
+User: Utilisateur
+Password: Mot de passe
+Beta: Beta
+Do not sign out: Garder ma session active
+Log in as guest: Entrez en tant qu'invité
+Enter: Entrer
+Login mail: ruben@verdnatura.es
+Login phone: +33 781 533 900
+Password forgotten? Push here: as tu oublié ton mot de passe?
+Yet you are not a customer?: Êtes-vous Pas encore client?
+Sign up: Inscription
+You've been too idle: Il a eu le temps de trop paresseux et votre session a expiré
+Invalid login: >-
+  Utilisateur ou mot de passe incorrect, n'oubliez pas de distinction entre
+  majuscules et minuscules
+Please write your user name: S'il vous plaît entrer votre nom d'utilisateur
+A mail has been sent wich you can recover your password: Nous avons envoyé un e-mail où vous pouvez récupérer votre mot de passe
+Menu: Menu
+Exit: Laisser
+Test the new website: Testez le nouveau site!
+Old website: Ancien site web
+Recent changes: Modifications récentes
+Print: Imprimir
+Please unlock popups and try again: S'il vous plaît déverrouiller pop ups et essayez à nouveau
+Error loading form: Forme erreur de chargement
+Error loading report: Rapport erreur de chargement
+By using this site you accept cookies: >-
+  En utilisant ce site, vous acceptez l'utilisation de cookies pour
+  personnaliser le contenu et l'analyse.
+New version available: >-
+  Il ya une nouvelle mise à jour, la page sera automatiquement recargargará pour
+  télécharger
+AppName: Verdnatura
+Home: Accueil
+Orders: Commandes
+Basket: Panier
+Last orders: Dernières commandes
+Invoices: Facturas
+Catalog: Catalogue
+About: Nous
+About us: A propos de nous
+Why: Pourquoi?
+Location: Emplacement
+Administration: Administration
+Control panel: Panneau de contrôle
+Users: Utilisateurs
+Connections: Connexions
+Visits: Visites
+News: Nouvelles
+Photos: Photos
+Items: Articles
+Reports: Rapport
+Shelves: Etagères
+Items list: Liste des articles
+Contact: Je veux être client
+Training: Formation
+Agencies: Agences
+Configuration: Configuration
+Account: Compte
+Addresses: Adresses
diff --git a/js/hedera/locale/mn.json b/js/hedera/locale/mn.json
deleted file mode 100644
index 53ada016..00000000
--- a/js/hedera/locale/mn.json
+++ /dev/null
@@ -1,63 +0,0 @@
-{
-	 "User": "Хэрэглэгчийн"
-	,"Password": "нууц үг"
-	,"Beta": "Бета"
-	,"Do not sign out": "Гаргаж гарын үсэг зураагүй байна"
-	,"Log in as guest": "Зочин байдлаар оруулна уу"
-	,"Enter": "энд бичнэ үү"
-	,"Login mail": "clientes@verdnatura.es"
-	,"Login phone": "+34 607 562 391"
-	,"Password forgotten? Push here": "Нууц үг мартсан? энд түлхэх"
-	,"Yet you are not a customer?": "Гэсэн хэдий ч та хэрэглэгчийн биш гэж үү?"
-	,"Sign up": "бүртгүүлэх"
-
-	,"You've been too idle": "Та нар ч бас зогссон байсан, чуулган хугацаа дууссан байна"
-	,"Invalid login": "Хэрэглэгчийн нэр эсвэл нууц үг буруу, Тэр хэргийг мэдрэмтгий гэдгийг санаарай"
-	,"Please write your user name": "Хэрэглэгчийн нэрээ бичнэ үү"
-	,"A mail has been sent wich you can recover your password": "Мэйл та нууц үгээ сэргээх боломжтой А байна илгээсэн"
-
-	,"Menu": "Цэс"
-	,"Exit": "гарах"
-	,"Test the new website": "Шинэ вэб шалгана!"
-	,"Old website": "Хуучин вэб сайт"
-	,"Recent changes": "Сүүлийн өөрчлөлтүүд"
-
-	,"Print": "Хэвлэх"
-	,"Please unlock popups and try again":
-		"Поп өгсөх түгжээ дахин оролдоно уу"
-
-	,"Error loading form": "Алдаа бол ачих хэлбэр"
-	,"Error loading report": "Алдаа ачих тайлан"
-	,"By using this site you accept cookies": "Энэ вэб сайтыг ашиглан та агуулга, дүн шинжилгээ хийх тохиргоонууд жигнэмэг хэрэглэхийг хүлээн зөвшөөрдөг."
-	,"New version available": "Шинэ шинэчлэх байна, хуудас автоматаар татаж авах цэнэглэж болно"
-	
-	,"AppName": "Verdnatura"
-
-	,"Home": "Нүүр хуудас"
-	,"Orders": "захиалга"
-		,"Basket": "сагс"
-		,"Last orders": "Өнгөрсөн захиалга"
-		,"Invoices": "Нэхэмжлэх"
-	,"Catalog": "Каталог"
-	,"About": "тухай"
-		,"About us": "бидний тухай"
-		,"Why": "яагаад"
-	,"Location": "Байрлал"
-	,"Administration": "захиргаа"
-		,"Control panel": "хяналтын самбар"
-		,"Users": "Хэрэглэгчид нь"
-	 	,"Connections": "холболт"
-		,"Visits": "уулзалт"
-		,"News": "мэдээ"
-		,"Photos": "Фото зураг"
-		,"Items": "зүйл"
-	,"Reports": "мэдээ"
-		,"Shelves": "тавиур"
-		,"Items list": "зүйлс жагсаалт"
-	,"Contact": "Холбоо барих"
-	,"Training": "сургалт"
-	,"Agencies": "байгууллагууд"
-	,"Configuration": "Тохиргоо"
-		,"Account": "Дансны"
-		,"Addresses": "хаягууд"
-}
diff --git a/js/hedera/locale/mn.yml b/js/hedera/locale/mn.yml
new file mode 100644
index 00000000..06ee6aac
--- /dev/null
+++ b/js/hedera/locale/mn.yml
@@ -0,0 +1,56 @@
+User: Хэрэглэгчийн
+Password: нууц үг
+Beta: Бета
+Do not sign out: Гаргаж гарын үсэг зураагүй байна
+Log in as guest: Зочин байдлаар оруулна уу
+Enter: энд бичнэ үү
+Login mail: clientes@verdnatura.es
+Login phone: +34 607 562 391
+Password forgotten? Push here: Нууц үг мартсан? энд түлхэх
+Yet you are not a customer?: Гэсэн хэдий ч та хэрэглэгчийн биш гэж үү?
+Sign up: бүртгүүлэх
+You've been too idle: 'Та нар ч бас зогссон байсан, чуулган хугацаа дууссан байна'
+Invalid login: 'Хэрэглэгчийн нэр эсвэл нууц үг буруу, Тэр хэргийг мэдрэмтгий гэдгийг санаарай'
+Please write your user name: Хэрэглэгчийн нэрээ бичнэ үү
+A mail has been sent wich you can recover your password: Мэйл та нууц үгээ сэргээх боломжтой А байна илгээсэн
+Menu: Цэс
+Exit: гарах
+Test the new website: Шинэ вэб шалгана!
+Old website: Хуучин вэб сайт
+Recent changes: Сүүлийн өөрчлөлтүүд
+Print: Хэвлэх
+Please unlock popups and try again: Поп өгсөх түгжээ дахин оролдоно уу
+Error loading form: Алдаа бол ачих хэлбэр
+Error loading report: Алдаа ачих тайлан
+By using this site you accept cookies: >-
+  Энэ вэб сайтыг ашиглан та агуулга, дүн шинжилгээ хийх тохиргоонууд жигнэмэг
+  хэрэглэхийг хүлээн зөвшөөрдөг.
+New version available: 'Шинэ шинэчлэх байна, хуудас автоматаар татаж авах цэнэглэж болно'
+AppName: Verdnatura
+Home: Нүүр хуудас
+Orders: захиалга
+Basket: сагс
+Last orders: Өнгөрсөн захиалга
+Invoices: Нэхэмжлэх
+Catalog: Каталог
+About: тухай
+About us: бидний тухай
+Why: яагаад
+Location: Байрлал
+Administration: захиргаа
+Control panel: хяналтын самбар
+Users: Хэрэглэгчид нь
+Connections: холболт
+Visits: уулзалт
+News: мэдээ
+Photos: Фото зураг
+Items: зүйл
+Reports: мэдээ
+Shelves: тавиур
+Items list: зүйлс жагсаалт
+Contact: Холбоо барих
+Training: сургалт
+Agencies: байгууллагууд
+Configuration: Тохиргоо
+Account: Дансны
+Addresses: хаягууд
diff --git a/js/hedera/locale/pt.json b/js/hedera/locale/pt.json
deleted file mode 100644
index 4de2b8b9..00000000
--- a/js/hedera/locale/pt.json
+++ /dev/null
@@ -1,63 +0,0 @@
-{
-	 "User": "Usuario"
-	,"Password": "Palavra-Passe"
-	,"Beta": "Beta"
-	,"Do not sign out": "Não finalizar Sessão"
-	,"Log in as guest": "Entrar como convidado"
-	,"Enter": "Entrar"
-	,"Login mail": "clientes@verdnatura.es"
-	,"Login phone": "+34 963 242 100"
-	,"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 para recuperar sua palavra-passe"
-
-	,"Menu": "Menú"
-	,"Exit": "Sair"
-	,"Test the new website": "Prove a nova pagina web"
-	,"Old website": "Web antiga"
-	,"Recent changes": "Modificações recentes"
-
-	,"Print": "Imprimir"
-	,"Please unlock popups and try again":
-		"Por favor, desbloqueie os pop-ups e volte a tentar"
-
-	,"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, 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": "Encomendas"
-		,"Basket": "Cesta"
-		,"Last orders": "Últimas encomendas"
-		,"Invoices": "Facturas"
-	,"Catalog": "Catálogo"
-	,"About": "Conheça-nos"
-		,"About us": "Sobre nós"
-		,"Why": "Por quê?"
-	,"Location": "Localização"
-	,"Administration": "Administração"
-		,"Control panel": "Painel de controle"
-		,"Users": "Usuarios"
-		,"Connections": "Conexões"
-		,"Visits": "Visitas"
-		,"News": "Noticias"
-		,"Photos": "Fotos"
-		,"Items": "Artigos"
-	,"Reports": "Relatórios"
-		,"Shelves": "Estantes"
-		,"Items list": "Lista de Itens"
-	,"Contact": "Quero ser cliente"
-	,"Training": "Formação"
-	,"Agencies": "Agências"
-	,"Configuration": "Configuração"
-		,"Account": "Conta"
-		,"Addresses": "Moradas"
-}
diff --git a/js/hedera/locale/pt.yml b/js/hedera/locale/pt.yml
new file mode 100644
index 00000000..7519aec4
--- /dev/null
+++ b/js/hedera/locale/pt.yml
@@ -0,0 +1,58 @@
+User: Usuario
+Password: Palavra-Passe
+Beta: Beta
+Do not sign out: Não finalizar Sessão
+Log in as guest: Entrar como convidado
+Enter: Entrar
+Login mail: clientes@verdnatura.es
+Login phone: +34 963 242 100
+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 para recuperar sua palavra-passe
+Menu: Menú
+Exit: Sair
+Test the new website: Prove a nova pagina web
+Old website: Web antiga
+Recent changes: Modificações recentes
+Print: Imprimir
+Please unlock popups and try again: 'Por favor, desbloqueie os pop-ups e volte a tentar'
+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, 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: Encomendas
+Basket: Cesta
+Last orders: Últimas encomendas
+Invoices: Facturas
+Catalog: Catálogo
+About: Conheça-nos
+About us: Sobre nós
+Why: Por quê?
+Location: Localização
+Administration: Administração
+Control panel: Painel de controle
+Users: Usuarios
+Connections: Conexões
+Visits: Visitas
+News: Noticias
+Photos: Fotos
+Items: Artigos
+Reports: Relatórios
+Shelves: Estantes
+Items list: Lista de Itens
+Contact: Quero ser cliente
+Training: Formação
+Agencies: Agências
+Configuration: Configuração
+Account: Conta
+Addresses: Moradas
diff --git a/js/htk/locale/ca.json b/js/htk/locale/ca.json
deleted file mode 100644
index 48d74aee..00000000
--- a/js/htk/locale/ca.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-	 "True": "Sí"
-	,"False": "No"
-	,"Null": "Nul"
-	,"ChangeDate": "Cambiar Data"
-	,"Sort": "Ordenar"
-	,"At": "a les"
-	,"Of": "de"
-	,"OfThe": "del"
-	,"Remove": "Esborrar"
-	,"Loading": "Carregant"
-	,"Loading...": "Carregant..."
-	,"ReallyDelete": "Estàs segur que vols esborrar la línia?"
-	,"YouMustBeLoggedIn": "Has d'estar registrat com a usuari"
-	,"EmptyList": "Llistat buit"
-	,"NoData": "Sense dades"
-	,"ErrorLoadingData": "Error"
-	,"Error": "Error"
-	,"Image": "Imatge"
-	,"File": "Arxiu"
-	,"FileName": "Nom"
-	,"UpdateImage": "Afegir o actualitzar Imatge"
-	,"UploadFile": "Putjar arxiu"
-	,"ImageAdded": "Imatge afegida correctament"
-	,"Close": "Tancar"
-	,"Previous": "Anterior"
-	,"Next": "Següent"
-	,"Search": "Cercar"
-	,"Search...": "Cercar..."
-}
diff --git a/js/htk/locale/ca.yml b/js/htk/locale/ca.yml
new file mode 100644
index 00000000..651d6135
--- /dev/null
+++ b/js/htk/locale/ca.yml
@@ -0,0 +1,28 @@
+'True': Sí
+'False': 'No'
+'Null': Nul
+ChangeDate: Cambiar Data
+Sort: Ordenar
+At: a les
+Of: de
+OfThe: del
+Remove: Esborrar
+Loading: Carregant
+Loading...: Carregant...
+ReallyDelete: Estàs segur que vols esborrar la línia?
+YouMustBeLoggedIn: Has d'estar registrat com a usuari
+EmptyList: Llistat buit
+NoData: Sense dades
+ErrorLoadingData: Error
+Error: Error
+Image: Imatge
+File: Arxiu
+FileName: Nom
+UpdateImage: Afegir o actualitzar Imatge
+UploadFile: Putjar arxiu
+ImageAdded: Imatge afegida correctament
+Close: Tancar
+Previous: Anterior
+Next: Següent
+Search: Cercar
+Search...: Cercar...
diff --git a/js/htk/locale/en.json b/js/htk/locale/en.json
deleted file mode 100644
index 7f34c222..00000000
--- a/js/htk/locale/en.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-	 "True": "True"
-	,"False": "False"
-	,"Null": "Null"
-	,"ChangeDate": "Change date"
-	,"Sort": "Sort"
-	,"At": "at"
-	,"Of": "of"
-	,"OfThe": "of the"
-	,"Remove": "Remove"
-	,"Loading": "Loading"
-	,"Loading...": "Loading..."
-	,"ReallyDelete": "Are you sure you want to delete the line?"
-	,"YouMustBeLoggedIn": "You must be a registered user"
-	,"EmptyList": "Empty list"
-	,"NoData": "No data"
-	,"ErrorLoadingData": "Error"
-	,"Error": "Error"
-	,"Image": "Image"
-	,"File": "File"
-	,"FileName": "File name"
-	,"UpdateImage": "Add or update an image"
-	,"UploadFile": "Upload file"
-	,"ImageAdded": "Image added successfully"
-	,"Close": "Close"
-	,"Previous": "Previous"
-	,"Next": "Next"
-	,"Search": "Search"
-	,"Search...": "Search..."
-}
diff --git a/js/htk/locale/en.yml b/js/htk/locale/en.yml
new file mode 100644
index 00000000..8a081b29
--- /dev/null
+++ b/js/htk/locale/en.yml
@@ -0,0 +1,28 @@
+'True': 'True'
+'False': 'False'
+'Null': 'Null'
+ChangeDate: Change date
+Sort: Sort
+At: at
+Of: of
+OfThe: of the
+Remove: Remove
+Loading: Loading
+Loading...: Loading...
+ReallyDelete: Are you sure you want to delete the line?
+YouMustBeLoggedIn: You must be a registered user
+EmptyList: Empty list
+NoData: No data
+ErrorLoadingData: Error
+Error: Error
+Image: Image
+File: File
+FileName: File name
+UpdateImage: Add or update an image
+UploadFile: Upload file
+ImageAdded: Image added successfully
+Close: Close
+Previous: Previous
+Next: Next
+Search: Search
+Search...: Search...
diff --git a/js/htk/locale/es.json b/js/htk/locale/es.json
deleted file mode 100644
index c2f600a6..00000000
--- a/js/htk/locale/es.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-	 "True": "Si"
-	,"False": "No"
-	,"Null": "Nulo"
-	,"ChangeDate": "Cambiar Fecha"
-	,"Sort": "Ordenar"
-	,"At": "a las"
-	,"Of": "de"
-	,"OfThe": "del"
-	,"Remove": "Borrar"
-	,"Loading": "Cargando"
-	,"Loading...": "Cargando..."
-	,"ReallyDelete": "¿Estás seguro de que quieres borrar la línea?"
-	,"YouMustBeLoggedIn": "Debes estar registrado como usuario"
-	,"EmptyList": "Lista vacía"
-	,"NoData": "Sin datos"
-	,"ErrorLoadingData": "Error"
-	,"Error": "Error"
-	,"Image": "Imagen"
-	,"File": "Archivo"
-	,"FileName": "Nombre"
-	,"UpdateImage": "Añadir o actualizar imagen"
-	,"UploadFile": "Subir archivo"
-	,"ImageAdded": "Imagen añadida correctamente"
-	,"Close": "Cerrar"
-	,"Previous": "Anterior"
-	,"Next": "Siguiente"
-	,"Search": "Buscar"
-	,"Search...": "Buscar..."
-}
diff --git a/js/htk/locale/es.yml b/js/htk/locale/es.yml
new file mode 100644
index 00000000..42cad4b4
--- /dev/null
+++ b/js/htk/locale/es.yml
@@ -0,0 +1,28 @@
+'True': Si
+'False': 'No'
+'Null': Nulo
+ChangeDate: Cambiar Fecha
+Sort: Ordenar
+At: a las
+Of: de
+OfThe: del
+Remove: Borrar
+Loading: Cargando
+Loading...: Cargando...
+ReallyDelete: ¿Estás seguro de que quieres borrar la línea?
+YouMustBeLoggedIn: Debes estar registrado como usuario
+EmptyList: Lista vacía
+NoData: Sin datos
+ErrorLoadingData: Error
+Error: Error
+Image: Imagen
+File: Archivo
+FileName: Nombre
+UpdateImage: Añadir o actualizar imagen
+UploadFile: Subir archivo
+ImageAdded: Imagen añadida correctamente
+Close: Cerrar
+Previous: Anterior
+Next: Siguiente
+Search: Buscar
+Search...: Buscar...
diff --git a/js/htk/locale/fr.json b/js/htk/locale/fr.json
deleted file mode 100644
index 56e03bce..00000000
--- a/js/htk/locale/fr.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-	 "True": "Si"
-	,"False": "Aucun"
-	,"Null": "Nul"
-	,"ChangeDate": "Modification de la date"
-	,"Sort": "Ordre"
-	,"At": "à"
-	,"Of": "de"
-	,"OfThe": "de"
-	,"Remove": "Effacer"
-	,"Loading": "Chargement"
-	,"Loading...": "Chargement..."
-	,"ReallyDelete": "Voulez-vous vraiment supprimer la ligne?"
-	,"YouMustBeLoggedIn": "Vous devez être un utilisateur enregistré"
-	,"EmptyList": "Vider la liste"
-	,"NoData": "Aucune donnée"
-	,"ErrorLoadingData": "Erreur"
-	,"Error": "Erreur"
-	,"Image": "Image"
-	,"File": "Archives"
-	,"FileName": "Nom"
-	,"UpdateImage": "Ajouter our mettre à jour l'image"
-	,"UploadFile": "Télécharger le fichier"
-	,"ImageAdded": "Image ajoutée correctement"
-	,"Close": "Croche"
-	,"Previous": "Précédent"
-	,"Next": "Suivant"
-	,"Search": "Recherche"
-	,"Search...": "Recherche..."
-}
diff --git a/js/htk/locale/fr.yml b/js/htk/locale/fr.yml
new file mode 100644
index 00000000..55e5b90d
--- /dev/null
+++ b/js/htk/locale/fr.yml
@@ -0,0 +1,28 @@
+'True': Si
+'False': Aucun
+'Null': Nul
+ChangeDate: Modification de la date
+Sort: Ordre
+At: à
+Of: de
+OfThe: de
+Remove: Effacer
+Loading: Chargement
+Loading...: Chargement...
+ReallyDelete: Voulez-vous vraiment supprimer la ligne?
+YouMustBeLoggedIn: Vous devez être un utilisateur enregistré
+EmptyList: Vider la liste
+NoData: Aucune donnée
+ErrorLoadingData: Erreur
+Error: Erreur
+Image: Image
+File: Archives
+FileName: Nom
+UpdateImage: Ajouter our mettre à jour l'image
+UploadFile: Télécharger le fichier
+ImageAdded: Image ajoutée correctement
+Close: Croche
+Previous: Précédent
+Next: Suivant
+Search: Recherche
+Search...: Recherche...
diff --git a/js/htk/locale/mn.json b/js/htk/locale/mn.json
deleted file mode 100644
index b9b6f6c3..00000000
--- a/js/htk/locale/mn.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-	 "True": "True"
-	,"False": "False"
-	,"Null": "Null"
-	,"ChangeDate": "Change date"
-	,"Sort": "Sort"
-	,"At": "at"
-	,"Of": "of"
-	,"OfThe": "of the"
-	,"Remove": "Remove"
-	,"Loading": "Loading"
-	,"Loading...": "Loading..."
-	,"ReallyDelete": "Are you sure you want to delete the line?"
-	,"YouMustBeLoggedIn": "You must be a registered user"
-	,"EmptyList": "Empty list"
-	,"NoData": "No data"
-	,"ErrorLoadingData": "Error"
-	,"Error": "Error"
-	,"Image": "Image"
-	,"File": "File"
-	,"FileName": "File name"
-	,"UpdateImage": "Add or update an image"
-	,"UploadFile": "Upload file"
-	,"ImageAdded": "Image added successfully"
-	,"Close": "Close"
-	,"Previous": "Previous"
-	,"Next": "Next"
-	,"Search": "хайх"
-	,"Search...": "хайх..."
-}
diff --git a/js/htk/locale/mn.yml b/js/htk/locale/mn.yml
new file mode 100644
index 00000000..7c92ea41
--- /dev/null
+++ b/js/htk/locale/mn.yml
@@ -0,0 +1,28 @@
+'True': 'True'
+'False': 'False'
+'Null': 'Null'
+ChangeDate: Change date
+Sort: Sort
+At: at
+Of: of
+OfThe: of the
+Remove: Remove
+Loading: Loading
+Loading...: Loading...
+ReallyDelete: Are you sure you want to delete the line?
+YouMustBeLoggedIn: You must be a registered user
+EmptyList: Empty list
+NoData: No data
+ErrorLoadingData: Error
+Error: Error
+Image: Image
+File: File
+FileName: File name
+UpdateImage: Add or update an image
+UploadFile: Upload file
+ImageAdded: Image added successfully
+Close: Close
+Previous: Previous
+Next: Next
+Search: хайх
+Search...: хайх...
diff --git a/js/htk/locale/pt.json b/js/htk/locale/pt.json
deleted file mode 100644
index 9aac96e1..00000000
--- a/js/htk/locale/pt.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-	 "True": "Sim"
-	,"False": "Não"
-	,"Null": "Nulo"
-	,"ChangeDate": "Modificar Data"
-	,"Sort": "Organizar"
-	,"At": "às"
-	,"Of": "de"
-	,"OfThe": "de"
-	,"Remove": "Eliminar"
-	,"Loading": "Carregando"
-	,"Loading...": "Carregando..."
-	,"ReallyDelete": "Tens certeza que queres eliminar esta linha?"
-	,"YouMustBeLoggedIn": "Deves estar registrado como usuario"
-	,"EmptyList": "Lista vazia"
-	,"NoData": "Sem dados"
-	,"ErrorLoadingData": "Erro"
-	,"Error": "Erro"
-	,"Image": "Imagem"
-	,"File": "Arquivo"
-	,"FileName": "Nome"
-	,"UpdateImage": "Adicionar ou atualizar imagem"
-	,"UploadFile": "Subir arquivo"
-	,"ImageAdded": "Imagen adicionada corretamente"
-	,"Close": "Fechar"
-	,"Previous": "Anterior"
-	,"Next": "Seguinte"
-	,"Search": "Procurar"
-	,"Search...": "Procurar..."
-}
diff --git a/js/htk/locale/pt.yml b/js/htk/locale/pt.yml
new file mode 100644
index 00000000..305ecf0c
--- /dev/null
+++ b/js/htk/locale/pt.yml
@@ -0,0 +1,28 @@
+'True': Sim
+'False': Não
+'Null': Nulo
+ChangeDate: Modificar Data
+Sort: Organizar
+At: às
+Of: de
+OfThe: de
+Remove: Eliminar
+Loading: Carregando
+Loading...: Carregando...
+ReallyDelete: Tens certeza que queres eliminar esta linha?
+YouMustBeLoggedIn: Deves estar registrado como usuario
+EmptyList: Lista vazia
+NoData: Sem dados
+ErrorLoadingData: Erro
+Error: Erro
+Image: Imagem
+File: Arquivo
+FileName: Nome
+UpdateImage: Adicionar ou atualizar imagem
+UploadFile: Subir arquivo
+ImageAdded: Imagen adicionada corretamente
+Close: Fechar
+Previous: Anterior
+Next: Seguinte
+Search: Procurar
+Search...: Procurar...
diff --git a/js/vn/locale.js b/js/vn/locale.js
index e4aa23cd..1a786050 100644
--- a/js/vn/locale.js
+++ b/js/vn/locale.js
@@ -1,4 +1,4 @@
-
+var yaml = require('js-yaml');
 vnLocaleStrings = {};
 
 /**
@@ -44,7 +44,7 @@ module.exports =
 
 	,createRequest: function (data, isDef, lang)
 	{
-		var langFile = this.getLocalePath (data.path, lang);
+		var langFile = data.path +'/locale/'+ lang +'.yml'+ Vn.getVersion ();
 
 		var request = new XMLHttpRequest ();
 		request.open ('get', langFile, true);
@@ -82,7 +82,7 @@ module.exports =
 			return false;
 	
 		try {
-			this.add (JSON.parse (request.responseText));
+			this.add (yaml.safeLoad (request.responseText));
 			return true;
 		}
 		catch (e) {
@@ -91,11 +91,6 @@ module.exports =
 
 		return false
 	}
-
-	,getLocalePath: function (path, lang)
-	{
-		return path +'/locale/'+ lang +'.json'+ Vn.getVersion ();
-	}
 	
 	,loadScript: function (path, callback)
 	{
diff --git a/js/vn/locale/ca.json b/js/vn/locale/ca.json
deleted file mode 100644
index 77a72036..00000000
--- a/js/vn/locale/ca.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-	 "Sunday": "Diumenge"
-	,"Monday": "Dilluns"
-	,"Tuesday": "Dimarts"
-	,"Wednesday": "Dimecres"
-	,"Thursday": "Dijous"
-	,"Friday": "Divendres"
-	,"Saturday": "Dissabte"
-
-	,"Su": "Dg"
-	,"Mo": "Dl"
-	,"Tu": "Dt"
-	,"We": "Dc"
-	,"Th": "Dj"
-	,"Fr": "Dv"
-	,"Sa": "Ds"
-
-	,"January": "Gener"
-	,"February": "Febrer"
-	,"March": "Març"
-	,"April": "Abril"
-	,"May": "Maig"
-	,"June": "Juny"
-	,"July": "Juliol"
-	,"August": "Agost"
-	,"September": "Setembre"
-	,"October": "Octubre"
-	,"November": "Novembre"
-	,"December": "Decembre"
-
-	,"Jan": "Gen"
-	,"Feb": "Febr"
-	,"Mar": "Març"
-	,"Apr": "Abr"
-	,"May": "Maig"
-	,"Jun": "Juny"
-	,"Jul": "Jul"
-	,"Ago": "Ag"
-	,"Sep": "Set"
-	,"Oct": "Oct"
-	,"Nov": "Nov"
-	,"Dec": "Des"
-	
-	,"%A, %B %e": "%A, %e de %B"
-
-	,"Something went wrong":
-		"Alguna cosa ha anat malament"
-	,"The server does not respond, please check your Internet connection":
-		"El servidor no respon, si us plau comprova la teva connexió a Internet"
-}
diff --git a/js/vn/locale/ca.yml b/js/vn/locale/ca.yml
new file mode 100644
index 00000000..4f7830c6
--- /dev/null
+++ b/js/vn/locale/ca.yml
@@ -0,0 +1,40 @@
+Sunday: Diumenge
+Monday: Dilluns
+Tuesday: Dimarts
+Wednesday: Dimecres
+Thursday: Dijous
+Friday: Divendres
+Saturday: Dissabte
+Su: Dg
+Mo: Dl
+Tu: Dt
+We: Dc
+Th: Dj
+Fr: Dv
+Sa: Ds
+January: Gener
+February: Febrer
+March: Març
+April: Abril
+May: Maig
+June: Juny
+July: Juliol
+August: Agost
+September: Setembre
+October: Octubre
+November: Novembre
+December: Decembre
+Jan: Gen
+Feb: Febr
+Mar: Març
+Apr: Abr
+Jun: Juny
+Jul: Jul
+Ago: Ag
+Sep: Set
+Oct: Oct
+Nov: Nov
+Dec: Des
+'%A, %B %e': '%A, %e de %B'
+Something went wrong: Alguna cosa ha anat malament
+'The server does not respond, please check your Internet connection': 'El servidor no respon, si us plau comprova la teva connexió a Internet'
diff --git a/js/vn/locale/en.json b/js/vn/locale/en.json
deleted file mode 100644
index f2ee6372..00000000
--- a/js/vn/locale/en.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-	 "Sunday": "Sunday"
-	,"Monday": "Monday"
-	,"Tuesday": "Tuesday"
-	,"Wednesday": "Wednesday"
-	,"Thursday": "Thursday"
-	,"Friday": "Friday"
-	,"Saturday": "Saturday"
-
-	,"Su": "Su"
-	,"Mo": "Mo"
-	,"Tu": "Tu"
-	,"We": "We"
-	,"Th": "Th"
-	,"Fr": "Fr"
-	,"Sa": "Sa"
-
-	,"January": "January"
-	,"February": "February"
-	,"March": "March"
-	,"April": "April"
-	,"May": "May"
-	,"June": "June"
-	,"July": "June"
-	,"August": "August"
-	,"September": "September"
-	,"October": "October"
-	,"November": "November"
-	,"December": "December"
-
-	,"Jan": "Jan"
-	,"Feb": "Feb"
-	,"Mar": "Mar"
-	,"Apr": "Apr"
-	,"May": "May"
-	,"Jun": "Jun"
-	,"Jul": "Jul"
-	,"Ago": "Ago"
-	,"Sep": "Sep"
-	,"Oct": "Oct"
-	,"Nov": "Nov"
-	,"Dec": "Dic"
-	
-	,"%A, %B %e": "%A, %B %e"
-
-	,"Something went wrong":
-		"Something went wrong"
-	,"The server does not respond, please check your Internet connection":
-		"The server does not respond, please check you Internet connection"
-}
diff --git a/js/vn/locale/en.yml b/js/vn/locale/en.yml
new file mode 100644
index 00000000..136a2be7
--- /dev/null
+++ b/js/vn/locale/en.yml
@@ -0,0 +1,40 @@
+Sunday: Sunday
+Monday: Monday
+Tuesday: Tuesday
+Wednesday: Wednesday
+Thursday: Thursday
+Friday: Friday
+Saturday: Saturday
+Su: Su
+Mo: Mo
+Tu: Tu
+We: We
+Th: Th
+Fr: Fr
+Sa: Sa
+January: January
+February: February
+March: March
+April: April
+May: May
+June: June
+July: June
+August: August
+September: September
+October: October
+November: November
+December: December
+Jan: Jan
+Feb: Feb
+Mar: Mar
+Apr: Apr
+Jun: Jun
+Jul: Jul
+Ago: Ago
+Sep: Sep
+Oct: Oct
+Nov: Nov
+Dec: Dic
+'%A, %B %e': '%A, %B %e'
+Something went wrong: Something went wrong
+'The server does not respond, please check your Internet connection': 'The server does not respond, please check you Internet connection'
diff --git a/js/vn/locale/es.json b/js/vn/locale/es.json
deleted file mode 100644
index 400dee13..00000000
--- a/js/vn/locale/es.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-	 "Sunday": "Domingo"
-	,"Monday": "Lunes"
-	,"Tuesday": "Martes"
-	,"Wednesday": "Miércoles"
-	,"Thursday": "Jueves"
-	,"Friday": "Viernes"
-	,"Saturday": "Sábado"
-
-	,"Su": "Do"
-	,"Mo": "Lu"
-	,"Tu": "Ma"
-	,"We": "Mi"
-	,"Th": "Ju"
-	,"Fr": "Vi"
-	,"Sa": "Sa"
-
-	,"January": "Enero"
-	,"February": "Febrero"
-	,"March": "Marzo"
-	,"April": "Abril"
-	,"May": "Mayo"
-	,"June": "Junio"
-	,"July": "Julio"
-	,"August": "Agosto"
-	,"September": "Septiembre"
-	,"October": "Octubre"
-	,"November": "Noviembre"
-	,"December": "Diciembre"
-
-	,"Jan": "Ene"
-	,"Feb": "Feb"
-	,"Mar": "Mar"
-	,"Apr": "Abr"
-	,"May": "May"
-	,"Jun": "Jun"
-	,"Jul": "Jul"
-	,"Ago": "Ago"
-	,"Sep": "Sep"
-	,"Oct": "Oct"
-	,"Nov": "Nov"
-	,"Dec": "Dic"
-	
-	,"%A, %B %e": "%A, %e de %B"
-	
-	,"Something went wrong":
-		"Algo salió mal"
-	,"The server does not respond, please check your Internet connection":
-		"El servidor no responde, por favor comprueba tu conexión a Internet"
-}
diff --git a/js/vn/locale/es.yml b/js/vn/locale/es.yml
new file mode 100644
index 00000000..4c36ae6d
--- /dev/null
+++ b/js/vn/locale/es.yml
@@ -0,0 +1,40 @@
+Sunday: Domingo
+Monday: Lunes
+Tuesday: Martes
+Wednesday: Miércoles
+Thursday: Jueves
+Friday: Viernes
+Saturday: Sábado
+Su: Do
+Mo: Lu
+Tu: Ma
+We: Mi
+Th: Ju
+Fr: Vi
+Sa: Sa
+January: Enero
+February: Febrero
+March: Marzo
+April: Abril
+May: May
+June: Junio
+July: Julio
+August: Agosto
+September: Septiembre
+October: Octubre
+November: Noviembre
+December: Diciembre
+Jan: Ene
+Feb: Feb
+Mar: Mar
+Apr: Abr
+Jun: Jun
+Jul: Jul
+Ago: Ago
+Sep: Sep
+Oct: Oct
+Nov: Nov
+Dec: Dic
+'%A, %B %e': '%A, %e de %B'
+Something went wrong: Algo salió mal
+'The server does not respond, please check your Internet connection': 'El servidor no responde, por favor comprueba tu conexión a Internet'
diff --git a/js/vn/locale/fr.json b/js/vn/locale/fr.json
deleted file mode 100644
index 07c3e725..00000000
--- a/js/vn/locale/fr.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-	 "Sunday": "Dimanche"
-	,"Monday": "Lundi"
-	,"Tuesday": "Mardi"
-	,"Wednesday": "Mercredi"
-	,"Thursday": "Jeudi"
-	,"Friday": "Vendredi"
-	,"Saturday": "Samedi"
-
-	,"Su": "Do"
-	,"Mo": "Lu"
-	,"Tu": "Ma"
-	,"We": "Me"
-	,"Th": "Je"
-	,"Fr": "Ve"
-	,"Sa": "Sa"
-
-	,"January": "Janvier"
-	,"February": "Février"
-	,"March": "Mars"
-	,"April": "Avril"
-	,"May": "Mai"
-	,"June": "Juin"
-	,"July": "Juillet"
-	,"August": "Août"
-	,"September": "Septembre"
-	,"October": "Octobre"
-	,"November": "Novembre"
-	,"December": "Décembre"
-
-	,"Jan": "Jan"
-	,"Feb": "Fév"
-	,"Mar": "Mars"
-	,"Apr": "Avr"
-	,"May": "Mai"
-	,"Jun": "Juin"
-	,"Jul": "Juil"
-	,"Ago": "Août"
-	,"Sep": "Sep"
-	,"Oct": "Oct"
-	,"Nov": "Nov"
-	,"Dec": "Déc"
-	
-	,"%A, %B %e": "%A, %B %e"
-
-	,"Something went wrong":
-		"Quelque-chose s'est mal passé"
-	,"The server does not respond, please check your Internet connection":
-		"Le serveur ne répond pas, s'il vous plaît vérifier votre connexion Internet"
-}
diff --git a/js/vn/locale/fr.yml b/js/vn/locale/fr.yml
new file mode 100644
index 00000000..ac496f83
--- /dev/null
+++ b/js/vn/locale/fr.yml
@@ -0,0 +1,40 @@
+Sunday: Dimanche
+Monday: Lundi
+Tuesday: Mardi
+Wednesday: Mercredi
+Thursday: Jeudi
+Friday: Vendredi
+Saturday: Samedi
+Su: Do
+Mo: Lu
+Tu: Ma
+We: Me
+Th: Je
+Fr: Ve
+Sa: Sa
+January: Janvier
+February: Février
+March: Mars
+April: Avril
+May: Mai
+June: Juin
+July: Juillet
+August: Août
+September: Septembre
+October: Octobre
+November: Novembre
+December: Décembre
+Jan: Jan
+Feb: Fév
+Mar: Mars
+Apr: Avr
+Jun: Juin
+Jul: Juil
+Ago: Août
+Sep: Sep
+Oct: Oct
+Nov: Nov
+Dec: Déc
+'%A, %B %e': '%A, %B %e'
+Something went wrong: Quelque-chose s'est mal passé
+'The server does not respond, please check your Internet connection': 'Le serveur ne répond pas, s''il vous plaît vérifier votre connexion Internet'
diff --git a/js/vn/locale/mn.json b/js/vn/locale/mn.json
deleted file mode 100644
index de1f336b..00000000
--- a/js/vn/locale/mn.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-	 "Sunday": "Ням гараг"
-	,"Monday": "Даваа гариг"
-	,"Tuesday": "Мягмар"
-	,"Wednesday": "Лхагва"
-	,"Thursday": "Пүрэв"
-	,"Friday": "Баасан гариг"
-	,"Saturday": "Бямба"
-
-	,"Su": "Ня"
-	,"Mo": "Да"
-	,"Tu": "Мя"
-	,"We": "Лх"
-	,"Th": "Пү"
-	,"Fr": "Ба"
-	,"Sa": "Бя"
-
-	,"January": "оны нэгдүгээр сарын"
-	,"February": "хоёрдугаар сар"
-	,"March": "Гуравдугаар сарын"
-	,"April": "Дөрөвдүгээр сар"
-	,"May": "May"
-	,"June": "June"
-	,"July": "June"
-	,"August": "Наймдугаар сар"
-	,"September": "Есдүгээр"
-	,"October": "Аравдугаар сар"
-	,"November": "Арваннэгдүгээр"
-	,"December": "Арванхоёрдугаар сар"
-
-	,"Jan": "оны"
-	,"Feb": "хоё"
-	,"Mar": "Гур"
-	,"Apr": "Дөр"
-	,"May": "May"
-	,"Jun": "Jun"
-	,"Jul": "Jul"
-	,"Ago": "Най"
-	,"Sep": "Есд"
-	,"Oct": "Ара"
-	,"Nov": "Арв"
-	,"Dec": "Арв"
-	
-	,"%A, %B %e": "%A, %B %e"
-
-	,"Something went wrong":
-		"Something went wrong"
-	,"The server does not respond, please check your Internet connection":
-		"The server does not respond, please check you Internet connection"
-}
diff --git a/js/vn/locale/mn.yml b/js/vn/locale/mn.yml
new file mode 100644
index 00000000..f1023a84
--- /dev/null
+++ b/js/vn/locale/mn.yml
@@ -0,0 +1,40 @@
+Sunday: Ням гараг
+Monday: Даваа гариг
+Tuesday: Мягмар
+Wednesday: Лхагва
+Thursday: Пүрэв
+Friday: Баасан гариг
+Saturday: Бямба
+Su: Ня
+Mo: Да
+Tu: Мя
+We: Лх
+Th: Пү
+Fr: Ба
+Sa: Бя
+January: оны нэгдүгээр сарын
+February: хоёрдугаар сар
+March: Гуравдугаар сарын
+April: Дөрөвдүгээр сар
+May: May
+June: June
+July: June
+August: Наймдугаар сар
+September: Есдүгээр
+October: Аравдугаар сар
+November: Арваннэгдүгээр
+December: Арванхоёрдугаар сар
+Jan: оны
+Feb: хоё
+Mar: Гур
+Apr: Дөр
+Jun: Jun
+Jul: Jul
+Ago: Най
+Sep: Есд
+Oct: Ара
+Nov: Арв
+Dec: Арв
+'%A, %B %e': '%A, %B %e'
+Something went wrong: Something went wrong
+'The server does not respond, please check your Internet connection': 'The server does not respond, please check you Internet connection'
diff --git a/js/vn/locale/pt.json b/js/vn/locale/pt.json
deleted file mode 100644
index 538ed138..00000000
--- a/js/vn/locale/pt.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-	 "Sunday": "Domingo"
-	,"Monday": "Segunda-Feira"
-	,"Tuesday": "Terça-Feira"
-	,"Wednesday": "Quarta-Feira"
-	,"Thursday": "Quinta-Feira"
-	,"Friday": "Sexta-Feira"
-	,"Saturday": "Sábado"
-
-	,"Su": "Do"
-	,"Mo": "Seg"
-	,"Tu": "Ter"
-	,"We": "Qua"
-	,"Th": "Qui"
-	,"Fr": "Sex"
-	,"Sa": "Sab"
-
-	,"January": "Janeiro"
-	,"February": "Fevereiro"
-	,"March": "Março"
-	,"April": "Abril"
-	,"May": "Maio"
-	,"June": "Junho"
-	,"July": "Julho"
-	,"August": "Agosto"
-	,"September": "Septembro"
-	,"October": "Outubro"
-	,"November": "Novembro"
-	,"December": "Dezembro"
-
-	,"Jan": "Jan"
-	,"Feb": "Fev"
-	,"Mar": "Mar"
-	,"Apr": "Abr"
-	,"May": "Mai"
-	,"Jun": "Jun"
-	,"Jul": "Jul"
-	,"Ago": "Ago"
-	,"Sep": "Set"
-	,"Oct": "Out"
-	,"Nov": "Nov"
-	,"Dec": "Dez"
-	
-	,"%A, %B %e": "%A, %B %e"
-
-	,"Something went wrong":
-		"Algo deu errado"
-	,"The server does not respond, please check your Internet connection":
-		"O servidor não responde, por favor, verifique sua conexão com a Internet"
-}
diff --git a/js/vn/locale/pt.yml b/js/vn/locale/pt.yml
new file mode 100644
index 00000000..5a0da485
--- /dev/null
+++ b/js/vn/locale/pt.yml
@@ -0,0 +1,40 @@
+Sunday: Domingo
+Monday: Segunda-Feira
+Tuesday: Terça-Feira
+Wednesday: Quarta-Feira
+Thursday: Quinta-Feira
+Friday: Sexta-Feira
+Saturday: Sábado
+Su: Do
+Mo: Seg
+Tu: Ter
+We: Qua
+Th: Qui
+Fr: Sex
+Sa: Sab
+January: Janeiro
+February: Fevereiro
+March: Março
+April: Abril
+May: Mai
+June: Junho
+July: Julho
+August: Agosto
+September: Septembro
+October: Outubro
+November: Novembro
+December: Dezembro
+Jan: Jan
+Feb: Fev
+Mar: Mar
+Apr: Abr
+Jun: Jun
+Jul: Jul
+Ago: Ago
+Sep: Set
+Oct: Out
+Nov: Nov
+Dec: Dez
+'%A, %B %e': '%A, %B %e'
+Something went wrong: Algo deu errado
+'The server does not respond, please check your Internet connection': 'O servidor não responde, por favor, verifique sua conexão com a Internet'
diff --git a/package.json b/package.json
index c3791be6..298cc4e4 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "hedera-web",
-  "version": "1.405.76",
+  "version": "1.405.77",
   "description": "Verdnatura web page",
   "license": "GPL-3.0",
   "repository": {
@@ -22,10 +22,13 @@
     "url-loader": "^0.5.7",
     "webpack": "^3.10.0",
     "webpack-dev-server": "^2.9.1",
-    "webpack-merge": "^4.1.0"
+    "webpack-merge": "^4.1.0",
+    "yaml-loader": "^0.5.0"
   },
   "dependencies": {
+    "js-yaml": "^3.10.0",
     "mootools": "^1.5.2",
+    "require-yaml": "0.0.1",
     "tinymce": "^4.4.3"
   },
   "scripts": {
diff --git a/pages/update-browser/locale/ca.json b/pages/update-browser/locale/ca.json
deleted file mode 100644
index 888067e7..00000000
--- a/pages/update-browser/locale/ca.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-	 "UpdateYourBrowser": "Actualitza el teu navegador"
-	,"ContinueAnyway": "Continuar igualment"
-}
diff --git a/pages/update-browser/locale/ca.yml b/pages/update-browser/locale/ca.yml
new file mode 100644
index 00000000..6dc920c4
--- /dev/null
+++ b/pages/update-browser/locale/ca.yml
@@ -0,0 +1,2 @@
+UpdateYourBrowser: Actualitza el teu navegador
+ContinueAnyway: Continuar igualment
diff --git a/pages/update-browser/locale/en.json b/pages/update-browser/locale/en.json
deleted file mode 100644
index 1735de56..00000000
--- a/pages/update-browser/locale/en.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-	 "UpdateYourBrowser": "Upgrade your browser"
-	,"ContinueAnyway": "Continue anyway"
-}
diff --git a/pages/update-browser/locale/en.yml b/pages/update-browser/locale/en.yml
new file mode 100644
index 00000000..3660ead7
--- /dev/null
+++ b/pages/update-browser/locale/en.yml
@@ -0,0 +1,2 @@
+UpdateYourBrowser: Upgrade your browser
+ContinueAnyway: Continue anyway
diff --git a/pages/update-browser/locale/es.json b/pages/update-browser/locale/es.json
deleted file mode 100644
index 7e92fd86..00000000
--- a/pages/update-browser/locale/es.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-	 "UpdateYourBrowser": "Actualiza tu navegador"
-	,"ContinueAnyway": "Continuar de todos modos"
-}
diff --git a/pages/update-browser/locale/es.yml b/pages/update-browser/locale/es.yml
new file mode 100644
index 00000000..39adff07
--- /dev/null
+++ b/pages/update-browser/locale/es.yml
@@ -0,0 +1,2 @@
+UpdateYourBrowser: Actualiza tu navegador
+ContinueAnyway: Continuar de todos modos
diff --git a/pages/update-browser/locale/fr.json b/pages/update-browser/locale/fr.json
deleted file mode 100644
index c9e977e0..00000000
--- a/pages/update-browser/locale/fr.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-	 "UpdateYourBrowser": "Mettez à jour votre navigateur"
-	,"ContinueAnyway": "Continuer"
-}
diff --git a/pages/update-browser/locale/fr.yml b/pages/update-browser/locale/fr.yml
new file mode 100644
index 00000000..8500ff28
--- /dev/null
+++ b/pages/update-browser/locale/fr.yml
@@ -0,0 +1,2 @@
+UpdateYourBrowser: Mettez à jour votre navigateur
+ContinueAnyway: Continuer
diff --git a/pages/update-browser/locale/mn.json b/pages/update-browser/locale/mn.json
deleted file mode 100644
index 1735de56..00000000
--- a/pages/update-browser/locale/mn.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-	 "UpdateYourBrowser": "Upgrade your browser"
-	,"ContinueAnyway": "Continue anyway"
-}
diff --git a/pages/update-browser/locale/mn.yml b/pages/update-browser/locale/mn.yml
new file mode 100644
index 00000000..3660ead7
--- /dev/null
+++ b/pages/update-browser/locale/mn.yml
@@ -0,0 +1,2 @@
+UpdateYourBrowser: Upgrade your browser
+ContinueAnyway: Continue anyway
diff --git a/pages/update-browser/locale/pt.json b/pages/update-browser/locale/pt.json
deleted file mode 100644
index 494cf9ab..00000000
--- a/pages/update-browser/locale/pt.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-	 "UpdateYourBrowser": "Atualize seu navegador"
-	,"ContinueAnyway": "Continuar de todas maneiras"
-}
diff --git a/pages/update-browser/locale/pt.yml b/pages/update-browser/locale/pt.yml
new file mode 100644
index 00000000..37048a27
--- /dev/null
+++ b/pages/update-browser/locale/pt.yml
@@ -0,0 +1,2 @@
+UpdateYourBrowser: Atualize seu navegador
+ContinueAnyway: Continuar de todas maneiras
diff --git a/pages/version-menu/locale/ca.json b/pages/version-menu/locale/ca.json
deleted file mode 100644
index 3f51080b..00000000
--- a/pages/version-menu/locale/ca.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-	"Welcome to Verdnatura, where are you going?": "Benvingut a Verdnatura, On vols anar?"
-
-	,"New website": "Nova web"
-	,"(Fantastic)": "(Fantàstica)"
-	,"Old website": "Antiga web"
-	,"(Best choose new)": "(Millor triï la nova)"
-}
diff --git a/pages/version-menu/locale/ca.yml b/pages/version-menu/locale/ca.yml
new file mode 100644
index 00000000..62ddfddb
--- /dev/null
+++ b/pages/version-menu/locale/ca.yml
@@ -0,0 +1,5 @@
+'Welcome to Verdnatura, where are you going?': 'Benvingut a Verdnatura, On vols anar?'
+New website: Nova web
+(Fantastic): (Fantàstica)
+Old website: Antiga web
+(Best choose new): (Millor triï la nova)
diff --git a/pages/version-menu/locale/en.json b/pages/version-menu/locale/en.json
deleted file mode 100644
index fa6ddf49..00000000
--- a/pages/version-menu/locale/en.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-	"Welcome to Verdnatura, where are you going?": "Welcome to Verdnatura, where are you going?"
-
-	,"New website": "New website"
-	,"(Fantastic)": "(Fantastic)"
-	,"Old website": "Old website"
-	,"(Best choose new)": "(Best choose new)"
-}
diff --git a/pages/version-menu/locale/en.yml b/pages/version-menu/locale/en.yml
new file mode 100644
index 00000000..4691428e
--- /dev/null
+++ b/pages/version-menu/locale/en.yml
@@ -0,0 +1,5 @@
+'Welcome to Verdnatura, where are you going?': 'Welcome to Verdnatura, where are you going?'
+New website: New website
+(Fantastic): (Fantastic)
+Old website: Old website
+(Best choose new): (Best choose new)
diff --git a/pages/version-menu/locale/es.json b/pages/version-menu/locale/es.json
deleted file mode 100644
index ed3396a8..00000000
--- a/pages/version-menu/locale/es.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-	"Welcome to Verdnatura, where are you going?": "Bienvenido a Verdnatura, ¿Dónde quieres ir?"
-
-	,"New website": "Nueva web"
-	,"(Fantastic)": "(Fantástica)"
-	,"Old website": "Antigua web"
-	,"(Best choose new)": "(Mejor elige la nueva)"
-}
diff --git a/pages/version-menu/locale/es.yml b/pages/version-menu/locale/es.yml
new file mode 100644
index 00000000..0b22d9b5
--- /dev/null
+++ b/pages/version-menu/locale/es.yml
@@ -0,0 +1,5 @@
+'Welcome to Verdnatura, where are you going?': 'Bienvenido a Verdnatura, ¿Dónde quieres ir?'
+New website: Nueva web
+(Fantastic): (Fantástica)
+Old website: Antigua web
+(Best choose new): (Mejor elige la nueva)
diff --git a/pages/version-menu/locale/fr.json b/pages/version-menu/locale/fr.json
deleted file mode 100644
index 17aa6376..00000000
--- a/pages/version-menu/locale/fr.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-	"Welcome to Verdnatura, where are you going?": "Bienvenue à Verdnatura, où allez-vous?"
-
-	,"New website": "Nouveau site web"
-	,"(Fantastic)": "(Fantastique)"
-	,"Old website": "Vieux web"
-	,"(Best choose new)": "(Mieux choisir le nouveau)"
-}
diff --git a/pages/version-menu/locale/fr.yml b/pages/version-menu/locale/fr.yml
new file mode 100644
index 00000000..e9b002f2
--- /dev/null
+++ b/pages/version-menu/locale/fr.yml
@@ -0,0 +1,5 @@
+'Welcome to Verdnatura, where are you going?': 'Bienvenue à Verdnatura, où allez-vous?'
+New website: Nouveau site web
+(Fantastic): (Fantastique)
+Old website: Vieux web
+(Best choose new): (Mieux choisir le nouveau)
diff --git a/pages/version-menu/locale/mn.json b/pages/version-menu/locale/mn.json
deleted file mode 100644
index fa6ddf49..00000000
--- a/pages/version-menu/locale/mn.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-	"Welcome to Verdnatura, where are you going?": "Welcome to Verdnatura, where are you going?"
-
-	,"New website": "New website"
-	,"(Fantastic)": "(Fantastic)"
-	,"Old website": "Old website"
-	,"(Best choose new)": "(Best choose new)"
-}
diff --git a/pages/version-menu/locale/mn.yml b/pages/version-menu/locale/mn.yml
new file mode 100644
index 00000000..4691428e
--- /dev/null
+++ b/pages/version-menu/locale/mn.yml
@@ -0,0 +1,5 @@
+'Welcome to Verdnatura, where are you going?': 'Welcome to Verdnatura, where are you going?'
+New website: New website
+(Fantastic): (Fantastic)
+Old website: Old website
+(Best choose new): (Best choose new)
diff --git a/pages/version-menu/locale/pt.json b/pages/version-menu/locale/pt.json
deleted file mode 100644
index a40e0c6b..00000000
--- a/pages/version-menu/locale/pt.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-	"Welcome to Verdnatura, where are you going?": "Bem-Vindo a VerdNatura, onde queres ir?"
-
-	,"New website": "Nova Web"
-	,"(Fantastic)": "(Fantástica)"
-	,"Old website": "Antiga web"
-	,"(Best choose new)": "(Melhor escolher a nova)"
-}
diff --git a/pages/version-menu/locale/pt.yml b/pages/version-menu/locale/pt.yml
new file mode 100644
index 00000000..8c02c51e
--- /dev/null
+++ b/pages/version-menu/locale/pt.yml
@@ -0,0 +1,5 @@
+'Welcome to Verdnatura, where are you going?': 'Bem-Vindo a VerdNatura, onde queres ir?'
+New website: Nova Web
+(Fantastic): (Fantástica)
+Old website: Antiga web
+(Best choose new): (Melhor escolher a nova)
diff --git a/reports/recover-password/locale/en.json b/reports/recover-password/locale/en.json
deleted file mode 100644
index fe974be8..00000000
--- a/reports/recover-password/locale/en.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-	 "Recover password": "Recover password"
-	,"Press on the following link to change your password.":
-		"Press on the following link to change your password."
-}
diff --git a/reports/recover-password/locale/en.yml b/reports/recover-password/locale/en.yml
new file mode 100644
index 00000000..80bb6f88
--- /dev/null
+++ b/reports/recover-password/locale/en.yml
@@ -0,0 +1,2 @@
+Recover password: Recover password
+Press on the following link to change your password.: Press on the following link to change your password.
diff --git a/reports/recover-password/locale/es.json b/reports/recover-password/locale/es.json
deleted file mode 100644
index eda30383..00000000
--- a/reports/recover-password/locale/es.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-	 "Recover password": "Restaurar contraseña"
-	,"Press on the following link to change your password.":
-		"Presiona en el siguiente link para cambiar tu contraseña."
-}
diff --git a/reports/recover-password/locale/es.yml b/reports/recover-password/locale/es.yml
new file mode 100644
index 00000000..8bd79bc5
--- /dev/null
+++ b/reports/recover-password/locale/es.yml
@@ -0,0 +1,2 @@
+Recover password: Restaurar contraseña
+Press on the following link to change your password.: Presiona en el siguiente link para cambiar tu contraseña.
diff --git a/reports/recover-password/locale/pt.json b/reports/recover-password/locale/pt.json
deleted file mode 100644
index 55ae36e6..00000000
--- a/reports/recover-password/locale/pt.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-	 "Recover password": "Recuperar palavra-passe"
-	,"Press on the following link to change your password.":
-		"Pressione o botão para modificar sua palavra-passe."
-}
diff --git a/reports/recover-password/locale/pt.yml b/reports/recover-password/locale/pt.yml
new file mode 100644
index 00000000..3c48c01a
--- /dev/null
+++ b/reports/recover-password/locale/pt.yml
@@ -0,0 +1,2 @@
+Recover password: Recuperar palavra-passe
+Press on the following link to change your password.: Pressione o botão para modificar sua palavra-passe.
diff --git a/reports/shelves-report/locale/en.json b/reports/shelves-report/locale/en.json
deleted file mode 100644
index 101d29fc..00000000
--- a/reports/shelves-report/locale/en.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-	 "Start": "Start"
-	,"End": "End"
-	,"Pallet": "Pallet"
-}
diff --git a/reports/shelves-report/locale/en.yml b/reports/shelves-report/locale/en.yml
new file mode 100644
index 00000000..b01366dd
--- /dev/null
+++ b/reports/shelves-report/locale/en.yml
@@ -0,0 +1,3 @@
+Start: Start
+End: End
+Pallet: Pallet
diff --git a/reports/shelves-report/locale/es.json b/reports/shelves-report/locale/es.json
deleted file mode 100644
index f3416e67..00000000
--- a/reports/shelves-report/locale/es.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-	 "Start": "Inicio"
-	,"End": "Fin"
-	,"Pallet": "Palé"
-}
diff --git a/reports/shelves-report/locale/es.yml b/reports/shelves-report/locale/es.yml
new file mode 100644
index 00000000..a821a9ff
--- /dev/null
+++ b/reports/shelves-report/locale/es.yml
@@ -0,0 +1,3 @@
+Start: Inicio
+End: Fin
+Pallet: Palé
diff --git a/reports/shelves-report/locale/pt.json b/reports/shelves-report/locale/pt.json
deleted file mode 100644
index 88d8b0bf..00000000
--- a/reports/shelves-report/locale/pt.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-	 "Start": "Inicio"
-	,"End": "Final"
-	,"Pallet": "Palete"
-}
diff --git a/reports/shelves-report/locale/pt.yml b/reports/shelves-report/locale/pt.yml
new file mode 100644
index 00000000..422c7252
--- /dev/null
+++ b/reports/shelves-report/locale/pt.yml
@@ -0,0 +1,3 @@
+Start: Inicio
+End: Final
+Pallet: Palete
diff --git a/rest/core/locale/ca.json b/rest/core/locale/ca.json
deleted file mode 100644
index 3bc546a6..00000000
--- a/rest/core/locale/ca.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-	 "InvalidAction": "Acció invàlida"
-
-	,"EmptyQuery": "Consulta buida"
-}
diff --git a/rest/core/locale/ca.yml b/rest/core/locale/ca.yml
new file mode 100644
index 00000000..fd0c7306
--- /dev/null
+++ b/rest/core/locale/ca.yml
@@ -0,0 +1,2 @@
+InvalidAction: Acció invàlida
+EmptyQuery: Consulta buida
diff --git a/rest/core/locale/en.json b/rest/core/locale/en.json
deleted file mode 100644
index 75f9e384..00000000
--- a/rest/core/locale/en.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-	 "InvalidAction": "Invalid action"
-
-	,"EmptyQuery": "Empty query"
-}
diff --git a/rest/core/locale/en.yml b/rest/core/locale/en.yml
new file mode 100644
index 00000000..9418df77
--- /dev/null
+++ b/rest/core/locale/en.yml
@@ -0,0 +1,2 @@
+InvalidAction: Invalid action
+EmptyQuery: Empty query
diff --git a/rest/core/locale/es.json b/rest/core/locale/es.json
deleted file mode 100644
index f33bd628..00000000
--- a/rest/core/locale/es.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-	 "InvalidAction": "Acción inválida"
-	,"EmptyQuery": "Consulta vacía"
-	,"Invalid password": "Contraseña inválida"
-	,"Password does not meet requirements":
-		"La nueva contraseña no reune los requisitos de seguridad necesarios"
-}
diff --git a/rest/core/locale/es.yml b/rest/core/locale/es.yml
new file mode 100644
index 00000000..ad0f69fc
--- /dev/null
+++ b/rest/core/locale/es.yml
@@ -0,0 +1,4 @@
+InvalidAction: Acción inválida
+EmptyQuery: Consulta vacía
+Invalid password: Contraseña inválida
+Password does not meet requirements: La nueva contraseña no reune los requisitos de seguridad necesarios
diff --git a/rest/core/locale/fr.json b/rest/core/locale/fr.json
deleted file mode 100644
index a9a18625..00000000
--- a/rest/core/locale/fr.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-	 "InvalidAction": "Action non valide"
-
-	,"EmptyQuery": "Requête vide"
-}
diff --git a/rest/core/locale/fr.yml b/rest/core/locale/fr.yml
new file mode 100644
index 00000000..d34f2b44
--- /dev/null
+++ b/rest/core/locale/fr.yml
@@ -0,0 +1,2 @@
+InvalidAction: Action non valide
+EmptyQuery: Requête vide
diff --git a/rest/core/locale/mn.json b/rest/core/locale/mn.json
deleted file mode 100644
index 75f9e384..00000000
--- a/rest/core/locale/mn.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-	 "InvalidAction": "Invalid action"
-
-	,"EmptyQuery": "Empty query"
-}
diff --git a/rest/core/locale/mn.yml b/rest/core/locale/mn.yml
new file mode 100644
index 00000000..9418df77
--- /dev/null
+++ b/rest/core/locale/mn.yml
@@ -0,0 +1,2 @@
+InvalidAction: Invalid action
+EmptyQuery: Empty query
diff --git a/rest/core/locale/pt.json b/rest/core/locale/pt.json
deleted file mode 100644
index 90823f48..00000000
--- a/rest/core/locale/pt.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-	 "InvalidAction": "Ação Inválida"
-
-	,"EmptyQuery": "Consulta vazía"
-}
diff --git a/rest/core/locale/pt.yml b/rest/core/locale/pt.yml
new file mode 100644
index 00000000..e1e7d8a5
--- /dev/null
+++ b/rest/core/locale/pt.yml
@@ -0,0 +1,2 @@
+InvalidAction: Ação Inválida
+EmptyQuery: Consulta vazía
diff --git a/rest/image/locale/en.json b/rest/image/locale/en.json
deleted file mode 100644
index 1fa3c051..00000000
--- a/rest/image/locale/en.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-	 "Cant lock cache": "The cache could not be blocked"
-	,"Bad file format": "Unrecognized file format"
-	,"File not choosed": "You have not selected any file"
-	,"Permission denied": "You are not allowed to upload the file"
-	,"File upload error": "Failed to upload the file, check that size is not too large"
-	,"File save error": "Failed to save the file: %s"
-	,"File size error": "The file must be no longer than %.2f MB"
-	,"Bad file name": "The file name must contain only lowercase letters, digits or the '_' character"
-	,"Bad schema name": "Invalid schema name"
-	,"Schema not exists": "Schema does not exist"
-	,"Unreferenced file": "The file is not referenced by the database"
-	,"Com error": "Error communicating with the server"
-	,"Image open error": "Error opening the image file"
-	,"Operation disabled": "Operation disabled for security"
-	,"Image added": "Image added correctly"
-	
-	,"ErrIniSize": "File exceeds the upload_max_filesize directive in php.ini"
-	,"ErrFormSize": "File exceeds the MAX_FILE_SIZE specified in the HTML form"
-	,"ErrPartial": "File was partially uploaded"
-	,"ErrNoFile": "No file was uploaded"
-	,"ErrNoTmpDir": "Missing a temporary folder"
-	,"ErrCantWrite": "Failed to write file to disk"
-	,"ErrExtension": "File upload stopped by extension"
-	,"ErrDefault": "Unknown upload error"
-
-	,"Sync complete": "Synchronization complete"
-}
diff --git a/rest/image/locale/en.yml b/rest/image/locale/en.yml
new file mode 100644
index 00000000..daf21d30
--- /dev/null
+++ b/rest/image/locale/en.yml
@@ -0,0 +1,24 @@
+Cant lock cache: The cache could not be blocked
+Bad file format: Unrecognized file format
+File not choosed: You have not selected any file
+Permission denied: You are not allowed to upload the file
+File upload error: 'Failed to upload the file, check that size is not too large'
+File save error: 'Failed to save the file: %s'
+File size error: The file must be no longer than %.2f MB
+Bad file name: 'The file name must contain only lowercase letters, digits or the ''_'' character'
+Bad schema name: Invalid schema name
+Schema not exists: Schema does not exist
+Unreferenced file: The file is not referenced by the database
+Com error: Error communicating with the server
+Image open error: Error opening the image file
+Operation disabled: Operation disabled for security
+Image added: Image added correctly
+ErrIniSize: File exceeds the upload_max_filesize directive in php.ini
+ErrFormSize: File exceeds the MAX_FILE_SIZE specified in the HTML form
+ErrPartial: File was partially uploaded
+ErrNoFile: No file was uploaded
+ErrNoTmpDir: Missing a temporary folder
+ErrCantWrite: Failed to write file to disk
+ErrExtension: File upload stopped by extension
+ErrDefault: Unknown upload error
+Sync complete: Synchronization complete
diff --git a/rest/image/locale/es.json b/rest/image/locale/es.json
deleted file mode 100644
index 3d51f42e..00000000
--- a/rest/image/locale/es.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-	 "Cant lock cache": "La caché no pudo ser bloqueada"
-	,"Bad file format": "Formato de archivo no reconocido"
-	,"File not choosed": "No has seleccionado ningún archivo"
-	,"Permission denied": "No tienes permiso para subir el fichero"
-	,"File upload error": "Error al subir el fichero, comprueba que su tamaño no sea demasiado grande"
-	,"File save error": "Error al guardar el fichero: %s"
-	,"File size error": "El fichero no debe ocupar más de %.2f MB"
-	,"Bad file name": "El nombre del archivo solo debe contener letras minúsculas, dígitos o el carácter '_'"
-	,"Bad schema name": "Nombre de esquema no válido"
-	,"Schema not exists": "El esquema no existe"
-	,"Unreferenced file": "El archivo no está referenciado por la base de datos"
-	,"Com error": "Error en la comunicación con el servidor"
-	,"Image open error": "Error al abrir el archivo de imagen"
-	,"Operation disabled": "Operación deshabilitada por seguridad"
-	,"Image added": "Imagen añadida correctamente"
-	
-	,"ErrIniSize": "File exceeds the upload_max_filesize directive in php.ini"
-	,"ErrFormSize": "File exceeds the MAX_FILE_SIZE specified in the HTML form"
-	,"ErrPartial": "File was partially uploaded"
-	,"ErrNoFile": "No file was uploaded"
-	,"ErrNoTmpDir": "Missing a temporary folder"
-	,"ErrCantWrite": "Failed to write file to disk"
-	,"ErrExtension": "File upload stopped by extension"
-	,"ErrDefault": "Unknown upload error"
-
-	,"Sync complete": "Sincronización completada"
-}
diff --git a/rest/image/locale/es.yml b/rest/image/locale/es.yml
new file mode 100644
index 00000000..16a4e4a5
--- /dev/null
+++ b/rest/image/locale/es.yml
@@ -0,0 +1,26 @@
+Cant lock cache: La caché no pudo ser bloqueada
+Bad file format: Formato de archivo no reconocido
+File not choosed: No has seleccionado ningún archivo
+Permission denied: No tienes permiso para subir el fichero
+File upload error: 'Error al subir el fichero, comprueba que su tamaño no sea demasiado grande'
+File save error: 'Error al guardar el fichero: %s'
+File size error: El fichero no debe ocupar más de %.2f MB
+Bad file name: >-
+  El nombre del archivo solo debe contener letras minúsculas, dígitos o el
+  carácter '_'
+Bad schema name: Nombre de esquema no válido
+Schema not exists: El esquema no existe
+Unreferenced file: El archivo no está referenciado por la base de datos
+Com error: Error en la comunicación con el servidor
+Image open error: Error al abrir el archivo de imagen
+Operation disabled: Operación deshabilitada por seguridad
+Image added: Imagen añadida correctamente
+ErrIniSize: File exceeds the upload_max_filesize directive in php.ini
+ErrFormSize: File exceeds the MAX_FILE_SIZE specified in the HTML form
+ErrPartial: File was partially uploaded
+ErrNoFile: No file was uploaded
+ErrNoTmpDir: Missing a temporary folder
+ErrCantWrite: Failed to write file to disk
+ErrExtension: File upload stopped by extension
+ErrDefault: Unknown upload error
+Sync complete: Sincronización completada
diff --git a/rest/image/locale/pt.json b/rest/image/locale/pt.json
deleted file mode 100644
index 796bd48c..00000000
--- a/rest/image/locale/pt.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-	 "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"
-}
diff --git a/rest/image/locale/pt.yml b/rest/image/locale/pt.yml
new file mode 100644
index 00000000..3f072b4d
--- /dev/null
+++ b/rest/image/locale/pt.yml
@@ -0,0 +1,24 @@
+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
diff --git a/utils/extract-locale.js b/utils/extract-locale.js
old mode 100644
new mode 100755
index 620f900b..e83f86ee
--- a/utils/extract-locale.js
+++ b/utils/extract-locale.js
@@ -1,3 +1,5 @@
+#!/usr/bin/node
+
 var glob = require('glob');
 var fs = require('fs-extra');
 var path = require('path');
@@ -15,35 +17,34 @@ if (lang == null)
 let nTasks;
 let projectDir;
 
-fs.remove(lang, () => {
-	fs.realpath(`${__dirname}/..`, (err, realPath) => {
-		projectDir = realPath;
-		let len = projectDir.length + 1;
-		
-		glob(`${projectDir}/**/locale/`, (err, localeDirs) => {
-			for (let localeDir of localeDirs) {
-				localeDir = localeDir.substr(len)
+(async () => {
+	await fs.remove(lang);
+	projectDir = await fs.realpath(`${__dirname}/..`);
 
-				if (/^node_modules\//.test (localeDir))
-					continue;
+	projectDir = realPath;
+	let len = projectDir.length + 1;
+	
+	glob(`${projectDir}/**/locale/`, async (err, localeDirs) => {
+		if (err) throw err;
 
-				exportLocale(localeDir);
-			}
+		for (let localeDir of localeDirs) {
+			localeDir = localeDir.substr(len)
 
-			nTasks = localeDirs.length;
-		});
+			if (/^node_modules\//.test (localeDir))
+				continue;
+
+			await exportLocale(localeDir);
+		}
+
+		nTasks = localeDirs.length;
 	});
-});
+})();
 
-function exportLocale (localeDir) {
+async function exportLocale (localeDir) {
 	let dstDir = `${lang}/${localeDir}`;
 	
-	fs.mkdirp(dstDir, err => {
-		if (err) {
-			console.log(err);
-			onTaskEnd();
-			return;
-		}
+	try {
+		await fs.mkdirp(dstDir);
 
 		let src, dst;
 		
@@ -56,21 +57,21 @@ function exportLocale (localeDir) {
 		fs.copy(src, dst, onTaskEnd);
 
 		nTasks += 2;
-		onTaskEnd();
-	});
-}
+	}
+	catch (e) {
+		console.log(err);
+	}
 
-let output;
-let archive;
-
-function onTaskEnd() {
 	nTasks--;
 	if (nTasks > 0) return;
 
-	output = fs.createWriteStream(`${lang}.zip`);
-	output.on ('close', onArchiveClose);
+	let output = fs.createWriteStream(`${lang}.zip`);
+	output.on ('close', () =>{
+		fs.remove(lang);
+		console.log ('Export finalized!');
+	});
 
-	archive = archiver('zip', {
+	let archive = archiver('zip', {
 		zlib: { level: 9 }
 	});
 	archive.on ('error', err => {
@@ -80,8 +81,3 @@ function onTaskEnd() {
 	archive.directory(lang);
 	archive.finalize();
 }
-
-function onArchiveClose() {
-	fs.remove(lang);
-	console.log ('Export finalized!');
-}
diff --git a/utils/parse-yaml.js b/utils/parse-yaml.js
new file mode 100755
index 00000000..83b89cf0
--- /dev/null
+++ b/utils/parse-yaml.js
@@ -0,0 +1,28 @@
+#!/usr/bin/node
+
+var glob = require('glob');
+var fs = require('fs-extra');
+var yaml = require('js-yaml');
+
+(async () => {
+    let projectDir = await fs.realpath(`${__dirname}/..`);
+
+    glob(`${projectDir}/**/locale/*.json`, async (err, localeFiles) => {
+        if (err) throw err;
+
+        for (let localeFile of localeFiles) {
+            if (/node_modules/.test (localeFile))
+                continue;
+
+            let dstFile = localeFile.replace(/\.json$/, '.yml');
+            let ymlString = yaml.safeDump(require(localeFile));
+            await fs.writeFile(dstFile, ymlString, 'utf8');
+            await fs.unlink(localeFile);
+
+            console.log('->', localeFile);
+            console.log('  ', dstFile);
+        }
+
+        console.log('Total %d files dumped.', localeFiles.length);
+    });
+})();
\ No newline at end of file
diff --git a/web/locale/en.json b/web/locale/en.json
deleted file mode 100644
index 77ef30c8..00000000
--- a/web/locale/en.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-	 "Something went wrong": "Something went wrong"
-	,"You don't have enough privileges": "You don't have enough privileges"
-	,"Missing parameters": "Missing parameters"
-}
diff --git a/web/locale/en.yml b/web/locale/en.yml
new file mode 100644
index 00000000..440d2a1d
--- /dev/null
+++ b/web/locale/en.yml
@@ -0,0 +1,3 @@
+Something went wrong: Something went wrong
+You don't have enough privileges: You don't have enough privileges
+Missing parameters: Missing parameters
diff --git a/web/locale/es.json b/web/locale/es.json
deleted file mode 100644
index ff5f8aaa..00000000
--- a/web/locale/es.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-	 "Something went wrong": "Algo salió mal"
-	,"You don't have enough privileges": "No tienes suficientes privilegios"
-	,"Missing parameters": "Faltan parámetros"
-}
diff --git a/web/locale/es.yml b/web/locale/es.yml
new file mode 100644
index 00000000..93605262
--- /dev/null
+++ b/web/locale/es.yml
@@ -0,0 +1,3 @@
+Something went wrong: Algo salió mal
+You don't have enough privileges: No tienes suficientes privilegios
+Missing parameters: Faltan parámetros
diff --git a/web/locale/pt.json b/web/locale/pt.json
deleted file mode 100644
index 9cc71037..00000000
--- a/web/locale/pt.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-	 "Something went wrong": "Algo deu errado"
-	,"You don't have enough privileges": "Não tens previlegios suficientes"
-	,"Missing parameters": "Faltam parametros"
-}
diff --git a/web/locale/pt.yml b/web/locale/pt.yml
new file mode 100644
index 00000000..110cfeac
--- /dev/null
+++ b/web/locale/pt.yml
@@ -0,0 +1,3 @@
+Something went wrong: Algo deu errado
+You don't have enough privileges: Não tens previlegios suficientes
+Missing parameters: Faltam parametros
diff --git a/webpack.config.js b/webpack.config.js
index a4f28b87..1713a8dc 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -17,6 +17,7 @@ var baseConfig = {
 	module: {
 		rules: [
 			{ test: /\.css$/, loader: 'style-loader!css-loader' },
+			{ test: /\.yml$/, loader: 'json-loader!yaml-loader' },
 			{ test: /\.xml$/, loader: 'raw-loader' },
 			{ test: /\.ttf$/, loader: 'file-loader' }
 		]
diff --git a/webpack.config.json b/webpack.config.json
index 1e418dfa..f775e578 100644
--- a/webpack.config.json
+++ b/webpack.config.json
@@ -3,6 +3,6 @@
 	"devServerPort": 9000,
 	"entry": {
 		"main": "./app.js",
-		"vendor": "mootools"
+		"vendor": ["mootools", "js-yaml"]
 	}
 }
\ No newline at end of file