diff --git a/htdocs/langs/ar_AR/other.lang b/htdocs/langs/ar_AR/other.lang
index 69136e3e66a624fb3f20b3571c3cd0c84b79237a..1fe91f467382228565a4859fa2bfd44df0ba6d5a 100644
--- a/htdocs/langs/ar_AR/other.lang
+++ b/htdocs/langs/ar_AR/other.lang
@@ -52,11 +52,9 @@ PredefinedMailContentSendInvoice=Veuillez trouver كايماني المشترك
PredefinedMailContentSendInvoiceReminder=Nous apportons à vôtre connaissance كيو facture __FACREF__ شمال شرق لوس انجليس semble النظام avoir été réglée. لوس انجليس لvoici donc ، من أجل إهبط ، én pièce jointe. \ ن \ nCordialement \ ن \ ن
PredefinedMailContentSendProposal=Veuillez trouver كايماني المشترك بين لوس انجليس لاقتراح التجاري __PROPREF__ \ ن \ nCordialement \ ن \ ن
PredefinedMailContentSendOrder=Veuillez trouver كايماني المشترك بين لوس انجليس لcommande __ORDERREF__ \ ن \ nCordialement \ ن \ ن
-DemoDesc=Dolibarr يست مدمجة ولكن تخطيط موارد المؤسسات مبني من عدة وحدات fonctionnal. وقال ان العرض يشمل جميع وحدات لا يعني اي شيء يحدث هذا أبدا. بذلك ، عرض عدة ملامح المتاحة.
ChooseYourDemoProfil=اختيار عرض ملف المباراة التي أنشطتك...
DemoFundation=أعضاء في إدارة مؤسسة
DemoFundation2=إدارة وأعضاء في الحساب المصرفي للمؤسسة
-DemoCompanyServiceOnly=إدارة حر activiy بيع الخدمة فقط
DemoCompanyShopWithCashDesk=تدير متجر مع مكتب النقدية
DemoCompanyProductAndStocks=إدارة شركة صغيرة أو متوسطة بيع المنتجات
DemoCompanyAll=إدارة شركة صغيرة أو متوسطة متعددة الأنشطة الرئيسية لجميع وحدات)
@@ -94,7 +92,6 @@ SizeUnitdm=مارك ألماني
SizeUnitcm=سم
SizeUnitmm=مم
BugTracker=علة تعقب
-SendNewPasswordDesc=هذا الشكل يتيح لك طلب جديد passord. سيكون من إرسالها إلى عنوان البريد الإلكتروني الخاص بك. <br> التغيير لن تكون فعالة إلا بعد النقر على تأكيد الصلة داخل هذه الرسالة. <br> تحقق من بريدك الالكتروني القارئ البرمجيات.
BackToLoginPage=عودة إلى صفحة تسجيل الدخول
AuthenticationDoesNotAllowSendNewPassword=طريقة التوثيق <b>٪ ق.</b> <br> في هذا الوضع ، لا يمكن معرفة Dolibarr أو تغيير كلمة السر الخاصة بك. <br> اتصل بمسؤول النظام إذا كنت تريد تغيير كلمة السر الخاصة بك.
EnableGDLibraryDesc=تثبيت أو تمكين ش ج مكتبة لديكم PHP لاستخدام هذا الخيار.
diff --git a/htdocs/langs/da_DA/other.lang b/htdocs/langs/da_DA/other.lang
index e2ee998490568a0bcd4caf7a29c56e2c66dd4d1a..efce542c72be395abeb9bc236aa031780c46012a 100644
--- a/htdocs/langs/da_DA/other.lang
+++ b/htdocs/langs/da_DA/other.lang
@@ -50,11 +50,9 @@ PredefinedMailContentSendInvoice=Veuillez trouver ci-joint la fremstilling __FAC
PredefinedMailContentSendInvoiceReminder=Nous apportons votre connaissance que la fremstilling __FACREF__ ne semble pas avoir t rgle. La voici donc, hæld rappel, da pice jointe. \ N \ nCordialement \ n \ n
PredefinedMailContentSendProposal=Veuillez trouver ci-joint la proposition commerciale __PROPREF__ \ n \ nCordialement \ n \ n
PredefinedMailContentSendOrder=Veuillez trouver ci-joint la commande __ORDERREF__ \ n \ nCordialement \ n \ n
-DemoDesc=Dolibarr er ikke en kompakt ERP, men er bygget fra flere fonctionnal moduler. En demo, der omfatter alle moduler ikke betyder noget, da dette aldrig sker. Så flere demo profiler der er tilgængelige.
ChooseYourDemoProfil=Vælg den demo profil, der passer til din virksomhed ...
DemoFundation=Administrer medlemmer af en fundation
DemoFundation2=Administrer medlemmer og bankkonto i en fundation
-DemoCompanyServiceOnly=Administrer en freelance activiy sælge service kun
DemoCompanyShopWithCashDesk=Administrer en butik med et kontant desk
DemoCompanyProductAndStocks=Administrer en lille eller mellemstor virksomhed, der sælger produkter
DemoCompanyAll=Administrer en lille eller mellemstor virksomhed med flere aktiviteter (alle de vigtigste moduler)
@@ -92,7 +90,6 @@ SizeUnitdm=dm
SizeUnitcm=cm
SizeUnitmm=mm
BugTracker=Bug tracker
-SendNewPasswordDesc=Denne form giver dig mulighed for at anmode om en ny passord. Det vil blive sendt til din email-adresse. <br> Ændring vil kun være effektiv, når de har klikket på bekræftelse linket i denne e-mail. <br> Tjek din e-mail reader software.
BackToLoginPage=Tilbage til login-siden
AuthenticationDoesNotAllowSendNewPassword=Authentication mode <b>er% s.</b> <br> I denne tilstand, Dolibarr ikke kan vide eller ændre din adgangskode. <br> Kontakt din systemadministrator, hvis du ønsker at ændre din adgangskode.
EnableGDLibraryDesc=Installere eller aktivere GD bibliotek med din PHP til brug af denne mulighed.
diff --git a/htdocs/langs/de_DE/other.lang b/htdocs/langs/de_DE/other.lang
index e1e7327c75bd086700fa6d610e5f7b1061a9d2ac..c50e945e978140c7326d1eea694bdab869f5ca09 100644
--- a/htdocs/langs/de_DE/other.lang
+++ b/htdocs/langs/de_DE/other.lang
@@ -48,7 +48,6 @@ PredefinedMailContentSendInvoice=Veuillez trouver ci-Joint la facture __FACREF__
PredefinedMailContentSendInvoiceReminder=Nous apportons votre connaissance que la facture __FACREF__ ne semble pas avoir t rgle. La voici donc, pour rappel, en Pice jointe. \ N \ nCordialement \ n \ n
PredefinedMailContentSendProposal=Veuillez trouver ci-Joint la proposition commerciale __PROPREF__ \ n \ nCordialement \ n \ n
PredefinedMailContentSendOrder=Veuillez trouver ci-Joint la commande __ORDERREF__ \ n \ nCordialement \ n \ n
-DemoDesc=Dolibarr ist nicht eine kompakte ERP, sondern besteht aus mehreren Modulen fonctionnal. Eine Demo, die alle Module bedeutet nichts, da dies nie eintritt. Also, mehrere Demo-Profile zur Verfügung stehen.
ChooseYourDemoProfil=Wählen Sie die Demo-profil, die mit Ihrer Tätigkeit ...
DemoFundation=Mitglieder verwalten einer Stiftung
DemoFundation2=Mitglieder verwalten und Bankkonto einer Stiftung
@@ -90,7 +89,6 @@ SizeUnitdm=dm
SizeUnitcm=cm
SizeUnitmm=mm
BugTracker=Bug-Tracker
-SendNewPasswordDesc=Dieses Formular erlaubt Ihnen, eine neue passord. Es wird an Ihre E-Mail-Adresse. <br> Änderungen werden erst wirksam, wenn Sie auf eine Bestätigung dieser E-Mail enthaltenen Link. <br> Überprüfen Sie Ihre E-Mail-Leser-Software.
BackToLoginPage=Zurück zur Login-Seite
AuthenticationDoesNotAllowSendNewPassword=Authentication-Modus <b>ist% s.</b> <br> In diesem Modus, Dolibarr noch nicht wissen können, ändern Sie Ihr Kennwort ein. <br> Wenden Sie sich an Ihren Systemadministrator, wenn Sie wollen, Ihr Passwort zu ändern.
EnableGDLibraryDesc=Installieren oder aktivieren GD-Library mit Ihrem PHP für den Einsatz dieser Option.
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 952002b10ae2b5fdd7f249ba1d09efdfb5954094..93d1d3e272b4a0036098bad4360d6e953dd94bd9 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -650,7 +650,7 @@ SetupDescription1=All parameters available in the setup area allow you to setup
SetupDescription2=The 2 most important setup steps are the 2 first ones in the left setup menu, this means Company/foundation setup page and Modules setup page:
SetupDescription3=Parameters in menu <b>Setup -> Company/foundation</b> are required because input information is used on Dolibarr displays and to modify Dolibarr behaviour (for example for features related to your country).
SetupDescription4=Parameters in menu <b>Setup -> Modules</b> are required because Dolibarr is not a fixed ERP/CRM but a sum of several modules, all more or less independant. It's only after activating modules you're interesting in that you will see features appeared in menus.
-SetupDescription5=Other menu entries manage optionnal parameters.
+SetupDescription5=Other menu entries manage optional parameters.
EventsSetup=Setup for events logs
LogEvents=Security audit events
Audit=Audit
diff --git a/htdocs/langs/en_US/bills.lang b/htdocs/langs/en_US/bills.lang
index de0d47793f02b617277a6a8c4e11468b86b878e5..845c389dbc27722fa1a8b5aa91d0165427ae041a 100644
--- a/htdocs/langs/en_US/bills.lang
+++ b/htdocs/langs/en_US/bills.lang
@@ -251,7 +251,7 @@ DiscountStillRemaining=Discount still remaining
DiscountAlreadyCounted=Discount already counted
BillAddress=Bill address
HelpEscompte=This discount is a discount granted to customer because its paiement was made before term.
-HelpAbandonBadCustomer=This amount has been abandoned (customer said to be a bad customer) and is considered as an exceptionnal loose.
+HelpAbandonBadCustomer=This amount has been abandoned (customer said to be a bad customer) and is considered as an exceptional loose.
HelpAbandonOther=This amount has been abandoned since it was an error (wrong customer or invoice replaced by an other for example)
IdSocialContribution=Social contribution id
PaymentId=Payment id
diff --git a/htdocs/langs/en_US/companies.lang b/htdocs/langs/en_US/companies.lang
index 91f62ce72c8aa7d7a8fd16701b06443f1b56d727..da801c50bb39929a7bd57777342ce11ca814b45f 100644
--- a/htdocs/langs/en_US/companies.lang
+++ b/htdocs/langs/en_US/companies.lang
@@ -75,7 +75,7 @@ WrongSupplierCode=Supplier code invalid
CustomerCodeModel=Customer code model
SupplierCodeModel=Supplier code model
Gencod=Bar code
-##### Professionnal ID #####
+##### Professional ID #####
ProfId1Short=Prof. id 1
ProfId2Short=Prof. id 2
ProfId3Short=Prof. id 3
diff --git a/htdocs/langs/en_US/install.lang b/htdocs/langs/en_US/install.lang
index 3f63869a0214e8396e2595213129029e93b9d892..b97569c0c44ea7e579f219445899330579a91592 100644
--- a/htdocs/langs/en_US/install.lang
+++ b/htdocs/langs/en_US/install.lang
@@ -57,7 +57,7 @@ CreateUser=Create user
DatabaseSuperUserAccess=Database - Superuser access
CheckToCreateDatabase=Check box if database does not exist and must be created.<br>In this case, you must fill the login/password for superuser account at the bottom of this page.
CheckToCreateUser=Check box if login does not exist and must be created.<br>In this case, you must fill the login/password for superuser account at the bottom of this page.
-Experimental=(experimental, non operationnal)
+Experimental=(experimental, non operational)
DatabaseRootLoginDescription=Login of the user allowed to create new databases or new users, useless if your database and your database login already exists (like when you're hosted by a web hosting provider).
KeepEmptyIfNoPassword=Leave empty if user has no password (avoid this)
SaveConfigurationFile=Save values
diff --git a/htdocs/langs/en_US/other.lang b/htdocs/langs/en_US/other.lang
index 6bce13639e0157a52fb88de5e894eda6877c5d92..1d2799924c02c2d1ab61e74a5b7765b2927e7e74 100644
--- a/htdocs/langs/en_US/other.lang
+++ b/htdocs/langs/en_US/other.lang
@@ -43,11 +43,11 @@ PredefinedMailContentSendInvoice=Veuillez trouver ci-joint la facture __FACREF__
PredefinedMailContentSendInvoiceReminder=Nous apportons à votre connaissance que la facture __FACREF__ ne semble pas avoir été réglée. La voici donc, pour rappel, en pièce jointe.\n\nCordialement\n\n
PredefinedMailContentSendProposal=Veuillez trouver ci-joint la proposition commerciale __PROPREF__\n\nCordialement\n\n
PredefinedMailContentSendOrder=Veuillez trouver ci-joint la commande __ORDERREF__\n\nCordialement\n\n
-DemoDesc=Dolibarr is not a compact ERP but is built from several fonctionnal modules. A demo that includes all modules does not mean anything as this never occurs. So, several demo profiles are available.
+DemoDesc=Dolibarr is a compact ERP/CRM composed by several functional modules. A demo that includes all modules does not mean anything as this never occurs. So, several demo profiles are available.
ChooseYourDemoProfil=Choose the demo profil that match your activity...
DemoFundation=Manage members of a foundation
DemoFundation2=Manage members and bank account of a foundation
-DemoCompanyServiceOnly=Manage a freelance activiy selling service only
+DemoCompanyServiceOnly=Manage a freelance activity selling service only
DemoCompanyShopWithCashDesk=Manage a shop with a cash desk
DemoCompanyProductAndStocks=Manage a small or medium company selling products
DemoCompanyAll=Manage a small or medium company with multiple activities (all main modules)
@@ -85,7 +85,7 @@ SizeUnitdm=dm
SizeUnitcm=cm
SizeUnitmm=mm
BugTracker=Bug tracker
-SendNewPasswordDesc=This form allows you to request a new passord. It will be send to your email address.<br>Change will be effective only after clicking on confirmation link inside this email.<br>Check your email reader software.
+SendNewPasswordDesc=This form allows you to request a new password. It will be send to your email address.<br>Change will be effective only after clicking on confirmation link inside this email.<br>Check your email reader software.
BackToLoginPage=Back to login page
AuthenticationDoesNotAllowSendNewPassword=Authentication mode is <b>%s</b>.<br>In this mode, Dolibarr can't know nor change your password.<br>Contact your system administrator if you want to change your password.
EnableGDLibraryDesc=Install or enable GD library with your PHP for use this option.
diff --git a/htdocs/langs/fi_FI/other.lang b/htdocs/langs/fi_FI/other.lang
index 3d6a2d0dd6dc881b1fa84e672c8b056f2c2b527e..64576d377d3103b9c30d9eacffac2422b8b21ada 100644
--- a/htdocs/langs/fi_FI/other.lang
+++ b/htdocs/langs/fi_FI/other.lang
@@ -48,11 +48,9 @@ PredefinedMailContentSendInvoice=Veuillez trouver ci-yhteinen la seen __FACREF__
PredefinedMailContentSendInvoiceReminder=Nous apportons votre connaissance que la seen __FACREF__ ne semble pas avoir t rgle. La voici siis, pour rappel, en pice jointe. \ N \ nCordialement \ n \ n
PredefinedMailContentSendProposal=Veuillez trouver ci-yhteinen la proposition commerciale __PROPREF__ \ n \ nCordialement \ n \ n
PredefinedMailContentSendOrder=Veuillez trouver ci-yhteinen la commande __ORDERREF__ \ n \ nCordialement \ n \ n
-DemoDesc=Dolibarr ei kompakti ERP mutta on rakennettu useita fonctionnal moduulit. A demo, joka sisältää kaikki moduulit eivät merkitse mitään, koska tämä ei koskaan tapahdu. Joten useita demo profiilit ovat saatavilla.
ChooseYourDemoProfil=Valitse demo profil jotka vastaavat aktiviisuutesi ...
DemoFundation=Hallitse jäseniä, fundation
DemoFundation2=Jäsenten hallinta ja pankkitilin on fundation
-DemoCompanyServiceOnly=Hallinnoi freelance activiy myydä palvelua vain
DemoCompanyShopWithCashDesk=Hallinnoi liikkeen kanssa kassa
DemoCompanyProductAndStocks=Hallitse pieni tai keskisuuri yritys myy tuotteitaan
DemoCompanyAll=Hallitse pieni tai keskisuuri yritys, jossa on useita toimintoja (kaikki tärkeimmät moduulit)
diff --git a/htdocs/langs/fr_FR/other.lang b/htdocs/langs/fr_FR/other.lang
index 2291a9eabdc6303ad9937ac667a1ef02aa5f0276..7d9701c8adfc1c6b290309186fb62400e8a1938d 100644
--- a/htdocs/langs/fr_FR/other.lang
+++ b/htdocs/langs/fr_FR/other.lang
@@ -43,7 +43,7 @@ PredefinedMailContentSendInvoice=Veuillez trouver ci-joint la facture __FACREF__
PredefinedMailContentSendInvoiceReminder=Nous apportons à votre connaissance que la facture __FACREF__ ne semble pas avoir été réglée. La voici donc, pour rappel, en pièce jointe.\n\nCordialement\n\n
PredefinedMailContentSendProposal=Veuillez trouver ci-joint la proposition commerciale __PROPREF__\n\nCordialement\n\n
PredefinedMailContentSendOrder=Veuillez trouver ci-joint la commande __ORDERREF__\n\nCordialement\n\n
-DemoDesc=Dolibarr n'est pas un logiciel de gestion d'activité (professionnelle ou associative) monolithique mais est composé de modules fonctionnels indépendants et optionnels. Une démonstration qui inclut tous ces modules n'a pas de sens car jamais tous les modules ne sont utilisés. Aussi, plusieurs profils type de démo sont disponibles.
+DemoDesc=Dolibarr est un logiciel de gestion d'activité (professionnelle ou associative) composé de modules fonctionnels indépendants et optionnels. Une démonstration qui inclut tous ces modules n'a pas de sens car jamais tous les modules ne sont utilisés. Aussi, plusieurs profils type de démo sont disponibles.
ChooseYourDemoProfil=Veuillez choisir le profil de démo qui correspond le mieux à votre activité...
DemoFundation=Gestion des adhérents d'une association
DemoFundation2=Gestion des adhérents et trésorerie d'une association
diff --git a/htdocs/langs/it_IT/other.lang b/htdocs/langs/it_IT/other.lang
index 5bf6b20ab13ea4c5fd5dfc41b443e3d2f8b0689f..7ac11b5b9dc108c72f19bc126567bd4b78374047 100644
--- a/htdocs/langs/it_IT/other.lang
+++ b/htdocs/langs/it_IT/other.lang
@@ -1,21 +1,21 @@
# Dolibarr language file - it_IT - other
-ErrorPasswordDiffers =Password � diverso, si prega di digitare nuovamente.
+ErrorPasswordDiffers =Password � diverso, si prega di digitare nuovamente.
ErrorForbidden =Accesso vietato. <br> Si tenta di accedere a una pagina, o particolare sezione senza essere in una sessione autenticata o non consentita per l'utente.
ErrorForbidden2 =L'autorizzazione per questi dati di accesso possono essere definiti con il tuo amministratore di Dolibarr dal menu %s -> %s.
ErrorForbidden3 =Sembra che Dolibarr non viene utilizzato attraverso una sessione autenticata. Dai un'occhiata alla documentazione di installazione Dolibarr sapere come gestire le autenticazioni (htaccess, mod_auth o altri ...).
-ErrorNoImagickReadimage =Imagick_readimage funzione non � stato trovato in questo PHP. Anteprima non pu� essere disponibile. Gli amministratori possono disattivare questa scheda dal menu Impostazioni - Schermo.
-ErrorRecordAlreadyExists =Il record esiste gi�
+ErrorNoImagickReadimage =Imagick_readimage funzione non � stato trovato in questo PHP. Anteprima non pu� essere disponibile. Gli amministratori possono disattivare questa scheda dal menu Impostazioni - Schermo.
+ErrorRecordAlreadyExists =Il record esiste gi�
ErrorCantReadFile =Impossibile leggere il file '%s'
ErrorCantReadDir =Impossibile leggere la directory '%s'
-ErrorFailedToFindEntity =Impossibile leggere entit� '%s'
+ErrorFailedToFindEntity =Impossibile leggere entit� '%s'
ErrorBadLoginPassword =Valore non valido per il login o password
-ErrorLoginDisabled =Il tuo account � stato disabilitato
-ErrorFailedToRunExternalCommand =Impossibile eseguire comando esterno. Controlla che sia disponibile e runnable dal vostro server PHP. Se il PHP <b> Modalit� </ b> � abilitata, verificare che il comando � all'interno di una directory definita dal parametro <b> safe_mode_exec_dir </ b>.
+ErrorLoginDisabled =Il tuo account � stato disabilitato
+ErrorFailedToRunExternalCommand =Impossibile eseguire comando esterno. Controlla che sia disponibile e runnable dal vostro server PHP. Se il PHP <b> Modalit� </ b> � abilitata, verificare che il comando � all'interno di una directory definita dal parametro <b> safe_mode_exec_dir </ b>.
ErrorFailedToChangePassword =Impossibile cambiare la password
-ErrorLoginDoesNotExists =Utente con accesso <b> %s </ b> non � stata trovata.
+ErrorLoginDoesNotExists =Utente con accesso <b> %s </ b> non � stata trovata.
ErrorLoginHasNoEmail =Questo utente non ha alcun indirizzo email. Processo interrotto.
ErrorBadValueForCode =Bad i tipi di valore per il codice. Riprova con un nuovo valore ...
-ErrorFileIsInfectedWith =Questo file � stato infettato da %s
+ErrorFileIsInfectedWith =Questo file � stato infettato da %s
SecurityCode =Codice di sicurezza
Calendar =Calendario
AddTrip =Aggiungi viaggio
@@ -26,13 +26,13 @@ Notify_NOTIFY_VAL_FICHINTER =Valida intervento
Notify_NOTIFY_VAL_FAC =Convalida di legge
NbOfAttachedFiles =Numero di file allegati / documenti
TotalSizeOfAttachedFiles =Dimensione totale dei file allegati / documenti
-MaxSize =La dimensione massima �
+MaxSize =La dimensione massima �
AttachANewFile =Allegare un nuovo file / documento
LinkedObject =Collegato oggetto
Miscellanous =Varie
NbOfActiveNotifications =Numero di notifiche
-WarningInstallDirExists =Attenzione, directory di installazione ( %s) esiste ancora. Questo � un grave buco di sicurezza. Si dovrebbe rimosso non appena possibile.
-WarningUntilDirRemoved =Questo avviso rimarr� attiva fino a quando questa directory � presente (disponibile solo per gli utenti admin).
+WarningInstallDirExists =Attenzione, directory di installazione ( %s) esiste ancora. Questo � un grave buco di sicurezza. Si dovrebbe rimosso non appena possibile.
+WarningUntilDirRemoved =Questo avviso rimarr� attiva fino a quando questa directory � presente (disponibile solo per gli utenti admin).
Bookmark =Favoriti
Bookmarks =Segnalibri
NewBookmark =Nuovo segnalibro
@@ -59,11 +59,11 @@ ModifiedBy =Modificata da %s
ValidatedBy =Convalidato da %s
CanceledBy =Annullato da %s
ClosedBy =Chiuso da %s
-FileWasRemoved =File � stato eliminato
-DirWasRemoved =Directory � stato rimosso
-FeatureNotYetAvailable =Funzionalit� non ancora disponibile in questa versione
+FileWasRemoved =File � stato eliminato
+DirWasRemoved =Directory � stato rimosso
+FeatureNotYetAvailable =Funzionalit� non ancora disponibile in questa versione
FeatureExperimental =Caratteristica sperimentale. Non stabile in questa versione
-FeatureDevelopment =Sviluppo funzionalit�. Non stabile in questa versione
+FeatureDevelopment =Sviluppo funzionalit�. Non stabile in questa versione
FeaturesSupported =Funzioni supportate
Width =Ampiezza
Height =Altezza
@@ -80,16 +80,15 @@ VolumeUnitdm3 =dm3
VolumeUnitcm3 =cm3
VolumeUnitmm3 =mm3
BugTracker =Bug tracker
-SendNewPasswordDesc =Questo modulo consente di richiedere una nuova passord. Sar� inviare al tuo indirizzo email. <br> Cambiamento sar� effettivo solo dopo aver fatto clic sul link di conferma all'interno di questa e-mail. <br> Controlla la tua email lettore software.
BackToLoginPage =Torna alla pagina di accesso
-AuthenticationDoesNotAllowSendNewPassword =Modalit� di autenticazione � <b> %s </ b>. <br> In questa modalit�, Dolibarr non pu� sapere n� cambiare la tua password. <br> Contattare l'amministratore di sistema se si desidera cambiare la tua password.
+AuthenticationDoesNotAllowSendNewPassword =Modalit� di autenticazione � <b> %s </ b>. <br> In questa modalit�, Dolibarr non pu� sapere n� cambiare la tua password. <br> Contattare l'amministratore di sistema se si desidera cambiare la tua password.
EnableGDLibraryDesc =Installare o abilitare libreria GD con il PHP per utilizzare questa opzione.
-EnablePhpAVModuleDesc =� necessario installare un modulo compatibile con il vostro antivirus. (ClamAV: php4-clamavlib o php5-clamavlib)
+EnablePhpAVModuleDesc =� necessario installare un modulo compatibile con il vostro antivirus. (ClamAV: php4-clamavlib o php5-clamavlib)
##### Webcal #####
LoginWebcal =Login per Webcalendar
-ErrorWebcalLoginNotDefined =Il Webcalendar di accesso associati al tuo Dolibarr login <b>%s </ b> non � definito.
+ErrorWebcalLoginNotDefined =Il Webcalendar di accesso associati al tuo Dolibarr login <b>%s </ b> non � definito.
##### Phenix #####
-ErrorPhenixLoginNotDefined =Le Phenix di accesso associati al tuo Dolibarr login <b>%s </ b> non � definito.
+ErrorPhenixLoginNotDefined =Le Phenix di accesso associati al tuo Dolibarr login <b>%s </ b> non � definito.
##### Calendar common #####
AddCalendarEntry =Aggiungi entrata nel calendario %s
NewCompanyToDolibarr =Azienda %s aggiunto in Dolibarr
@@ -100,7 +99,7 @@ PropalClosedSignedInDolibarr =Proposta %s firmato a Dolibarr
PropalClosedRefusedInDolibarr =Proposta rifiutata %s in Dolibarr
PropalValidatedInDolibarr =Proposta %s convalidati in Dolibarr
InvoiceValidatedInDolibarr =Fattura %s convalidati in Dolibarr
-InvoicePayedInDolibarr =Fattura %s � cambiato a pagare in Dolibarr
+InvoicePayedInDolibarr =Fattura %s � cambiato a pagare in Dolibarr
InvoiceCanceledInDolibarr =Fattura %s annullato in Dolibarr
PaymentDoneInDolibarr =Pagamento %s fatto in Dolibarr
CustomerPaymentDoneInDolibarr =Clienti pagamento %s fatto in Dolibarr
@@ -124,14 +123,12 @@ PredefinedMailContentSendInvoice=Veuillez trouver ci-joint la facture __FACREF__
PredefinedMailContentSendInvoiceReminder=Nous apportons vostra conoscenza che la facture __FACREF__ ne semble pas avoir t rgle. La voici donc, pour rappel, en pice jointe. \ N \ nCordialement \ n \ n
PredefinedMailContentSendProposal=Veuillez trouver ci-joint la proposta commerciale __PROPREF__ \ n \ nCordialement \ n \ n
PredefinedMailContentSendOrder=Veuillez trouver ci-joint la commande __ORDERREF__ \ n \ nCordialement \ n \ n
-DemoDesc=Dolibarr non � una compatta ERP, ma � costituito da diversi moduli fonctionnal. Un demo che comprende tutti i moduli non significa niente come questo non si verifica. Cos�, diversi profili demo sono disponibili.
-ChooseYourDemoProfil=Scegli la demo profilo che corrispondono alla tua attivit� ...
+ChooseYourDemoProfil=Scegli la demo profilo che corrispondono alla tua attivit� ...
DemoFundation=Gestisci membri di una Fondazione
DemoFundation2=Gestisci membri e di un conto bancario Fundation
-DemoCompanyServiceOnly=Gestire un servizio di vendita activiy freelance solo
DemoCompanyShopWithCashDesk=Gestire un negozio con una cassa
DemoCompanyProductAndStocks=Gestire una piccola o media azienda che vende prodotti
-DemoCompanyAll=Gestire una piccola o media azienda con pi� attivit� (tutti i principali moduli)
+DemoCompanyAll=Gestire una piccola o media azienda con pi� attivit� (tutti i principali moduli)
GoToDemo=Vai alla demo
FeatureNotYetAvailableShort=Disponibile in una prossima versione
Depth=Altezza
@@ -140,18 +137,18 @@ SizeUnitm=m
SizeUnitdm=dm
SizeUnitcm=centimetro
SizeUnitmm=millimetro
-ProfIdShortDesc=<b>Prof ID% s</b> � un centro informazioni, a seconda del paese terzo. <br> Ad esempio, per il <b>paese% s,</b> � il <b>codice% s.</b>
+ProfIdShortDesc=<b>Prof ID% s</b> � un centro informazioni, a seconda del paese terzo. <br> Ad esempio, per il <b>paese% s,</b> � il <b>codice% s.</b>
DolibarrDemo=Dolibarr ERP / CRM demo
-StatsByNumberOfUnits=Statistiche in numero di unit�
+StatsByNumberOfUnits=Statistiche in numero di unit�
StatsByNumberOfEntities=Statistiche del numero di enti
NumberOfProposals=Numero di proposte sulla ultimi 12 mesi
NumberOfCustomerOrders=Numero di ordini dei clienti sul ultimi 12 mesi
NumberOfCustomerInvoices=Numero di fatture a clienti negli ultimi 12 mesi
NumberOfSupplierInvoices=Numero di fatture fornitore sul ultimi 12 mesi
-NumberOfUnitsProposals=Numero di unit� sulle proposte des derniers 12 mois
-NumberOfUnitsCustomerOrders=Numero di unit� su ordini dei clienti sul ultimi 12 mesi
-NumberOfUnitsCustomerInvoices=Numero di unit� sulle fatture del cliente negli ultimi 12 mesi
-NumberOfUnitsSupplierInvoices=Numero di unit� su fatture fornitore ultimi 12 mesi
+NumberOfUnitsProposals=Numero di unit� sulle proposte des derniers 12 mois
+NumberOfUnitsCustomerOrders=Numero di unit� su ordini dei clienti sul ultimi 12 mesi
+NumberOfUnitsCustomerInvoices=Numero di unit� sulle fatture del cliente negli ultimi 12 mesi
+NumberOfUnitsSupplierInvoices=Numero di unit� su fatture fornitore ultimi 12 mesi
EMailTextOrderApproved=Ordine% s approvato
EMailTextOrderApprovedBy=Ordine approvato% s da% s
EMailTextOrderRefused=Ordine rifiutato% s
diff --git a/htdocs/langs/nb_NO/admin.lang b/htdocs/langs/nb_NO/admin.lang
index 5c38a258d80d797b8fed3ec8ccb9a4ca591ad647..51078beda3f0b37df6ee9882e53e7b1c0e94bd20 100644
--- a/htdocs/langs/nb_NO/admin.lang
+++ b/htdocs/langs/nb_NO/admin.lang
@@ -158,7 +158,6 @@ AvailableOnlyIfJavascriptAndAjaxNotDisabled=Tilgjengelig bare hvis Javascript og
Required=Påkrevet
Security=Sikkerhet
Passwords=Passord
-DoNotStoreClearPassword=Ikke lagre passord åpnet i databasen
MainDbPasswordFileConfEncrypted=Databasepassord kryptert i conf.php
ConfigFileIsInReadOnly=Filen conf.php er skrivebeskyttet. Sjekk tillatelser.
ProtectAndEncryptPdfFiles=Beskytt genererte pdf-filer (anbefales ikke, brekker mulighet for massegenerering av PDF'er)
diff --git a/htdocs/langs/nl_NL/other.lang b/htdocs/langs/nl_NL/other.lang
index f494c1d45637e32d41c64749e77d40e3f241b8b1..624a4081db3b0b0205510186dc4c54b446c349d5 100644
--- a/htdocs/langs/nl_NL/other.lang
+++ b/htdocs/langs/nl_NL/other.lang
@@ -50,11 +50,9 @@ PredefinedMailContentSendInvoice=Veuillez trouver ci-joint la facture __FACREF__
PredefinedMailContentSendInvoiceReminder=Nous apportons votre Connaissance que la facture __FACREF__ ne semble pas avoir t rgle. La voici dus, pour rappel, en pice jointe. \ N \ nCordialement \ n \ n
PredefinedMailContentSendProposal=Veuillez trouver ci-joint la proposition commerciale __PROPREF__ \ n \ nCordialement \ n \ n
PredefinedMailContentSendOrder=Veuillez trouver ci-joint la commande __ORDERREF__ \ n \ nCordialement \ n \ n
-DemoDesc=Dolibarr is niet een compacte ERP maar is opgebouwd uit verschillende modules fonctionnal. Een demo waarin alle modules niet betekent iets als dit nooit gebeurt. Dus, enkele demo-profielen beschikbaar zijn.
ChooseYourDemoProfil=Kies de demo profiel die overeenkomen met uw activiteit ...
DemoFundation=Leden beheren van een fundation
DemoFundation2=Beheer van de leden en de bankrekening van een fundation
-DemoCompanyServiceOnly=Het beheren van een freelance activiy verkoop alleen
DemoCompanyShopWithCashDesk=Beheren van een winkel met een kassa
DemoCompanyProductAndStocks=Het beheren van een kleine of middelgrote onderneming verkopen van producten
DemoCompanyAll=Het beheren van een kleine of middelgrote onderneming met meerdere activiteiten (alle modules)
@@ -92,7 +90,6 @@ SizeUnitdm=dm
SizeUnitcm=cm
SizeUnitmm=mm
BugTracker=Bug tracker
-SendNewPasswordDesc=Dit formulier kunt u een verzoek om nieuwe passord. Het zal versturen naar uw e-mailadres. <br> Verandering is alleen na het klikken op bevestiging link in deze e-mail. <br> Check uw e-reader software.
BackToLoginPage=Naar login pagina
AuthenticationDoesNotAllowSendNewPassword=Authenticatiemodus <b>is% s.</b> <br> In deze modus Dolibarr niet kan weten of uw wachtwoord wijzigen. <br> Neem contact op met uw systeembeheerder als u wilt dat uw wachtwoord wijzigen.
EnableGDLibraryDesc=Installeren of inschakelen GD bibliotheek met uw PHP voor het gebruik van deze optie.
diff --git a/htdocs/langs/pl_PL/other.lang b/htdocs/langs/pl_PL/other.lang
index 46fcd13f2c7919991c6f954af734ebd2494a4893..37083bb307997ec51a774921026932feaebd642f 100644
--- a/htdocs/langs/pl_PL/other.lang
+++ b/htdocs/langs/pl_PL/other.lang
@@ -50,11 +50,9 @@ PredefinedMailContentSendInvoice=Veuillez trouver ci-joint la faktura __FACREF__
PredefinedMailContentSendInvoiceReminder=Nous apportons votre connaissance que la faktura __FACREF__ ne semble pas avoir t rgle. La voici donc, pour rappel, pl cena jointe. \ N \ nCordialement \ n \ n
PredefinedMailContentSendProposal=Veuillez trouver ci-joint la proposition commerciale __PROPREF__ \ n \ nCordialement \ n \ n
PredefinedMailContentSendOrder=Veuillez trouver ci-joint la Commande __ORDERREF__ \ n \ nCordialement \ n \ n
-DemoDesc=Dolibarr nie jest kompaktowy ERP, ale zbudowana jest z kilku modułów fonctionnal. A demo, która zawiera wszystkie moduły nie oznacza nic, ponieważ nie występuje. Tak więc, kilka profili są dostępne demo.
ChooseYourDemoProfil=Wybierz demo, które pasują do profilu działalności ...
DemoFundation=Zarządzanie użytkowników o fundacji
DemoFundation2=Zarządzanie użytkowników i konta bankowego z fundacji
-DemoCompanyServiceOnly=Zarządzanie wolny activiy sprzedaży usług tylko
DemoCompanyShopWithCashDesk=Zarządzanie sklepem z kasy
DemoCompanyProductAndStocks=Zarządzanie małym lub średnim przedsiębiorstwem sprzedaży produktów
DemoCompanyAll=Zarządzanie małym i średnim przedsiębiorstwem z wielu działalności (wszystkie główne moduły)
@@ -92,7 +90,6 @@ SizeUnitdm=dm
SizeUnitcm=cm
SizeUnitmm=mm
BugTracker=Bug tracker
-SendNewPasswordDesc=Ta forma pozwala na złożenie wniosku o nowe passord. Będzie wyślij swój adres e-mail. <br> Zmiana będzie skuteczne dopiero po kliknięciu na link potwierdzający wewnątrz tej wiadomości. <br> Sprawdź pocztę czytnik oprogramowania.
BackToLoginPage=Powrót do strony logowania
AuthenticationDoesNotAllowSendNewPassword=Uwierzytelnianie w <b>trybie% s.</b> <br> W tym trybie Dolibarr nie może znać ani zmienić hasła. <br> Skontaktuj się z administratorem systemu, jeśli chcesz zmienić swoje hasło.
EnableGDLibraryDesc=Zainstaluj lub włączyć biblioteka GD z PHP do wykorzystania tej opcji.
diff --git a/htdocs/langs/ro_RO/other.lang b/htdocs/langs/ro_RO/other.lang
index c7848852ae8a42bb46b4e3aafcd5da6141840996..ea05b0cc96a1c4f5330e51bdb78c61b626a05c9e 100644
--- a/htdocs/langs/ro_RO/other.lang
+++ b/htdocs/langs/ro_RO/other.lang
@@ -48,11 +48,9 @@ PredefinedMailContentSendInvoice=Veuillez trouver ci-comun la facture __FACREF__
PredefinedMailContentSendInvoiceReminder=Nous apportons votre connaissance que la facture __FACREF__ ne semble pas avoir t rgle. La voici deci, se toarna rapel, en pice jointe. \ N \ nCordialement \ n \ n
PredefinedMailContentSendProposal=Veuillez trouver ci-comun la propunere commerciale __PROPREF__ \ n \ nCordialement \ n \ n
PredefinedMailContentSendOrder=Veuillez trouver ci-comun de la commande __ORDERREF__ \ n \ nCordialement \ n \ n
-DemoDesc=Dolibarr nu este un compact ERP, dar este construit din mai multe fonctionnal module. Un demo care include toate modulele nu înseamnă nimic, deoarece aceasta nu se produce. Deci, mai multe demo-profile sunt disponibile.
ChooseYourDemoProfil=Alegeţi demo care se potrivesc cu profilul de activitate ...
DemoFundation=Gestionare membrii unui Fundaţia
DemoFundation2=Gestionaţi membri şi un cont bancar de Fundaţia
-DemoCompanyServiceOnly=Gestionaţi o activiy independenţi de servicii de vânzare numai
DemoCompanyShopWithCashDesk=Gestionaţi-un magazin cu o casă
DemoCompanyProductAndStocks=Gestionaţi o companie mici sau medii de vânzare a produselor
DemoCompanyAll=Gestionaţi o companie mici sau medii cu mai multe activitati (toate principalele module)
@@ -90,7 +88,6 @@ SizeUnitdm=dm
SizeUnitcm=cm
SizeUnitmm=mm
BugTracker=Bug tracker
-SendNewPasswordDesc=Acest formular vă permite să solicite un nou passord. Se va trimite la adresa de e-mail. <br> Modificarea va fi în vigoare doar după ce fac clic pe link-ul de confirmare în interiorul acestui email. <br> Verificaţi-vă de e-mail reader software.
BackToLoginPage=Înapoi la pagina de login
AuthenticationDoesNotAllowSendNewPassword=Mod de autentificare <b>este% s.</b> <br> În acest mod, Dolibarr nu poate şi nici nu ştiu să-ţi schimbi parola. <br> Contactaţi administratorul de sistem, dacă doriţi să vă schimbaţi parola.
EnableGDLibraryDesc=Instalaţi sau permite GD bibliotecă cu dumneavoastră PHP, pentru a fi utilizat această opţiune.
diff --git a/htdocs/langs/ru_RU/other.lang b/htdocs/langs/ru_RU/other.lang
index 7e15f3f39bdba96e0b8e69a31126fe8b9a48b2cd..83342f91726cb9ac223e2585466716602fb491c5 100644
--- a/htdocs/langs/ru_RU/other.lang
+++ b/htdocs/langs/ru_RU/other.lang
@@ -48,11 +48,9 @@ PredefinedMailContentSendInvoice=Veuillez trouver CI-ла совместных
PredefinedMailContentSendInvoiceReminder=Nous apportons вашей connaissance QUE LA Фактура __FACREF__ NE semble Пас AVOIR т rgle. La voici donc, налить rappel, EN ПИКЕ jointe. \ N \ nCordialement \ N \ N
PredefinedMailContentSendProposal=Veuillez trouver CI-ла совместное предложение Commerciale __PROPREF__ \ N \ nCordialement \ N \ N
PredefinedMailContentSendOrder=Veuillez trouver CI-ла совместных commande __ORDERREF__ \ N \ nCordialement \ N \ N
-DemoDesc=Dolibarr не компактно ERP, но строится из нескольких fonctionnal модулей. Демонстрация, которая включает все модули, не означает ничего, как этого никогда не происходит. Так, несколько демо-профилей доступны.
ChooseYourDemoProfil=Выберите демо-профиль, которые соответствуют Вашей деятельности ...
DemoFundation=Управление членов Фонда
DemoFundation2=Управление членами и банковские счета Фонда
-DemoCompanyServiceOnly=Управление внештатными activiy продавать услугу только
DemoCompanyShopWithCashDesk=Работа магазина в кассу
DemoCompanyProductAndStocks=Управление небольшой или средней компании продавать продукцию
DemoCompanyAll=Управление небольшой или средней компании с несколькими деятельности (все основные модули)
@@ -90,7 +88,6 @@ SizeUnitdm=дм
SizeUnitcm=см
SizeUnitmm=мм
BugTracker=Ошибка Tracker
-SendNewPasswordDesc=Эта форма позволяет запросить новый passord. Он будет отправить на ваш адрес электронной почты. <br> Изменения вступят в силу только после нажатия на ссылку в подтверждение этого сообщения. <br> Проверьте ваш электронный читатель программного обеспечения.
BackToLoginPage=Перейти на страницу входа
AuthenticationDoesNotAllowSendNewPassword=Аутентификация <b>режим% S.</b> <br> В этом режиме Dolibarr можете не знать, ни изменить свой пароль. <br> Обратитесь к системному администратору, если вы хотите изменить свой пароль.
EnableGDLibraryDesc=Установка или позволить GD библиотеку с PHP для использования этой опции.
diff --git a/htdocs/lib/security.lib.php b/htdocs/lib/security.lib.php
index 1783dda7387d83b8e37062a371e4bdda6869f652..228f7e06862e9c79cb9fca6126722baa75d7020c 100644
--- a/htdocs/lib/security.lib.php
+++ b/htdocs/lib/security.lib.php
@@ -34,6 +34,9 @@
*/
function dol_loginfunction($langs,$conf,$mysoc)
{
+ $langcode=(empty($_GET["lang"])?'auto':$_GET["lang"]);
+ $langs->setDefaultLang($langcode);
+
$langs->load("main");
$langs->load("other");
@@ -62,7 +65,7 @@ function dol_loginfunction($langs,$conf,$mysoc)
print '<meta name="robots" content="noindex,nofollow">'."\n"; // Evite indexation par robots
print "<title>".$langs->trans("Login")."</title>\n";
- print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/'.$conf->css.'">'."\n";
+ print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/'.$conf->css.'?lang='.$langs->defaultlang.'">'."\n";
print '<style type="text/css">'."\n";
print '<!--'."\n";
@@ -271,7 +274,7 @@ function dol_loginfunction($langs,$conf,$mysoc)
print nl2br($conf->global->MAIN_HOME);
print '</td></tr></table></center><br>'."\n";
}
-
+
// Google Adsense (ex: demo mode)
if (! empty($conf->global->MAIN_GOOGLE_AD_CLIENT) && ! empty($conf->global->MAIN_GOOGLE_AD_SLOT))
{
diff --git a/htdocs/paybox/paybox.lib.php b/htdocs/paybox/paybox.lib.php
index aef6d361be8bd2ab1faa9baa6493af53d4538666..d0f1e297028c777348006a1b880403b0837af6e2 100644
--- a/htdocs/paybox/paybox.lib.php
+++ b/htdocs/paybox/paybox.lib.php
@@ -44,10 +44,10 @@ function llxHeaderPaybox($title, $head = "")
print '<meta name="description" content="Welcome on Dolibarr online payment form">'."\n";
print "<title>".$title."</title>\n";
if ($head) print $head."\n";
- if ($conf->global->PAYBOX_CSS_URL) print '<link rel="stylesheet" type="text/css" href="'.$conf->global->PAYBOX_CSS_URL.'">'."\n";
+ if ($conf->global->PAYBOX_CSS_URL) print '<link rel="stylesheet" type="text/css" href="'.$conf->global->PAYBOX_CSS_URL.'?lang='.$langs->defaultlang.'">'."\n";
else
{
- print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/'.$conf->css.'">'."\n";
+ print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/'.$conf->css.'?lang='.$langs->defaultlang.'">'."\n";
print '<style type="text/css">';
print '.CTableRow1 { margin: 1px; padding: 3px; font: 12px verdana,arial; background: #e6E6eE; color: #000000; -moz-border-radius-topleft:6px; -moz-border-radius-topright:6px; -moz-border-radius-bottomleft:6px; -moz-border-radius-bottomright:6px;}';
print '.CTableRow2 { margin: 1px; padding: 3px; font: 12px verdana,arial; background: #FFFFFF; color: #000000; -moz-border-radius-topleft:6px; -moz-border-radius-topright:6px; -moz-border-radius-bottomleft:6px; -moz-border-radius-bottomright:6px;}';
diff --git a/htdocs/public/demo/index.php b/htdocs/public/demo/index.php
index fef3258a815418b7d7ab29c3c44db5b55a919129..e6812600ee1a915b3c74df36e49f65f1e933e896 100644
--- a/htdocs/public/demo/index.php
+++ b/htdocs/public/demo/index.php
@@ -34,7 +34,7 @@ $langs->load("main");
$langs->load("other");
// Security check
-if (empty($conf->global->MAIN_DEMO)) accessforbidden('Constant MAIN_DEMO must be defined in Home->Setup->Misc to enable the demo entry page',1,1,1);
+if (empty($conf->global->MAIN_DEMO)) accessforbidden('Constant MAIN_DEMO must be defined in Home->Setup->Misc with value "default login,default pass" to enable the demo entry page',1,1,1);
$demoprofiles=array(
@@ -74,7 +74,7 @@ function llxHeaderVierge($title, $head = "")
print '<meta name="keywords" content="dolibarr,demo,online,demonstration,example,test,web,erp,crm,demos,online">'."\n";
print '<meta name="description" content="Dolibarr simple ERP/CRM demo. You can test here several profiles of Dolibarr ERP/CRM demos.">'."\n";
print "<title>".$title."</title>\n";
- print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/theme/eldy/eldy.css.php">'."\n";
+ print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/theme/eldy/eldy.css.php?lang='.$langs->defaultlang.'">'."\n";
if ($head) print $head."\n";
print '<style type="text/css">';
print '.CTableRow1 { margin: 1px; padding: 3px; font: 12px verdana,arial; background: #e6E6eE; color: #000000; -moz-border-radius-topleft:6px; -moz-border-radius-topright:6px; -moz-border-radius-bottomleft:6px; -moz-border-radius-bottomright:6px;}';
@@ -222,14 +222,14 @@ foreach ($demoprofiles as $profilarray)
$url=$_SERVER["PHP_SELF"].'?action=gotodemo&demochoice='.$profilarray['key'].'&urlfrom='.urlencode($_SERVER["PHP_SELF"]);
//if ($i % $NBOFCOLS == 0) print '<tr>';
print '<tr>';
- print '<td align="left">';
+ print '<td>';
print '<table summary="Dolibarr online demonstration for profile '.$profilarray['label'].'" style="font-size:14px;" width="100%" class="CTableRow'.($i%2==0?'1':'2').'">'."\n";
print '<tr>';
- print '<td align="left" width="50"><a href="'.$url.'"><img src="'.$profilarray['icon'].'" width="48" border="0" alt="Demo '.$profilarray['label'].'"></a></td>';
+ print '<td width="50"><a href="'.$url.'"><img src="'.$profilarray['icon'].'" width="48" border="0" alt="Demo '.$profilarray['label'].'"></a></td>';
//print '<td><input type="radio" name="demochoice"';
//if ($profilarray['default']) print ' checked="true"';
//print ' value="'.$profilarray['key'].'"></td>';
- print '<td align="left"><a href="'.$url.'">'.$langs->trans($profilarray['label']).'</a></td></tr>';
+ print '<td><a href="'.$url.'">'.$langs->trans($profilarray['label']).'</a></td></tr>';
print '</table>';
print '</td>';
//if ($i % $NBOFCOLS == ($NBOFCOLS-1)) print '</tr>'."\n";
diff --git a/htdocs/translate.class.php b/htdocs/translate.class.php
index 147cef748caebdbacddb2ca364b3983647896913..9a110bc7ef8a5cf0004fb55011cff2c1edb37925 100644
--- a/htdocs/translate.class.php
+++ b/htdocs/translate.class.php
@@ -108,27 +108,36 @@ class Translate {
$langpref=$_SERVER['HTTP_ACCEPT_LANGUAGE'];
$langpref=eregi_replace(";[^,]*","",$langpref);
$langpref=eregi_replace("-","_",$langpref);
-
$langlist=split("[;,]",$langpref);
+ $codetouse=$langlist[0];
+ }
+ else $codetouse=$srclang;
- $langpart=split("_",$langlist[0]);
- //print "Short before _ : ".$langpart[0].'/ Short after _ : '.$langpart[1];
+ // We redefine $srclang
+ $langpart=split("_",$codetouse);
+ //print "Short before _ : ".$langpart[0].'/ Short after _ : '.$langpart[1];
- if (isset($langpart[1])) {
+ if (isset($langpart[1])) // If its a long code xx_YY
+ {
+ // Array to convert short lang code into other long code.
+ $longforshort=array('ar'=>'ar_AR');
+ if (isset($longforshort[strtolower($langpart[0])])) $srclang=$longforshort[strtolower($langpart[0])];
+ else {
$srclang=strtolower($langpart[0])."_".strtoupper($langpart[1]);
// Array to convert long lang code into other long code.
$longforlong=array('no_nb'=>'nb_NO');
if (isset($longforlong[strtolower($srclang)])) $srclang=$longforlong[strtolower($srclang)];
}
- else {
- // Array to convert short lang code into long code.
- $longforshort=array('ca'=>'ca_ES', 'nb'=>'nb_NO', 'no'=>'nb_NO');
- if (isset($longforshort[strtolower($langpart[0])])) $srclang=$longforshort[strtolower($langpart[0])];
- else $srclang=strtolower($langpart[0])."_".strtoupper($langpart[0]);
- }
+ }
+ else { // If its a short code xx
+ // Array to convert short lang code into long code.
+ $longforshort=array('ca'=>'ca_ES', 'nb'=>'nb_NO', 'no'=>'nb_NO');
+ if (isset($longforshort[strtolower($langpart[0])])) $srclang=$longforshort[strtolower($langpart[0])];
+ else $srclang=strtolower($langpart[0])."_".strtoupper($langpart[0]);
}
$this->defaultlang=$srclang;
+ //print $this->defaultlang;
}
@@ -201,7 +210,7 @@ class Translate {
// Check in "always available" alternate file if not found or if asked
if ($newalt || ! $filelangexists)
{
- // Dir of always available alternate file (en_US or fr_FR)
+ // Dir of ALWAYS available alternate file (en_US, fr_FR, es_ES)
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";
diff --git a/htdocs/user/passwordforgotten.php b/htdocs/user/passwordforgotten.php
index 618efccaa6c575dd6417c60c38acde39cf61fa1f..8a512ce0e1375afc278c0ebb24010bcb30da3d71 100644
--- a/htdocs/user/passwordforgotten.php
+++ b/htdocs/user/passwordforgotten.php
@@ -37,6 +37,9 @@ require_once(DOL_DOCUMENT_ROOT."/contact.class.php");
require_once(DOL_DOCUMENT_ROOT."/lib/ldap.class.php");
require_once(DOL_DOCUMENT_ROOT."/lib/usergroups.lib.php");
+$langcode=(empty($_GET["lang"])?'auto':$_GET["lang"]);
+$langs->setDefaultLang($langcode);
+
$user->getrights('user');
$langs->load("main");
@@ -157,9 +160,10 @@ print '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">'."\n";
// En tete html
print "<html>\n";
print "<head>\n";
+print '<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">'."\n";
print '<meta name="robots" content="noindex,nofollow">'."\n"; // Evite indexation par robots
print "<title>Dolibarr Authentification</title>\n";
-print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/'.$conf->css.'">'."\n";
+print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/'.$conf->css.'?lang='.$langs->defaultlang.'">'."\n";
print '<style type="text/css">'."\n";
print '<!--'."\n";
print '#login {';