diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index 09c62769b8b..224160a1aa6 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -1,4 +1,5 @@ # Dolibarr language file - en_US - admin +CHARSET=ISO-8859-1 Version=Version VersionProgram=Version program VersionLastInstall=Version initial install diff --git a/htdocs/langs/en_US/agenda.lang b/htdocs/langs/en_US/agenda.lang index a965088c8f1..1cd93e2e818 100644 --- a/htdocs/langs/en_US/agenda.lang +++ b/htdocs/langs/en_US/agenda.lang @@ -1,4 +1,5 @@ # Dolibarr language file - en_US - agenda +CHARSET=ISO-8859-1 Actions = Actions ActionsArea = Actions area (Events and tasks) Agenda = Agenda diff --git a/htdocs/langs/en_US/banks.lang b/htdocs/langs/en_US/banks.lang index c41ed77c296..7ab1520bc60 100644 --- a/htdocs/langs/en_US/banks.lang +++ b/htdocs/langs/en_US/banks.lang @@ -1,4 +1,5 @@ # Dolibarr language file - en_US - banks +CHARSET=ISO-8859-1 Bank=Bank Banks=Banks MenuBankCash=Bank/Cash diff --git a/htdocs/langs/en_US/bills.lang b/htdocs/langs/en_US/bills.lang index e2e8e1a7ac2..2f6570c0833 100644 --- a/htdocs/langs/en_US/bills.lang +++ b/htdocs/langs/en_US/bills.lang @@ -1,4 +1,5 @@ # Dolibarr language file - en_US - bills +CHARSET=ISO-8859-1 Bill=Invoice Bills=Invoices BillsCustomers=Customers' invoices diff --git a/htdocs/langs/en_US/boxes.lang b/htdocs/langs/en_US/boxes.lang index 4d6a08d6596..65ea89af0f3 100644 --- a/htdocs/langs/en_US/boxes.lang +++ b/htdocs/langs/en_US/boxes.lang @@ -1,4 +1,5 @@ # Dolibarr language file - en_US - boxes +CHARSET=ISO-8859-1 BoxLastRssInfos=Rss information BoxLastProducts=Last products/services BoxLastProductsInContract=Last contracted products/services diff --git a/htdocs/langs/en_US/categories.lang b/htdocs/langs/en_US/categories.lang index fa2c51f28c5..cda93feda7c 100644 --- a/htdocs/langs/en_US/categories.lang +++ b/htdocs/langs/en_US/categories.lang @@ -1,4 +1,5 @@ # Dolibarr language file - en_US - categories +CHARSET=ISO-8859-1 Category=Category Categories=Categories Rubrique=Category diff --git a/htdocs/langs/en_US/commercial.lang b/htdocs/langs/en_US/commercial.lang index d7d2e3965b0..f7ff5f94945 100644 --- a/htdocs/langs/en_US/commercial.lang +++ b/htdocs/langs/en_US/commercial.lang @@ -1,4 +1,5 @@ # Dolibarr language file - en_US - commercial +CHARSET=ISO-8859-1 Commercial=Commercial CommercialArea=Commercial area CommercialCard=Commercial card diff --git a/htdocs/langs/en_US/companies.lang b/htdocs/langs/en_US/companies.lang index b29bca83e9b..f2b064910eb 100644 --- a/htdocs/langs/en_US/companies.lang +++ b/htdocs/langs/en_US/companies.lang @@ -1,4 +1,5 @@ # Dolibarr language file - en_US - companies +CHARSET=ISO-8859-1 ErrorBadEMail=EMail %s is wrong ErrorCompanyNameAlreadyExists=Company name %s already exists. Choose another one. ErrorPrefixAlreadyExists=Prefix %s already exists. Choose another one. diff --git a/htdocs/langs/en_US/compta.lang b/htdocs/langs/en_US/compta.lang index fbbd474f700..25cb2f4347d 100644 --- a/htdocs/langs/en_US/compta.lang +++ b/htdocs/langs/en_US/compta.lang @@ -1,4 +1,5 @@ # Dolibarr language file - en_US - compta +CHARSET=ISO-8859-1 Accountancy=Accountancy AccountancyCard=Accountancy card Treasury=Treasury diff --git a/htdocs/langs/en_US/contracts.lang b/htdocs/langs/en_US/contracts.lang index f1876e7e536..82174ad3629 100644 --- a/htdocs/langs/en_US/contracts.lang +++ b/htdocs/langs/en_US/contracts.lang @@ -1,4 +1,5 @@ # Dolibarr language file - en_US - contracts +CHARSET=ISO-8859-1 ContractsArea=Contracts area ListOfContracts=List of contracts LastContracts=Last %s modified contracts diff --git a/htdocs/langs/en_US/deliveries.lang b/htdocs/langs/en_US/deliveries.lang index 2c722a54a98..83c6816375c 100644 --- a/htdocs/langs/en_US/deliveries.lang +++ b/htdocs/langs/en_US/deliveries.lang @@ -1,4 +1,5 @@ # Dolibarr language file - en_US - deliveries +CHARSET=ISO-8859-1 Delivery=Delivery Deliveries=Deliveries DeliveryCard=Delivery card diff --git a/htdocs/langs/en_US/dict.lang b/htdocs/langs/en_US/dict.lang index 5ce4365a63d..61994c0404b 100755 --- a/htdocs/langs/en_US/dict.lang +++ b/htdocs/langs/en_US/dict.lang @@ -1,4 +1,5 @@ # Dolibarr language file - en_US - dict +CHARSET=ISO-8859-1 CountryFR=France CountryBE=Belgium CountryIT=Italy diff --git a/htdocs/langs/en_US/domains.lang b/htdocs/langs/en_US/domains.lang index 0e050f63f8b..5364ccc0fb6 100644 --- a/htdocs/langs/en_US/domains.lang +++ b/htdocs/langs/en_US/domains.lang @@ -1,3 +1,4 @@ # Dolibarr language file - en_US - domains +CHARSET=ISO-8859-1 DomainNames=Domain names NewDomain=New domain name \ No newline at end of file diff --git a/htdocs/langs/en_US/donations.lang b/htdocs/langs/en_US/donations.lang index caef330c6f9..e87fdd4247c 100644 --- a/htdocs/langs/en_US/donations.lang +++ b/htdocs/langs/en_US/donations.lang @@ -1,4 +1,5 @@ # Dolibarr language file - en_US - donations +CHARSET=ISO-8859-1 Donation=Donation Donationss=Donations Donor=Donor diff --git a/htdocs/langs/en_US/ecm.lang b/htdocs/langs/en_US/ecm.lang index 3560e6c42a0..f1dd044343d 100644 --- a/htdocs/langs/en_US/ecm.lang +++ b/htdocs/langs/en_US/ecm.lang @@ -1,4 +1,5 @@ # Dolibarr language file - en_US - ecm +CHARSET=ISO-8859-1 MenuECM=Documents DocsMine=My documents DocsGenerated=Generated documents diff --git a/htdocs/langs/en_US/errors.lang b/htdocs/langs/en_US/errors.lang index 23beaa147fc..1d976d62c09 100644 --- a/htdocs/langs/en_US/errors.lang +++ b/htdocs/langs/en_US/errors.lang @@ -1,4 +1,5 @@ # Dolibarr language file - en_US - errors +CHARSET=ISO-8859-1 ErrorLoginAlreadyExists=Login %s already exists. ErrorGroupAlreadyExists=Group %s already exists. ErrorDuplicateTrigger=A trigger file with class nam '%s' is present sevaral times. Remove duplicate trigger file in directory '%s'. diff --git a/htdocs/langs/en_US/exports.lang b/htdocs/langs/en_US/exports.lang index 582989749ae..d456a944df4 100644 --- a/htdocs/langs/en_US/exports.lang +++ b/htdocs/langs/en_US/exports.lang @@ -1,4 +1,5 @@ # Dolibarr language file - en_US - exports +CHARSET=ISO-8859-1 ExportsArea=Exports area ImportArea=Import area NewExport=New export diff --git a/htdocs/langs/en_US/interventions.lang b/htdocs/langs/en_US/interventions.lang index 7332049cba1..0f394c15218 100644 --- a/htdocs/langs/en_US/interventions.lang +++ b/htdocs/langs/en_US/interventions.lang @@ -1,4 +1,5 @@ # Dolibarr language file - en_US - interventions +CHARSET=ISO-8859-1 Intervention=Intervention Interventions=Interventions InterventionCard=Intervention card diff --git a/htdocs/langs/en_US/ldap.lang b/htdocs/langs/en_US/ldap.lang index 1678dd92679..89dd2e4faa2 100644 --- a/htdocs/langs/en_US/ldap.lang +++ b/htdocs/langs/en_US/ldap.lang @@ -1,4 +1,5 @@ # Dolibarr language file - en_US - ldap +CHARSET=ISO-8859-1 DomainPassword=Password for domain YouMustChangePassNextLogon=Password for user %s on the domain %s must be changed. UserMustChangePassNextLogon=User must change password on the domain %s diff --git a/htdocs/langs/en_US/mails.lang b/htdocs/langs/en_US/mails.lang index 5b506580dcc..12399cebb5d 100644 --- a/htdocs/langs/en_US/mails.lang +++ b/htdocs/langs/en_US/mails.lang @@ -1,4 +1,5 @@ # Dolibarr language file - en_US - mails +CHARSET=ISO-8859-1 Mailing=EMailing EMailing=EMailing Mailings=EMailings diff --git a/htdocs/langs/en_US/members.lang b/htdocs/langs/en_US/members.lang index e15c48545e2..1359ea9a3a8 100644 --- a/htdocs/langs/en_US/members.lang +++ b/htdocs/langs/en_US/members.lang @@ -1,4 +1,5 @@ # Dolibarr language file - en_US - members +CHARSET=ISO-8859-1 MembersArea=Members area PublicMembersArea=Public members area MemberCard=Member card diff --git a/htdocs/langs/en_US/orders.lang b/htdocs/langs/en_US/orders.lang index 360cf00d961..d7092d5c496 100755 --- a/htdocs/langs/en_US/orders.lang +++ b/htdocs/langs/en_US/orders.lang @@ -1,4 +1,5 @@ # Dolibarr language file - en_US - orders +CHARSET=ISO-8859-1 OrdersArea=Customers orders area SuppliersOrdersArea=Suppliers orders area OrderCard=Order card diff --git a/htdocs/langs/en_US/oscommerce.lang b/htdocs/langs/en_US/oscommerce.lang index 1b031f39f20..afe622db5e6 100644 --- a/htdocs/langs/en_US/oscommerce.lang +++ b/htdocs/langs/en_US/oscommerce.lang @@ -1,4 +1,5 @@ # Dolibarr language file - en_US - oscommerce +CHARSET=ISO-8859-1 OSCommerce=OS Commerce OSCommerceSetup=OS Commerce module setup OSCommerceSetupSaved=OS Commerce setup saved diff --git a/htdocs/langs/en_US/other.lang b/htdocs/langs/en_US/other.lang index c10ee5deb65..a61574e6cc6 100644 --- a/htdocs/langs/en_US/other.lang +++ b/htdocs/langs/en_US/other.lang @@ -1,4 +1,5 @@ # Dolibarr language file - en_US - other +CHARSET=ISO-8859-1 ErrorPasswordDiffers=Passwords differs, please type them again. ErrorForbidden=Access forbidden.
You try to access to a page, area or feature without being in an authenticated session or that is not allowed to your user. ErrorForbidden2=Permission for this login can be defined by your Dolibarr administrator from menu %s->%s. diff --git a/htdocs/langs/en_US/products.lang b/htdocs/langs/en_US/products.lang index de9795ab905..42b6a8612ae 100644 --- a/htdocs/langs/en_US/products.lang +++ b/htdocs/langs/en_US/products.lang @@ -1,4 +1,5 @@ # Dolibarr language file - en_US - products +CHARSET=ISO-8859-1 ProductServiceCard=Products/Services card Products=Products Services=Services diff --git a/htdocs/langs/en_US/projects.lang b/htdocs/langs/en_US/projects.lang index f33f7586d2e..cda9f834a00 100755 --- a/htdocs/langs/en_US/projects.lang +++ b/htdocs/langs/en_US/projects.lang @@ -1,4 +1,5 @@ # Dolibarr language file - en_US - projects +CHARSET=ISO-8859-1 Project=Project Projects=Projects SharedProject=Shared project diff --git a/htdocs/langs/en_US/propal.lang b/htdocs/langs/en_US/propal.lang index 011e043baa5..66a7e4f45d0 100644 --- a/htdocs/langs/en_US/propal.lang +++ b/htdocs/langs/en_US/propal.lang @@ -1,4 +1,5 @@ # Dolibarr language file - en_US - propal +CHARSET=ISO-8859-1 Proposals=Commercial proposals Proposal=Commercial proposal ProposalsDraft=Draft commercial proposals diff --git a/htdocs/langs/en_US/sendings.lang b/htdocs/langs/en_US/sendings.lang index 327b2d7d6cc..13078b13a6a 100644 --- a/htdocs/langs/en_US/sendings.lang +++ b/htdocs/langs/en_US/sendings.lang @@ -1,4 +1,5 @@ # Dolibarr language file - en_US - sendings +CHARSET=ISO-8859-1 RefSending=Ref. sending Sending=Sending Sendings=Sendings diff --git a/htdocs/langs/en_US/shop.lang b/htdocs/langs/en_US/shop.lang index 80e8d8ee6dc..9503a03cbc9 100644 --- a/htdocs/langs/en_US/shop.lang +++ b/htdocs/langs/en_US/shop.lang @@ -1,4 +1,5 @@ # Dolibarr language file - en_US - shop +CHARSET=ISO-8859-1 Shop=Shop ShopWeb=Web Shop LastOrders=Last orders diff --git a/htdocs/langs/en_US/stocks.lang b/htdocs/langs/en_US/stocks.lang index 05958d2bf33..0932686c1c4 100644 --- a/htdocs/langs/en_US/stocks.lang +++ b/htdocs/langs/en_US/stocks.lang @@ -1,4 +1,5 @@ # Dolibarr language file - en_US - stocks +CHARSET=ISO-8859-1 WarehouseCard=Warehouse card Warehouse=Warehouse NewWarehouse=New warehouse / Stock area diff --git a/htdocs/langs/en_US/suppliers.lang b/htdocs/langs/en_US/suppliers.lang index 01994b83d60..90507adff49 100644 --- a/htdocs/langs/en_US/suppliers.lang +++ b/htdocs/langs/en_US/suppliers.lang @@ -1,4 +1,5 @@ # Dolibarr language file - en_US - suppliers +CHARSET=ISO-8859-1 Suppliers=Suppliers Supplier=Supplier AddSupplier=Add a supplier diff --git a/htdocs/langs/en_US/trips.lang b/htdocs/langs/en_US/trips.lang index be4ce680300..7ecac86295c 100644 --- a/htdocs/langs/en_US/trips.lang +++ b/htdocs/langs/en_US/trips.lang @@ -1,4 +1,5 @@ # Dolibarr language file - en_US - trips +CHARSET=ISO-8859-1 Trip=Trip Trips=Trips TripsAndExpenses=Trips and expenses diff --git a/htdocs/langs/en_US/users.lang b/htdocs/langs/en_US/users.lang index 5d1916cfdc3..65c26da7de6 100755 --- a/htdocs/langs/en_US/users.lang +++ b/htdocs/langs/en_US/users.lang @@ -1,4 +1,5 @@ # Dolibarr language file - en_US - users +CHARSET=ISO-8859-1 UserCard=User card ContactCard=Contact card GroupCard=Group card diff --git a/htdocs/langs/en_US/withdrawals.lang b/htdocs/langs/en_US/withdrawals.lang index 22a1674ee6f..094dc17cacf 100755 --- a/htdocs/langs/en_US/withdrawals.lang +++ b/htdocs/langs/en_US/withdrawals.lang @@ -1,4 +1,5 @@ # Dolibarr language file - en_US - withdrawals +CHARSET=ISO-8859-1 StandingOrdersArea=Standing orders area CustomersStandingOrdersArea=Customers standing orders area StandingOrders=Standing orders diff --git a/htdocs/langs/nl_BE/main.lang b/htdocs/langs/nl_BE/main.lang index 7246ace24a7..1c185f037fb 100644 --- a/htdocs/langs/nl_BE/main.lang +++ b/htdocs/langs/nl_BE/main.lang @@ -1,5 +1,5 @@ # Dolibarr language file - nl_BE - main -charset=iso-8859-1 +CHARSET=iso-8859-1 SeparatorDecimal=, SeparatorThousand= Error=Fout diff --git a/htdocs/langs/nl_NL/admin.lang b/htdocs/langs/nl_NL/admin.lang index 360b088386f..99f5e5a92bc 100644 --- a/htdocs/langs/nl_NL/admin.lang +++ b/htdocs/langs/nl_NL/admin.lang @@ -10,6 +10,7 @@ // Date 2009-01-19 00:04:30 // START - Lines generated via autotranslator.php tool. // Reference language: en_US +CHARSET=UTF-8 Version=Versie VersionProgram=Versie programma VersionLastInstall=Oorspronkelijke versie installeren diff --git a/htdocs/langs/nl_NL/agenda.lang b/htdocs/langs/nl_NL/agenda.lang index 49b4f020b8d..046d43fac0e 100644 --- a/htdocs/langs/nl_NL/agenda.lang +++ b/htdocs/langs/nl_NL/agenda.lang @@ -10,6 +10,7 @@ // Date 2009-01-18 23:55:46 // START - Lines generated via autotranslator.php tool. // Reference language: en_US +CHARSET=UTF-8 Actions=Acties ActionsArea=Acties gebied (Evenementen en taken) Agenda=Agenda diff --git a/htdocs/langs/nl_NL/banks.lang b/htdocs/langs/nl_NL/banks.lang index 6672dbf6047..327693f16bc 100644 --- a/htdocs/langs/nl_NL/banks.lang +++ b/htdocs/langs/nl_NL/banks.lang @@ -10,6 +10,7 @@ // Date 2009-01-18 23:55:46 // START - Lines generated via autotranslator.php tool. // Reference language: en_US +CHARSET=UTF-8 Bank=Bank Banks=Banken MenuBankCash=Bank / Cash diff --git a/htdocs/langs/nl_NL/bills.lang b/htdocs/langs/nl_NL/bills.lang index cb3f57e1320..516e0464948 100644 --- a/htdocs/langs/nl_NL/bills.lang +++ b/htdocs/langs/nl_NL/bills.lang @@ -10,6 +10,7 @@ // Date 2009-01-18 23:57:49 // START - Lines generated via autotranslator.php tool. // Reference language: en_US +CHARSET=UTF-8 Bill=Factuur Bills=Facturen BillsCustomers=Klanten facturen @@ -126,8 +127,8 @@ BillFrom=Van BillTo=Bill tot ActionsOnBill=Acties op factuur NewBill=Nieuwe factuur -Prélèvements=Doorlopende opdracht -Prélèvements=Permanente opdrachten +Pr�l�vements=Doorlopende opdracht +Pr�l�vements=Permanente opdrachten LastBills=Last% s facturen LastCustomersBills=Last% s klanten facturen LastSuppliersBills=Last% s leveranciers facturen diff --git a/htdocs/langs/nl_NL/boxes.lang b/htdocs/langs/nl_NL/boxes.lang index cfe069aa408..1dea3b907ee 100644 --- a/htdocs/langs/nl_NL/boxes.lang +++ b/htdocs/langs/nl_NL/boxes.lang @@ -10,6 +10,7 @@ // Date 2009-01-18 23:57:49 // START - Lines generated via autotranslator.php tool. // Reference language: en_US +CHARSET=UTF-8 BoxLastRssInfos=RSS informatie BoxLastProducts=Laatste producten / diensten BoxLastProductsInContract=Laatste gecontracteerde producten / diensten diff --git a/htdocs/langs/nl_NL/categories.lang b/htdocs/langs/nl_NL/categories.lang index 846f9fed319..0b2e644fcb0 100644 --- a/htdocs/langs/nl_NL/categories.lang +++ b/htdocs/langs/nl_NL/categories.lang @@ -10,6 +10,7 @@ // Date 2009-01-18 23:57:49 // START - Lines generated via autotranslator.php tool. // Reference language: en_US +CHARSET=UTF-8 Category=Categorie Categories=Categorieën Rubrique=Categorie diff --git a/htdocs/langs/nl_NL/commercial.lang b/htdocs/langs/nl_NL/commercial.lang index 0b8ec07c39f..db7a46b9560 100644 --- a/htdocs/langs/nl_NL/commercial.lang +++ b/htdocs/langs/nl_NL/commercial.lang @@ -10,6 +10,7 @@ // Date 2009-01-18 23:57:49 // START - Lines generated via autotranslator.php tool. // Reference language: en_US +CHARSET=UTF-8 Commercial=Commercieel CommercialArea=Commerciële ruimte CommercialCard=Commerciële kaart diff --git a/htdocs/langs/nl_NL/companies.lang b/htdocs/langs/nl_NL/companies.lang index 1ff8113c6d6..ea7bc91792e 100644 --- a/htdocs/langs/nl_NL/companies.lang +++ b/htdocs/langs/nl_NL/companies.lang @@ -10,6 +10,7 @@ // Date 2009-01-18 23:57:49 // START - Lines generated via autotranslator.php tool. // Reference language: en_US +CHARSET=UTF-8 ErrorBadEMail=EMail% s is verkeerd ErrorCompanyNameAlreadyExists=Firmanaam% s bestaat reeds. Kies een andere. ErrorPrefixAlreadyExists=Prefix% s bestaat reeds. Kies een andere. diff --git a/htdocs/langs/nl_NL/compta.lang b/htdocs/langs/nl_NL/compta.lang index c88d4402e2d..299bdb2d938 100644 --- a/htdocs/langs/nl_NL/compta.lang +++ b/htdocs/langs/nl_NL/compta.lang @@ -10,6 +10,7 @@ // Date 2009-01-18 23:57:49 // START - Lines generated via autotranslator.php tool. // Reference language: en_US +CHARSET=UTF-8 Accountancy=Accountancy AccountancyCard=Accountancy kaart Treasury=Schatkist diff --git a/htdocs/langs/nl_NL/contracts.lang b/htdocs/langs/nl_NL/contracts.lang index 371fb284846..16877c5d2c5 100644 --- a/htdocs/langs/nl_NL/contracts.lang +++ b/htdocs/langs/nl_NL/contracts.lang @@ -10,6 +10,7 @@ // Date 2009-01-18 23:57:49 // START - Lines generated via autotranslator.php tool. // Reference language: en_US +CHARSET=UTF-8 ContractsArea=Contracten gebied ListOfContracts=Lijst van opdrachten LastContracts=Last% s bewerkt contracten diff --git a/htdocs/langs/nl_NL/deliveries.lang b/htdocs/langs/nl_NL/deliveries.lang index f80d1d7b07c..68735c2354f 100644 --- a/htdocs/langs/nl_NL/deliveries.lang +++ b/htdocs/langs/nl_NL/deliveries.lang @@ -10,6 +10,7 @@ // Date 2009-01-18 23:57:49 // START - Lines generated via autotranslator.php tool. // Reference language: en_US +CHARSET=UTF-8 Delivery=Aflevering Deliveries=Leveringen DeliveryCard=Bezorging kaart diff --git a/htdocs/langs/nl_NL/dict.lang b/htdocs/langs/nl_NL/dict.lang index 0f3313c4a09..1032f45338a 100644 --- a/htdocs/langs/nl_NL/dict.lang +++ b/htdocs/langs/nl_NL/dict.lang @@ -10,6 +10,7 @@ // Date 2009-01-18 23:57:49 // START - Lines generated via autotranslator.php tool. // Reference language: en_US +CHARSET=UTF-8 CountryFR=Frankrijk CountryBE=België CountryIT=Italië diff --git a/htdocs/langs/nl_NL/domains.lang b/htdocs/langs/nl_NL/domains.lang index 5c35d568427..ec0ceb1831c 100644 --- a/htdocs/langs/nl_NL/domains.lang +++ b/htdocs/langs/nl_NL/domains.lang @@ -10,6 +10,7 @@ // Date 2009-01-18 23:57:49 // START - Lines generated via autotranslator.php tool. // Reference language: en_US +CHARSET=UTF-8 DomainNames=Domeinnamen NewDomain=Nieuwe domeinnaam // Date 2009-01-18 23:57:49 diff --git a/htdocs/langs/nl_NL/donations.lang b/htdocs/langs/nl_NL/donations.lang index 6f29f8d2019..2a9946d44db 100644 --- a/htdocs/langs/nl_NL/donations.lang +++ b/htdocs/langs/nl_NL/donations.lang @@ -10,6 +10,7 @@ // Date 2009-01-18 23:57:49 // START - Lines generated via autotranslator.php tool. // Reference language: en_US +CHARSET=UTF-8 Donation=Donatie Donationss=Donaties Donor=Donor diff --git a/htdocs/langs/nl_NL/ecm.lang b/htdocs/langs/nl_NL/ecm.lang index 77bd13bb20a..8b2ebff6bb0 100644 --- a/htdocs/langs/nl_NL/ecm.lang +++ b/htdocs/langs/nl_NL/ecm.lang @@ -10,6 +10,7 @@ // Date 2009-01-19 00:04:30 // START - Lines generated via autotranslator.php tool. // Reference language: en_US +CHARSET=UTF-8 MenuECM=Documenten DocsMine=Mijn documenten DocsGenerated=Gegenereerd documenten diff --git a/htdocs/langs/nl_NL/errors.lang b/htdocs/langs/nl_NL/errors.lang index 34ae5a76f34..59b1b9d530e 100644 --- a/htdocs/langs/nl_NL/errors.lang +++ b/htdocs/langs/nl_NL/errors.lang @@ -10,6 +10,7 @@ // Date 2009-01-18 23:57:49 // START - Lines generated via autotranslator.php tool. // Reference language: en_US +CHARSET=UTF-8 ErrorLoginAlreadyExists=Inloggen% s bestaat reeds. ErrorGroupAlreadyExists=Groep% s bestaat reeds. ErrorDuplicateTrigger=Een trigger bestand met klasse nam '% s' is aanwezig sevaral tijden. Verwijder dubbele trigger-bestand in de directory '% s'. diff --git a/htdocs/langs/nl_NL/exports.lang b/htdocs/langs/nl_NL/exports.lang index 05ea8ec5970..7c66fb42c71 100644 --- a/htdocs/langs/nl_NL/exports.lang +++ b/htdocs/langs/nl_NL/exports.lang @@ -10,6 +10,7 @@ // Date 2009-01-18 23:57:49 // START - Lines generated via autotranslator.php tool. // Reference language: en_US +CHARSET=UTF-8 ExportsArea=Uitvoer gebied ImportArea=Import gebied NewExport=Nieuwe exportmogelijkheden diff --git a/htdocs/langs/nl_NL/interventions.lang b/htdocs/langs/nl_NL/interventions.lang index 0ced0144baf..770e1f793e9 100644 --- a/htdocs/langs/nl_NL/interventions.lang +++ b/htdocs/langs/nl_NL/interventions.lang @@ -10,6 +10,7 @@ // Date 2009-01-19 00:04:30 // START - Lines generated via autotranslator.php tool. // Reference language: en_US +CHARSET=UTF-8 Intervention=Interventie Interventions=Interventies InterventionCard=Interventie-kaart diff --git a/htdocs/langs/nl_NL/ldap.lang b/htdocs/langs/nl_NL/ldap.lang index 74698cb5b77..c8bbc00cb81 100644 --- a/htdocs/langs/nl_NL/ldap.lang +++ b/htdocs/langs/nl_NL/ldap.lang @@ -10,6 +10,7 @@ // Date 2009-01-19 00:04:30 // START - Lines generated via autotranslator.php tool. // Reference language: en_US +CHARSET=UTF-8 DomainPassword=Wachtwoord voor het domein YouMustChangePassNextLogon=Wachtwoord voor gebruiker% s op het domein% s moet worden veranderd. UserMustChangePassNextLogon=Gebruiker moet wachtwoord wijzigen op het domein% s diff --git a/htdocs/langs/nl_NL/mails.lang b/htdocs/langs/nl_NL/mails.lang index 1479a43cf07..5d9a6ce36f6 100644 --- a/htdocs/langs/nl_NL/mails.lang +++ b/htdocs/langs/nl_NL/mails.lang @@ -10,6 +10,7 @@ // Date 2009-01-19 00:04:30 // START - Lines generated via autotranslator.php tool. // Reference language: en_US +CHARSET=UTF-8 Mailing=E-mailen EMailing=E-mailen Mailings=EMailings diff --git a/htdocs/langs/nl_NL/members.lang b/htdocs/langs/nl_NL/members.lang index 6a5e3050cdd..e84eb29352b 100644 --- a/htdocs/langs/nl_NL/members.lang +++ b/htdocs/langs/nl_NL/members.lang @@ -10,6 +10,7 @@ // Date 2009-01-19 00:04:30 // START - Lines generated via autotranslator.php tool. // Reference language: en_US +CHARSET=UTF-8 MembersArea=Members Area PublicMembersArea=Openbare leden gebied MemberCard=Lid kaart diff --git a/htdocs/langs/nl_NL/orders.lang b/htdocs/langs/nl_NL/orders.lang index b289e130ffc..ba7b9e35ec6 100644 --- a/htdocs/langs/nl_NL/orders.lang +++ b/htdocs/langs/nl_NL/orders.lang @@ -10,6 +10,7 @@ // Date 2009-01-19 00:04:30 // START - Lines generated via autotranslator.php tool. // Reference language: en_US +CHARSET=UTF-8 OrdersArea=Klanten bestellingen gebied SuppliersOrdersArea=Leveranciers bestellingen gebied OrderCard=Bestel kaart diff --git a/htdocs/langs/nl_NL/oscommerce.lang b/htdocs/langs/nl_NL/oscommerce.lang index 94b04ca988d..3ae0a605a9c 100644 --- a/htdocs/langs/nl_NL/oscommerce.lang +++ b/htdocs/langs/nl_NL/oscommerce.lang @@ -10,6 +10,7 @@ // Date 2009-01-19 00:04:30 // START - Lines generated via autotranslator.php tool. // Reference language: en_US +CHARSET=UTF-8 OSCommerce=OS Commerce OSCommerceSetup=OS Commerce module setup OSCommerceSetupSaved=OS Commerce setup opgeslagen diff --git a/htdocs/langs/nl_NL/other.lang b/htdocs/langs/nl_NL/other.lang index 70b8c9f4313..f494c1d4563 100644 --- a/htdocs/langs/nl_NL/other.lang +++ b/htdocs/langs/nl_NL/other.lang @@ -10,6 +10,7 @@ // Date 2009-01-19 00:04:30 // START - Lines generated via autotranslator.php tool. // Reference language: en_US +CHARSET=UTF-8 ErrorPasswordDiffers=Wachtwoorden verschilt, typt u deze opnieuw. ErrorForbidden=Toegang verboden.
Je probeert de toegang tot een pagina of functie zonder in een geauthentiseerde sessie, of dat niet is toegestaan om uw gebruikersnaam. ErrorForbidden2=Toestemming voor deze aanmelding kan worden gedefinieerd door de beheerder van Dolibarr menu% s->% s. diff --git a/htdocs/langs/nl_NL/products.lang b/htdocs/langs/nl_NL/products.lang index 521d7a3c7c2..415f0532438 100644 --- a/htdocs/langs/nl_NL/products.lang +++ b/htdocs/langs/nl_NL/products.lang @@ -10,6 +10,7 @@ // Date 2009-01-19 00:04:30 // START - Lines generated via autotranslator.php tool. // Reference language: en_US +CHARSET=UTF-8 ProductServiceCard=Producten / Diensten kaart Products=Producten Services=Diensten diff --git a/htdocs/langs/nl_NL/projects.lang b/htdocs/langs/nl_NL/projects.lang index fcbd3637014..ae4b9cc8dce 100644 --- a/htdocs/langs/nl_NL/projects.lang +++ b/htdocs/langs/nl_NL/projects.lang @@ -10,6 +10,7 @@ // Date 2009-01-19 00:04:30 // START - Lines generated via autotranslator.php tool. // Reference language: en_US +CHARSET=UTF-8 Project=Project Projects=Projecten SharedProject=Gezamenlijk project diff --git a/htdocs/langs/nl_NL/propal.lang b/htdocs/langs/nl_NL/propal.lang index e2cb9b97c37..fee95d72465 100644 --- a/htdocs/langs/nl_NL/propal.lang +++ b/htdocs/langs/nl_NL/propal.lang @@ -10,6 +10,7 @@ // Date 2009-01-19 00:04:30 // START - Lines generated via autotranslator.php tool. // Reference language: en_US +CHARSET=UTF-8 Proposals=Commerciële voorstellen Proposal=Commerciële voorstel ProposalsDraft=Ontwerp commerciële voorstellen diff --git a/htdocs/langs/nl_NL/sendings.lang b/htdocs/langs/nl_NL/sendings.lang index f2d6fc2ff85..66c7e57b204 100644 --- a/htdocs/langs/nl_NL/sendings.lang +++ b/htdocs/langs/nl_NL/sendings.lang @@ -10,6 +10,7 @@ // Date 2009-01-19 00:04:30 // START - Lines generated via autotranslator.php tool. // Reference language: en_US +CHARSET=UTF-8 RefSending=Ref. verzenden Sending=Thuisinstelling Sendings=Verzendingen diff --git a/htdocs/langs/nl_NL/shop.lang b/htdocs/langs/nl_NL/shop.lang index 8dc2e6dd8bc..68e997160c8 100644 --- a/htdocs/langs/nl_NL/shop.lang +++ b/htdocs/langs/nl_NL/shop.lang @@ -10,6 +10,7 @@ // Date 2009-01-19 00:04:30 // START - Lines generated via autotranslator.php tool. // Reference language: en_US +CHARSET=UTF-8 Shop=Winkel ShopWeb=Web Winkel LastOrders=Last orders diff --git a/htdocs/langs/nl_NL/stocks.lang b/htdocs/langs/nl_NL/stocks.lang index cbfb86ce46d..5014e0e7950 100644 --- a/htdocs/langs/nl_NL/stocks.lang +++ b/htdocs/langs/nl_NL/stocks.lang @@ -10,6 +10,7 @@ // Date 2009-01-19 00:04:30 // START - Lines generated via autotranslator.php tool. // Reference language: en_US +CHARSET=UTF-8 WarehouseCard=Warehouse kaart Warehouse=Warehouse NewWarehouse=Nieuw magazijn / Stock gebied diff --git a/htdocs/langs/nl_NL/suppliers.lang b/htdocs/langs/nl_NL/suppliers.lang index 94236283da9..362c4ed592a 100644 --- a/htdocs/langs/nl_NL/suppliers.lang +++ b/htdocs/langs/nl_NL/suppliers.lang @@ -10,6 +10,7 @@ // Date 2009-01-19 00:04:30 // START - Lines generated via autotranslator.php tool. // Reference language: en_US +CHARSET=UTF-8 Suppliers=Leveranciers Supplier=Leverancier AddSupplier=Voeg een leverancier diff --git a/htdocs/langs/nl_NL/trips.lang b/htdocs/langs/nl_NL/trips.lang index 68a218871a3..293060b21ba 100644 --- a/htdocs/langs/nl_NL/trips.lang +++ b/htdocs/langs/nl_NL/trips.lang @@ -10,6 +10,7 @@ // Date 2009-01-19 00:04:30 // START - Lines generated via autotranslator.php tool. // Reference language: en_US +CHARSET=UTF-8 Trip=Reis Trips=Uitstapjes TripsAndExpenses=Uitstapjes en lasten diff --git a/htdocs/langs/nl_NL/users.lang b/htdocs/langs/nl_NL/users.lang index 65cc82d3dce..0286052aaa1 100644 --- a/htdocs/langs/nl_NL/users.lang +++ b/htdocs/langs/nl_NL/users.lang @@ -10,6 +10,7 @@ // Date 2009-01-19 00:04:30 // START - Lines generated via autotranslator.php tool. // Reference language: en_US +CHARSET=UTF-8 UserCard=Gebruiker kaart ContactCard=Contactkaart GroupCard=Groep kaart diff --git a/htdocs/langs/nl_NL/withdrawals.lang b/htdocs/langs/nl_NL/withdrawals.lang index bbaa9c301da..45094ac2c5d 100644 --- a/htdocs/langs/nl_NL/withdrawals.lang +++ b/htdocs/langs/nl_NL/withdrawals.lang @@ -10,6 +10,7 @@ // Date 2009-01-19 00:04:30 // START - Lines generated via autotranslator.php tool. // Reference language: en_US +CHARSET=UTF-8 StandingOrdersArea=Permanente opdrachten gebied CustomersStandingOrdersArea=Klanten permanente opdrachten gebied StandingOrders=Permanente opdrachten diff --git a/htdocs/langs/pt_PT/main.lang b/htdocs/langs/pt_PT/main.lang index 89146b8ff77..bc3409dd47a 100644 --- a/htdocs/langs/pt_PT/main.lang +++ b/htdocs/langs/pt_PT/main.lang @@ -1,5 +1,5 @@ # Dolibarr language file - pt_PT - principal -charset=iso-8859-1 +CHARSET=ISO-8859-1 Error=Erro ErrorFieldRequired=O campo '%s' é obrigatório ErrorFileDoesNotExists=O ficheiro %s não existe diff --git a/htdocs/translate.class.php b/htdocs/translate.class.php index ea337c4ca52..b28e6156a98 100644 --- a/htdocs/translate.class.php +++ b/htdocs/translate.class.php @@ -42,8 +42,8 @@ class Translate { var $cache_labels=array(); // Cache for labels - var $charset_inputfile='ISO-8859-1'; // Codage used by default to encode/decode lang files (used if CHARSET not found in file) - var $charset_output='UTF-8'; // Codage used by default for "trans" method output if $conf->character_set_client not defined (should never happen) + var $charset_inputfile=array(); // To store charset encoding used for language + var $charset_output='UTF-8'; // Codage used by default for "trans" method output if $conf->character_set_client not defined (should never happen) /** @@ -214,7 +214,6 @@ class Translate { if ($this->defaultlang == "en_US") $scandiralt = $searchdir."/fr_FR"; elseif (eregi('^fr',$this->defaultlang) && $this->defaultlang != 'fr_FR') $scandiralt = $searchdir."/fr_FR"; elseif (eregi('^en',$this->defaultlang) && $this->defaultlang != 'en_US') $scandiralt = $searchdir."/en_US"; - elseif (eregi('^es',$this->defaultlang) && $this->defaultlang != 'es_ES') $scandiralt = $searchdir."/es_ES"; else $scandiralt = $searchdir."/en_US"; $file_lang = $scandiralt . "/".$domain.".lang"; @@ -258,14 +257,14 @@ class Translate { if (eregi('^CHARSET$',$key)) { // On est tombe sur une balise qui declare le format du fichier lu - $this->charset_inputfile=strtoupper($value); - //print 'File '.$file_lang.' has format '.$this->charset_inputfile.'
'; + $this->charset_inputfile[$domain]=strtoupper($value); + //print 'File '.$file_lang.' is declared to have format '.$this->charset_inputfile[$domain].'
'; } else { // On stocke toujours dans le tableau Tab en UTF-8 - //if ($this->charset_inputfile == 'UTF-8') $value=utf8_decode($value); - if ($this->charset_inputfile == 'ISO-8859-1') $value=utf8_encode($value); + //if (empty($this->charset_inputfile[$domain]) || $this->charset_inputfile[$domain] == 'UTF-8') $value=utf8_decode($value); + if (empty($this->charset_inputfile[$domain]) || $this->charset_inputfile[$domain] == 'ISO-8859-1') $value=utf8_encode($value); // We do not load Separator values for alternate files if (! $newalt || (! eregi('^Separator',$key)))