Sync transifex

2021-11-13 15:17:06 +01:00 · 2021-11-13 15:17:06 +01:00 · ec78f21c26
commit ec78f21c26
parent 21c2dba922
3580 changed files with 89840 additions and 32022 deletions
--- a/htdocs/langs/am_ET/accountancy.lang
+++ b/htdocs/langs/am_ET/accountancy.lang
@ -37,8 +37,8 @@ OtherInfo=Other information
 DeleteCptCategory=Remove accounting account from group
 ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group?
 JournalizationInLedgerStatus=Status of journalization
-AlreadyInGeneralLedger=Already transferred in accounting journals and ledger
-NotYetInGeneralLedger=Not yet transferred in accouting journals and ledger
+AlreadyInGeneralLedger=Already transferred to accounting journals and ledger
+NotYetInGeneralLedger=Not yet transferred to accouting journals and ledger
 GroupIsEmptyCheckSetup=Group is empty, check setup of the personalized accounting group
 DetailByAccount=Show detail by account
 AccountWithNonZeroValues=Accounts with non-zero values
@ -48,7 +48,8 @@ CountriesNotInEEC=Countries not in EEC
 CountriesInEECExceptMe=Countries in EEC except %s
 CountriesExceptMe=All countries except %s
 AccountantFiles=Export source documents
-ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
+ExportAccountingSourceDocHelp=With this tool, you can export the source events (list in CSV and PDFs) that were used to generate your accountancy.
+ExportAccountingSourceDocHelp2=To export your journals, use the menu entry %s - %s.
 VueByAccountAccounting=View by accounting account
 VueBySubAccountAccounting=View by accounting subaccount

@ -245,9 +246,9 @@ DescThirdPartyReport=Consult here the list of third-party customers and vendors
 ListAccounts=List of the accounting accounts
 UnknownAccountForThirdparty=Unknown third-party account. We will use %s
 UnknownAccountForThirdpartyBlocking=Unknown third-party account. Blocking error
-ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Third-party account not defined or third party unknown. We will use %s
+ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Subledger account not defined or third party or user unknown. We will use %s
 ThirdpartyAccountNotDefinedOrThirdPartyUnknownSubledgerIgnored=Third-party unknown and subledger not defined on the payment. We will keep the subledger account value empty.
-ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Third-party account not defined or third party unknown. Blocking error.
+ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Subledger account not defined or third party or user unknown. Blocking error.
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third-party account and waiting account not defined. Blocking error
 PaymentsNotLinkedToProduct=Payment not linked to any product / service
 OpeningBalance=Opening balance
@ -297,7 +298,7 @@ NoNewRecordSaved=No more record to journalize
 ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
 ChangeBinding=Change the binding
 Accounted=Accounted in ledger
-NotYetAccounted=Not yet accounted in the ledger
+NotYetAccounted=Not yet transferred to accounting
 ShowTutorial=Show Tutorial
 NotReconciled=Not reconciled
 WarningRecordWithoutSubledgerAreExcluded=Warning, all operations without subledger account defined are filtered and excluded from this view
@ -328,8 +329,8 @@ ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountanc
 ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting)

 ## Export
-NotifiedExportDate=Notified export date (modification of the entries will not be possible)
-NotifiedValidationDate=Validation of the entries (modification or deletion of the entries will not be possible)
+NotifiedExportDate=Flag exported lines as exported (modification of the lines will not be possible)
+NotifiedValidationDate=Validate the exported entries (modification or deletion of the lines will not be possible)
 ConfirmExportFile=Confirmation of the generation of the accounting export file ?
 ExportDraftJournal=Export draft journal
 Modelcsv=Model of export
@ -338,11 +339,11 @@ Modelcsv_normal=Classic export
 Modelcsv_CEGID=Export for CEGID Expert Comptabilité
 Modelcsv_COALA=Export for Sage Coala
 Modelcsv_bob50=Export for Sage BOB 50
-Modelcsv_ciel=Export for Sage Ciel Compta or Compta Evolution
+Modelcsv_ciel=Export for Sage50, Ciel Compta or Compta Evo. (Format XIMPORT)
 Modelcsv_quadratus=Export for Quadratus QuadraCompta
 Modelcsv_ebp=Export for EBP
 Modelcsv_cogilog=Export for Cogilog
-Modelcsv_agiris=Export for Agiris
+Modelcsv_agiris=Export for Agiris Isacompta
 Modelcsv_LDCompta=Export for LD Compta (v9) (Test)
 Modelcsv_LDCompta10=Export for LD Compta (v10 & higher)
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
@ -350,9 +351,10 @@ Modelcsv_configurable=Export CSV Configurable
 Modelcsv_FEC=Export FEC
 Modelcsv_FEC2=Export FEC (With dates generation writing / document reversed)
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
-Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
+Modelcsv_winfic=Export for Winfic - eWinfic - WinSis Compta
 Modelcsv_Gestinumv3=Export for Gestinum (v3)
-Modelcsv_Gestinumv5Export for Gestinum (v5)
+Modelcsv_Gestinumv5=Export for Gestinum (v5)
+Modelcsv_charlemagne=Export for Aplim Charlemagne
 ChartofaccountsId=Chart of accounts Id

 ## Tools - Init accounting account on product / service
--- a/htdocs/langs/am_ET/admin.lang
+++ b/htdocs/langs/am_ET/admin.lang
@ -75,7 +75,7 @@ Dictionary=Dictionaries
 ErrorReservedTypeSystemSystemAuto=Value 'system' and 'systemauto' for type is reserved. You can use 'user' as value to add your own record
 ErrorCodeCantContainZero=Code can't contain value 0
 DisableJavascript=Disable JavaScript and Ajax functions
-DisableJavascriptNote=Note: For test or debug purpose. For optimization for blind person or text browsers, you may prefer to use the setup on the profile of user
+DisableJavascriptNote=Note: For test or debug purpose only. For optimization for blind person or text browsers, you may prefer to use the setup on the profile of user
 UseSearchToSelectCompanyTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant COMPANY_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 DelaiedFullListToSelectCompany=Wait until a key is pressed before loading content of Third Parties combo list.<br>This may increase performance if you have a large number of third parties, but it is less convenient.
@ -85,6 +85,7 @@ NumberOfBytes=Number of Bytes
 SearchString=Search string
 NotAvailableWhenAjaxDisabled=Not available when Ajax disabled
 AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a project linked to another third party
+TimesheetPreventAfterFollowingMonths=Prevent recording time spent after the following number of months
 JavascriptDisabled=JavaScript disabled
 UsePreviewTabs=Use preview tabs
 ShowPreview=Show preview
@ -117,6 +118,7 @@ MultiCurrencySetup=Multi-currency setup
 MenuLimits=Limits and accuracy
 MenuIdParent=Parent menu ID
 DetailMenuIdParent=ID of parent menu (empty for a top menu)
+ParentID=Parent ID
 DetailPosition=Sort number to define menu position
 AllMenus=All
 NotConfigured=Module/Application not configured
@ -131,7 +133,6 @@ IdModule=Module ID
 IdPermissions=Permissions ID
 LanguageBrowserParameter=Parameter %s
 LocalisationDolibarrParameters=Localization parameters
-ClientTZ=Client Time Zone (user)
 ClientHour=Client time (user)
 OSTZ=Server OS Time Zone
 PHPTZ=PHP server Time Zone
@ -159,7 +160,7 @@ Purge=Purge
 PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not normally necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
 PurgeDeleteLogFile=Delete log files, including <b>%s</b> defined for Syslog module (no risk of losing data)
 PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Parameter can be 'tempfilesold', 'logfiles' or both 'tempfilesold+logfiles'. Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
-PurgeDeleteTemporaryFilesShort=Delete log and temporary files
+PurgeDeleteTemporaryFilesShort=Delete log and temporary files (no risk of losing data)
 PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory: <b>%s</b>.<br>This will delete all generated documents related to elements (third parties, invoices etc...), files uploaded into the ECM module, database backup dumps and temporary files.
 PurgeRunNow=Purge now
 PurgeNothingToDelete=No directory or files to delete.
@ -209,6 +210,7 @@ FeatureAvailableOnlyOnStable=Feature only available on official stable versions
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the trashcan to disable it.
 OnlyActiveElementsAreShown=Only elements from <a href="%s">enabled modules</a> are shown.
 ModulesDesc=The modules/applications determine which features are available in the software. Some modules require permissions to be granted to users after activating the module. Click the on/off button <span class="small valignmiddle">%s</span> of each module to enable or disable a module/application.
+ModulesDesc2=Click the wheel button <span class="small valignmiddle">%s</span> to configure the module/application.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
 ModulesDeployDesc=If permissions on your file system allow it, you can use this tool to deploy an external module. The module will then be visible on the tab <strong>%s</strong>.
 ModulesMarketPlaces=Find external app/modules
@ -277,6 +279,7 @@ SpaceX=Space X
 SpaceY=Space Y
 FontSize=Font size
 Content=Content
+ContentForLines=Content to display for each product or service (from variable __LINES__ of Content)
 NoticePeriod=Notice period
 NewByMonth=New by month
 Emails=Emails
@ -372,8 +375,8 @@ UMask=UMask parameter for new files on Unix/Linux/BSD/Mac file system.
 UMaskExplanation=This parameter allow you to define permissions set by default on files created by Dolibarr on server (during upload for example).<br>It must be the octal value (for example, 0666 means read and write for everyone).<br>This parameter is useless on a Windows server.
 SeeWikiForAllTeam=Take a look at the Wiki page for a list of contributors and their organization
 UseACacheDelay= Delay for caching export response in seconds (0 or empty for no cache)
-DisableLinkToHelpCenter=Hide link "<b>Need help or support</b>" on login page
-DisableLinkToHelp=Hide link to online help "<b>%s</b>"
+DisableLinkToHelpCenter=Hide the link "<b>Need help or support</b>" on the login page
+DisableLinkToHelp=Hide the link to the online help "<b>%s</b>"
 AddCRIfTooLong=There is no automatic text wrapping, text that is too long will not display on documents. Please add carriage returns in the text area if needed.
 ConfirmPurge=Are you sure you want to execute this purge?<br>This will permanently delete all your data files with no way to restore them (ECM files, attached files...).
 MinLength=Minimum length
@ -495,9 +498,10 @@ WarningPHPMail=WARNING: The setup to send emails from the application is using t
 WarningPHPMailA=- Using the server of the Email Service Provider increases the trustability of your email, so it increases the deliverablity without being flagged as SPAM
 WarningPHPMailB=- Some Email Service Providers (like Yahoo) do not allow you to send an email from another server than their own server. Your current setup uses the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not theirs, so few of your sent Emails may not be accepted for delivery (be careful also of your email provider's sending quota).
 WarningPHPMailC=- Using the SMTP server of your own Email Service Provider to send emails is also interesting so all emails sent from application will also be saved into your "Sent" directory of your mailbox.
-WarningPHPMailD=If the method 'PHP Mail' is really the method you would like to use, you can remove this warning by adding the constant MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP to 1 in Home - Setup - Other.
+WarningPHPMailD=Also, it is therefore recommended to change the sending method of e-mails to the value "SMTP". If you really want to keep the default "PHP" method to send emails, just ignore this warning, or remove it by setting the MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP constant to 1 in Home - Setup - Other.
 WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of the mail user agent (MUA) for your ERP CRM application: <strong>%s</strong>.
-WarningPHPMailSPF=If the domain name in your sender email address is protected by a SPF record (ask you domain name registar), you must add the following IPs in the SPF record of the DNS of your domain: <strong>%s</strong>.
+WarningPHPMailSPF=If the domain name in your sender email address is protected by a SPF record (ask your domain name registar), you must add the following IPs in the SPF record of the DNS of your domain: <strong>%s</strong>.
+ActualMailSPFRecordFound=Actual SPF record found : %s
 ClickToShowDescription=Click to show description
 DependsOn=This module needs the module(s)
 RequiredBy=This module is required by module(s)
@ -514,6 +518,9 @@ Field=Field
 ProductDocumentTemplates=Document templates to generate product document
 FreeLegalTextOnExpenseReports=Free legal text on expense reports
 WatermarkOnDraftExpenseReports=Watermark on draft expense reports
+ProjectIsRequiredOnExpenseReports=The project is mandatory for entering an expense report
+PrefillExpenseReportDatesWithCurrentMonth=Pre-fill start and end dates of new expense report with start and end dates of the current month
+ForceExpenseReportsLineAmountsIncludingTaxesOnly=Force the entry of expense report amounts always in amount with taxes
 AttachMainDocByDefault=Set this to 1 if you want to attach main document to email by default (if applicable)
 FilesAttachedToEmail=Attach file
 SendEmailsReminders=Send agenda reminders by emails
@ -603,7 +610,7 @@ Module400Desc=Management of projects, leads/opportunities and/or tasks. You can
 Module410Name=Webcalendar
 Module410Desc=Webcalendar integration
 Module500Name=Taxes & Special Expenses
-Module500Desc=Management of other expenses (sale taxes, social or fiscal taxes, dividends, ...)
+Module500Desc=Management of other expenses (sales taxes, social or fiscal taxes, dividends, ...)
 Module510Name=Salaries
 Module510Desc=Record and track employee payments
 Module520Name=Loans
@ -895,6 +902,11 @@ Permission1002=Create/modify warehouses
 Permission1003=Delete warehouses
 Permission1004=Read stock movements
 Permission1005=Create/modify stock movements
+Permission1011=View inventories
+Permission1012=Create new inventory
+Permission1014=Validate inventory
+Permission1015=Allow to change PMP value for a product
+Permission1016=Delete inventory
 Permission1101=Read delivery receipts
 Permission1102=Create/modify delivery receipts
 Permission1104=Validate delivery receipts
@ -950,6 +962,14 @@ Permission4001=See employees
 Permission4002=Create employees
 Permission4003=Delete employees
 Permission4004=Export employees
+Permission4010=Read skill/job/position
+Permission4011=Create/modify skill/job/position
+Permission4012=Delete skill/job/position
+Permission4020=Read evaluation
+Permission4021=Create/modify evaluation
+Permission4022=Validate evaluation
+Permission4023=Delete evaluation
+Permission4030=See comparison menu
 Permission10001=Read website content
 Permission10002=Create/modify website content (html and javascript content)
 Permission10003=Create/modify website content (dynamic php code). Dangerous, must be reserved to restricted developers.
@ -1032,7 +1052,7 @@ DictionaryFees=Expense report - Types of expense report lines
 DictionarySendingMethods=Shipping methods
 DictionaryStaff=Number of Employees
 DictionaryAvailability=Delivery delay
-DictionaryOrderMethods=Ordering methods
+DictionaryOrderMethods=Order methods
 DictionarySource=Origin of proposals/orders
 DictionaryAccountancyCategory=Personalized groups for reports
 DictionaryAccountancysystem=Models for chart of accounts
@ -1165,7 +1185,8 @@ DoNotSuggestPaymentMode=Do not suggest
 NoActiveBankAccountDefined=No active bank account defined
 OwnerOfBankAccount=Owner of bank account %s
 BankModuleNotActive=Bank accounts module not enabled
-ShowBugTrackLink=Define the link "<strong>%s</strong>" (empty to not display this link, 'github' for the link to the Dolibarr project or define directly an url 'https://...')
+ShowBugTrackLink=Show the link "<strong>%s</strong>"
+ShowBugTrackLinkDesc=Keep empty to not display this link, use value 'github' for the link to the Dolibarr project or define directly an url 'https://...'
 Alerts=Alerts
 DelaysOfToleranceBeforeWarning=Delay before displaying a warning alert for:
 DelaysOfToleranceDesc=Set the delay before an alert icon %s is shown onscreen for the late element.
@ -1190,6 +1211,9 @@ SetupDescription2=The following two sections are mandatory (the two first entrie
 SetupDescription3=<a href="%s">%s -> %s</a><br><br>Basic parameters used to customize the default behavior of your application (e.g for country-related features).
 SetupDescription4=<a href="%s">%s -> %s</a><br><br>This software is a suite of many modules/applications. The modules related to your needs must be enabled and configured. Menu entries will appears with the activation of these modules.
 SetupDescription5=Other Setup menu entries manage optional parameters.
+SetupDescriptionLink=<a href="%s">%s - %s</a>
+SetupDescription3b=Basic parameters used to customize the default behavior of your application (e.g for country-related features).
+SetupDescription4b=This software is a suite of many modules/applications. The modules related to your needs must be enabled and configured. Menu entries will appears with the activation of these modules.
 AuditedSecurityEvents=Security events that are audited
 NoSecurityEventsAreAduited=No security events are audited. You can enable them from menu %s
 Audit=Security events
@ -1212,7 +1236,7 @@ SystemAreaForAdminOnly=This area is available to administrator users only. Dolib
 CompanyFundationDesc=Edit the information of your company/organization. Click on "%s" button at the bottom of the page when done.
 AccountantDesc=If you have an external accountant/bookkeeper, you can edit here its information.
 AccountantFileNumber=Accountant code
-DisplayDesc=Parameters affecting the look and behaviour of Dolibarr can be modified here.
+DisplayDesc=Parameters affecting the look and presentation of the application can be modified here.
 AvailableModules=Available app/modules
 ToActivateModule=To activate modules, go on setup Area (Home->Setup->Modules).
 SessionTimeOut=Time out for session
@ -1264,7 +1288,7 @@ SimpleNumRefNoDateModelDesc=Returns the reference number in the format %s-nnnn w
 ShowProfIdInAddress=Show professional ID with addresses
 ShowVATIntaInAddress=Hide intra-Community VAT number
 TranslationUncomplete=Partial translation
-MAIN_DISABLE_METEO=Disable meteorological view
+MAIN_DISABLE_METEO=Disable weather thumb
 MeteoStdMod=Standard mode
 MeteoStdModEnabled=Standard mode enabled
 MeteoPercentageMod=Percentage mode
@ -1335,6 +1359,7 @@ BrowserIsKO=You are using the %s web browser. This browser is known to be a bad
 PHPModuleLoaded=PHP component %s is loaded
 PreloadOPCode=Preloaded OPCode is used
 AddRefInList=Display Customer/Vendor ref. info list (select list or combobox) and most of hyperlink.<br>Third Parties will appear with a name format of "CC12345 - SC45678 - The Big Company corp." instead of "The Big Company corp".
+AddVatInList=Display Customer/Vendor VAT number. info list (select list or combobox).
 AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)<br>Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp".
 AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town info list (select list or combobox)<br>Contacts will appear with a name format of "Dupond Durand - dupond.durand@email.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand".
 AskForPreferredShippingMethod=Ask for preferred shipping method for Third Parties.
@ -1366,7 +1391,7 @@ AccountCodeManager=Options for automatic generation of customer/vendor accountin
 NotificationsDesc=Email notifications can be sent automatically for some Dolibarr events.<br>Recipients of notifications can be defined:
 NotificationsDescUser=* per user, one user at a time.
 NotificationsDescContact=* per third-party contacts (customers or vendors), one contact at a time.
-NotificationsDescGlobal=* or by setting global email addresses in this setup page.
+NotificationsDescGlobal=* or by setting global email addresses in the setup page of the module.
 ModelModules=Document Templates
 DocumentModelOdt=Generate documents from OpenDocument templates (.ODT / .ODS files from LibreOffice, OpenOffice, KOffice, TextEdit,...)
 WatermarkOnDraft=Watermark on draft document
@ -1415,7 +1440,7 @@ WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Ask for Warehouse Source for order
 ##### Suppliers Orders #####
 BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ask for bank account destination of purchase order
 ##### Orders #####
-SuggestedPaymentModesIfNotDefinedInOrder=Suggested payments mode on sale order by default if not defined on the order
+SuggestedPaymentModesIfNotDefinedInOrder=Suggested payments mode on sales order by default if not defined on the order
 OrdersSetup=Sales Orders management setup
 OrdersNumberingModules=Orders numbering models
 OrdersModelModule=Order documents models
@ -1466,10 +1491,10 @@ LDAPSynchronizeMembersTypes=Organization of foundation's members types in LDAP
 LDAPPrimaryServer=Primary server
 LDAPSecondaryServer=Secondary server
 LDAPServerPort=Server port
-LDAPServerPortExample=Default port: 389
+LDAPServerPortExample=Standard or StartTLS: 389, LDAPs: 636
 LDAPServerProtocolVersion=Protocol version
 LDAPServerUseTLS=Use TLS
-LDAPServerUseTLSExample=Your LDAP server use TLS
+LDAPServerUseTLSExample=Your LDAP server use StartTLS
 LDAPServerDn=Server DN
 LDAPAdminDn=Administrator DN
 LDAPAdminDnExample=Complete DN (ex: cn=admin,dc=example,dc=com or cn=Administrator,cn=Users,dc=example,dc=com for active directory)
@ -1619,8 +1644,7 @@ ProductSetup=Products module setup
 ServiceSetup=Services module setup
 ProductServiceSetup=Products and Services modules setup
 NumberOfProductShowInSelect=Maximum number of products to show in combo select lists (0=no limit)
-ViewProductDescInFormAbility=Display product descriptions in forms (otherwise shown in a tooltip popup)
-DoNotAddProductDescAtAddLines=Do not add product description (from product card) on submit add lines on forms
+ViewProductDescInFormAbility=Display product descriptions in lines of items (otherwise show description in a tooltip popup)
 OnProductSelectAddProductDesc=How to use the description of the products when adding a product as a line of a document
 AutoFillFormFieldBeforeSubmit=Auto fill the description input field with the description of product
 DoNotAutofillButAutoConcat=Do not autofill the input field with description of product. Description of the product will be concatenated to the entered description automatically.
@ -1684,6 +1708,8 @@ MailingDelay=Seconds to wait after sending next message
 NotificationSetup=Email Notification module setup
 NotificationEMailFrom=Sender email (From) for emails sent by the Notifications module
 FixedEmailTarget=Recipient
+NotificationDisableConfirmMessageFix=Disable notification info in confirm message for fix notification
+NotificationDisableConfirmMessageUser=Disable notification info in confirm message for user notification
 ##### Sendings #####
 SendingsSetup=Shipping module setup
 SendingsReceiptModel=Sending receipt model
@ -1699,8 +1725,10 @@ FreeLegalTextOnDeliveryReceipts=Free text on delivery receipts
 ##### FCKeditor #####
 AdvancedEditor=Advanced editor
 ActivateFCKeditor=Activate advanced editor for:
-FCKeditorForCompany=WYSIWIG creation/edition of elements description and note (except products/services)
-FCKeditorForProduct=WYSIWIG creation/edition of products/services description and note
+FCKeditorForNotePublic=WYSIWIG creation/edition of the field public notes of elements
+FCKeditorForNotePrivate=WYSIWIG creation/edition of the field private notes of elements
+FCKeditorForCompany=WYSIWIG creation/edition of the field description of elements (except products/services)
+FCKeditorForProduct=WYSIWIG creation/edition of the field description of products/services
 FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). <span class="warning">Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files.</span>
 FCKeditorForMailing= WYSIWIG creation/edition for mass eMailings (Tools->eMailing)
 FCKeditorForUserSignature=WYSIWIG creation/edition of user signature
@ -1779,7 +1807,7 @@ ClickToDialSetup=Click To Dial module setup
 ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with clicktodial login (defined on user card)<br><b>__PASS__</b> that will be replaced with clicktodial password (defined on user card).
 ClickToDialDesc=This module change phone numbers, when using a desktop computer, into clickable links. A click will call the number. This can be used to start the phone call when using a soft phone on your desktop or when using a CTI system based on SIP protocol for example. Note: When using a smartphone, phone numbers are always clickable.
 ClickToDialUseTelLink=Use just a link "tel:" on phone numbers
-ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface, installed on the same computer as the browser, and called when you click on a link starting with "tel:" in your browser. If you need link that start with "sip:" or a full server solution (no need of local software installation), you must set this to "No" and fill next field.
+ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface, installed on the same computer as the browser, and called when you click on a link starting with "tel:" in your browser. If you need a link that start with "sip:" or a full server solution (no need of local software installation), you must set this to "No" and fill the next field.
 ##### Point Of Sale (CashDesk) #####
 CashDesk=Point of Sale
 CashDeskSetup=Point of Sales module setup
@ -1909,11 +1937,11 @@ UnicodeCurrency=Enter here between braces, list of byte number that represent th
 ColorFormat=The RGB color is in HEX format, eg: FF0000
 PictoHelp=Icon name in dolibarr format ('image.png' if into the current theme directory, 'image.png@nom_du_module' if into the directory /img/ of a module)
 PositionIntoComboList=Position of line into combo lists
-SellTaxRate=Sale tax rate
+SellTaxRate=Sales tax rate
 RecuperableOnly=Yes for VAT "Not Perceived but Recoverable" dedicated for some state in France. Keep value to "No" in all other cases.
 UrlTrackingDesc=If the provider or transport service offers a page or web site to check the status of your shipments, you may enter it here. You can use the key {TRACKID} in the URL parameters so the system will replace it with the tracking number the user entered into the shipment card.
 OpportunityPercent=When you create a lead, you will define an estimated amount of project/lead. According to status of the lead, this amount may be multiplied by this rate to evaluate a total amount all your leads may generate. Value is a percentage (between 0 and 100).
-TemplateForElement=This template record is dedicated to which element
+TemplateForElement=This mail template is related to what type of object? An email template is available only when using the "Send Email" button from the related object.
 TypeOfTemplate=Type of template
 TemplateIsVisibleByOwnerOnly=Template is visible to owner only
 VisibleEverywhere=Visible everywhere
@ -1988,7 +2016,14 @@ MAIN_PDF_MARGIN_RIGHT=Right margin on PDF
 MAIN_PDF_MARGIN_TOP=Top margin on PDF
 MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
 MAIN_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
-MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Add picture on proposal line
+MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Add column for picture on proposal lines
+MAIN_DOCUMENTS_WITH_PICTURE_WIDTH=Width of the column if a picture is added on lines
+MAIN_PDF_NO_SENDER_FRAME=Hide borders on sender address frame
+MAIN_PDF_NO_RECIPENT_FRAME=Hide borders on recipent address frame
+MAIN_PDF_HIDE_CUSTOMER_CODE=Hide customer code
+MAIN_PDF_HIDE_SENDER_NAME=Hide sender/company name in address block
+PROPOSAL_PDF_HIDE_PAYMENTTERM=Hide payments conditions
+PROPOSAL_PDF_HIDE_PAYMENTMODE=Hide payment mode
 MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING=Add electronic sign in PDF
 NothingToSetup=There is no specific setup required for this module.
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
@ -2089,7 +2124,7 @@ LargerThan=Larger than
 IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email aready collected and linked to an object, the created event will be automatically linked to the known related object.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
 EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set name of directory here to use this feature (Do NOT use special characters in name). Note that you must also use a read/write login account.
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
+EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<br>For example, if you want to create a thirdparty with a name extracted a string 'Name: name to find' found into the body, use sender email as email, you can set the parameter field like this:<br>'email=HEADER:^From:(.*);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;'<br>
 EndPointFor=End point for %s : %s
 DeleteEmailCollector=Delete email collector
 ConfirmDeleteEmailCollector=Are you sure you want to delete this email collector?
@ -2106,6 +2141,7 @@ EMailsWillHaveMessageID=Emails will have a tag 'References' matching this syntax
 PDF_SHOW_PROJECT=Show project on document
 ShowProjectLabel=Project Label
 PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated in 2 different languages in the same generated PDF, you must set here this second language so generated PDF will contains 2 different languages in same page, the one chosen when generating PDF and this one (only few PDF templates support this). Keep empty for 1 language per PDF.
+PDF_USE_A=Gererate PDF documents with format PDF/A instead of defaut format PDF
 FafaIconSocialNetworksDesc=Enter here the code of a FontAwesome icon. If you don't know what is FontAwesome, you can use the generic value fa-address-book.
 RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
 JumpToBoxes=Jump to Setup -> Widgets
@ -2128,6 +2164,7 @@ AskThisIDToYourBank=Contact your bank to get this ID
 AdvancedModeOnly=Permision available in Advanced permission mode only
 ConfFileIsReadableOrWritableByAnyUsers=The conf file is readable or writable by any users. Give permission to web server user and group only.
 MailToSendEventOrganization=Event Organization
+MailToPartnership=Partnership
 AGENDA_EVENT_DEFAULT_STATUS=Default event status when creating a event from the form
 YouShouldDisablePHPFunctions=You should disable PHP functions
 IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands in custom code, you shoud disable PHP functions
@ -2136,7 +2173,7 @@ NoWritableFilesFoundIntoRootDir=No writable files or directories of the common p
 RecommendedValueIs=Recommended: %s
 Recommended=Recommended
 NotRecommended=Not recommended
-ARestrictedPath=A restricted path
+ARestrictedPath=Some restricted path
 CheckForModuleUpdate=Check for external modules updates
 CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
 ModuleUpdateAvailable=An update is available
@ -2148,3 +2185,27 @@ DatabasePasswordObfuscated=Database password is obfuscated in conf file
 DatabasePasswordNotObfuscated=Database password is NOT obfuscated in conf file
 APIsAreNotEnabled=APIs modules are not enabled
 YouShouldSetThisToOff=You should set this to 0 or off
+InstallAndUpgradeLockedBy=Install and upgrades are locked by the file <b>%s</b>
+OldImplementation=Old implementation
+PDF_SHOW_LINK_TO_ONLINE_PAYMENT=If some online payment modules are enabled (Paypal, Stripe, ...), add a link on the PDF to make the online payment
+DashboardDisableGlobal=Disable globally all the thumbs of open objects
+BoxstatsDisableGlobal=Disable totally box statistics
+DashboardDisableBlocks=Thumbs of open objects (to process or late) on main dashboard
+DashboardDisableBlockAgenda=Disable the thumb for agenda
+DashboardDisableBlockProject=Disable the thumb for projects
+DashboardDisableBlockCustomer=Disable the thumb for customers
+DashboardDisableBlockSupplier=Disable the thumb for suppliers
+DashboardDisableBlockContract=Disable the thumb for contracts
+DashboardDisableBlockTicket=Disable the thumb for tickets
+DashboardDisableBlockBank=Disable the thumb for banks
+DashboardDisableBlockAdherent=Disable the thumb for memberships
+DashboardDisableBlockExpenseReport=Disable the thumb for expense reports
+DashboardDisableBlockHoliday=Disable the thumb for leaves
+EnabledCondition=Condition to have field enabled (if not enabled, visibility will always be off)
+IfYouUseASecondTaxYouMustSetYouUseTheMainTax=If you want to use a second tax, you must enable also the first sale tax
+IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=If you want to use a third tax, you must enable also the first sale tax
+LanguageAndPresentation=Language and presentation
+SkinAndColors=Skin and colors
+IfYouUseASecondTaxYouMustSetYouUseTheMainTax=If you want to use a second tax, you must enable also the first sale tax
+IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=If you want to use a third tax, you must enable also the first sale tax
+PDF_USE_1A=Generate PDF with PDF/A-1b format
--- a/htdocs/langs/am_ET/agenda.lang
+++ b/htdocs/langs/am_ET/agenda.lang
@ -64,6 +64,7 @@ ShipmentClassifyClosedInDolibarr=Shipment %s classified billed
 ShipmentUnClassifyCloseddInDolibarr=Shipment %s classified re-open
 ShipmentBackToDraftInDolibarr=Shipment %s go back to draft status
 ShipmentDeletedInDolibarr=Shipment %s deleted
+ShipmentCanceledInDolibarr=Shipment %s canceled
 ReceptionValidatedInDolibarr=Reception %s validated
 OrderCreatedInDolibarr=Order %s created
 OrderValidatedInDolibarr=Order %s validated
@ -170,3 +171,4 @@ ReminderType=Callback type
 AddReminder=Create an automatic reminder notification for this event
 ErrorReminderActionCommCreation=Error creating the reminder notification for this event
 BrowserPush=Browser Popup Notification
+ActiveByDefault=Enabled by default
--- a/htdocs/langs/am_ET/banks.lang
+++ b/htdocs/langs/am_ET/banks.lang
@ -182,3 +182,4 @@ BankColorizeMovementName2=Background color for credit movement
 IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning.
 NoBankAccountDefined=No bank account defined
 NoRecordFoundIBankcAccount=No record found in bank account. Commonly, this occurs when a record has been deleted manually from the list of transaction in the bank account (for example during a reconciliation of the bank account). Another reason is that the payment was recorded when the module "%s" was disabled.
+AlreadyOneBankAccount=Already one bank account defined
--- a/htdocs/langs/am_ET/bills.lang
+++ b/htdocs/langs/am_ET/bills.lang
@ -192,6 +192,7 @@ ConfirmClassifyPaidPartiallyReasonDiscount=Remaining unpaid <b>(%s %s)</b> is a
 ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
 ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note.
 ConfirmClassifyPaidPartiallyReasonBadCustomer=Bad customer
+ConfirmClassifyPaidPartiallyReasonBankCharge=Deduction by bank (intermediary bank fees)
 ConfirmClassifyPaidPartiallyReasonProductReturned=Products partially returned
 ConfirmClassifyPaidPartiallyReasonOther=Amount abandoned for other reason
 ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=This choice is possible if your invoice has been provided with suitable comments. (Example «Only the tax corresponding to the price that has been actually paid gives rights to deduction»)
@ -199,6 +200,7 @@ ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=In some countries, this choice
 ConfirmClassifyPaidPartiallyReasonAvoirDesc=Use this choice if all other does not suit
 ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=A <b>bad customer</b> is a customer that refuses to pay his debt.
 ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=This choice is used when payment is not complete because some of products were returned
+ConfirmClassifyPaidPartiallyReasonBankChargeDesc=The unpaid amount is <b>intermediary bank fees</b>, deducted directly from the <b>correct amount</b> paid by the Customer.
 ConfirmClassifyPaidPartiallyReasonOtherDesc=Use this choice if all others are not suitable, for example in following situation:<br>- payment not complete because some products were shipped back<br>- amount claimed too important because a discount was forgotten<br>In all cases, amount over-claimed must be corrected in accountancy system by creating a credit note.
 ConfirmClassifyAbandonReasonOther=Other
 ConfirmClassifyAbandonReasonOtherDesc=This choice will be used in all other cases. For example because you plan to create a replacing invoice.
@ -234,16 +236,22 @@ AlreadyPaidBack=Already paid back
 AlreadyPaidNoCreditNotesNoDeposits=Already paid (without credit notes and down payments)
 Abandoned=Abandoned
 RemainderToPay=Remaining unpaid
+RemainderToPayMulticurrency=Remaining unpaid, original currency
 RemainderToTake=Remaining amount to take
+RemainderToTakeMulticurrency=Remaining amount to take, original currency
 RemainderToPayBack=Remaining amount to refund
+RemainderToPayBackMulticurrency=Remaining amount to refund, original currency
 Rest=Pending
 AmountExpected=Amount claimed
 ExcessReceived=Excess received
+ExcessReceivedMulticurrency=Excess received, original currency
 ExcessPaid=Excess paid
+ExcessPaidMulticurrency=Excess paid, original currency
 EscompteOffered=Discount offered (payment before term)
 EscompteOfferedShort=Discount
 SendBillRef=Submission of invoice %s
 SendReminderBillRef=Submission of invoice %s (reminder)
+SendPaymentReceipt=Submission of payment receipt %s
 NoDraftBills=No draft invoices
 NoOtherDraftBills=No other draft invoices
 NoDraftInvoices=No draft invoices
@ -260,6 +268,7 @@ DateInvoice=Invoice date
 DatePointOfTax=Point of tax
 NoInvoice=No invoice
 NoOpenInvoice=No open invoice
+NbOfOpenInvoices=Number of open invoices
 ClassifyBill=Classify invoice
 SupplierBillsToPay=Unpaid vendor invoices
 CustomerBillsUnpaid=Unpaid customer invoices
@ -570,7 +579,7 @@ ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually
 ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask your administrator to enable and setup module <strong>%s</strong>. Note that both methods (manual and automatic) can be used together with no risk of duplication.
 DeleteRepeatableInvoice=Delete template invoice
 ConfirmDeleteRepeatableInvoice=Are your sure you want to delete the template invoice?
-CreateOneBillByThird=Create one invoice per third party (otherwise, one invoice per order)
+CreateOneBillByThird=Create one invoice per third party (otherwise, one invoice per selected object)
 BillCreated=%s invoice(s) generated
 BillXCreated=Invoice %s generated
 StatusOfGeneratedDocuments=Status of document generation
@ -591,3 +600,5 @@ SituationTotalRayToRest=Remainder to pay without taxe
 PDFSituationTitle=Situation n° %d
 SituationTotalProgress=Total progress %d %%
 SearchUnpaidInvoicesWithDueDate=Search unpaid invoices with a due date = %s
+NoPaymentAvailable=No payment available for %s
+PaymentRegisteredAndInvoiceSetToPaid=Payment registered and invoice %s set to paid
--- a/htdocs/langs/am_ET/bookmarks.lang
+++ b/htdocs/langs/am_ET/bookmarks.lang
@ -19,3 +19,4 @@ UseAnExternalHttpLinkOrRelativeDolibarrLink=Use an external/absolute link (https
 ChooseIfANewWindowMustBeOpenedOnClickOnBookmark=Choose if the linked page should open in the current tab or a new tab
 BookmarksManagement=Bookmarks management
 BookmarksMenuShortCut=Ctrl + shift + m
+NoBookmarks=No bookmarks defined
--- a/htdocs/langs/am_ET/cashdesk.lang
+++ b/htdocs/langs/am_ET/cashdesk.lang
@ -42,7 +42,7 @@ AddTable=Add table
 Place=Place
 TakeposConnectorNecesary='TakePOS Connector' required
 OrderPrinters=Add a button to send the order to some given printers, without payment (for example to send an order to a kitchen)
-NotAvailableWithBrowserPrinter=Not available when printer for receipt is set to browser:
+NotAvailableWithBrowserPrinter=Not available when printer for receipt is set to browser
 SearchProduct=Search product
 Receipt=Receipt
 Header=Header
@ -128,3 +128,8 @@ PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
 WeighingScale=Weighing scale
 ShowPriceHT = Display the column with the price excluding tax (on screen)
 ShowPriceHTOnReceipt = Display the column with the price excluding tax (on the receipt)
+CustomerDisplay=Customer display
+SplitSale=Split sale
+PrintWithoutDetailsButton=Add "Print without details" button
+PrintWithoutDetailsLabelDefault=Line label by default on printing without details
+PrintWithoutDetails=Print without details
--- a/htdocs/langs/am_ET/categories.lang
+++ b/htdocs/langs/am_ET/categories.lang
@ -96,4 +96,5 @@ ChooseCategory=Choose category
 StocksCategoriesArea=Warehouse Categories
 ActionCommCategoriesArea=Event Categories
 WebsitePagesCategoriesArea=Page-Container Categories
+KnowledgemanagementsCategoriesArea=KM article Categories
 UseOrOperatorForCategories=Use 'OR' operator for categories
--- a/htdocs/langs/am_ET/companies.lang
+++ b/htdocs/langs/am_ET/companies.lang
@ -80,7 +80,7 @@ Web=Web
 Poste= Position
 DefaultLang=Default language
 VATIsUsed=Sales tax used
-VATIsUsedWhenSelling=This defines if this third party includes a sale tax or not when it makes an invoice to its own customers
+VATIsUsedWhenSelling=This defines if this third party includes a sales tax or not when it makes an invoice to its own customers
 VATIsNotUsed=Sales tax is not used
 CopyAddressFromSoc=Copy address from third-party details
 ThirdpartyNotCustomerNotSupplierSoNoRef=Third party neither customer nor vendor, no available referring objects
@ -271,6 +271,12 @@ ProfId3RU=Prof Id 3 (KPP)
 ProfId4RU=Prof Id 4 (OKPO)
 ProfId5RU=-
 ProfId6RU=-
+ProfId1UA=Prof Id 1 (EDRPOU)
+ProfId2UA=Prof Id 2 (DRFO)
+ProfId3UA=Prof Id 3 (INN)
+ProfId4UA=Prof Id 4 (Certificate)
+ProfId5UA=Prof Id 5 (RNOKPP)
+ProfId6UA=Prof Id 6 (TRDPAU)
 ProfId1DZ=RC
 ProfId2DZ=Art.
 ProfId3DZ=NIF
--- a/htdocs/langs/am_ET/compta.lang
+++ b/htdocs/langs/am_ET/compta.lang
@ -188,25 +188,25 @@ LT1ReportByCustomers=Report tax 2 by third party
 LT2ReportByCustomers=Report tax 3 by third party
 LT1ReportByCustomersES=Report by third party RE
 LT2ReportByCustomersES=Report by third party IRPF
-VATReport=Sale tax report
-VATReportByPeriods=Sale tax report by period
-VATReportByMonth=Sale tax report by month
-VATReportByRates=Sale tax report by rates
-VATReportByThirdParties=Sale tax report by third parties
-VATReportByCustomers=Sale tax report by customer
+VATReport=Sales tax report
+VATReportByPeriods=Sales tax report by period
+VATReportByMonth=Sales tax report by month
+VATReportByRates=Sales tax report by rate
+VATReportByThirdParties=Sales tax report by third party
+VATReportByCustomers=Sales tax report by customer
 VATReportByCustomersInInputOutputMode=Report by the customer VAT collected and paid
-VATReportByQuartersInInputOutputMode=Report by Sale tax rate of the tax collected and paid
+VATReportByQuartersInInputOutputMode=Report by Sales tax rate of the tax collected and paid
 VATReportShowByRateDetails=Show details of this rate
 LT1ReportByQuarters=Report tax 2 by rate
 LT2ReportByQuarters=Report tax 3 by rate
 LT1ReportByQuartersES=Report by RE rate
 LT2ReportByQuartersES=Report by IRPF rate
-SeeVATReportInInputOutputMode=See report <b>%sVAT encasement%s</b> for a standard calculation
-SeeVATReportInDueDebtMode=See report <b>%sVAT on flow%s</b> for a calculation with an option on the flow
-RulesVATInServices=- For services, the report includes the VAT regulations actually received or issued on the basis of the date of payment.
-RulesVATInProducts=- For material assets, the report includes the VAT received or issued on the basis of the date of payment.
-RulesVATDueServices=- For services, the report includes VAT invoices due, paid or not, based on the invoice date.
-RulesVATDueProducts=- For material assets, the report includes the VAT invoices, based on the invoice date.
+SeeVATReportInInputOutputMode=See report <b>%sVAT collection%s</b> for a standard calculation
+SeeVATReportInDueDebtMode=See report <b>%sVAT on debit%s</b> for a calculation with an option on the invoicing
+RulesVATInServices=- For services, the report includes the VAT of payments actually received or paid on the basis of the date of payment.
+RulesVATInProducts=- For material assets, the report includes the VAT on the basis of the date of payment.
+RulesVATDueServices=- For services, the report includes VAT of due invoices, paid or not, based on the invoice date.
+RulesVATDueProducts=- For material assets, the report includes the VAT of due invoices, based on the invoice date.
 OptionVatInfoModuleComptabilite=Note: For material assets, it should use the date of delivery to be more fair.
 ThisIsAnEstimatedValue=This is a preview, based on business events and not from the final ledger table, so final results may differ from this preview values
 PercentOfInvoice=%%/invoice
@ -286,9 +286,12 @@ ReportPurchaseTurnover=Purchase turnover invoiced
 ReportPurchaseTurnoverCollected=Purchase turnover collected
 IncludeVarpaysInResults = Include various payments in reports
 IncludeLoansInResults = Include loans in reports
-InvoiceLate30Days = Invoices late > 30 days
-InvoiceLate15Days = Invoices late > 15 days
-InvoiceLateMinus15Days = Invoices late
-InvoiceNotLate = To be collected < 15 days
-InvoiceNotLate15Days = To be collected in 15 days
-InvoiceNotLate30Days = To be collected in 30 days
+InvoiceLate30Days = Invoices late (> 30 days)
+InvoiceLate15Days = Invoices late (15 to 30 days)
+InvoiceLateMinus15Days = Invoices late (< 15 days)
+InvoiceNotLate = To be collected (< 15 days)
+InvoiceNotLate15Days = To be collected (15 to 30 days)
+InvoiceNotLate30Days = To be collected (> 30 days)
+InvoiceToPay=To pay (< 15 days)
+InvoiceToPay15Days=To pay (15 to 30 days)
+InvoiceToPay30Days=To pay (> 30 days)
--- a/htdocs/langs/am_ET/contracts.lang
+++ b/htdocs/langs/am_ET/contracts.lang
@ -36,7 +36,7 @@ CloseAContract=Close a contract
 ConfirmDeleteAContract=Are you sure you want to delete this contract and all its services?
 ConfirmValidateContract=Are you sure you want to validate this contract under name <b>%s</b>?
 ConfirmActivateAllOnContract=This will open all services (not yet active). Are you sure you want to open all services?
-ConfirmCloseContract=This will close all services (active or not). Are you sure you want to close this contract?
+ConfirmCloseContract=This will close all services (expired or not). Are you sure you want to close this contract?
 ConfirmCloseService=Are you sure you want to close this service with date <b>%s</b>?
 ValidateAContract=Validate a contract
 ActivateService=Activate service
--- a/htdocs/langs/am_ET/ecm.lang
+++ b/htdocs/langs/am_ET/ecm.lang
@ -45,3 +45,5 @@ GenerateImgWebp=Duplicate all images with another version with .webp format
 ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder (subfolders are not included)...
 ConfirmImgWebpCreation=Confirm all images duplication
 SucessConvertImgWebp=Images successfully duplicated
+ECMDirName=Dir name
+ECMParentDirectory=Parent directory
--- a/htdocs/langs/am_ET/errors.lang
+++ b/htdocs/langs/am_ET/errors.lang
@ -83,7 +83,7 @@ ErrorCantSaveADoneUserWithZeroPercentage=Can't save an action with "status not s
 ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorPleaseTypeBankTransactionReportName=Please enter the bank statement name where the entry has to be reported (Format YYYYMM or YYYYMMDD)
 ErrorRecordHasChildren=Failed to delete record since it has some child records.
-ErrorRecordHasAtLeastOneChildOfType=Object has at least one child of type %s
+ErrorRecordHasAtLeastOneChildOfType=Object %s has at least one child of type %s
 ErrorRecordIsUsedCantDelete=Can't delete record. It is already used or included into another object.
 ErrorModuleRequireJavascript=Javascript must not be disabled to have this feature working. To enable/disable Javascript, go to menu Home->Setup->Display.
 ErrorPasswordsMustMatch=Both typed passwords must match each other
@ -264,6 +264,13 @@ ErrorAnAmountWithoutTaxIsRequired=Error, amount is mandatory
 ErrorAPercentIsRequired=Error, please fill in the percentage correctly
 ErrorYouMustFirstSetupYourChartOfAccount=You must first setup your chart of account
 ErrorFailedToFindEmailTemplate=Failed to find template with code name %s
+ErrorDurationForServiceNotDefinedCantCalculateHourlyPrice=Duration not defined on service. No way to calculate the hourly price.
+ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
+ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
+CheckVersionFail=Version check fail
+ErrorWrongFileName=Name of the file cannot have __SOMETHING__ in it
+ErrorNotInDictionaryPaymentConditions=Not in Payment Terms Dictionary, please modify.
+ErrorIsNotADraft=%s is not a draft

 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
@ -297,8 +304,24 @@ WarningTheHiddenOptionIsOn=Warning, the hidden option <b>%s</b> is on.
 WarningCreateSubAccounts=Warning, you can't create directly a sub account, you must create a third party or an user and assign them an accounting code to find them in this list
 WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connection.
 WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So you may miss a lot of event here.
-ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
-ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
-CheckVersionFail=Version check fail
-ErrorWrongFileName=Name of the file cannot have __SOMETHING__ in it
-ErrorNotInDictionaryPaymentConditions=Not in Payment Terms Dictionary, please modify.
+WarningPaypalPaymentNotCompatibleWithStrict=The value 'Strict' makes the online payment features not working correctly. Use 'Lax' instead.
+
+# Validate
+RequireValidValue = Value not valid
+RequireAtLeastXString = Requires at least %s character(s)
+RequireXStringMax = Requires %s character(s) max
+RequireAtLeastXDigits = Requires at least %s digit(s)
+RequireXDigitsMax = Requires %s digit(s) max
+RequireValidEmail = Email address is not valid
+RequireMaxLength = Length must be less than %s chars
+RequireMinLength = Length must be more than %s char(s)
+RequireValidUrl = Require valid URL
+RequireValidDate = Require a valid date
+RequireANotEmptyValue = Is required
+RequireValidDuration = Require a valid duration
+RequireValidExistingElement = Require an existing value
+RequireValidBool = Require a valid boolean
+BadSetupOfField = Error bad setup of field
+BadSetupOfFieldClassNotFoundForValidation = Error bad setup of field : Class not found for validation
+BadSetupOfFieldFileNotFound = Error bad setup of field : File not found for inclusion
+BadSetupOfFieldFetchNotCallable = Error bad setup of field : Fetch not callable on class
--- a/htdocs/langs/am_ET/eventorganization.lang
+++ b/htdocs/langs/am_ET/eventorganization.lang
@ -19,18 +19,22 @@
 #
 ModuleEventOrganizationName = Event Organization
 EventOrganizationDescription = Event Organization through Module Project
-EventOrganizationDescriptionLong= Manage Event organization for conference, attendees, speaker, and attendees, with public subcription page
+EventOrganizationDescriptionLong= Manage the organization of an event (show, conferences, attendees or speakers, with public pages for suggestion, vote or registration)
 #
 # Menu
 #
 EventOrganizationMenuLeft = Organized events
 EventOrganizationConferenceOrBoothMenuLeft = Conference Or Booth

+PaymentEvent=Payment of event
+
 #
 # Admin page
 #
-EventOrganizationSetup = Event Organization setup
-Settings = Settings
+NewRegistration=Registration
+EventOrganizationSetup=Event Organization setup
+EventOrganization=Event organization
+Settings=Settings
 EventOrganizationSetupPage = Event Organization setup page
 EVENTORGANIZATION_TASK_LABEL = Label of tasks to create automatically when project is validated
 EVENTORGANIZATION_TASK_LABELTooltip = When you validate an organized event, some tasks can be automatically created in the project<br><br>For example: <br>Send Call for Conference<br>Send Call for Booth<br>Receive call for conferences<br>Receive call for Booth<br>Open subscriptions to events for attendees<br>Send remind of event to speakers<br>Send remind of event to Booth hoster<br>Send remind of event to attendees
@ -38,8 +42,8 @@ EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Category to add to third-parties autom
 EVENTORGANIZATION_CATEG_THIRDPARTY_BOOTH = Category to add to third-parties automatically created when they suggests a booth
 EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_CONF = Template of email to send after receiving a suggestion of a conference.
 EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_BOOTH = Template of email to send after receiving a suggestion of a booth.
-EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_BOOTH = Template of email to send  after a subscription to a booth has been paid.
-EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT = Template of email to send after a subscription to an event has been paid.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_BOOTH = Template of email to send  after a registration to a booth has been paid.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT = Template of email to send after a registration to an event has been paid.
 EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_SPEAKER = Template of email of massaction to attendes
 EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Template of email of massaction to speakers
 EVENTORGANIZATION_FILTERATTENDEES_CAT = Filter thirdpartie's select list in attendees creation card/form with category
@ -49,11 +53,11 @@ EVENTORGANIZATION_FILTERATTENDEES_TYPE = Filter thirdpartie's select list in att
 # Object
 #
 EventOrganizationConfOrBooth= Conference Or Booth
-ManageOrganizeEvent = Manage event organisation
+ManageOrganizeEvent = Manage the organization of an event
 ConferenceOrBooth = Conference Or Booth
 ConferenceOrBoothTab = Conference Or Booth
-AmountOfSubscriptionPaid = Amount of subscription paid
-DateSubscription = Date of subscription
+AmountPaid = Amount paid
+DateOfRegistration = Date of registration
 ConferenceOrBoothAttendee = Conference Or Booth Attendee

 #
@ -63,25 +67,26 @@ YourOrganizationEventConfRequestWasReceived = Your request for conference was re
 YourOrganizationEventBoothRequestWasReceived = Your request for booth was received
 EventOrganizationEmailAskConf = Request for conference
 EventOrganizationEmailAskBooth = Request for booth
-EventOrganizationEmailSubsBooth = Subscription for booth
-EventOrganizationEmailSubsEvent = Subscription for an event
+EventOrganizationEmailBoothPayment = Payment of your booth
+EventOrganizationEmailRegistrationPayment = Registration for an event
 EventOrganizationMassEmailAttendees = Communication to attendees
 EventOrganizationMassEmailSpeakers = Communication to speakers

 #
 # Event
 #
-AllowUnknownPeopleSuggestConf=Allow unknown people to suggest conferences
-AllowUnknownPeopleSuggestConfHelp=Allow unknown people to suggest conferences
-AllowUnknownPeopleSuggestBooth=Allow unknown people to suggest booth
-AllowUnknownPeopleSuggestBoothHelp=Allow unknown people to suggest booth
+AllowUnknownPeopleSuggestConf=Allow people to suggest conferences
+AllowUnknownPeopleSuggestConfHelp=Allow unknown people to suggest a conference they want to do
+AllowUnknownPeopleSuggestBooth=Allow people to apply for a booth
+AllowUnknownPeopleSuggestBoothHelp=Allow unknown people to apply for a booth
 PriceOfRegistration=Price of registration
-PriceOfRegistrationHelp=Price of registration
+PriceOfRegistrationHelp=Price to pay to register or participate in the event
 PriceOfBooth=Subscription price to stand a booth
 PriceOfBoothHelp=Subscription price to stand a booth
 EventOrganizationICSLink=Link ICS for events
 ConferenceOrBoothInformation=Conference Or Booth informations
-Attendees = Attendees
+Attendees=Attendees
+ListOfAttendeesOfEvent=List of attendees of the event project
 DownloadICSLink = Download ICS link
 EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
 SERVICE_BOOTH_LOCATION = Service used for the invoice row about a booth location
@ -100,25 +105,41 @@ EvntOrgCancelled = Cancelled
 # Public page
 #
 SuggestForm = Suggestion page
-RegisterPage = Page for conferences or booth
-EvntOrgRegistrationHelpMessage = Here, you can vote for an event, or suggest a new conference or booth for the project
-EvntOrgRegistrationConfHelpMessage = Here, you can suggest a new conference for the project
-EvntOrgRegistrationBoothHelpMessage = Here, you can suggest a new booth for the project
+SuggestOrVoteForConfOrBooth = Page for suggestion or vote
+EvntOrgRegistrationHelpMessage = Here, you can vote for a conference or suggest a new one for the event. You can also apply to have a booth during the event.
+EvntOrgRegistrationConfHelpMessage = Here, you can suggest a new conference to animate during the event.
+EvntOrgRegistrationBoothHelpMessage = Here, you can apply to have a booth during the event.
 ListOfSuggestedConferences = List of suggested conferences
 ListOfSuggestedBooths = List of suggested booths
+ListOfConferencesOrBooths=List of conferences or booths of event project
 SuggestConference = Suggest a new conference
 SuggestBooth = Suggest a booth
 ViewAndVote = View and vote for suggested events
-PublicAttendeeSubscriptionPage = Public link of registration to a conference
+PublicAttendeeSubscriptionGlobalPage = Public link for registration to the event
+PublicAttendeeSubscriptionPage = Public link for registration to this event only
 MissingOrBadSecureKey = The security key is invalid or missing
-EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference : '%s'
+EvntOrgWelcomeMessage = This form allows you to register as a new participant to the event : <b>%s</b>
 EvntOrgDuration = This conference starts on %s and ends on %s.
 ConferenceAttendeeFee = Conference attendee fee for the event : '%s' occurring from %s to %s.
 BoothLocationFee = Booth location for the event : '%s' occurring from %s to %s
 EventType = Event type
 LabelOfBooth=Booth label
 LabelOfconference=Conference label
-ConferenceIsNotConfirmed=Subcription not available, conference is not confirmed yet
+ConferenceIsNotConfirmed=Registration not available, conference is not confirmed yet
+DateMustBeBeforeThan=%s must be before %s
+DateMustBeAfterThan=%s must be after %s
+
+NewSubscription=Registration
+OrganizationEventConfRequestWasReceived=Your suggestion for a conference has been received
+OrganizationEventBoothRequestWasReceived=Your request for a booth has been received
+OrganizationEventPaymentOfBoothWasReceived=Your payment for your booth has been recorded
+OrganizationEventPaymentOfRegistrationWasReceived=Your payment for your event registration has been recorded
+OrganizationEventBulkMailToAttendees=This is a remind about your participation in the event as an attendee
+OrganizationEventBulkMailToSpeakers=This is a reminder on your participation in the event as a speaker
+OrganizationEventLinkToThirdParty=Link to third party (customer, supplier or partner)
+
+NewSuggestionOfBooth=Application for a booth
+NewSuggestionOfConference=Application for a conference

 #
 # Vote page
@ -131,17 +152,15 @@ VoteOk = Your vote has been accepted.
 AlreadyVoted = You have already voted for this event.
 VoteError = An error has occurred during the vote, please try again.

-#
-# SubscriptionOk page
-#
-SubscriptionOk = Your subscription to this conference has been validated
-#
-# Subscription validation mail
-#
-ConfAttendeeSubscriptionConfirmation = Confirmation of your subscription to a conference
-#
-# Payment page
-#
+SubscriptionOk = Your registration has been validated
+ConfAttendeeSubscriptionConfirmation = Confirmation of your subscription to an event
 Attendee = Attendee
 PaymentConferenceAttendee = Conference attendee payment
 PaymentBoothLocation = Booth location payment
+DeleteConferenceOrBoothAttendee=Remove attendee
+RegistrationAndPaymentWereAlreadyRecorder=A registration and a payment were already recorded for the email <b>%s</b>
+EmailAttendee=Attendee email
+EmailCompanyForInvoice=Company email (for invoice, if different of attendee email)
+ErrorSeveralCompaniesWithEmailContactUs=Several companies with this email has been found so we can't validate automaticaly your registration. Please contact us at %s for a manual validation
+ErrorSeveralCompaniesWithNameContactUs=Several companies with this name has been found so we can't validate automaticaly your registration. Please contact us at %s for a manual validation
+NoPublicActionsAllowedForThisEvent=No public actions are open to public for this event
--- a/htdocs/langs/am_ET/exports.lang
+++ b/htdocs/langs/am_ET/exports.lang
@ -96,8 +96,8 @@ DataComeFromFileFieldNb=Value to insert comes from field number <b>%s</b> in sou
 DataComeFromIdFoundFromRef=Value that comes from field number <b>%s</b> of source file will be used to find the id of the parent object to use (so the object <b>%s</b> that has the ref. from source file must exist in the database).
 DataComeFromIdFoundFromCodeId=Code that comes from field number <b>%s</b> of source file will be used to find the id of the parent object to use (so the code from source file must exist in the dictionary <b>%s</b>). Note that if you know the id, you can also use it in the source file instead of the code. Import should work in both cases.
 DataIsInsertedInto=Data coming from source file will be inserted into the following field:
-DataIDSourceIsInsertedInto=The id of parent object was found using the data in the source file, will be inserted into the following field:
-DataCodeIDSourceIsInsertedInto=The id of parent line found from code, will be inserted into following field:
+DataIDSourceIsInsertedInto=The id of the parent object, that was found using the data in the source file, will be inserted into the following field:
+DataCodeIDSourceIsInsertedInto=The id of the parent line, that was found from code, will be inserted into the following field:
 SourceRequired=Data value is mandatory
 SourceExample=Example of possible data value
 ExampleAnyRefFoundIntoElement=Any ref found for element <b>%s</b>
--- a/htdocs/langs/am_ET/holiday.lang
+++ b/htdocs/langs/am_ET/holiday.lang
@ -13,7 +13,7 @@ ToReviewCP=Awaiting approval
 ApprovedCP=Approved
 CancelCP=Canceled
 RefuseCP=Refused
-ValidatorCP=Approbator
+ValidatorCP=Approver
 ListeCP=List of leave
 Leave=Leave request
 LeaveId=Leave ID
@ -39,11 +39,11 @@ TitreRequestCP=Leave request
 TypeOfLeaveId=Type of leave ID
 TypeOfLeaveCode=Type of leave code
 TypeOfLeaveLabel=Type of leave label
-NbUseDaysCP=Number of days of vacation consumed
-NbUseDaysCPHelp=The calculation takes into account the non working days and the holidays defined in the dictionary.
-NbUseDaysCPShort=Days consumed
-NbUseDaysCPShortInMonth=Days consumed in month
-DayIsANonWorkingDay=%s is a non working day
+NbUseDaysCP=Number of days of leave used
+NbUseDaysCPHelp=The calculation takes into account the non-working days and the holidays defined in the dictionary.
+NbUseDaysCPShort=Days of leave
+NbUseDaysCPShortInMonth=Days of leave in month
+DayIsANonWorkingDay=%s is a non-working day
 DateStartInMonth=Start date in month
 DateEndInMonth=End date in month
 EditCP=Edit
@ -55,7 +55,7 @@ TitleDeleteCP=Delete the leave request
 ConfirmDeleteCP=Confirm the deletion of this leave request?
 ErrorCantDeleteCP=Error you don't have the right to delete this leave request.
 CantCreateCP=You don't have the right to make leave requests.
-InvalidValidatorCP=You must choose an approbator to your leave request.
+InvalidValidatorCP=You must choose the approver for your leave request.
 NoDateDebut=You must select a start date.
 NoDateFin=You must select an end date.
 ErrorDureeCP=Your leave request does not contain working day.
@ -80,14 +80,14 @@ UserCP=User
 ErrorAddEventToUserCP=An error occurred while adding the exceptional leave.
 AddEventToUserOkCP=The addition of the exceptional leave has been completed.
 MenuLogCP=View change logs
-LogCP=Log of updates of available vacation days
-ActionByCP=Performed by
-UserUpdateCP=For the user
+LogCP=Log of all updates made to "Balance of Leave"
+ActionByCP=Updated by
+UserUpdateCP=Updated for
 PrevSoldeCP=Previous Balance
 NewSoldeCP=New Balance
 alreadyCPexist=A leave request has already been done on this period.
-FirstDayOfHoliday=First day of vacation
-LastDayOfHoliday=Last day of vacation
+FirstDayOfHoliday=Beginning day of leave request
+LastDayOfHoliday=Ending day of leave request
 BoxTitleLastLeaveRequests=Latest %s modified leave requests
 HolidaysMonthlyUpdate=Monthly update
 ManualUpdate=Manual update
@ -104,8 +104,8 @@ LEAVE_SICK=Sick leave
 LEAVE_OTHER=Other leave
 LEAVE_PAID_FR=Paid vacation
 ## Configuration du Module ##
-LastUpdateCP=Latest automatic update of leave allocation
-MonthOfLastMonthlyUpdate=Month of latest automatic update of leave allocation
+LastUpdateCP=Last automatic update of leave allocation
+MonthOfLastMonthlyUpdate=Month of last automatic update of leave allocation
 UpdateConfCPOK=Updated successfully.
 Module27130Name= Management of leave requests
 Module27130Desc= Management of leave requests
@ -125,10 +125,12 @@ HolidaysCanceledBody=Your leave request for %s to %s has been canceled.
 FollowedByACounter=1: This type of leave need to be followed by a counter. Counter is incremented manually or automatically and when a leave request is validated, counter is decremented.<br>0: Not followed by a counter.
 NoLeaveWithCounterDefined=There is no leave types defined that need to be followed by a counter
 GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leave</strong> to setup the different types of leaves.
-HolidaySetup=Setup of module Holiday
-HolidaysNumberingModules=Leave requests numbering models
+HolidaySetup=Setup of module Leave
+HolidaysNumberingModules=Numbering models for leave requests
 TemplatePDFHolidays=Template for leave requests PDF
 FreeLegalTextOnHolidays=Free text on PDF
 WatermarkOnDraftHolidayCards=Watermarks on draft leave requests
 HolidaysToApprove=Holidays to approve
 NobodyHasPermissionToValidateHolidays=Nobody has permission to validate holidays
+HolidayBalanceMonthlyUpdate=Monthly update of holiday balance
+XIsAUsualNonWorkingDay=%s is usualy a NON working day
--- a/htdocs/langs/am_ET/hrm.lang
+++ b/htdocs/langs/am_ET/hrm.lang
@ -1,4 +1,6 @@
 # Dolibarr language file - en_US - hrm
+
+
 # Admin
 HRM_EMAIL_EXTERNAL_SERVICE=Email to prevent HRM external service
 Establishments=Establishments
@ -17,3 +19,63 @@ Employees=Employees
 Employee=Employee
 NewEmployee=New employee
 ListOfEmployees=List of employees
+HrmSetup=HRM module setup
+HRM_MAXRANK=Maximum rank for a skill
+HRM_DEFAULT_SKILL_DESCRIPTION=Default description of ranks when skill is created
+deplacement=Shift
+DateEval=Evaluation date
+JobCard=Job card
+Job=Job
+Jobs=Jobs
+NewSkill=New Skill
+SkillType=Skill type
+Skilldets=List of ranks for this skill
+Skilldet=Skill level
+rank=Rank
+ErrNoSkillSelected=No skill selected
+ErrSkillAlreadyAdded=This skill is already in the list
+SkillHasNoLines=This skill has no lines
+skill=Skill
+Skills=Skills
+SkillCard=Skill card
+EmployeeSkillsUpdated=Employee skills have been updated (see "Skills" tab of employee card)
+Eval=Evaluation
+Evals=Evaluations
+NewEval=New evaluation
+ValidateEvaluation=Validate evaluation
+ConfirmValidateEvaluation=Are you sure you want to validate this evaluation with reference <b>%s</b>?
+EvaluationCard=Evaluation card
+RequiredRank=Required rank for this job
+EmployeeRank=Employee rank for this skill
+Position=Position
+Positions=Positions
+PositionCard=Position card
+EmployeesInThisPosition=Employees in this position
+group1ToCompare=Usergroup to analyze
+group2ToCompare=Second usergroup for comparison
+OrJobToCompare=Compare to job skills requirements
+difference=Difference
+CompetenceAcquiredByOneOrMore=Competence acquired by one or more users but not requested by the second comparator
+MaxlevelGreaterThan=Max level greater than the one requested
+MaxLevelEqualTo=Max level equal to that demand
+MaxLevelLowerThan=Max level lower than that demand
+MaxlevelGreaterThanShort=Employee level greater than the one requested
+MaxLevelEqualToShort=Employee level equals to that demand
+MaxLevelLowerThanShort=Employee level lower than that demand
+SkillNotAcquired=Skill not acquired by all users and requested by the second comparator
+legend=Legend
+TypeSkill=Skill type
+AddSkill=Add skills to job
+RequiredSkills=Required skills for this job
+UserRank=User Rank
+SkillList=Skill list
+SaveRank=Save rank
+knowHow=Know how
+HowToBe=How to be
+knowledge=Knowledge
+AbandonmentComment=Abandonment comment
+DateLastEval=Date last evaluation
+NoEval=No evaluation done for this employee
+HowManyUserWithThisMaxNote=Number of users with this rank
+HighestRank=Highest rank
+SkillComparison=Skill comparison
--- a/htdocs/langs/am_ET/interventions.lang
+++ b/htdocs/langs/am_ET/interventions.lang
@ -64,5 +64,5 @@ InterLineDuration=Line duration intervention
 InterLineDesc=Line description intervention
 RepeatableIntervention=Template of intervention
 ToCreateAPredefinedIntervention=To create a predefined or recurring intervention, create a common intervention and convert it into intervention template
-Reopen=Reopen
 ConfirmReopenIntervention=Are you sure you want to open back the intervention <b>%s</b>?
+GenerateInter=Generate intervention
--- a/htdocs/langs/am_ET/knowledgemanagement.lang
+++ b/htdocs/langs/am_ET/knowledgemanagement.lang
@ -37,15 +37,7 @@ About = About
 KnowledgeManagementAbout = About Knowledge Management
 KnowledgeManagementAboutPage = Knowledge Management about page

-#
-# Sample page
-#
 KnowledgeManagementArea = Knowledge Management
-
-
-#
-# Menu
-#
 MenuKnowledgeRecord = Knowledge base
 ListKnowledgeRecord = List of articles
 NewKnowledgeRecord = New article
@ -53,3 +45,6 @@ ValidateReply = Validate solution
 KnowledgeRecords = Articles
 KnowledgeRecord = Article
 KnowledgeRecordExtraFields = Extrafields for Article
+GroupOfTicket=Group of tickets
+YouCanLinkArticleToATicketCategory=You can link an article to a ticket group (so the article will be suggested during qualification of new tickets)
+SuggestedForTicketsInGroup=Suggested for tickets when group is
--- a/htdocs/langs/am_ET/languages.lang
+++ b/htdocs/langs/am_ET/languages.lang
@ -1,9 +1,13 @@
 # Dolibarr language file - Source file is en_US - languages
 Language_am_ET=Ethiopian
 Language_ar_AR=Arabic
+Language_ar_DZ=Arabic (Algeria)
 Language_ar_EG=Arabic (Egypt)
+Language_ar_MA=Arabic (Moroco)
 Language_ar_SA=Arabic
 Language_ar_TN=Arabic (Tunisia)
+Language_ar_IQ=Arabic (Iraq)
+Language_as_IN=Assamese
 Language_az_AZ=Azerbaijani
 Language_bn_BD=Bengali
 Language_bn_IN=Bengali (India)
@ -70,6 +74,7 @@ Language_it_IT=Italian
 Language_it_CH=Italian (Switzerland)
 Language_ja_JP=Japanese
 Language_ka_GE=Georgian
+Language_kk_KZ=Kazakh
 Language_km_KH=Khmer
 Language_kn_IN=Kannada
 Language_ko_KR=Korean
@ -83,12 +88,14 @@ Language_ne_NP=Nepali
 Language_nl_BE=Dutch (Belgium)
 Language_nl_NL=Dutch
 Language_pl_PL=Polish
+Language_pt_AO=Portuguese (Angola)
 Language_pt_BR=Portuguese (Brazil)
 Language_pt_PT=Portuguese
 Language_ro_MD=Romanian (Moldavia)
 Language_ro_RO=Romanian
 Language_ru_RU=Russian
 Language_ru_UA=Russian (Ukraine)
+Language_tg_TJ=Tajik
 Language_tr_TR=Turkish
 Language_sl_SI=Slovenian
 Language_sv_SV=Swedish
--- a/htdocs/langs/am_ET/mails.lang
+++ b/htdocs/langs/am_ET/mails.lang
@ -60,6 +60,7 @@ EMailTestSubstitutionReplacedByGenericValues=When using test mode, substitutions
 MailingAddFile=Attach this file
 NoAttachedFiles=No attached files
 BadEMail=Bad value for Email
+EMailNotDefined=Email not defined
 ConfirmCloneEMailing=Are you sure you want to clone this emailing?
 CloneContent=Clone message
 CloneReceivers=Cloner recipients
@ -162,8 +163,8 @@ AdvTgtDeleteFilter=Delete filter
 AdvTgtSaveFilter=Save filter
 AdvTgtCreateFilter=Create filter
 AdvTgtOrCreateNewFilter=Name of new filter
-NoContactWithCategoryFound=No contact/address with a category found
-NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
+NoContactWithCategoryFound=No category found linked to some contacts/addresses
+NoContactLinkedToThirdpartieWithCategoryFound=No category found linked to some thirdparties
 OutGoingEmailSetup=Outgoing emails
 InGoingEmailSetup=Incoming emails
 OutGoingEmailSetupForEmailing=Outgoing emails (for module %s)
@ -175,5 +176,5 @@ Answered=Answered
 IsNotAnAnswer=Is not answer (initial email)
 IsAnAnswer=Is an answer of an initial email
 RecordCreatedByEmailCollector=Record created by the Email Collector %s from email %s
-DefaultBlacklistMailingStatus=Default contact status for refuse bulk emailing
+DefaultBlacklistMailingStatus=Default value for field '%s' when creating a new contact
 DefaultStatusEmptyMandatory=Empty but mandatory
--- a/htdocs/langs/am_ET/main.lang
+++ b/htdocs/langs/am_ET/main.lang
@ -804,6 +804,7 @@ LinkToSupplierInvoice=Link to vendor invoice
 LinkToContract=Link to contract
 LinkToIntervention=Link to intervention
 LinkToTicket=Link to ticket
+LinkToMo=Link to Mo
 CreateDraft=Create draft
 SetToDraft=Back to draft
 ClickToEdit=Click to edit
@ -1137,3 +1138,24 @@ CopiedToClipboard=Copied to clipboard
 InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
 ConfirmCancel=Are you sure you want to cancel
 EmailMsgID=Email MsgID
+SetToEnabled=Set to enabled
+SetToDisabled=Set to disabled
+ConfirmMassEnabling=mass enabling confirmation
+ConfirmMassEnablingQuestion=Are you sure you want to enable the %s selected record(s)?
+ConfirmMassDisabling=mass disabling confirmation
+ConfirmMassDisablingQuestion=Are you sure you want to disable the %s selected record(s)?
+RecordsEnabled=%s record(s) enabled
+RecordsDisabled=%s record(s) disabled
+RecordEnabled=Record enabled
+RecordDisabled=Record disabled
+Forthcoming=Forthcoming
+Currently=Currently
+ConfirmMassLeaveApprovalQuestion=Are you sure you want to approve the %s selected record(s)?
+ConfirmMassLeaveApproval=Mass leave approval confirmation
+RecordAproved=Record approved
+RecordsApproved=%s Record(s) approved
+Properties=Properties
+hasBeenValidated=%s has been validated
+ClientTZ=Client Time Zone (user)
+NotClosedYet=Not yet closed
+ClearSignature=Signature reset
--- a/htdocs/langs/am_ET/margins.lang
+++ b/htdocs/langs/am_ET/margins.lang
@ -22,7 +22,7 @@ ProductService=Product or Service
 AllProducts=All products and services
 ChooseProduct/Service=Choose product or service
 ForceBuyingPriceIfNull=Force buying/cost price to selling price if not defined
-ForceBuyingPriceIfNullDetails=If buying/cost price not provided when we add a new line, and this option is "ON", the margin will be 0 on the new line (buying/cost price = selling price). If this option is "OFF" (recommended), margin will be equal to the value suggested by default (and may be 100% if no default value can be found).
+ForceBuyingPriceIfNullDetails=If buying/cost price not provided when we add a new line, and this option is "ON", the margin will be 0%% on the new line (buying/cost price = selling price). If this option is "OFF" (recommended), margin will be equal to the value suggested by default (and may be 100%% if no default value can be found).
 MARGIN_METHODE_FOR_DISCOUNT=Margin method for global discounts
 UseDiscountAsProduct=As a product
 UseDiscountAsService=As a service
--- a/htdocs/langs/am_ET/members.lang
+++ b/htdocs/langs/am_ET/members.lang
@ -7,7 +7,7 @@ Members=Members
 ShowMember=Show member card
 UserNotLinkedToMember=User not linked to a member
 ThirdpartyNotLinkedToMember=Third party not linked to a member
-MembersTickets=Members Tickets
+MembersTickets=Membership address sheet
 FundationMembers=Foundation members
 ListOfValidatedPublicMembers=List of validated public members
 ErrorThisMemberIsNotPublic=This member is not public
@ -19,8 +19,8 @@ MembersCards=Business cards for members
 MembersList=List of members
 MembersListToValid=List of draft members (to be validated)
 MembersListValid=List of valid members
-MembersListUpToDate=List of valid members with up-to-date subscription
-MembersListNotUpToDate=List of valid members with out-of-date subscription
+MembersListUpToDate=List of valid members with up-to-date contribution
+MembersListNotUpToDate=List of valid members with out-of-date contribution
 MembersListExcluded=List of excluded members
 MembersListResiliated=List of terminated members
 MembersListQualified=List of qualified members
@ -28,13 +28,13 @@ MenuMembersToValidate=Draft members
 MenuMembersValidated=Validated members
 MenuMembersExcluded=Excluded members
 MenuMembersResiliated=Terminated members
-MembersWithSubscriptionToReceive=Members with subscription to receive
-MembersWithSubscriptionToReceiveShort=Subscription to receive
-DateSubscription=Subscription date
-DateEndSubscription=Subscription end date
-EndSubscription=Subscription Ends
-SubscriptionId=Subscription id
-WithoutSubscription=Without subscription
+MembersWithSubscriptionToReceive=Members with contribution to receive
+MembersWithSubscriptionToReceiveShort=Contributions to receive
+DateSubscription=Date of membership
+DateEndSubscription=End date of membership
+EndSubscription=End of membership
+SubscriptionId=Contribution ID
+WithoutSubscription=Without contribution
 MemberId=Member id
 NewMember=New member
 MemberType=Member type
@ -43,9 +43,9 @@ MemberTypeLabel=Member type label
 MembersTypes=Members types
 MemberStatusDraft=Draft (needs to be validated)
 MemberStatusDraftShort=Draft
-MemberStatusActive=Validated (waiting subscription)
+MemberStatusActive=Validated (waiting contribution)
 MemberStatusActiveShort=Validated
-MemberStatusActiveLate=Subscription expired
+MemberStatusActiveLate=Contribution expired
 MemberStatusActiveLateShort=Expired
 MemberStatusPaid=Subscription up to date
 MemberStatusPaidShort=Up to date
@ -56,9 +56,9 @@ MemberStatusResiliatedShort=Terminated
 MembersStatusToValid=Draft members
 MembersStatusExcluded=Excluded members
 MembersStatusResiliated=Terminated members
-MemberStatusNoSubscription=Validated (no subscription needed)
+MemberStatusNoSubscription=Validated (no contribution required)
 MemberStatusNoSubscriptionShort=Validated
-SubscriptionNotNeeded=No subscription needed
+SubscriptionNotNeeded=No contribution required
 NewCotisation=New contribution
 PaymentSubscription=New contribution payment
 SubscriptionEndDate=Subscription's end date
@ -68,19 +68,19 @@ DeleteAMemberType=Delete a member type
 ConfirmDeleteMemberType=Are you sure you want to delete this member type?
 MemberTypeDeleted=Member type deleted
 MemberTypeCanNotBeDeleted=Member type can not be deleted
-NewSubscription=New subscription
+NewSubscription=New contribution
 NewSubscriptionDesc=This form allows you to record your subscription as a new member of the foundation. If you want to renew your subscription (if already a member), please contact foundation board instead by email %s.
-Subscription=Subscription
-Subscriptions=Subscriptions
+Subscription=Contribution
+Subscriptions=Contributions
 SubscriptionLate=Late
-SubscriptionNotReceived=Subscription never received
-ListOfSubscriptions=List of subscriptions
+SubscriptionNotReceived=Contribution never received
+ListOfSubscriptions=List of contributions
 SendCardByMail=Send card by email
 AddMember=Create member
 NoTypeDefinedGoToSetup=No member types defined. Go to menu "Members types"
 NewMemberType=New member type
 WelcomeEMail=Welcome email
-SubscriptionRequired=Subscription required
+SubscriptionRequired=Contribution required
 DeleteType=Delete
 VoteAllowed=Vote allowed
 Physical=Individual
@ -88,47 +88,48 @@ Moral=Corporation
 MorAndPhy=Corporation and Individual
 Reenable=Re-Enable
 ExcludeMember=Exclude a member
+Exclude=Exclude
 ConfirmExcludeMember=Are you sure you want to exclude this member ?
 ResiliateMember=Terminate a member
 ConfirmResiliateMember=Are you sure you want to terminate this member?
 DeleteMember=Delete a member
-ConfirmDeleteMember=Are you sure you want to delete this member (Deleting a member will delete all his subscriptions)?
+ConfirmDeleteMember=Are you sure you want to delete this member (Deleting a member will delete all his contributions)?
 DeleteSubscription=Delete a subscription
-ConfirmDeleteSubscription=Are you sure you want to delete this subscription?
+ConfirmDeleteSubscription=Are you sure you want to delete this contribution?
 Filehtpasswd=htpasswd file
 ValidateMember=Validate a member
 ConfirmValidateMember=Are you sure you want to validate this member?
 FollowingLinksArePublic=The following links are open pages not protected by any Dolibarr permission. They are not formatted pages, provided as example to show how to list members database.
 PublicMemberList=Public member list
-BlankSubscriptionForm=Public self-subscription form
+BlankSubscriptionForm=Public self-registration form
 BlankSubscriptionFormDesc=Dolibarr can provide you a public URL/website to allow external visitors to ask to subscribe to the foundation. If an online payment module is enabled, a payment form may also be automatically provided.
 EnablePublicSubscriptionForm=Enable the public website with self-subscription form
 ForceMemberType=Force the member type
-ExportDataset_member_1=Members and subscriptions
+ExportDataset_member_1=Members and contributions
 ImportDataset_member_1=Members
 LastMembersModified=Latest %s modified members
-LastSubscriptionsModified=Latest %s modified subscriptions
+LastSubscriptionsModified=Latest %s modified contributions
 String=String
 Text=Text
 Int=Int
 DateAndTime=Date and time
 PublicMemberCard=Member public card
-SubscriptionNotRecorded=Subscription not recorded
-AddSubscription=Create subscription
-ShowSubscription=Show subscription
+SubscriptionNotRecorded=Contribution not recorded
+AddSubscription=Create contribution
+ShowSubscription=Show contribution
 # Label of email templates
 SendingAnEMailToMember=Sending information email to member
 SendingEmailOnAutoSubscription=Sending email on auto registration
 SendingEmailOnMemberValidation=Sending email on new member validation
-SendingEmailOnNewSubscription=Sending email on new subscription
-SendingReminderForExpiredSubscription=Sending reminder for expired subscriptions
+SendingEmailOnNewSubscription=Sending email on new contribution
+SendingReminderForExpiredSubscription=Sending reminder for expired contributions
 SendingEmailOnCancelation=Sending email on cancelation
 SendingReminderActionComm=Sending reminder for agenda event
 # Topic of email templates
 YourMembershipRequestWasReceived=Your membership was received.
 YourMembershipWasValidated=Your membership was validated
-YourSubscriptionWasRecorded=Your new subscription was recorded
-SubscriptionReminderEmail=Subscription reminder
+YourSubscriptionWasRecorded=Your new contribution was recorded
+SubscriptionReminderEmail=contribution reminder
 YourMembershipWasCanceled=Your membership was canceled
 CardContent=Content of your member card
 # Text of email templates
@ -139,10 +140,10 @@ ThisIsContentOfSubscriptionReminderEmail=We want to let you know that your subsc
 ThisIsContentOfYourCard=This is a summary of the information we have about you. Please contact us if anything is incorrect.<br><br>
 DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the notification email received in case of auto-inscription of a guest
 DescADHERENT_AUTOREGISTER_NOTIF_MAIL=Content of the notification email received in case of auto-inscription of a guest
-DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Email template to use to send email to a member on member autosubscription
+DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Email template to use to send email to a member on member auto-registration
 DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Email template to use to send email to a member on member validation
-DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Email template to use to send email to a member on new subscription recording
-DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Email template to use to send email reminder when subscription is about to expire
+DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Email template to use to send email to a member on new contribution recording
+DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Email template to use to send email reminder when contribution is about to expire
 DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Email template to use to send email to a member on member cancelation
 DescADHERENT_EMAIL_TEMPLATE_EXCLUSION=Email template to use to send email to a member on member exclusion
 DescADHERENT_MAIL_FROM=Sender Email for automatic emails
@ -155,10 +156,10 @@ DescADHERENT_CARD_TEXT_RIGHT=Text printed on member cards (align on right)
 DescADHERENT_CARD_FOOTER_TEXT=Text printed on bottom of member cards
 ShowTypeCard=Show type '%s'
 HTPasswordExport=htpassword file generation
-NoThirdPartyAssociatedToMember=No third party associated to this member
-MembersAndSubscriptions= Members and Subscriptions
+NoThirdPartyAssociatedToMember=No third party associated with this member
+MembersAndSubscriptions=Members and Contributions
 MoreActions=Complementary action on recording
-MoreActionsOnSubscription=Complementary action, suggested by default when recording a subscription
+MoreActionsOnSubscription=Complementary action, suggested by default when recording a contribution
 MoreActionBankDirect=Create a direct entry on bank account
 MoreActionBankViaInvoice=Create an invoice, and a payment on bank account
 MoreActionInvoiceOnly=Create an invoice with no payment
@ -167,9 +168,9 @@ LinkToGeneratedPagesDesc=This screen allows you to generate PDF files with busin
 DocForAllMembersCards=Generate business cards for all members
 DocForOneMemberCards=Generate business cards for a particular member
 DocForLabels=Generate address sheets
-SubscriptionPayment=Subscription payment
-LastSubscriptionDate=Date of latest subscription payment
-LastSubscriptionAmount=Amount of latest subscription
+SubscriptionPayment=Contribution payment
+LastSubscriptionDate=Date of latest contribution payment
+LastSubscriptionAmount=Amount of latest contribution
 LastMemberType=Last Member type
 MembersStatisticsByCountries=Members statistics by country
 MembersStatisticsByState=Members statistics by state/province
@ -186,32 +187,34 @@ MembersByRegion=This screen show you statistics of members by region.
 MembersStatisticsDesc=Choose statistics you want to read...
 MenuMembersStats=Statistics
 LastMemberDate=Latest membership date
-LatestSubscriptionDate=Latest subscription date
+LatestSubscriptionDate=Latest contribution date
 MemberNature=Nature of the member
 MembersNature=Nature of the members
 Public=Information is public
 NewMemberbyWeb=New member added. Awaiting approval
 NewMemberForm=New member form
-SubscriptionsStatistics=Subscriptions statistics
-NbOfSubscriptions=Number of subscriptions
-AmountOfSubscriptions=Amount collected from subscriptions
+SubscriptionsStatistics=Contributions statistics
+NbOfSubscriptions=Number of contributions
+AmountOfSubscriptions=Amount collected from contributions
 TurnoverOrBudget=Turnover (for a company) or Budget (for a foundation)
-DefaultAmount=Default amount of subscription
-CanEditAmount=Visitor can choose/edit amount of its subscription
+DefaultAmount=Default amount of contribution
+CanEditAmount=Visitor can choose/edit amount of its contribution
 MEMBER_NEWFORM_PAYONLINE=Jump on integrated online payment page
 ByProperties=By nature
 MembersStatisticsByProperties=Members statistics by nature
-VATToUseForSubscriptions=VAT rate to use for subscriptions
-NoVatOnSubscription=No VAT for subscriptions
-ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
+VATToUseForSubscriptions=VAT rate to use for contributionss
+NoVatOnSubscription=No VAT for contributions
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for contribution line into invoice: %s
 NameOrCompany=Name or company
-SubscriptionRecorded=Subscription recorded
+SubscriptionRecorded=Contribution recorded
 NoEmailSentToMember=No email sent to member
 EmailSentToMember=Email sent to member at %s
-SendReminderForExpiredSubscriptionTitle=Send reminder by email for expired subscription
-SendReminderForExpiredSubscription=Send reminder by email to members when subscription is about to expire (parameter is number of days before end of subscription to send the remind. It can be a list of days separated by a semicolon, for example '10;5;0;-5')
+SendReminderForExpiredSubscriptionTitle=Send reminder by email for expired contributions
+SendReminderForExpiredSubscription=Send reminder by email to members when contribution is about to expire (parameter is number of days before end of membership to send the remind. It can be a list of days separated by a semicolon, for example '10;5;0;-5')
 MembershipPaid=Membership paid for current period (until %s)
 YouMayFindYourInvoiceInThisEmail=You may find your invoice attached to this email
 XMembersClosed=%s member(s) closed
 XExternalUserCreated=%s external user(s) created
 ForceMemberNature=Force member nature (Individual or Corporation)
+CreateDolibarrLoginDesc=The creation of a user login for members allows them to connect to the application. Depending on the authorizations granted, they will be able, for example, to consult or modify their file themselves.
+CreateDolibarrThirdPartyDesc=A thirdparty is the legal entity that will be used on the invoice if you decide to generate invoice for each contribution. You will be able to create it later during the process of recording the contribution.
--- a/htdocs/langs/am_ET/modulebuilder.lang
+++ b/htdocs/langs/am_ET/modulebuilder.lang
@ -144,3 +144,4 @@ AsciiToPdfConverter=Ascii to PDF converter
 TableNotEmptyDropCanceled=Table not empty. Drop has been canceled.
 ModuleBuilderNotAllowed=The module builder is available but not allowed to your user.
 ImportExportProfiles=Import and export profiles
+ValidateModBuilderDesc=Put 1 if this field need to be validated with $this->validateField() or 0 if validation required
--- a/htdocs/langs/am_ET/mrp.lang
+++ b/htdocs/langs/am_ET/mrp.lang
@ -9,6 +9,7 @@ LatestBOMModified=Latest %s Bills of materials modified
 LatestMOModified=Latest %s Manufacturing Orders modified
 Bom=Bills of Material
 BillOfMaterials=Bill of Materials
+BillOfMaterialsLines=Bill of Materials lines
 BOMsSetup=Setup of module BOM
 ListOfBOMs=List of bills of material - BOM
 ListOfManufacturingOrders=List of Manufacturing Orders
@ -31,7 +32,7 @@ ValueOfMeansLossForProductProduced=Value of 0.95 means an average of 5%% of loss
 DeleteBillOfMaterials=Delete Bill Of Materials
 DeleteMo=Delete Manufacturing Order
 ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Materials?
-ConfirmDeleteMo=Are you sure you want to delete this Bill Of Materials?
+ConfirmDeleteMo=Are you sure you want to delete this Manufacturing Order?
 MenuMRP=Manufacturing Orders
 NewMO=New Manufacturing Order
 QtyToProduce=Qty to produce
@ -55,6 +56,7 @@ WarehouseForProduction=Warehouse for production
 CreateMO=Create MO
 ToConsume=To consume
 ToProduce=To produce
+ToObtain=To obtain
 QtyAlreadyConsumed=Qty already consumed
 QtyAlreadyProduced=Qty already produced
 QtyRequiredIfNoLoss=Qty required if there is no loss (Manufacturing efficiency is 100%%)
@ -72,6 +74,7 @@ NoStockChangeOnServices=No stock change on services
 ProductQtyToConsumeByMO=Product quantity still to consume by open MO
 ProductQtyToProduceByMO=Product quantity still to produce by open MO
 AddNewConsumeLines=Add new line to consume
+AddNewProduceLines=Add new line to produce
 ProductsToConsume=Products to consume
 ProductsToProduce=Products to produce
 UnitCost=Unit cost
@ -101,3 +104,6 @@ HumanMachine=Human / Machine
 WorkstationArea=Workstation area
 Machines=Machines
 THMEstimatedHelp=This rate makes it possible to define a forecast cost of the item
+BOM=Bill Of Materials
+CollapseBOMHelp=You can define the default display of the details of the nomenclature in the configuration of the BOM module
+MOAndLines=Manufacturing Orders and lines
--- a/htdocs/langs/am_ET/opensurvey.lang
+++ b/htdocs/langs/am_ET/opensurvey.lang
@ -48,6 +48,8 @@ AddEndHour=Add end hour
 votes=vote(s)
 NoCommentYet=No comments have been posted for this poll yet
 CanComment=Voters can comment in the poll
+YourVoteIsPrivate=This poll is private, nobody can see your vote.
+YourVoteIsPublic=This poll is public, anybody with the link can see your vote.
 CanSeeOthersVote=Voters can see other people's vote
 SelectDayDesc=For each selected day, you can choose, or not, meeting hours in the following format:<br>- empty,<br>- "8h", "8H" or "8:00" to give a meeting's start hour,<br>- "8-11", "8h-11h", "8H-11H" or "8:00-11:00" to give a meeting's start and end hour,<br>- "8h15-11h15", "8H15-11H15" or "8:15-11:15" for the same thing but with minutes.
 BackToCurrentMonth=Back to current month
--- a/htdocs/langs/am_ET/orders.lang
+++ b/htdocs/langs/am_ET/orders.lang
@ -17,7 +17,7 @@ ToOrder=Make order
 MakeOrder=Make order
 SupplierOrder=Purchase order
 SuppliersOrders=Purchase orders
-SaleOrderLines=Sale order lines
+SaleOrderLines=Sales order lines
 PurchaseOrderLines=Puchase order lines
 SuppliersOrdersRunning=Current purchase orders
 CustomerOrder=Sales Order
@ -124,6 +124,8 @@ SupplierOrderReceivedInDolibarr=Purchase Order %s received %s
 SupplierOrderSubmitedInDolibarr=Purchase Order %s submitted
 SupplierOrderClassifiedBilled=Purchase Order %s set billed
 OtherOrders=Other orders
+SupplierOrderValidatedAndApproved=Supplier order is validated and approved : %s
+SupplierOrderValidated=Supplier order is validated : %s
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=Representative following-up sales order
 TypeContact_commande_internal_SHIPPING=Representative following-up shipping
@ -151,6 +153,7 @@ PDFEdisonDescription=A simple order model
 PDFProformaDescription=A complete Proforma invoice template
 CreateInvoiceForThisCustomer=Bill orders
 CreateInvoiceForThisSupplier=Bill orders
+CreateInvoiceForThisReceptions=Bill receptions
 NoOrdersToInvoice=No orders billable
 CloseProcessedOrdersAutomatically=Classify "Processed" all selected orders.
 OrderCreation=Order creation
--- a/htdocs/langs/am_ET/other.lang
+++ b/htdocs/langs/am_ET/other.lang
@ -35,6 +35,9 @@ OnlyOneFieldForXAxisIsPossible=Only 1 field is currently possible as X-Axis. Onl
 AtLeastOneMeasureIsRequired=At least 1 field for measure is required
 AtLeastOneXAxisIsRequired=At least 1 field for X-Axis is required
 LatestBlogPosts=Latest Blog Posts
+notiftouser=To users
+notiftofixedemail=To fixed mail
+notiftouserandtofixedemail=To user and fixed mail
 Notify_ORDER_VALIDATE=Sales order validated
 Notify_ORDER_SENTBYMAIL=Sales order sent by mail
 Notify_ORDER_SUPPLIER_SENTBYMAIL=Purchase order sent by email
@ -291,3 +294,7 @@ PopuCom=Products/Services by popularity in Orders
 ProductStatistics=Products/Services Statistics
 NbOfQtyInOrders=Qty in orders
 SelectTheTypeOfObjectToAnalyze=Select an object to view its statistics...
+
+ConfirmBtnCommonContent = Are you sure you want to "%s" ?
+ConfirmBtnCommonTitle = Confirm your action
+CloseDialog = Close
--- a/htdocs/langs/am_ET/partnership.lang
+++ b/htdocs/langs/am_ET/partnership.lang
@ -77,6 +77,10 @@ YourPartnershipRefusedContent=We inform you that your partnership request has be
 YourPartnershipAcceptedContent=We inform you that your partnership request has been accepted.
 YourPartnershipCanceledContent=We inform you that your partnership has been canceled.

+CountLastUrlCheckError=Number of errors for last URL check
+LastCheckBacklink=Date of last URL check
+ReasonDeclineOrCancel=Decline reason
+
 #
 # Status
 #
--- a/htdocs/langs/am_ET/printing.lang
+++ b/htdocs/langs/am_ET/printing.lang
@ -1,10 +1,10 @@
 # Dolibarr language file - Source file is en_US - printing
-Module64000Name=Direct Printing
-Module64000Desc=Enable Direct Printing System
-PrintingSetup=Setup of Direct Printing System
-PrintingDesc=This module adds a Print button to various modules to allow documents to be printed directly to a printer without needing to open the document in another application.
-MenuDirectPrinting=Direct Printing jobs
-DirectPrint=Direct print
+Module64000Name=One click Printing
+Module64000Desc=Enable One click Printing System
+PrintingSetup=Setup of One click Printing System
+PrintingDesc=This module adds a Print button to various modules to allow documents to be printed directly to a printer with no need to open the document into another application.
+MenuDirectPrinting=One click Printing jobs
+DirectPrint=One click Print
 PrintingDriverDesc=Configuration variables for printing driver.
 ListDrivers=List of drivers
 PrintTestDesc=List of Printers.
--- a/htdocs/langs/am_ET/productbatch.lang
+++ b/htdocs/langs/am_ET/productbatch.lang
@ -37,7 +37,8 @@ ManufacturingDate=Manufacturing date
 DestructionDate=Destruction date
 FirstUseDate=First use date
 QCFrequency=Quality control frequency (in days)
-
+ShowAllLots=Show all lots
+HideLots=Hide lots
 #Traceability - qc status
 OutOfOrder=Out of order
 InWorkingOrder=In working order
--- a/htdocs/langs/am_ET/products.lang
+++ b/htdocs/langs/am_ET/products.lang
@ -75,6 +75,7 @@ SellingPriceTTC=Selling price (inc. tax)
 SellingMinPriceTTC=Minimum Selling price (inc. tax)
 CostPriceDescription=This price field (excl. tax) can be used to capture the average amount this product costs to your company. It may be any price you calculate yourself, for example, from the average buying price plus average production and distribution cost.
 CostPriceUsage=This value could be used for margin calculation.
+ManufacturingPrice=Manufacturing price
 SoldAmount=Sold amount
 PurchasedAmount=Purchased amount
 NewPrice=New price
@ -315,7 +316,7 @@ LastUpdated=Latest update
 CorrectlyUpdated=Correctly updated
 PropalMergePdfProductActualFile=Files use to add into PDF Azur are/is
 PropalMergePdfProductChooseFile=Select PDF files
-IncludingProductWithTag=Include products/services with tag
+IncludingProductWithTag=Including products/services with the tag
 DefaultPriceRealPriceMayDependOnCustomer=Default price, real price may depend on customer
 WarningSelectOneDocument=Please select at least one document
 DefaultUnitToShow=Unit
@ -341,7 +342,7 @@ ProductSheet=Product sheet
 ServiceSheet=Service sheet
 PossibleValues=Possible values
 GoOnMenuToCreateVairants=Go on menu %s - %s to prepare attribute variants (like colors, size, ...)
-UseProductFournDesc=Add a feature to define the descriptions of products defined by the vendors in addition to descriptions for customers
+UseProductFournDesc=Add a feature to define the product description defined by the vendors (for each vendor reference) in addition to the description for customers
 ProductSupplierDescription=Vendor description for the product
 UseProductSupplierPackaging=Use packaging on supplier prices (recalculate quantities according to packaging set on supplier price when adding/updating line in supplier documents)
 PackagingForThisProduct=Packaging
@ -397,5 +398,13 @@ ActionAvailableOnVariantProductOnly=Action only available on the variant of prod
 ProductsPricePerCustomer=Product prices per customers
 ProductSupplierExtraFields=Additional Attributes (Supplier Prices)
 DeleteLinkedProduct=Delete the child product linked to the combination
+AmountUsedToUpdateWAP=Amount to use to update the Weighted Average Price
 PMPValue=Weighted average price
 PMPValueShort=WAP
+mandatoryperiod=Mandatory periods
+mandatoryPeriodNeedTobeSet=Attention periods not entered and mandatory
+mandatoryPeriodNeedTobeSetMsgValidate=A service requires a start and end period
+mandatoryHelper=Message to the user on the need to enter a start date and an end date on a service when creating / validating an invoice, commercial proposal, sales order. <br> This action is not blocking in the process of confirmation
+DefaultBOM=Default BOM
+DefaultBOMDesc=The default BOM recommended to use to manufacture this product. This field can be set only if nature of product is '%s'.
+Rank=Rank
--- a/htdocs/langs/am_ET/projects.lang
+++ b/htdocs/langs/am_ET/projects.lang
@ -140,6 +140,7 @@ NoTasks=No tasks for this project
 LinkedToAnotherCompany=Linked to other third party
 TaskIsNotAssignedToUser=Task not assigned to user. Use button '<strong>%s</strong>' to assign task now.
 ErrorTimeSpentIsEmpty=Time spent is empty
+TimeRecordingRestrictedToNMonthsBack=Time recording is restricted to %s months back
 ThisWillAlsoRemoveTasks=This action will also delete all tasks of project (<b>%s</b> tasks at the moment) and all inputs of time spent.
 IfNeedToUseOtherObjectKeepEmpty=If some objects (invoice, order, ...), belonging to another third party, must be linked to the project to create, keep this empty to have the project being multi third parties.
 CloneTasks=Clone tasks
@ -241,6 +242,7 @@ LatestModifiedProjects=Latest %s modified projects
 OtherFilteredTasks=Other filtered tasks
 NoAssignedTasks=No assigned tasks found (assign project/tasks to the current user from the top select box to enter time on it)
 ThirdPartyRequiredToGenerateInvoice=A third party must be defined on project to be able to invoice it.
+ThirdPartyRequiredToGenerateInvoice=A third party must be defined on project to be able to invoice it.
 ChooseANotYetAssignedTask=Choose a task not yet assigned to you
 # Comments trans
 AllowCommentOnTask=Allow user comments on tasks
@ -252,10 +254,12 @@ SendProjectRef=Information project %s
 ModuleSalaryToDefineHourlyRateMustBeEnabled=Module 'Salaries' must be enabled to define employee hourly rate to have time spent valorized
 NewTaskRefSuggested=Task ref already used, a new task ref is required
 TimeSpentInvoiced=Time spent billed
+TimeSpentForIntervention=Time spent
 TimeSpentForInvoice=Time spent
 OneLinePerUser=One line per user
 ServiceToUseOnLines=Service to use on lines
 InvoiceGeneratedFromTimeSpent=Invoice %s has been generated from time spent on project
+InterventionGeneratedFromTimeSpent=Intervention %s has been generated from time spent on project
 ProjectBillTimeDescription=Check if you enter timesheet on tasks of project AND you plan to generate invoice(s) from the timesheet to bill the customer of the project (do not check if you plan to create invoice that is not based on entered timesheets). Note: To generate invoice, go on tab 'Time spent' of the project and select lines to include.
 ProjectFollowOpportunity=Follow opportunity
 ProjectFollowTasks=Follow tasks or time spent
@ -264,10 +268,13 @@ UsageOpportunity=Usage: Opportunity
 UsageTasks=Usage: Tasks
 UsageBillTimeShort=Usage: Bill time
 InvoiceToUse=Draft invoice to use
+InterToUse=Draft intervention to use
 NewInvoice=New invoice
+NewInter=New intervention
 OneLinePerTask=One line per task
 OneLinePerPeriod=One line per period
 OneLinePerTimeSpentLine=One line for each time spent declaration
+AddDetailDateAndDuration=With date and duration into line description
 RefTaskParent=Ref. Parent Task
 ProfitIsCalculatedWith=Profit is calculated using
 AddPersonToTask=Add also to tasks
@ -275,3 +282,5 @@ UsageOrganizeEvent=Usage: Event Organization
 PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=Classify project as closed when all its tasks are completed (100%% progress)
 PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with all tasks at 100 %% progress won't be affected: you will have to close them manually. This option only affects open projects.
 SelectLinesOfTimeSpentToInvoice=Select lines of time spent that are unbilled, then bulk action "Generate Invoice" to bill them
+ProjectTasksWithoutTimeSpent=Project tasks without time spent
+FormForNewLeadDesc=Thanks to fill the following form to contact us. You can also send us an email directly to <b>%s</b>.
--- a/htdocs/langs/am_ET/propal.lang
+++ b/htdocs/langs/am_ET/propal.lang
@ -89,4 +89,11 @@ IdProposal=Proposal ID
 IdProduct=Product ID
 PrParentLine=Proposal Parent Line
 LineBuyPriceHT=Buy Price Amount net of tax for line
-
+SignPropal=Accept proposal
+RefusePropal=Refuse proposal
+Sign=Sign
+PropalAlreadySigned=Proposal already accepted
+PropalAlreadyRefused=Proposal already refused
+PropalSigned=Proposal accepted
+PropalRefused=Proposal refused
+ConfirmRefusePropal=Are you sure you want to refuse this commercial proposal?
--- a/htdocs/langs/am_ET/receptions.lang
+++ b/htdocs/langs/am_ET/receptions.lang
@ -36,7 +36,7 @@ StatsOnReceptionsOnlyValidated=Statistics conducted on receptions only validated
 SendReceptionByEMail=Send reception by email
 SendReceptionRef=Submission of reception %s
 ActionsOnReception=Events on reception
-ReceptionCreationIsDoneFromOrder=For the moment, creation of a new reception is done from the order card.
+ReceptionCreationIsDoneFromOrder=For the moment, creation of a new reception is done from the Purchase Order record.
 ReceptionLine=Reception line
 ProductQtyInReceptionAlreadySent=Product quantity from open sales order already sent
 ProductQtyInSuppliersReceptionAlreadyRecevied=Product quantity from open supplier order already received
@ -45,3 +45,4 @@ ReceptionsNumberingModules=Numbering module for receptions
 ReceptionsReceiptModel=Document templates for receptions
 NoMorePredefinedProductToDispatch=No more predefined products to dispatch
 ReceptionExist=A reception exists
+ByingPrice=Bying price
--- a/htdocs/langs/am_ET/salaries.lang
+++ b/htdocs/langs/am_ET/salaries.lang
@ -6,6 +6,7 @@ CREATE_NEW_SALARY_WITHOUT_AUTO_PAYMENT=By default, leave empty the option "Autom
 Salary=Salary
 Salaries=Salaries
 NewSalary=New salary
+AddSalary=Add salary
 NewSalaryPayment=New salary card
 AddSalaryPayment=Add salary payment
 SalaryPayment=Salary payment
@ -22,3 +23,4 @@ AllSalaries=All salaries
 SalariesStatistics=Salary statistics
 SalariesAndPayments=Salaries and payments
 ConfirmDeleteSalaryPayment=Do you want to delete this salary payment ?
+FillFieldFirst=Fill employee field first
--- a/htdocs/langs/am_ET/sendings.lang
+++ b/htdocs/langs/am_ET/sendings.lang
@ -53,7 +53,7 @@ SendShippingByEMail=Send shipment by email
 SendShippingRef=Submission of shipment %s
 ActionsOnShipping=Events on shipment
 LinkToTrackYourPackage=Link to track your package
-ShipmentCreationIsDoneFromOrder=For the moment, creation of a new shipment is done from the order card.
+ShipmentCreationIsDoneFromOrder=For the moment, creation of a new shipment is done from the Sales Order record.
 ShipmentLine=Shipment line
 ProductQtyInCustomersOrdersRunning=Product quantity from open sales orders
 ProductQtyInSuppliersOrdersRunning=Product quantity from open purchase orders
--- a/htdocs/langs/am_ET/stocks.lang
+++ b/htdocs/langs/am_ET/stocks.lang
@ -12,9 +12,9 @@ AddWarehouse=Create warehouse
 AddOne=Add one
 DefaultWarehouse=Default warehouse
 WarehouseTarget=Target warehouse
-ValidateSending=Delete sending
-CancelSending=Cancel sending
-DeleteSending=Delete sending
+ValidateSending=Confirm shipment
+CancelSending=Cancel shipment
+DeleteSending=Delete shipment
 Stock=Stock
 Stocks=Stocks
 MissingStocks=Missing stocks
@ -60,9 +60,10 @@ EnhancedValueOfWarehouses=Warehouses value
 UserWarehouseAutoCreate=Create a user warehouse automatically when creating a user
 AllowAddLimitStockByWarehouse=Manage also value for minimum and desired stock per pairing (product-warehouse) in addition to the value for minimum and desired stock per product
 RuleForWarehouse=Rule for warehouses
-WarehouseAskWarehouseOnThirparty=Set a warehouse on third-party
+WarehouseAskWarehouseOnThirparty=Set a warehouse on Third-parties
 WarehouseAskWarehouseDuringPropal=Set a warehouse on Commercial proposals
-WarehouseAskWarehouseDuringOrder=Set a warehouse on Sale orders
+WarehouseAskWarehouseDuringOrder=Set a warehouse on Sales Orders
+WarehouseAskWarehouseDuringProject=Set a warehouse on Projects
 UserDefaultWarehouse=Set a warehouse on Users
 MainDefaultWarehouse=Default warehouse
 MainDefaultWarehouseUser=Use a default warehouse for each user
@ -167,8 +168,8 @@ MovementTransferStock=Stock transfer of product %s into another warehouse
 InventoryCodeShort=Inv./Mov. code
 NoPendingReceptionOnSupplierOrder=No pending reception due to open purchase order
 ThisSerialAlreadyExistWithDifferentDate=This lot/serial number (<strong>%s</strong>) already exists but with different eatby or sellby date (found <strong>%s</strong> but you enter <strong>%s</strong>).
-OpenAll=Open for all actions
-OpenInternal=Open only for internal actions
+OpenAnyMovement=Open (all movement)
+OpenInternal=Open (only internal movement)
 UseDispatchStatus=Use a dispatch status (approve/refuse) for product lines on purchase order reception
 OptionMULTIPRICESIsOn=Option "several prices per segment" is on. It means a product has several selling price so value for sell can't be calculated
 ProductStockWarehouseCreated=Stock limit for alert and desired optimal stock correctly created
@ -256,3 +257,10 @@ AutofillWithExpected=Fill real quantity with expected quantity
 ShowAllBatchByDefault=By default, show batch details on product "stock" tab
 CollapseBatchDetailHelp=You can set batch detail default display in stocks module configuration
 FieldCannotBeNegative=Field "%s" cannot be negative
+ErrorWrongBarcodemode=Unknown Barcode mode
+ProductDoesNotExist=Product does not exist
+ErrorSameBatchNumber=Same batch number found in inventory list
+ProductBatchDoesNotExist=Product with batch/serial does not exist
+ProductBarcodeDoesNotExist=Product with barcode does not exist
+WarehouseId=Warehouse ID
+WarehouseRef=Warehouse Ref
--- a/htdocs/langs/am_ET/ticket.lang
+++ b/htdocs/langs/am_ET/ticket.lang
@ -45,6 +45,8 @@ TicketSeverityShortNORMAL=Normal
 TicketSeverityShortHIGH=High
 TicketSeverityShortBLOCKING=Critical, Blocking

+TicketCategoryShortOTHER=Other
+
 ErrorBadEmailAddress=Field '%s' incorrect
 MenuTicketMyAssign=My tickets
 MenuTicketMyAssignNonClosed=My open tickets
@ -66,7 +68,7 @@ NeedMoreInformation=Waiting for reporter feedback
 NeedMoreInformationShort=Waiting for feedback
 Answered=Answered
 Waiting=Waiting
-Closed=Closed
+SolvedClosed=Solved
 Deleted=Deleted

 # Dict
@ -180,15 +182,17 @@ MessageSuccessfullyAdded=Ticket added
 TicketMessageSuccessfullyAdded=Message successfully added
 TicketMessagesList=Message list
 NoMsgForThisTicket=No message for this ticket
-Properties=Classification
+TicketProperties=Classification
 LatestNewTickets=Latest %s newest tickets (not read)
 TicketSeverity=Severity
 ShowTicket=See ticket
 RelatedTickets=Related tickets
 TicketAddIntervention=Create intervention
-CloseTicket=Close ticket
-CloseATicket=Close a ticket
+CloseTicket=Close|Solve ticket
+AbandonTicket=Abandon ticket
+CloseATicket=Close|Solve a ticket
 ConfirmCloseAticket=Confirm ticket closing
+ConfirmAbandonTicket=Do you confirm the closing of the ticket to status 'Abandonned'
 ConfirmDeleteTicket=Please confirm ticket deleting
 TicketDeletedSuccess=Ticket deleted with success
 TicketMarkedAsClosed=Ticket marked as closed
@ -317,3 +321,4 @@ BoxNumberOfTicketByDay=Number of new tickets by day
 BoxNewTicketVSClose=Number of today's new tickets versus today's closed tickets
 TicketCreatedToday=Ticket created today
 TicketClosedToday=Ticket closed today
+KMFoundForTicketGroup=We found topics and FAQs that may answers your question, thanks to check them before submitting the ticket
--- a/htdocs/langs/am_ET/trips.lang
+++ b/htdocs/langs/am_ET/trips.lang
@ -33,7 +33,7 @@ ExpenseReportCanceledMessage=The expense report %s was canceled.<br> - User: %s<
 ExpenseReportPaid=An expense report was paid
 ExpenseReportPaidMessage=The expense report %s was paid.<br> - User: %s<br> - Paid by: %s<br>Click here to show the expense report: %s
 TripId=Id expense report
-AnyOtherInThisListCanValidate=Person to inform for validation.
+AnyOtherInThisListCanValidate=Person to be informed for validating the request.
 TripSociete=Information company
 TripNDF=Informations expense report
 PDFStandardExpenseReports=Standard template to generate a PDF document for expense report
@ -90,7 +90,6 @@ DATE_REFUS=Deny date
 DATE_SAVE=Validation date
 DATE_CANCEL=Cancelation date
 DATE_PAIEMENT=Payment date
-BROUILLONNER=Reopen
 ExpenseReportRef=Ref. expense report
 ValidateAndSubmit=Validate and submit for approval
 ValidatedWaitingApproval=Validated (waiting for approval)
@ -110,10 +109,10 @@ ExpenseReportPayment=Expense report payment
 ExpenseReportsToApprove=Expense reports to approve
 ExpenseReportsToPay=Expense reports to pay
 ConfirmCloneExpenseReport=Are you sure you want to clone this expense report ?
-ExpenseReportsIk=Expense report milles index
+ExpenseReportsIk=Configuration of mileage charges
 ExpenseReportsRules=Expense report rules
 ExpenseReportIkDesc=You can modify the calculation of kilometers expense by category and range who they are previously defined. <b>d</b> is the distance in kilometers
-ExpenseReportRulesDesc=You can create or update any rules of calculation. This part will be used when user will create a new expense report
+ExpenseReportRulesDesc=You can define max amount rules for expense reports. These rules will be applied when a new expense is added to an expense report
 expenseReportOffset=Offset
 expenseReportCoef=Coefficient
 expenseReportTotalForFive=Example with <u>d</u> = 5
@ -128,24 +127,24 @@ ExpenseReportDomain=Domain to apply
 ExpenseReportLimitOn=Limit on
 ExpenseReportDateStart=Date start
 ExpenseReportDateEnd=Date end
-ExpenseReportLimitAmount=Limite amount
-ExpenseReportRestrictive=Restrictive
+ExpenseReportLimitAmount=Max amount
+ExpenseReportRestrictive=Exceeding forbidden
 AllExpenseReport=All type of expense report
 OnExpense=Expense line
 ExpenseReportRuleSave=Expense report rule saved
 ExpenseReportRuleErrorOnSave=Error: %s
 RangeNum=Range %d
-ExpenseReportConstraintViolationError=Constraint violation id [%s]: %s  is superior to %s %s
+ExpenseReportConstraintViolationError=Max amount exceeded (rule %s): %s is higher than %s (Exceeding forbidden)
 byEX_DAY=by day (limitation to %s)
 byEX_MON=by month (limitation to %s)
 byEX_YEA=by year (limitation to %s)
 byEX_EXP=by line (limitation to %s)
-ExpenseReportConstraintViolationWarning=Constraint violation id [%s]: %s  is superior to %s %s
+ExpenseReportConstraintViolationWarning=Max amount exceeded (rule %s): %s is higher than %s (Exceeding authorized)
 nolimitbyEX_DAY=by day (no limitation)
 nolimitbyEX_MON=by month (no limitation)
 nolimitbyEX_YEA=by year (no limitation)
 nolimitbyEX_EXP=by line (no limitation)
-CarCategory=Category of car
+CarCategory=Vehicle category
 ExpenseRangeOffset=Offset amount: %s
 RangeIk=Mileage range
 AttachTheNewLineToTheDocument=Attach the line to an uploaded document
--- a/htdocs/langs/am_ET/users.lang
+++ b/htdocs/langs/am_ET/users.lang
@ -62,8 +62,8 @@ ListOfUsersInGroup=List of users in this group
 ListOfGroupsForUser=List of groups for this user
 LinkToCompanyContact=Link to third party / contact
 LinkedToDolibarrMember=Link to member
-LinkedToDolibarrUser=Link to Dolibarr user
-LinkedToDolibarrThirdParty=Link to Dolibarr third party
+LinkedToDolibarrUser=Link to user
+LinkedToDolibarrThirdParty=Link to third party
 CreateDolibarrLogin=Create a user
 CreateDolibarrThirdParty=Create a third party
 LoginAccountDisableInDolibarr=Account disabled in Dolibarr.
--- a/htdocs/langs/am_ET/withdrawals.lang
+++ b/htdocs/langs/am_ET/withdrawals.lang
@ -45,6 +45,7 @@ WithdrawRequestsDone=%s direct debit payment requests recorded
 BankTransferRequestsDone=%s credit transfer requests recorded
 ThirdPartyBankCode=Third-party bank code
 NoInvoiceCouldBeWithdrawed=No invoice debited successfully. Check that invoices are on companies with a valid IBAN and that IBAN has a UMR (Unique Mandate Reference) with mode <strong>%s</strong>.
+WithdrawalCantBeCreditedTwice=This withdrawal receipt is already marked as credited; this can't be done twice, as this would potentially create duplicate payments and bank entries.
 ClassCredited=Classify credited
 ClassCreditedConfirm=Are you sure you want to classify this withdrawal receipt as credited on your bank account?
 TransData=Transmission date
@ -132,8 +133,7 @@ SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=Execution date
 CreateForSepa=Create direct debit file
-ICS=Creditor Identifier CI for direct debit
-ICSTransfer=Creditor Identifier CI for bank transfer
+ICS=Creditor Identifier - ICS
 END_TO_END="EndToEndId" SEPA XML tag - Unique id assigned per transaction
 USTRD="Unstructured" SEPA XML tag
 ADDDAYS=Add days to Execution Date
--- a/htdocs/langs/am_ET/workflow.lang
+++ b/htdocs/langs/am_ET/workflow.lang
@ -13,6 +13,7 @@ descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposal as b
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source sales order as billed when customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked order)
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source sales order as billed when customer invoice is set to paid (and if the amount of the invoice is the same as the total amount of the linked order)
 descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source sales order as shipped when a shipment is validated (and if the quantity shipped by all shipments is the same as in the order to update)
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING_CLOSED=Classify linked source sales order as shipped when a shipment is closed (and if the quantity shipped by all shipments is the same as in the order to update)
 # Autoclassify purchase order
 descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal as billed when vendor invoice is validated (and if the amount of the invoice is the same as the total amount of the linked proposal)
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order as billed when vendor invoice is validated (and if the amount of the invoice is the same as the total amount of the linked order)
--- a/htdocs/langs/ar_EG/accountancy.lang
+++ b/htdocs/langs/ar_EG/accountancy.lang
@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - accountancy
-ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
--- a/htdocs/langs/ar_EG/eventorganization.lang
+++ b/htdocs/langs/ar_EG/eventorganization.lang
@ -1,2 +1,3 @@
 # Dolibarr language file - Source file is en_US - eventorganization
+Settings=الإعدادات
 EvntOrgDraft =مسودة
--- a/htdocs/langs/ar_EG/main.lang
+++ b/htdocs/langs/ar_EG/main.lang
@ -19,6 +19,7 @@ FormatDateHourShort=%m/%d/%Y %I:%M %p
 FormatDateHourSecShort=%m/%d/%Y %I:%M:%S %p
 FormatDateHourTextShort=%b %d, %Y, %I:%M %p
 FormatDateHourText=%B %d, %Y, %I:%M %p
+Closed=مقفول
 Closed2=مقفول
 CloseAs=اضبط الحالة على
 RefSupplier=المرجع. مورد
--- a/htdocs/langs/ar_EG/members.lang
+++ b/htdocs/langs/ar_EG/members.lang
@ -2,3 +2,4 @@
 MemberStatusDraft=مسودة(مطلوب الاعتماد)
 MemberStatusActiveShort=معتمد
 MemberStatusNoSubscriptionShort=معتمد
+NewSubscription=New contribution
--- a/htdocs/langs/ar_EG/ticket.lang
+++ b/htdocs/langs/ar_EG/ticket.lang
@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - ticket
-Closed=مقفول
-TicketSettings=الإعدادات
--- a/htdocs/langs/ar_IQ/accountancy.lang
+++ b/htdocs/langs/ar_IQ/accountancy.lang
@ -37,8 +37,8 @@ OtherInfo=Other information
 DeleteCptCategory=Remove accounting account from group
 ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group?
 JournalizationInLedgerStatus=Status of journalization
-AlreadyInGeneralLedger=Already transferred in accounting journals and ledger
-NotYetInGeneralLedger=Not yet transferred in accouting journals and ledger
+AlreadyInGeneralLedger=Already transferred to accounting journals and ledger
+NotYetInGeneralLedger=Not yet transferred to accouting journals and ledger
 GroupIsEmptyCheckSetup=Group is empty, check setup of the personalized accounting group
 DetailByAccount=Show detail by account
 AccountWithNonZeroValues=Accounts with non-zero values
@ -48,7 +48,8 @@ CountriesNotInEEC=Countries not in EEC
 CountriesInEECExceptMe=Countries in EEC except %s
 CountriesExceptMe=All countries except %s
 AccountantFiles=Export source documents
-ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
+ExportAccountingSourceDocHelp=With this tool, you can export the source events (list in CSV and PDFs) that were used to generate your accountancy.
+ExportAccountingSourceDocHelp2=To export your journals, use the menu entry %s - %s.
 VueByAccountAccounting=View by accounting account
 VueBySubAccountAccounting=View by accounting subaccount

@ -245,9 +246,9 @@ DescThirdPartyReport=Consult here the list of third-party customers and vendors
 ListAccounts=List of the accounting accounts
 UnknownAccountForThirdparty=Unknown third-party account. We will use %s
 UnknownAccountForThirdpartyBlocking=Unknown third-party account. Blocking error
-ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Third-party account not defined or third party unknown. We will use %s
+ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Subledger account not defined or third party or user unknown. We will use %s
 ThirdpartyAccountNotDefinedOrThirdPartyUnknownSubledgerIgnored=Third-party unknown and subledger not defined on the payment. We will keep the subledger account value empty.
-ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Third-party account not defined or third party unknown. Blocking error.
+ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Subledger account not defined or third party or user unknown. Blocking error.
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third-party account and waiting account not defined. Blocking error
 PaymentsNotLinkedToProduct=Payment not linked to any product / service
 OpeningBalance=Opening balance
@ -297,7 +298,7 @@ NoNewRecordSaved=No more record to journalize
 ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
 ChangeBinding=Change the binding
 Accounted=Accounted in ledger
-NotYetAccounted=Not yet accounted in the ledger
+NotYetAccounted=Not yet transferred to accounting
 ShowTutorial=Show Tutorial
 NotReconciled=Not reconciled
 WarningRecordWithoutSubledgerAreExcluded=Warning, all operations without subledger account defined are filtered and excluded from this view
@ -328,8 +329,8 @@ ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountanc
 ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting)

 ## Export
-NotifiedExportDate=Notified export date (modification of the entries will not be possible)
-NotifiedValidationDate=Validation of the entries (modification or deletion of the entries will not be possible)
+NotifiedExportDate=Flag exported lines as exported (modification of the lines will not be possible)
+NotifiedValidationDate=Validate the exported entries (modification or deletion of the lines will not be possible)
 ConfirmExportFile=Confirmation of the generation of the accounting export file ?
 ExportDraftJournal=Export draft journal
 Modelcsv=Model of export
@ -338,11 +339,11 @@ Modelcsv_normal=Classic export
 Modelcsv_CEGID=Export for CEGID Expert Comptabilité
 Modelcsv_COALA=Export for Sage Coala
 Modelcsv_bob50=Export for Sage BOB 50
-Modelcsv_ciel=Export for Sage Ciel Compta or Compta Evolution
+Modelcsv_ciel=Export for Sage50, Ciel Compta or Compta Evo. (Format XIMPORT)
 Modelcsv_quadratus=Export for Quadratus QuadraCompta
 Modelcsv_ebp=Export for EBP
 Modelcsv_cogilog=Export for Cogilog
-Modelcsv_agiris=Export for Agiris
+Modelcsv_agiris=Export for Agiris Isacompta
 Modelcsv_LDCompta=Export for LD Compta (v9) (Test)
 Modelcsv_LDCompta10=Export for LD Compta (v10 & higher)
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
@ -350,9 +351,10 @@ Modelcsv_configurable=Export CSV Configurable
 Modelcsv_FEC=Export FEC
 Modelcsv_FEC2=Export FEC (With dates generation writing / document reversed)
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
-Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
+Modelcsv_winfic=Export for Winfic - eWinfic - WinSis Compta
 Modelcsv_Gestinumv3=Export for Gestinum (v3)
-Modelcsv_Gestinumv5Export for Gestinum (v5)
+Modelcsv_Gestinumv5=Export for Gestinum (v5)
+Modelcsv_charlemagne=Export for Aplim Charlemagne
 ChartofaccountsId=Chart of accounts Id

 ## Tools - Init accounting account on product / service
--- a/htdocs/langs/ar_IQ/admin.lang
+++ b/htdocs/langs/ar_IQ/admin.lang
@ -75,7 +75,7 @@ Dictionary=Dictionaries
 ErrorReservedTypeSystemSystemAuto=Value 'system' and 'systemauto' for type is reserved. You can use 'user' as value to add your own record
 ErrorCodeCantContainZero=Code can't contain value 0
 DisableJavascript=Disable JavaScript and Ajax functions
-DisableJavascriptNote=Note: For test or debug purpose. For optimization for blind person or text browsers, you may prefer to use the setup on the profile of user
+DisableJavascriptNote=Note: For test or debug purpose only. For optimization for blind person or text browsers, you may prefer to use the setup on the profile of user
 UseSearchToSelectCompanyTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant COMPANY_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 DelaiedFullListToSelectCompany=Wait until a key is pressed before loading content of Third Parties combo list.<br>This may increase performance if you have a large number of third parties, but it is less convenient.
@ -85,6 +85,7 @@ NumberOfBytes=Number of Bytes
 SearchString=Search string
 NotAvailableWhenAjaxDisabled=Not available when Ajax disabled
 AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a project linked to another third party
+TimesheetPreventAfterFollowingMonths=Prevent recording time spent after the following number of months
 JavascriptDisabled=JavaScript disabled
 UsePreviewTabs=Use preview tabs
 ShowPreview=Show preview
@ -117,6 +118,7 @@ MultiCurrencySetup=Multi-currency setup
 MenuLimits=Limits and accuracy
 MenuIdParent=Parent menu ID
 DetailMenuIdParent=ID of parent menu (empty for a top menu)
+ParentID=Parent ID
 DetailPosition=Sort number to define menu position
 AllMenus=All
 NotConfigured=Module/Application not configured
@ -131,7 +133,6 @@ IdModule=Module ID
 IdPermissions=Permissions ID
 LanguageBrowserParameter=Parameter %s
 LocalisationDolibarrParameters=Localization parameters
-ClientTZ=Client Time Zone (user)
 ClientHour=Client time (user)
 OSTZ=Server OS Time Zone
 PHPTZ=PHP server Time Zone
@ -159,7 +160,7 @@ Purge=Purge
 PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not normally necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
 PurgeDeleteLogFile=Delete log files, including <b>%s</b> defined for Syslog module (no risk of losing data)
 PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Parameter can be 'tempfilesold', 'logfiles' or both 'tempfilesold+logfiles'. Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
-PurgeDeleteTemporaryFilesShort=Delete log and temporary files
+PurgeDeleteTemporaryFilesShort=Delete log and temporary files (no risk of losing data)
 PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory: <b>%s</b>.<br>This will delete all generated documents related to elements (third parties, invoices etc...), files uploaded into the ECM module, database backup dumps and temporary files.
 PurgeRunNow=Purge now
 PurgeNothingToDelete=No directory or files to delete.
@ -209,6 +210,7 @@ FeatureAvailableOnlyOnStable=Feature only available on official stable versions
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the trashcan to disable it.
 OnlyActiveElementsAreShown=Only elements from <a href="%s">enabled modules</a> are shown.
 ModulesDesc=The modules/applications determine which features are available in the software. Some modules require permissions to be granted to users after activating the module. Click the on/off button <span class="small valignmiddle">%s</span> of each module to enable or disable a module/application.
+ModulesDesc2=Click the wheel button <span class="small valignmiddle">%s</span> to configure the module/application.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
 ModulesDeployDesc=If permissions on your file system allow it, you can use this tool to deploy an external module. The module will then be visible on the tab <strong>%s</strong>.
 ModulesMarketPlaces=Find external app/modules
@ -277,6 +279,7 @@ SpaceX=Space X
 SpaceY=Space Y
 FontSize=Font size
 Content=Content
+ContentForLines=Content to display for each product or service (from variable __LINES__ of Content)
 NoticePeriod=Notice period
 NewByMonth=New by month
 Emails=Emails
@ -372,8 +375,8 @@ UMask=UMask parameter for new files on Unix/Linux/BSD/Mac file system.
 UMaskExplanation=This parameter allow you to define permissions set by default on files created by Dolibarr on server (during upload for example).<br>It must be the octal value (for example, 0666 means read and write for everyone).<br>This parameter is useless on a Windows server.
 SeeWikiForAllTeam=Take a look at the Wiki page for a list of contributors and their organization
 UseACacheDelay= Delay for caching export response in seconds (0 or empty for no cache)
-DisableLinkToHelpCenter=Hide link "<b>Need help or support</b>" on login page
-DisableLinkToHelp=Hide link to online help "<b>%s</b>"
+DisableLinkToHelpCenter=Hide the link "<b>Need help or support</b>" on the login page
+DisableLinkToHelp=Hide the link to the online help "<b>%s</b>"
 AddCRIfTooLong=There is no automatic text wrapping, text that is too long will not display on documents. Please add carriage returns in the text area if needed.
 ConfirmPurge=Are you sure you want to execute this purge?<br>This will permanently delete all your data files with no way to restore them (ECM files, attached files...).
 MinLength=Minimum length
@ -495,9 +498,10 @@ WarningPHPMail=WARNING: The setup to send emails from the application is using t
 WarningPHPMailA=- Using the server of the Email Service Provider increases the trustability of your email, so it increases the deliverablity without being flagged as SPAM
 WarningPHPMailB=- Some Email Service Providers (like Yahoo) do not allow you to send an email from another server than their own server. Your current setup uses the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not theirs, so few of your sent Emails may not be accepted for delivery (be careful also of your email provider's sending quota).
 WarningPHPMailC=- Using the SMTP server of your own Email Service Provider to send emails is also interesting so all emails sent from application will also be saved into your "Sent" directory of your mailbox.
-WarningPHPMailD=If the method 'PHP Mail' is really the method you would like to use, you can remove this warning by adding the constant MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP to 1 in Home - Setup - Other.
+WarningPHPMailD=Also, it is therefore recommended to change the sending method of e-mails to the value "SMTP". If you really want to keep the default "PHP" method to send emails, just ignore this warning, or remove it by setting the MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP constant to 1 in Home - Setup - Other.
 WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of the mail user agent (MUA) for your ERP CRM application: <strong>%s</strong>.
-WarningPHPMailSPF=If the domain name in your sender email address is protected by a SPF record (ask you domain name registar), you must add the following IPs in the SPF record of the DNS of your domain: <strong>%s</strong>.
+WarningPHPMailSPF=If the domain name in your sender email address is protected by a SPF record (ask your domain name registar), you must add the following IPs in the SPF record of the DNS of your domain: <strong>%s</strong>.
+ActualMailSPFRecordFound=Actual SPF record found : %s
 ClickToShowDescription=Click to show description
 DependsOn=This module needs the module(s)
 RequiredBy=This module is required by module(s)
@ -514,6 +518,9 @@ Field=Field
 ProductDocumentTemplates=Document templates to generate product document
 FreeLegalTextOnExpenseReports=Free legal text on expense reports
 WatermarkOnDraftExpenseReports=Watermark on draft expense reports
+ProjectIsRequiredOnExpenseReports=The project is mandatory for entering an expense report
+PrefillExpenseReportDatesWithCurrentMonth=Pre-fill start and end dates of new expense report with start and end dates of the current month
+ForceExpenseReportsLineAmountsIncludingTaxesOnly=Force the entry of expense report amounts always in amount with taxes
 AttachMainDocByDefault=Set this to 1 if you want to attach main document to email by default (if applicable)
 FilesAttachedToEmail=Attach file
 SendEmailsReminders=Send agenda reminders by emails
@ -603,7 +610,7 @@ Module400Desc=Management of projects, leads/opportunities and/or tasks. You can
 Module410Name=Webcalendar
 Module410Desc=Webcalendar integration
 Module500Name=Taxes & Special Expenses
-Module500Desc=Management of other expenses (sale taxes, social or fiscal taxes, dividends, ...)
+Module500Desc=Management of other expenses (sales taxes, social or fiscal taxes, dividends, ...)
 Module510Name=Salaries
 Module510Desc=Record and track employee payments
 Module520Name=Loans
@ -895,6 +902,11 @@ Permission1002=Create/modify warehouses
 Permission1003=Delete warehouses
 Permission1004=Read stock movements
 Permission1005=Create/modify stock movements
+Permission1011=View inventories
+Permission1012=Create new inventory
+Permission1014=Validate inventory
+Permission1015=Allow to change PMP value for a product
+Permission1016=Delete inventory
 Permission1101=Read delivery receipts
 Permission1102=Create/modify delivery receipts
 Permission1104=Validate delivery receipts
@ -950,6 +962,14 @@ Permission4001=See employees
 Permission4002=Create employees
 Permission4003=Delete employees
 Permission4004=Export employees
+Permission4010=Read skill/job/position
+Permission4011=Create/modify skill/job/position
+Permission4012=Delete skill/job/position
+Permission4020=Read evaluation
+Permission4021=Create/modify evaluation
+Permission4022=Validate evaluation
+Permission4023=Delete evaluation
+Permission4030=See comparison menu
 Permission10001=Read website content
 Permission10002=Create/modify website content (html and javascript content)
 Permission10003=Create/modify website content (dynamic php code). Dangerous, must be reserved to restricted developers.
@ -1032,7 +1052,7 @@ DictionaryFees=Expense report - Types of expense report lines
 DictionarySendingMethods=Shipping methods
 DictionaryStaff=Number of Employees
 DictionaryAvailability=Delivery delay
-DictionaryOrderMethods=Ordering methods
+DictionaryOrderMethods=Order methods
 DictionarySource=Origin of proposals/orders
 DictionaryAccountancyCategory=Personalized groups for reports
 DictionaryAccountancysystem=Models for chart of accounts
@ -1165,7 +1185,8 @@ DoNotSuggestPaymentMode=Do not suggest
 NoActiveBankAccountDefined=No active bank account defined
 OwnerOfBankAccount=Owner of bank account %s
 BankModuleNotActive=Bank accounts module not enabled
-ShowBugTrackLink=Define the link "<strong>%s</strong>" (empty to not display this link, 'github' for the link to the Dolibarr project or define directly an url 'https://...')
+ShowBugTrackLink=Show the link "<strong>%s</strong>"
+ShowBugTrackLinkDesc=Keep empty to not display this link, use value 'github' for the link to the Dolibarr project or define directly an url 'https://...'
 Alerts=Alerts
 DelaysOfToleranceBeforeWarning=Delay before displaying a warning alert for:
 DelaysOfToleranceDesc=Set the delay before an alert icon %s is shown onscreen for the late element.
@ -1190,6 +1211,9 @@ SetupDescription2=The following two sections are mandatory (the two first entrie
 SetupDescription3=<a href="%s">%s -> %s</a><br><br>Basic parameters used to customize the default behavior of your application (e.g for country-related features).
 SetupDescription4=<a href="%s">%s -> %s</a><br><br>This software is a suite of many modules/applications. The modules related to your needs must be enabled and configured. Menu entries will appears with the activation of these modules.
 SetupDescription5=Other Setup menu entries manage optional parameters.
+SetupDescriptionLink=<a href="%s">%s - %s</a>
+SetupDescription3b=Basic parameters used to customize the default behavior of your application (e.g for country-related features).
+SetupDescription4b=This software is a suite of many modules/applications. The modules related to your needs must be enabled and configured. Menu entries will appears with the activation of these modules.
 AuditedSecurityEvents=Security events that are audited
 NoSecurityEventsAreAduited=No security events are audited. You can enable them from menu %s
 Audit=Security events
@ -1212,7 +1236,7 @@ SystemAreaForAdminOnly=This area is available to administrator users only. Dolib
 CompanyFundationDesc=Edit the information of your company/organization. Click on "%s" button at the bottom of the page when done.
 AccountantDesc=If you have an external accountant/bookkeeper, you can edit here its information.
 AccountantFileNumber=Accountant code
-DisplayDesc=Parameters affecting the look and behaviour of Dolibarr can be modified here.
+DisplayDesc=Parameters affecting the look and presentation of the application can be modified here.
 AvailableModules=Available app/modules
 ToActivateModule=To activate modules, go on setup Area (Home->Setup->Modules).
 SessionTimeOut=Time out for session
@ -1264,7 +1288,7 @@ SimpleNumRefNoDateModelDesc=Returns the reference number in the format %s-nnnn w
 ShowProfIdInAddress=Show professional ID with addresses
 ShowVATIntaInAddress=Hide intra-Community VAT number
 TranslationUncomplete=Partial translation
-MAIN_DISABLE_METEO=Disable meteorological view
+MAIN_DISABLE_METEO=Disable weather thumb
 MeteoStdMod=Standard mode
 MeteoStdModEnabled=Standard mode enabled
 MeteoPercentageMod=Percentage mode
@ -1335,6 +1359,7 @@ BrowserIsKO=You are using the %s web browser. This browser is known to be a bad
 PHPModuleLoaded=PHP component %s is loaded
 PreloadOPCode=Preloaded OPCode is used
 AddRefInList=Display Customer/Vendor ref. info list (select list or combobox) and most of hyperlink.<br>Third Parties will appear with a name format of "CC12345 - SC45678 - The Big Company corp." instead of "The Big Company corp".
+AddVatInList=Display Customer/Vendor VAT number. info list (select list or combobox).
 AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)<br>Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp".
 AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town info list (select list or combobox)<br>Contacts will appear with a name format of "Dupond Durand - dupond.durand@email.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand".
 AskForPreferredShippingMethod=Ask for preferred shipping method for Third Parties.
@ -1366,7 +1391,7 @@ AccountCodeManager=Options for automatic generation of customer/vendor accountin
 NotificationsDesc=Email notifications can be sent automatically for some Dolibarr events.<br>Recipients of notifications can be defined:
 NotificationsDescUser=* per user, one user at a time.
 NotificationsDescContact=* per third-party contacts (customers or vendors), one contact at a time.
-NotificationsDescGlobal=* or by setting global email addresses in this setup page.
+NotificationsDescGlobal=* or by setting global email addresses in the setup page of the module.
 ModelModules=Document Templates
 DocumentModelOdt=Generate documents from OpenDocument templates (.ODT / .ODS files from LibreOffice, OpenOffice, KOffice, TextEdit,...)
 WatermarkOnDraft=Watermark on draft document
@ -1415,7 +1440,7 @@ WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Ask for Warehouse Source for order
 ##### Suppliers Orders #####
 BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ask for bank account destination of purchase order
 ##### Orders #####
-SuggestedPaymentModesIfNotDefinedInOrder=Suggested payments mode on sale order by default if not defined on the order
+SuggestedPaymentModesIfNotDefinedInOrder=Suggested payments mode on sales order by default if not defined on the order
 OrdersSetup=Sales Orders management setup
 OrdersNumberingModules=Orders numbering models
 OrdersModelModule=Order documents models
@ -1466,10 +1491,10 @@ LDAPSynchronizeMembersTypes=Organization of foundation's members types in LDAP
 LDAPPrimaryServer=Primary server
 LDAPSecondaryServer=Secondary server
 LDAPServerPort=Server port
-LDAPServerPortExample=Default port: 389
+LDAPServerPortExample=Standard or StartTLS: 389, LDAPs: 636
 LDAPServerProtocolVersion=Protocol version
 LDAPServerUseTLS=Use TLS
-LDAPServerUseTLSExample=Your LDAP server use TLS
+LDAPServerUseTLSExample=Your LDAP server use StartTLS
 LDAPServerDn=Server DN
 LDAPAdminDn=Administrator DN
 LDAPAdminDnExample=Complete DN (ex: cn=admin,dc=example,dc=com or cn=Administrator,cn=Users,dc=example,dc=com for active directory)
@ -1619,8 +1644,7 @@ ProductSetup=Products module setup
 ServiceSetup=Services module setup
 ProductServiceSetup=Products and Services modules setup
 NumberOfProductShowInSelect=Maximum number of products to show in combo select lists (0=no limit)
-ViewProductDescInFormAbility=Display product descriptions in forms (otherwise shown in a tooltip popup)
-DoNotAddProductDescAtAddLines=Do not add product description (from product card) on submit add lines on forms
+ViewProductDescInFormAbility=Display product descriptions in lines of items (otherwise show description in a tooltip popup)
 OnProductSelectAddProductDesc=How to use the description of the products when adding a product as a line of a document
 AutoFillFormFieldBeforeSubmit=Auto fill the description input field with the description of product
 DoNotAutofillButAutoConcat=Do not autofill the input field with description of product. Description of the product will be concatenated to the entered description automatically.
@ -1684,6 +1708,8 @@ MailingDelay=Seconds to wait after sending next message
 NotificationSetup=Email Notification module setup
 NotificationEMailFrom=Sender email (From) for emails sent by the Notifications module
 FixedEmailTarget=Recipient
+NotificationDisableConfirmMessageFix=Disable notification info in confirm message for fix notification
+NotificationDisableConfirmMessageUser=Disable notification info in confirm message for user notification
 ##### Sendings #####
 SendingsSetup=Shipping module setup
 SendingsReceiptModel=Sending receipt model
@ -1699,8 +1725,10 @@ FreeLegalTextOnDeliveryReceipts=Free text on delivery receipts
 ##### FCKeditor #####
 AdvancedEditor=Advanced editor
 ActivateFCKeditor=Activate advanced editor for:
-FCKeditorForCompany=WYSIWIG creation/edition of elements description and note (except products/services)
-FCKeditorForProduct=WYSIWIG creation/edition of products/services description and note
+FCKeditorForNotePublic=WYSIWIG creation/edition of the field public notes of elements
+FCKeditorForNotePrivate=WYSIWIG creation/edition of the field private notes of elements
+FCKeditorForCompany=WYSIWIG creation/edition of the field description of elements (except products/services)
+FCKeditorForProduct=WYSIWIG creation/edition of the field description of products/services
 FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). <span class="warning">Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files.</span>
 FCKeditorForMailing= WYSIWIG creation/edition for mass eMailings (Tools->eMailing)
 FCKeditorForUserSignature=WYSIWIG creation/edition of user signature
@ -1779,7 +1807,7 @@ ClickToDialSetup=Click To Dial module setup
 ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with clicktodial login (defined on user card)<br><b>__PASS__</b> that will be replaced with clicktodial password (defined on user card).
 ClickToDialDesc=This module change phone numbers, when using a desktop computer, into clickable links. A click will call the number. This can be used to start the phone call when using a soft phone on your desktop or when using a CTI system based on SIP protocol for example. Note: When using a smartphone, phone numbers are always clickable.
 ClickToDialUseTelLink=Use just a link "tel:" on phone numbers
-ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface, installed on the same computer as the browser, and called when you click on a link starting with "tel:" in your browser. If you need link that start with "sip:" or a full server solution (no need of local software installation), you must set this to "No" and fill next field.
+ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface, installed on the same computer as the browser, and called when you click on a link starting with "tel:" in your browser. If you need a link that start with "sip:" or a full server solution (no need of local software installation), you must set this to "No" and fill the next field.
 ##### Point Of Sale (CashDesk) #####
 CashDesk=Point of Sale
 CashDeskSetup=Point of Sales module setup
@ -1909,11 +1937,11 @@ UnicodeCurrency=Enter here between braces, list of byte number that represent th
 ColorFormat=The RGB color is in HEX format, eg: FF0000
 PictoHelp=Icon name in dolibarr format ('image.png' if into the current theme directory, 'image.png@nom_du_module' if into the directory /img/ of a module)
 PositionIntoComboList=Position of line into combo lists
-SellTaxRate=Sale tax rate
+SellTaxRate=Sales tax rate
 RecuperableOnly=Yes for VAT "Not Perceived but Recoverable" dedicated for some state in France. Keep value to "No" in all other cases.
 UrlTrackingDesc=If the provider or transport service offers a page or web site to check the status of your shipments, you may enter it here. You can use the key {TRACKID} in the URL parameters so the system will replace it with the tracking number the user entered into the shipment card.
 OpportunityPercent=When you create a lead, you will define an estimated amount of project/lead. According to status of the lead, this amount may be multiplied by this rate to evaluate a total amount all your leads may generate. Value is a percentage (between 0 and 100).
-TemplateForElement=This template record is dedicated to which element
+TemplateForElement=This mail template is related to what type of object? An email template is available only when using the "Send Email" button from the related object.
 TypeOfTemplate=Type of template
 TemplateIsVisibleByOwnerOnly=Template is visible to owner only
 VisibleEverywhere=Visible everywhere
@ -1988,7 +2016,14 @@ MAIN_PDF_MARGIN_RIGHT=Right margin on PDF
 MAIN_PDF_MARGIN_TOP=Top margin on PDF
 MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
 MAIN_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
-MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Add picture on proposal line
+MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Add column for picture on proposal lines
+MAIN_DOCUMENTS_WITH_PICTURE_WIDTH=Width of the column if a picture is added on lines
+MAIN_PDF_NO_SENDER_FRAME=Hide borders on sender address frame
+MAIN_PDF_NO_RECIPENT_FRAME=Hide borders on recipent address frame
+MAIN_PDF_HIDE_CUSTOMER_CODE=Hide customer code
+MAIN_PDF_HIDE_SENDER_NAME=Hide sender/company name in address block
+PROPOSAL_PDF_HIDE_PAYMENTTERM=Hide payments conditions
+PROPOSAL_PDF_HIDE_PAYMENTMODE=Hide payment mode
 MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING=Add electronic sign in PDF
 NothingToSetup=There is no specific setup required for this module.
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
@ -2089,7 +2124,7 @@ LargerThan=Larger than
 IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email aready collected and linked to an object, the created event will be automatically linked to the known related object.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
 EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set name of directory here to use this feature (Do NOT use special characters in name). Note that you must also use a read/write login account.
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
+EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<br>For example, if you want to create a thirdparty with a name extracted a string 'Name: name to find' found into the body, use sender email as email, you can set the parameter field like this:<br>'email=HEADER:^From:(.*);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;'<br>
 EndPointFor=End point for %s : %s
 DeleteEmailCollector=Delete email collector
 ConfirmDeleteEmailCollector=Are you sure you want to delete this email collector?
@ -2106,6 +2141,7 @@ EMailsWillHaveMessageID=Emails will have a tag 'References' matching this syntax
 PDF_SHOW_PROJECT=Show project on document
 ShowProjectLabel=Project Label
 PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated in 2 different languages in the same generated PDF, you must set here this second language so generated PDF will contains 2 different languages in same page, the one chosen when generating PDF and this one (only few PDF templates support this). Keep empty for 1 language per PDF.
+PDF_USE_A=Gererate PDF documents with format PDF/A instead of defaut format PDF
 FafaIconSocialNetworksDesc=Enter here the code of a FontAwesome icon. If you don't know what is FontAwesome, you can use the generic value fa-address-book.
 RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
 JumpToBoxes=Jump to Setup -> Widgets
@ -2128,6 +2164,7 @@ AskThisIDToYourBank=Contact your bank to get this ID
 AdvancedModeOnly=Permision available in Advanced permission mode only
 ConfFileIsReadableOrWritableByAnyUsers=The conf file is readable or writable by any users. Give permission to web server user and group only.
 MailToSendEventOrganization=Event Organization
+MailToPartnership=Partnership
 AGENDA_EVENT_DEFAULT_STATUS=Default event status when creating a event from the form
 YouShouldDisablePHPFunctions=You should disable PHP functions
 IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands in custom code, you shoud disable PHP functions
@ -2136,7 +2173,7 @@ NoWritableFilesFoundIntoRootDir=No writable files or directories of the common p
 RecommendedValueIs=Recommended: %s
 Recommended=Recommended
 NotRecommended=Not recommended
-ARestrictedPath=A restricted path
+ARestrictedPath=Some restricted path
 CheckForModuleUpdate=Check for external modules updates
 CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
 ModuleUpdateAvailable=An update is available
@ -2148,3 +2185,27 @@ DatabasePasswordObfuscated=Database password is obfuscated in conf file
 DatabasePasswordNotObfuscated=Database password is NOT obfuscated in conf file
 APIsAreNotEnabled=APIs modules are not enabled
 YouShouldSetThisToOff=You should set this to 0 or off
+InstallAndUpgradeLockedBy=Install and upgrades are locked by the file <b>%s</b>
+OldImplementation=Old implementation
+PDF_SHOW_LINK_TO_ONLINE_PAYMENT=If some online payment modules are enabled (Paypal, Stripe, ...), add a link on the PDF to make the online payment
+DashboardDisableGlobal=Disable globally all the thumbs of open objects
+BoxstatsDisableGlobal=Disable totally box statistics
+DashboardDisableBlocks=Thumbs of open objects (to process or late) on main dashboard
+DashboardDisableBlockAgenda=Disable the thumb for agenda
+DashboardDisableBlockProject=Disable the thumb for projects
+DashboardDisableBlockCustomer=Disable the thumb for customers
+DashboardDisableBlockSupplier=Disable the thumb for suppliers
+DashboardDisableBlockContract=Disable the thumb for contracts
+DashboardDisableBlockTicket=Disable the thumb for tickets
+DashboardDisableBlockBank=Disable the thumb for banks
+DashboardDisableBlockAdherent=Disable the thumb for memberships
+DashboardDisableBlockExpenseReport=Disable the thumb for expense reports
+DashboardDisableBlockHoliday=Disable the thumb for leaves
+EnabledCondition=Condition to have field enabled (if not enabled, visibility will always be off)
+IfYouUseASecondTaxYouMustSetYouUseTheMainTax=If you want to use a second tax, you must enable also the first sale tax
+IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=If you want to use a third tax, you must enable also the first sale tax
+LanguageAndPresentation=Language and presentation
+SkinAndColors=Skin and colors
+IfYouUseASecondTaxYouMustSetYouUseTheMainTax=If you want to use a second tax, you must enable also the first sale tax
+IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=If you want to use a third tax, you must enable also the first sale tax
+PDF_USE_1A=Generate PDF with PDF/A-1b format
--- a/htdocs/langs/ar_IQ/agenda.lang
+++ b/htdocs/langs/ar_IQ/agenda.lang
@ -64,6 +64,7 @@ ShipmentClassifyClosedInDolibarr=Shipment %s classified billed
 ShipmentUnClassifyCloseddInDolibarr=Shipment %s classified re-open
 ShipmentBackToDraftInDolibarr=Shipment %s go back to draft status
 ShipmentDeletedInDolibarr=Shipment %s deleted
+ShipmentCanceledInDolibarr=Shipment %s canceled
 ReceptionValidatedInDolibarr=Reception %s validated
 OrderCreatedInDolibarr=Order %s created
 OrderValidatedInDolibarr=Order %s validated
@ -170,3 +171,4 @@ ReminderType=Callback type
 AddReminder=Create an automatic reminder notification for this event
 ErrorReminderActionCommCreation=Error creating the reminder notification for this event
 BrowserPush=Browser Popup Notification
+ActiveByDefault=Enabled by default
--- a/htdocs/langs/ar_IQ/banks.lang
+++ b/htdocs/langs/ar_IQ/banks.lang
@ -182,3 +182,4 @@ BankColorizeMovementName2=Background color for credit movement
 IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning.
 NoBankAccountDefined=No bank account defined
 NoRecordFoundIBankcAccount=No record found in bank account. Commonly, this occurs when a record has been deleted manually from the list of transaction in the bank account (for example during a reconciliation of the bank account). Another reason is that the payment was recorded when the module "%s" was disabled.
+AlreadyOneBankAccount=Already one bank account defined
--- a/htdocs/langs/ar_IQ/bills.lang
+++ b/htdocs/langs/ar_IQ/bills.lang
@ -192,6 +192,7 @@ ConfirmClassifyPaidPartiallyReasonDiscount=Remaining unpaid <b>(%s %s)</b> is a
 ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
 ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note.
 ConfirmClassifyPaidPartiallyReasonBadCustomer=Bad customer
+ConfirmClassifyPaidPartiallyReasonBankCharge=Deduction by bank (intermediary bank fees)
 ConfirmClassifyPaidPartiallyReasonProductReturned=Products partially returned
 ConfirmClassifyPaidPartiallyReasonOther=Amount abandoned for other reason
 ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=This choice is possible if your invoice has been provided with suitable comments. (Example «Only the tax corresponding to the price that has been actually paid gives rights to deduction»)
@ -199,6 +200,7 @@ ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=In some countries, this choice
 ConfirmClassifyPaidPartiallyReasonAvoirDesc=Use this choice if all other does not suit
 ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=A <b>bad customer</b> is a customer that refuses to pay his debt.
 ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=This choice is used when payment is not complete because some of products were returned
+ConfirmClassifyPaidPartiallyReasonBankChargeDesc=The unpaid amount is <b>intermediary bank fees</b>, deducted directly from the <b>correct amount</b> paid by the Customer.
 ConfirmClassifyPaidPartiallyReasonOtherDesc=Use this choice if all others are not suitable, for example in following situation:<br>- payment not complete because some products were shipped back<br>- amount claimed too important because a discount was forgotten<br>In all cases, amount over-claimed must be corrected in accountancy system by creating a credit note.
 ConfirmClassifyAbandonReasonOther=Other
 ConfirmClassifyAbandonReasonOtherDesc=This choice will be used in all other cases. For example because you plan to create a replacing invoice.
@ -234,16 +236,22 @@ AlreadyPaidBack=Already paid back
 AlreadyPaidNoCreditNotesNoDeposits=Already paid (without credit notes and down payments)
 Abandoned=Abandoned
 RemainderToPay=Remaining unpaid
+RemainderToPayMulticurrency=Remaining unpaid, original currency
 RemainderToTake=Remaining amount to take
+RemainderToTakeMulticurrency=Remaining amount to take, original currency
 RemainderToPayBack=Remaining amount to refund
+RemainderToPayBackMulticurrency=Remaining amount to refund, original currency
 Rest=Pending
 AmountExpected=Amount claimed
 ExcessReceived=Excess received
+ExcessReceivedMulticurrency=Excess received, original currency
 ExcessPaid=Excess paid
+ExcessPaidMulticurrency=Excess paid, original currency
 EscompteOffered=Discount offered (payment before term)
 EscompteOfferedShort=Discount
 SendBillRef=Submission of invoice %s
 SendReminderBillRef=Submission of invoice %s (reminder)
+SendPaymentReceipt=Submission of payment receipt %s
 NoDraftBills=No draft invoices
 NoOtherDraftBills=No other draft invoices
 NoDraftInvoices=No draft invoices
@ -260,6 +268,7 @@ DateInvoice=Invoice date
 DatePointOfTax=Point of tax
 NoInvoice=No invoice
 NoOpenInvoice=No open invoice
+NbOfOpenInvoices=Number of open invoices
 ClassifyBill=Classify invoice
 SupplierBillsToPay=Unpaid vendor invoices
 CustomerBillsUnpaid=Unpaid customer invoices
@ -570,7 +579,7 @@ ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually
 ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask your administrator to enable and setup module <strong>%s</strong>. Note that both methods (manual and automatic) can be used together with no risk of duplication.
 DeleteRepeatableInvoice=Delete template invoice
 ConfirmDeleteRepeatableInvoice=Are your sure you want to delete the template invoice?
-CreateOneBillByThird=Create one invoice per third party (otherwise, one invoice per order)
+CreateOneBillByThird=Create one invoice per third party (otherwise, one invoice per selected object)
 BillCreated=%s invoice(s) generated
 BillXCreated=Invoice %s generated
 StatusOfGeneratedDocuments=Status of document generation
@ -591,3 +600,5 @@ SituationTotalRayToRest=Remainder to pay without taxe
 PDFSituationTitle=Situation n° %d
 SituationTotalProgress=Total progress %d %%
 SearchUnpaidInvoicesWithDueDate=Search unpaid invoices with a due date = %s
+NoPaymentAvailable=No payment available for %s
+PaymentRegisteredAndInvoiceSetToPaid=Payment registered and invoice %s set to paid
--- a/htdocs/langs/ar_IQ/bookmarks.lang
+++ b/htdocs/langs/ar_IQ/bookmarks.lang
@ -19,3 +19,4 @@ UseAnExternalHttpLinkOrRelativeDolibarrLink=Use an external/absolute link (https
 ChooseIfANewWindowMustBeOpenedOnClickOnBookmark=Choose if the linked page should open in the current tab or a new tab
 BookmarksManagement=Bookmarks management
 BookmarksMenuShortCut=Ctrl + shift + m
+NoBookmarks=No bookmarks defined
--- a/htdocs/langs/ar_IQ/cashdesk.lang
+++ b/htdocs/langs/ar_IQ/cashdesk.lang
@ -42,7 +42,7 @@ AddTable=Add table
 Place=Place
 TakeposConnectorNecesary='TakePOS Connector' required
 OrderPrinters=Add a button to send the order to some given printers, without payment (for example to send an order to a kitchen)
-NotAvailableWithBrowserPrinter=Not available when printer for receipt is set to browser:
+NotAvailableWithBrowserPrinter=Not available when printer for receipt is set to browser
 SearchProduct=Search product
 Receipt=Receipt
 Header=Header
@ -128,3 +128,8 @@ PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
 WeighingScale=Weighing scale
 ShowPriceHT = Display the column with the price excluding tax (on screen)
 ShowPriceHTOnReceipt = Display the column with the price excluding tax (on the receipt)
+CustomerDisplay=Customer display
+SplitSale=Split sale
+PrintWithoutDetailsButton=Add "Print without details" button
+PrintWithoutDetailsLabelDefault=Line label by default on printing without details
+PrintWithoutDetails=Print without details
--- a/htdocs/langs/ar_IQ/categories.lang
+++ b/htdocs/langs/ar_IQ/categories.lang
@ -96,4 +96,5 @@ ChooseCategory=Choose category
 StocksCategoriesArea=Warehouse Categories
 ActionCommCategoriesArea=Event Categories
 WebsitePagesCategoriesArea=Page-Container Categories
+KnowledgemanagementsCategoriesArea=KM article Categories
 UseOrOperatorForCategories=Use 'OR' operator for categories
--- a/htdocs/langs/ar_IQ/companies.lang
+++ b/htdocs/langs/ar_IQ/companies.lang
@ -80,7 +80,7 @@ Web=Web
 Poste= Position
 DefaultLang=Default language
 VATIsUsed=Sales tax used
-VATIsUsedWhenSelling=This defines if this third party includes a sale tax or not when it makes an invoice to its own customers
+VATIsUsedWhenSelling=This defines if this third party includes a sales tax or not when it makes an invoice to its own customers
 VATIsNotUsed=Sales tax is not used
 CopyAddressFromSoc=Copy address from third-party details
 ThirdpartyNotCustomerNotSupplierSoNoRef=Third party neither customer nor vendor, no available referring objects
@ -271,6 +271,12 @@ ProfId3RU=Prof Id 3 (KPP)
 ProfId4RU=Prof Id 4 (OKPO)
 ProfId5RU=-
 ProfId6RU=-
+ProfId1UA=Prof Id 1 (EDRPOU)
+ProfId2UA=Prof Id 2 (DRFO)
+ProfId3UA=Prof Id 3 (INN)
+ProfId4UA=Prof Id 4 (Certificate)
+ProfId5UA=Prof Id 5 (RNOKPP)
+ProfId6UA=Prof Id 6 (TRDPAU)
 ProfId1DZ=RC
 ProfId2DZ=Art.
 ProfId3DZ=NIF
--- a/htdocs/langs/ar_IQ/compta.lang
+++ b/htdocs/langs/ar_IQ/compta.lang
@ -188,25 +188,25 @@ LT1ReportByCustomers=Report tax 2 by third party
 LT2ReportByCustomers=Report tax 3 by third party
 LT1ReportByCustomersES=Report by third party RE
 LT2ReportByCustomersES=Report by third party IRPF
-VATReport=Sale tax report
-VATReportByPeriods=Sale tax report by period
-VATReportByMonth=Sale tax report by month
-VATReportByRates=Sale tax report by rates
-VATReportByThirdParties=Sale tax report by third parties
-VATReportByCustomers=Sale tax report by customer
+VATReport=Sales tax report
+VATReportByPeriods=Sales tax report by period
+VATReportByMonth=Sales tax report by month
+VATReportByRates=Sales tax report by rate
+VATReportByThirdParties=Sales tax report by third party
+VATReportByCustomers=Sales tax report by customer
 VATReportByCustomersInInputOutputMode=Report by the customer VAT collected and paid
-VATReportByQuartersInInputOutputMode=Report by Sale tax rate of the tax collected and paid
+VATReportByQuartersInInputOutputMode=Report by Sales tax rate of the tax collected and paid
 VATReportShowByRateDetails=Show details of this rate
 LT1ReportByQuarters=Report tax 2 by rate
 LT2ReportByQuarters=Report tax 3 by rate
 LT1ReportByQuartersES=Report by RE rate
 LT2ReportByQuartersES=Report by IRPF rate
-SeeVATReportInInputOutputMode=See report <b>%sVAT encasement%s</b> for a standard calculation
-SeeVATReportInDueDebtMode=See report <b>%sVAT on flow%s</b> for a calculation with an option on the flow
-RulesVATInServices=- For services, the report includes the VAT regulations actually received or issued on the basis of the date of payment.
-RulesVATInProducts=- For material assets, the report includes the VAT received or issued on the basis of the date of payment.
-RulesVATDueServices=- For services, the report includes VAT invoices due, paid or not, based on the invoice date.
-RulesVATDueProducts=- For material assets, the report includes the VAT invoices, based on the invoice date.
+SeeVATReportInInputOutputMode=See report <b>%sVAT collection%s</b> for a standard calculation
+SeeVATReportInDueDebtMode=See report <b>%sVAT on debit%s</b> for a calculation with an option on the invoicing
+RulesVATInServices=- For services, the report includes the VAT of payments actually received or paid on the basis of the date of payment.
+RulesVATInProducts=- For material assets, the report includes the VAT on the basis of the date of payment.
+RulesVATDueServices=- For services, the report includes VAT of due invoices, paid or not, based on the invoice date.
+RulesVATDueProducts=- For material assets, the report includes the VAT of due invoices, based on the invoice date.
 OptionVatInfoModuleComptabilite=Note: For material assets, it should use the date of delivery to be more fair.
 ThisIsAnEstimatedValue=This is a preview, based on business events and not from the final ledger table, so final results may differ from this preview values
 PercentOfInvoice=%%/invoice
@ -286,9 +286,12 @@ ReportPurchaseTurnover=Purchase turnover invoiced
 ReportPurchaseTurnoverCollected=Purchase turnover collected
 IncludeVarpaysInResults = Include various payments in reports
 IncludeLoansInResults = Include loans in reports
-InvoiceLate30Days = Invoices late > 30 days
-InvoiceLate15Days = Invoices late > 15 days
-InvoiceLateMinus15Days = Invoices late
-InvoiceNotLate = To be collected < 15 days
-InvoiceNotLate15Days = To be collected in 15 days
-InvoiceNotLate30Days = To be collected in 30 days
+InvoiceLate30Days = Invoices late (> 30 days)
+InvoiceLate15Days = Invoices late (15 to 30 days)
+InvoiceLateMinus15Days = Invoices late (< 15 days)
+InvoiceNotLate = To be collected (< 15 days)
+InvoiceNotLate15Days = To be collected (15 to 30 days)
+InvoiceNotLate30Days = To be collected (> 30 days)
+InvoiceToPay=To pay (< 15 days)
+InvoiceToPay15Days=To pay (15 to 30 days)
+InvoiceToPay30Days=To pay (> 30 days)
--- a/htdocs/langs/ar_IQ/contracts.lang
+++ b/htdocs/langs/ar_IQ/contracts.lang
@ -36,7 +36,7 @@ CloseAContract=Close a contract
 ConfirmDeleteAContract=Are you sure you want to delete this contract and all its services?
 ConfirmValidateContract=Are you sure you want to validate this contract under name <b>%s</b>?
 ConfirmActivateAllOnContract=This will open all services (not yet active). Are you sure you want to open all services?
-ConfirmCloseContract=This will close all services (active or not). Are you sure you want to close this contract?
+ConfirmCloseContract=This will close all services (expired or not). Are you sure you want to close this contract?
 ConfirmCloseService=Are you sure you want to close this service with date <b>%s</b>?
 ValidateAContract=Validate a contract
 ActivateService=Activate service
--- a/htdocs/langs/ar_IQ/ecm.lang
+++ b/htdocs/langs/ar_IQ/ecm.lang
@ -45,3 +45,5 @@ GenerateImgWebp=Duplicate all images with another version with .webp format
 ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder (subfolders are not included)...
 ConfirmImgWebpCreation=Confirm all images duplication
 SucessConvertImgWebp=Images successfully duplicated
+ECMDirName=Dir name
+ECMParentDirectory=Parent directory
--- a/htdocs/langs/ar_IQ/errors.lang
+++ b/htdocs/langs/ar_IQ/errors.lang
@ -83,7 +83,7 @@ ErrorCantSaveADoneUserWithZeroPercentage=Can't save an action with "status not s
 ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorPleaseTypeBankTransactionReportName=Please enter the bank statement name where the entry has to be reported (Format YYYYMM or YYYYMMDD)
 ErrorRecordHasChildren=Failed to delete record since it has some child records.
-ErrorRecordHasAtLeastOneChildOfType=Object has at least one child of type %s
+ErrorRecordHasAtLeastOneChildOfType=Object %s has at least one child of type %s
 ErrorRecordIsUsedCantDelete=Can't delete record. It is already used or included into another object.
 ErrorModuleRequireJavascript=Javascript must not be disabled to have this feature working. To enable/disable Javascript, go to menu Home->Setup->Display.
 ErrorPasswordsMustMatch=Both typed passwords must match each other
@ -264,6 +264,13 @@ ErrorAnAmountWithoutTaxIsRequired=Error, amount is mandatory
 ErrorAPercentIsRequired=Error, please fill in the percentage correctly
 ErrorYouMustFirstSetupYourChartOfAccount=You must first setup your chart of account
 ErrorFailedToFindEmailTemplate=Failed to find template with code name %s
+ErrorDurationForServiceNotDefinedCantCalculateHourlyPrice=Duration not defined on service. No way to calculate the hourly price.
+ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
+ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
+CheckVersionFail=Version check fail
+ErrorWrongFileName=Name of the file cannot have __SOMETHING__ in it
+ErrorNotInDictionaryPaymentConditions=Not in Payment Terms Dictionary, please modify.
+ErrorIsNotADraft=%s is not a draft

 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
@ -297,8 +304,24 @@ WarningTheHiddenOptionIsOn=Warning, the hidden option <b>%s</b> is on.
 WarningCreateSubAccounts=Warning, you can't create directly a sub account, you must create a third party or an user and assign them an accounting code to find them in this list
 WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connection.
 WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So you may miss a lot of event here.
-ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
-ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
-CheckVersionFail=Version check fail
-ErrorWrongFileName=Name of the file cannot have __SOMETHING__ in it
-ErrorNotInDictionaryPaymentConditions=Not in Payment Terms Dictionary, please modify.
+WarningPaypalPaymentNotCompatibleWithStrict=The value 'Strict' makes the online payment features not working correctly. Use 'Lax' instead.
+
+# Validate
+RequireValidValue = Value not valid
+RequireAtLeastXString = Requires at least %s character(s)
+RequireXStringMax = Requires %s character(s) max
+RequireAtLeastXDigits = Requires at least %s digit(s)
+RequireXDigitsMax = Requires %s digit(s) max
+RequireValidEmail = Email address is not valid
+RequireMaxLength = Length must be less than %s chars
+RequireMinLength = Length must be more than %s char(s)
+RequireValidUrl = Require valid URL
+RequireValidDate = Require a valid date
+RequireANotEmptyValue = Is required
+RequireValidDuration = Require a valid duration
+RequireValidExistingElement = Require an existing value
+RequireValidBool = Require a valid boolean
+BadSetupOfField = Error bad setup of field
+BadSetupOfFieldClassNotFoundForValidation = Error bad setup of field : Class not found for validation
+BadSetupOfFieldFileNotFound = Error bad setup of field : File not found for inclusion
+BadSetupOfFieldFetchNotCallable = Error bad setup of field : Fetch not callable on class
--- a/htdocs/langs/ar_IQ/eventorganization.lang
+++ b/htdocs/langs/ar_IQ/eventorganization.lang
@ -19,18 +19,22 @@
 #
 ModuleEventOrganizationName = Event Organization
 EventOrganizationDescription = Event Organization through Module Project
-EventOrganizationDescriptionLong= Manage Event organization for conference, attendees, speaker, and attendees, with public subcription page
+EventOrganizationDescriptionLong= Manage the organization of an event (show, conferences, attendees or speakers, with public pages for suggestion, vote or registration)
 #
 # Menu
 #
 EventOrganizationMenuLeft = Organized events
 EventOrganizationConferenceOrBoothMenuLeft = Conference Or Booth

+PaymentEvent=Payment of event
+
 #
 # Admin page
 #
-EventOrganizationSetup = Event Organization setup
-Settings = Settings
+NewRegistration=Registration
+EventOrganizationSetup=Event Organization setup
+EventOrganization=Event organization
+Settings=Settings
 EventOrganizationSetupPage = Event Organization setup page
 EVENTORGANIZATION_TASK_LABEL = Label of tasks to create automatically when project is validated
 EVENTORGANIZATION_TASK_LABELTooltip = When you validate an organized event, some tasks can be automatically created in the project<br><br>For example: <br>Send Call for Conference<br>Send Call for Booth<br>Receive call for conferences<br>Receive call for Booth<br>Open subscriptions to events for attendees<br>Send remind of event to speakers<br>Send remind of event to Booth hoster<br>Send remind of event to attendees
@ -38,8 +42,8 @@ EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Category to add to third-parties autom
 EVENTORGANIZATION_CATEG_THIRDPARTY_BOOTH = Category to add to third-parties automatically created when they suggests a booth
 EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_CONF = Template of email to send after receiving a suggestion of a conference.
 EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_BOOTH = Template of email to send after receiving a suggestion of a booth.
-EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_BOOTH = Template of email to send  after a subscription to a booth has been paid.
-EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT = Template of email to send after a subscription to an event has been paid.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_BOOTH = Template of email to send  after a registration to a booth has been paid.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT = Template of email to send after a registration to an event has been paid.
 EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_SPEAKER = Template of email of massaction to attendes
 EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Template of email of massaction to speakers
 EVENTORGANIZATION_FILTERATTENDEES_CAT = Filter thirdpartie's select list in attendees creation card/form with category
@ -49,11 +53,11 @@ EVENTORGANIZATION_FILTERATTENDEES_TYPE = Filter thirdpartie's select list in att
 # Object
 #
 EventOrganizationConfOrBooth= Conference Or Booth
-ManageOrganizeEvent = Manage event organisation
+ManageOrganizeEvent = Manage the organization of an event
 ConferenceOrBooth = Conference Or Booth
 ConferenceOrBoothTab = Conference Or Booth
-AmountOfSubscriptionPaid = Amount of subscription paid
-DateSubscription = Date of subscription
+AmountPaid = Amount paid
+DateOfRegistration = Date of registration
 ConferenceOrBoothAttendee = Conference Or Booth Attendee

 #
@ -63,25 +67,26 @@ YourOrganizationEventConfRequestWasReceived = Your request for conference was re
 YourOrganizationEventBoothRequestWasReceived = Your request for booth was received
 EventOrganizationEmailAskConf = Request for conference
 EventOrganizationEmailAskBooth = Request for booth
-EventOrganizationEmailSubsBooth = Subscription for booth
-EventOrganizationEmailSubsEvent = Subscription for an event
+EventOrganizationEmailBoothPayment = Payment of your booth
+EventOrganizationEmailRegistrationPayment = Registration for an event
 EventOrganizationMassEmailAttendees = Communication to attendees
 EventOrganizationMassEmailSpeakers = Communication to speakers

 #
 # Event
 #
-AllowUnknownPeopleSuggestConf=Allow unknown people to suggest conferences
-AllowUnknownPeopleSuggestConfHelp=Allow unknown people to suggest conferences
-AllowUnknownPeopleSuggestBooth=Allow unknown people to suggest booth
-AllowUnknownPeopleSuggestBoothHelp=Allow unknown people to suggest booth
+AllowUnknownPeopleSuggestConf=Allow people to suggest conferences
+AllowUnknownPeopleSuggestConfHelp=Allow unknown people to suggest a conference they want to do
+AllowUnknownPeopleSuggestBooth=Allow people to apply for a booth
+AllowUnknownPeopleSuggestBoothHelp=Allow unknown people to apply for a booth
 PriceOfRegistration=Price of registration
-PriceOfRegistrationHelp=Price of registration
+PriceOfRegistrationHelp=Price to pay to register or participate in the event
 PriceOfBooth=Subscription price to stand a booth
 PriceOfBoothHelp=Subscription price to stand a booth
 EventOrganizationICSLink=Link ICS for events
 ConferenceOrBoothInformation=Conference Or Booth informations
-Attendees = Attendees
+Attendees=Attendees
+ListOfAttendeesOfEvent=List of attendees of the event project
 DownloadICSLink = Download ICS link
 EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
 SERVICE_BOOTH_LOCATION = Service used for the invoice row about a booth location
@ -100,25 +105,41 @@ EvntOrgCancelled = Cancelled
 # Public page
 #
 SuggestForm = Suggestion page
-RegisterPage = Page for conferences or booth
-EvntOrgRegistrationHelpMessage = Here, you can vote for an event, or suggest a new conference or booth for the project
-EvntOrgRegistrationConfHelpMessage = Here, you can suggest a new conference for the project
-EvntOrgRegistrationBoothHelpMessage = Here, you can suggest a new booth for the project
+SuggestOrVoteForConfOrBooth = Page for suggestion or vote
+EvntOrgRegistrationHelpMessage = Here, you can vote for a conference or suggest a new one for the event. You can also apply to have a booth during the event.
+EvntOrgRegistrationConfHelpMessage = Here, you can suggest a new conference to animate during the event.
+EvntOrgRegistrationBoothHelpMessage = Here, you can apply to have a booth during the event.
 ListOfSuggestedConferences = List of suggested conferences
 ListOfSuggestedBooths = List of suggested booths
+ListOfConferencesOrBooths=List of conferences or booths of event project
 SuggestConference = Suggest a new conference
 SuggestBooth = Suggest a booth
 ViewAndVote = View and vote for suggested events
-PublicAttendeeSubscriptionPage = Public link of registration to a conference
+PublicAttendeeSubscriptionGlobalPage = Public link for registration to the event
+PublicAttendeeSubscriptionPage = Public link for registration to this event only
 MissingOrBadSecureKey = The security key is invalid or missing
-EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference : '%s'
+EvntOrgWelcomeMessage = This form allows you to register as a new participant to the event : <b>%s</b>
 EvntOrgDuration = This conference starts on %s and ends on %s.
 ConferenceAttendeeFee = Conference attendee fee for the event : '%s' occurring from %s to %s.
 BoothLocationFee = Booth location for the event : '%s' occurring from %s to %s
 EventType = Event type
 LabelOfBooth=Booth label
 LabelOfconference=Conference label
-ConferenceIsNotConfirmed=Subcription not available, conference is not confirmed yet
+ConferenceIsNotConfirmed=Registration not available, conference is not confirmed yet
+DateMustBeBeforeThan=%s must be before %s
+DateMustBeAfterThan=%s must be after %s
+
+NewSubscription=Registration
+OrganizationEventConfRequestWasReceived=Your suggestion for a conference has been received
+OrganizationEventBoothRequestWasReceived=Your request for a booth has been received
+OrganizationEventPaymentOfBoothWasReceived=Your payment for your booth has been recorded
+OrganizationEventPaymentOfRegistrationWasReceived=Your payment for your event registration has been recorded
+OrganizationEventBulkMailToAttendees=This is a remind about your participation in the event as an attendee
+OrganizationEventBulkMailToSpeakers=This is a reminder on your participation in the event as a speaker
+OrganizationEventLinkToThirdParty=Link to third party (customer, supplier or partner)
+
+NewSuggestionOfBooth=Application for a booth
+NewSuggestionOfConference=Application for a conference

 #
 # Vote page
@ -131,17 +152,15 @@ VoteOk = Your vote has been accepted.
 AlreadyVoted = You have already voted for this event.
 VoteError = An error has occurred during the vote, please try again.

-#
-# SubscriptionOk page
-#
-SubscriptionOk = Your subscription to this conference has been validated
-#
-# Subscription validation mail
-#
-ConfAttendeeSubscriptionConfirmation = Confirmation of your subscription to a conference
-#
-# Payment page
-#
+SubscriptionOk = Your registration has been validated
+ConfAttendeeSubscriptionConfirmation = Confirmation of your subscription to an event
 Attendee = Attendee
 PaymentConferenceAttendee = Conference attendee payment
 PaymentBoothLocation = Booth location payment
+DeleteConferenceOrBoothAttendee=Remove attendee
+RegistrationAndPaymentWereAlreadyRecorder=A registration and a payment were already recorded for the email <b>%s</b>
+EmailAttendee=Attendee email
+EmailCompanyForInvoice=Company email (for invoice, if different of attendee email)
+ErrorSeveralCompaniesWithEmailContactUs=Several companies with this email has been found so we can't validate automaticaly your registration. Please contact us at %s for a manual validation
+ErrorSeveralCompaniesWithNameContactUs=Several companies with this name has been found so we can't validate automaticaly your registration. Please contact us at %s for a manual validation
+NoPublicActionsAllowedForThisEvent=No public actions are open to public for this event
--- a/htdocs/langs/ar_IQ/exports.lang
+++ b/htdocs/langs/ar_IQ/exports.lang
@ -96,8 +96,8 @@ DataComeFromFileFieldNb=Value to insert comes from field number <b>%s</b> in sou
 DataComeFromIdFoundFromRef=Value that comes from field number <b>%s</b> of source file will be used to find the id of the parent object to use (so the object <b>%s</b> that has the ref. from source file must exist in the database).
 DataComeFromIdFoundFromCodeId=Code that comes from field number <b>%s</b> of source file will be used to find the id of the parent object to use (so the code from source file must exist in the dictionary <b>%s</b>). Note that if you know the id, you can also use it in the source file instead of the code. Import should work in both cases.
 DataIsInsertedInto=Data coming from source file will be inserted into the following field:
-DataIDSourceIsInsertedInto=The id of parent object was found using the data in the source file, will be inserted into the following field:
-DataCodeIDSourceIsInsertedInto=The id of parent line found from code, will be inserted into following field:
+DataIDSourceIsInsertedInto=The id of the parent object, that was found using the data in the source file, will be inserted into the following field:
+DataCodeIDSourceIsInsertedInto=The id of the parent line, that was found from code, will be inserted into the following field:
 SourceRequired=Data value is mandatory
 SourceExample=Example of possible data value
 ExampleAnyRefFoundIntoElement=Any ref found for element <b>%s</b>
--- a/htdocs/langs/ar_IQ/holiday.lang
+++ b/htdocs/langs/ar_IQ/holiday.lang
@ -132,3 +132,5 @@ FreeLegalTextOnHolidays=Free text on PDF
 WatermarkOnDraftHolidayCards=Watermarks on draft leave requests
 HolidaysToApprove=Holidays to approve
 NobodyHasPermissionToValidateHolidays=Nobody has permission to validate holidays
+HolidayBalanceMonthlyUpdate=Monthly update of holiday balance
+XIsAUsualNonWorkingDay=%s is usualy a NON working day
--- a/htdocs/langs/ar_IQ/hrm.lang
+++ b/htdocs/langs/ar_IQ/hrm.lang
@ -1,4 +1,6 @@
 # Dolibarr language file - en_US - hrm
+
+
 # Admin
 HRM_EMAIL_EXTERNAL_SERVICE=Email to prevent HRM external service
 Establishments=Establishments
@ -17,3 +19,63 @@ Employees=Employees
 Employee=Employee
 NewEmployee=New employee
 ListOfEmployees=List of employees
+HrmSetup=HRM module setup
+HRM_MAXRANK=Maximum rank for a skill
+HRM_DEFAULT_SKILL_DESCRIPTION=Default description of ranks when skill is created
+deplacement=Shift
+DateEval=Evaluation date
+JobCard=Job card
+Job=Job
+Jobs=Jobs
+NewSkill=New Skill
+SkillType=Skill type
+Skilldets=List of ranks for this skill
+Skilldet=Skill level
+rank=Rank
+ErrNoSkillSelected=No skill selected
+ErrSkillAlreadyAdded=This skill is already in the list
+SkillHasNoLines=This skill has no lines
+skill=Skill
+Skills=Skills
+SkillCard=Skill card
+EmployeeSkillsUpdated=Employee skills have been updated (see "Skills" tab of employee card)
+Eval=Evaluation
+Evals=Evaluations
+NewEval=New evaluation
+ValidateEvaluation=Validate evaluation
+ConfirmValidateEvaluation=Are you sure you want to validate this evaluation with reference <b>%s</b>?
+EvaluationCard=Evaluation card
+RequiredRank=Required rank for this job
+EmployeeRank=Employee rank for this skill
+Position=Position
+Positions=Positions
+PositionCard=Position card
+EmployeesInThisPosition=Employees in this position
+group1ToCompare=Usergroup to analyze
+group2ToCompare=Second usergroup for comparison
+OrJobToCompare=Compare to job skills requirements
+difference=Difference
+CompetenceAcquiredByOneOrMore=Competence acquired by one or more users but not requested by the second comparator
+MaxlevelGreaterThan=Max level greater than the one requested
+MaxLevelEqualTo=Max level equal to that demand
+MaxLevelLowerThan=Max level lower than that demand
+MaxlevelGreaterThanShort=Employee level greater than the one requested
+MaxLevelEqualToShort=Employee level equals to that demand
+MaxLevelLowerThanShort=Employee level lower than that demand
+SkillNotAcquired=Skill not acquired by all users and requested by the second comparator
+legend=Legend
+TypeSkill=Skill type
+AddSkill=Add skills to job
+RequiredSkills=Required skills for this job
+UserRank=User Rank
+SkillList=Skill list
+SaveRank=Save rank
+knowHow=Know how
+HowToBe=How to be
+knowledge=Knowledge
+AbandonmentComment=Abandonment comment
+DateLastEval=Date last evaluation
+NoEval=No evaluation done for this employee
+HowManyUserWithThisMaxNote=Number of users with this rank
+HighestRank=Highest rank
+SkillComparison=Skill comparison
--- a/htdocs/langs/ar_IQ/interventions.lang
+++ b/htdocs/langs/ar_IQ/interventions.lang
@ -64,5 +64,5 @@ InterLineDuration=Line duration intervention
 InterLineDesc=Line description intervention
 RepeatableIntervention=Template of intervention
 ToCreateAPredefinedIntervention=To create a predefined or recurring intervention, create a common intervention and convert it into intervention template
-Reopen=Reopen
 ConfirmReopenIntervention=Are you sure you want to open back the intervention <b>%s</b>?
+GenerateInter=Generate intervention
--- a/htdocs/langs/ar_IQ/knowledgemanagement.lang
+++ b/htdocs/langs/ar_IQ/knowledgemanagement.lang
@ -37,15 +37,7 @@ About = About
 KnowledgeManagementAbout = About Knowledge Management
 KnowledgeManagementAboutPage = Knowledge Management about page

-#
-# Sample page
-#
 KnowledgeManagementArea = Knowledge Management
-
-
-#
-# Menu
-#
 MenuKnowledgeRecord = Knowledge base
 ListKnowledgeRecord = List of articles
 NewKnowledgeRecord = New article
@ -53,3 +45,6 @@ ValidateReply = Validate solution
 KnowledgeRecords = Articles
 KnowledgeRecord = Article
 KnowledgeRecordExtraFields = Extrafields for Article
+GroupOfTicket=Group of tickets
+YouCanLinkArticleToATicketCategory=You can link an article to a ticket group (so the article will be suggested during qualification of new tickets)
+SuggestedForTicketsInGroup=Suggested for tickets when group is
--- a/htdocs/langs/ar_IQ/languages.lang
+++ b/htdocs/langs/ar_IQ/languages.lang
@ -1,9 +1,13 @@
 # Dolibarr language file - Source file is en_US - languages
 Language_am_ET=Ethiopian
 Language_ar_AR=Arabic
+Language_ar_DZ=Arabic (Algeria)
 Language_ar_EG=Arabic (Egypt)
+Language_ar_MA=Arabic (Moroco)
 Language_ar_SA=Arabic
 Language_ar_TN=Arabic (Tunisia)
+Language_ar_IQ=Arabic (Iraq)
+Language_as_IN=Assamese
 Language_az_AZ=Azerbaijani
 Language_bn_BD=Bengali
 Language_bn_IN=Bengali (India)
@ -70,6 +74,7 @@ Language_it_IT=Italian
 Language_it_CH=Italian (Switzerland)
 Language_ja_JP=Japanese
 Language_ka_GE=Georgian
+Language_kk_KZ=Kazakh
 Language_km_KH=Khmer
 Language_kn_IN=Kannada
 Language_ko_KR=Korean
@ -83,12 +88,14 @@ Language_ne_NP=Nepali
 Language_nl_BE=Dutch (Belgium)
 Language_nl_NL=Dutch
 Language_pl_PL=Polish
+Language_pt_AO=Portuguese (Angola)
 Language_pt_BR=Portuguese (Brazil)
 Language_pt_PT=Portuguese
 Language_ro_MD=Romanian (Moldavia)
 Language_ro_RO=Romanian
 Language_ru_RU=Russian
 Language_ru_UA=Russian (Ukraine)
+Language_tg_TJ=Tajik
 Language_tr_TR=Turkish
 Language_sl_SI=Slovenian
 Language_sv_SV=Swedish
--- a/htdocs/langs/ar_IQ/mails.lang
+++ b/htdocs/langs/ar_IQ/mails.lang
@ -60,6 +60,7 @@ EMailTestSubstitutionReplacedByGenericValues=When using test mode, substitutions
 MailingAddFile=Attach this file
 NoAttachedFiles=No attached files
 BadEMail=Bad value for Email
+EMailNotDefined=Email not defined
 ConfirmCloneEMailing=Are you sure you want to clone this emailing?
 CloneContent=Clone message
 CloneReceivers=Cloner recipients
@ -162,8 +163,8 @@ AdvTgtDeleteFilter=Delete filter
 AdvTgtSaveFilter=Save filter
 AdvTgtCreateFilter=Create filter
 AdvTgtOrCreateNewFilter=Name of new filter
-NoContactWithCategoryFound=No contact/address with a category found
-NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
+NoContactWithCategoryFound=No category found linked to some contacts/addresses
+NoContactLinkedToThirdpartieWithCategoryFound=No category found linked to some thirdparties
 OutGoingEmailSetup=Outgoing emails
 InGoingEmailSetup=Incoming emails
 OutGoingEmailSetupForEmailing=Outgoing emails (for module %s)
@ -175,5 +176,5 @@ Answered=Answered
 IsNotAnAnswer=Is not answer (initial email)
 IsAnAnswer=Is an answer of an initial email
 RecordCreatedByEmailCollector=Record created by the Email Collector %s from email %s
-DefaultBlacklistMailingStatus=Default contact status for refuse bulk emailing
+DefaultBlacklistMailingStatus=Default value for field '%s' when creating a new contact
 DefaultStatusEmptyMandatory=Empty but mandatory
--- a/htdocs/langs/ar_IQ/main.lang
+++ b/htdocs/langs/ar_IQ/main.lang
@ -804,6 +804,7 @@ LinkToSupplierInvoice=Link to vendor invoice
 LinkToContract=Link to contract
 LinkToIntervention=Link to intervention
 LinkToTicket=Link to ticket
+LinkToMo=Link to Mo
 CreateDraft=Create draft
 SetToDraft=Back to draft
 ClickToEdit=Click to edit
@ -1137,3 +1138,24 @@ CopiedToClipboard=Copied to clipboard
 InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
 ConfirmCancel=Are you sure you want to cancel
 EmailMsgID=Email MsgID
+SetToEnabled=Set to enabled
+SetToDisabled=Set to disabled
+ConfirmMassEnabling=mass enabling confirmation
+ConfirmMassEnablingQuestion=Are you sure you want to enable the %s selected record(s)?
+ConfirmMassDisabling=mass disabling confirmation
+ConfirmMassDisablingQuestion=Are you sure you want to disable the %s selected record(s)?
+RecordsEnabled=%s record(s) enabled
+RecordsDisabled=%s record(s) disabled
+RecordEnabled=Record enabled
+RecordDisabled=Record disabled
+Forthcoming=Forthcoming
+Currently=Currently
+ConfirmMassLeaveApprovalQuestion=Are you sure you want to approve the %s selected record(s)?
+ConfirmMassLeaveApproval=Mass leave approval confirmation
+RecordAproved=Record approved
+RecordsApproved=%s Record(s) approved
+Properties=Properties
+hasBeenValidated=%s has been validated
+ClientTZ=Client Time Zone (user)
+NotClosedYet=Not yet closed
+ClearSignature=Signature reset
--- a/htdocs/langs/ar_IQ/margins.lang
+++ b/htdocs/langs/ar_IQ/margins.lang
@ -22,7 +22,7 @@ ProductService=Product or Service
 AllProducts=All products and services
 ChooseProduct/Service=Choose product or service
 ForceBuyingPriceIfNull=Force buying/cost price to selling price if not defined
-ForceBuyingPriceIfNullDetails=If buying/cost price not provided when we add a new line, and this option is "ON", the margin will be 0 on the new line (buying/cost price = selling price). If this option is "OFF" (recommended), margin will be equal to the value suggested by default (and may be 100% if no default value can be found).
+ForceBuyingPriceIfNullDetails=If buying/cost price not provided when we add a new line, and this option is "ON", the margin will be 0%% on the new line (buying/cost price = selling price). If this option is "OFF" (recommended), margin will be equal to the value suggested by default (and may be 100%% if no default value can be found).
 MARGIN_METHODE_FOR_DISCOUNT=Margin method for global discounts
 UseDiscountAsProduct=As a product
 UseDiscountAsService=As a service
--- a/htdocs/langs/ar_IQ/members.lang
+++ b/htdocs/langs/ar_IQ/members.lang
@ -7,7 +7,7 @@ Members=Members
 ShowMember=Show member card
 UserNotLinkedToMember=User not linked to a member
 ThirdpartyNotLinkedToMember=Third party not linked to a member
-MembersTickets=Members Tickets
+MembersTickets=Membership address sheet
 FundationMembers=Foundation members
 ListOfValidatedPublicMembers=List of validated public members
 ErrorThisMemberIsNotPublic=This member is not public
@ -19,8 +19,8 @@ MembersCards=Business cards for members
 MembersList=List of members
 MembersListToValid=List of draft members (to be validated)
 MembersListValid=List of valid members
-MembersListUpToDate=List of valid members with up-to-date subscription
-MembersListNotUpToDate=List of valid members with out-of-date subscription
+MembersListUpToDate=List of valid members with up-to-date contribution
+MembersListNotUpToDate=List of valid members with out-of-date contribution
 MembersListExcluded=List of excluded members
 MembersListResiliated=List of terminated members
 MembersListQualified=List of qualified members
@ -28,13 +28,13 @@ MenuMembersToValidate=Draft members
 MenuMembersValidated=Validated members
 MenuMembersExcluded=Excluded members
 MenuMembersResiliated=Terminated members
-MembersWithSubscriptionToReceive=Members with subscription to receive
-MembersWithSubscriptionToReceiveShort=Subscription to receive
-DateSubscription=Subscription date
-DateEndSubscription=Subscription end date
-EndSubscription=Subscription Ends
-SubscriptionId=Subscription id
-WithoutSubscription=Without subscription
+MembersWithSubscriptionToReceive=Members with contribution to receive
+MembersWithSubscriptionToReceiveShort=Contributions to receive
+DateSubscription=Date of membership
+DateEndSubscription=End date of membership
+EndSubscription=End of membership
+SubscriptionId=Contribution ID
+WithoutSubscription=Without contribution
 MemberId=Member id
 NewMember=New member
 MemberType=Member type
@ -43,9 +43,9 @@ MemberTypeLabel=Member type label
 MembersTypes=Members types
 MemberStatusDraft=Draft (needs to be validated)
 MemberStatusDraftShort=Draft
-MemberStatusActive=Validated (waiting subscription)
+MemberStatusActive=Validated (waiting contribution)
 MemberStatusActiveShort=Validated
-MemberStatusActiveLate=Subscription expired
+MemberStatusActiveLate=Contribution expired
 MemberStatusActiveLateShort=Expired
 MemberStatusPaid=Subscription up to date
 MemberStatusPaidShort=Up to date
@ -56,9 +56,9 @@ MemberStatusResiliatedShort=Terminated
 MembersStatusToValid=Draft members
 MembersStatusExcluded=Excluded members
 MembersStatusResiliated=Terminated members
-MemberStatusNoSubscription=Validated (no subscription needed)
+MemberStatusNoSubscription=Validated (no contribution required)
 MemberStatusNoSubscriptionShort=Validated
-SubscriptionNotNeeded=No subscription needed
+SubscriptionNotNeeded=No contribution required
 NewCotisation=New contribution
 PaymentSubscription=New contribution payment
 SubscriptionEndDate=Subscription's end date
@ -68,19 +68,19 @@ DeleteAMemberType=Delete a member type
 ConfirmDeleteMemberType=Are you sure you want to delete this member type?
 MemberTypeDeleted=Member type deleted
 MemberTypeCanNotBeDeleted=Member type can not be deleted
-NewSubscription=New subscription
+NewSubscription=New contribution
 NewSubscriptionDesc=This form allows you to record your subscription as a new member of the foundation. If you want to renew your subscription (if already a member), please contact foundation board instead by email %s.
-Subscription=Subscription
-Subscriptions=Subscriptions
+Subscription=Contribution
+Subscriptions=Contributions
 SubscriptionLate=Late
-SubscriptionNotReceived=Subscription never received
-ListOfSubscriptions=List of subscriptions
+SubscriptionNotReceived=Contribution never received
+ListOfSubscriptions=List of contributions
 SendCardByMail=Send card by email
 AddMember=Create member
 NoTypeDefinedGoToSetup=No member types defined. Go to menu "Members types"
 NewMemberType=New member type
 WelcomeEMail=Welcome email
-SubscriptionRequired=Subscription required
+SubscriptionRequired=Contribution required
 DeleteType=Delete
 VoteAllowed=Vote allowed
 Physical=Individual
@ -88,47 +88,48 @@ Moral=Corporation
 MorAndPhy=Corporation and Individual
 Reenable=Re-Enable
 ExcludeMember=Exclude a member
+Exclude=Exclude
 ConfirmExcludeMember=Are you sure you want to exclude this member ?
 ResiliateMember=Terminate a member
 ConfirmResiliateMember=Are you sure you want to terminate this member?
 DeleteMember=Delete a member
-ConfirmDeleteMember=Are you sure you want to delete this member (Deleting a member will delete all his subscriptions)?
+ConfirmDeleteMember=Are you sure you want to delete this member (Deleting a member will delete all his contributions)?
 DeleteSubscription=Delete a subscription
-ConfirmDeleteSubscription=Are you sure you want to delete this subscription?
+ConfirmDeleteSubscription=Are you sure you want to delete this contribution?
 Filehtpasswd=htpasswd file
 ValidateMember=Validate a member
 ConfirmValidateMember=Are you sure you want to validate this member?
 FollowingLinksArePublic=The following links are open pages not protected by any Dolibarr permission. They are not formatted pages, provided as example to show how to list members database.
 PublicMemberList=Public member list
-BlankSubscriptionForm=Public self-subscription form
+BlankSubscriptionForm=Public self-registration form
 BlankSubscriptionFormDesc=Dolibarr can provide you a public URL/website to allow external visitors to ask to subscribe to the foundation. If an online payment module is enabled, a payment form may also be automatically provided.
 EnablePublicSubscriptionForm=Enable the public website with self-subscription form
 ForceMemberType=Force the member type
-ExportDataset_member_1=Members and subscriptions
+ExportDataset_member_1=Members and contributions
 ImportDataset_member_1=Members
 LastMembersModified=Latest %s modified members
-LastSubscriptionsModified=Latest %s modified subscriptions
+LastSubscriptionsModified=Latest %s modified contributions
 String=String
 Text=Text
 Int=Int
 DateAndTime=Date and time
 PublicMemberCard=Member public card
-SubscriptionNotRecorded=Subscription not recorded
-AddSubscription=Create subscription
-ShowSubscription=Show subscription
+SubscriptionNotRecorded=Contribution not recorded
+AddSubscription=Create contribution
+ShowSubscription=Show contribution
 # Label of email templates
 SendingAnEMailToMember=Sending information email to member
 SendingEmailOnAutoSubscription=Sending email on auto registration
 SendingEmailOnMemberValidation=Sending email on new member validation
-SendingEmailOnNewSubscription=Sending email on new subscription
-SendingReminderForExpiredSubscription=Sending reminder for expired subscriptions
+SendingEmailOnNewSubscription=Sending email on new contribution
+SendingReminderForExpiredSubscription=Sending reminder for expired contributions
 SendingEmailOnCancelation=Sending email on cancelation
 SendingReminderActionComm=Sending reminder for agenda event
 # Topic of email templates
 YourMembershipRequestWasReceived=Your membership was received.
 YourMembershipWasValidated=Your membership was validated
-YourSubscriptionWasRecorded=Your new subscription was recorded
-SubscriptionReminderEmail=Subscription reminder
+YourSubscriptionWasRecorded=Your new contribution was recorded
+SubscriptionReminderEmail=contribution reminder
 YourMembershipWasCanceled=Your membership was canceled
 CardContent=Content of your member card
 # Text of email templates
@ -139,10 +140,10 @@ ThisIsContentOfSubscriptionReminderEmail=We want to let you know that your subsc
 ThisIsContentOfYourCard=This is a summary of the information we have about you. Please contact us if anything is incorrect.<br><br>
 DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the notification email received in case of auto-inscription of a guest
 DescADHERENT_AUTOREGISTER_NOTIF_MAIL=Content of the notification email received in case of auto-inscription of a guest
-DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Email template to use to send email to a member on member autosubscription
+DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Email template to use to send email to a member on member auto-registration
 DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Email template to use to send email to a member on member validation
-DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Email template to use to send email to a member on new subscription recording
-DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Email template to use to send email reminder when subscription is about to expire
+DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Email template to use to send email to a member on new contribution recording
+DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Email template to use to send email reminder when contribution is about to expire
 DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Email template to use to send email to a member on member cancelation
 DescADHERENT_EMAIL_TEMPLATE_EXCLUSION=Email template to use to send email to a member on member exclusion
 DescADHERENT_MAIL_FROM=Sender Email for automatic emails
@ -155,10 +156,10 @@ DescADHERENT_CARD_TEXT_RIGHT=Text printed on member cards (align on right)
 DescADHERENT_CARD_FOOTER_TEXT=Text printed on bottom of member cards
 ShowTypeCard=Show type '%s'
 HTPasswordExport=htpassword file generation
-NoThirdPartyAssociatedToMember=No third party associated to this member
-MembersAndSubscriptions= Members and Subscriptions
+NoThirdPartyAssociatedToMember=No third party associated with this member
+MembersAndSubscriptions=Members and Contributions
 MoreActions=Complementary action on recording
-MoreActionsOnSubscription=Complementary action, suggested by default when recording a subscription
+MoreActionsOnSubscription=Complementary action, suggested by default when recording a contribution
 MoreActionBankDirect=Create a direct entry on bank account
 MoreActionBankViaInvoice=Create an invoice, and a payment on bank account
 MoreActionInvoiceOnly=Create an invoice with no payment
@ -167,9 +168,9 @@ LinkToGeneratedPagesDesc=This screen allows you to generate PDF files with busin
 DocForAllMembersCards=Generate business cards for all members
 DocForOneMemberCards=Generate business cards for a particular member
 DocForLabels=Generate address sheets
-SubscriptionPayment=Subscription payment
-LastSubscriptionDate=Date of latest subscription payment
-LastSubscriptionAmount=Amount of latest subscription
+SubscriptionPayment=Contribution payment
+LastSubscriptionDate=Date of latest contribution payment
+LastSubscriptionAmount=Amount of latest contribution
 LastMemberType=Last Member type
 MembersStatisticsByCountries=Members statistics by country
 MembersStatisticsByState=Members statistics by state/province
@ -186,32 +187,34 @@ MembersByRegion=This screen show you statistics of members by region.
 MembersStatisticsDesc=Choose statistics you want to read...
 MenuMembersStats=Statistics
 LastMemberDate=Latest membership date
-LatestSubscriptionDate=Latest subscription date
+LatestSubscriptionDate=Latest contribution date
 MemberNature=Nature of the member
 MembersNature=Nature of the members
 Public=Information is public
 NewMemberbyWeb=New member added. Awaiting approval
 NewMemberForm=New member form
-SubscriptionsStatistics=Subscriptions statistics
-NbOfSubscriptions=Number of subscriptions
-AmountOfSubscriptions=Amount collected from subscriptions
+SubscriptionsStatistics=Contributions statistics
+NbOfSubscriptions=Number of contributions
+AmountOfSubscriptions=Amount collected from contributions
 TurnoverOrBudget=Turnover (for a company) or Budget (for a foundation)
-DefaultAmount=Default amount of subscription
-CanEditAmount=Visitor can choose/edit amount of its subscription
+DefaultAmount=Default amount of contribution
+CanEditAmount=Visitor can choose/edit amount of its contribution
 MEMBER_NEWFORM_PAYONLINE=Jump on integrated online payment page
 ByProperties=By nature
 MembersStatisticsByProperties=Members statistics by nature
-VATToUseForSubscriptions=VAT rate to use for subscriptions
-NoVatOnSubscription=No VAT for subscriptions
-ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
+VATToUseForSubscriptions=VAT rate to use for contributionss
+NoVatOnSubscription=No VAT for contributions
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for contribution line into invoice: %s
 NameOrCompany=Name or company
-SubscriptionRecorded=Subscription recorded
+SubscriptionRecorded=Contribution recorded
 NoEmailSentToMember=No email sent to member
 EmailSentToMember=Email sent to member at %s
-SendReminderForExpiredSubscriptionTitle=Send reminder by email for expired subscription
-SendReminderForExpiredSubscription=Send reminder by email to members when subscription is about to expire (parameter is number of days before end of subscription to send the remind. It can be a list of days separated by a semicolon, for example '10;5;0;-5')
+SendReminderForExpiredSubscriptionTitle=Send reminder by email for expired contributions
+SendReminderForExpiredSubscription=Send reminder by email to members when contribution is about to expire (parameter is number of days before end of membership to send the remind. It can be a list of days separated by a semicolon, for example '10;5;0;-5')
 MembershipPaid=Membership paid for current period (until %s)
 YouMayFindYourInvoiceInThisEmail=You may find your invoice attached to this email
 XMembersClosed=%s member(s) closed
 XExternalUserCreated=%s external user(s) created
 ForceMemberNature=Force member nature (Individual or Corporation)
+CreateDolibarrLoginDesc=The creation of a user login for members allows them to connect to the application. Depending on the authorizations granted, they will be able, for example, to consult or modify their file themselves.
+CreateDolibarrThirdPartyDesc=A thirdparty is the legal entity that will be used on the invoice if you decide to generate invoice for each contribution. You will be able to create it later during the process of recording the contribution.
--- a/htdocs/langs/ar_IQ/modulebuilder.lang
+++ b/htdocs/langs/ar_IQ/modulebuilder.lang
@ -144,3 +144,4 @@ AsciiToPdfConverter=Ascii to PDF converter
 TableNotEmptyDropCanceled=Table not empty. Drop has been canceled.
 ModuleBuilderNotAllowed=The module builder is available but not allowed to your user.
 ImportExportProfiles=Import and export profiles
+ValidateModBuilderDesc=Put 1 if this field need to be validated with $this->validateField() or 0 if validation required
--- a/htdocs/langs/ar_IQ/mrp.lang
+++ b/htdocs/langs/ar_IQ/mrp.lang
@ -9,6 +9,7 @@ LatestBOMModified=Latest %s Bills of materials modified
 LatestMOModified=Latest %s Manufacturing Orders modified
 Bom=Bills of Material
 BillOfMaterials=Bill of Materials
+BillOfMaterialsLines=Bill of Materials lines
 BOMsSetup=Setup of module BOM
 ListOfBOMs=List of bills of material - BOM
 ListOfManufacturingOrders=List of Manufacturing Orders
@ -31,7 +32,7 @@ ValueOfMeansLossForProductProduced=Value of 0.95 means an average of 5%% of loss
 DeleteBillOfMaterials=Delete Bill Of Materials
 DeleteMo=Delete Manufacturing Order
 ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Materials?
-ConfirmDeleteMo=Are you sure you want to delete this Bill Of Materials?
+ConfirmDeleteMo=Are you sure you want to delete this Manufacturing Order?
 MenuMRP=Manufacturing Orders
 NewMO=New Manufacturing Order
 QtyToProduce=Qty to produce
@ -55,6 +56,7 @@ WarehouseForProduction=Warehouse for production
 CreateMO=Create MO
 ToConsume=To consume
 ToProduce=To produce
+ToObtain=To obtain
 QtyAlreadyConsumed=Qty already consumed
 QtyAlreadyProduced=Qty already produced
 QtyRequiredIfNoLoss=Qty required if there is no loss (Manufacturing efficiency is 100%%)
@ -72,6 +74,7 @@ NoStockChangeOnServices=No stock change on services
 ProductQtyToConsumeByMO=Product quantity still to consume by open MO
 ProductQtyToProduceByMO=Product quantity still to produce by open MO
 AddNewConsumeLines=Add new line to consume
+AddNewProduceLines=Add new line to produce
 ProductsToConsume=Products to consume
 ProductsToProduce=Products to produce
 UnitCost=Unit cost
@ -101,3 +104,6 @@ HumanMachine=Human / Machine
 WorkstationArea=Workstation area
 Machines=Machines
 THMEstimatedHelp=This rate makes it possible to define a forecast cost of the item
+BOM=Bill Of Materials
+CollapseBOMHelp=You can define the default display of the details of the nomenclature in the configuration of the BOM module
+MOAndLines=Manufacturing Orders and lines
--- a/htdocs/langs/ar_IQ/opensurvey.lang
+++ b/htdocs/langs/ar_IQ/opensurvey.lang
@ -48,6 +48,8 @@ AddEndHour=Add end hour
 votes=vote(s)
 NoCommentYet=No comments have been posted for this poll yet
 CanComment=Voters can comment in the poll
+YourVoteIsPrivate=This poll is private, nobody can see your vote.
+YourVoteIsPublic=This poll is public, anybody with the link can see your vote.
 CanSeeOthersVote=Voters can see other people's vote
 SelectDayDesc=For each selected day, you can choose, or not, meeting hours in the following format:<br>- empty,<br>- "8h", "8H" or "8:00" to give a meeting's start hour,<br>- "8-11", "8h-11h", "8H-11H" or "8:00-11:00" to give a meeting's start and end hour,<br>- "8h15-11h15", "8H15-11H15" or "8:15-11:15" for the same thing but with minutes.
 BackToCurrentMonth=Back to current month
--- a/htdocs/langs/ar_IQ/orders.lang
+++ b/htdocs/langs/ar_IQ/orders.lang
@ -17,7 +17,7 @@ ToOrder=Make order
 MakeOrder=Make order
 SupplierOrder=Purchase order
 SuppliersOrders=Purchase orders
-SaleOrderLines=Sale order lines
+SaleOrderLines=Sales order lines
 PurchaseOrderLines=Puchase order lines
 SuppliersOrdersRunning=Current purchase orders
 CustomerOrder=Sales Order
@ -124,6 +124,8 @@ SupplierOrderReceivedInDolibarr=Purchase Order %s received %s
 SupplierOrderSubmitedInDolibarr=Purchase Order %s submitted
 SupplierOrderClassifiedBilled=Purchase Order %s set billed
 OtherOrders=Other orders
+SupplierOrderValidatedAndApproved=Supplier order is validated and approved : %s
+SupplierOrderValidated=Supplier order is validated : %s
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=Representative following-up sales order
 TypeContact_commande_internal_SHIPPING=Representative following-up shipping
@ -151,6 +153,7 @@ PDFEdisonDescription=A simple order model
 PDFProformaDescription=A complete Proforma invoice template
 CreateInvoiceForThisCustomer=Bill orders
 CreateInvoiceForThisSupplier=Bill orders
+CreateInvoiceForThisReceptions=Bill receptions
 NoOrdersToInvoice=No orders billable
 CloseProcessedOrdersAutomatically=Classify "Processed" all selected orders.
 OrderCreation=Order creation
--- a/htdocs/langs/ar_IQ/other.lang
+++ b/htdocs/langs/ar_IQ/other.lang
@ -35,6 +35,9 @@ OnlyOneFieldForXAxisIsPossible=Only 1 field is currently possible as X-Axis. Onl
 AtLeastOneMeasureIsRequired=At least 1 field for measure is required
 AtLeastOneXAxisIsRequired=At least 1 field for X-Axis is required
 LatestBlogPosts=Latest Blog Posts
+notiftouser=To users
+notiftofixedemail=To fixed mail
+notiftouserandtofixedemail=To user and fixed mail
 Notify_ORDER_VALIDATE=Sales order validated
 Notify_ORDER_SENTBYMAIL=Sales order sent by mail
 Notify_ORDER_SUPPLIER_SENTBYMAIL=Purchase order sent by email
@ -291,3 +294,7 @@ PopuCom=Products/Services by popularity in Orders
 ProductStatistics=Products/Services Statistics
 NbOfQtyInOrders=Qty in orders
 SelectTheTypeOfObjectToAnalyze=Select an object to view its statistics...
+
+ConfirmBtnCommonContent = Are you sure you want to "%s" ?
+ConfirmBtnCommonTitle = Confirm your action
+CloseDialog = Close
--- a/htdocs/langs/ar_IQ/partnership.lang
+++ b/htdocs/langs/ar_IQ/partnership.lang
@ -77,6 +77,10 @@ YourPartnershipRefusedContent=We inform you that your partnership request has be
 YourPartnershipAcceptedContent=We inform you that your partnership request has been accepted.
 YourPartnershipCanceledContent=We inform you that your partnership has been canceled.

+CountLastUrlCheckError=Number of errors for last URL check
+LastCheckBacklink=Date of last URL check
+ReasonDeclineOrCancel=Decline reason
+
 #
 # Status
 #
--- a/htdocs/langs/ar_IQ/printing.lang
+++ b/htdocs/langs/ar_IQ/printing.lang
@ -1,10 +1,10 @@
 # Dolibarr language file - Source file is en_US - printing
-Module64000Name=Direct Printing
-Module64000Desc=Enable Direct Printing System
-PrintingSetup=Setup of Direct Printing System
-PrintingDesc=This module adds a Print button to various modules to allow documents to be printed directly to a printer without needing to open the document in another application.
-MenuDirectPrinting=Direct Printing jobs
-DirectPrint=Direct print
+Module64000Name=One click Printing
+Module64000Desc=Enable One click Printing System
+PrintingSetup=Setup of One click Printing System
+PrintingDesc=This module adds a Print button to various modules to allow documents to be printed directly to a printer with no need to open the document into another application.
+MenuDirectPrinting=One click Printing jobs
+DirectPrint=One click Print
 PrintingDriverDesc=Configuration variables for printing driver.
 ListDrivers=List of drivers
 PrintTestDesc=List of Printers.
--- a/htdocs/langs/ar_IQ/productbatch.lang
+++ b/htdocs/langs/ar_IQ/productbatch.lang
@ -37,7 +37,8 @@ ManufacturingDate=Manufacturing date
 DestructionDate=Destruction date
 FirstUseDate=First use date
 QCFrequency=Quality control frequency (in days)
-
+ShowAllLots=Show all lots
+HideLots=Hide lots
 #Traceability - qc status
 OutOfOrder=Out of order
 InWorkingOrder=In working order
--- a/htdocs/langs/ar_IQ/products.lang
+++ b/htdocs/langs/ar_IQ/products.lang
@ -75,6 +75,7 @@ SellingPriceTTC=Selling price (inc. tax)
 SellingMinPriceTTC=Minimum Selling price (inc. tax)
 CostPriceDescription=This price field (excl. tax) can be used to capture the average amount this product costs to your company. It may be any price you calculate yourself, for example, from the average buying price plus average production and distribution cost.
 CostPriceUsage=This value could be used for margin calculation.
+ManufacturingPrice=Manufacturing price
 SoldAmount=Sold amount
 PurchasedAmount=Purchased amount
 NewPrice=New price
@ -315,7 +316,7 @@ LastUpdated=Latest update
 CorrectlyUpdated=Correctly updated
 PropalMergePdfProductActualFile=Files use to add into PDF Azur are/is
 PropalMergePdfProductChooseFile=Select PDF files
-IncludingProductWithTag=Include products/services with tag
+IncludingProductWithTag=Including products/services with the tag
 DefaultPriceRealPriceMayDependOnCustomer=Default price, real price may depend on customer
 WarningSelectOneDocument=Please select at least one document
 DefaultUnitToShow=Unit
@ -341,7 +342,7 @@ ProductSheet=Product sheet
 ServiceSheet=Service sheet
 PossibleValues=Possible values
 GoOnMenuToCreateVairants=Go on menu %s - %s to prepare attribute variants (like colors, size, ...)
-UseProductFournDesc=Add a feature to define the descriptions of products defined by the vendors in addition to descriptions for customers
+UseProductFournDesc=Add a feature to define the product description defined by the vendors (for each vendor reference) in addition to the description for customers
 ProductSupplierDescription=Vendor description for the product
 UseProductSupplierPackaging=Use packaging on supplier prices (recalculate quantities according to packaging set on supplier price when adding/updating line in supplier documents)
 PackagingForThisProduct=Packaging
@ -397,5 +398,13 @@ ActionAvailableOnVariantProductOnly=Action only available on the variant of prod
 ProductsPricePerCustomer=Product prices per customers
 ProductSupplierExtraFields=Additional Attributes (Supplier Prices)
 DeleteLinkedProduct=Delete the child product linked to the combination
+AmountUsedToUpdateWAP=Amount to use to update the Weighted Average Price
 PMPValue=Weighted average price
 PMPValueShort=WAP
+mandatoryperiod=Mandatory periods
+mandatoryPeriodNeedTobeSet=Attention periods not entered and mandatory
+mandatoryPeriodNeedTobeSetMsgValidate=A service requires a start and end period
+mandatoryHelper=Message to the user on the need to enter a start date and an end date on a service when creating / validating an invoice, commercial proposal, sales order. <br> This action is not blocking in the process of confirmation
+DefaultBOM=Default BOM
+DefaultBOMDesc=The default BOM recommended to use to manufacture this product. This field can be set only if nature of product is '%s'.
+Rank=Rank
--- a/htdocs/langs/ar_IQ/projects.lang
+++ b/htdocs/langs/ar_IQ/projects.lang
@ -140,6 +140,7 @@ NoTasks=No tasks for this project
 LinkedToAnotherCompany=Linked to other third party
 TaskIsNotAssignedToUser=Task not assigned to user. Use button '<strong>%s</strong>' to assign task now.
 ErrorTimeSpentIsEmpty=Time spent is empty
+TimeRecordingRestrictedToNMonthsBack=Time recording is restricted to %s months back
 ThisWillAlsoRemoveTasks=This action will also delete all tasks of project (<b>%s</b> tasks at the moment) and all inputs of time spent.
 IfNeedToUseOtherObjectKeepEmpty=If some objects (invoice, order, ...), belonging to another third party, must be linked to the project to create, keep this empty to have the project being multi third parties.
 CloneTasks=Clone tasks
@ -241,6 +242,7 @@ LatestModifiedProjects=Latest %s modified projects
 OtherFilteredTasks=Other filtered tasks
 NoAssignedTasks=No assigned tasks found (assign project/tasks to the current user from the top select box to enter time on it)
 ThirdPartyRequiredToGenerateInvoice=A third party must be defined on project to be able to invoice it.
+ThirdPartyRequiredToGenerateInvoice=A third party must be defined on project to be able to invoice it.
 ChooseANotYetAssignedTask=Choose a task not yet assigned to you
 # Comments trans
 AllowCommentOnTask=Allow user comments on tasks
@ -252,10 +254,12 @@ SendProjectRef=Information project %s
 ModuleSalaryToDefineHourlyRateMustBeEnabled=Module 'Salaries' must be enabled to define employee hourly rate to have time spent valorized
 NewTaskRefSuggested=Task ref already used, a new task ref is required
 TimeSpentInvoiced=Time spent billed
+TimeSpentForIntervention=Time spent
 TimeSpentForInvoice=Time spent
 OneLinePerUser=One line per user
 ServiceToUseOnLines=Service to use on lines
 InvoiceGeneratedFromTimeSpent=Invoice %s has been generated from time spent on project
+InterventionGeneratedFromTimeSpent=Intervention %s has been generated from time spent on project
 ProjectBillTimeDescription=Check if you enter timesheet on tasks of project AND you plan to generate invoice(s) from the timesheet to bill the customer of the project (do not check if you plan to create invoice that is not based on entered timesheets). Note: To generate invoice, go on tab 'Time spent' of the project and select lines to include.
 ProjectFollowOpportunity=Follow opportunity
 ProjectFollowTasks=Follow tasks or time spent
@ -264,10 +268,13 @@ UsageOpportunity=Usage: Opportunity
 UsageTasks=Usage: Tasks
 UsageBillTimeShort=Usage: Bill time
 InvoiceToUse=Draft invoice to use
+InterToUse=Draft intervention to use
 NewInvoice=New invoice
+NewInter=New intervention
 OneLinePerTask=One line per task
 OneLinePerPeriod=One line per period
 OneLinePerTimeSpentLine=One line for each time spent declaration
+AddDetailDateAndDuration=With date and duration into line description
 RefTaskParent=Ref. Parent Task
 ProfitIsCalculatedWith=Profit is calculated using
 AddPersonToTask=Add also to tasks
@ -275,3 +282,5 @@ UsageOrganizeEvent=Usage: Event Organization
 PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=Classify project as closed when all its tasks are completed (100%% progress)
 PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with all tasks at 100 %% progress won't be affected: you will have to close them manually. This option only affects open projects.
 SelectLinesOfTimeSpentToInvoice=Select lines of time spent that are unbilled, then bulk action "Generate Invoice" to bill them
+ProjectTasksWithoutTimeSpent=Project tasks without time spent
+FormForNewLeadDesc=Thanks to fill the following form to contact us. You can also send us an email directly to <b>%s</b>.
--- a/htdocs/langs/ar_IQ/propal.lang
+++ b/htdocs/langs/ar_IQ/propal.lang
@ -89,4 +89,11 @@ IdProposal=Proposal ID
 IdProduct=Product ID
 PrParentLine=Proposal Parent Line
 LineBuyPriceHT=Buy Price Amount net of tax for line
-
+SignPropal=Accept proposal
+RefusePropal=Refuse proposal
+Sign=Sign
+PropalAlreadySigned=Proposal already accepted
+PropalAlreadyRefused=Proposal already refused
+PropalSigned=Proposal accepted
+PropalRefused=Proposal refused
+ConfirmRefusePropal=Are you sure you want to refuse this commercial proposal?
--- a/htdocs/langs/ar_IQ/receptions.lang
+++ b/htdocs/langs/ar_IQ/receptions.lang
@ -36,7 +36,7 @@ StatsOnReceptionsOnlyValidated=Statistics conducted on receptions only validated
 SendReceptionByEMail=Send reception by email
 SendReceptionRef=Submission of reception %s
 ActionsOnReception=Events on reception
-ReceptionCreationIsDoneFromOrder=For the moment, creation of a new reception is done from the order card.
+ReceptionCreationIsDoneFromOrder=For the moment, creation of a new reception is done from the Purchase Order record.
 ReceptionLine=Reception line
 ProductQtyInReceptionAlreadySent=Product quantity from open sales order already sent
 ProductQtyInSuppliersReceptionAlreadyRecevied=Product quantity from open supplier order already received
@ -45,3 +45,4 @@ ReceptionsNumberingModules=Numbering module for receptions
 ReceptionsReceiptModel=Document templates for receptions
 NoMorePredefinedProductToDispatch=No more predefined products to dispatch
 ReceptionExist=A reception exists
+ByingPrice=Bying price
--- a/htdocs/langs/ar_IQ/salaries.lang
+++ b/htdocs/langs/ar_IQ/salaries.lang
@ -6,6 +6,7 @@ CREATE_NEW_SALARY_WITHOUT_AUTO_PAYMENT=By default, leave empty the option "Autom
 Salary=Salary
 Salaries=Salaries
 NewSalary=New salary
+AddSalary=Add salary
 NewSalaryPayment=New salary card
 AddSalaryPayment=Add salary payment
 SalaryPayment=Salary payment
@ -22,3 +23,4 @@ AllSalaries=All salaries
 SalariesStatistics=Salary statistics
 SalariesAndPayments=Salaries and payments
 ConfirmDeleteSalaryPayment=Do you want to delete this salary payment ?
+FillFieldFirst=Fill employee field first
--- a/htdocs/langs/ar_IQ/sendings.lang
+++ b/htdocs/langs/ar_IQ/sendings.lang
@ -53,7 +53,7 @@ SendShippingByEMail=Send shipment by email
 SendShippingRef=Submission of shipment %s
 ActionsOnShipping=Events on shipment
 LinkToTrackYourPackage=Link to track your package
-ShipmentCreationIsDoneFromOrder=For the moment, creation of a new shipment is done from the order card.
+ShipmentCreationIsDoneFromOrder=For the moment, creation of a new shipment is done from the Sales Order record.
 ShipmentLine=Shipment line
 ProductQtyInCustomersOrdersRunning=Product quantity from open sales orders
 ProductQtyInSuppliersOrdersRunning=Product quantity from open purchase orders
--- a/htdocs/langs/ar_IQ/stocks.lang
+++ b/htdocs/langs/ar_IQ/stocks.lang
@ -12,9 +12,9 @@ AddWarehouse=Create warehouse
 AddOne=Add one
 DefaultWarehouse=Default warehouse
 WarehouseTarget=Target warehouse
-ValidateSending=Delete sending
-CancelSending=Cancel sending
-DeleteSending=Delete sending
+ValidateSending=Confirm shipment
+CancelSending=Cancel shipment
+DeleteSending=Delete shipment
 Stock=Stock
 Stocks=Stocks
 MissingStocks=Missing stocks
@ -60,9 +60,10 @@ EnhancedValueOfWarehouses=Warehouses value
 UserWarehouseAutoCreate=Create a user warehouse automatically when creating a user
 AllowAddLimitStockByWarehouse=Manage also value for minimum and desired stock per pairing (product-warehouse) in addition to the value for minimum and desired stock per product
 RuleForWarehouse=Rule for warehouses
-WarehouseAskWarehouseOnThirparty=Set a warehouse on third-party
+WarehouseAskWarehouseOnThirparty=Set a warehouse on Third-parties
 WarehouseAskWarehouseDuringPropal=Set a warehouse on Commercial proposals
-WarehouseAskWarehouseDuringOrder=Set a warehouse on Sale orders
+WarehouseAskWarehouseDuringOrder=Set a warehouse on Sales Orders
+WarehouseAskWarehouseDuringProject=Set a warehouse on Projects
 UserDefaultWarehouse=Set a warehouse on Users
 MainDefaultWarehouse=Default warehouse
 MainDefaultWarehouseUser=Use a default warehouse for each user
@ -167,8 +168,8 @@ MovementTransferStock=Stock transfer of product %s into another warehouse
 InventoryCodeShort=Inv./Mov. code
 NoPendingReceptionOnSupplierOrder=No pending reception due to open purchase order
 ThisSerialAlreadyExistWithDifferentDate=This lot/serial number (<strong>%s</strong>) already exists but with different eatby or sellby date (found <strong>%s</strong> but you enter <strong>%s</strong>).
-OpenAll=Open for all actions
-OpenInternal=Open only for internal actions
+OpenAnyMovement=Open (all movement)
+OpenInternal=Open (only internal movement)
 UseDispatchStatus=Use a dispatch status (approve/refuse) for product lines on purchase order reception
 OptionMULTIPRICESIsOn=Option "several prices per segment" is on. It means a product has several selling price so value for sell can't be calculated
 ProductStockWarehouseCreated=Stock limit for alert and desired optimal stock correctly created
@ -256,3 +257,10 @@ AutofillWithExpected=Fill real quantity with expected quantity
 ShowAllBatchByDefault=By default, show batch details on product "stock" tab
 CollapseBatchDetailHelp=You can set batch detail default display in stocks module configuration
 FieldCannotBeNegative=Field "%s" cannot be negative
+ErrorWrongBarcodemode=Unknown Barcode mode
+ProductDoesNotExist=Product does not exist
+ErrorSameBatchNumber=Same batch number found in inventory list
+ProductBatchDoesNotExist=Product with batch/serial does not exist
+ProductBarcodeDoesNotExist=Product with barcode does not exist
+WarehouseId=Warehouse ID
+WarehouseRef=Warehouse Ref
--- a/htdocs/langs/ar_IQ/ticket.lang
+++ b/htdocs/langs/ar_IQ/ticket.lang
@ -45,6 +45,8 @@ TicketSeverityShortNORMAL=Normal
 TicketSeverityShortHIGH=High
 TicketSeverityShortBLOCKING=Critical, Blocking

+TicketCategoryShortOTHER=Other
+
 ErrorBadEmailAddress=Field '%s' incorrect
 MenuTicketMyAssign=My tickets
 MenuTicketMyAssignNonClosed=My open tickets
@ -66,7 +68,7 @@ NeedMoreInformation=Waiting for reporter feedback
 NeedMoreInformationShort=Waiting for feedback
 Answered=Answered
 Waiting=Waiting
-Closed=Closed
+SolvedClosed=Solved
 Deleted=Deleted

 # Dict
@ -180,15 +182,17 @@ MessageSuccessfullyAdded=Ticket added
 TicketMessageSuccessfullyAdded=Message successfully added
 TicketMessagesList=Message list
 NoMsgForThisTicket=No message for this ticket
-Properties=Classification
+TicketProperties=Classification
 LatestNewTickets=Latest %s newest tickets (not read)
 TicketSeverity=Severity
 ShowTicket=See ticket
 RelatedTickets=Related tickets
 TicketAddIntervention=Create intervention
-CloseTicket=Close ticket
-CloseATicket=Close a ticket
+CloseTicket=Close|Solve ticket
+AbandonTicket=Abandon ticket
+CloseATicket=Close|Solve a ticket
 ConfirmCloseAticket=Confirm ticket closing
+ConfirmAbandonTicket=Do you confirm the closing of the ticket to status 'Abandonned'
 ConfirmDeleteTicket=Please confirm ticket deleting
 TicketDeletedSuccess=Ticket deleted with success
 TicketMarkedAsClosed=Ticket marked as closed
@ -317,3 +321,4 @@ BoxNumberOfTicketByDay=Number of new tickets by day
 BoxNewTicketVSClose=Number of today's new tickets versus today's closed tickets
 TicketCreatedToday=Ticket created today
 TicketClosedToday=Ticket closed today
+KMFoundForTicketGroup=We found topics and FAQs that may answers your question, thanks to check them before submitting the ticket
--- a/htdocs/langs/ar_IQ/trips.lang
+++ b/htdocs/langs/ar_IQ/trips.lang
@ -90,7 +90,6 @@ DATE_REFUS=Deny date
 DATE_SAVE=Validation date
 DATE_CANCEL=Cancelation date
 DATE_PAIEMENT=Payment date
-BROUILLONNER=Reopen
 ExpenseReportRef=Ref. expense report
 ValidateAndSubmit=Validate and submit for approval
 ValidatedWaitingApproval=Validated (waiting for approval)
@ -113,7 +112,7 @@ ConfirmCloneExpenseReport=Are you sure you want to clone this expense report ?
 ExpenseReportsIk=Configuration of mileage charges
 ExpenseReportsRules=Expense report rules
 ExpenseReportIkDesc=You can modify the calculation of kilometers expense by category and range who they are previously defined. <b>d</b> is the distance in kilometers
-ExpenseReportRulesDesc=You can create or update any rules of calculation. This part will be used when user will create a new expense report
+ExpenseReportRulesDesc=You can define max amount rules for expense reports. These rules will be applied when a new expense is added to an expense report
 expenseReportOffset=Offset
 expenseReportCoef=Coefficient
 expenseReportTotalForFive=Example with <u>d</u> = 5
@ -128,19 +127,19 @@ ExpenseReportDomain=Domain to apply
 ExpenseReportLimitOn=Limit on
 ExpenseReportDateStart=Date start
 ExpenseReportDateEnd=Date end
-ExpenseReportLimitAmount=Limite amount
-ExpenseReportRestrictive=Restrictive
+ExpenseReportLimitAmount=Max amount
+ExpenseReportRestrictive=Exceeding forbidden
 AllExpenseReport=All type of expense report
 OnExpense=Expense line
 ExpenseReportRuleSave=Expense report rule saved
 ExpenseReportRuleErrorOnSave=Error: %s
 RangeNum=Range %d
-ExpenseReportConstraintViolationError=Constraint violation id [%s]: %s  is superior to %s %s
+ExpenseReportConstraintViolationError=Max amount exceeded (rule %s): %s is higher than %s (Exceeding forbidden)
 byEX_DAY=by day (limitation to %s)
 byEX_MON=by month (limitation to %s)
 byEX_YEA=by year (limitation to %s)
 byEX_EXP=by line (limitation to %s)
-ExpenseReportConstraintViolationWarning=Constraint violation id [%s]: %s  is superior to %s %s
+ExpenseReportConstraintViolationWarning=Max amount exceeded (rule %s): %s is higher than %s (Exceeding authorized)
 nolimitbyEX_DAY=by day (no limitation)
 nolimitbyEX_MON=by month (no limitation)
 nolimitbyEX_YEA=by year (no limitation)
--- a/htdocs/langs/ar_IQ/users.lang
+++ b/htdocs/langs/ar_IQ/users.lang
@ -62,8 +62,8 @@ ListOfUsersInGroup=List of users in this group
 ListOfGroupsForUser=List of groups for this user
 LinkToCompanyContact=Link to third party / contact
 LinkedToDolibarrMember=Link to member
-LinkedToDolibarrUser=Link to Dolibarr user
-LinkedToDolibarrThirdParty=Link to Dolibarr third party
+LinkedToDolibarrUser=Link to user
+LinkedToDolibarrThirdParty=Link to third party
 CreateDolibarrLogin=Create a user
 CreateDolibarrThirdParty=Create a third party
 LoginAccountDisableInDolibarr=Account disabled in Dolibarr.
--- a/htdocs/langs/ar_IQ/withdrawals.lang
+++ b/htdocs/langs/ar_IQ/withdrawals.lang
@ -133,8 +133,7 @@ SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=Execution date
 CreateForSepa=Create direct debit file
-ICS=Creditor Identifier CI for direct debit
-ICSTransfer=Creditor Identifier CI for bank transfer
+ICS=Creditor Identifier - ICS
 END_TO_END="EndToEndId" SEPA XML tag - Unique id assigned per transaction
 USTRD="Unstructured" SEPA XML tag
 ADDDAYS=Add days to Execution Date
--- a/htdocs/langs/ar_IQ/workflow.lang
+++ b/htdocs/langs/ar_IQ/workflow.lang
@ -13,6 +13,7 @@ descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposal as b
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source sales order as billed when customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked order)
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source sales order as billed when customer invoice is set to paid (and if the amount of the invoice is the same as the total amount of the linked order)
 descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source sales order as shipped when a shipment is validated (and if the quantity shipped by all shipments is the same as in the order to update)
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING_CLOSED=Classify linked source sales order as shipped when a shipment is closed (and if the quantity shipped by all shipments is the same as in the order to update)
 # Autoclassify purchase order
 descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal as billed when vendor invoice is validated (and if the amount of the invoice is the same as the total amount of the linked proposal)
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order as billed when vendor invoice is validated (and if the amount of the invoice is the same as the total amount of the linked order)
--- a/htdocs/langs/ar_SA/accountancy.lang
+++ b/htdocs/langs/ar_SA/accountancy.lang
@ -37,8 +37,8 @@ OtherInfo=معلومات اخرى
 DeleteCptCategory=إزالة حساب المحاسبة من المجموعة
 ConfirmDeleteCptCategory=هل أنت متأكد أنك تريد إزالة هذا الحساب المحاسبي من مجموعة حسابات المحاسبة؟
 JournalizationInLedgerStatus=حالة اليوميات
-AlreadyInGeneralLedger=تم نقله بالفعل في دفاتر اليومية المحاسبية ودفتر الأستاذ
-NotYetInGeneralLedger=لم يتم نقله الى دفاتر اليومية المحاسبية ودفتر الأستاذ
+AlreadyInGeneralLedger=Already transferred to accounting journals and ledger
+NotYetInGeneralLedger=Not yet transferred to accouting journals and ledger
 GroupIsEmptyCheckSetup=المجموعة فارغة ، تحقق من إعداد مجموعة المحاسبة المخصصة
 DetailByAccount=إظهار التفاصيل حسب الحساب
 AccountWithNonZeroValues=الحسابات ذات القيم غير الصفرية
@ -48,7 +48,8 @@ CountriesNotInEEC=ليس ضمن دول الاتحاد الأوروبي
 CountriesInEECExceptMe=البلدان في المجموعة الاقتصادية الأوروبية باستثناء %s
 CountriesExceptMe=جميع الدول باستثناء %s
 AccountantFiles=تصدير مستندات المصدر
-ExportAccountingSourceDocHelp=باستخدام هذه الأداة ، يمكنك تصدير الأحداث  (القائمة وملفات PDF) التي تم استخدامها لإنشاء المحاسبة الخاصة بك. لتصدير دفاتر اليومية الخاصة بك ، استخدم إدخال القائمة %s - %s.
+ExportAccountingSourceDocHelp=باستخدام هذه الأداة ، يمكنك تصدير الأحداث  (في شكل قائمة او بصيغة ملفات متنقلة ) التي تم استخدامها لإنشاء قيودك المحاسبية .
+ExportAccountingSourceDocHelp2=لتصدير دفاترك المحاسبية ، إستخدم القائمة %s - %s .
 VueByAccountAccounting=عرض حسب الحساب المحاسبي
 VueBySubAccountAccounting=عرض حسب الحساب المحاسبة الفرعي

@ -245,9 +246,9 @@ DescThirdPartyReport=راجع هنا قائمة العملاء والموردي
 ListAccounts=قائمة الحسابات المحاسبية
 UnknownAccountForThirdparty=حساب طرف ثالث غير معروف. سوف نستخدم %s
 UnknownAccountForThirdpartyBlocking=حساب طرف ثالث غير معروف. خطأ في المنع
-ThirdpartyAccountNotDefinedOrThirdPartyUnknown=حساب طرف ثالث غير محدد أو طرف ثالث غير معروف. سوف نستخدم %s
+ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Subledger account not defined or third party or user unknown. We will use %s
 ThirdpartyAccountNotDefinedOrThirdPartyUnknownSubledgerIgnored=طرف ثالث غير معروف ودفتر الأستاذ الفرعي غير محدد في الدفعة. سنبقي قيمة حساب دفتر الأستاذ الفرعي فارغة.
-ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=حساب طرف ثالث غير محدد أو طرف ثالث غير معروف. خطأ في المنع.
+ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Subledger account not defined or third party or user unknown. Blocking error.
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=حساب طرف ثالث وحساب قيد الانتظار غير معرّفين. خطأ في المنع
 PaymentsNotLinkedToProduct=الدفع غير مرتبط بأي منتج / خدمة
 OpeningBalance=الرصيد الافتتاحي
@ -297,7 +298,7 @@ NoNewRecordSaved=لا مزيد من التسجيل لليوميات
 ListOfProductsWithoutAccountingAccount=قائمة المنتجات غير مرتبطة بأي حساب
 ChangeBinding=تغيير الربط
 Accounted=حسب في دفتر الأستاذ
-NotYetAccounted=Not yet accounted in the ledger
+NotYetAccounted=Not yet transferred to accounting
 ShowTutorial=عرض البرنامج التعليمي
 NotReconciled=لم يتم تسويتة
 WarningRecordWithoutSubledgerAreExcluded=تحذير ، كل العمليات التي لم يتم تحديد حساب دفتر الأستاذ الفرعي لها تتم تصفيتها واستبعادها من طريقة العرض هذه
@ -328,8 +329,8 @@ ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=تعطيل الربط والتحويل
 ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=تعطيل الربط والتحويل في المحاسبة على تقارير المصروفات (لن يتم أخذ تقارير المصروفات في الاعتبار في المحاسبة)

 ## Export
-NotifiedExportDate=Notified export date (modification of the entries will not be possible)
-NotifiedValidationDate=Validation of the entries (modification or deletion of the entries will not be possible)
+NotifiedExportDate=Flag exported lines as exported (modification of the lines will not be possible)
+NotifiedValidationDate=Validate the exported entries (modification or deletion of the lines will not be possible)
 ConfirmExportFile=Confirmation of the generation of the accounting export file ?
 ExportDraftJournal=تصدير مسودة دفتر اليومية
 Modelcsv=نموذج التصدير
@ -338,11 +339,11 @@ Modelcsv_normal=تصدير كلاسيكي
 Modelcsv_CEGID=Export for CEGID Expert Comptabilité
 Modelcsv_COALA=Export for Sage Coala
 Modelcsv_bob50=Export for Sage BOB 50
-Modelcsv_ciel=Export for Sage Ciel Compta or Compta Evolution
+Modelcsv_ciel=Export for Sage50, Ciel Compta or Compta Evo. (Format XIMPORT)
 Modelcsv_quadratus=Export for Quadratus QuadraCompta
 Modelcsv_ebp=Export for EBP
 Modelcsv_cogilog=Export for Cogilog
-Modelcsv_agiris=Export for Agiris
+Modelcsv_agiris=Export for Agiris Isacompta
 Modelcsv_LDCompta=Export for LD Compta (v9) (Test)
 Modelcsv_LDCompta10=Export for LD Compta (v10 & higher)
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
@ -350,9 +351,10 @@ Modelcsv_configurable=Export CSV Configurable
 Modelcsv_FEC=Export FEC
 Modelcsv_FEC2=Export FEC (With dates generation writing / document reversed)
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
-Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
+Modelcsv_winfic=Export for Winfic - eWinfic - WinSis Compta
 Modelcsv_Gestinumv3=Export for Gestinum (v3)
-Modelcsv_Gestinumv5Export for Gestinum (v5)
+Modelcsv_Gestinumv5=Export for Gestinum (v5)
+Modelcsv_charlemagne=Export for Aplim Charlemagne
 ChartofaccountsId=معرف دليل الحسابات

 ## Tools - Init accounting account on product / service
@ -417,8 +419,8 @@ FECFormatSubledgerAccountLabel=Subledger account number (CompAuxLib)
 FECFormatPieceRef=Piece ref (PieceRef)
 FECFormatPieceDate=Piece date creation (PieceDate)
 FECFormatLabelOperation=Label operation (EcritureLib)
-FECFormatDebit=Debit (Debit)
-FECFormatCredit=Credit (Credit)
+FECFormatDebit=مدين (مدين)
+FECFormatCredit=دائن (دائن)
 FECFormatReconcilableCode=Reconcilable code (EcritureLet)
 FECFormatReconcilableDate=Reconcilable date (DateLet)
 FECFormatValidateDate=Piece date validated (ValidDate)
@ -430,4 +432,4 @@ WarningReportNotReliable=تحذير ، هذا التقرير لا يستند إ
 ExpenseReportJournal=تقرير دفتر المصاريف
 InventoryJournal=دفتر الجرد

-NAccounts=%s accounts
+NAccounts=%s حساباً
--- a/htdocs/langs/ar_SA/admin.lang
+++ b/htdocs/langs/ar_SA/admin.lang
@ -75,7 +75,7 @@ Dictionary=قواميس
 ErrorReservedTypeSystemSystemAuto=القيمة 'system' و 'systemauto' لهذا النوع محفوظ. يمكنك إستخدام 'user' كقيمة لإضافة السجل الخاص بك
 ErrorCodeCantContainZero=الكود لا يمكن أن يحتوي على القيمة 0
 DisableJavascript=تعطيل عمليات الجافا و الأجاكس
-DisableJavascriptNote=ملاحظة: لغرض الاختبار أو التصحيح. لتحسين أداء الشخص المكفوف أو المتصفحات النصية ، قد تفضل استخدام الإعداد في ملف تعريف المستخدم
+DisableJavascriptNote=Note: For test or debug purpose only. For optimization for blind person or text browsers, you may prefer to use the setup on the profile of user
 UseSearchToSelectCompanyTooltip=أيضا إذا كان لديك عدد كبير من الأحزاب الثالثة (> 100 000)، يمكنك زيادة السرعة عن طريق وضع COMPANY_DONOTSEARCH_ANYWHERE ثابت إلى 1 في الإعداد، <أخرى. وبعد ذلك البحث أن يقتصر على بداية السلسلة.
 UseSearchToSelectContactTooltip=أيضا إذا كان لديك عدد كبير من الأحزاب الثالثة (> 100 000)، يمكنك زيادة السرعة عن طريق وضع CONTACT_DONOTSEARCH_ANYWHERE ثابت إلى 1 في الإعداد، <أخرى. وبعد ذلك البحث أن يقتصر على بداية السلسلة.
 DelaiedFullListToSelectCompany=انتظر حتى يتم الضغط على مفتاح قبل تحميل محتوى قائمة التحرير والسرد الخاصة بالأطراف الثالثة ، <br> قد يؤدي ذلك إلى زيادة الأداء إذا كان لديك عدد كبير من الأطراف الثالثة ، ولكنه أقل ملاءمة.
@ -85,6 +85,7 @@ NumberOfBytes=Number of Bytes
 SearchString=Search string
 NotAvailableWhenAjaxDisabled=غير متوفر عندما يكون أجاكس معطلاً
 AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a project linked to another third party
+TimesheetPreventAfterFollowingMonths=Prevent recording time spent after the following number of months
 JavascriptDisabled=الجافا سكربت معطل
 UsePreviewTabs=إستخدم زر المعاينة
 ShowPreview=آظهر المعاينة
@ -117,6 +118,7 @@ MultiCurrencySetup=إعدادات تعدد العملات
 MenuLimits=الحدود و الدقة
 MenuIdParent=رمز القائمة العليا
 DetailMenuIdParent=رمز القائمة العليا (فراغ للقائمة العليا)
+ParentID=Parent ID
 DetailPosition=رتب الرقم لتعريف موقع القائمة
 AllMenus=الكل
 NotConfigured=الوحدة النمطية | التطبيق غير مهيأ
@ -131,7 +133,6 @@ IdModule=معرف الوحدة
 IdPermissions=ضوابط ID
 LanguageBrowserParameter=الوحدة %s
 LocalisationDolibarrParameters=عوامل محلية او مناطقية
-ClientTZ=المنطقة الزمنية للعميل (المستخدم)
 ClientHour=وقت العميل (المستخدم)
 OSTZ=OS المنطقة الزمنية الخادم
 PHPTZ=المنطقة الزمنية خادم PHP
@ -159,7 +160,7 @@ Purge=أحذف
 PurgeAreaDesc=تسمح لك هذه الصفحة بحذف كل الملفات التي بنيت أو تم تخزينها بواسطة دوليبار (الملفات المؤقتة ، أو كافة الملفات في المجلد <b>%s</b>) استخدام هذه الميزة ليست ضرورية. هذه الخدمة مقدمة للمستخدمين الذين يستخدمون برنامج دوليبار على خادم لا يوفر لهم صلاحيات حذف الملفات التي أنشئت من قبل خادم الويب.
 PurgeDeleteLogFile=Delete log files, including <b>%s</b> defined for Syslog module (no risk of losing data)
 PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Parameter can be 'tempfilesold', 'logfiles' or both 'tempfilesold+logfiles'. Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
-PurgeDeleteTemporaryFilesShort=Delete log and temporary files
+PurgeDeleteTemporaryFilesShort=Delete log and temporary files (no risk of losing data)
 PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory: <b>%s</b>.<br>This will delete all generated documents related to elements (third parties, invoices etc...), files uploaded into the ECM module, database backup dumps and temporary files.
 PurgeRunNow=إحذف الآن
 PurgeNothingToDelete=No directory or files to delete.
@ -209,6 +210,7 @@ FeatureAvailableOnlyOnStable=Feature only available on official stable versions
 BoxesDesc=البريمجات هي المكونات البرمجية التي تُظهر بعض المعلومات في بعض الصفحات. يمكنك اختيار إظهار أو إخفائها بإختيار الصفحات المطلوبة و الضغط على 'تنشيط', او بالضغط على الزر الآخر لتعطيلها.
 OnlyActiveElementsAreShown=فقط العناصر من <a href="%s">النماذج المفعلة </a> سوف تظهر.
 ModulesDesc=The modules/applications determine which features are available in the software. Some modules require permissions to be granted to users after activating the module. Click the on/off button <span class="small valignmiddle">%s</span> of each module to enable or disable a module/application.
+ModulesDesc2=Click the wheel button <span class="small valignmiddle">%s</span> to configure the module/application.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
 ModulesDeployDesc=If permissions on your file system allow it, you can use this tool to deploy an external module. The module will then be visible on the tab <strong>%s</strong>.
 ModulesMarketPlaces=Find external app/modules
@ -277,6 +279,7 @@ SpaceX=Space X
 SpaceY=Space Y
 FontSize=Font size
 Content=Content
+ContentForLines=Content to display for each product or service (from variable __LINES__ of Content)
 NoticePeriod=فترة إشعار
 NewByMonth=New by month
 Emails=رسائل البريد الإلكترونية
@ -372,8 +375,8 @@ UMask=معلمة جديدة UMask صورة يونيكس / لينكس / بي إس
 UMaskExplanation=تسمح لك هذه المعلمة لتحديد الاذونات التي حددها تقصير من الملفات التي أنشأتها Dolibarr على الخادم (خلال تحميلها على سبيل المثال). <br> يجب أن يكون ثمانية القيمة (على سبيل المثال ، 0666 وسائل القراءة والكتابة للجميع). <br> م شمال شرق paramètre سرت sous الامم المتحدة لتقييم الأداء ويندوز serveur.
 SeeWikiForAllTeam=Take a look at the Wiki page for a list of contributors and their organization
 UseACacheDelay= التخزين المؤقت للتأخير في الرد على الصادرات ثانية (0 فارغة أو لا مخبأ)
-DisableLinkToHelpCenter=الاختباء وصلة <b>"هل تحتاج إلى مساعدة أو دعم"</b> على صفحة تسجيل الدخول
-DisableLinkToHelp=إخفاء تصل إلى التعليمات الفورية <b>"٪ ق"</b>
+DisableLinkToHelpCenter=Hide the link "<b>Need help or support</b>" on the login page
+DisableLinkToHelp=Hide the link to the online help "<b>%s</b>"
 AddCRIfTooLong=There is no automatic text wrapping, text that is too long will not display on documents. Please add carriage returns in the text area if needed.
 ConfirmPurge=Are you sure you want to execute this purge?<br>This will permanently delete all your data files with no way to restore them (ECM files, attached files...).
 MinLength=الحد الأدني لمدة
@ -495,9 +498,10 @@ WarningPHPMail=WARNING: The setup to send emails from the application is using t
 WarningPHPMailA=- Using the server of the Email Service Provider increases the trustability of your email, so it increases the deliverablity without being flagged as SPAM
 WarningPHPMailB=- Some Email Service Providers (like Yahoo) do not allow you to send an email from another server than their own server. Your current setup uses the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not theirs, so few of your sent Emails may not be accepted for delivery (be careful also of your email provider's sending quota).
 WarningPHPMailC=- Using the SMTP server of your own Email Service Provider to send emails is also interesting so all emails sent from application will also be saved into your "Sent" directory of your mailbox.
-WarningPHPMailD=If the method 'PHP Mail' is really the method you would like to use, you can remove this warning by adding the constant MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP to 1 in Home - Setup - Other.
+WarningPHPMailD=Also, it is therefore recommended to change the sending method of e-mails to the value "SMTP". If you really want to keep the default "PHP" method to send emails, just ignore this warning, or remove it by setting the MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP constant to 1 in Home - Setup - Other.
 WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of the mail user agent (MUA) for your ERP CRM application: <strong>%s</strong>.
-WarningPHPMailSPF=If the domain name in your sender email address is protected by a SPF record (ask you domain name registar), you must add the following IPs in the SPF record of the DNS of your domain: <strong>%s</strong>.
+WarningPHPMailSPF=If the domain name in your sender email address is protected by a SPF record (ask your domain name registar), you must add the following IPs in the SPF record of the DNS of your domain: <strong>%s</strong>.
+ActualMailSPFRecordFound=Actual SPF record found : %s
 ClickToShowDescription=Click to show description
 DependsOn=This module needs the module(s)
 RequiredBy=This module is required by module(s)
@ -514,6 +518,9 @@ Field=حقل
 ProductDocumentTemplates=Document templates to generate product document
 FreeLegalTextOnExpenseReports=Free legal text on expense reports
 WatermarkOnDraftExpenseReports=Watermark on draft expense reports
+ProjectIsRequiredOnExpenseReports=The project is mandatory for entering an expense report
+PrefillExpenseReportDatesWithCurrentMonth=Pre-fill start and end dates of new expense report with start and end dates of the current month
+ForceExpenseReportsLineAmountsIncludingTaxesOnly=Force the entry of expense report amounts always in amount with taxes
 AttachMainDocByDefault=Set this to 1 if you want to attach main document to email by default (if applicable)
 FilesAttachedToEmail=Attach file
 SendEmailsReminders=Send agenda reminders by emails
@ -603,7 +610,7 @@ Module400Desc=Management of projects, leads/opportunities and/or tasks. You can
 Module410Name=Webcalendar
 Module410Desc=التكامل Webcalendar
 Module500Name=Taxes & Special Expenses
-Module500Desc=Management of other expenses (sale taxes, social or fiscal taxes, dividends, ...)
+Module500Desc=Management of other expenses (sales taxes, social or fiscal taxes, dividends, ...)
 Module510Name=الرواتب
 Module510Desc=Record and track employee payments
 Module520Name=القروض
@ -895,6 +902,11 @@ Permission1002=إنشاء / تعديل المستودعات
 Permission1003=حذف المستودعات
 Permission1004=قراءة تحركات الأسهم
 Permission1005=إنشاء / تعديل تحركات الأسهم
+Permission1011=View inventories
+Permission1012=Create new inventory
+Permission1014=Validate inventory
+Permission1015=Allow to change PMP value for a product
+Permission1016=Delete inventory
 Permission1101=Read delivery receipts
 Permission1102=Create/modify delivery receipts
 Permission1104=Validate delivery receipts
@ -950,6 +962,14 @@ Permission4001=See employees
 Permission4002=Create employees
 Permission4003=Delete employees
 Permission4004=Export employees
+Permission4010=Read skill/job/position
+Permission4011=Create/modify skill/job/position
+Permission4012=Delete skill/job/position
+Permission4020=Read evaluation
+Permission4021=Create/modify evaluation
+Permission4022=Validate evaluation
+Permission4023=Delete evaluation
+Permission4030=See comparison menu
 Permission10001=Read website content
 Permission10002=Create/modify website content (html and javascript content)
 Permission10003=Create/modify website content (dynamic php code). Dangerous, must be reserved to restricted developers.
@ -1032,7 +1052,7 @@ DictionaryFees=Expense report - Types of expense report lines
 DictionarySendingMethods=وسائل النقل البحري
 DictionaryStaff=Number of Employees
 DictionaryAvailability=تأخير تسليم
-DictionaryOrderMethods=طرق ترتيب
+DictionaryOrderMethods=Order methods
 DictionarySource=أصل مقترحات / أوامر
 DictionaryAccountancyCategory=Personalized groups for reports
 DictionaryAccountancysystem=نماذج للتخطيط للحسابات
@ -1165,7 +1185,8 @@ DoNotSuggestPaymentMode=لا توحي
 NoActiveBankAccountDefined=لا يعرف في حساب مصرفي نشط
 OwnerOfBankAccount=صاحب الحساب المصرفي %s
 BankModuleNotActive=الحسابات المصرفية وحدة لا يمكن
-ShowBugTrackLink=Define the link "<strong>%s</strong>" (empty to not display this link, 'github' for the link to the Dolibarr project or define directly an url 'https://...')
+ShowBugTrackLink=Show the link "<strong>%s</strong>"
+ShowBugTrackLinkDesc=Keep empty to not display this link, use value 'github' for the link to the Dolibarr project or define directly an url 'https://...'
 Alerts=تنبيهات
 DelaysOfToleranceBeforeWarning=Delay before displaying a warning alert for:
 DelaysOfToleranceDesc=Set the delay before an alert icon %s is shown onscreen for the late element.
@ -1190,6 +1211,9 @@ SetupDescription2=القسمان التاليان إلزاميان (المدخل
 SetupDescription3= <a href="%s"> %s -> %s </a> <br> <br> تُستخدم المعطيات الأساسية لتخصيص السلوك الافتراضي لتطبيقك (على سبيل المثال للميزات المتعلقة بالبلد).
 SetupDescription4= <a href="%s"> %s -> %s </a> <br> <br> هذا البرنامج عبارة عن مجموعة من العديد من الوحدات  |  التطبيقات. يجب تمكين وتكوين الوحدات النمطية التى تحتاجها. ستظهر فى القائمة بعد تمكين هذه الوحدات.
 SetupDescription5=قائمة الإعدادات الأخرى تقوم بإدارة المعطيات الاختيارية.
+SetupDescriptionLink=<a href="%s">%s - %s</a>
+SetupDescription3b=Basic parameters used to customize the default behavior of your application (e.g for country-related features).
+SetupDescription4b=This software is a suite of many modules/applications. The modules related to your needs must be enabled and configured. Menu entries will appears with the activation of these modules.
 AuditedSecurityEvents=Security events that are audited
 NoSecurityEventsAreAduited=No security events are audited. You can enable them from menu %s
 Audit=Security events
@ -1212,7 +1236,7 @@ SystemAreaForAdminOnly=هذه المنطقة متاحة للمستخدمين ا
 CompanyFundationDesc=قم بتحرير معلومات شركتك | مؤسستك. ثم انقر فوق الزر "%s" في أسفل الصفحة عند الانتهاء.
 AccountantDesc=If you have an external accountant/bookkeeper, you can edit here its information.
 AccountantFileNumber=Accountant code
-DisplayDesc=Parameters affecting the look and behaviour of Dolibarr can be modified here.
+DisplayDesc=Parameters affecting the look and presentation of the application can be modified here.
 AvailableModules=Available app/modules
 ToActivateModule=لتنشيط الوحدات ، انتقل إلى منطقة الإعدادات (الصفحة الرئيسية-> الإعدادات-> الوحدات النمطية).
 SessionTimeOut=نفذ وقت الجلسة
@ -1264,7 +1288,7 @@ SimpleNumRefNoDateModelDesc=Returns the reference number in the format %s-nnnn w
 ShowProfIdInAddress=Show professional ID with addresses
 ShowVATIntaInAddress=Hide intra-Community VAT number
 TranslationUncomplete=ترجمة جزئية
-MAIN_DISABLE_METEO=Disable meteorological view
+MAIN_DISABLE_METEO=Disable weather thumb
 MeteoStdMod=Standard mode
 MeteoStdModEnabled=Standard mode enabled
 MeteoPercentageMod=Percentage mode
@ -1335,6 +1359,7 @@ BrowserIsKO=You are using the %s web browser. This browser is known to be a bad
 PHPModuleLoaded=PHP component %s is loaded
 PreloadOPCode=Preloaded OPCode is used
 AddRefInList=Display Customer/Vendor ref. info list (select list or combobox) and most of hyperlink.<br>Third Parties will appear with a name format of "CC12345 - SC45678 - The Big Company corp." instead of "The Big Company corp".
+AddVatInList=Display Customer/Vendor VAT number. info list (select list or combobox).
 AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)<br>Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp".
 AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town info list (select list or combobox)<br>Contacts will appear with a name format of "Dupond Durand - dupond.durand@email.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand".
 AskForPreferredShippingMethod=Ask for preferred shipping method for Third Parties.
@ -1366,7 +1391,7 @@ AccountCodeManager=Options for automatic generation of customer/vendor accountin
 NotificationsDesc=Email notifications can be sent automatically for some Dolibarr events.<br>Recipients of notifications can be defined:
 NotificationsDescUser=* per user, one user at a time.
 NotificationsDescContact=* per third-party contacts (customers or vendors), one contact at a time.
-NotificationsDescGlobal=* or by setting global email addresses in this setup page.
+NotificationsDescGlobal=* or by setting global email addresses in the setup page of the module.
 ModelModules=Document Templates
 DocumentModelOdt=Generate documents from OpenDocument templates (.ODT / .ODS files from LibreOffice, OpenOffice, KOffice, TextEdit,...)
 WatermarkOnDraft=علامة مائية على مشروع الوثيقة
@ -1415,7 +1440,7 @@ WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=طلب مستودع المصدر لأمر
 ##### Suppliers Orders #####
 BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ask for bank account destination of purchase order
 ##### Orders #####
-SuggestedPaymentModesIfNotDefinedInOrder=Suggested payments mode on sale order by default if not defined on the order
+SuggestedPaymentModesIfNotDefinedInOrder=Suggested payments mode on sales order by default if not defined on the order
 OrdersSetup=Sales Orders management setup
 OrdersNumberingModules=أوامر الترقيم نمائط
 OrdersModelModule=وثائق من أجل النماذج
@ -1466,10 +1491,10 @@ LDAPSynchronizeMembersTypes=Organization of foundation's members types in LDAP
 LDAPPrimaryServer=الخادم الرئيسي
 LDAPSecondaryServer=ثانوية الخادم
 LDAPServerPort=خادم الميناء
-LDAPServerPortExample=Default port: 389
+LDAPServerPortExample=Standard or StartTLS: 389, LDAPs: 636
 LDAPServerProtocolVersion=بروتوكول النسخة
 LDAPServerUseTLS=استخدام TLS
-LDAPServerUseTLSExample=خادم LDAP الخاص بك استخدام TLS
+LDAPServerUseTLSExample=Your LDAP server use StartTLS
 LDAPServerDn=خادم DN
 LDAPAdminDn=مدير DN
 LDAPAdminDnExample=Complete DN (ex: cn=admin,dc=example,dc=com or cn=Administrator,cn=Users,dc=example,dc=com for active directory)
@ -1619,8 +1644,7 @@ ProductSetup=المنتجات وحدة الإعداد
 ServiceSetup=خدمات وحدة الإعداد
 ProductServiceSetup=منتجات وخدمات إعداد وحدات
 NumberOfProductShowInSelect=Maximum number of products to show in combo select lists (0=no limit)
-ViewProductDescInFormAbility=Display product descriptions in forms (otherwise shown in a tooltip popup)
-DoNotAddProductDescAtAddLines=Do not add product description (from product card) on submit add lines on forms
+ViewProductDescInFormAbility=Display product descriptions in lines of items (otherwise show description in a tooltip popup)
 OnProductSelectAddProductDesc=How to use the description of the products when adding a product as a line of a document
 AutoFillFormFieldBeforeSubmit=Auto fill the description input field with the description of product
 DoNotAutofillButAutoConcat=Do not autofill the input field with description of product. Description of the product will be concatenated to the entered description automatically.
@ -1684,6 +1708,8 @@ MailingDelay=ثواني الانتظار بعد إرسال الرسالة الت
 NotificationSetup=Email Notification module setup
 NotificationEMailFrom=Sender email (From) for emails sent by the Notifications module
 FixedEmailTarget=مستلم
+NotificationDisableConfirmMessageFix=Disable notification info in confirm message for fix notification
+NotificationDisableConfirmMessageUser=Disable notification info in confirm message for user notification
 ##### Sendings #####
 SendingsSetup=Shipping module setup
 SendingsReceiptModel=ارسال استلام نموذج
@ -1699,8 +1725,10 @@ FreeLegalTextOnDeliveryReceipts=النص الحر على إيصالات التس
 ##### FCKeditor #####
 AdvancedEditor=محرر متقدم
 ActivateFCKeditor=تفعيل محرر متقدم ل:
-FCKeditorForCompany=WYSIWIG إنشاء / الطبعة شركات ووصف المذكرة
-FCKeditorForProduct=WYSIWIG إنشاء / الطبعة المنتجات / الخدمات ووصف المذكرة
+FCKeditorForNotePublic=WYSIWIG creation/edition of the field public notes of elements
+FCKeditorForNotePrivate=WYSIWIG creation/edition of the field private notes of elements
+FCKeditorForCompany=WYSIWIG creation/edition of the field description of elements (except products/services)
+FCKeditorForProduct=WYSIWIG creation/edition of the field description of products/services
 FCKeditorForProductDetails=إنشاء \\ تعديل  تفاصيل المنتجات على طريقة الطباعة "ما تراه ستحصل عليه" لجميع المستندات (المقترحات،الاوامر،الفواتير،...) <span class="warning"> تحذير: إستخدام هذه الخاصية غير منصوح به بشدة بسبب مشاكل المحارف الخاصة وتنسيق الصفحات وذلك عند توليد ملفات بصيغة المستندات المتنقلة .</span>
 FCKeditorForMailing= WYSIWIG إنشاء / الطبعة بالبريد
 FCKeditorForUserSignature=إنشاء WYSIWIG / طبعة التوقيع المستعمل
@ -1779,7 +1807,7 @@ ClickToDialSetup=انقر لإعداد وحدة الاتصال الهاتفي
 ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with clicktodial login (defined on user card)<br><b>__PASS__</b> that will be replaced with clicktodial password (defined on user card).
 ClickToDialDesc=This module change phone numbers, when using a desktop computer, into clickable links. A click will call the number. This can be used to start the phone call when using a soft phone on your desktop or when using a CTI system based on SIP protocol for example. Note: When using a smartphone, phone numbers are always clickable.
 ClickToDialUseTelLink=مجرد استخدام الرابط "الهاتف:" على أرقام الهواتف
-ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface, installed on the same computer as the browser, and called when you click on a link starting with "tel:" in your browser. If you need link that start with "sip:" or a full server solution (no need of local software installation), you must set this to "No" and fill next field.
+ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface, installed on the same computer as the browser, and called when you click on a link starting with "tel:" in your browser. If you need a link that start with "sip:" or a full server solution (no need of local software installation), you must set this to "No" and fill the next field.
 ##### Point Of Sale (CashDesk) #####
 CashDesk=Point of Sale
 CashDeskSetup=Point of Sales module setup
@ -1909,11 +1937,11 @@ UnicodeCurrency=Enter here between braces, list of byte number that represent th
 ColorFormat=The RGB color is in HEX format, eg: FF0000
 PictoHelp=Icon name in dolibarr format ('image.png' if into the current theme directory, 'image.png@nom_du_module' if into the directory /img/ of a module)
 PositionIntoComboList=موقف خط في قوائم السرد
-SellTaxRate=بيع معدل الضريبة
+SellTaxRate=Sales tax rate
 RecuperableOnly=Yes for VAT "Not Perceived but Recoverable" dedicated for some state in France. Keep value to "No" in all other cases.
 UrlTrackingDesc=If the provider or transport service offers a page or web site to check the status of your shipments, you may enter it here. You can use the key {TRACKID} in the URL parameters so the system will replace it with the tracking number the user entered into the shipment card.
 OpportunityPercent=When you create a lead, you will define an estimated amount of project/lead. According to status of the lead, this amount may be multiplied by this rate to evaluate a total amount all your leads may generate. Value is a percentage (between 0 and 100).
-TemplateForElement=ويكرس هذا السجل القالب الذي عنصر
+TemplateForElement=This mail template is related to what type of object? An email template is available only when using the "Send Email" button from the related object.
 TypeOfTemplate=نوع القالب
 TemplateIsVisibleByOwnerOnly=Template is visible to owner only
 VisibleEverywhere=Visible everywhere
@ -1988,7 +2016,14 @@ MAIN_PDF_MARGIN_RIGHT=الهامش الايمن لملفات صيغة المست
 MAIN_PDF_MARGIN_TOP=الهامش العلوي لصيغة المستندات المتنقلة
 MAIN_PDF_MARGIN_BOTTOM=الهامش العلوي لصيغة المستندات المتنقلة
 MAIN_DOCUMENTS_LOGO_HEIGHT=ارتفاع الشعار على صيغة المستندات المتنقلة
-MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Add picture on proposal line
+MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Add column for picture on proposal lines
+MAIN_DOCUMENTS_WITH_PICTURE_WIDTH=Width of the column if a picture is added on lines
+MAIN_PDF_NO_SENDER_FRAME=Hide borders on sender address frame
+MAIN_PDF_NO_RECIPENT_FRAME=Hide borders on recipent address frame
+MAIN_PDF_HIDE_CUSTOMER_CODE=Hide customer code
+MAIN_PDF_HIDE_SENDER_NAME=Hide sender/company name in address block
+PROPOSAL_PDF_HIDE_PAYMENTTERM=Hide payments conditions
+PROPOSAL_PDF_HIDE_PAYMENTMODE=Hide payment mode
 MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING=Add electronic sign in PDF
 NothingToSetup=There is no specific setup required for this module.
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
@ -2089,7 +2124,7 @@ LargerThan=Larger than
 IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email aready collected and linked to an object, the created event will be automatically linked to the known related object.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
 EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set name of directory here to use this feature (Do NOT use special characters in name). Note that you must also use a read/write login account.
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
+EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<br>For example, if you want to create a thirdparty with a name extracted a string 'Name: name to find' found into the body, use sender email as email, you can set the parameter field like this:<br>'email=HEADER:^From:(.*);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;'<br>
 EndPointFor=End point for %s : %s
 DeleteEmailCollector=Delete email collector
 ConfirmDeleteEmailCollector=Are you sure you want to delete this email collector?
@ -2106,6 +2141,7 @@ EMailsWillHaveMessageID=Emails will have a tag 'References' matching this syntax
 PDF_SHOW_PROJECT=Show project on document
 ShowProjectLabel=Project Label
 PDF_USE_ALSO_LANGUAGE_CODE=اذا كنت ترغب في تكرار بعض النصوص بلغتين مختلفتين  في ملفاتك المولدة بصيغة المستندات المتنقلة . يجب عليك ان ان تحدد اللغة الثانية هنا حتى يتسنى للملفات المولدة ان تحتوي على لغتين في نفس الصفحة . اللغة المختارة اثناء توليد المستند واللغة المختارة هنا (فقط بعض قوالب صيغة المستندات المتنقلة تدعم هذه الميزة) . ابق الخيار فارغاً للتوليد بلغة واحدة 
+PDF_USE_A=Gererate PDF documents with format PDF/A instead of defaut format PDF
 FafaIconSocialNetworksDesc=Enter here the code of a FontAwesome icon. If you don't know what is FontAwesome, you can use the generic value fa-address-book.
 RssNote=ملاحظة: كل تعريف لمصدر اخبار مختصرة يوفر بريمج يجب تفعيله ليكون متاحا في لوحة المعلومات
 JumpToBoxes=اذهب الى الاعدادت -> البريمجات
@ -2128,6 +2164,7 @@ AskThisIDToYourBank=Contact your bank to get this ID
 AdvancedModeOnly=Permision available in Advanced permission mode only
 ConfFileIsReadableOrWritableByAnyUsers=The conf file is readable or writable by any users. Give permission to web server user and group only.
 MailToSendEventOrganization=Event Organization
+MailToPartnership=Partnership
 AGENDA_EVENT_DEFAULT_STATUS=Default event status when creating a event from the form
 YouShouldDisablePHPFunctions=You should disable PHP functions
 IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands in custom code, you shoud disable PHP functions
@ -2136,7 +2173,7 @@ NoWritableFilesFoundIntoRootDir=No writable files or directories of the common p
 RecommendedValueIs=Recommended: %s
 Recommended=موصى بها
 NotRecommended=Not recommended
-ARestrictedPath=A restricted path
+ARestrictedPath=Some restricted path
 CheckForModuleUpdate=Check for external modules updates
 CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
 ModuleUpdateAvailable=An update is available
@ -2148,3 +2185,27 @@ DatabasePasswordObfuscated=Database password is obfuscated in conf file
 DatabasePasswordNotObfuscated=Database password is NOT obfuscated in conf file
 APIsAreNotEnabled=APIs modules are not enabled
 YouShouldSetThisToOff=You should set this to 0 or off
+InstallAndUpgradeLockedBy=Install and upgrades are locked by the file <b>%s</b>
+OldImplementation=Old implementation
+PDF_SHOW_LINK_TO_ONLINE_PAYMENT=If some online payment modules are enabled (Paypal, Stripe, ...), add a link on the PDF to make the online payment
+DashboardDisableGlobal=Disable globally all the thumbs of open objects
+BoxstatsDisableGlobal=Disable totally box statistics
+DashboardDisableBlocks=Thumbs of open objects (to process or late) on main dashboard
+DashboardDisableBlockAgenda=Disable the thumb for agenda
+DashboardDisableBlockProject=Disable the thumb for projects
+DashboardDisableBlockCustomer=Disable the thumb for customers
+DashboardDisableBlockSupplier=Disable the thumb for suppliers
+DashboardDisableBlockContract=Disable the thumb for contracts
+DashboardDisableBlockTicket=Disable the thumb for tickets
+DashboardDisableBlockBank=Disable the thumb for banks
+DashboardDisableBlockAdherent=Disable the thumb for memberships
+DashboardDisableBlockExpenseReport=Disable the thumb for expense reports
+DashboardDisableBlockHoliday=Disable the thumb for leaves
+EnabledCondition=Condition to have field enabled (if not enabled, visibility will always be off)
+IfYouUseASecondTaxYouMustSetYouUseTheMainTax=If you want to use a second tax, you must enable also the first sale tax
+IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=If you want to use a third tax, you must enable also the first sale tax
+LanguageAndPresentation=Language and presentation
+SkinAndColors=Skin and colors
+IfYouUseASecondTaxYouMustSetYouUseTheMainTax=If you want to use a second tax, you must enable also the first sale tax
+IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=If you want to use a third tax, you must enable also the first sale tax
+PDF_USE_1A=Generate PDF with PDF/A-1b format
--- a/htdocs/langs/ar_SA/agenda.lang
+++ b/htdocs/langs/ar_SA/agenda.lang
@ -64,6 +64,7 @@ ShipmentClassifyClosedInDolibarr=الشحنة %sتم تصنيفها مدفوعة
 ShipmentUnClassifyCloseddInDolibarr=Shipment %s classified re-open
 ShipmentBackToDraftInDolibarr=Shipment %s go back to draft status
 ShipmentDeletedInDolibarr=الشحنة%sتم حذفها
+ShipmentCanceledInDolibarr=Shipment %s canceled
 ReceptionValidatedInDolibarr=Reception %s validated
 OrderCreatedInDolibarr=الطلب %s تم إنشاؤة
 OrderValidatedInDolibarr=الطلب %s تم التحقق منه
@ -170,3 +171,4 @@ ReminderType=Callback type
 AddReminder=Create an automatic reminder notification for this event
 ErrorReminderActionCommCreation=Error creating the reminder notification for this event
 BrowserPush=Browser Popup Notification
+ActiveByDefault=Enabled by default
--- a/htdocs/langs/ar_SA/banks.lang
+++ b/htdocs/langs/ar_SA/banks.lang
@ -182,3 +182,4 @@ BankColorizeMovementName2=لون الخلفية لحركة الائتمان
 IfYouDontReconcileDisableProperty=إذا لم تقم بإجراء التسويات البنكية على بعض الحسابات المصرفية ، فقم بتعطيل الخاصية "%s" عليها لإزالة هذا التحذير.
 NoBankAccountDefined=لم يتم تحديد حساب مصرفي
 NoRecordFoundIBankcAccount=لا يوجد سجل في الحساب المصرفي. عادةً ما يحدث هذا عندما يتم حذف سجل يدويًا من قائمة المعاملات في الحساب المصرفي (على سبيل المثال أثناء تسوية الحساب المصرفي). سبب آخر هو أنه تم تسجيل الدفعة عندما تم تعطيل الوحدة النمطية "%s".
+AlreadyOneBankAccount=Already one bank account defined
--- a/htdocs/langs/ar_SA/bills.lang
+++ b/htdocs/langs/ar_SA/bills.lang
@ -192,6 +192,7 @@ ConfirmClassifyPaidPartiallyReasonDiscount=المتبقي الغير مدفوع
 ConfirmClassifyPaidPartiallyReasonDiscountNoVat=المتبقي الغير مدفوع <b> (%s %s) </b> هو خصم ممنوح لأن السداد تم قبل الأجل. أنا أقبل خسارة ضريبة القيمة المضافة على هذا الخصم.
 ConfirmClassifyPaidPartiallyReasonDiscountVat=المتبقي الغير مدفوع <b> (%s %s) </b> هو خصم ممنوح لأن السداد تم قبل الأجل. أسترد ضريبة القيمة المضافة على هذا الخصم بدون إشعار دائن.
 ConfirmClassifyPaidPartiallyReasonBadCustomer=عميل سيء
+ConfirmClassifyPaidPartiallyReasonBankCharge=Deduction by bank (intermediary bank fees)
 ConfirmClassifyPaidPartiallyReasonProductReturned=تم إرجاع بعض المنتجات
 ConfirmClassifyPaidPartiallyReasonOther=التخلي عن المبلغ لسبب آخر
 ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=هذا الاختيار ممكن إذا تم تزويد فاتورتك بالتعليقات المناسبة. (مثال «فقط الضريبة المقابلة للسعر الذي تم دفعه هي التي تعطي الحق في الخصم»)
@ -199,6 +200,7 @@ ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=في بعض البلدان ،
 ConfirmClassifyPaidPartiallyReasonAvoirDesc=استخدم هذا الاختيار إذا كانت جميع الاختيارات الاخرى لا تناسبك
 ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=العميل السيئ <b> </b> هو العميل الذي يرفض سداد ديونه.
 ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=يستخدم هذا الاختيار عندما لا يكتمل السداد بسبب إرجاع بعض المنتجات
+ConfirmClassifyPaidPartiallyReasonBankChargeDesc=The unpaid amount is <b>intermediary bank fees</b>, deducted directly from the <b>correct amount</b> paid by the Customer.
 ConfirmClassifyPaidPartiallyReasonOtherDesc=استخدم هذا الخيار إذا لم يكن هناك خيار مناسب ، على سبيل المثال في الحالة التالية: <br> - الدفع غير مكتمل لأن بعض المنتجات تم شحنها مرة أخرى <br> - المبلغ المطالب به مهم جدًا لأنه تم نسيان الخصم <br> في جميع الحالات ، يجب تصحيح المبلغ المطالب به في نظام المحاسبة عن طريق إنشاء إشعار دائن.
 ConfirmClassifyAbandonReasonOther=أخرى
 ConfirmClassifyAbandonReasonOtherDesc=سيتم استخدام هذا الاختيار في جميع الحالات الأخرى. على سبيل المثال ، لأنك تخطط لإنشاء فاتورة بديلة.
@ -234,16 +236,22 @@ AlreadyPaidBack=سددت بالفعل
 AlreadyPaidNoCreditNotesNoDeposits=سددت (بدون اشعار دائن ودفعات مقدمة)
 Abandoned=المهجورة
 RemainderToPay=المتبقي غير مسدد
+RemainderToPayMulticurrency=Remaining unpaid, original currency
 RemainderToTake=الميلغ المتبقي لاتخاذ
+RemainderToTakeMulticurrency=Remaining amount to take, original currency
 RemainderToPayBack=المبلغ المتبقي للاسترجاع
+RemainderToPayBackMulticurrency=Remaining amount to refund, original currency
 Rest=بانتظار
 AmountExpected=المبلغ المطالب به
 ExcessReceived=المبالغ الزائدة المستلمة
+ExcessReceivedMulticurrency=Excess received, original currency
 ExcessPaid=المبالغ الزائدة المسددة
+ExcessPaidMulticurrency=Excess paid, original currency
 EscompteOffered=عرض الخصم (الدفع قبل الأجل)
 EscompteOfferedShort=خصم
 SendBillRef=تسليم الفاتورة %s
 SendReminderBillRef=تسليم الفاتورة %s (تذكير)
+SendPaymentReceipt=Submission of payment receipt %s
 NoDraftBills=لا توجد مسودات فواتير
 NoOtherDraftBills=لا توجد مسودات فواتير أخرى
 NoDraftInvoices=لا توجد مسودات فواتير
@ -260,6 +268,7 @@ DateInvoice=تاريخ الفاتورة
 DatePointOfTax=Point of tax
 NoInvoice=لا فاتورة
 NoOpenInvoice=No open invoice
+NbOfOpenInvoices=Number of open invoices
 ClassifyBill=صنف كفاتورة
 SupplierBillsToPay=فواتير المورد الغير مسددة
 CustomerBillsUnpaid=فواتير العملاء غير المسددة
@ -570,7 +579,7 @@ ToCreateARecurringInvoiceGene=لإنشاء فواتير مستقبلية بشك
 ToCreateARecurringInvoiceGeneAuto=إذا كنت بحاجة إلى إنشاء مثل هذه الفواتير تلقائيًا ، فاطلب من المسؤول تمكين وحدة الإعداد <strong> %s </strong> وإعدادها. لاحظ أنه يمكن استخدام كلتا الطريقتين (يدويًا وآليًا) مع عدم وجود خطر التكرار.
 DeleteRepeatableInvoice=حذف قالب الفاتورة
 ConfirmDeleteRepeatableInvoice=هل أنت متأكد أنك تريد حذف قالب الفاتورة؟
-CreateOneBillByThird=إنشاء فاتورة واحدة لكل طرف ثالث (خلاف ذلك ، فاتورة واحدة لكل طلب)
+CreateOneBillByThird=Create one invoice per third party (otherwise, one invoice per selected object)
 BillCreated=%s إصدار فاتورة (فواتير) 
 BillXCreated=تم إنشاء %s الفاتورة 
 StatusOfGeneratedDocuments=حالة إنشاء الوثيقة
@ -591,3 +600,5 @@ SituationTotalRayToRest=ما تبقى للدفع بدون ضريبة
 PDFSituationTitle=Situation n° %d
 SituationTotalProgress=إجمالي التقدم %d %%
 SearchUnpaidInvoicesWithDueDate=Search unpaid invoices with a due date = %s
+NoPaymentAvailable=No payment available for %s
+PaymentRegisteredAndInvoiceSetToPaid=Payment registered and invoice %s set to paid
--- a/htdocs/langs/ar_SA/bookmarks.lang
+++ b/htdocs/langs/ar_SA/bookmarks.lang
@ -1,20 +1,22 @@
 # Dolibarr language file - Source file is en_US - marque pages
-AddThisPageToBookmarks=أضف هذه الصفحة إلى المفضلة
+AddThisPageToBookmarks=إضافة الصفحة الحالية إلى الإشارات المرجعية
 Bookmark=احفظ
 Bookmarks=العناوين
-ListOfBookmarks=قائمة العناوين
-EditBookmarks=List/edit bookmarks
+ListOfBookmarks=قائمة الإشارات المرجعية
+EditBookmarks=قائمة / تحرير الإشارات المرجعية
 NewBookmark=إشارة مرجعية جديدة
 ShowBookmark=وتظهر علامة
-OpenANewWindow=فتح نافذة جديدة
-ReplaceWindow=استبدال النافذة الحالية
-BookmarkTargetNewWindowShort=نافذة جديدة
-BookmarkTargetReplaceWindowShort=النافذة الحالية
-BookmarkTitle=احفظ العنوان
+OpenANewWindow=Open a new tab
+ReplaceWindow=Replace current tab
+BookmarkTargetNewWindowShort=New tab
+BookmarkTargetReplaceWindowShort=Current tab
+BookmarkTitle=Bookmark name
 UrlOrLink=العنوان
-BehaviourOnClick=السلوك على الضغط على العنوان
-CreateBookmark=إيجاد المرجعية
-SetHereATitleForLink=مجموعة هنا عنوان المرجعية
-UseAnExternalHttpLinkOrRelativeDolibarrLink=استخدام خارجي عنوان النص المتشعب أو قريب Dolibarr عنوان
-ChooseIfANewWindowMustBeOpenedOnClickOnBookmark=Choose if linked page must open in new window or not
-BookmarksManagement=إدارة العناوين
+BehaviourOnClick=السلوك عند تحديد عنوان للإشارة المرجعية
+CreateBookmark=إنشاء إشارة مرجعية
+SetHereATitleForLink=Set a name for the bookmark
+UseAnExternalHttpLinkOrRelativeDolibarrLink=Use an external/absolute link (https://URL) or an internal/relative link (/DOLIBARR_ROOT/htdocs/...)
+ChooseIfANewWindowMustBeOpenedOnClickOnBookmark=Choose if the linked page should open in the current tab or a new tab
+BookmarksManagement=إدارة الإشارات المرجعية
+BookmarksMenuShortCut=Ctrl + shift + m
+NoBookmarks=No bookmarks defined
--- a/htdocs/langs/ar_SA/cashdesk.lang
+++ b/htdocs/langs/ar_SA/cashdesk.lang
@ -42,7 +42,7 @@ AddTable=Add table
 Place=Place
 TakeposConnectorNecesary='TakePOS Connector' required
 OrderPrinters=Add a button to send the order to some given printers, without payment (for example to send an order to a kitchen)
-NotAvailableWithBrowserPrinter=Not available when printer for receipt is set to browser:
+NotAvailableWithBrowserPrinter=Not available when printer for receipt is set to browser
 SearchProduct=Search product
 Receipt=ورود
 Header=Header
@ -128,3 +128,8 @@ PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
 WeighingScale=Weighing scale
 ShowPriceHT = Display the column with the price excluding tax (on screen)
 ShowPriceHTOnReceipt = Display the column with the price excluding tax (on the receipt)
+CustomerDisplay=Customer display
+SplitSale=Split sale
+PrintWithoutDetailsButton=Add "Print without details" button
+PrintWithoutDetailsLabelDefault=Line label by default on printing without details
+PrintWithoutDetails=Print without details
--- a/Show More
+++ b/Show More