From 8d892e19c1cf3d804754d5b1bb85e4815daa458b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 2 Apr 2015 13:56:32 +0200
Subject: [PATCH] Sync from transifex

---
 htdocs/langs/en_GB/banks.lang        | 10 +---------
 htdocs/langs/en_GB/compta.lang       |  7 -------
 htdocs/langs/en_GB/main.lang         | 22 ++++++++++++++--------
 htdocs/langs/es_AR/banks.lang        |  2 ++
 htdocs/langs/es_AR/commercial.lang   |  2 ++
 htdocs/langs/es_AR/suppliers.lang    |  2 ++
 htdocs/langs/es_CO/banks.lang        |  2 ++
 htdocs/langs/es_CO/commercial.lang   |  2 ++
 htdocs/langs/es_CO/externalsite.lang |  2 ++
 htdocs/langs/es_CO/salaries.lang     |  5 +++++
 htdocs/langs/es_CO/suppliers.lang    |  2 ++
 htdocs/langs/pt_BR/link.lang         |  8 ++++++++
 12 files changed, 42 insertions(+), 24 deletions(-)
 delete mode 100644 htdocs/langs/en_GB/compta.lang
 create mode 100644 htdocs/langs/es_AR/banks.lang
 create mode 100644 htdocs/langs/es_AR/commercial.lang
 create mode 100644 htdocs/langs/es_AR/suppliers.lang
 create mode 100644 htdocs/langs/es_CO/banks.lang
 create mode 100644 htdocs/langs/es_CO/commercial.lang
 create mode 100644 htdocs/langs/es_CO/externalsite.lang
 create mode 100644 htdocs/langs/es_CO/salaries.lang
 create mode 100644 htdocs/langs/es_CO/suppliers.lang
 create mode 100644 htdocs/langs/pt_BR/link.lang

diff --git a/htdocs/langs/en_GB/banks.lang b/htdocs/langs/en_GB/banks.lang
index 289acc55386..e58cf5e72b5 100644
--- a/htdocs/langs/en_GB/banks.lang
+++ b/htdocs/langs/en_GB/banks.lang
@@ -1,10 +1,2 @@
 # Dolibarr language file - Source file is en_US - banks
-ValidateCheckReceipt=Validate this cheque receipt ?
-ConfirmValidateCheckReceipt=Are you sure you want to validate this cheque receipt, no change will be possible once this is done ?
-DeleteCheckReceipt=Delete this cheque receipt ?
-ConfirmDeleteCheckReceipt=Are you sure you want to delete this cheque receipt ?
-BankChecks=Bank cheques
-BankChecksToReceipt=Cheques waiting for deposit
-ShowCheckReceipt=Show cheque deposit receipt
-NumberOfCheques=Nb of cheque
-SelectChequeTransactionAndGenerate=Select/filter cheques to include into the cheque deposit receipt and click on "Create".
+InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
diff --git a/htdocs/langs/en_GB/compta.lang b/htdocs/langs/en_GB/compta.lang
deleted file mode 100644
index 8bd70a68704..00000000000
--- a/htdocs/langs/en_GB/compta.lang
+++ /dev/null
@@ -1,7 +0,0 @@
-# Dolibarr language file - Source file is en_US - compta
-CheckReceipt=Cheque deposit
-CheckReceiptShort=Cheque deposit
-NewCheckDeposit=New cheque deposit
-NoWaitingChecks=No cheques waiting for deposit.
-DateChequeReceived=Cheque reception date
-NbOfCheques=Nb of cheques
diff --git a/htdocs/langs/en_GB/main.lang b/htdocs/langs/en_GB/main.lang
index c571a7a7272..3dbf77cffe0 100644
--- a/htdocs/langs/en_GB/main.lang
+++ b/htdocs/langs/en_GB/main.lang
@@ -4,17 +4,23 @@ FONTFORPDF=helvetica
 FONTSIZEFORPDF=10
 SeparatorDecimal=.
 SeparatorThousand=,
-FormatDateShort=%m/%d/%Y
+FormatDateShort=%d/%m/%Y
 FormatDateShortInput=%m/%d/%Y
-FormatDateShortJava=MM/dd/yyyy
+FormatDateShortJava=dd/MM/yyyy
 FormatDateShortJavaInput=MM/dd/yyyy
 FormatDateShortJQuery=mm/dd/yy
 FormatDateShortJQueryInput=mm/dd/yy
-FormatHourShort=%I:%M %p
+FormatHourShort=%H:%M
 FormatHourShortDuration=%H:%M
-FormatDateTextShort=%b %d, %Y
-FormatDateText=%B %d, %Y
-FormatDateHourShort=%m/%d/%Y %I:%M %p
+FormatDateTextShort=%d %b %Y
+FormatDateText=%d %B %Y
+FormatDateHourShort=%d/%m/%Y %H:%M
 FormatDateHourSecShort=%m/%d/%Y %I:%M:%S %p
-FormatDateHourTextShort=%b %d, %Y, %I:%M %p
-FormatDateHourText=%B %d, %Y, %I:%M %p
+FormatDateHourTextShort=%d %b %Y %H:%M
+FormatDateHourText=%d %B %Y %H:%M
+AmountVAT=Amount VAT
+TotalVAT=Total VAT
+IncludedVAT=Included VAT
+TTC=Inc. VAT
+VAT=VAT
+VATRate=VAT Rate
diff --git a/htdocs/langs/es_AR/banks.lang b/htdocs/langs/es_AR/banks.lang
new file mode 100644
index 00000000000..e58cf5e72b5
--- /dev/null
+++ b/htdocs/langs/es_AR/banks.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - banks
+InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
diff --git a/htdocs/langs/es_AR/commercial.lang b/htdocs/langs/es_AR/commercial.lang
new file mode 100644
index 00000000000..18d8db06801
--- /dev/null
+++ b/htdocs/langs/es_AR/commercial.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - commercial
+ActionAffectedTo=Event assigned to
diff --git a/htdocs/langs/es_AR/suppliers.lang b/htdocs/langs/es_AR/suppliers.lang
new file mode 100644
index 00000000000..5213cec4e07
--- /dev/null
+++ b/htdocs/langs/es_AR/suppliers.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - suppliers
+DenyingThisOrder=Deny this order
diff --git a/htdocs/langs/es_CO/banks.lang b/htdocs/langs/es_CO/banks.lang
new file mode 100644
index 00000000000..e58cf5e72b5
--- /dev/null
+++ b/htdocs/langs/es_CO/banks.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - banks
+InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
diff --git a/htdocs/langs/es_CO/commercial.lang b/htdocs/langs/es_CO/commercial.lang
new file mode 100644
index 00000000000..18d8db06801
--- /dev/null
+++ b/htdocs/langs/es_CO/commercial.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - commercial
+ActionAffectedTo=Event assigned to
diff --git a/htdocs/langs/es_CO/externalsite.lang b/htdocs/langs/es_CO/externalsite.lang
new file mode 100644
index 00000000000..41f70db06fe
--- /dev/null
+++ b/htdocs/langs/es_CO/externalsite.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - externalsite
+ExampleMyMenuEntry=Mi entrada en el menú
diff --git a/htdocs/langs/es_CO/salaries.lang b/htdocs/langs/es_CO/salaries.lang
new file mode 100644
index 00000000000..a9438eb4f66
--- /dev/null
+++ b/htdocs/langs/es_CO/salaries.lang
@@ -0,0 +1,5 @@
+# Dolibarr language file - Source file is en_US - salaries
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Código contable para pagos de salarios
+SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Código contable para cargo financiero
+THM=Valor de hora promedio
+TJM=Valor día promedio
diff --git a/htdocs/langs/es_CO/suppliers.lang b/htdocs/langs/es_CO/suppliers.lang
new file mode 100644
index 00000000000..5213cec4e07
--- /dev/null
+++ b/htdocs/langs/es_CO/suppliers.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - suppliers
+DenyingThisOrder=Deny this order
diff --git a/htdocs/langs/pt_BR/link.lang b/htdocs/langs/pt_BR/link.lang
new file mode 100644
index 00000000000..fc6685ef08d
--- /dev/null
+++ b/htdocs/langs/pt_BR/link.lang
@@ -0,0 +1,8 @@
+# Dolibarr language file - Source file is en_US - link
+LinkANewFile=Vincular um novo arquivo/documento
+LinkedFiles=Arquivos vinculados e documentos
+NoLinkFound=Não há links registrados
+LinkComplete=O arquivo foi associada com sucesso
+ErrorFileNotLinked=O arquivo não pôde ser vinculado
+ErrorFailedToDeleteLink=Falha ao remover link '<b>%s</b>'
+ErrorFailedToUpdateLink=Falha ao atualizar link '<b>%s</b>'
-- 
GitLab