Fix translations

htdocs/langs/en_US/admin.lang

@@ -210,6 +210,7 @@ MAIN_DISABLE_ALL_MAILS=Disable all e-mails sendings (for test purposes or demos)
 MAIN_MAIL_SENDMODE=Method to use to send EMails
 MAIN_MAIL_SMTPS_ID=SMTPS ID if authentication required
 MAIN_MAIL_SMTPS_PW=SMTPS Password if authentication required
+MAIN_MAIL_EMAIL_TLS = Use TLS (SSL) encrypt
 FeatureNotAvailableOnLinux=Feature not available on Unix like systems. Test your sendmail program locally.
 ModuleSetup=Module setup
 ModulesSetup=Modules setup

htdocs/langs/en_US/banks.lang

@@ -82,17 +82,17 @@ BankTransactions=Bank transactions
 SearchTransaction=Search transaction
 ListTransactions=List transactions
 ListTransactionsByCategory=List transaction/category
-TransactionsToConciliate=Transactions to conciliate
+TransactionsToConciliate=Transactions to reconcile
-Conciliable=Conciliable
+Conciliable=Can be reconciled
-Conciliate=Conciliate
+Conciliate=Reconcile
-Conciliation=Conciliation
+Conciliation=Reconciliation
-ConciliationForAccount=Conciliate this account
+ConciliationForAccount=Reconcile this account
 IncludeClosedAccount=Include closed accounts
 OnlyOpenedAccount=Only opened accounts
 AccountToCredit=Account to credit
 AccountToDebit=Account to debit
-DisableConciliation=Disable conciliation feature for this account
+DisableConciliation=Disable reconciliation feature for this account
-ConciliationDisabled=Conciliation feature disabled
+ConciliationDisabled=Reconciliation feature disabled
 StatusAccountOpened=Opened
 StatusAccountClosed=Closed
 AccountIdShort=Number
@@ -100,9 +100,9 @@ EditBankRecord=Edit record
 LineRecord=Transaction
 AddBankRecord=Add transaction
 AddBankRecordLong=Add transaction manually
-ConciliatedBy=Conciliated by
+ConciliatedBy=Reconciled by
-DateConciliating=Conciliate date
+DateConciliating=Reconcile date
-BankLineConciliated=Transaction conciliated
+BankLineConciliated=Transaction reconciled
 CustomerInvoicePayment=Customer payment
 SupplierInvoicePayment=Supplier payment
 SocialContributionPayment=Social contribution payment

htdocs/langs/en_US/bills.lang

@@ -80,8 +80,8 @@ ClassifyClosed=Classify 'Closed'
 CreateBill=Create Invoice
 AddBill=Add invoice or credit note
 DeleteBill=Delete invoice
-SearchACustomerInvoice=Search a customer invoice
+SearchACustomerInvoice=Search for a customer invoice
-SearchASupplierInvoice=Search a supplier invoice
+SearchASupplierInvoice=Search for a supplier invoice
 CancelBill=Cancel an invoice
 SendByMail=Send by EMail
 SendRemindByMail=Send reminder by EMail
@@ -118,7 +118,7 @@ PaymentStatusToValidShort=To validate
 ErrorVATIntraNotConfigured=Intracommunautary VAT number not yet defined
 ErrorNoPaiementModeConfigured=No default payment mode defined. Go to Invoice module setup to fix this.
 ErrorCreateBankAccount=Create a bank account, then go to Setup panel of Invoice module to define payment modes
-ErrorBillNotFound=Invoice %s does not exists
+ErrorBillNotFound=Invoice %s does not exist
 ErrorInvoiceAlreadyReplaced=Error, you try to validate an invoice to replace invoice %s. But this one has already been replaced by invoice %s.
 ErrorDiscountAlreadyUsed=Error, discount already used
 ErrorInvoiceAvoirMustBeNegative=Error, correct invoice must have a negative amount

htdocs/langs/en_US/commercial.lang

@@ -16,7 +16,7 @@ AddActionRendezVous=Add a Rendezvous task
 Rendez-Vous=Rendezvous
 ConfirmDeleteAction=Are you sure you want to delete this task ?
 CardAction=Action card
-PercentDone=Percentage done
+PercentDone=Percentage complete
 ActionOnCompany=Task about company
 ActionOnContact=Task about contact
 TaskRDV=Meetings
@@ -35,19 +35,19 @@ ShowCustomer=Show customer
 ShowProspect=Show prospect
 ListOfProspects=List of prospects
 ListOfCustomers=List of customers
-LastDoneTasks=Last %s done tasks
+LastDoneTasks=Last %s completed tasks
 LastRecordedTasks=Last recorded tasks
 LastActionsToDo=Last %s oldest actions not completed
-DoneAndToDoActionsFor=Done and To do tasks for %s
+DoneAndToDoActionsFor=Completed and To do tasks for %s
-DoneAndToDoActions=Done and To do tasks
+DoneAndToDoActions=Completed and To do tasks
-DoneActions=Done actions
+DoneActions=Completed actions
-DoneActionsFor=Done actions for %s
+DoneActionsFor=Completed actions for %s
 ToDoActions=Incomplete actions
 ToDoActionsFor=Incomplete actions for %s
 SendPropalRef=Send commercial proposal %s
 SendOrderRef=Send order %s
 StatusActionToDo=To do
-StatusActionDone=Done
+StatusActionDone=Complete
 MyActionsAsked=Actions I have recorded
 MyActionsToDo=Actions I have to do
 MyActionsDone=Actions affected to me
@@ -73,5 +73,5 @@ ActionAC_RDV=Meetings
 ActionAC_FAC=Send billing
 ActionAC_REL=Send billing (reminder)
 ActionAC_CLO=Close
-ActionAC_EMAILING=Send mass emailing
+ActionAC_EMAILING=Send mass email
 ActionAC_COM=Send order by mail

htdocs/langs/en_US/companies.lang

@@ -18,7 +18,7 @@ MenuNewPrivateIndividual=New private individual
 MenuSocGroup=Groups
 NewCompany=New company (prospect, customer, supplier)
 NewThirdParty=New third party (prospect, customer, supplier)
-NewSocGroup=New companies group
+NewSocGroup=New company group
 NewPrivateIndividual=New private individual (prospect, customer, supplier)
 ProspectionArea=Prospection area
 SocGroup=Group of companies
@@ -56,7 +56,7 @@ PostOrFunction=Post/Function
 UserTitle=Title
 Surname=Surname/Pseudo
 Address=Address
-State=State/Canton
+State=State/Province
 Region=Region
 Country=Country
 CountryCode=Country code
@@ -66,7 +66,7 @@ PhonePerso=Pers. phone
 PhoneMobile=Mobile
 Fax=Fax
 Zip=Zip Code
-Town=Town
+Town=City
 Web=Web
 VATIsUsed=VAT is used
 VATIsNotUsed=VAT is not used
@@ -89,7 +89,7 @@ ProfId1AU=Prof Id 1 (ABN)
 ProfId2AU=-
 ProfId3AU=-
 ProfId4AU=-
-ProfId1BE=Prof Id 1 (Professionnel number)
+ProfId1BE=Prof Id 1 (Professional number)
 ProfId2BE=-
 ProfId3BE=-
 ProfId4BE=-
@@ -183,7 +183,7 @@ ContactForOrders=Orders' contact
 ContactForProposals=Proposals' contact
 ContactForContracts=Contracts' contact
 ContactForInvoices=Invoices' contact
-NoContactForAnyOrder=This contact is not contact for any order
+NoContactForAnyOrder=This contact is not a contact for any order
 NoContactForAnyProposal=This contact is not a contact for any commercial proposal
 NoContactForAnyContract=This contact is not a contact for any contract
 NoContactForAnyInvoice=This contact is not a contact for any invoice
@@ -221,7 +221,7 @@ TE_UNKNOWN=-
 TE_STARTUP=Startup
 TE_GROUP=Large company
 TE_MEDIUM=Medium company
-TE_ADMIN=Governemental
+TE_ADMIN=Governmental
 TE_SMALL=Small company
 TE_RETAIL=Retailer
 TE_WHOLE=Wholetailer

htdocs/langs/en_US/compta.lang

@@ -16,8 +16,8 @@ Account=Account
 Accounts=Accounts
 BillsForSuppliers=Bills for suppliers
 Income=Income
-Outcome=Outcome
+Outcome=Expense
-ReportInOut=Income / Outcome
+ReportInOut=Income / Expense
 ReportTurnover=Turnover
 PaymentsNotLinkedToInvoice=Payments not linked to any invoice, so not linked to any third party
 PaymentsNotLinkedToUser=Payments not linked to any user

htdocs/langs/en_US/contracts.lang

@@ -39,10 +39,10 @@ ConfirmCloseContract=This will close all services (active or not). Are you sure
 ConfirmCloseService=Are you sure you want to close this service with date <b>%s</b> ?
 ValidateAContract=Validate a contract
 ActivateService=Activate service
-ConfirmActivateService=Are you sure you want to activate this service with date of <b>%s</b> ?
+ConfirmActivateService=Are you sure you want to activate this service with date <b>%s</b> ?
 DateContract=Contract date
-DateServiceActivate=Date of service activation
+DateServiceActivate=Service activation date
-DateServiceUnactivate=Date of service unactivation
+DateServiceUnactivate=Service deactivation date
 DateServiceStart=Date for beginning of service
 DateServiceEnd=Date for end of service
 ShowContract=Show contract
@@ -52,7 +52,7 @@ ListOfExpiredServices=List of expired active services
 ListOfClosedServices=List of closed services
 ListOfRunningContractsLines=List of running contract lines
 ListOfRunningServices=List of running services
-NotActivatedServices=Not activated services (among validated contracts)
+NotActivatedServices=Inactive services (among validated contracts)
 BoardNotActivatedServices=Services to activate among validated contracts
 LastContracts=Last % contracts
 LastActivatedServices=Last %s activated services
@@ -88,5 +88,5 @@ ExpiredSince=Expiration date
 TypeContact_contrat_internal_SALESREPSIGN=Sales representative signing contract
 TypeContact_contrat_internal_SALESREPFOLL=Sales representative following-up contract
 TypeContact_contrat_external_BILLING=Billing customer contact
-TypeContact_contrat_external_CUSTOMER=Following-up customer contact
+TypeContact_contrat_external_CUSTOMER=Follow-up customer contact
 TypeContact_contrat_external_SALESREPSIGN=Signing contract customer contact

htdocs/langs/en_US/dict.lang

@@ -17,7 +17,7 @@ CountryCA=Canada
 CountryTG=Togo
 CountryGA=Gabon
 CountryNL=Netherlands
-CountryHU=Hongria
+CountryHU=Hungary
 CountryRU=Russia
 CountrySE=Sweden
 CountryCI=Ivoiry Coast
@@ -255,8 +255,8 @@ CivilityMTRE=Master
 
 ##### Currencies #####
 Currencyeuros=Euros
-CurrencyAUD=Dollar AU
+CurrencyAUD=AU Dollar
-CurrencyCAD=Dollar CAN
+CurrencyCAD=CAN Dollar
 CurrencyCHF=Swiss Francs
 CurrencyEUR=Euros
 CurrencyFRF=French Francs
@@ -266,7 +266,7 @@ CurrencyMGA=Ariary
 CurrencyMUR=Mauritius rupee
 CurrencyNOK=Norwegian krone
 CurrencyTND=Tunisian dinars
-CurrencyUSD=Dollars US
+CurrencyUSD=US Dollars
 CurrencyXAF=CFA Francs BEAC
 CurrencyXOF=CFA Francs BCEAO
 CurrencyXPF=CFP Francs

htdocs/langs/en_US/errors.lang

@@ -45,7 +45,7 @@ WarningPassIsEmpty=Warning, database password is empty. This is a security hole.
 ErrorNoAccountancyModuleLoaded=No accountancy module activated
 ErrorExportDuplicateProfil=This profil name already exists for this export set.
 ErrorLDAPSetupNotComplete=Dolibarr-LDAP matching is not complete.
-ErrorLDAPMakeManualTest=A .ldif file has been generated in directory %s. Try to load it manually from command line to have more informations on errors.
+ErrorLDAPMakeManualTest=A .ldif file has been generated in directory %s. Try to load it manually from command line to have more information on errors.
 ErrorCantSaveADoneUserWithZeroPercentage=Can't save an action with "statut not started" if field "done by" is also filled.
 ErrorBillRefAlreadyExists=Ref used for creation already exists.
 ErrorPleaseTypeBankTransactionReportName=Please type bank receipt name where transaction is reported (Format YYYYMM or YYYYMMDD) 

htdocs/langs/en_US/exports.lang

@@ -79,8 +79,8 @@ NowClickToTestTheImport=Check import parameters you have defined. If they are co
 RunSimulateImportFile=Launch the import simulation 
 FieldNeedSource=This fiels in database require a data from source file
 SomeMandatoryFieldHaveNoSource=Some mandatory fields have no source from data file
-InformationOnSourceFile=Informations on source file
+InformationOnSourceFile=Information on source file
-InformationOnTargetTables=Informations on target fields
+InformationOnTargetTables=Information on target fields
 SelectAtLeastOneField=Switch at least one source field in the column of fields to export
 SelectFormat=Choose this import file format
 RunImportFile=Launch import file

htdocs/langs/en_US/install.lang

@@ -7,7 +7,7 @@ ConfFileExists=Configuration file <b>%s</b> exists.
 ConfFileDoesNotExists=Configuration file <b>%s</b> does not exist !
 ConfFileDoesNotExistsAndCouldNotBeCreated=Configuration file <b>%s</b> does not exist and could not be created !
 ConfFileCouldBeCreated=Configuration file <b>%s</b> could be created.
-ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permissions. For first install, your web server must be granted to be able to write into this file during configuration process ("chmod 666" for example on Unix like OS).
+ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permissions. For first install, your web server must be granted to be able to write into this file during configuration process ("chmod 666" for example on a Unix like OS).
 ConfFileIsWritable=Configuration file <b>%s</b> is writable.
 PHPSupportSessions=This PHP supports sessions.
 PHPSupportPOSTGETOk=This PHP supports variables POST and GET.
@@ -20,7 +20,7 @@ Recheck=Click here for a more significative test
 ErrorPHPDoesNotSupportSessions=Your PHP installation does not support sessions. This feature is required to make Dolibarr working. Check your PHP setup.
 ErrorPHPDoesNotSupportGD=Your PHP installation does not support graphical function GD. No graph will be available.
 ErrorPHPDoesNotSupportUTF8=Your PHP installation does not support UTF8 functions. Dolibarr can't work correctly. Solve this before installing Dolibarr.
-ErrorDirDoesNotExists=Directory %s does not exists.
+ErrorDirDoesNotExists=Directory %s does not exist.
 ErrorGoBackAndCorrectParameters=Go backward and correct wrong parameters.
 ErrorWrongValueForParameter=You may have typed a wrong value for parameter '%s'.
 ErrorFailedToCreateDatabase=Failed to create database '%s'.
@@ -48,10 +48,10 @@ ServerPortDescription=Database server port. Keep empty if unknown.
 DatabaseServer=Database server
 DatabaseName=Database name
 Login=Login
-AdminLogin=Login for Dolibarr database administrator. Keep empty if you connect in anonymous
+AdminLogin=Login for Dolibarr database administrator. Keep empty if you connect anonymously
 Password=Password
 PasswordAgain=Retype password a second time
-AdminPassword=Password for Dolibarr database administrator. Keep empty if you connect in anonymous
+AdminPassword=Password for Dolibarr database administrator. Keep empty if you connect anonymously
 CreateDatabase=Create database
 CreateUser=Create user
 DatabaseSuperUserAccess=Database - Superuser access
@@ -80,7 +80,7 @@ PasswordsMismatch=Passwords differs, please try again !
 SetupEnd=End of setup
 SystemIsInstalled=This installation is complete.
 SystemIsUpgraded=Dolibarr has been upgraded successfully.
-YouNeedToPersonalizeSetup=You need to configure Dolibarr to match your needs (appearance, features, ...). To do this, please follow the link below:
+YouNeedToPersonalizeSetup=You need to configure Dolibarr to suit your needs (appearance, features, ...). To do this, please follow the link below:
 AdminLoginCreatedSuccessfuly=Dolibarr administrator login '<b>%s</b>' created successfuly.
 GoToDolibarr=Go to Dolibarr
 GoToSetupArea=Go to Dolibarr (setup area)
@@ -94,20 +94,20 @@ AdminLoginAlreadyExists=Dolibarr administrator account '<b>%s</b>' already exist
 WarningRemoveInstallDir=Warning, for security reasons, once the install or upgrade is complete, you should remove the <b>install<b> directory or rename it to <b>install.lock</b> in order to avoid its malicious use.
 ThisPHPDoesNotSupportTypeBase=This PHP system does not support any interface to access database type %s
 FunctionNotAvailableInThisPHP=Not available on this PHP
-MigrateScript=Migrate script
+MigrateScript=Migration script
-ChoosedMigrateScript=Chosen migrate script
+ChoosedMigrateScript=Choose migration script
 DataMigration=Data migration
 DatabaseMigration=Structure database migration
 ProcessMigrateScript=Script processing
 ChooseYourSetupMode=Choose your setup mode and click "Start"...
 FreshInstall=Fresh install
-FreshInstallDesc=Use this mode if this is your first install. If not, this mode can repair a previous incomplete install, but if you want to upgrade your version, choose "Upgrade" mode.
+FreshInstallDesc=Use this mode if this is your first install. If not, this mode can repair a incomplete previous install, but if you want to upgrade your version, choose "Upgrade" mode.
 Upgrade=Upgrade
 UpgradeDesc=Use this mode if you have replaced old Dolibarr files with files from a newer version. This will upgrade your database and data.
 Start=Start
 InstallNotAllowed=Setup not allowed by <b>conf.php</b> permissions
 NotAvailable=Not available
-YouMustCreateWithPermission=You must create file %s and set write permissions on it for web server during install process.
+YouMustCreateWithPermission=You must create file %s and set write permissions on it for the web server during install process.
 CorrectProblemAndReloadPage=Please fix the problem and press F5 to reload page.
 AlreadyDone=Already migrated
 DatabaseVersion=Database version

htdocs/langs/en_US/interventions.lang

@@ -6,7 +6,7 @@ InterventionCard=Intervention card
 NewIntervention=New intervention
 AddIntervention=Add intervention
 ListOfInterventions=List of interventions
-EditIntervention=Editer intervention
+EditIntervention=Edit intervention
 LastInterventions=Last %s interventions
 AllInterventions=All interventions
 CreateDraftIntervention=Create draft

htdocs/langs/en_US/mails.lang

@@ -32,7 +32,7 @@ PrepareMailing=Prepare emailing
 CreateMailing=Create emailing
 MailingDesc=This page allows you to send emailings to a group of people.
 MailingResult=Sending emails result
-TestMailing=Test emailing
+TestMailing=Test email
 ValidMailing=Valid emailing
 ApproveMailing=Approve emailing
 MailingStatusDraft=Draft
@@ -43,7 +43,7 @@ MailingStatusSentPartialy=Sent partialy
 MailingStatusSentCompletely=Sent completely
 MailingStatusError=Error
 MailingStatusNotSent=Not sent
-MailSuccessfulySent=Email successfuly sent (from %s to %s)
+MailSuccessfulySent=Email successfully sent (from %s to %s)
 ErrorMailRecipientIsEmpty=Email recipient is empty
 WarningNoEMailsAdded=No new Email to add to recipient's list.
 ConfirmValidMailing=Are you sure you want to validate this emailing ?
@@ -93,8 +93,8 @@ MailingNeedCommand2=You can however send them online by adding parameter MAILING
 ConfirmSendingEmailing=Are you sure you want to send mailing ?
 LimitSendingEmailing=On line sending of emailings are limited for security and timeout reasons to <b>%s</b> recipients by sending session.
 TargetsReset=Clear list
-ToClearAllRecipientsClickHere=To clear recipients' list for this emailing, click button
+ToClearAllRecipientsClickHere=Click here to clear the recipient list for this emailing
-ToAddRecipientsChooseHere=To add recipients, choose in those lists
+ToAddRecipientsChooseHere=Add recipients by choosing from the lists
 NbOfEMailingsReceived=Mass emailings received
 IdRecord=ID record
 DeliveryReceipt=Delivery Receipt

htdocs/langs/en_US/main.lang

@@ -15,7 +15,7 @@ DatabaseConnection=Database connection
 Error=Error
 ErrorFieldRequired=Field '%s' is required
 ErrorFieldFormat=Field '%s' has a bad value
-ErrorFileDoesNotExists=File %s does not exists
+ErrorFileDoesNotExists=File %s does not exist
 ErrorFailedToOpenFile=Failed to open file %s
 ErrorCanNotCreateDir=Can not create dir %s
 ErrorCanNotReadDir=Can not read dir %s
@@ -26,7 +26,7 @@ ErrorLogoFileNotFound=Logo file '%s' was not found
 ErrorGoToGlobalSetup=Go to 'Company/Foundation' setup to fix this
 ErrorGoToModuleSetup=Go to Module setup to fix this
 ErrorFailedToSendMail=Failed to send mail (sender=%s, receiver=%s)
-ErrorAttachedFilesDisabled=Attaching files feature is disabled on this server
+ErrorAttachedFilesDisabled=File attaching is disabled on this server
 ErrorFileNotUploaded=File was not uploaded. Check that size does not exceed maximum allowed, that free space is available on disk and that there is not already a file with same name in this directory.
 ErrorInternalErrorDetected=Error detected
 ErrorNoRequestRan=No request ran
@@ -71,7 +71,7 @@ RequestLastAccessInError=Request for last database access in error
 ReturnCodeLastAccessInError=Return code for last database access in error
 InformationLastAccessInError=Information for last database access in error
 DolibarrHasDetectedError=Dolibarr has detected a technical error
-InformationToHelpDiagnose=This is information that can help to diagnose
+InformationToHelpDiagnose=This information can help to diagnose
 MoreInformation=More information
 NotePublic=Note (public)
 NotePrivate=Note (private)
@@ -195,7 +195,7 @@ DateDue=Due date
 DateValue=Value date
 DateValueShort=Value date
 DateOperation=Operation date
-DateOperationShort=Ope. Date
+DateOperationShort=Oper. Date
 DateLimit=Limit date
 DateRequest=Request date 
 DateProcess=Process date
@@ -266,7 +266,7 @@ PriceQtyHT=Price for this quantity (net of tax)
 PriceQtyMinHT=Price quantity min. (net of tax)
 PriceQtyTTC=Price for this quantity (inc. tax)
 PriceQtyMinTTC=Price quantity min. (inc. of tax)
-Percentage=Pourcentage
+Percentage=Percentage
 Total=Total
 SubTotal=Subtotal
 TotalHTShort=Total (net)
@@ -364,7 +364,7 @@ Rejects=Rejects
 Preview=Preview
 NextStep=Next step
 PreviousStep=Previous step
-Datas=Datas
+Datas=Data
 None=None
 NoneF=None
 Late=Late
@@ -420,7 +420,7 @@ ReportDescription=Description
 Report=Report
 Keyword=Mot clé
 Legend=Legend
-FillTownFromZip=Fill town from zip
+FillTownFromZip=Fill city from zip
 ShowLog=Show log
 File=File
 Files=Files
@@ -434,8 +434,8 @@ NbOfThirdParties=Number of third parties
 NbOfCustomers=Number of customers
 NbOfLines=Number of lines
 NbOfObjects=Number of objects
-NbOfReferers=Number of referers
+NbOfReferers=Number of referrers
-Referers=Referers
+Referers=Referrers
 TotalQuantity=Total quantity
 DateFromTo=From %s to %s
 DateFrom=From %s
@@ -542,6 +542,7 @@ FieldsWithAreMandatory=Fields with <b>%s</b> are mandatory
 FieldsWithIsForPublic=Fields with <b>%s</b> are shown on public list of members. If you don't want this, check the "public" box.
 AccordingToGeoIPDatabase=(according to GeoIP convertion)
 Line=Line
+NotSupported=Not supported
 
 # Week day
 Day1=Monday

htdocs/langs/en_US/members.lang

@@ -73,7 +73,7 @@ NewCotisation=New contribution
 PaymentSubscription=New contribution payment
 EditMember=Edit member
 SubscriptionEndDate=Subscription's end date
-NewAttribute=New attribut
+NewAttribute=New attribute
 AttributeCode=Attribute code
 OptionalFieldsSetup=Optional fields setup
 MembersTypeSetup=Members type setup

htdocs/langs/en_US/orders.lang

@@ -19,7 +19,7 @@ CustomerOrder=Customer order
 CustomersOrders=Customers' orders
 CustomersOrdersRunning=Current customers' orders
 CustomersOrdersAndOrdersLines=Customer orders and orders' lines
-OrdersToValid=Orders to valid
+OrdersToValid=Orders to validate
 OrdersToBill=Orders to bill
 OrdersInProcess=Orders in process
 OrdersToProcess=Orders to process
@@ -87,7 +87,7 @@ ClassifyBilled=Classify "Billed"
 ComptaCard=Accountancy card
 DraftOrders=Draft orders
 RelatedOrders=Related orders
-OnProcessOrders=On process orders
+OnProcessOrders=In process orders
 RefOrder=Ref. order
 RefCustomerOrder=Ref. customer order
 CustomerOrder=Customer order
@@ -112,9 +112,9 @@ Error_FailedToLoad_COMMANDE_ADDON_File=Failed to load module file '%s'
 # Sources
 OrderSource0=Commercial proposal
 OrderSource1=Internet
-OrderSource2=Mail campain
+OrderSource2=Mail campaign
-OrderSource3=Phone compain
+OrderSource3=Phone compaign
-OrderSource4=Fax campain
+OrderSource4=Fax campaign
 OrderSource5=Commercial
 OrderSource6=Store
 QtyOrdered=Qty ordered

htdocs/langs/en_US/other.lang

@@ -1,7 +1,7 @@
 # Dolibarr language file - en_US - other
 CHARSET=UTF-8
 ErrorPasswordDiffers=Passwords differs, please type them again.
-ErrorForbidden=Access forbidden.<br>You try to access to a page, area or feature without being in an authenticated session or that is not allowed to your user.
+ErrorForbidden=Access denied.<br>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.
 ErrorForbidden3=It seems that Dolibarr is not used through an authenticated session. Take a look at Dolibarr setup documentation to know how to manage authentications (htaccess, mod_auth or other...).
 ErrorNoImagickReadimage=Function imagick_readimage is not found in this PHP. No preview can be available. Administrators can disable this tab from menu Setup - Display.
@@ -38,7 +38,7 @@ LinkedObject=Linked object
 Miscellanous=Miscellanous
 NbOfActiveNotifications=Number of notifications
 WarningInstallDirExists=Warning, install directory (<b>htdocs/install</b>) still exists. This is a serious security hole. You should removed it as soon as possible.
-WarningUntilDirRemoved=All security warnings (visible by admin users only) will remain active as long as vulnerability is present (or that constant MAIN_REMOVE_INSTALL_WARNING is added in Setup->Other setup).
+WarningUntilDirRemoved=All security warnings (visible by admin users only) will remain active as long as the vulnerability is present (or that constant MAIN_REMOVE_INSTALL_WARNING is added in Setup->Other setup).
 PredefinedMailContentSendInvoice=Veuillez trouver ci-joint la facture __FACREF__\n\nCordialement\n\n
 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
@@ -123,11 +123,11 @@ BookmarkTargetNewWindowShort=New window
 BookmarkTargetReplaceWindowShort=Current window
 BookmarkTitle=Bookmark title
 UrlOrLink=URL
-BehaviourOnClick=Behaviour on click on URL
+BehaviourOnClick=Behaviour when a URL is clicked
 CreateBookmark=Create bookmark
-SetHereATitleForLink=Set here a title for bookmark
+SetHereATitleForLink=Set a title for the bookmark
 UseAnExternalHttpLinkOrRelativeDolibarrLink=Use an external http URL or a relative Dolibarr URL
-ChooseIfANewWindowMustBeOpenedOnClickOnBookmark=Choose if page opened by link must appear on current or new window
+ChooseIfANewWindowMustBeOpenedOnClickOnBookmark=Choose if a page opened by link must appear on current or new window
 BookmarksManagement=Bookmarks management
 ListOfBookmarks=List of bookmarks
 ##### Webcal #####
@@ -159,7 +159,7 @@ ExportsArea=Exports area
 AvailableFormats=Available formats
 LibraryUsed=Librairy used
 LibraryVersion=Version
-ExportableDatas=Exportable datas
+ExportableDatas=Exportable data
 NoExportableData=No exportable data (no modules with exportable data loaded, or missing permissions)
 ToExport=Export
 NewExport=New export

htdocs/langs/en_US/paybox.lang

@@ -6,13 +6,13 @@ FollowingUrlAreAvailableToMakePayments=Following URLs are available to offer a p
 PaymentForm=Payment form
 WelcomeOnPaymentPage=Welcome on our online payment service
 ThisScreenAllowsYouToPay=This screen allow you to make an online payment to %s.
-ThisIsInformationOnPayment=This is informations on payment to do
+ThisIsInformationOnPayment=This is information on payment to do
 ToComplete=To complete
 YourEMail=Email for payment confirmation
 Creditor=Creditor
 PaymentCode=Payment code
 PayBoxDoPayment=Go on payment
-YouWillBeRedirectedOnPayBox=You will be redirected on secured Paybox page to input you credit card informations
+YouWillBeRedirectedOnPayBox=You will be redirected on secured Paybox page to input you credit card information
 PleaseBePatient=Please, be patient
 Continue=Next
 ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for an order

htdocs/langs/en_US/products.lang

@@ -21,14 +21,14 @@ ServiceCode=Service code
 ProductOrService=Product or Service
 ProductsAndServices=Products and Services
 ProductsOrServices=Products or Services
-ProductsAndServicesOnSell=Products and Services on sell
+ProductsAndServicesOnSell=Available Products and Services
-ProductsAndServicesNotOnSell=Products and Services out of sell
+ProductsAndServicesNotOnSell=Obsolete Products and Services
 ProductsAndServicesStatistics=Products and Services statistics
 ProductsStatistics=Products statistics
-ProductsOnSell=Products on sell
+ProductsOnSell=Available products
-ProductsNotOnSell=Products out of sell
+ProductsNotOnSell=Obsolete products
-ServicesOnSell=Services on sell
+ServicesOnSell=Availabel services
-ServicesNotOnSell=Services out of sell
+ServicesNotOnSell=Obsolete services
 InternalRef=Internal reference
 LastRecorded=Last products/services on sell recorded
 LastRecordedProductsAndServices=Last %s recorded products/services
@@ -47,12 +47,12 @@ Stock=Stock
 Stocks=Stocks
 Movement=Movement
 Movements=Movements
-OnSell=On sell
+OnSell=Available
-NotOnSell=Out of Sell
+NotOnSell=Obsolete
-ProductStatusOnSell=On sell
+ProductStatusOnSell=Available
-ProductStatusNotOnSell=Out of sell
+ProductStatusNotOnSell=Obsolete
-ProductStatusOnSellShort=On sell
+ProductStatusOnSellShort=Available
-ProductStatusNotOnSellShort=Out of sell
+ProductStatusNotOnSellShort=Obsolete
 UpdatePrice=Update price
 AppliedPricesFrom=Applied prices from
 SellingPrice=Selling price

htdocs/langs/en_US/propal.lang

@@ -34,11 +34,11 @@ ShowPropal=Show proposal
 PropalsDraft=Drafts
 PropalsOpened=Opened
 PropalsNotBilled=Closed not billed
-PropalStatusDraft=Draft (needs to be validated)
+PropalStatusDraft=Draft (needs validation)
-PropalStatusValidated=Validated (proposal is opened)
+PropalStatusValidated=Validated (proposal is open)
-PropalStatusOpened=Validated (proposal is opened)
+PropalStatusOpened=Validated (proposal is open)
 PropalStatusClosed=Closed
-PropalStatusSigned=Signed (to bill)
+PropalStatusSigned=Signed (needs billing)
 PropalStatusNotSigned=Not signed (closed)
 PropalStatusBilled=Billed
 PropalStatusDraftShort=Draft

htdocs/langs/en_US/sendings.lang

@@ -1,31 +1,31 @@
 # Dolibarr language file - en_US - sendings
 CHARSET=UTF-8
-RefSending=Ref. sending
+RefSending=Ref. shipment
-Sending=Sending
+Sending=Shipment
-Sendings=Sendings
+Sendings=Shipments
 Receivings=Receivings
-SendingsArea=Sendings area
+SendingsArea=Shipments area
 ListOfSendings=List of sendings
-SendingMethod=Sending method
+SendingMethod=Shipping method
-SendingReceipt=Sending receipt
+SendingReceipt=Shipping receipt
-LastSendings=Last %s sendings
+LastSendings=Last %s shipments
-SearchASending=Search a sending
+SearchASending=Search for shipment
-StatisticsOfSendings=Statistics of sendings
+StatisticsOfSendings=Statistics for shipments
-NbOfSendings=Number of sendings
+NbOfSendings=Number of shipments
-SendingCard=Sending card
+SendingCard=Shipping card
-NewSending=New sending
+NewSending=New shipment
-CreateASending=Create a sending
+CreateASending=Create a shipment
-CreateSending=Create sending
+CreateSending=Create shipment
 QtyOrdered=Qty ordered
 QtyShipped=Qty shipped
 QtyToShip=Qty to ship
 QtyReceived=Qty received
 KeepToShip=Keep to ship
-OtherSendingsForSameOrder=Other sendings for this order
+OtherSendingsForSameOrder=Other shipments for this order
 DateSending=Date sending order
 DateSendingShort=Date sending order
-SendingsForSameOrder=Sendings for this order
+SendingsForSameOrder=Shipments for this order
-SendingsAndReceivingForSameOrder=Sendings and receivings for this order
+SendingsAndReceivingForSameOrder=Shipments and receivings for this order
 SendingsToValidate=Sending to validate
 StatusSendingDraft=Draft
 StatusSendingValidated=Validated (products to ship or already shipped)
@@ -36,9 +36,9 @@ Carriers=Carriers
 Carrier=Carrier
 CarriersArea=Carriers area
 NewCarrier=New carrier
-ConfirmDeleteSending=Are you sure you want to delete this sending ?
+ConfirmDeleteSending=Are you sure you want to delete this shipment ?
-ConfirmValidateSending=Are you sure you want to valdate this sending ?
+ConfirmValidateSending=Are you sure you want to valdate this shipment ?
-ConfirmCancelSending=Are you sure you want to cancel this sending ?
+ConfirmCancelSending=Are you sure you want to cancel this shipment ?
 GenericTransport=Generic transport
 Enlevement=Gotten by customer
 DocumentModelSimple=Simple document model

htdocs/langs/en_US/withdrawals.lang

@@ -7,12 +7,12 @@ StandingOrder=Standing orders
 NewStandingOrder=New standing order
 Withdrawals=Withdrawals
 Withdrawal=Withdrawal
-WithdrawalsReceipts=Withdrawals receipts
+WithdrawalsReceipts=Withdrawal receipts
 WithdrawalReceipt=Withdrawal receipt
 WithdrawalReceiptShort=Receipt
 LastWithdrawalReceipts=Last %s withdrawal receipts
-WithdrawedBills=Withdrawed invoices
+WithdrawedBills=Withdrawn invoices
-WithdrawalsLines=Withdrawals lines
+WithdrawalsLines=Withdrawal lines
 RequestStandingOrderToTreat=Request for standing orders to treat
 RequestStandingOrderTreated=Request for standing orders treated
 CustomersStandingOrders=Customer standing orders

htdocs/langs/fr_FR/admin.lang

@@ -208,8 +208,9 @@ MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike = Nom host ou ip du serveur SMTP/S
 MAIN_MAIL_EMAIL_FROM = EMail émetteur pour envoi emails automatiques (Par défaut dans php.ini: <b>%s</b>)
 MAIN_DISABLE_ALL_MAILS = Désactiver globalement tout envoi de mails (pour mode test ou démos)
 MAIN_MAIL_SENDMODE = Méthode d'envoi des mails
-MAIN_MAIL_SMTPS_ID = SMTPS ID si authentification SMTP requise
+MAIN_MAIL_SMTPS_ID = SMTP Authentification ID si authentification SMTP requise
-MAIN_MAIL_SMTPS_PW = SMTPS Password si authentification SMTP requise 
+MAIN_MAIL_SMTPS_PW = SMTP Authentification Password si authentification SMTP requise 
+MAIN_MAIL_EMAIL_TLS = Utilisation du cryptage TLS (SSL) 
 FeatureNotAvailableOnLinux = Fonctionnalité non disponible sous systemes Unix. Tester votre sendmail localement. 
 ModuleSetup = Configuration du module
 ModulesSetup = Configuration des modules

htdocs/langs/fr_FR/main.lang

@@ -541,6 +541,7 @@ FieldsWithAreMandatory=Les champs marqués par un <b>%s</b> sont obligatoires
 FieldsWithIsForPublic=Les champs marqués par <b>%s</b> seront affiches sur la liste publique des membres. Si vous ne le souhaitez pas, décochez la case "public".
 AccordingToGeoIPDatabase=(obtenu par conversion GeoIP)
 Line=Ligne
+NotSupported=Non supporté
 
 # Week day
 Day1=Lundi

htdocs/lib/CMailFile.class.php

@@ -869,6 +869,7 @@ class CMailFile
 
 		if (function_exists('fsockopen'))
 		{
+			dol_syslog("Try socket connection to host=".$host." port=".$port);
 			//See if we can connect to the SMTP server
 			if ( $socket = @fsockopen($host,       // Host to 'hit', IP or domain
 			$port,       // which Port number to use
@@ -877,8 +878,9 @@ class CMailFile
 			5) )  // timeout for reading/writing data over the socket
 			{
 				// Windows still does not have support for this timeout function
-				if (function_exists('socket_set_timeout'))
+				if (function_exists('socket_set_timeout')) socket_set_timeout($socket, 5, 0);
-				socket_set_timeout($socket, 5, 0);
+
+				dol_syslog("Now we wait for answer 220");
 
 				// Check response from Server
 				if ( $_retVal = $this->server_parse($socket, "220") )