Merge branch 'develop' into new_mass_generate

htdocs/langs/en_US/main.lang

@@ -58,13 +58,13 @@ ErrorNoRequestInError=No request in error
 ErrorServiceUnavailableTryLater=Service not available at the moment. Try again later.
 ErrorDuplicateField=Duplicate value in a unique field
 ErrorSomeErrorWereFoundRollbackIsDone=Some errors were found. Changes have been rolled back.
-ErrorConfigParameterNotDefined=Parameter <b>%s</b> is not defined in Dolibarr config file <b>conf.php</b>.
+ErrorConfigParameterNotDefined=Parameter <b>%s</b> is not defined in the Dolibarr config file <b>conf.php</b>.
 ErrorCantLoadUserFromDolibarrDatabase=Failed to find user <b>%s</b> in Dolibarr database.
 ErrorNoVATRateDefinedForSellerCountry=Error, no vat rates defined for country '%s'.
 ErrorNoSocialContributionForSellerCountry=Error, no social/fiscal taxes type defined for country '%s'.
 ErrorFailedToSaveFile=Error, failed to save file.
-ErrorCannotAddThisParentWarehouse=You are trying to add a parent warehouse which is already a child of a current one
-MaxNbOfRecordPerPage=Max number of records per page
+ErrorCannotAddThisParentWarehouse=You are trying to add a parent warehouse which is already a child of a existing warehouse
+MaxNbOfRecordPerPage=Max. number of records per page
 NotAuthorized=You are not authorized to do that.
 SetDate=Set date
 SelectDate=Select a date
@@ -170,7 +170,7 @@ Save=Save
 SaveAs=Save As
 TestConnection=Test connection
 ToClone=Clone
-ConfirmClone=Choose data you want to clone :
+ConfirmClone=Choose data you want to clone:
 NoCloneOptionsSpecified=No data to clone defined.
 Of=of
 Go=Go
@@ -185,7 +185,7 @@ Valid=Valid
 Approve=Approve
 Disapprove=Disapprove
 ReOpen=Re-Open
-Upload=Send file
+Upload=Upload
 ToLink=Link
 Select=Select
 Choose=Choose
@@ -333,8 +333,8 @@ DefaultValues=Default values/filters/sorting
 Price=Price
 PriceCurrency=Price (currency)
 UnitPrice=Unit price
-UnitPriceHT=Unit price (net)
-UnitPriceHTCurrency=Unit price (net) (currency)
+UnitPriceHT=Unit price (excl.)
+UnitPriceHTCurrency=Unit price (excl.) (currency)
 UnitPriceTTC=Unit price
 PriceU=U.P.
 PriceUHT=U.P. (net)
@@ -344,15 +344,15 @@ Amount=Amount
 AmountInvoice=Invoice amount
 AmountInvoiced=Amount invoiced
 AmountPayment=Payment amount
-AmountHTShort=Amount (net)
+AmountHTShort=Amount (excl.)
 AmountTTCShort=Amount (inc. tax)
-AmountHT=Amount (net of tax)
+AmountHT=Amount (excl. tax)
 AmountTTC=Amount (inc. tax)
 AmountVAT=Amount tax
 MulticurrencyAlreadyPaid=Already paid, original currency
 MulticurrencyRemainderToPay=Remain to pay, original currency
 MulticurrencyPaymentAmount=Payment amount, original currency
-MulticurrencyAmountHT=Amount (net of tax), original currency
+MulticurrencyAmountHT=Amount (excl. tax), original currency
 MulticurrencyAmountTTC=Amount (inc. of tax), original currency
 MulticurrencyAmountVAT=Amount tax, original currency
 AmountLT1=Amount tax 2
@@ -361,16 +361,16 @@ AmountLT1ES=Amount RE
 AmountLT2ES=Amount IRPF
 AmountTotal=Total amount
 AmountAverage=Average amount
-PriceQtyMinHT=Price quantity min. (net of tax)
-PriceQtyMinHTCurrency=Price quantity min. (net of tax) (currency)
+PriceQtyMinHT=Price quantity min. (excl. tax)
+PriceQtyMinHTCurrency=Price quantity min. (excl. tax) (currency)
 Percentage=Percentage
 Total=Total
 SubTotal=Subtotal
-TotalHTShort=Total (net)
-TotalHTShortCurrency=Total (net in currency)
+TotalHTShort=Total (excl.)
+TotalHTShortCurrency=Total (excl. in currency)
 TotalTTCShort=Total (inc. tax)
-TotalHT=Total (net of tax)
-TotalHTforthispage=Total (net of tax) for this page
+TotalHT=Total (excl. tax)
+TotalHTforthispage=Total (excl. tax) for this page
 Totalforthispage=Total for this page
 TotalTTC=Total (inc. tax)
 TotalTTCToYourCredit=Total (inc. tax) to your credit
@@ -382,7 +382,7 @@ TotalLT1ES=Total RE
 TotalLT2ES=Total IRPF
 TotalLT1IN=Total CGST
 TotalLT2IN=Total SGST
-HT=Net of tax
+HT=Excl. tax
 TTC=Inc. tax
 INCVATONLY=Inc. VAT
 INCT=Inc. all taxes
@@ -437,7 +437,8 @@ Accountant=Accountant
 ContactsForCompany=Contacts for this third party
 ContactsAddressesForCompany=Contacts/addresses for this third party
 AddressesForCompany=Addresses for this third party
-ActionsOnCompany=Events about this third party
+ActionsOnCompany=Events for this third party
+ActionsOnContact=Events for this contact/address
 ActionsOnMember=Events about this member
 ActionsOnProduct=Events about this product
 NActionsLate=%s late
@@ -508,7 +509,7 @@ None=None
 NoneF=None
 NoneOrSeveral=None or several
 Late=Late
-LateDesc=The delay to define if a record is late or not depends on your setup. Ask your admin to change the delay from menu Home - Setup - Alerts.
+LateDesc=An item is defined as Delayed as per the system configuration in menu Home - Setup - Alerts.
 NoItemLate=No late item
 Photo=Picture
 Photos=Pictures
@@ -636,6 +637,8 @@ SendMail=Send email
 EMail=E-mail
 NoEMail=No email
 Email=Email
+AlreadyRead=Already read
+NotRead=Not read
 NoMobilePhone=No mobile phone
 Owner=Owner
 FollowingConstantsWillBeSubstituted=The following constants will be replaced with the corresponding value.
@@ -700,14 +703,14 @@ Notes=Notes
 AddNewLine=Add new line
 AddFile=Add file
 FreeZone=Not a predefined product/service
-FreeLineOfType=Not a predefined entry of type
+FreeLineOfType=Free-text item, type:
 CloneMainAttributes=Clone object with its main attributes
 PDFMerge=PDF Merge
 Merge=Merge
 DocumentModelStandardPDF=Standard PDF template
 PrintContentArea=Show page to print main content area
 MenuManager=Menu manager
-WarningYouAreInMaintenanceMode=Warning, you are in maintenance mode, so only login <b>%s</b> is allowed to use the application at this time.
+WarningYouAreInMaintenanceMode=Warning, you are in maintenance mode: only login <b>%s</b> is allowed to use the application in this mode.
 CoreErrorTitle=System error
 CoreErrorMessage=Sorry, an error occurred. Contact your system administrator to check the logs or disable $dolibarr_main_prod=1 to get more information.
 CreditCard=Credit card
@@ -744,14 +747,15 @@ LinkToProposal=Link to proposal
 LinkToOrder=Link to order
 LinkToInvoice=Link to invoice
 LinkToTemplateInvoice=Link to template invoice
-LinkToSupplierOrder=Link to supplier order
-LinkToSupplierProposal=Link to supplier proposal
-LinkToSupplierInvoice=Link to supplier invoice
+LinkToSupplierOrder=Link to vendor order
+LinkToSupplierProposal=Link to vendor proposal
+LinkToSupplierInvoice=Link to vendor invoice
 LinkToContract=Link to contract
 LinkToIntervention=Link to intervention
 CreateDraft=Create draft
 SetToDraft=Back to draft
 ClickToEdit=Click to edit
+ClickToRefresh=Click to refresh
 EditWithEditor=Edit with CKEditor
 EditWithTextEditor=Edit with Text editor
 EditHTMLSource=Edit HTML Source
@@ -816,8 +820,8 @@ TooManyRecordForMassAction=Too many records selected for mass action. The action
 NoRecordSelected=No record selected
 MassFilesArea=Area for files built by mass actions
 ShowTempMassFilesArea=Show area of files built by mass actions
-ConfirmMassDeletion=Mass delete confirmation
-ConfirmMassDeletionQuestion=Are you sure you want to delete the %s selected record?
+ConfirmMassDeletion=Bulk Delete confirmation
+ConfirmMassDeletionQuestion=Are you sure you want to delete the %s selected record(s)?
 RelatedObjects=Related Objects
 ClassifyBilled=Classify billed
 ClassifyUnbilled=Classify unbilled
@@ -846,9 +850,9 @@ ModuleBuilder=Module Builder
 SetMultiCurrencyCode=Set currency
 BulkActions=Bulk actions
 ClickToShowHelp=Click to show tooltip help
-WebSite=Web site
-WebSites=Web sites
-WebSiteAccounts=Web site accounts
+WebSite=Website
+WebSites=Websites
+WebSiteAccounts=Website accounts
 ExpenseReport=Expense report
 ExpenseReports=Expense reports
 HR=HR
@@ -872,6 +876,8 @@ NewLeadOrProject=New lead or project
 Rights=Permissions
 LineNb=Line no.
 IncotermLabel=Incoterms
+TabLetteringCustomer=Customer lettering
+TabLetteringSupplier=Vendor lettering
 # Week day
 Monday=Monday
 Tuesday=Tuesday
@@ -950,3 +956,4 @@ ConfirmMassDraftDeletion=Draft mass delete confirmation
 FileSharedViaALink=File shared via a link
 SelectAThirdPartyFirst=Select a third party first...
 YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
+Inventory=Inventory