diff --git a/ChangeLog b/ChangeLog index a2a4d548985..683589961d3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -47,7 +47,8 @@ For users: For translators: -- Normalized sort order of all languages files with english reference files. +- Qual: Normalized sort order of all languages files with english reference files. +- New: Add language code files for South Africa. For developers: - New: DolGraph can build graph with three lines. diff --git a/dev/iso-normes/locales.txt b/dev/iso-normes/locales.txt index e7d13acfbcb..958f97c1cee 100644 --- a/dev/iso-normes/locales.txt +++ b/dev/iso-normes/locales.txt @@ -1,4 +1,9 @@ +For languages: See page http://demo.icu-project.org/icu-bin/locexp?d_=fr +For format number: For number format, you can also see page http://en.wikipedia.org/wiki/Decimal_mark + +For date format: +http://en.wikipedia.org/wiki/Date_format_by_country \ No newline at end of file diff --git a/htdocs/langs/en_US/languages.lang b/htdocs/langs/en_US/languages.lang index 2a3e0f61c62..3c701c58a56 100644 --- a/htdocs/langs/en_US/languages.lang +++ b/htdocs/langs/en_US/languages.lang @@ -16,6 +16,7 @@ Language_en_IN=English (India) Language_en_NZ=English (New Zealand) Language_en_SA=English (Saudi Arabia) Language_en_US=English (United States) +Language_en_ZA=English (South Africa) Language_es_ES=Spanish Language_es_AR=Spanish (Argentina) Language_es_HN=Spanish (Honduras) diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang index d67501d89ab..a14f19b1c73 100644 --- a/htdocs/langs/en_US/main.lang +++ b/htdocs/langs/en_US/main.lang @@ -7,8 +7,8 @@ DIRECTION=ltr # To read chinese pdf with linux: sudo apt-get install poppler-data FONTFORPDF=helvetica FONTSIZEFORPDF=10 -SeparatorDecimal=. -SeparatorThousand=, +SeparatorDecimal=, +SeparatorThousand=None FormatDateShort=%m/%d/%Y FormatDateShortInput=%m/%d/%Y FormatDateShortJava=MM/dd/yyyy diff --git a/htdocs/langs/en_ZA/companies.lang b/htdocs/langs/en_ZA/companies.lang new file mode 100644 index 00000000000..7552d556432 --- /dev/null +++ b/htdocs/langs/en_ZA/companies.lang @@ -0,0 +1,10 @@ +# Dolibarr language file - en_ZA - companies +# This file contains only line that must differs from en_US +CHARSET=UTF-8 +VATIsUsed=VAT is used +VATIsNotUsed=VAT is not used +VATIntra=VAT number +VATIntraShort=VAT number +VATIntraVeryShort=VAT +VATIntraSyntaxIsValid=Syntax is valid +VATIntraValueIsValid=Value is valid \ No newline at end of file diff --git a/htdocs/langs/en_ZA/compta.lang b/htdocs/langs/en_ZA/compta.lang new file mode 100644 index 00000000000..713190da583 --- /dev/null +++ b/htdocs/langs/en_ZA/compta.lang @@ -0,0 +1,16 @@ +# Dolibarr language file - en_ZA - compta +# This file contains only line that must differs from en_US +CHARSET=UTF-8 +AmountHTVATRealReceived=Amount excl VAT collected +AmountHTVATRealPaid=Amount excl VAT paid +VATToPay=VAT to pay +VATReceived=VAT received +VATToCollect=VAT to collect +VATSummary=VAT Summary +VATPaid=VAT paid +VATCollected=VAT collected +NewVATPayment=New VAT payment +VATPayment=VAT Payment +VATPayments=VAT Payments +TotalToPay=Total to pay +TotalVATReceived=Total VAT received \ No newline at end of file diff --git a/htdocs/langs/en_ZA/main.lang b/htdocs/langs/en_ZA/main.lang new file mode 100644 index 00000000000..c2a2feb3b89 --- /dev/null +++ b/htdocs/langs/en_ZA/main.lang @@ -0,0 +1,41 @@ +# Dolibarr language file - en_ZA - main +# This file contains only line that must differs from en_US file +CHARSET=UTF-8 +SeparatorDecimal=. +SeparatorThousand=, +FormatDateShort=%Y/%m/%d +FormatDateShortInput=%Y/%m/%d +FormatDateShortJava=yyy/MM/dd +FormatDateShortJavaInput=yyyy/MM/yy +FormatDateShortJQuery=yy/mm/yy +FormatDateShortJQueryInput=yy/mm/dd +FormatHourShort=%H:%M +FormatDateTextShort=%d %b %Y +FormatDateText=%d %B %Y +FormatDateHourShort=%d/%m/%Y %H:%M +FormatDateHourTextShort=%d %b %Y %H:%M +FormatDateHourText=%d %B %Y %H:%M +UnitPrice=Unit price +UnitPriceHT=Unit price (without VAT) +UnitPriceTTC=Unit price +PriceU=U.P. +PriceUHT=U.P. (net) +PriceUTTC=U.P. +PriceUHTShort=P.U. excl VAT +PriceUTTCShort=P.U. incl VAT +AmountHT=Amount (excl VAT) +AmountTTC=Amount (incl VAT) +AmountVAT=Amount VAT +PriceQtyHT=Price for this quantity excl VAT +PriceQtyMinHT=Price quantity min. excl VAT +PriceQtyTTC=Price for this quantity incl VAT +PriceQtyMinTTC=Price quantity min. incl VAT +TotalHT=Total (excl VAT) +TotalTTC=Total (incl VAT) +TotalTTCToYourCredit=Total (incl VAT) to your credit +TotalVAT=Total VAT +IncludedVAT=Included VAT +HT=excl VAT +TTC=Incl VAT +VAT=VAT +VATRate=VAT Rate \ No newline at end of file diff --git a/htdocs/langs/fr_FR/languages.lang b/htdocs/langs/fr_FR/languages.lang index eb20ff3275c..3adee9d9bfa 100644 --- a/htdocs/langs/fr_FR/languages.lang +++ b/htdocs/langs/fr_FR/languages.lang @@ -16,6 +16,7 @@ Language_en_IN=Anglais (Inde) Language_en_NZ=Anglais (Nouvelle Zeland) Language_en_SA=Anglais (Arabie Saoudite) Language_en_US=Anglais (Etats-Unis) +Language_en_ZA=Anglais (Afrique du Sud) Language_es_ES=Espagnol Language_es_AR=Espagnol (Argentine) Language_es_HN=Espagnol (Honduras)