Merge

.eslintrc.yml

@@ -1,7 +1,6 @@
 extends: eslint:recommended
-env:
-    es6: true
 parserOptions:
+    ecmaVersion: 2017
     sourceType: module
 rules:
     no-undef: 0

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 ();

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>
 	
@@ -22,4 +26,3 @@
 	AllowOverride FileInfo Options
 	Require all granted
 </Directory>
-

conf/config.php

@@ -27,4 +27,3 @@ return [
 ]
 
 ];
-

debian/control

@@ -4,7 +4,7 @@ Maintainer: Juan Ferrer Toribio <juan@verdnatura.es>
 Build-Depends: build-essential, debhelper, nodejs
 Standards-Version: 3.9.3
 Section: misc
-Homepage: http://www.verdnatura.es
+Homepage: https://verdnatura.es
 Vcs-Git: https://git.verdnatura.es/hedera-web
 
 Package: hedera-web

forms/account/address-list/address-list.js

@@ -26,7 +26,7 @@ Hedera.AddressList = new Class
 	{
 		if (confirm (_('AreYouSureDeleteAddress')))
 		{
-			button.lot.set ('active', false);
+			button.lot.set ('isActive', false);
 			button.lot.refresh ();
 		}
 	}

forms/account/address-list/locale/ca.json

@@ -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ó?"
-}

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ó?

forms/account/address-list/locale/en.json

@@ -1,11 +0,0 @@
-{
-	 "Addresses": "Addresses"
-	
-	,"Return": "Return"
-	,"AddAddress": "Add address"
-	
-	,"SetAsDefault": "Set as default"
-	,"RemoveAddress": "Remove address"
-	,"EditAddress": "Edit address"
-	,"AreYouSureDeleteAddress": "Are you sure you want to delete the address?"
-}

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?

forms/account/address-list/locale/es.json

@@ -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?"
-}

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?

forms/account/address-list/locale/fr.json

@@ -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?"
-}

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?

forms/account/address-list/locale/pt.json

@@ -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?"
-}

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?

forms/account/address-list/ui.xml

@@ -8,11 +8,11 @@
 	</db-form>
 	<db-model id="addresses" updatable="true">
 		SELECT a.id, a.nickname, p.name province, a.postalCode,
-				a.city, a.street, a.active, c.country
+				a.city, a.street, a.isActive, c.country
 			FROM myAddress a
-				LEFT JOIN vn.province p ON p.id = a.provinceFk
+			LEFT JOIN vn.province p ON p.id = a.provinceFk
-				JOIN vn.country c ON c.id = p.countryFk
+			JOIN vn.country c ON c.id = p.countryFk
-			WHERE a.active
+				WHERE a.isActive
 	</db-model>
 </vn-group>
 <h1 id="title">

forms/account/address/locale/ca.json

@@ -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"
-}

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

forms/account/address/locale/en.json

@@ -1,15 +0,0 @@
-{
-	"AddEditAddress": "Add or edit address"
-
-	,"Name": "Consignee"
-	,"Address": "Address"
-	,"City": "City"
-	,"ZipCode": "Zip code"
-	,"Country": "Country"
-	,"Province": "Province"
-
-	,"Return": "Return"
-	,"Accept": "Accept"
-	
-	,"AddressChangedSuccessfully": "Address changed successfully"
-}

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

forms/account/address/locale/es.json

@@ -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"
-}

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

forms/account/address/locale/fr.json

@@ -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"
-}

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

forms/account/address/locale/pt.json

@@ -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"
-}

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

forms/account/address/ui.xml

@@ -16,7 +16,7 @@
 				FROM myAddress a
 					LEFT JOIN vn.province p ON p.id = a.provinceFk
 					JOIN vn.country c ON c.id = p.countryFk
-				WHERE a.active AND a.id = #address
+				WHERE a.id = #address
 		</db-model>
 	</db-form>
 </vn-group>

forms/account/conf/locale/ca.json

@@ -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"
-}

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

forms/account/conf/locale/en.json

@@ -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"
-}

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

forms/account/conf/locale/es.json

@@ -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"
-}

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

forms/account/conf/locale/fr.json

@@ -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"
-}

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

forms/account/conf/locale/pt.json

@@ -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"
-}

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

forms/admin/access-log/locale/ca.json

@@ -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"
-}

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

forms/admin/access-log/locale/en.json

@@ -1,15 +0,0 @@
-{
-	 "AccessLog": "Access log"
-
-	,"UserNumber:": "User Number:"
-	,"User:": "User:"
-	,"Phone:": "Phone:"
-	,"Mobile:": "Mobile:"
-
-	,"Access": "Access"
-	,"OS": "OS"
-	,"Browser": "Browser"
-	,"Version": "Version"
-	,"Javascript": "Javascript"
-	,"Cookies": "Cookies"
-}

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

forms/admin/access-log/locale/es.json

@@ -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"
-}

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

forms/admin/access-log/locale/fr.json

@@ -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"
-}

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

forms/admin/access-log/locale/pt.json

@@ -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"
-}

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

forms/admin/connections/locale/ca.json

@@ -1,8 +0,0 @@
-{
-	 "Connections": "Connexions"
-
-	,"Refresh": "Actualitzar"
-	,"Visits": "Visites"
-	
-	,"connections": "connexions"
-}

forms/admin/connections/locale/ca.yml

@@ -0,0 +1,4 @@
+Connections: Connexions
+Refresh: Actualitzar
+Visits: Visites
+connections: connexions

forms/admin/connections/locale/en.json

@@ -1,8 +0,0 @@
-{
-	 "Connections": "Connections"
-
-	,"Refresh": "Refresh"
-	,"Visits": "Visits"
-	
-	,"connections": "connections"
-}

forms/admin/connections/locale/en.yml

@@ -0,0 +1,4 @@
+Connections: Connections
+Refresh: Refresh
+Visits: Visits
+connections: connections

forms/admin/connections/locale/es.json

@@ -1,8 +0,0 @@
-{
-	 "Connections": "Conexiones"
-
-	,"Refresh": "Actualizar"
-	,"Visits": "Visitas"
-	
-	,"connections": "conexiones"
-}

forms/admin/connections/locale/es.yml

@@ -0,0 +1,4 @@
+Connections: Conexiones
+Refresh: Actualizar
+Visits: Visitas
+connections: conexiones

forms/admin/connections/locale/fr.json

@@ -1,8 +0,0 @@
-{
-	 "Connections": "Connexions"
-
-	,"Refresh": "Actualiser"
-	,"Visits": "Visites"
-	
-	,"connections": "connexions"
-}

forms/admin/connections/locale/fr.yml

@@ -0,0 +1,4 @@
+Connections: Connexions
+Refresh: Actualiser
+Visits: Visites
+connections: connexions

forms/admin/connections/locale/mn.json

@@ -1,8 +0,0 @@
-{
-	 "Connections": "холболт"
-
-	,"Refresh": "Сэргээх"
-	,"Visits": "уулзалт"
-	
-	,"connections": "холболт"
-}

forms/admin/connections/locale/mn.yml

@@ -0,0 +1,4 @@
+Connections: холболт
+Refresh: Сэргээх
+Visits: уулзалт
+connections: холболт

forms/admin/connections/locale/pt.json

@@ -1,8 +0,0 @@
-{
-	 "Connections": "Conexões"
-
-	,"Refresh": "actualização"
-	,"Visits": "Visualizações"
-	
-	,"connections": "conexões"
-}

forms/admin/connections/locale/pt.yml

@@ -0,0 +1,4 @@
+Connections: Conexões
+Refresh: actualização
+Visits: Visualizações
+connections: conexões

forms/admin/items/locale/ca.json

@@ -1,4 +0,0 @@
-{
-	 "Items": "Artícles",
-	 "Enter a search term": "Introdueix un terme de cerca"
-}

forms/admin/items/locale/ca.yml

@@ -0,0 +1,2 @@
+Items: Artícles
+Enter a search term: Introdueix un terme de cerca

forms/admin/items/locale/en.yml

@@ -0,0 +1,2 @@
+Items: Items
+Enter a search term: Enter a search term

forms/admin/items/locale/es.json

@@ -1,4 +0,0 @@
-{
-	 "Items": "Artículos",
-	 "Enter a search term": "Introduce un término de búsqueda"
-}

forms/admin/items/locale/es.yml

@@ -0,0 +1,2 @@
+Items: Artículos
+Enter a search term: Introduce un término de búsqueda

forms/admin/items/locale/fr.json

@@ -1,4 +0,0 @@
-{
-	 "Items": "Articles",
-	 "Enter a search term": "Entrez un terme de recherche"
-}

forms/admin/items/locale/fr.yml

@@ -0,0 +1,2 @@
+Items: Articles
+Enter a search term: Entrez un terme de recherche

forms/admin/items/locale/pt.json

@@ -1,4 +0,0 @@
-{
-	 "Items": "Ítens",
-	 "Enter a search term": "Digite um termo de pesquisa"
-}

forms/admin/items/locale/pt.yml

@@ -0,0 +1,2 @@
+Items: Ítens
+Enter a search term: Digite um termo de pesquisa

forms/admin/links/locale/ca.json

@@ -1,6 +0,0 @@
-{
-	 "ControlPanel": "Panell de control"
-
-	,"Module": "Mòdul"
-	,"Description": "Descripció"
-}

forms/admin/links/locale/ca.yml

@@ -0,0 +1,3 @@
+ControlPanel: Panell de control
+Module: Mòdul
+Description: Descripció

forms/admin/links/locale/en.json

@@ -1,6 +0,0 @@
-{
-	 "ControlPanel": "Control panel"
-
-	,"Module": "Module"
-	,"Description": "Description"
-}

forms/admin/links/locale/en.yml

@@ -0,0 +1,3 @@
+ControlPanel: Control panel
+Module: Module
+Description: Description

forms/admin/links/locale/es.json

@@ -1,6 +0,0 @@
-{
-	 "ControlPanel": "Panel de control"
-
-	,"Module": "Módulo"
-	,"Description": "Descripción"
-}

forms/admin/links/locale/es.yml

@@ -0,0 +1,3 @@
+ControlPanel: Panel de control
+Module: Módulo
+Description: Descripción

forms/admin/links/locale/fr.json

@@ -1,6 +0,0 @@
-{
-	 "ControlPanel": "Panneau de configuration"
-
-	,"Module": "Module"
-	,"Description": "Description"
-}

forms/admin/links/locale/fr.yml

@@ -0,0 +1,3 @@
+ControlPanel: Panneau de configuration
+Module: Module
+Description: Description

forms/admin/links/locale/pt.json

@@ -1,6 +0,0 @@
-{
-	 "ControlPanel": "Painel de controle"
-
-	,"Module": "Módulo"
-	,"Description": "Descrição"
-}

forms/admin/links/locale/pt.yml

@@ -0,0 +1,3 @@
+ControlPanel: Painel de controle
+Module: Módulo
+Description: Descrição

forms/admin/photos/locale/ca.json

@@ -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"
-}

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

forms/admin/photos/locale/en.json

@@ -1,17 +0,0 @@
-{
-	 "Images": "Images"
-
-	,"Collection": "Collection"
-	,"Click or drop files here": "Click or drop files here"
-
-	,"Clear all": "Clear all"
-	,"Upload files": "Upload files"
-
-	,"Waiting for upload": "Waiting for upload"
-	,"Uploading file": "Uploading file"
-	,"Image uploaded": "Image uploaded"
-
-	,"Upload finished successfully": "Upload finished successfully"
-	,"Some errors happened on upload": "Some errors happened on upload"
-	,"There are no files to upload": "There are no files to upload"
-}

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

forms/admin/photos/locale/es.json

@@ -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"
-}

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

forms/admin/photos/locale/fr.json

@@ -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"
-}

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

forms/admin/photos/locale/pt.json

@@ -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"
-}

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

forms/admin/queries/locale/ca.json

@@ -1,11 +0,0 @@
-{
-	 "Queries": "Consultes"
-
-	,"Execute": "Executar"
-	,"Clean": "Netejar"
-
-	,"SQL query": "Consulta SQL"
-	,"Updatable": "Actualitzable"
-	
-	,"Query executed!": "Consulta executada!"
-}

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!

forms/admin/queries/locale/en.json

@@ -1,11 +0,0 @@
-{
-	 "Queries": "Queries"
-
-	,"Execute": "Execute"
-	,"Clean": "Clean"
-
-	,"SQL query": "SQL query"
-	,"Updatable": "Updatable"
-	
-	,"Query executed!": "Query executed!"
-}

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!

forms/admin/queries/locale/es.json

@@ -1,11 +0,0 @@
-{
-	 "Queries": "Consultas"
-
-	,"Execute": "Ejecutar"
-	,"Clean": "Limpiar"
-
-	,"SQL query": "Consulta SQL"
-	,"Updatable": "Actualizable"
-	
-	,"Query executed!": "¡Consulta ejecutada!"
-}

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!

forms/admin/queries/locale/fr.json

@@ -1,11 +0,0 @@
-{
-	 "Queries": "Queries"
-
-	,"Execute": "Execute"
-	,"Clean": "Clean"
-
-	,"SQL query": "SQL query"
-	,"Updatable": "Updatable"
-	
-	,"Query executed!": "Query executed!"
-}

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!

forms/admin/queries/locale/pt.json

@@ -1,11 +0,0 @@
-{
-	 "Queries": "Consultas"
-
-	,"Execute": "Executar"
-	,"Clean": "Limpar"
-
-	,"SQL query": "Consulta SQL"
-	,"Updatable": "Actualizável"
-	
-	,"Query executed!": "Consulta executada!"
-}

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!

forms/admin/users/locale/ca.json

@@ -1,7 +0,0 @@
-{
-	 "User management": "Gestió d'usuaris"
-
-	,"Disabled": "Deshabilitat"
-	,"Impersonate user": "Suplantar usuari"
-	,"Access log": "Registre d'accessos"
-}