Merge

forms/admin/items/locale/en.json

@@ -1,4 +0,0 @@
-{
-	 "Items": "Items",
-	 "Enter a search term": "Enter a search term"
-}

forms/ecomerce/invoices/locale/ca.yml

@@ -1,4 +1,5 @@
 Invoices: Factures
+Show invoices from: Mostra factures desde
 Serial: Sèrie
 Date: Data
 Import: Import

forms/ecomerce/invoices/locale/en.yml

@@ -1,4 +1,5 @@
 Invoices: Invoices
+Show invoices from: Show invoices from
 Serial: Serial
 Date: Date
 Import: Import

forms/ecomerce/invoices/locale/es.yml

@@ -1,4 +1,5 @@
 Invoices: Facturas
+Show invoices from: Mostrar facturas desde
 Serial: Serie
 Date: Fecha
 Import: Importe

forms/ecomerce/invoices/locale/fr.yml

@@ -1,4 +1,5 @@
 Invoices: Factures
+Show invoices from: Afficher les factures de
 Serial: Série
 Date: Date
 Import: Montant

forms/ecomerce/invoices/locale/pt.yml

@@ -1,4 +1,5 @@
 Invoices: Factura
+Show invoices from: Mostrar facturas de
 Serial: Serie
 Date: Data
 Import: Importe

forms/ecomerce/orders/locale/ca.yml

@@ -6,6 +6,7 @@ DateMake: Data de creació
 DateExit: Data d'eixida
 SendMethod: Forma d'enviament
 LastOrders: Últimes comandes
+Show orders from: Mostra comandes desde
 'Balance:': 'Saldo:'
 PaymentInfo: >-
   La quantitat mostrada és el teu saldo pendent (negatiu) o favorable a dia
@@ -27,10 +28,6 @@ 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

forms/ecomerce/orders/locale/en.yml

@@ -6,6 +6,7 @@ DateMake: Creation date
 DateExit: Shipping date
 SendMethod: Delivery method
 LastOrders: Last orders
+Show orders from: Show orders from
 'Balance:': 'Balance:'
 PaymentInfo: >-
   The amount shown is your slope (negative) or favorable balance today, it
@@ -26,12 +27,6 @@ Consignee: Consignee
 Boxes: Bundles
 TotalWithVAT: Total with VAT
 PayOrder: Pay order
-'AmountToPay:': 'Amount to pay (€):'
+An error has been in the payment: It seems that there has been an error in the payment
-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

forms/ecomerce/orders/locale/es.yml

@@ -6,6 +6,7 @@ DateMake: Fecha de creación
 DateExit: Fecha de salida
 SendMethod: Forma de envío
 LastOrders: Últimos pedidos
+Show orders from: Mostrar pedidos desde
 'Balance:': 'Saldo:'
 PaymentInfo: >-
   La cantidad mostrada es tu saldo pendiente (negativa) o favorable a día de
@@ -27,11 +28,6 @@ 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

forms/ecomerce/orders/locale/fr.yml

@@ -6,6 +6,7 @@ DateMake: Date de creation
 DateExit: Date de sortie
 SendMethod: Typo
 LastOrders: Les dernières commandes
+Show orders from: Afficher les commandes de
 'Balance:': 'Balance:'
 PaymentInfo: >-
   Le montant indiqué est votre pente (négative) ou balance favorable
@@ -27,12 +28,6 @@ Consignee: Destinataire
 Boxes: Colis
 TotalWithVAT: Total avec TVA
 PayOrder: Payer la commande
-'AmountToPay:': 'Montant à payer (€):'
+An error has been in the payment: Il semble qu'il ya eu une erreur dans le paiement
-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

forms/ecomerce/orders/locale/mn.yml

@@ -6,6 +6,7 @@ DateMake: Creation date
 DateExit: Shipping date
 SendMethod: Delivery method
 LastOrders: Last orders
+Show orders from: '-Аас харуулах захиалга'
 'Balance:': 'Balance:'
 PaymentInfo: >-
   Үзүүлсэн хэмжээ цаашид захиалга эзэлж биш, таны налуу (сөрөг), эсвэл
@@ -26,12 +27,6 @@ Consignee: Consignee
 Boxes: Bundles
 TotalWithVAT: Total with VAT
 PayOrder: Pay order
-'AmountToPay:': 'Amount to pay (€):'
+An error has been in the payment: It seems that there has been an error in the payment
-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

forms/ecomerce/orders/locale/pt.yml

@@ -6,6 +6,7 @@ DateMake: Data de criação
 DateExit: Data de saída
 SendMethod: Forma de envío
 LastOrders: Últimas encomendas
+Show orders from: Mostrar ordens de
 'Balance:': 'Saldo:'
 PaymentInfo: >-
   A quantidade mostrada é seu saldo pendente (negativo) ou favorável a dia de
@@ -27,11 +28,6 @@ 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

forms/ecomerce/ticket/locale/ca.json

@@ -1,23 +0,0 @@
-{
-	 "OrderDetail": "Detall de l'encarrec"
-
-	,"Delivery note": "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"
-}

forms/ecomerce/ticket/locale/en.json

@@ -1,23 +0,0 @@
-{
-	 "OrderDetail": "Order detail"
-
-	,"Delivery note": "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"
-}

forms/ecomerce/ticket/locale/es.json

@@ -1,24 +0,0 @@
-{
-	 "OrderDetail": "Detalle del pedido"
-
-	,"Delivery note": "Albarán"
-
-	,"Delivery": "Entrega"
-	,"Total": "Total"
-	,"Total + tax": "Total + IVA"
-	,"Tax base": "Base imponible"
-	,"VAT": "IVA"
-	,"Total + VAT": "Total + 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"
-}

forms/ecomerce/ticket/locale/fr.json

@@ -1,23 +0,0 @@
-{
-	 "OrderDetail": "Détails de la commande"
-
-	,"Delivery note": "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"
-}

forms/ecomerce/ticket/locale/pt.json

@@ -1,23 +0,0 @@
-{
-	 "OrderDetail": "Detalhes da encomenda"
-
-	,"Delivery note": "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"
-}

forms/preview/locale/ca.json

@@ -1,5 +0,0 @@
-{
-	 "Report": "Informe"
-	,"Preview": "Visualització prèvia"
-	,"Print": "Imprimir"
-}

forms/preview/locale/ca.yml

@@ -0,0 +1,3 @@
+Report: Informe
+Preview: Visualització prèvia
+Print: Imprimir

forms/preview/locale/en.json

@@ -1,5 +0,0 @@
-{
-	 "Report": "Report"
-	,"Preview": "Preview"
-	,"Print": "Print"
-}

forms/preview/locale/en.yml

@@ -0,0 +1,3 @@
+Report: Report
+Preview: Preview
+Print: Print

forms/preview/locale/es.json

@@ -1,5 +0,0 @@
-{
-	 "Report": "Informe"
-	,"Preview": "Vista preliminar"
-	,"Print": "Imprimir"
-}

forms/preview/locale/es.yml

@@ -0,0 +1,3 @@
+Report: Informe
+Preview: Vista preliminar
+Print: Imprimir

forms/preview/locale/fr.json

@@ -1,5 +0,0 @@
-{
-	 "Report": "Rapport"
-	,"Preview": "Avant-première"
-	,"Print": "Imprimer"
-}

forms/preview/locale/fr.yml

@@ -0,0 +1,3 @@
+Report: Rapport
+Preview: Avant-première
+Print: Imprimer

forms/preview/locale/mn.json

@@ -1,5 +0,0 @@
-{
-	 "Report": "тайлан"
-	,"Preview": "Урьдчилан харах"
-	,"Print": "хэвлэх"
-}

forms/preview/locale/mn.yml

@@ -0,0 +1,3 @@
+Report: тайлан
+Preview: Урьдчилан харах
+Print: хэвлэх

forms/preview/locale/pt.json

@@ -1,5 +0,0 @@
-{
-	 "Report": "Relatório"
-	,"Preview": "Vsualização"
-	,"Print": "Impressão"
-}

forms/preview/locale/pt.yml

@@ -0,0 +1,3 @@
+Report: Relatório
+Preview: Vsualização
+Print: Impressão

forms/reports/shelves/locale/en.yml

@@ -10,6 +10,7 @@ Limit amount per item: Limit amount per item
 Title: Title
 Show packing: Show packing
 Stack different items: Stack different items
-Preview: Preview
+Use ids instead of names: Use ids instead of names
+Show: Show
 Pallets: Pallets
 'No items found, check that all fields are correct': 'No items found, check that all fields are correct'

forms/reports/shelves/locale/es.yml

@@ -10,6 +10,7 @@ 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
+Use ids instead of names: Usar ids en vez de nombres
+Show: 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'

forms/reports/shelves/locale/pt.yml

@@ -10,6 +10,7 @@ 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
+Use ids instead of names: Usar ids en vez de nombres
+Show: Mostrar
 Pallets: Palets
 'No items found, check that all fields are correct': 'Nenhum ítem encontrado, comprove que todos os campos estão corretos'

js/hedera/locale/ca.yml

@@ -58,3 +58,6 @@ Agencies: Agències
 Configuration: Configuració
 Account: Compte
 Addresses: Direccions
+'AmountToPay:': 'Quantitat a pagar (€):'
+AmountError: La quantitat ha de ser un nombre positiu
+PayError: Error al realitzar el pagament

js/hedera/locale/en.yml

@@ -54,3 +54,6 @@ Agencies: Agencies
 Configuration: Configuration
 Account: Account
 Addresses: Addresses
+'AmountToPay:': 'Amount to pay (€):'
+AmountError: The amount must be a positive number
+PayError: Failed to make the payment

js/hedera/locale/es.yml

@@ -58,3 +58,6 @@ Agencies: Agencias
 Configuration: Configuración
 Account: Cuenta
 Addresses: Direcciones
+'AmountToPay:': 'Cantidad a pagar (€):'
+AmountError: La cantidad debe ser un número positivo
+PayError: Error al realizar el pago

js/hedera/locale/fr.yml

@@ -58,3 +58,6 @@ Agencies: Agences
 Configuration: Configuration
 Account: Compte
 Addresses: Adresses
+'AmountToPay:': 'Montant à payer (€):'
+AmountError: La quantité doit être un neméro positif
+PayError: Impossible d'effectuer le paiement

js/hedera/locale/mn.yml

@@ -54,3 +54,6 @@ Agencies: байгууллагууд
 Configuration: Тохиргоо
 Account: Дансны
 Addresses: хаягууд
+'AmountToPay:': 'Amount to pay (€):'
+AmountError: The amount must be a positive number
+PayError: Failed to make the payment

js/hedera/locale/pt.yml

@@ -56,3 +56,6 @@ Agencies: Agências
 Configuration: Configuração
 Account: Conta
 Addresses: Moradas
+'AmountToPay:': 'Quantidade a pagar (€):'
+AmountError: A quantidade deve ser um número positivo
+PayError: Erro ao realizar o pagamento

js/vn/locale/ca.yml

@@ -28,6 +28,7 @@ Jan: Gen
 Feb: Febr
 Mar: Març
 Apr: Abr
+MayAbr: Maig
 Jun: Juny
 Jul: Jul
 Ago: Ag

js/vn/locale/en.yml

@@ -18,7 +18,7 @@ March: March
 April: April
 May: May
 June: June
-July: June
+July: July
 August: August
 September: September
 October: October
@@ -28,6 +28,7 @@ Jan: Jan
 Feb: Feb
 Mar: Mar
 Apr: Apr
+MayAbr: May
 Jun: Jun
 Jul: Jul
 Ago: Ago

js/vn/locale/es.yml

@@ -16,7 +16,7 @@ January: Enero
 February: Febrero
 March: Marzo
 April: Abril
-May: May
+May: Mayo
 June: Junio
 July: Julio
 August: Agosto
@@ -28,6 +28,7 @@ Jan: Ene
 Feb: Feb
 Mar: Mar
 Apr: Abr
+MayAbr: May
 Jun: Jun
 Jul: Jul
 Ago: Ago

js/vn/locale/fr.yml

@@ -28,6 +28,7 @@ Jan: Jan
 Feb: Fév
 Mar: Mars
 Apr: Avr
+MayAbr: Mai
 Jun: Juin
 Jul: Juil
 Ago: Août

js/vn/locale/mn.yml

@@ -28,6 +28,7 @@ Jan: оны
 Feb: хоё
 Mar: Гур
 Apr: Дөр
+MayAbr: May
 Jun: Jun
 Jul: Jul
 Ago: Най

js/vn/locale/pt.yml

@@ -16,7 +16,7 @@ January: Janeiro
 February: Fevereiro
 March: Março
 April: Abril
-May: Mai
+May: Maio
 June: Junho
 July: Julho
 August: Agosto
@@ -28,6 +28,7 @@ Jan: Jan
 Feb: Fev
 Mar: Mar
 Apr: Abr
+MayAbr: Mai
 Jun: Jun
 Jul: Jul
 Ago: Ago

reports/delivery-note/locale/es.json

@@ -1,4 +0,0 @@
-{
-	 "Import": "Importe"
-	,"Total + VAT": "Total + IVA"
-}

reports/delivery-note/locale/es.yml

@@ -0,0 +1,2 @@
+Import: Importe
+Total + VAT: Total + IVA