diff --git a/htdocs/langs/ar_EG/supplier_proposal.lang b/htdocs/langs/ar_EG/supplier_proposal.lang
index ab10fd913c0..8e3e10bfc28 100644
--- a/htdocs/langs/ar_EG/supplier_proposal.lang
+++ b/htdocs/langs/ar_EG/supplier_proposal.lang
@@ -11,6 +11,7 @@ LastModifiedRequests=أحدث طلبات السعر المعدلة %s
 RequestsOpened=طلبات عروض اسعار مفتوحة
 SupplierProposalArea=منطقة عروض الموردين
 SupplierProposalShort=عرض المورد
+AskPrice=طلب عرض السعر
 NewAskPrice=طلب عرض سعر جديد
 ShowSupplierProposal=فتح عرض السعر
 AddSupplierProposal=عمل طلب عرض سعر
@@ -39,3 +40,4 @@ DefaultModelSupplierProposalClosed=القالب الافتراضي عند إغل
 SupplierProposalsToClose=عروض موردين لإغلاق
 SupplierProposalsToProcess=عروض موردين لمعالجة
 AllPriceRequests=جميع الطلبات
+TypeContact_supplier_proposal_external_SERVICE=الممثل المتابع للعرض
diff --git a/htdocs/langs/ar_SA/accountancy.lang b/htdocs/langs/ar_SA/accountancy.lang
index cb620d83f9e..a2372830672 100644
--- a/htdocs/langs/ar_SA/accountancy.lang
+++ b/htdocs/langs/ar_SA/accountancy.lang
@@ -57,11 +57,14 @@ WarningDataDisappearsWhenDataIsExported=تحذير ، تحتوي هذه القا
 VueByAccountAccounting=عرض حسب الحساب المحاسبي
 VueBySubAccountAccounting=عرض حسب الحساب المحاسبة الفرعي
 
-MainAccountForCustomersNotDefined=حساب المحاسبة الرئيسي للعملاء الغير محددين في الإعدادات
-MainAccountForSuppliersNotDefined=حساب المحاسبة الرئيسي للموردين الغير محددين في الإعدادات
-MainAccountForUsersNotDefined=حساب المحاسبة الرئيسي للمستخدمين الغير محددين في الإعدادات
-MainAccountForVatPaymentNotDefined=حساب المحاسبة الرئيسي لدفعات (VAT) الغير محددين في الإعدادات
-MainAccountForSubscriptionPaymentNotDefined=حساب المحاسبة الرئيسي للمشتركين الغير محددين في الإعدادات
+MainAccountForCustomersNotDefined=Main account (from the Chart of Account) for customers not defined in setup
+MainAccountForSuppliersNotDefined=Main account (from the Chart of Account) for vendors not defined in setup
+MainAccountForUsersNotDefined=Main account (from the Chart of Account) for users not defined in setup
+MainAccountForRevenueStampSaleNotDefined=Account (from the Chart of Account) for the revenue stamp (sales) not defined in setup
+MainAccountForRevenueStampPurchaseNotDefined=Account (from the Chart of Account) for the revenue stamp (purchases) not defined in setup
+MainAccountForVatPaymentNotDefined=Account (from the Chart of Account) for VAT payment not defined in setup
+MainAccountForSubscriptionPaymentNotDefined=Account (from the Chart of Account) for membership payment not defined in setup
+MainAccountForRetainedWarrantyNotDefined=Account (from the Chart of Account) for the retained warranty not defined in setup
 UserAccountNotDefined=لم يتم تعريف حساب في الحسابات في الاعدادات
 
 AccountancyArea=منطقة المحاسبة
diff --git a/htdocs/langs/ar_SA/admin.lang b/htdocs/langs/ar_SA/admin.lang
index 78054427357..eb0cd900a4a 100644
--- a/htdocs/langs/ar_SA/admin.lang
+++ b/htdocs/langs/ar_SA/admin.lang
@@ -1509,7 +1509,8 @@ WatermarkOnDraftContractCards=العلامة المائية على مسودات
 MembersSetup=أعضاء وحدة الإعداد
 MemberMainOptions=الخيارات الرئيسية
 MemberCodeChecker=Options for automatic generation of member codes
-AdherentLoginRequired= إدارة تسجيل الدخول لكل عضو
+AdherentLoginRequired=Manage a login/password for each member
+AdherentLoginRequiredDesc=Add a value for a login and a password on the member file. If the member is linked to a user, updating the member login and password will also update the user login and password.
 AdherentMailRequired=البريد الإلكتروني مطلوب لإنشاء عضو جديد
 MemberSendInformationByMailByDefault=مربع لإرسال الرسائل للأعضاء تأكيدا على افتراضي
 MemberCreateAnExternalUserForSubscriptionValidated=قم بإنشاء تسجيل دخول مستخدم خارجي لكل اشتراك عضو جديد تم التحقق من صحته
@@ -2076,6 +2077,10 @@ MAIN_DOCUMENTS_LOGO_HEIGHT=ارتفاع الشعار على صيغة المست
 DOC_SHOW_FIRST_SALES_REP=Show first sales representative
 MAIN_GENERATE_PROPOSALS_WITH_PICTURE=أضف عمودًا للصورة في سطور الاقتراح
 MAIN_DOCUMENTS_WITH_PICTURE_WIDTH=عرض العمود إذا تم إضافة صورة على الخطوط
+MAIN_GENERATE_DOCUMENTS_SUPPLIER_PROPOSAL_WITHOUT_UNIT_PRICE=Hide the unit price column on quotation requests
+MAIN_GENERATE_DOCUMENTS_SUPPLIER_PROPOSAL_WITHOUT_TOTAL_COLUMN=Hide the total price column on quotation requests
+MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_UNIT_PRICE=Hide the unit price column on purchase orders
+MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_TOTAL_COLUMN=Hide the total price column on puchase orders
 MAIN_PDF_NO_SENDER_FRAME=إخفاء الحدود في إطار عنوان المرسل
 MAIN_PDF_NO_RECIPENT_FRAME=إخفاء الحدود على إطار عنوان المستلم
 MAIN_PDF_HIDE_CUSTOMER_CODE=إخفاء رمز العميل
@@ -2400,4 +2405,4 @@ OptionXShouldBeEnabledInModuleY=Option "<b>%s</b>" should be enabled into module
 OptionXIsCorrectlyEnabledInModuleY=Option "<b>%s</b>" is enabled into module <b>%s</b>
 AtBottomOfPage=At bottom of page
 FailedAuth=failed authentications
-MaxNumberOfFailedAuth=Max number of failed authentication in 24h to disable login.
+MaxNumberOfFailedAuth=Max number of failed authentication in 24h to deny login.
diff --git a/htdocs/langs/ar_SA/main.lang b/htdocs/langs/ar_SA/main.lang
index 2e6f4afbb22..a902ad3ba34 100644
--- a/htdocs/langs/ar_SA/main.lang
+++ b/htdocs/langs/ar_SA/main.lang
@@ -1237,3 +1237,5 @@ SearchSyntaxTooltipForStringOrNum=For searching inside text fields, you can use
 InProgress=قيد التنفيذ
 DateOfPrinting=Date of printing
 ClickFullScreenEscapeToLeave=Click here to switch in Full screen mode. Press ESCAPE to leave Full screen mode.
+UserNotYetValid=Not yet valid
+UserExpired=انتهى
diff --git a/htdocs/langs/ar_SA/supplier_proposal.lang b/htdocs/langs/ar_SA/supplier_proposal.lang
index ddf555e5dbe..848e3af9b85 100644
--- a/htdocs/langs/ar_SA/supplier_proposal.lang
+++ b/htdocs/langs/ar_SA/supplier_proposal.lang
@@ -42,7 +42,8 @@ SendAskRef=إرسال سعر الطلب٪ الصورة
 SupplierProposalCard=طلب بطاقة
 ConfirmDeleteAsk=هل تريد بالتأكيد حذف طلب السعر هذا <b> %s </b>؟
 ActionsOnSupplierProposal=الأحداث على طلب السعر
-DocModelAuroreDescription=نموذج طلب كامل (شعار ...)
+DocModelAuroreDescription=A complete template for a vendor quotation request template (old implementation of Sponge template)
+DocModelZenithDescription=A complete template for a vendor quotation request template
 CommercialAsk=طلب السعر
 DefaultModelSupplierProposalCreate=إنشاء نموذج افتراضي
 DefaultModelSupplierProposalToBill=القالب الافتراضي عند إغلاق طلب السعر (مقبول)
diff --git a/htdocs/langs/bg_BG/accountancy.lang b/htdocs/langs/bg_BG/accountancy.lang
index 5a14a1ca14e..9368cc2319b 100644
--- a/htdocs/langs/bg_BG/accountancy.lang
+++ b/htdocs/langs/bg_BG/accountancy.lang
@@ -57,11 +57,14 @@ WarningDataDisappearsWhenDataIsExported=Warning, this list contains only the acc
 VueByAccountAccounting=View by accounting account
 VueBySubAccountAccounting=View by accounting subaccount
 
-MainAccountForCustomersNotDefined=Основна счетоводна сметка за клиенти, която не е дефинирана в настройката
-MainAccountForSuppliersNotDefined=Основна счетоводна сметка за доставчици, която не е дефинирана в настройката
-MainAccountForUsersNotDefined=Основна счетоводна сметка за потребители, която не е дефинирана в настройката
-MainAccountForVatPaymentNotDefined=Основна счетоводна сметка за плащане на ДДС, която не е дефинирана в настройката
-MainAccountForSubscriptionPaymentNotDefined=Основна счетоводна сметка за плащане на абонамент, която не е дефинирана в настройката
+MainAccountForCustomersNotDefined=Main account (from the Chart of Account) for customers not defined in setup
+MainAccountForSuppliersNotDefined=Main account (from the Chart of Account) for vendors not defined in setup
+MainAccountForUsersNotDefined=Main account (from the Chart of Account) for users not defined in setup
+MainAccountForRevenueStampSaleNotDefined=Account (from the Chart of Account) for the revenue stamp (sales) not defined in setup
+MainAccountForRevenueStampPurchaseNotDefined=Account (from the Chart of Account) for the revenue stamp (purchases) not defined in setup
+MainAccountForVatPaymentNotDefined=Account (from the Chart of Account) for VAT payment not defined in setup
+MainAccountForSubscriptionPaymentNotDefined=Account (from the Chart of Account) for membership payment not defined in setup
+MainAccountForRetainedWarrantyNotDefined=Account (from the Chart of Account) for the retained warranty not defined in setup
 UserAccountNotDefined=Accounting account for user not defined in setup
 
 AccountancyArea=Секция за счетоводство
diff --git a/htdocs/langs/bg_BG/admin.lang b/htdocs/langs/bg_BG/admin.lang
index d756e98d5e7..cee702a1170 100644
--- a/htdocs/langs/bg_BG/admin.lang
+++ b/htdocs/langs/bg_BG/admin.lang
@@ -1509,7 +1509,8 @@ WatermarkOnDraftContractCards=Воден знак върху чернови до
 MembersSetup=Настройка на модула за членове
 MemberMainOptions=Основни параметри
 MemberCodeChecker=Options for automatic generation of member codes
-AdherentLoginRequired= Управление на входни данни за всеки член
+AdherentLoginRequired=Manage a login/password for each member
+AdherentLoginRequiredDesc=Add a value for a login and a password on the member file. If the member is linked to a user, updating the member login and password will also update the user login and password.
 AdherentMailRequired=Необходим е имейл при създаване на нов член
 MemberSendInformationByMailByDefault=По подразбиране е активирано изпращането на потвърждение, чрез имейл до членове (валидиране или нов абонамент)
 MemberCreateAnExternalUserForSubscriptionValidated=Create an external user login for each new member subscription validated
@@ -2076,6 +2077,10 @@ MAIN_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
 DOC_SHOW_FIRST_SALES_REP=Show first sales representative
 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_GENERATE_DOCUMENTS_SUPPLIER_PROPOSAL_WITHOUT_UNIT_PRICE=Hide the unit price column on quotation requests
+MAIN_GENERATE_DOCUMENTS_SUPPLIER_PROPOSAL_WITHOUT_TOTAL_COLUMN=Hide the total price column on quotation requests
+MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_UNIT_PRICE=Hide the unit price column on purchase orders
+MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_TOTAL_COLUMN=Hide the total price column on puchase orders
 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
@@ -2400,4 +2405,4 @@ OptionXShouldBeEnabledInModuleY=Option "<b>%s</b>" should be enabled into module
 OptionXIsCorrectlyEnabledInModuleY=Option "<b>%s</b>" is enabled into module <b>%s</b>
 AtBottomOfPage=At bottom of page
 FailedAuth=failed authentications
-MaxNumberOfFailedAuth=Max number of failed authentication in 24h to disable login.
+MaxNumberOfFailedAuth=Max number of failed authentication in 24h to deny login.
diff --git a/htdocs/langs/bg_BG/supplier_proposal.lang b/htdocs/langs/bg_BG/supplier_proposal.lang
index 5aa60ffd859..440f60bf09b 100644
--- a/htdocs/langs/bg_BG/supplier_proposal.lang
+++ b/htdocs/langs/bg_BG/supplier_proposal.lang
@@ -13,6 +13,7 @@ SupplierProposalArea=Секция със запитвания към доста
 SupplierProposalShort=Запитване към доставчик
 SupplierProposals=Запитвания към доставчик
 SupplierProposalsShort=Запитвания към доставчик
+AskPrice=Запитване за цена
 NewAskPrice=Ново запитване за цена
 ShowSupplierProposal=Показване на запитване за цена
 AddSupplierProposal=Създаване на запитване за цена
@@ -41,7 +42,8 @@ SendAskRef=Изпращане на запитване за цена %s
 SupplierProposalCard=Запитване за цена
 ConfirmDeleteAsk=Сигурни ли сте, че искате да изтриете това запитване за цена с № <b>%s</b>?
 ActionsOnSupplierProposal=Свързани събития
-DocModelAuroreDescription=Завършен шаблон на запитване (лого...)
+DocModelAuroreDescription=A complete template for a vendor quotation request template (old implementation of Sponge template)
+DocModelZenithDescription=A complete template for a vendor quotation request template
 CommercialAsk=Запитване за цена
 DefaultModelSupplierProposalCreate=Създаване на шаблон по подразбиране
 DefaultModelSupplierProposalToBill=Шаблон по подразбиране, когато се затваря запитване за цена (прието)
@@ -52,3 +54,6 @@ SupplierProposalsToClose=Запитвания към доставчици за 
 SupplierProposalsToProcess=Запитвания към доставчици за обработка
 LastSupplierProposals=Запитвания за цени: %s последни
 AllPriceRequests=Всички запитвания
+TypeContact_supplier_proposal_external_SHIPPING=Vendor contact for delivery
+TypeContact_supplier_proposal_external_BILLING=Vendor contact for billing
+TypeContact_supplier_proposal_external_SERVICE=Изготвил предложение
diff --git a/htdocs/langs/bs_BA/main.lang b/htdocs/langs/bs_BA/main.lang
index 9acbfcac15b..51c493a9956 100644
--- a/htdocs/langs/bs_BA/main.lang
+++ b/htdocs/langs/bs_BA/main.lang
@@ -1237,3 +1237,5 @@ SearchSyntaxTooltipForStringOrNum=For searching inside text fields, you can use
 InProgress=U toku
 DateOfPrinting=Date of printing
 ClickFullScreenEscapeToLeave=Click here to switch in Full screen mode. Press ESCAPE to leave Full screen mode.
+UserNotYetValid=Not yet valid
+UserExpired=Istekao
diff --git a/htdocs/langs/ca_ES/accountancy.lang b/htdocs/langs/ca_ES/accountancy.lang
index ff5a21e6223..223b5066045 100644
--- a/htdocs/langs/ca_ES/accountancy.lang
+++ b/htdocs/langs/ca_ES/accountancy.lang
@@ -57,11 +57,14 @@ WarningDataDisappearsWhenDataIsExported=Warning, this list contains only the acc
 VueByAccountAccounting=Visualització per compte comptable
 VueBySubAccountAccounting=Visualització per subcompte comptable
 
-MainAccountForCustomersNotDefined=Compte comptable per a clients no definida en la configuració
-MainAccountForSuppliersNotDefined=Compte comptable principal per a proveïdors no definit a la configuració
-MainAccountForUsersNotDefined=Compte comptable per a usuaris no de definit en la configuració
-MainAccountForVatPaymentNotDefined=Compte comptable per a IVA no definida en la configuració
-MainAccountForSubscriptionPaymentNotDefined=Compte comptable per a IVA no definida en la configuració del mòdul
+MainAccountForCustomersNotDefined=Main account (from the Chart of Account) for customers not defined in setup
+MainAccountForSuppliersNotDefined=Main account (from the Chart of Account) for vendors not defined in setup
+MainAccountForUsersNotDefined=Main account (from the Chart of Account) for users not defined in setup
+MainAccountForRevenueStampSaleNotDefined=Account (from the Chart of Account) for the revenue stamp (sales) not defined in setup
+MainAccountForRevenueStampPurchaseNotDefined=Account (from the Chart of Account) for the revenue stamp (purchases) not defined in setup
+MainAccountForVatPaymentNotDefined=Account (from the Chart of Account) for VAT payment not defined in setup
+MainAccountForSubscriptionPaymentNotDefined=Account (from the Chart of Account) for membership payment not defined in setup
+MainAccountForRetainedWarrantyNotDefined=Account (from the Chart of Account) for the retained warranty not defined in setup
 UserAccountNotDefined=Compte comptable per a l'usuari no definit a la configuració
 
 AccountancyArea=Àrea de comptabilitat
diff --git a/htdocs/langs/ca_ES/admin.lang b/htdocs/langs/ca_ES/admin.lang
index 4bee81426eb..366d0624b4a 100644
--- a/htdocs/langs/ca_ES/admin.lang
+++ b/htdocs/langs/ca_ES/admin.lang
@@ -366,8 +366,8 @@ GenericMaskCodes2= <b> {cccc} </b> el codi del client en n caràcters <br><b>{cc
 GenericMaskCodes3=Qualsevol altre caràcter a la màscara es quedarà sense canvis. <br> No es permeten espais<br>
 GenericMaskCodes3EAN=La resta de caràcters de la màscara romandran intactes (excepte * o ? En 13a posició a EAN13). <br>No es permeten espais. <br> A EAN13, l'últim caràcter després de l'últim } a la 13a posició hauria de ser * o ? . Se substituirà per la clau calculada.<br>
 GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany, with date 2023-01-31:</u><br>
-GenericMaskCodes4b=<u>Example on third party created on 2023-01-31:</u><br>
-GenericMaskCodes4c=<u>Example on product created on 2023-01-31:</u><br>
+GenericMaskCodes4b=<u>Exemple en un tercer creat el 31/01/2023:</u><br>
+GenericMaskCodes4c=<u>Exemple de producte creat el 31/01/2023:</u><br>
 GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> will give <b>ABC2301-000099</b><br><b>{0000+100@1}-ZZZ/{dd}/XXX</b> will give <b>0199-ZZZ/31/XXX</b><br><b>IN{yy}{mm}-{0000}-{t}</b> will give <b>IN2301-0099-A</b> if the type of company is 'Responsable Inscripto' with code for type that is 'A_RI'
 GenericNumRefModelDesc=Retorna un nombre creat d'acord amb una màscara definida.
 ServerAvailableOnIPOrPort=Servidor disponible a l'adreça <b>%s</b> al port <b>%s</b>
@@ -650,7 +650,7 @@ Module2300Name=Tasques programades
 Module2300Desc=Gestió de tasques programades (àlies cron o taula de crons)
 Module2400Name=Esdeveniments/Agenda
 Module2400Desc=Seguiment d'esdeveniments. Registre d'esdeveniments automàtics per a fer el seguiment o registrar esdeveniments manuals o reunions. Aquest és el mòdul principal per a una bona gestió de la relació amb clients o proveïdors.
-Module2430Name=Online Booking Calendar
+Module2430Name=Calendari de reserves en línia
 Module2430Desc=Proporcioneu un calendari en línia per a permetre que qualsevol persona pugui reservar una cita, segons els rangs o les disponibilitats predefinits.
 Module2500Name=SGD / GCE
 Module2500Desc=Sistema de gestió de documents / Gestió de continguts electrònics. Organització automàtica dels vostres documents generats o emmagatzemats. Compartiu-los quan ho necessiteu.
@@ -1509,7 +1509,8 @@ WatermarkOnDraftContractCards=Marca d'aigua en contractes (en cas d'estar buit)
 MembersSetup=Configuració del mòdul Socis
 MemberMainOptions=Opcions principals
 MemberCodeChecker=Opcions per a la generació automàtica de codis de soci
-AdherentLoginRequired= Gestiona un compte d'usuari per a cada soci
+AdherentLoginRequired=Gestiona un compte d'usuari/contrasenya per a cada soci
+AdherentLoginRequiredDesc=Add a value for a login and a password on the member file. If the member is linked to a user, updating the member login and password will also update the user login and password.
 AdherentMailRequired=Cal un correu electrònic per a crear un soci nou
 MemberSendInformationByMailByDefault=La casella de selecció per a enviar una confirmació per correu electrònic als socis (validació o nova subscripció) està activada per defecte
 MemberCreateAnExternalUserForSubscriptionValidated=Creeu un usuari extern per a cada subscripció nova membre validada
@@ -1642,9 +1643,9 @@ LDAPFieldEndLastSubscription=Data final d'afiliació
 LDAPFieldTitle=Càrrec
 LDAPFieldTitleExample=Exemple:títol
 LDAPFieldGroupid=Identificador de grup
-LDAPFieldGroupidExample=Example : gidnumber
+LDAPFieldGroupidExample=Exemple : gidnumber
 LDAPFieldUserid=Identificador personal
-LDAPFieldUseridExample=Example : uidnumber
+LDAPFieldUseridExample=Exemple : uidnumber
 LDAPFieldHomedirectory=Directori d’inici
 LDAPFieldHomedirectoryExample=Exemple: directoriprincipal
 LDAPFieldHomedirectoryprefix=Prefix del directori inicial
@@ -2076,6 +2077,10 @@ MAIN_DOCUMENTS_LOGO_HEIGHT=Alçada del logotip en PDF
 DOC_SHOW_FIRST_SALES_REP=Mostra el primer agent comercial
 MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Afegiu una columna per a la imatge a les línies de proposta
 MAIN_DOCUMENTS_WITH_PICTURE_WIDTH=Amplada de la columna si s'afegeix una imatge a les línies
+MAIN_GENERATE_DOCUMENTS_SUPPLIER_PROPOSAL_WITHOUT_UNIT_PRICE=Hide the unit price column on quotation requests
+MAIN_GENERATE_DOCUMENTS_SUPPLIER_PROPOSAL_WITHOUT_TOTAL_COLUMN=Hide the total price column on quotation requests
+MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_UNIT_PRICE=Hide the unit price column on purchase orders
+MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_TOTAL_COLUMN=Hide the total price column on puchase orders
 MAIN_PDF_NO_SENDER_FRAME=Amaga les vores del marc d’adreça del remitent
 MAIN_PDF_NO_RECIPENT_FRAME=Amaga les vores del marc d’adreça destinatari
 MAIN_PDF_HIDE_CUSTOMER_CODE=Amaga el codi de client
@@ -2112,7 +2117,7 @@ NewEmailCollector=Col·lector nou de correus electrònics
 EMailHost=Servidor IMAP de correu electrònic
 EMailHostPort=Port del servidor IMAP de correu electrònic
 loginPassword=Inici de sessió/Contrasenya
-oauthToken=OAuth2 token
+oauthToken=Testimoni OAuth2
 accessType=Tipus d'accés
 oauthService=Servei d'Oauth
 TokenMustHaveBeenCreated=El mòdul OAuth2 ha d'estar habilitat i s'ha d'haver creat un testimoni oauth2 amb els permisos correctes (per exemple, l'àmbit "gmail_full" amb OAuth per a Gmail).
@@ -2340,7 +2345,7 @@ INVOICE_ADD_ZATCA_QR_CODEMore=Alguns països àrabs necessiten aquest codi QR a
 INVOICE_ADD_SWISS_QR_CODE=Mostra el codi QR-Bill suís a les factures
 INVOICE_ADD_SWISS_QR_CODEMore=Switzerland's standard for invoices; make sure ZIP & City are filled and that the accounts have valid Swiss/Liechtenstein IBANs.
 INVOICE_SHOW_SHIPPING_ADDRESS=Mostra l'adreça d'enviament
-INVOICE_SHOW_SHIPPING_ADDRESSMore=Compulsory indication in some countries (France, ...)
+INVOICE_SHOW_SHIPPING_ADDRESSMore=Indicació obligatòria en alguns països (França, ...)
 UrlSocialNetworksDesc=Enllaç URL de la xarxa social. Utilitzeu {socialid} per a la part variable que conté l'identificador de la xarxa social.
 IfThisCategoryIsChildOfAnother=Si aquesta categoria és fill d'una altra
 DarkThemeMode=Mode de tema fosc
@@ -2368,12 +2373,12 @@ DefinedAPathForAntivirusCommandIntoSetup=Definiu un camí per a un programa anti
 TriggerCodes=Esdeveniments desencadenants
 TriggerCodeInfo=Introduïu aquí els codis activadors que han de generar una publicació d'una sol·licitud web (només es permet l'URL extern). Podeu introduir diversos codis d'activació separats per una coma.
 EditableWhenDraftOnly=Si no està marcat, el valor només es pot modificar quan l'objecte té un estat d'esborrany
-CssOnEdit=CSS on edit pages
-CssOnView=CSS on view pages
-CssOnList=CSS on lists
-HelpCssOnEditDesc=The CSS used when editing the field.<br>Example: "minwiwdth100 maxwidth500 widthcentpercentminusx"
-HelpCssOnViewDesc=The CSS used when viewing the field.
-HelpCssOnListDesc=The CSS used when field is inside a list table.<br>Example: "tdoverflowmax200"
+CssOnEdit=CSS a les pàgines d'edició
+CssOnView=CSS a les pàgines de visualització
+CssOnList=CSS als llistats
+HelpCssOnEditDesc=El CSS utilitzat en editar el camp.<br>Exemple: «minwiwdth100 maxwidth500 widthcentpercentminusx»
+HelpCssOnViewDesc=El CSS utilitzat en visualitzar el camp.
+HelpCssOnListDesc=El CSS utilitzat quan el camp es troba dins d'una taula de llista.<br>Exemple: «tdoverflowmax200»
 RECEPTION_PDF_HIDE_ORDERED=Amaga la quantitat demanada als documents generats per a recepcions
 MAIN_PDF_RECEPTION_DISPLAY_AMOUNT_HT=Mostra el preu als documents generats per a recepcions
 WarningDisabled=Avís desactivat
@@ -2399,5 +2404,5 @@ DefaultForTypeDesc=Plantilla utilitzada per defecte quan es crea un correu elect
 OptionXShouldBeEnabledInModuleY=L'opció «<b>%s</b>» s'ha d'habilitar al mòdul <b>%s</b> 
 OptionXIsCorrectlyEnabledInModuleY=L'opció «<b>%s</b>» està habilitada al mòdul <b>%s</b> 
 AtBottomOfPage=A la part inferior de la pàgina
-FailedAuth=failed authentications
-MaxNumberOfFailedAuth=Max number of failed authentication in 24h to disable login.
+FailedAuth=autenticacions fallides
+MaxNumberOfFailedAuth=Nombre màxim d'autenticacions fallides en 24 hores per a denegar l'inici de sessió.
diff --git a/htdocs/langs/ca_ES/banks.lang b/htdocs/langs/ca_ES/banks.lang
index db51abae3a1..b4ddff39f3c 100644
--- a/htdocs/langs/ca_ES/banks.lang
+++ b/htdocs/langs/ca_ES/banks.lang
@@ -60,7 +60,7 @@ EditFinancialAccount=Edició compte
 LabelBankCashAccount=Nom del banc o de l'efectiu
 AccountType=Tipus de compte
 BankType0=Compte d'estalvis
-BankType1=Current, cheque or credit card account
+BankType1=Compte corrent, de xec o de targeta de crèdit
 BankType2=Compte caixa/efectiu
 AccountsArea=Àrea comptes
 AccountCard=Fitxa compte
@@ -106,8 +106,8 @@ BankLineNotReconciled=No conciliat
 CustomerInvoicePayment=Cobrament a client
 SupplierInvoicePayment=Pagament al proveïdor
 SubscriptionPayment=Pagament de quota
-WithdrawalPayment=Direct Debit payment
-BankTransferPayment=Credit Transfer payment
+WithdrawalPayment=Pagament per domiciliació bancària
+BankTransferPayment=Pagament per transferència de crèdit
 SocialContributionPayment=Pagament d'impostos varis
 BankTransfer=Transferència bancària
 BankTransfers=Transferències bancàries
diff --git a/htdocs/langs/ca_ES/bills.lang b/htdocs/langs/ca_ES/bills.lang
index 206c75837c8..3bfd7eff439 100644
--- a/htdocs/langs/ca_ES/bills.lang
+++ b/htdocs/langs/ca_ES/bills.lang
@@ -164,7 +164,7 @@ BillFrom=Emissor
 BillTo=Enviar a
 ShippingTo=L'enviament a
 ActionsOnBill=Accions en la factura
-ActionsOnBillRec=Actions on recurring invoice
+ActionsOnBillRec=Accions sobre factura recurrent
 RecurringInvoiceTemplate=Plantilla / Factura recurrent
 NoQualifiedRecurringInvoiceTemplateFound=No es pot generar cap factura de plantilla periòdica.
 FoundXQualifiedRecurringInvoiceTemplate=S'han trobat %s factures recurrents de plantilla qualificades per a la generació.
@@ -197,7 +197,7 @@ ConfirmClassifyPaidPartiallyReasonDiscount=La resta a pagar <b>(%s %s)</b> és u
 ConfirmClassifyPaidPartiallyReasonDiscountNoVat=La resta a pagar <b>(%s %s)</b> és un descompte acordat després de la facturació. Accepto perdre l'IVA d'aquest descompte
 ConfirmClassifyPaidPartiallyReasonDiscountVat=La resta a pagar <b>(%s %s)</b> és un descompte atorgat perquè el pagament es va fer abans de temps. Recupero l'IVA d'aquest descompte, sense un abonament.
 ConfirmClassifyPaidPartiallyReasonBadCustomer=Client morós
-ConfirmClassifyPaidPartiallyReasonBadSupplier=Bad vendor
+ConfirmClassifyPaidPartiallyReasonBadSupplier=Mal venedor
 ConfirmClassifyPaidPartiallyReasonBankCharge=Deducció per banc (comissió bancària)
 ConfirmClassifyPaidPartiallyReasonWithholdingTax=Retenció d'impostos
 ConfirmClassifyPaidPartiallyReasonProductReturned=Productes retornats en part
@@ -210,7 +210,7 @@ ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=Aquesta elecció és possi
 ConfirmClassifyPaidPartiallyReasonBankChargeDesc=L'import no pagat son <b>comissions bancàries</b>, deduïdes directament de <b>l'import correcte</b> pagat pel Client.
 ConfirmClassifyPaidPartiallyReasonWithholdingTaxDesc=L'import no pagat mai es pagarà ja que es tracta d'una retenció a la font
 ConfirmClassifyPaidPartiallyReasonOtherDesc=Utilitza aquesta opció si totes les altres no són adequades, per exemple, en la següent situació: <br>- el pagament no s'ha completat perquè alguns productes es van tornar a enviar<br>- la quantitat reclamada és massa important perquè s'ha oblidat un descompte <br>En tots els casos, s'ha de corregir l'import excessiu en el sistema de comptabilitat mitjançant la creació d’un abonament.
-ConfirmClassifyPaidPartiallyReasonBadSupplierDesc=A <b>bad supplier</b> is a supplier we refuse to pay.
+ConfirmClassifyPaidPartiallyReasonBadSupplierDesc=Un <b>mal proveïdor</b> és un proveïdor que ens neguem a pagar.
 ConfirmClassifyAbandonReasonOther=Altres
 ConfirmClassifyAbandonReasonOtherDesc=Aquesta elecció serà per a qualsevol altre cas. Per exemple arran de la intenció de crear una factura rectificativa.
 ConfirmCustomerPayment=Confirmes aquesta entrada de pagament per a <b>%s</b> %s?
diff --git a/htdocs/langs/ca_ES/dict.lang b/htdocs/langs/ca_ES/dict.lang
index a72af1908d1..8af56ff3bac 100644
--- a/htdocs/langs/ca_ES/dict.lang
+++ b/htdocs/langs/ca_ES/dict.lang
@@ -137,7 +137,7 @@ CountryLV=Letònia
 CountryLB=Líban
 CountryLS=Lesotho
 CountryLR=Libèria
-CountryLY=Libya
+CountryLY=Líbia
 CountryLI=Liechtenstein
 CountryLT=Lituània
 CountryLU=Luxemburg
diff --git a/htdocs/langs/ca_ES/errors.lang b/htdocs/langs/ca_ES/errors.lang
index cfac7520f96..a9defc87d6a 100644
--- a/htdocs/langs/ca_ES/errors.lang
+++ b/htdocs/langs/ca_ES/errors.lang
@@ -318,8 +318,10 @@ ErrorTheUrlOfYourDolInstanceDoesNotMatchURLIntoOAuthSetup=Error: The URL of you
 ErrorMenuExistValue=Ja existeix un menú amb aquest títol o URL
 ErrorSVGFilesNotAllowedAsLinksWithout=Els fitxers SVG no es permeten com a enllaços externs sense l'opció %s
 ErrorTypeMenu=Impossible afegir un altre menú per al mateix mòdul a la barra de navegació, encara no es gestiona
-ErrorTableExist=Table <b>%s</b> already exist
-ErrorDictionaryNotFound=Dictionary <b>%s</b> not found
+ErrorTableExist=La taula <b>%s</b> ja existeix
+ErrorDictionaryNotFound=No s'ha trobat el diccionari <b>%s</b>
+ErrorFailedToCreateSymLinkToMedias=Failed to create the symlinks %s to point to %s
+
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=El paràmetre PHP upload_max_filesize (%s) és superior al paràmetre PHP post_max_size (%s). No es tracta d’una configuració consistent.
 WarningPasswordSetWithNoAccount=S'ha establert una contrasenya per a aquest soci. Tot i això, no s'ha creat cap compte d'usuari. Per tant, aquesta contrasenya s’emmagatzema però no es pot utilitzar per a iniciar la sessió a Dolibarr. Pot ser utilitzat per un mòdul/interfície extern, però si no necessiteu definir cap inici de sessió ni contrasenya per a un soci, podeu desactivar l'opció "Gestiona un inici de sessió per a cada soci" des de la configuració del mòdul Socis. Si heu de gestionar un inici de sessió però no necessiteu cap contrasenya, podeu mantenir aquest camp buit per a evitar aquesta advertència. Nota: El correu electrònic també es pot utilitzar com a inici de sessió si el soci està enllaçat amb un usuari.
@@ -360,7 +362,7 @@ WarningAutoValNotPossibleWhenStockIsDecreasedOnInvoiceVal=La validació automàt
 WarningModuleNeedRefrech = El mòdul <b>%s</b> s'ha desactivat. No oblideu activar-lo
 WarningPermissionAlreadyExist=Permisos existents per a aquest objecte
 WarningGoOnAccountancySetupToAddAccounts=If this list is empty, go into menu %s - %s - %s to load or create accounts for your chart of account.
-WarningCorrectedInvoiceNotFound=Corrected invoice not found
+WarningCorrectedInvoiceNotFound=No s'ha trobat la factura corregida
 
 SwissQrOnlyVIR = SwissQR invoice can only be added on invoices set to be paid with credit transfer payments.
 SwissQrCreditorAddressInvalid = L'adreça del creditor no és vàlida (s'han definit el codi postal i la ciutat? (%s)
@@ -389,4 +391,4 @@ BadSetupOfField = S'ha produït un error en configurar el camp
 BadSetupOfFieldClassNotFoundForValidation = Error de configuració incorrecta del camp: no s'ha trobat la classe per a la validació
 BadSetupOfFieldFileNotFound = Error de configuració incorrecta del camp: no s'ha trobat el fitxer per a incloure'l
 BadSetupOfFieldFetchNotCallable = Error de configuració incorrecta del camp: la recuperació no es pot trucar a la classe
-ErrorTooManyAttempts= Too many attempts, please try again later
+ErrorTooManyAttempts= Massa intents, torna-ho a provar més tard
diff --git a/htdocs/langs/ca_ES/languages.lang b/htdocs/langs/ca_ES/languages.lang
index 050d19fc8db..84ea3561982 100644
--- a/htdocs/langs/ca_ES/languages.lang
+++ b/htdocs/langs/ca_ES/languages.lang
@@ -123,6 +123,6 @@ Language_ur_PK=Urdú
 Language_uz_UZ=Uzbek
 Language_vi_VN=Vietnamita
 Language_zh_CN=Xinès
-Language_zh_TW=Chinese (Taiwan)
+Language_zh_TW=Xinès (Taiwan)
 Language_zh_HK=Xinès (Hong Kong)
 Language_bh_MY=Malai
diff --git a/htdocs/langs/ca_ES/main.lang b/htdocs/langs/ca_ES/main.lang
index 9165b03a67d..3f39fbfc92f 100644
--- a/htdocs/langs/ca_ES/main.lang
+++ b/htdocs/langs/ca_ES/main.lang
@@ -235,8 +235,8 @@ PersonalValue=Valor personalitzat
 NewObject=Nou %s
 NewValue=Valor nou
 OldValue=Valor antic %s
-FieldXModified=Field %s modified
-FieldXModifiedFromYToZ=Field %s modified from %s to %s
+FieldXModified=S'ha modificat el camp %s
+FieldXModifiedFromYToZ=El camp %s s'ha modificat de %s a %s
 CurrentValue=Valor actual
 Code=Codi
 Type=Tipus
@@ -348,7 +348,7 @@ MonthOfDay=Mes del dia
 DaysOfWeek=Dies de la setmana
 HourShort=H
 MinuteShort=Minut
-SecondShort=sec
+SecondShort=seg
 Rate=Tipus
 CurrencyRate=Tarifa de conversió de moneda
 UseLocalTax=Inclou impostos
@@ -558,7 +558,7 @@ Unknown=Desconegut
 General=General
 Size=Mida
 OriginalSize=Mida original
-RotateImage=Rotate 90°
+RotateImage=Gira 90°
 Received=Rebut
 Paid=Pagat
 Topic=Assumpte
@@ -1235,5 +1235,7 @@ DropFileToAddItToObject=Deixeu anar un fitxer per a afegir-lo en aquest objecte
 UploadFileDragDropSuccess=Els fitxers s'han penjat correctament
 SearchSyntaxTooltipForStringOrNum=For searching inside text fields, you can use the characters ^ or $ to make a 'start or end with' search or use the ! to make a 'does not contain' test. You can use the | between two strings instead of a space for a 'OR' condition instead of 'AND'. For numeric values, you can use the operator <, >, <=, >= or != before the value, to filter using a mathematical comparison
 InProgress=En progrés
-DateOfPrinting=Date of printing
-ClickFullScreenEscapeToLeave=Click here to switch in Full screen mode. Press ESCAPE to leave Full screen mode.
+DateOfPrinting=Data d'impressió
+ClickFullScreenEscapeToLeave=Feu clic aquí per a canviar al mode de pantalla completa. Premeu ESCAPE per a sortir del mode de pantalla completa.
+UserNotYetValid=Encara no vàlid
+UserExpired=No al dia
diff --git a/htdocs/langs/ca_ES/modulebuilder.lang b/htdocs/langs/ca_ES/modulebuilder.lang
index 8cad3243f00..69d49e7603f 100644
--- a/htdocs/langs/ca_ES/modulebuilder.lang
+++ b/htdocs/langs/ca_ES/modulebuilder.lang
@@ -163,11 +163,11 @@ ListOfTabsEntries=Llista d'entrades de pestanyes
 TabsDefDesc=Definiu aquí les pestanyes proporcionades pel vostre mòdul
 TabsDefDescTooltip=Les pestanyes proporcionades pel vostre mòdul/aplicació es defineixen a la matriu <strong> $this->tabs </strong> al fitxer descriptor del mòdul. Podeu editar manualment aquest fitxer o utilitzar l'editor incrustat.
 BadValueForType=Valor incorrecte per al tipus %s
-DefinePropertiesFromExistingTable=Definiu propietats a partir d'una taula existent
+DefinePropertiesFromExistingTable=Definiu els camps/propietats d'una taula existent
 DefinePropertiesFromExistingTableDesc=Si ja existeix una taula a la base de dades (per a que l'objecte es creï), podeu utilitzar-la per a definir les propietats de l'objecte.
 DefinePropertiesFromExistingTableDesc2=Manteniu-lo buit si la taula encara no existeix. El generador de codi utilitzarà diferents tipus de camps per a crear un exemple de taula que podeu editar més tard.
-GeneratePermissions=Vull afegir els permisos d'aquest objecte
-GeneratePermissionsHelp=generar permisos per defecte per a aquest objecte
+GeneratePermissions=Vull gestionar els permisos d'aquest objecte
+GeneratePermissionsHelp=Si marqueu això, s'afegirà algun codi per a gestionar els permisos per a consultar, escriure i eliminar registres dels objectes
 PermissionDeletedSuccesfuly=El permís s'ha eliminat correctament
 PermissionUpdatedSuccesfuly=El permís s'ha actualitzat correctament
 PermissionAddedSuccesfuly=El permís s'ha afegit correctament
@@ -178,5 +178,6 @@ ApiObjectDeleted=API per a l'objecte %s s'ha suprimit correctament
 CRUDRead=Llegit
 CRUDCreateWrite=Crea o Actualitza
 FailedToAddCodeIntoDescriptor=No s'ha pogut afegir el codi al descriptor. Comproveu que la cadena de comentaris «%s» encara està present al fitxer.
-DictionariesCreated=Dictionary <b>%s</b> created successfully
-DictionaryDeleted=Dictionary <b>%s</b> removed successfully
+DictionariesCreated=Diccionari <b>%s</b> creat correctament
+DictionaryDeleted=El diccionari <b>%s</b> s'ha eliminat correctament
+PropertyModuleUpdated=La propietat <b>%s</b> s'ha actualitzat correctament
diff --git a/htdocs/langs/ca_ES/other.lang b/htdocs/langs/ca_ES/other.lang
index 77873bf5a17..d95beef2845 100644
--- a/htdocs/langs/ca_ES/other.lang
+++ b/htdocs/langs/ca_ES/other.lang
@@ -300,6 +300,7 @@ ConfirmBtnCommonContent = Esteu segur que voleu «%s»?
 ConfirmBtnCommonTitle = Confirmeu la vostra acció
 CloseDialog = Tancar
 Autofill = Emplenament automàtic
+OrPasteAnURL=o Enganxeu un URL
 
 # externalsite
 ExternalSiteSetup=Configuració de l'enllaç a la pàgina web externa
diff --git a/htdocs/langs/ca_ES/stocks.lang b/htdocs/langs/ca_ES/stocks.lang
index 1878ecb0cf0..39753678b2f 100644
--- a/htdocs/langs/ca_ES/stocks.lang
+++ b/htdocs/langs/ca_ES/stocks.lang
@@ -321,5 +321,5 @@ BatchNotFound=No s'ha trobat lot / sèrie per a aquest producte
 StockMovementWillBeRecorded=Es registrarà el moviment d'estoc
 StockMovementNotYetRecorded=El moviment d'estoc no es veurà afectat per aquest pas
 WarningThisWIllAlsoDeleteStock=Advertència, això també destruirà totes les quantitats en estoc al magatzem
-DeleteBatch=Delete lot/serial
-ConfirmDeleteBatch=Are you sure you want to delete lot/serial ?
+DeleteBatch=Esborra el lot/sèrie
+ConfirmDeleteBatch=Esteu segur que voleu suprimir el lot/sèrie?
diff --git a/htdocs/langs/ca_ES/stripe.lang b/htdocs/langs/ca_ES/stripe.lang
index 5d48ba5d7a1..626f31604d4 100644
--- a/htdocs/langs/ca_ES/stripe.lang
+++ b/htdocs/langs/ca_ES/stripe.lang
@@ -51,7 +51,7 @@ StripeAccount=Compte de Stripe
 StripeChargeList=Llista de càrregues de Stripe
 StripeTransactionList=Llista de transaccions de Stripe
 StripeCustomerId=ID de client de Stripe
-StripePaymentId=Stripe payment id
+StripePaymentId=Id de pagament de Stripe
 StripePaymentModes=Formes de pagament de Stripe
 LocalID=ID local
 StripeID=ID de Stripe
diff --git a/htdocs/langs/ca_ES/supplier_proposal.lang b/htdocs/langs/ca_ES/supplier_proposal.lang
index ab16b6920c5..eb412f85987 100644
--- a/htdocs/langs/ca_ES/supplier_proposal.lang
+++ b/htdocs/langs/ca_ES/supplier_proposal.lang
@@ -42,7 +42,8 @@ SendAskRef=Enviant la petició de preu %s
 SupplierProposalCard=Fitxa de petició
 ConfirmDeleteAsk=Estàs segur que vols suprimir aquest preu de sol·licitud <b>%s</b>?
 ActionsOnSupplierProposal=Esdeveniments en petició de preu
-DocModelAuroreDescription=Model de petició completa (logo...)
+DocModelAuroreDescription=A complete template for a vendor quotation request template (old implementation of Sponge template)
+DocModelZenithDescription=A complete template for a vendor quotation request template
 CommercialAsk=Petició de preu
 DefaultModelSupplierProposalCreate=Model de creació per defecte
 DefaultModelSupplierProposalToBill=Model per defecte en tancar una petició de preu (acceptada)
diff --git a/htdocs/langs/ca_ES/ticket.lang b/htdocs/langs/ca_ES/ticket.lang
index 62d43e7597c..9f26d3a414e 100644
--- a/htdocs/langs/ca_ES/ticket.lang
+++ b/htdocs/langs/ca_ES/ticket.lang
@@ -126,9 +126,9 @@ TicketParams=Paràmetres
 TicketsShowModuleLogo=Mostra el logotip del mòdul a la interfície pública
 TicketsShowModuleLogoHelp=Activeu aquesta opció per a ocultar el mòdul de logotip a les pàgines de la interfície pública
 TicketsShowCompanyLogo=Mostra el logotip de l'empresa en la interfície pública
-TicketsShowCompanyLogoHelp=Enable this option to show the logo of the main company in the pages of the public interface
-TicketsShowCompanyFooter=Display the footer of the company in the public interface
-TicketsShowCompanyFooterHelp=Enable this option to show the footer of the main company in the pages of the public interface
+TicketsShowCompanyLogoHelp=Activeu aquesta opció per a mostrar el logotip de l'empresa principal a les pàgines de la interfície pública
+TicketsShowCompanyFooter=Mostra el peu de pàgina de l'empresa a la interfície pública
+TicketsShowCompanyFooterHelp=Activeu aquesta opció per a mostrar el peu de pàgina de l'empresa principal a les pàgines de la interfície pública
 TicketsEmailAlsoSendToMainAddress=També envieu una notificació a l’adreça de correu electrònic principal
 TicketsEmailAlsoSendToMainAddressHelp=Activeu aquesta opció per a enviar també un correu electrònic a l'adreça definida a la configuració "%s" (vegeu la pestanya "%s")
 TicketsLimitViewAssignedOnly=Restringir la visualització als tiquets assignats a l'usuari actual (no és efectiu per als usuaris externs, sempre estarà limitat al tercer de qui depengui)
@@ -329,8 +329,8 @@ OldUser=Usuari antic
 NewUser=Usuari nou
 NumberOfTicketsByMonth=Nombre d’entrades mensuals
 NbOfTickets=Nombre d’entrades
-ExternalContributors=External contributors
-AddContributor=Add external contributor
+ExternalContributors=Col·laboradors externs
+AddContributor=Afegeix un col·laborador extern
 
 # notifications
 TicketCloseEmailSubjectCustomer=Tiquet tancat
diff --git a/htdocs/langs/ca_ES/users.lang b/htdocs/langs/ca_ES/users.lang
index eaf315b8777..77b31af120e 100644
--- a/htdocs/langs/ca_ES/users.lang
+++ b/htdocs/langs/ca_ES/users.lang
@@ -99,7 +99,7 @@ YourRole=Els seus rols
 YourQuotaOfUsersIsReached=Ha arribat a la seva quota d'usuaris actius!
 NbOfUsers=Nombre d'usuaris
 NbOfPermissions=Nombre de permisos
-DontDowngradeSuperAdmin=Only another admin can downgrade an admin
+DontDowngradeSuperAdmin=Només un altre administrador pot rebaixar el nivell d'un administrador
 HierarchicalResponsible=Supervisor
 HierarchicView=Vista jeràrquica
 UseTypeFieldToChange=Utilitzeu el camp Tipus per a canviar
diff --git a/htdocs/langs/ca_ES/website.lang b/htdocs/langs/ca_ES/website.lang
index caf69bc7f4a..4eb3a931fa7 100644
--- a/htdocs/langs/ca_ES/website.lang
+++ b/htdocs/langs/ca_ES/website.lang
@@ -158,5 +158,5 @@ Reservation=Reserva
 PagesViewedPreviousMonth=Pàgines vistes (mes anterior)
 PagesViewedTotal=Pàgines vistes (total)
 Visibility=Visibilitat
-Everyone=Everyone
-AssignedContacts=Assigned contacts
+Everyone=Tothom
+AssignedContacts=Contactes assignats
diff --git a/htdocs/langs/cs_CZ/accountancy.lang b/htdocs/langs/cs_CZ/accountancy.lang
index fde4e63c17b..7937e37ea94 100644
--- a/htdocs/langs/cs_CZ/accountancy.lang
+++ b/htdocs/langs/cs_CZ/accountancy.lang
@@ -57,11 +57,14 @@ WarningDataDisappearsWhenDataIsExported=Warning, this list contains only the acc
 VueByAccountAccounting=View by accounting account
 VueBySubAccountAccounting=View by accounting subaccount
 
-MainAccountForCustomersNotDefined=Hlavní účetní účetnictví pro zákazníky, které nejsou definovány v nastavení
-MainAccountForSuppliersNotDefined=Hlavní účty účetnictví pro dodavatele, které nejsou definovány v nastavení
-MainAccountForUsersNotDefined=Hlavní účetní účetnictví pro uživatele, které nejsou definovány v nastavení
-MainAccountForVatPaymentNotDefined=Účet hlavního účtu pro platbu DPH není definována v nastavení
-MainAccountForSubscriptionPaymentNotDefined=Účet hlavního účtu je platba předplatného, která není definována v nastavení
+MainAccountForCustomersNotDefined=Main account (from the Chart of Account) for customers not defined in setup
+MainAccountForSuppliersNotDefined=Main account (from the Chart of Account) for vendors not defined in setup
+MainAccountForUsersNotDefined=Main account (from the Chart of Account) for users not defined in setup
+MainAccountForRevenueStampSaleNotDefined=Account (from the Chart of Account) for the revenue stamp (sales) not defined in setup
+MainAccountForRevenueStampPurchaseNotDefined=Account (from the Chart of Account) for the revenue stamp (purchases) not defined in setup
+MainAccountForVatPaymentNotDefined=Account (from the Chart of Account) for VAT payment not defined in setup
+MainAccountForSubscriptionPaymentNotDefined=Account (from the Chart of Account) for membership payment not defined in setup
+MainAccountForRetainedWarrantyNotDefined=Account (from the Chart of Account) for the retained warranty not defined in setup
 UserAccountNotDefined=Accounting account for user not defined in setup
 
 AccountancyArea=Účetní oblast
diff --git a/htdocs/langs/cs_CZ/admin.lang b/htdocs/langs/cs_CZ/admin.lang
index 6de44151cd1..60561531a7c 100644
--- a/htdocs/langs/cs_CZ/admin.lang
+++ b/htdocs/langs/cs_CZ/admin.lang
@@ -1509,7 +1509,8 @@ WatermarkOnDraftContractCards=Vodoznak v návrhu smlouvy (žádný, je-li prázd
 MembersSetup=Nastavení modulu členů
 MemberMainOptions=Hlavní volby
 MemberCodeChecker=Options for automatic generation of member codes
-AdherentLoginRequired= Správa Přihlášení pro každého člena
+AdherentLoginRequired=Manage a login/password for each member
+AdherentLoginRequiredDesc=Add a value for a login and a password on the member file. If the member is linked to a user, updating the member login and password will also update the user login and password.
 AdherentMailRequired=K vytvoření nového člena je třeba e-mail
 MemberSendInformationByMailByDefault=Zaškrtávací políčko poslat mailem potvrzení členům (validace nebo nové předplatné) je ve výchozím nastavení
 MemberCreateAnExternalUserForSubscriptionValidated=Create an external user login for each new member subscription validated
@@ -2076,6 +2077,10 @@ MAIN_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
 DOC_SHOW_FIRST_SALES_REP=Show first sales representative
 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_GENERATE_DOCUMENTS_SUPPLIER_PROPOSAL_WITHOUT_UNIT_PRICE=Hide the unit price column on quotation requests
+MAIN_GENERATE_DOCUMENTS_SUPPLIER_PROPOSAL_WITHOUT_TOTAL_COLUMN=Hide the total price column on quotation requests
+MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_UNIT_PRICE=Hide the unit price column on purchase orders
+MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_TOTAL_COLUMN=Hide the total price column on puchase orders
 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
@@ -2400,4 +2405,4 @@ OptionXShouldBeEnabledInModuleY=Option "<b>%s</b>" should be enabled into module
 OptionXIsCorrectlyEnabledInModuleY=Option "<b>%s</b>" is enabled into module <b>%s</b>
 AtBottomOfPage=At bottom of page
 FailedAuth=failed authentications
-MaxNumberOfFailedAuth=Max number of failed authentication in 24h to disable login.
+MaxNumberOfFailedAuth=Max number of failed authentication in 24h to deny login.
diff --git a/htdocs/langs/cs_CZ/main.lang b/htdocs/langs/cs_CZ/main.lang
index 8e35aafd0fd..7c29942e675 100644
--- a/htdocs/langs/cs_CZ/main.lang
+++ b/htdocs/langs/cs_CZ/main.lang
@@ -1237,3 +1237,5 @@ SearchSyntaxTooltipForStringOrNum=For searching inside text fields, you can use
 InProgress=probíhá
 DateOfPrinting=Date of printing
 ClickFullScreenEscapeToLeave=Click here to switch in Full screen mode. Press ESCAPE to leave Full screen mode.
+UserNotYetValid=Not yet valid
+UserExpired=Vypršela
diff --git a/htdocs/langs/cs_CZ/supplier_proposal.lang b/htdocs/langs/cs_CZ/supplier_proposal.lang
index 4291db37a11..f9857d16cde 100644
--- a/htdocs/langs/cs_CZ/supplier_proposal.lang
+++ b/htdocs/langs/cs_CZ/supplier_proposal.lang
@@ -13,6 +13,7 @@ SupplierProposalArea=Oblast návrhů dodavatele
 SupplierProposalShort=Návrh dodavatele
 SupplierProposals=Návrhy dodavatele
 SupplierProposalsShort=Návrhy dodavatele
+AskPrice=Cenový požadavek
 NewAskPrice=Nový cenový poožadavek
 ShowSupplierProposal=Zobrazit cenový požadavek
 AddSupplierProposal=Vytvoření cenového požadavku
@@ -41,7 +42,8 @@ SendAskRef=Zaslání cenového požadavku %s
 SupplierProposalCard=žádost o kartu
 ConfirmDeleteAsk=Opravdu chcete tuto cenovou žádost <b> %s </ b> smazat?
 ActionsOnSupplierProposal=Události cenových požadavků
-DocModelAuroreDescription=Kompletní model, žádost (logo ...)
+DocModelAuroreDescription=A complete template for a vendor quotation request template (old implementation of Sponge template)
+DocModelZenithDescription=A complete template for a vendor quotation request template
 CommercialAsk=Cenový požadavek
 DefaultModelSupplierProposalCreate=Tvorba z výchozí šablony
 DefaultModelSupplierProposalToBill=Výchozí šablona při zavírání cenového požadavku (vzat v potaz)
@@ -52,3 +54,6 @@ SupplierProposalsToClose=Uzavřené návrhy dodavatele
 SupplierProposalsToProcess=Návrhy dodavatele ve zpracování
 LastSupplierProposals=Poslední žádosti %s cena
 AllPriceRequests=Všechny žádosti
+TypeContact_supplier_proposal_external_SHIPPING=Vendor contact for delivery
+TypeContact_supplier_proposal_external_BILLING=Vendor contact for billing
+TypeContact_supplier_proposal_external_SERVICE=Zástupce následující vypracované nabídky
diff --git a/htdocs/langs/cy_GB/accountancy.lang b/htdocs/langs/cy_GB/accountancy.lang
index 78cf9834d6a..450afa974ba 100644
--- a/htdocs/langs/cy_GB/accountancy.lang
+++ b/htdocs/langs/cy_GB/accountancy.lang
@@ -57,11 +57,14 @@ WarningDataDisappearsWhenDataIsExported=Warning, this list contains only the acc
 VueByAccountAccounting=Gweld yn ôl cyfrif cyfrifeg
 VueBySubAccountAccounting=Gweld trwy isgyfrif cyfrifo
 
-MainAccountForCustomersNotDefined=Prif gyfrif cyfrifo ar gyfer cwsmeriaid heb ei ddiffinio yn y gosodiad
-MainAccountForSuppliersNotDefined=Prif gyfrif cyfrifo ar gyfer gwerthwyr heb ei ddiffinio yn y gosodiad
-MainAccountForUsersNotDefined=Prif gyfrif cyfrifo ar gyfer defnyddwyr heb ei ddiffinio yn y gosodiad
-MainAccountForVatPaymentNotDefined=Prif gyfrif cyfrifo ar gyfer taliad TAW heb ei ddiffinio yn y gosodiad
-MainAccountForSubscriptionPaymentNotDefined=Prif gyfrif cyfrifo ar gyfer taliad tanysgrifiad heb ei ddiffinio yn y gosodiad
+MainAccountForCustomersNotDefined=Main account (from the Chart of Account) for customers not defined in setup
+MainAccountForSuppliersNotDefined=Main account (from the Chart of Account) for vendors not defined in setup
+MainAccountForUsersNotDefined=Main account (from the Chart of Account) for users not defined in setup
+MainAccountForRevenueStampSaleNotDefined=Account (from the Chart of Account) for the revenue stamp (sales) not defined in setup
+MainAccountForRevenueStampPurchaseNotDefined=Account (from the Chart of Account) for the revenue stamp (purchases) not defined in setup
+MainAccountForVatPaymentNotDefined=Account (from the Chart of Account) for VAT payment not defined in setup
+MainAccountForSubscriptionPaymentNotDefined=Account (from the Chart of Account) for membership payment not defined in setup
+MainAccountForRetainedWarrantyNotDefined=Account (from the Chart of Account) for the retained warranty not defined in setup
 UserAccountNotDefined=Accounting account for user not defined in setup
 
 AccountancyArea=Maes cyfrifo
diff --git a/htdocs/langs/cy_GB/admin.lang b/htdocs/langs/cy_GB/admin.lang
index d03b9d27052..953868073fe 100644
--- a/htdocs/langs/cy_GB/admin.lang
+++ b/htdocs/langs/cy_GB/admin.lang
@@ -1509,7 +1509,8 @@ WatermarkOnDraftContractCards=Dyfrnod ar gontractau drafft (dim os yn wag)
 MembersSetup=Gosod modiwl aelodau
 MemberMainOptions=Prif opsiynau
 MemberCodeChecker=Options for automatic generation of member codes
-AdherentLoginRequired= Rheoli Mewngofnodi ar gyfer pob aelod
+AdherentLoginRequired=Manage a login/password for each member
+AdherentLoginRequiredDesc=Add a value for a login and a password on the member file. If the member is linked to a user, updating the member login and password will also update the user login and password.
 AdherentMailRequired=Mae angen e-bost i greu aelod newydd
 MemberSendInformationByMailByDefault=Mae'r blwch ticio i anfon cadarnhad post at aelodau (dilysiad neu danysgrifiad newydd) ymlaen yn ddiofyn
 MemberCreateAnExternalUserForSubscriptionValidated=Creu mewngofnod defnyddiwr allanol ar gyfer pob tanysgrifiad aelod newydd a ddilysir
@@ -2076,6 +2077,10 @@ MAIN_DOCUMENTS_LOGO_HEIGHT=Uchder ar gyfer y logo ar PDF
 DOC_SHOW_FIRST_SALES_REP=Show first sales representative
 MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Ychwanegu colofn ar gyfer llun ar linellau cynnig
 MAIN_DOCUMENTS_WITH_PICTURE_WIDTH=Lled y golofn os ychwanegir llun ar linellau
+MAIN_GENERATE_DOCUMENTS_SUPPLIER_PROPOSAL_WITHOUT_UNIT_PRICE=Hide the unit price column on quotation requests
+MAIN_GENERATE_DOCUMENTS_SUPPLIER_PROPOSAL_WITHOUT_TOTAL_COLUMN=Hide the total price column on quotation requests
+MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_UNIT_PRICE=Hide the unit price column on purchase orders
+MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_TOTAL_COLUMN=Hide the total price column on puchase orders
 MAIN_PDF_NO_SENDER_FRAME=Cuddio borderi ar ffrâm cyfeiriad anfonwr
 MAIN_PDF_NO_RECIPENT_FRAME=Cuddio borderi ar ffrâm cyfeiriad y rysáit
 MAIN_PDF_HIDE_CUSTOMER_CODE=Cuddio cod cwsmer
@@ -2400,4 +2405,4 @@ OptionXShouldBeEnabledInModuleY=Option "<b>%s</b>" should be enabled into module
 OptionXIsCorrectlyEnabledInModuleY=Option "<b>%s</b>" is enabled into module <b>%s</b>
 AtBottomOfPage=At bottom of page
 FailedAuth=failed authentications
-MaxNumberOfFailedAuth=Max number of failed authentication in 24h to disable login.
+MaxNumberOfFailedAuth=Max number of failed authentication in 24h to deny login.
diff --git a/htdocs/langs/cy_GB/supplier_proposal.lang b/htdocs/langs/cy_GB/supplier_proposal.lang
index 628335c4ee1..c500aa70486 100644
--- a/htdocs/langs/cy_GB/supplier_proposal.lang
+++ b/htdocs/langs/cy_GB/supplier_proposal.lang
@@ -42,7 +42,8 @@ SendAskRef=Anfon y cais pris %s
 SupplierProposalCard=Cerdyn cais
 ConfirmDeleteAsk=A ydych yn siŵr eich bod am ddileu'r cais pris hwn <b> %s </b> ?
 ActionsOnSupplierProposal=Digwyddiadau ar gais pris
-DocModelAuroreDescription=Model cais cyflawn (logo...)
+DocModelAuroreDescription=A complete template for a vendor quotation request template (old implementation of Sponge template)
+DocModelZenithDescription=A complete template for a vendor quotation request template
 CommercialAsk=Cais pris
 DefaultModelSupplierProposalCreate=Creu model diofyn
 DefaultModelSupplierProposalToBill=Templed rhagosodedig wrth gau cais pris (derbynnir)
diff --git a/htdocs/langs/da_DK/accountancy.lang b/htdocs/langs/da_DK/accountancy.lang
index e6d8bc90014..4dc428df6e0 100644
--- a/htdocs/langs/da_DK/accountancy.lang
+++ b/htdocs/langs/da_DK/accountancy.lang
@@ -57,11 +57,14 @@ WarningDataDisappearsWhenDataIsExported=Advarsel, denne liste indeholder kun de
 VueByAccountAccounting=Vis efter regnskabskonto
 VueBySubAccountAccounting=Vis efter regnskabsmæssig underkonto
 
-MainAccountForCustomersNotDefined=Standardkonto for kunder, der ikke er defineret i opsætningen
-MainAccountForSuppliersNotDefined=Hoved kontokort for leverandører, der ikke er defineret i opsætningen
-MainAccountForUsersNotDefined=Standardkonto for brugere, der ikke er defineret i opsætningen
-MainAccountForVatPaymentNotDefined=Standardkonto for momsbetaling ikke defineret i opsætningen
-MainAccountForSubscriptionPaymentNotDefined=Hovedkontokonto for abonnementsbetaling, der ikke er defineret i opsætningen
+MainAccountForCustomersNotDefined=Hovedkonto (fra kontoplanen) for kunder, der ikke er defineret i opsætning
+MainAccountForSuppliersNotDefined=Hovedkonto (fra kontoplanen) for leverandører, der ikke er defineret i opsætning
+MainAccountForUsersNotDefined=Hovedkonto (fra kontoplanen) for brugere, der ikke er defineret i opsætning
+MainAccountForRevenueStampSaleNotDefined=Konto (fra kontoplanen) for indtægtsstemplet (salg), der ikke er defineret i opsætning
+MainAccountForRevenueStampPurchaseNotDefined=Konto (fra kontoplanen) for indtægtsstemplet (køb), der ikke er defineret i opsætning
+MainAccountForVatPaymentNotDefined=Konto (fra kontoplanen) til momsbetaling ikke defineret i opsætning
+MainAccountForSubscriptionPaymentNotDefined=Konto (fra kontoplanen) til medlemsbetaling ikke defineret i opsætning
+MainAccountForRetainedWarrantyNotDefined=Konto (fra kontoplanen) for den bibeholdte garanti, der ikke er defineret i opsætningen
 UserAccountNotDefined=Regnskabskonto for bruger er ikke defineret i opsætning
 
 AccountancyArea=Bogførings område
diff --git a/htdocs/langs/da_DK/admin.lang b/htdocs/langs/da_DK/admin.lang
index 1c6ae95dc2f..68597099527 100644
--- a/htdocs/langs/da_DK/admin.lang
+++ b/htdocs/langs/da_DK/admin.lang
@@ -1509,7 +1509,8 @@ WatermarkOnDraftContractCards=Vandmærke på udkast til kontrakt (ingen hvis tom
 MembersSetup=Opsætning af medlemsmodul
 MemberMainOptions=Standardmuligheder
 MemberCodeChecker=Muligheder for automatisk generering af medlemskoder
-AdherentLoginRequired= Administrer et login for hvert medlem
+AdherentLoginRequired=Administrer et login/adgangskode for hvert medlem
+AdherentLoginRequiredDesc=Tilføj en værdi for et login og en adgangskode på medlemsfilen. Hvis medlemmet er knyttet til en bruger, vil opdatering af medlemslogin og adgangskode også opdatere brugerlogin og adgangskode.
 AdherentMailRequired=E-mail påkrævet for at oprette et nyt medlem
 MemberSendInformationByMailByDefault=Afkrydsningsfeltet for at sende mailbekræftelse til medlemmer (validering eller nyt abonnement) er slået til som standard
 MemberCreateAnExternalUserForSubscriptionValidated=Opret et eksternt brugerlogin for hvert nyt medlemsabonnement, der valideres
@@ -2076,6 +2077,10 @@ MAIN_DOCUMENTS_LOGO_HEIGHT=Højde for logo på PDF
 DOC_SHOW_FIRST_SALES_REP=Vis den første salgsrepræsentant
 MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Tilføj kolonne til billede på forslagslinjer
 MAIN_DOCUMENTS_WITH_PICTURE_WIDTH=Spaltens bredde, hvis et billede tilføjes på linjer
+MAIN_GENERATE_DOCUMENTS_SUPPLIER_PROPOSAL_WITHOUT_UNIT_PRICE=Skjul enhedspriskolonnen på tilbudsanmodninger
+MAIN_GENERATE_DOCUMENTS_SUPPLIER_PROPOSAL_WITHOUT_TOTAL_COLUMN=Skjul totalpriskolonnen på tilbudsanmodninger
+MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_UNIT_PRICE=Skjul enhedspriskolonnen på indkøbsordrer
+MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_TOTAL_COLUMN=Skjul totalpriskolonnen på indkøbsordrer
 MAIN_PDF_NO_SENDER_FRAME=Skjul kanter på afsenderadresserammen
 MAIN_PDF_NO_RECIPENT_FRAME=Skjul kanter på receptadresserammen
 MAIN_PDF_HIDE_CUSTOMER_CODE=Skjul kundekode
@@ -2400,4 +2405,4 @@ OptionXShouldBeEnabledInModuleY=Indstillingen " <b> %s </b> " skal aktiveres i m
 OptionXIsCorrectlyEnabledInModuleY=Indstillingen " <b> %s </b> " er aktiveret i modulet <b> %s </b>
 AtBottomOfPage=Nederst på siden
 FailedAuth=mislykkede godkendelser
-MaxNumberOfFailedAuth=Maks. antal mislykkede godkendelser inden for 24 timer for at deaktivere login.
+MaxNumberOfFailedAuth=Maks. antal mislykkede godkendelser inden for 24 timer for at nægte login.
diff --git a/htdocs/langs/da_DK/compta.lang b/htdocs/langs/da_DK/compta.lang
index e079a679cf3..fec97edc439 100644
--- a/htdocs/langs/da_DK/compta.lang
+++ b/htdocs/langs/da_DK/compta.lang
@@ -253,6 +253,8 @@ CalculationMode=Udregningsmåde
 AccountancyJournal=Regnskabskladde
 ACCOUNTING_VAT_SOLD_ACCOUNT=Konto (fra kontoplanen) skal bruges som standardkonto for moms ved salg (bruges, hvis det ikke er defineret i opsætning af momsordbog)
 ACCOUNTING_VAT_BUY_ACCOUNT=Konto (fra kontoplanen), der skal bruges som standardkonto for moms på køb (bruges, hvis det ikke er defineret i opsætning af momsordbog)
+ACCOUNTING_REVENUESTAMP_SOLD_ACCOUNT=Konto (fra kontoplanen), der skal bruges til indtægtsstemplet ved salg
+ACCOUNTING_REVENUESTAMP_BUY_ACCOUNT=Konto (fra kontoplanen), der skal bruges til indtægtsstemplet på køb
 ACCOUNTING_VAT_PAY_ACCOUNT=Konto (fra kontoplanen), der skal bruges som standardkonto til betaling af moms
 ACCOUNTING_VAT_BUY_REVERSE_CHARGES_CREDIT=Konto (fra kontoplanen) skal bruges som standardkonto for moms på køb til omvendt betalingspligt (kredit)
 ACCOUNTING_VAT_BUY_REVERSE_CHARGES_DEBIT=Konto (fra kontoplanen) skal bruges som standardkonto for moms på køb til omvendt debitering (Debet)
diff --git a/htdocs/langs/da_DK/errors.lang b/htdocs/langs/da_DK/errors.lang
index 9579deb5878..273e1432852 100644
--- a/htdocs/langs/da_DK/errors.lang
+++ b/htdocs/langs/da_DK/errors.lang
@@ -320,6 +320,8 @@ ErrorSVGFilesNotAllowedAsLinksWithout=SVG-filer er ikke tilladt som eksterne lin
 ErrorTypeMenu=Umuligt at tilføje en anden menu for det samme modul på navbaren, ikke håndtere endnu
 ErrorTableExist=Tabel <b> %s </b> findes allerede
 ErrorDictionaryNotFound=Ordbog <b> %s </b> ikke fundet
+ErrorFailedToCreateSymLinkToMedias=Kunne ikke oprette symbollinkene %s for at pege på %s
+
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Din PHP-parameter upload_max_filesize (%s) er højere end PHP-parameter post_max_size (%s). Dette er ikke en ensartet opsætning.
 WarningPasswordSetWithNoAccount=Der blev angivet en adgangskode til dette medlem. Der blev dog ikke oprettet en brugerkonto. Så denne adgangskode er gemt, men kan ikke bruges til at logge ind på Dolibarr. Det kan bruges af et eksternt modul/interface, men hvis du ikke behøver at definere noget login eller adgangskode for et medlem, kan du deaktivere muligheden "Administrer et login for hvert medlem" fra medlemsmodulets opsætning. Hvis du har brug for at administrere et login, men ikke har brug for nogen adgangskode, kan du holde dette felt tomt for at undgå denne advarsel. Bemærk: E-mail kan også bruges som login, hvis medlemmet er knyttet til en bruger.
diff --git a/htdocs/langs/da_DK/main.lang b/htdocs/langs/da_DK/main.lang
index 0cee0975810..a0330c33ec7 100644
--- a/htdocs/langs/da_DK/main.lang
+++ b/htdocs/langs/da_DK/main.lang
@@ -1237,3 +1237,5 @@ SearchSyntaxTooltipForStringOrNum=For at søge i tekstfelter kan du bruge tegnen
 InProgress=I gang
 DateOfPrinting=Udskrivningsdato
 ClickFullScreenEscapeToLeave=Klik her for at skifte i fuldskærmstilstand. Tryk på ESCAPE for at forlade fuldskærmstilstand.
+UserNotYetValid=Ikke gyldig endnu
+UserExpired=Udløbet
diff --git a/htdocs/langs/da_DK/modulebuilder.lang b/htdocs/langs/da_DK/modulebuilder.lang
index 8a8b2ea726d..59fb2184fbf 100644
--- a/htdocs/langs/da_DK/modulebuilder.lang
+++ b/htdocs/langs/da_DK/modulebuilder.lang
@@ -163,11 +163,11 @@ ListOfTabsEntries=Liste over faneposter
 TabsDefDesc=Definer her de faner, som dit modul giver
 TabsDefDescTooltip=Fanerne, der leveres af dit modul/applikation, er defineret i arrayet <strong> $this->tabs </strong> i modulbeskrivelsesfilen. Du kan redigere denne fil manuelt eller bruge den indlejrede editor.
 BadValueForType=Forkert værdi for type %s
-DefinePropertiesFromExistingTable=Definer egenskaber fra en eksisterende tabel
+DefinePropertiesFromExistingTable=Definer felterne/egenskaberne fra en eksisterende tabel
 DefinePropertiesFromExistingTableDesc=Hvis der allerede findes en tabel i databasen (for objektet at oprette), kan du bruge den til at definere objektets egenskaber.
 DefinePropertiesFromExistingTableDesc2=Hold tom, hvis tabellen ikke eksisterer endnu. Kodegeneratoren vil bruge forskellige slags felter til at bygge et eksempel på en tabel, som du kan redigere senere.
-GeneratePermissions=Jeg vil tilføje rettighederne til dette objekt
-GeneratePermissionsHelp=generere standardrettigheder for dette objekt
+GeneratePermissions=Jeg vil administrere tilladelser på dette objekt
+GeneratePermissionsHelp=Hvis du markerer dette, vil der blive tilføjet noget kode for at administrere tilladelser til at læse, skrive og slette registrering af objekterne
 PermissionDeletedSuccesfuly=Tilladelsen er blevet fjernet
 PermissionUpdatedSuccesfuly=Tilladelsen er blevet opdateret
 PermissionAddedSuccesfuly=Tilladelsen er blevet tilføjet
@@ -180,3 +180,4 @@ CRUDCreateWrite=Opret eller opdater
 FailedToAddCodeIntoDescriptor=Kunne ikke tilføje kode i beskrivelsen. Tjek, at strengkommentaren "%s" stadig er til stede i filen.
 DictionariesCreated=Ordbog <b> %s </b> oprettet med succes
 DictionaryDeleted=Ordbog <b> %s </b> fjernet med succes
+PropertyModuleUpdated=Ejendommen <b> %s </b> er blevet opdateret.
diff --git a/htdocs/langs/da_DK/supplier_proposal.lang b/htdocs/langs/da_DK/supplier_proposal.lang
index 44cdd478f6a..9c572fd58b2 100644
--- a/htdocs/langs/da_DK/supplier_proposal.lang
+++ b/htdocs/langs/da_DK/supplier_proposal.lang
@@ -13,6 +13,7 @@ SupplierProposalArea=Forhandlerforslag område
 SupplierProposalShort=Forhandlerforslag
 SupplierProposals=Forhandlerforslag
 SupplierProposalsShort=Forhandlerforslag
+AskPrice=Prisforespørgsel
 NewAskPrice=Ny prisanmodning
 ShowSupplierProposal=Vis prisforespørgsel
 AddSupplierProposal=Lav en prisforespørgsel
@@ -41,7 +42,8 @@ SendAskRef=Afsendelse af prisanmodning %s
 SupplierProposalCard=Forespørgselskort
 ConfirmDeleteAsk=Er du sikker på, at du vil slette denne prisanmodning <b> %s </ b>?
 ActionsOnSupplierProposal=Begivenheder for prisanmodning
-DocModelAuroreDescription=En komplet anmodningsmodel (logo ...)
+DocModelAuroreDescription=En komplet skabelon til en leverandørtilbudsanmodningsskabelon (gammel implementering af Sponge-skabelon)
+DocModelZenithDescription=En komplet skabelon til en leverandørtilbudsanmodningsskabelon
 CommercialAsk=Prisforespørgsel
 DefaultModelSupplierProposalCreate=Oprettelse af skabelon
 DefaultModelSupplierProposalToBill=Standardskabelon ved afslutning af en prisforespørgsel (accepteret)
@@ -52,3 +54,6 @@ SupplierProposalsToClose=Forhandlerforslag til at lukke
 SupplierProposalsToProcess=Forhandlerforslag til behandling
 LastSupplierProposals=Seneste %s prisforespørgsler
 AllPriceRequests=Alle anmodninger
+TypeContact_supplier_proposal_external_SHIPPING=Leverandørkontakt til levering
+TypeContact_supplier_proposal_external_BILLING=Leverandørkontakt for fakturering
+TypeContact_supplier_proposal_external_SERVICE=Repræsentant for opfølgning af tilbud
diff --git a/htdocs/langs/de_AT/admin.lang b/htdocs/langs/de_AT/admin.lang
index 65ff9c0e6e3..34550f7c781 100644
--- a/htdocs/langs/de_AT/admin.lang
+++ b/htdocs/langs/de_AT/admin.lang
@@ -64,16 +64,10 @@ Permission31=Produkte/Services einsehen
 Permission32=Produkte/Services erstellen/bearbeiten
 Permission34=Produkte/Services löschen
 Permission36=Projekte/Services exportieren
-Permission41=Read projects and tasks (shared project and projects I'm contact for). Can also enter time consumed, for me or my hierarchy, on assigned tasks (Timesheet)
-Permission42=Create/modify projects (shared project and projects I'm contact for). Can also create tasks and assign users to project and tasks
-Permission44=Delete projects (shared project and projects I'm contact for)
 Permission61=Eingriffe ansehen
 Permission62=Eingriffe erstellen/bearbeiten
 Permission64=Eingriffe löschen
 Permission67=Eingriffe exportieren
-Permission141=Read all projects and tasks (also private projects for which I am not a contact)
-Permission142=Create/modify all projects and tasks (also private projects for which I am not a contact)
-Permission144=Delete all projects and tasks (also private projects i am not contact for)
 Permission172=Reisen löschen
 Permission192=Leitungen anlegen
 Permission193=Leitungen verwerfen
@@ -133,7 +127,6 @@ FreeLegalTextOnContracts=Freier Text im Vertrag
 WatermarkOnDraftContractCards=Wasserzeichen in Vertragsentwürfe (keines wenn leer)
 MembersSetup=Modul Benutzereinstellung
 MemberMainOptions=Hauptoptionen
-AdherentLoginRequired=Verwalte Zugang für jedes Mitglied
 AdherentMailRequired=Email erforderlich zum erstellen eines neuen Mitglieds
 LDAPContactsSynchro=Kontakt
 LDAPMembersTypesSynchro=Mitgliedertypen
@@ -143,8 +136,6 @@ LDAPFieldFullname=vollständiger Name
 ClickToDialSetup=Click-to-Dial-Moduleinstellungen
 MailToSendShipment=Sendungen
 MailToSendIntervention=Eingriffe
-CreateTicketAndThirdParty=Create a ticket (linked to a third party if the third party was loaded by a previous operation, with no third party otherwise)
-OperationParamDesc=Define the rules to use to extract or set values.<br>Example for operations that need to extract a name from email subject:<br>name=EXTRACT:SUBJECT:Message from company ([^\n]*)<br>Example for operations that create objects:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value including value of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 MAIN_OPTIMIZEFORCOLORBLINDDesc=Aktiviere diese Option wenn Sie Farbenblind sind, in machen Fällen wird die Farbeinstellung geändert um den Kontrast zu erhöhen.
 WithGMailYouCanCreateADedicatedPassword=Wenn Sie bei einem GMail-Konto die Überprüfung in zwei Schritten aktiviert haben, wird empfohlen, ein dediziertes zweites Kennwort für die Anwendung zu erstellen, anstatt Ihr eigenes Kontokennwort von https://myaccount.google.com/ zu verwenden.
 EndPointFor=Endpunkt für %s: %s
diff --git a/htdocs/langs/de_AT/bookmarks.lang b/htdocs/langs/de_AT/bookmarks.lang
new file mode 100644
index 00000000000..3169e7b5a34
--- /dev/null
+++ b/htdocs/langs/de_AT/bookmarks.lang
@@ -0,0 +1,6 @@
+# Dolibarr language file - Source file is en_US - bookmarks
+BookmarksManagement =Bookmarks-Verwaltung
+CreateBookmark =erzeuge Lesezeichen
+NewBookmark =neues Lesezeichen
+ShowBookmark =zeige Lesezeichen
+UrlOrLink =URL oder Link
diff --git a/htdocs/langs/de_AT/main.lang b/htdocs/langs/de_AT/main.lang
index e54fb4920d7..8e7f356a1cb 100644
--- a/htdocs/langs/de_AT/main.lang
+++ b/htdocs/langs/de_AT/main.lang
@@ -79,3 +79,4 @@ DateOfBirth=Geburtstdatum
 ClientTZ=Client-Zeitzone (Benutzer)
 InternalUser=interner Nutzer
 ExternalUser=externer Nutzer
+UserExpired=abgelaufen
diff --git a/htdocs/langs/de_CH/accountancy.lang b/htdocs/langs/de_CH/accountancy.lang
index b1f29e455ff..a963bec1987 100644
--- a/htdocs/langs/de_CH/accountancy.lang
+++ b/htdocs/langs/de_CH/accountancy.lang
@@ -40,11 +40,6 @@ AccountantFiles=Geschäftsvorgänge exportieren
 ExportAccountingSourceDocHelp2=Die Journale exportierst du im Menu %s - %s.
 VueByAccountAccounting=Anzeigen nach Buchhaltungskonto
 VueBySubAccountAccounting=Anzeigen nach Nebenbuchkonto
-MainAccountForCustomersNotDefined=Es ist kein kein Buchhaltungskonto für Kunden eingerichtet.
-MainAccountForSuppliersNotDefined=Es ist kein kein Buchhaltungskonto für Anbieter eingerichtet.
-MainAccountForUsersNotDefined=Es ist kein kein Buchhaltungskonto für Kontakte eingerichtet.
-MainAccountForVatPaymentNotDefined=Für MWST zahlungen ist kein Buchhaltungskonto eingerichtet.
-MainAccountForSubscriptionPaymentNotDefined=Standard - Buchhaltungskonto für Abonnementszahlungen, falls nicht in den Einstellungen hinterlegt.
 AccountancyArea=Buchhaltungsumgebung
 AccountancyAreaDescIntro=Du benutzt das Buchhaltungsmodul auf verschiedene Arten:
 AccountancyAreaDescActionOnce=Folgende Aufgaben erledigst du normalerweise einmal pro Jahr.
@@ -128,6 +123,7 @@ ACCOUNTING_RESULT_LOSS=Ergebniskonto (Verlust)
 ACCOUNTING_CLOSURE_DEFAULT_JOURNAL=Abschlussjournal
 TransitionalAccount=Durchlaufkonto Bank
 LabelOperation=Vorgangsbezeichnung
+Sens=Richtung
 AccountingDirectionHelp=Verwenden Sie für ein Buchhaltungskonto eines Kunden Guthaben, um eine Zahlung zu erfassen, die Sie erhalten haben. <br> Verwenden Sie für ein Buchhaltungskonto eines Lieferanten Debit, um eine von Ihnen geleistete Zahlung zu erfassen
 LetteringCode=Beschriftung
 Lettering=Beschriftung
diff --git a/htdocs/langs/de_CH/admin.lang b/htdocs/langs/de_CH/admin.lang
index 9c0c6657f65..aa707ece644 100644
--- a/htdocs/langs/de_CH/admin.lang
+++ b/htdocs/langs/de_CH/admin.lang
@@ -199,10 +199,6 @@ CallUpdatePage=Zur Aktualisierung der Daten und der Datenbankstruktur gehst du z
 UpdateServerOffline=Update-Server offline
 WithCounter=Zähler verwalten
 GenericMaskCodes3=Alle anderen Zeichen in der Maske bleiben. <br> Leerzeichen sind nicht zulässig. <br>
-GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany, with date 2023-01-31:</u><br>
-GenericMaskCodes4b=<u>Example on third party created on 2023-01-31:</u><br>
-GenericMaskCodes4c=<u>Example on product created on 2023-01-31:</u><br>
-GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> will give <b>ABC2301-000099</b><br><b>{0000+100@1}-ZZZ/{dd}/XXX</b> will give <b>0199-ZZZ/31/XXX</b><br><b>IN{yy}{mm}-{0000}-{t}</b> will give <b>IN2301-0099-A</b> if the type of company is 'Responsable Inscripto' with code for type that is 'A_RI'
 ServerAvailableOnIPOrPort=Server ist verfügbar unter der Adresse <b>%s</b> auf Port <b>%s</b>
 ServerNotAvailableOnIPOrPort=Server nicht verfügbar unter Adresse <b>%s</b> auf Port <b>%s</b>
 DoTestSend=Test senden
@@ -523,8 +519,6 @@ LDAPTestSynchroMember=Mitgliederynchronisation testen
 LDAPFieldPhone=Telefonnummer, Beruf.
 LDAPFieldAddress=Strasse
 LDAPFieldCountry=Land
-LDAPFieldGroupidExample=Example : gidnumber
-LDAPFieldUseridExample=Example : uidnumber
 LDAPDescValues=Die Beispielwerte für <b>OpenLDAP</b> verfügen über folgende Muster: <b>core.schema, cosine.schema, inetorgperson.schema</b>. Wenn Sie diese Werte für OpenLDAP verwenden möchten, passen Sie bitte die LDAP-Konfigurationsdateu <b>slapd.conf</b> entsprechend an, damit all diese Muster geladen werden.
 ApplicativeCache=Applicative Cache
 MemcachedNotAvailable=Kein Cache Anwendung gefunden. \nSie können die Leistung durch die Installation des Cache-Server Memcached und die Aktivierung des Anwendungs Cache Modul\n<br>hier mehr Informationen <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN">http://wiki.dolibarr.org/index.php/Module_MemCached_EN</a>.<br>\nverbessern.\nBeachten Sie, dass viele Billig-Provider keine solche Cache-Server in ihrer Infrastruktur anbieten.
@@ -566,8 +560,8 @@ DetailLangs=Sprachdateiname für Bezeichnungsübersetzung
 OptionVatMode=MwSt. fällig
 OptionVATDebitOption=Rückstellungsbasis
 SupposedToBePaymentDate=Zahlungsdatum in Verwendung falls Lieferdatum unbekannt
+AgendaSetup =Aufgaben/Termine-Modul Einstellungen
 ClickToDialSetup=Click-to-Dial Moduleinstellungen
-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).
 CashDeskSetup=Modul Kasse (POS) einrichten
 CashDeskBankAccountForSell=Standard-Bargeldkonto für Kassenverkäufe (erforderlich)
 CashDeskBankAccountForCB=Finanzkonto für die Einlösung von Bargeldzahlungen via Kreditkarte
@@ -631,7 +625,6 @@ EmailCollector=E-Mail Sammeldienst
 EmailCollectorDescription=Hier kannst du zeitgesteuert IMAP - Mailboxen regelmässig abfragen und korrekt in deiner Umgebung zuweisen. Weiter kannst du daraus automatisch Objekte erzeugen, z.B. Interessenten.
 NewEmailCollector=Neuer E-Mail - Sammeldienst
 EMailHost=IMAP Server Host
-oauthToken=OAuth2 token
 EmailCollectorConfirmCollectTitle=E-Mail - Sammeldienst Bestätigung
 NoNewEmailToProcess=Ich habe keinen neuen E-Mails (die zu den Filtern passen) abzuarbeiten.
 ResourceSetup=Modul Ressourcen einrichten
@@ -642,10 +635,3 @@ ConfirmUnactivation=Bestätige das Zurücksetzen des Moduls.
 ExportSetup=Modul Daten-Export einrichten
 FeatureNotAvailableWithReceptionModule=Diese Funktion ist nicht verfügbar, wenn das Modul 'Lieferungen' aktiv ist
 DictionaryProductNature=Produktart
-INVOICE_ADD_SWISS_QR_CODEMore=Switzerland's standard for invoices; make sure ZIP & City are filled and that the accounts have valid Swiss/Liechtenstein IBANs.
-CssOnEdit=CSS on edit pages
-CssOnView=CSS on view pages
-CssOnList=CSS on lists
-HelpCssOnEditDesc=The CSS used when editing the field.<br>Example: "minwiwdth100 maxwidth500 widthcentpercentminusx"
-HelpCssOnViewDesc=The CSS used when viewing the field.
-HelpCssOnListDesc=The CSS used when field is inside a list table.<br>Example: "tdoverflowmax200"
diff --git a/htdocs/langs/de_CH/bookmarks.lang b/htdocs/langs/de_CH/bookmarks.lang
new file mode 100644
index 00000000000..9be5f12d141
--- /dev/null
+++ b/htdocs/langs/de_CH/bookmarks.lang
@@ -0,0 +1,9 @@
+# Dolibarr language file - Source file is en_US - bookmarks
+AddThisPageToBookmarks =Füge diese Seite zu deinen Lesezeichen hinzu.
+BehaviourOnClick =Was soll passieren, wenn ein Lesezeichen - Link angewählt wird?
+BookmarkTitle =Name des Lesezeichens
+BookmarksManagement =Lesezeichen - Verwaltung
+ChooseIfANewWindowMustBeOpenedOnClickOnBookmark =Gib an, ob der Link im selben- oder einem neuen Fenster geladen werden soll.
+EditBookmarks =Lesezeichen anzeigen und bearbeiten
+OpenANewWindow =Neuen Tab öffnen
+SetHereATitleForLink =Gib dem Lesezeichen einen Namen
diff --git a/htdocs/langs/de_CH/main.lang b/htdocs/langs/de_CH/main.lang
index 2d517c3b39f..aebbe380381 100644
--- a/htdocs/langs/de_CH/main.lang
+++ b/htdocs/langs/de_CH/main.lang
@@ -382,4 +382,3 @@ SelectYourGraphOptionsFirst=Wähle den Diagrammtyp
 Measures=Masseinheiten
 ClientTZ=Zeitzone Kunde (Benutzer)
 Terminate=Abschliessen
-ClickFullScreenEscapeToLeave=Click here to switch in Full screen mode. Press ESCAPE to leave Full screen mode.
diff --git a/htdocs/langs/de_CH/supplier_proposal.lang b/htdocs/langs/de_CH/supplier_proposal.lang
index e62f7e71901..77cf3cf069b 100644
--- a/htdocs/langs/de_CH/supplier_proposal.lang
+++ b/htdocs/langs/de_CH/supplier_proposal.lang
@@ -14,10 +14,10 @@ SupplierProposalRefFournNotice=Bevor die Preisanfrage mit "Angenommen" abgeschlo
 ConfirmValidateAsk=Willst du diese Offertanfrage unter dem Namen <b>%s</b> bestätigen?
 ValidateAsk=Anfrage bestätigen
 SupplierProposalStatusDraft=Entwürfe (benötigen Bestätigung)
+SupplierProposalStatusValidated=Bestätigt (Anfrage ist offen)
 SupplierProposalStatusSigned=Akzeptiert
 SupplierProposalStatusValidatedShort=Bestätigt
 SupplierProposalStatusSignedShort=Akzeptiert
-CopyAskFrom=Neue Preisanfrage erstellen (Kopie einer bestehenden Anfrage)
 CreateEmptyAsk=Leere Anfrage erstellen
 ConfirmCloneAsk=Willst du die Offertanfrage <b>%s</b> duplizieren?
 ConfirmReOpenAsk=Willst du diese Preisanfrage <b>%s</b> wiedereröffnen?
@@ -25,7 +25,6 @@ SendAskByMail=Preisanfrage mit E-Mail versenden
 SendAskRef=Preisanfrage %s versenden
 SupplierProposalCard=Anfragekarte
 ConfirmDeleteAsk=Willst du diese Preisanfrage <b>%s</b> löschen?
-DocModelAuroreDescription=Eine vollständige Preisanfrage-Vorlage (Logo...)
 DefaultModelSupplierProposalCreate=Standardvorlage erstellen
 DefaultModelSupplierProposalToBill=Standardvorlage beim Abschluss einer Preisanfrage (angenommen)
 DefaultModelSupplierProposalClosed=Standardvorlage beim Abschluss einer Preisanfrage (zurückgewiesen)
@@ -34,3 +33,4 @@ ListSupplierProposalsAssociatedProject=Liste der Lieferantenofferten, die mit di
 SupplierProposalsToClose=Zu schliessende Lieferantenangebote
 SupplierProposalsToProcess=Zu verarbeitende Lieferantenofferten
 LastSupplierProposals=Die letzten %s Offertanfragen
+TypeContact_supplier_proposal_external_SERVICE=Vertreter für Angebot
diff --git a/htdocs/langs/de_DE/accountancy.lang b/htdocs/langs/de_DE/accountancy.lang
index aeaec208b62..c65e1ec1a40 100644
--- a/htdocs/langs/de_DE/accountancy.lang
+++ b/htdocs/langs/de_DE/accountancy.lang
@@ -57,11 +57,14 @@ WarningDataDisappearsWhenDataIsExported=Achtung, diese Liste enthält nur die Bu
 VueByAccountAccounting=Ansicht nach Buchungskonto
 VueBySubAccountAccounting=Ansicht nach Buchhaltungsunterkonto
 
-MainAccountForCustomersNotDefined=Standardkonto für Kunden im Setup nicht definiert
-MainAccountForSuppliersNotDefined=Standardkonto für Lieferanten die nicht im Setup definiert sind
-MainAccountForUsersNotDefined=Standardkonto für Benutzer ist im Setup nicht definiert
-MainAccountForVatPaymentNotDefined=Standardkonto für MwSt.-Zahlungen ist im Setup nicht definiert
-MainAccountForSubscriptionPaymentNotDefined=Standardkonto für wiederkehrende Zahlungen ist im Setup nicht definiert
+MainAccountForCustomersNotDefined=Main account (from the Chart of Account) for customers not defined in setup
+MainAccountForSuppliersNotDefined=Main account (from the Chart of Account) for vendors not defined in setup
+MainAccountForUsersNotDefined=Main account (from the Chart of Account) for users not defined in setup
+MainAccountForRevenueStampSaleNotDefined=Account (from the Chart of Account) for the revenue stamp (sales) not defined in setup
+MainAccountForRevenueStampPurchaseNotDefined=Account (from the Chart of Account) for the revenue stamp (purchases) not defined in setup
+MainAccountForVatPaymentNotDefined=Account (from the Chart of Account) for VAT payment not defined in setup
+MainAccountForSubscriptionPaymentNotDefined=Account (from the Chart of Account) for membership payment not defined in setup
+MainAccountForRetainedWarrantyNotDefined=Account (from the Chart of Account) for the retained warranty not defined in setup
 UserAccountNotDefined=Buchungskonto für den Benutzer ist nicht im Setup definiert
 
 AccountancyArea=Bereich Buchhaltung
diff --git a/htdocs/langs/de_DE/admin.lang b/htdocs/langs/de_DE/admin.lang
index 82aaa2a91ce..34fd9b94e7f 100644
--- a/htdocs/langs/de_DE/admin.lang
+++ b/htdocs/langs/de_DE/admin.lang
@@ -1509,7 +1509,8 @@ WatermarkOnDraftContractCards=Wasserzeichen auf Entwurf (leerlassen, wenn nicht
 MembersSetup=Modul Mitglieder - Einstellungen
 MemberMainOptions=Haupteinstellungen
 MemberCodeChecker=Optionen für die automatische Generierung von Mitgliedsnummern
-AdherentLoginRequired= Verwalten Sie eine Anmeldung für jedes Mitglied
+AdherentLoginRequired=Manage a login/password for each member
+AdherentLoginRequiredDesc=Add a value for a login and a password on the member file. If the member is linked to a user, updating the member login and password will also update the user login and password.
 AdherentMailRequired=Für das Anlegen eines neuen Mitglieds ist eine E-Mail-Adresse erforderlich
 MemberSendInformationByMailByDefault=Das Kontrollkästchen für den automatischen Versand einer E-Mail-Bestätigung an Mitglieder (bei Freigabe oder neuem Abonnement) ist standardmäßig aktiviert
 MemberCreateAnExternalUserForSubscriptionValidated=Externes Benutzer-Login für jedes validierte neue Mitgliedsabonnement erstellen
@@ -2076,6 +2077,10 @@ MAIN_DOCUMENTS_LOGO_HEIGHT=Höhe des Logos im PDF
 DOC_SHOW_FIRST_SALES_REP=Ersten Vertriebsmitarbeiter anzeigen
 MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Spalte für Bild in Angebotspositionen hinzufügen
 MAIN_DOCUMENTS_WITH_PICTURE_WIDTH=Breite der Spalte, wenn den Positionen ein Bild hinzugefügt wird
+MAIN_GENERATE_DOCUMENTS_SUPPLIER_PROPOSAL_WITHOUT_UNIT_PRICE=Hide the unit price column on quotation requests
+MAIN_GENERATE_DOCUMENTS_SUPPLIER_PROPOSAL_WITHOUT_TOTAL_COLUMN=Hide the total price column on quotation requests
+MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_UNIT_PRICE=Hide the unit price column on purchase orders
+MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_TOTAL_COLUMN=Hide the total price column on puchase orders
 MAIN_PDF_NO_SENDER_FRAME=Rahmen des Absenderadressbereichs ausblenden
 MAIN_PDF_NO_RECIPENT_FRAME=Rahmen des Empfängeradressbereichs ausblenden
 MAIN_PDF_HIDE_CUSTOMER_CODE=Kunden-Nr. ausblenden
@@ -2400,4 +2405,4 @@ OptionXShouldBeEnabledInModuleY=Die Option "<b>%s</b>" sollte im Modul <b>%s</b>
 OptionXIsCorrectlyEnabledInModuleY=Die Option "<b>%s</b>" ist im Modul <b>%s</b> aktiviert
 AtBottomOfPage=Unten auf der Seite
 FailedAuth=fehlgeschlagene Authentifizierungen
-MaxNumberOfFailedAuth=Maximale Anzahl fehlgeschlagener Authentifizierungen innerhalb von 24 Stunden, um den Login zu deaktivieren.
+MaxNumberOfFailedAuth=Max number of failed authentication in 24h to deny login.
diff --git a/htdocs/langs/de_DE/banks.lang b/htdocs/langs/de_DE/banks.lang
index 7232249d725..f37f4876b6f 100644
--- a/htdocs/langs/de_DE/banks.lang
+++ b/htdocs/langs/de_DE/banks.lang
@@ -106,8 +106,8 @@ BankLineNotReconciled=Nicht abgeglichen
 CustomerInvoicePayment=Kundenzahlung
 SupplierInvoicePayment=Lieferanten Zahlung
 SubscriptionPayment=Beitragszahlung
-WithdrawalPayment=Direct Debit payment
-BankTransferPayment=Credit Transfer payment
+WithdrawalPayment=Zahlung per Lastschrift
+BankTransferPayment=Zahlung per Überweisung
 SocialContributionPayment=Zahlung von Steuern/Sozialabgaben
 BankTransfer=Überweisung
 BankTransfers=Überweisungen
diff --git a/htdocs/langs/de_DE/bookmarks.lang b/htdocs/langs/de_DE/bookmarks.lang
index 475220a35ab..ca3f4530e42 100644
--- a/htdocs/langs/de_DE/bookmarks.lang
+++ b/htdocs/langs/de_DE/bookmarks.lang
@@ -1,23 +1,24 @@
-# Dolibarr language file - Source file is en_US - marque pages
-AddThisPageToBookmarks=Aktuelle Ansicht zu Lesezeichen hinzufügen
-Bookmark=Lesezeichen
-Bookmarks=Lesezeichen
-ListOfBookmarks=Liste der Lesezeichen
-EditBookmarks=Alle Lesezeichen anzeigen / ändern
-NewBookmark=Neues Lesezeichen
-ShowBookmark=Zeige Lesezeichen
-OpenANewWindow=In neuem Tab öffnen
-ReplaceWindow=Aktuellen Tab ersetzen
-BookmarkTargetNewWindowShort=Neuer Tab
-BookmarkTargetReplaceWindowShort=Aktueller Tab
-BookmarkTitle=Benennung des Lesezeichens
-UrlOrLink=Link
-BehaviourOnClick=Öffnungsverhalten
-CreateBookmark=Lesezeichen erstellen
-SetHereATitleForLink=Erfassen Sie hier einen Namen für das Lesezeichen
-UseAnExternalHttpLinkOrRelativeDolibarrLink=Verwenden Sie einen externen/absoluten Link (https://externalurl.com) oder einen internen/relativen Link (/mypage.php). Sie können auch eine Telefonnummer wie tel:0123456 verwenden.
-ChooseIfANewWindowMustBeOpenedOnClickOnBookmark=Wählen Sie aus, ob die verlinkte Seite auf der aktuellen Registerkarte oder auf einer neuen Registerkarte geöffnet werden soll.
-BookmarksManagement=Verwalten von Lesezeichen
-BookmarksMenuShortCut=STRG + Umschalt + m
-NoBookmarks=Keine Lesezeichen definiert
-NoBookmarkFound=Kein Lesezeichen gefunden
+# Dolibarr language file - Source file is en_US - marque pages / bookmarks
+
+AddThisPageToBookmarks = Aktuelle Ansicht zu Lesezeichen hinzufügen
+BehaviourOnClick = Öffnungsverhalten
+Bookmark = Lesezeichen
+Bookmarks = Lesezeichen
+BookmarkTargetNewWindowShort = Neuer Tab
+BookmarkTargetReplaceWindowShort = Aktueller Tab
+BookmarkTitle = Benennung des Lesezeichens
+BookmarksManagement = Verwalten von Lesezeichen
+BookmarksMenuShortCut = STRG + Umschalt + m
+ChooseIfANewWindowMustBeOpenedOnClickOnBookmark = Wählen Sie aus, ob die verlinkte Seite auf der aktuellen Registerkarte oder auf einer neuen Registerkarte geöffnet werden soll.
+CreateBookmark = Lesezeichen erstellen
+EditBookmarks = Alle Lesezeichen anzeigen / ändern
+ListOfBookmarks = Liste der Lesezeichen
+NewBookmark = Neues Lesezeichen
+NoBookmarkFound = Kein Lesezeichen gefunden
+NoBookmarks = Keine Lesezeichen definiert
+OpenANewWindow = In neuem Tab öffnen
+ReplaceWindow = Aktuellen Tab ersetzen
+SetHereATitleForLink = Erfassen Sie hier einen Namen für das Lesezeichen
+ShowBookmark = Zeige Lesezeichen
+UrlOrLink = Link
+UseAnExternalHttpLinkOrRelativeDolibarrLink = Verwenden Sie einen externen/absoluten Link (https://externalurl.com) oder einen internen/relativen Link (/mypage.php). Sie können auch eine Telefonnummer wie tel:0123456 verwenden.
diff --git a/htdocs/langs/de_DE/compta.lang b/htdocs/langs/de_DE/compta.lang
index cea7392b1df..7623ec5f215 100644
--- a/htdocs/langs/de_DE/compta.lang
+++ b/htdocs/langs/de_DE/compta.lang
@@ -253,6 +253,8 @@ CalculationMode=Berechnungsmodus
 AccountancyJournal=Erfassung in Journal
 ACCOUNTING_VAT_SOLD_ACCOUNT=Konto (aus dem Kontenplan), das als Standardkonto für die Umsatzsteuer auf Verkäufe verwendet werden soll (wird verwendet, wenn nicht in den Umsatzsteuer-Stammdaten definiert)
 ACCOUNTING_VAT_BUY_ACCOUNT=Konto (aus dem Kontenplan), das als Standardkonto für die Umsatzsteuer auf Einkäufe verwendet werden soll (wird verwendet, wenn nicht in den Umsatzsteuer-Stammdaten definiert)
+ACCOUNTING_REVENUESTAMP_SOLD_ACCOUNT=Account (from the Chart Of Account) to be used for the revenue stamp on sales
+ACCOUNTING_REVENUESTAMP_BUY_ACCOUNT=Account (from the Chart Of Account) to be used for the revenue stamp on purchases
 ACCOUNTING_VAT_PAY_ACCOUNT=Konto (aus dem Kontenplan), das als Standard-Aufwandskonto für die Zahlung der Umsatzsteuer verwendet werden soll
 ACCOUNTING_VAT_BUY_REVERSE_CHARGES_CREDIT=Buchungskonto (aus dem Kontenplan) als Standardkonto für die Umsatzsteuer auf Käufe für Reverse Charges (Haben)
 ACCOUNTING_VAT_BUY_REVERSE_CHARGES_DEBIT=Buchungskonto (aus dem Kontenplan) als Standardkonto für die Umsatsteuer auf Käufe für Reverse Charges (Soll)
diff --git a/htdocs/langs/de_DE/ecm.lang b/htdocs/langs/de_DE/ecm.lang
index 6bd47e7a8e3..888e699b1f8 100644
--- a/htdocs/langs/de_DE/ecm.lang
+++ b/htdocs/langs/de_DE/ecm.lang
@@ -48,7 +48,7 @@ GenerateImgWebp=Erstelle ein Duplikat aller Bilder im .webp-Format, sofern diese
 ConfirmGenerateImgWebp=Wenn Sie bestätigen, generieren Sie für alle Bilder, die sich derzeit in diesem Ordner befinden, ein Bild im .webp-Format (Unterordner werden nicht berücksichtigt)...
 ConfirmImgWebpCreation=Bestätigen Sie die Duplizierung aller Bilder
 GenerateChosenImgWebp=Ausgewähltes Bild mit einer anderen Version im .webp-Format duplizieren
-ConfirmGenerateChosenImgWebp=If you confirm, you will generate an image in .webp format for the image %s
+ConfirmGenerateChosenImgWebp=Wenn Sie bestätigen, generieren Sie ein Bild im .webp-Format für das Bild %s
 ConfirmChosenImgWebpCreation=Bestätigen Sie die Duplizierung der ausgewählten Bilder
 SucessConvertImgWebp=Bilder erfolgreich dupliziert
 SucessConvertChosenImgWebp=Ausgewähltes Bild erfolgreich dupliziert
diff --git a/htdocs/langs/de_DE/errors.lang b/htdocs/langs/de_DE/errors.lang
index d2aca2a796f..1ff4fb59a39 100644
--- a/htdocs/langs/de_DE/errors.lang
+++ b/htdocs/langs/de_DE/errors.lang
@@ -318,8 +318,10 @@ ErrorTheUrlOfYourDolInstanceDoesNotMatchURLIntoOAuthSetup=Fehler: Die URL Ihrer
 ErrorMenuExistValue=Es existiert bereits ein Menü mit diesem Titel oder dieser URL
 ErrorSVGFilesNotAllowedAsLinksWithout=SVG-Dateien sind ohne die Option %s nicht als externe Links zulässig
 ErrorTypeMenu=Es ist nicht möglich, ein weiteres Menü für dasselbe Modul in der Navigationsleiste hinzuzufügen (noch nicht unterstützt)
-ErrorTableExist=Table <b>%s</b> already exist
-ErrorDictionaryNotFound=Dictionary <b>%s</b> not found
+ErrorTableExist=Tabelle <b>%s</b> existiert bereits
+ErrorDictionaryNotFound=Wörterbuch <b>%s</b> nicht gefunden
+ErrorFailedToCreateSymLinkToMedias=Failed to create the symlinks %s to point to %s
+
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Ihr PHP Parameter upload_max_filesize (%s) ist größer als Parameter post_max_size (%s). Dies ist eine inkonsistente Einstellung.
 WarningPasswordSetWithNoAccount=Es wurde ein Passwort für dieses Mitglied vergeben, aber kein Benutzer erstellt. Das Passwort wird gespeichert, aber kann nicht für die Anmeldung an Dolibarr verwendet werden. Es kann von einem externen Modul/einer Schnittstelle verwendet werden, aber wenn Sie kein Login oder Passwort für dieses Mitglied definiert müssen, können Sie die Option "Login für jedes Mitglied verwalten" in den Mitgliedseinstellungen deaktivieren. Wenn Sie ein Login aber kein Passwort benötige, lassen Sie dieses Feld leer, um diese Meldung zu deaktivieren. Anmerkung: Die E-Mail-Adresse kann auch zur Anmeldung verwendet werden, wenn das Mitglied mit einem Benutzer verbunden wird.
@@ -360,7 +362,7 @@ WarningAutoValNotPossibleWhenStockIsDecreasedOnInvoiceVal=Die automatische Freig
 WarningModuleNeedRefrech = Modul <b>%s</b> wurde deaktiviert. Vergessen Sie nicht, es zu aktivieren
 WarningPermissionAlreadyExist=Vorhandene Berechtigungen für dieses Objekt
 WarningGoOnAccountancySetupToAddAccounts=Wenn diese Liste leer ist, gehen Sie in das Menü %s - %s - %s um Konten für Ihren Kontenplan zu laden oder zu erstellen.
-WarningCorrectedInvoiceNotFound=Corrected invoice not found
+WarningCorrectedInvoiceNotFound=Korrigierte Rechnung nicht gefunden
 
 SwissQrOnlyVIR = Eine SwissQR-Rechnung kann nur Rechnungen hinzugefügt werden, die per Überweisung bezahlt werden sollen.
 SwissQrCreditorAddressInvalid = Die Kreditorenadresse ist ungültig (sind PLZ und Stadt festgelegt? (%s)
diff --git a/htdocs/langs/de_DE/main.lang b/htdocs/langs/de_DE/main.lang
index 355f098df92..bce073b2d3a 100644
--- a/htdocs/langs/de_DE/main.lang
+++ b/htdocs/langs/de_DE/main.lang
@@ -235,8 +235,8 @@ PersonalValue=Persönlicher Wert
 NewObject=Neu %s
 NewValue=Neuer Wert
 OldValue=Alter Wert %s
-FieldXModified=Field %s modified
-FieldXModifiedFromYToZ=Field %s modified from %s to %s
+FieldXModified=Feld %s geändert
+FieldXModifiedFromYToZ=Feld %s wurde von %s in %s geändert
 CurrentValue=Aktueller Wert
 Code=Name
 Type=Typ
@@ -348,7 +348,7 @@ MonthOfDay=Tag des Monats
 DaysOfWeek=Wochentage
 HourShort=H
 MinuteShort=mn
-SecondShort=sec
+SecondShort=Sek
 Rate=Rate
 CurrencyRate=Wechselkurs
 UseLocalTax=inkl. MwSt.
@@ -558,7 +558,7 @@ Unknown=Unbekannt
 General=Allgemein
 Size=Größe
 OriginalSize=Originalgröße
-RotateImage=Rotate 90°
+RotateImage=Um 90° drehen
 Received=Erhalten
 Paid=Bezahlt
 Topic=Betreff
@@ -1237,3 +1237,5 @@ SearchSyntaxTooltipForStringOrNum=Für die Suche innerhalb von Textfeldern könn
 InProgress=In Bearbeitung
 DateOfPrinting=Druckdatum
 ClickFullScreenEscapeToLeave=Klicken Sie hier, um in den Vollbildmodus zu wechseln. Drücken Sie ESC, um den Vollbildmodus zu verlassen.
+UserNotYetValid=Not yet valid
+UserExpired=Abgelaufen
diff --git a/htdocs/langs/de_DE/modulebuilder.lang b/htdocs/langs/de_DE/modulebuilder.lang
index 4548014b9d6..aa645128b4e 100644
--- a/htdocs/langs/de_DE/modulebuilder.lang
+++ b/htdocs/langs/de_DE/modulebuilder.lang
@@ -28,6 +28,7 @@ ModuleBuilderDescwidgets=Diese Registerkarte dient zum Verwalten / Erstellen von
 ModuleBuilderDescbuildpackage=Sie können hier eine "ready to distribute" Paketdatei (eine normalisierte.zip-Datei) Ihres Moduls und eine "ready to distribute" Dokumentationsdatei erzeugen. Klicken Sie einfach auf die Schaltfläche, um das Paket oder die Dokumentationsdatei zu erstellen.
 EnterNameOfModuleToDeleteDesc=Sie können Ihr Modul löschen. WARNUNG: Alle Codedateien des Moduls (generiert oder manuell erstellt) UND strukturierte Daten und Dokumentationen werden gelöscht!
 EnterNameOfObjectToDeleteDesc=Sie können ein Objekt löschen. WARNUNG: Alle Codedateien (generiert oder manuell erstellt), die sich auf das Objekt beziehen, werden gelöscht!
+EnterNameOfObjectToDeleteDesc=Sie können ein Objekt löschen. WARNUNG: Alle Codedateien (generiert oder manuell erstellt), die sich auf das Objekt beziehen, werden gelöscht!
 DangerZone=Gefahrenzone
 BuildPackage=Paket erstellen
 BuildPackageDesc=Sie können ein Zip-Paket Ihrer Anwendung erstellen, um es auf jede Dolibarr-Installation verteilen zu können. Sie können es auch über einem Marktplatz wie <a href="https://www.dolistore.com">DoliStore.com</a> kostenlos verbreiten oder verkaufen.
@@ -162,11 +163,11 @@ ListOfTabsEntries=Liste der Registerkarteneinträge/Tab-Einträge
 TabsDefDesc=Definieren Sie hier die von Ihrem Modul bereitgestellten Registerkarten/Tabs
 TabsDefDescTooltip=Die von Ihrem Modul/Ihrer Anwendung bereitgestellten Registerkarten/Tabs sind im Array <strong>$this->tabs</strong> in der Moduldeskriptordatei definiert. Sie können diese Datei manuell bearbeiten oder den eingebetteten Editor verwenden.
 BadValueForType=Ungültiger Wert für Typ %s
-DefinePropertiesFromExistingTable=Eigenschaften aus einer vorhandenen Tabelle definieren
+DefinePropertiesFromExistingTable=Define the fields/properties from an existing table
 DefinePropertiesFromExistingTableDesc=Wenn bereits eine Tabelle in der Datenbank (für das zu erstellende Objekt) vorhanden ist, können Sie diese verwenden, um die Eigenschaften des Objekts zu definieren.
 DefinePropertiesFromExistingTableDesc2=Leer lassen, wenn die Tabelle noch nicht existiert. Der Codegenerator verwendet verschiedene Arten von Feldern, um eine Beispieltabelle zu erstellen, die Sie später bearbeiten können.
-GeneratePermissions=Ich möchte die Rechte für dieses Objekt hinzufügen
-GeneratePermissionsHelp=Standardrechte für dieses Objekt generieren
+GeneratePermissions=I want to manage permissions on this object
+GeneratePermissionsHelp=If you check this, some code will be added to manage permissions to read, write and delete record of the objects
 PermissionDeletedSuccesfuly=Die Berechtigung wurde erfolgreich entfernt
 PermissionUpdatedSuccesfuly=Die Berechtigung wurde erfolgreich aktualisiert
 PermissionAddedSuccesfuly=Die Berechtigung wurde erfolgreich hinzugefügt
@@ -177,3 +178,6 @@ ApiObjectDeleted=API für Objekt %s wurde erfolgreich gelöscht
 CRUDRead=Gelesen
 CRUDCreateWrite=Erstellen oder aktualisieren
 FailedToAddCodeIntoDescriptor=Fehler beim Hinzufügen von Code zum Deskriptor. Überprüfen Sie, ob der Kommentar "%s“ noch in der Datei vorhanden ist.
+DictionariesCreated=Wörterbuch <b>%s</b> erfolgreich erstellt
+DictionaryDeleted=Wörterbuch <b>%s</b> erfolgreich entfernt
+PropertyModuleUpdated=Property <b>%s</b> has been update successfully
diff --git a/htdocs/langs/de_DE/stripe.lang b/htdocs/langs/de_DE/stripe.lang
index 67475f61f17..bde05c9a024 100644
--- a/htdocs/langs/de_DE/stripe.lang
+++ b/htdocs/langs/de_DE/stripe.lang
@@ -51,6 +51,7 @@ StripeAccount=Stripe Konto
 StripeChargeList=Liste der Bezahlvorgänge
 StripeTransactionList=Liste aller Transaktionen
 StripeCustomerId=Stripe Kunden-ID
+StripePaymentId=Stripe-Payment-ID
 StripePaymentModes=Stripe Zahlungsarten
 LocalID=Lokale ID
 StripeID=Stripe ID
diff --git a/htdocs/langs/de_DE/supplier_proposal.lang b/htdocs/langs/de_DE/supplier_proposal.lang
index 63c8f09282c..be09a8ae2a9 100644
--- a/htdocs/langs/de_DE/supplier_proposal.lang
+++ b/htdocs/langs/de_DE/supplier_proposal.lang
@@ -42,13 +42,14 @@ SendAskRef=Sende Preisanfrage %s
 SupplierProposalCard=Anfrage – Übersicht
 ConfirmDeleteAsk=Möchten Sie diese Preisanfrage <b>%s</b> wirklich löschen?
 ActionsOnSupplierProposal=Ereignis bei Preisanfrage
-DocModelAuroreDescription=Vollständige Vorlage für eine Anfrage (Logo...)
+DocModelAuroreDescription=A complete template for a vendor quotation request template (old implementation of Sponge template)
+DocModelZenithDescription=A complete template for a vendor quotation request template
 CommercialAsk=Preisanfrage
 DefaultModelSupplierProposalCreate=Erstellung einer Standard-Vorlage
 DefaultModelSupplierProposalToBill=Standardvorlage wenn eine Preisanfrage geschlossen wird (angenommen)
 DefaultModelSupplierProposalClosed=Standardvorlage wenn eine Preisanfrage geschlossen wird (abgelehnt)
 ListOfSupplierProposals=Liste von Angebotsanfragen für Lieferanten
-ListSupplierProposalsAssociatedProject=Liste der Lieferantenangebote, die mit dem Projekt verknüpft sind
+ListSupplierProposalsAssociatedProject=Liste der mit dem Projekt verbundenen Lieferantenangebote
 SupplierProposalsToClose=Zu schließende Lieferantenangebote 
 SupplierProposalsToProcess=Lieferantenangebote zu Verarbeiten
 LastSupplierProposals=letzte %s Preisanfragen
diff --git a/htdocs/langs/de_DE/ticket.lang b/htdocs/langs/de_DE/ticket.lang
index 0da1ca66582..27c23f83f61 100644
--- a/htdocs/langs/de_DE/ticket.lang
+++ b/htdocs/langs/de_DE/ticket.lang
@@ -329,8 +329,8 @@ OldUser=Alter Benutzer
 NewUser=Neuer Benutzer
 NumberOfTicketsByMonth=Anzahl der Tickets pro Monat
 NbOfTickets=Anzahl der Tickets
-ExternalContributors=External contributors
-AddContributor=Add external contributor
+ExternalContributors=Externe Mitwirkende
+AddContributor=Externen Mitwirkenden hinzufügen
 
 # notifications
 TicketCloseEmailSubjectCustomer=Ticket geschlossen
diff --git a/htdocs/langs/de_DE/website.lang b/htdocs/langs/de_DE/website.lang
index 9da946e1fc9..efd8d4ed1c0 100644
--- a/htdocs/langs/de_DE/website.lang
+++ b/htdocs/langs/de_DE/website.lang
@@ -158,5 +158,5 @@ Reservation=Reservierung
 PagesViewedPreviousMonth=Angesehene Seiten (Vormonat)
 PagesViewedTotal=Angesehene Seiten (gesamt)
 Visibility=Sichtbarkeit
-Everyone=Everyone
+Everyone=Alle
 AssignedContacts=Zugeordnete Kontakte
diff --git a/htdocs/langs/el_CY/ticket.lang b/htdocs/langs/el_CY/ticket.lang
new file mode 100644
index 00000000000..dd733640aa1
--- /dev/null
+++ b/htdocs/langs/el_CY/ticket.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - ticket
+TicketsShowCompanyLogoHelp=Enable this option to show the logo of the main company in the pages of the public interface
diff --git a/htdocs/langs/el_GR/accountancy.lang b/htdocs/langs/el_GR/accountancy.lang
index 6e9a78d2db6..8a5248c133d 100644
--- a/htdocs/langs/el_GR/accountancy.lang
+++ b/htdocs/langs/el_GR/accountancy.lang
@@ -57,11 +57,14 @@ WarningDataDisappearsWhenDataIsExported=Προειδοποίηση, αυτή η
 VueByAccountAccounting=Προβολή ανά λογαριασμό λογιστικής
 VueBySubAccountAccounting=Προβολή ανά λογιστικό υπολογαριασμό
 
-MainAccountForCustomersNotDefined=Ο Κύριος λογαριασμός λογιστικής για πελάτες δεν έχει οριστεί κατά τη ρύθμιση
-MainAccountForSuppliersNotDefined=Ο Κύριος λογαριασμός λογιστικής για προμηθευτές δεν έχει οριστεί κατά τη ρύθμιση
-MainAccountForUsersNotDefined=Ο Κύριος λογαριασμός λογιστικής για χρήστες δεν έχει οριστεί κατά τη ρύθμιση
-MainAccountForVatPaymentNotDefined=Ο Κύριος λογαριασμός λογιστικής για πληρωμή ΦΠΑ δεν έχει οριστεί κατά τη ρύθμιση
-MainAccountForSubscriptionPaymentNotDefined=Ο κύριος λογαριασμός λογιστικής για την πληρωμή συνδρομής δεν έχει οριστεί κατά τη ρύθμιση
+MainAccountForCustomersNotDefined=Main account (from the Chart of Account) for customers not defined in setup
+MainAccountForSuppliersNotDefined=Main account (from the Chart of Account) for vendors not defined in setup
+MainAccountForUsersNotDefined=Main account (from the Chart of Account) for users not defined in setup
+MainAccountForRevenueStampSaleNotDefined=Account (from the Chart of Account) for the revenue stamp (sales) not defined in setup
+MainAccountForRevenueStampPurchaseNotDefined=Account (from the Chart of Account) for the revenue stamp (purchases) not defined in setup
+MainAccountForVatPaymentNotDefined=Account (from the Chart of Account) for VAT payment not defined in setup
+MainAccountForSubscriptionPaymentNotDefined=Account (from the Chart of Account) for membership payment not defined in setup
+MainAccountForRetainedWarrantyNotDefined=Account (from the Chart of Account) for the retained warranty not defined in setup
 UserAccountNotDefined=Ο λογαριασμός λογιστικής για τον χρήστη δεν έχει οριστεί κατά τη ρύθμιση
 
 AccountancyArea=Τομέας Λογιστικής 
diff --git a/htdocs/langs/el_GR/admin.lang b/htdocs/langs/el_GR/admin.lang
index 68eed5fdafe..d74abe2ea9d 100644
--- a/htdocs/langs/el_GR/admin.lang
+++ b/htdocs/langs/el_GR/admin.lang
@@ -1509,7 +1509,8 @@ WatermarkOnDraftContractCards=Υδατογράφημα σε προσχέδια 
 MembersSetup=Ρύθμιση ενότητας μελών
 MemberMainOptions=Κύριες επιλογές
 MemberCodeChecker=Επιλογές για αυτόματη δημιουργία κωδικών μελών
-AdherentLoginRequired= Διαχείριση μιας Σύνδεσης για κάθε μέλος
+AdherentLoginRequired=Manage a login/password for each member
+AdherentLoginRequiredDesc=Add a value for a login and a password on the member file. If the member is linked to a user, updating the member login and password will also update the user login and password.
 AdherentMailRequired=Απαιτείται email για τη δημιουργία νέου μέλους
 MemberSendInformationByMailByDefault=Το πλαίσιο ελέγχου για την αποστολή επιβεβαίωσης αλληλογραφίας στα μέλη (επικύρωση ή νέα συνδρομή) είναι ενεργοποιημένο από προεπιλογή
 MemberCreateAnExternalUserForSubscriptionValidated=Δημιουργήστε στοιχεία σύνδεσης εξωτερικού χρήστη για κάθε επικυρωμένη συνδρομή νέου μέλους
@@ -2076,6 +2077,10 @@ MAIN_DOCUMENTS_LOGO_HEIGHT=Ύψος λογότυπου στο PDF
 DOC_SHOW_FIRST_SALES_REP=Εμφάνιση πρώτου αντιπροσώπου πωλήσεων
 MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Προσθήκη στήλης για εικόνα στις γραμμές προσφορών
 MAIN_DOCUMENTS_WITH_PICTURE_WIDTH=Το πλάτος της στήλης εάν προστεθεί μια εικόνα σε γραμμές
+MAIN_GENERATE_DOCUMENTS_SUPPLIER_PROPOSAL_WITHOUT_UNIT_PRICE=Απόκρυψη της στήλης τιμής μονάδας στις προσφορές
+MAIN_GENERATE_DOCUMENTS_SUPPLIER_PROPOSAL_WITHOUT_TOTAL_COLUMN=Απόκρυψη της στήλης συνολικής τιμής στις προσφορές
+MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_UNIT_PRICE=Hide the unit price column on purchase orders
+MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_TOTAL_COLUMN=Hide the total price column on puchase orders
 MAIN_PDF_NO_SENDER_FRAME=Απόκρυψη περιγραμμάτων στο πλαίσιο διεύθυνσης αποστολέα
 MAIN_PDF_NO_RECIPENT_FRAME=Απόκρυψη περιγραμμάτων στο πλαίσιο διεύθυνσης παραλήπτη
 MAIN_PDF_HIDE_CUSTOMER_CODE=Απόκρυψη κωδικού πελάτη
@@ -2399,5 +2404,5 @@ DefaultForTypeDesc=Πρότυπο που χρησιμοποιείται από 
 OptionXShouldBeEnabledInModuleY=Η επιλογή " <b> %s </b> " θα πρέπει να είναι ενεργοποιημένη στην ενότητα <b> %s </b>
 OptionXIsCorrectlyEnabledInModuleY=Η επιλογή " <b> %s </b> " είναι ενεργοποιημένη στην ενότητα <b> %s </b>
 AtBottomOfPage=Στο κάτω μέρος της σελίδας
-FailedAuth=failed authentications
-MaxNumberOfFailedAuth=Max number of failed authentication in 24h to disable login.
+FailedAuth=αποτυχημένοι έλεγχοι ταυτότητας
+MaxNumberOfFailedAuth=Max number of failed authentication in 24h to deny login.
diff --git a/htdocs/langs/el_GR/bills.lang b/htdocs/langs/el_GR/bills.lang
index 4d930775d6a..f5c18980d01 100644
--- a/htdocs/langs/el_GR/bills.lang
+++ b/htdocs/langs/el_GR/bills.lang
@@ -197,7 +197,7 @@ ConfirmClassifyPaidPartiallyReasonDiscount=Το υπόλοιπο που δεν 
 ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Παραμένουν απλήρωτα <b>(%s %s)</b> έχει μια έκπτωση που χορηγήθηκε επειδή η πληρωμή έγινε πριν από την περίοδο. Δέχομαι να χάσω το ΦΠΑ για την έκπτωση αυτή.
 ConfirmClassifyPaidPartiallyReasonDiscountVat=Παραμένουν απλήρωτα <b>(%s %s)</b> έχει μια έκπτωση που χορηγήθηκε επειδή η πληρωμή έγινε πριν από την περίοδο. Έχω την επιστροφή του ΦΠΑ για την έκπτωση αυτή χωρίς πιστωτικό τιμολόγιο.
 ConfirmClassifyPaidPartiallyReasonBadCustomer=Κακός πελάτης
-ConfirmClassifyPaidPartiallyReasonBadSupplier=Bad vendor
+ConfirmClassifyPaidPartiallyReasonBadSupplier=Κακός προμηθευτής
 ConfirmClassifyPaidPartiallyReasonBankCharge=Παρακράτηση από τράπεζα (ενδιάμεση τραπεζική προμήθεια)
 ConfirmClassifyPaidPartiallyReasonWithholdingTax=Παρακράτηση
 ConfirmClassifyPaidPartiallyReasonProductReturned=Τα προϊόντα επιστράφηκαν μερικώς
@@ -208,9 +208,9 @@ ConfirmClassifyPaidPartiallyReasonAvoirDesc=Επιλέξτε αυτή την ε
 ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=Ένας <b>κακός πελάτης</b> είναι ένας πελάτης που αρνείται να πληρώσει το χρέος του.
 ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=Αυτή η επιλογή χρησιμοποιείται όταν η πληρωμή δεν έχει ολοκληρωθεί επειδή ορισμένα από τα προϊόντα επιστράφηκαν
 ConfirmClassifyPaidPartiallyReasonBankChargeDesc=Το μη καταβληθέν ποσό είναι <b> προμήθειες μεσάζουσας τράπεζας </b> , που αφαιρούνται απευθείας από το <b>σωστό ποσό </b> που κατέβαλε ο Πελάτης.
-ConfirmClassifyPaidPartiallyReasonWithholdingTaxDesc=The unpaid amount will never be paid as it is a withholding tax
+ConfirmClassifyPaidPartiallyReasonWithholdingTaxDesc=Το απλήρωτο ποσό δεν θα καταβληθεί ποτέ καθώς είναι παρακράτηση φόρου
 ConfirmClassifyPaidPartiallyReasonOtherDesc=Χρησιμοποιήστε αυτήν την επιλογή αν όλες οι άλλες δεν είναι κατάλληλες, για παράδειγμα στην ακόλουθη περίπτωση: <br> - η πληρωμή δεν ολοκληρώθηκε επειδή ορισμένα προϊόντα επιστράφηκαν <br> - το ποσό που ζητήθηκε είναι πολύ μεγάλο επειδή μια έκπτωση ξεχάστηκε <br> Σε όλες τις περιπτώσεις, η υπέρμετρη αξίωση πρέπει να διορθωθεί στο λογιστικό σύστημα δημιουργώντας ένα πιστωτικό σημείωμα.
-ConfirmClassifyPaidPartiallyReasonBadSupplierDesc=A <b>bad supplier</b> is a supplier we refuse to pay.
+ConfirmClassifyPaidPartiallyReasonBadSupplierDesc=Ένας <b> κακός προμηθευτής </b> είναι ένας προμηθευτής που αρνούμαστε να πληρώσουμε.
 ConfirmClassifyAbandonReasonOther=Άλλος
 ConfirmClassifyAbandonReasonOtherDesc=Αυτή η επιλογή θα χρησιμοποιηθεί σε όλες τις άλλες περιπτώσεις. Για παράδειγμα, επειδή σκοπεύετε να δημιουργήσετε ένα τιμολόγιο αντικατάστασης.
 ConfirmCustomerPayment=Επιβεβαιώνετε αυτήν την καταχώριση πληρωμής για <b> %s </b> %s;
@@ -333,8 +333,8 @@ DiscountFromExcessPaid=Πληρωμές πάνω από την αξία του 
 AbsoluteDiscountUse=Αυτό το είδος πίστωσης μπορεί να χρησιμοποιηθεί στο τιμολόγιο πριν από την επικύρωσή του
 CreditNoteDepositUse=Το τιμολόγιο πρέπει να επικυρωθεί για να χρησιμοποιήσετε αυτού του είδους τις πιστώσεις
 NewGlobalDiscount=Νέα απόλυτη έκπτωση
-NewSupplierGlobalDiscount=New absolute supplier discount
-NewClientGlobalDiscount=New absolute client discount
+NewSupplierGlobalDiscount=Νέα απόλυτη έκπτωση προμηθευτή
+NewClientGlobalDiscount=Νέα απόλυτη έκπτωση πελάτη
 NewRelativeDiscount=Νέα σχετική έκπτωση
 DiscountType=Τύπος έκπτωσης
 NoteReason=Σημείωση/Αιτία
diff --git a/htdocs/langs/el_GR/dict.lang b/htdocs/langs/el_GR/dict.lang
index 9aee46f97de..a86b28acb2f 100644
--- a/htdocs/langs/el_GR/dict.lang
+++ b/htdocs/langs/el_GR/dict.lang
@@ -137,7 +137,7 @@ CountryLV=Λετονία
 CountryLB=Λίβανος
 CountryLS=Λεσότο
 CountryLR=Λιβερία
-CountryLY=Libya
+CountryLY=Λιβύη
 CountryLI=Λιχτενστάιν
 CountryLT=Λιθουανία
 CountryLU=Λουξεμβούργο
diff --git a/htdocs/langs/el_GR/ecm.lang b/htdocs/langs/el_GR/ecm.lang
index eb6f834bf69..fc9d2f2e248 100644
--- a/htdocs/langs/el_GR/ecm.lang
+++ b/htdocs/langs/el_GR/ecm.lang
@@ -48,7 +48,7 @@ GenerateImgWebp=Δημιουργήστε αντίγραφα όλων των ει
 ConfirmGenerateImgWebp=Εάν επιβεβαιώσετε, θα δημιουργήσετε μια εικόνα σε μορφή .webp για όλες τις εικόνες που βρίσκονται αυτήν τη στιγμή σε αυτόν τον φάκελο (οι υποφάκελοι δεν περιλαμβάνονται)...
 ConfirmImgWebpCreation=Επιβεβαιώστε την δημιουργία διπλοτύπων όλων των εικόνων
 GenerateChosenImgWebp=Μετατρέψτε την επιλεγμένη εικόνα σε μορφή .webp
-ConfirmGenerateChosenImgWebp=If you confirm, you will generate an image in .webp format for the image %s
+ConfirmGenerateChosenImgWebp=Εάν επιβεβαιώσετε, θα δημιουργήσετε μια νέα εικόνα σε μορφή .webp απο την εικόνα %s
 ConfirmChosenImgWebpCreation=Επιβεβαίωση μετατροπής των επιλεγμένων εικόνων
 SucessConvertImgWebp=Δημιουργήθηκαν επιτυχώς διπλότυπα των εικόνων
 SucessConvertChosenImgWebp=Η επιλεγμένη εικόνα αντιγράφηκε με επιτυχία
diff --git a/htdocs/langs/el_GR/errors.lang b/htdocs/langs/el_GR/errors.lang
index c69a4af418d..efec1f9c933 100644
--- a/htdocs/langs/el_GR/errors.lang
+++ b/htdocs/langs/el_GR/errors.lang
@@ -318,8 +318,10 @@ ErrorTheUrlOfYourDolInstanceDoesNotMatchURLIntoOAuthSetup=Σφάλμα: Η δι
 ErrorMenuExistValue=Υπάρχει ήδη ένα μενού με αυτόν τον τίτλο ή τη διεύθυνση URL
 ErrorSVGFilesNotAllowedAsLinksWithout=Τα αρχεία SVG δεν επιτρέπονται ως εξωτερικοί σύνδεσμοι χωρίς την επιλογή %s
 ErrorTypeMenu=Αδύνατη η προσθήκη ενός ακόμα μενού για την ίδια ενότητα στη γραμμή πλοήγησης, δεν υποστηρίζεται
-ErrorTableExist=Table <b>%s</b> already exist
-ErrorDictionaryNotFound=Dictionary <b>%s</b> not found
+ErrorTableExist=Ο πίνακας <b> %s </b> υπάρχει ήδη
+ErrorDictionaryNotFound=Το λεξικό <b> %s </b> δεν βρέθηκε
+ErrorFailedToCreateSymLinkToMedias=Failed to create the symlinks %s to point to %s
+
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Η παράμετρος PHP upload_max_filesize (%s) είναι υψηλότερη από την παράμετρο PHP post_max_size (%s). Αυτή δεν είναι μια συνεπής ρύθμιση.
 WarningPasswordSetWithNoAccount=Ορίστηκε κωδικός πρόσβασης για αυτό το μέλος. Ωστόσο, δεν δημιουργήθηκε λογαριασμός χρήστη. Επομένως, αυτός ο κωδικός πρόσβασης είναι αποθηκευμένος, αλλά δεν μπορεί να χρησιμοποιηθεί για τη σύνδεση στο Dolibarr. Μπορεί να χρησιμοποιηθεί από μια εξωτερική ενότητα/διεπαφή, αλλά αν δεν χρειάζεται να ορίσετε κανένα στοιχείο σύνδεσης ή κωδικό πρόσβασης για ένα μέλος, μπορείτε να απενεργοποιήσετε την επιλογή "Διαχείριση σύνδεσης για κάθε μέλος" από τη ρύθμιση της ενότητας μέλους. Εάν θέλετε να διαχειριστείτε μια σύνδεση, αλλά δεν χρειάζεστε κωδικό πρόσβασης, μπορείτε να διατηρήσετε αυτό το πεδίο κενό για να αποφύγετε αυτήν την προειδοποίηση. Σημείωση: Το email μπορεί επίσης να χρησιμοποιηθεί ως σύνδεση εάν το μέλος είναι συνδεδεμένο με έναν χρήστη.
@@ -360,7 +362,7 @@ WarningAutoValNotPossibleWhenStockIsDecreasedOnInvoiceVal=Η αυτόματη ε
 WarningModuleNeedRefrech = Η ενότητα <b> %s </b> έχει απενεργοποιηθεί. Μην ξεχάσετε να την ενεργοποιήσετε
 WarningPermissionAlreadyExist=Υπάρχοντα δικαιώματα για αυτό το αντικείμενο
 WarningGoOnAccountancySetupToAddAccounts=Εάν αυτή η λίστα είναι κενή, μεταβείτε στο μενού %s - %s - %s για να φορτώσετε ή να δημιουργήσετε λογαριασμούς για το λογιστικό σας σχέδιο.
-WarningCorrectedInvoiceNotFound=Corrected invoice not found
+WarningCorrectedInvoiceNotFound=Το διορθωμένο τιμολόγιο δεν βρέθηκε
 
 SwissQrOnlyVIR = Το SwissQR μπορεί να προστεθεί μόνο σε τιμολόγια που έχουν οριστεί για πληρωμή με πληρωμές μεταφοράς πίστωσης.
 SwissQrCreditorAddressInvalid = Η διεύθυνση του πιστωτή δεν είναι έγκυρη (Έχουν οριστεί ο ταχυδρομικός κώδικας και η πόλη; (%s)
@@ -389,4 +391,4 @@ BadSetupOfField = Σφάλμα κακή ρύθμιση του πεδίου
 BadSetupOfFieldClassNotFoundForValidation = Σφάλμα κακής ρύθμισης πεδίου: Η κλάση δεν βρέθηκε για επικύρωση
 BadSetupOfFieldFileNotFound = Σφάλμα κακής ρύθμισης πεδίου : Το αρχείο δεν βρέθηκε για συμπερίληψη
 BadSetupOfFieldFetchNotCallable = Σφάλμα κακής ρύθμισης του πεδίου : Fetch not callable on class
-ErrorTooManyAttempts= Too many attempts, please try again later
+ErrorTooManyAttempts= Πάρα πολλές προσπάθειες, παρακαλώ δοκιμάστε ξανά αργότερα
diff --git a/htdocs/langs/el_GR/main.lang b/htdocs/langs/el_GR/main.lang
index 0736597631e..dbc18164f36 100644
--- a/htdocs/langs/el_GR/main.lang
+++ b/htdocs/langs/el_GR/main.lang
@@ -235,8 +235,8 @@ PersonalValue=Προσωπική Τιμή
 NewObject=Νέο %s
 NewValue=Νέα Τιμή
 OldValue=Παλιά τιμή %s
-FieldXModified=Field %s modified
-FieldXModifiedFromYToZ=Field %s modified from %s to %s
+FieldXModified=Το πεδίο %s τροποποιήθηκε
+FieldXModifiedFromYToZ=Το πεδίο %s τροποποιήθηκε από %s σε %s
 CurrentValue=Τρέχουσα Τιμή
 Code=Κωδικός
 Type=Τύπος
@@ -348,7 +348,7 @@ MonthOfDay=Μήνας της ημέρας
 DaysOfWeek=Ημέρες της εβδομάδας
 HourShort=Ω
 MinuteShort=λ
-SecondShort=sec
+SecondShort=δευτερόλεπτο
 Rate=Τιμή
 CurrencyRate=Τιμή μετατροπής νομίσματος
 UseLocalTax=με Φ.Π.Α
@@ -558,7 +558,7 @@ Unknown=Άγνωστο
 General=Γενικά
 Size=Μέγεθος
 OriginalSize=Αρχικό μέγεθος
-RotateImage=Rotate 90°
+RotateImage=Περιστροφή 90°
 Received=Παραλήφθηκε
 Paid=Πληρωμένα
 Topic=Θέμα
@@ -1237,3 +1237,5 @@ SearchSyntaxTooltipForStringOrNum=Για αναζήτηση μέσα σε πεδ
 InProgress=Σε εξέλιξη
 DateOfPrinting=Ημερομηνία εκτύπωσης
 ClickFullScreenEscapeToLeave=Κάντε κλικ εδώ για εναλλαγή σε λειτουργία πλήρους οθόνης. Πατήστε ESCAPE για έξοδο από τη λειτουργία πλήρους οθόνης.
+UserNotYetValid=Not yet valid
+UserExpired=Ληγμένη
diff --git a/htdocs/langs/el_GR/modulebuilder.lang b/htdocs/langs/el_GR/modulebuilder.lang
index d81d167592c..fe4ae3c18f2 100644
--- a/htdocs/langs/el_GR/modulebuilder.lang
+++ b/htdocs/langs/el_GR/modulebuilder.lang
@@ -163,11 +163,11 @@ ListOfTabsEntries=Λίστα καταχωρήσεων καρτελών
 TabsDefDesc=Ορίστε εδώ τις καρτέλες που παρέχονται από την ενότητα σας
 TabsDefDescTooltip=Οι καρτέλες που παρέχονται από την ενότητα/εφαρμογή σας ορίζονται στον πίνακα  <strong>$this->tabs</strong>  στο αρχείο περιγραφής της ενότητας. Μπορείτε να επεξεργαστείτε μη αυτόματα αυτό το αρχείο ή να χρησιμοποιήσετε τον ενσωματωμένο επεξεργαστή.
 BadValueForType=Λάθος τιμή για τον τύπο %s
-DefinePropertiesFromExistingTable=Ορίστε ιδιότητες από έναν υπάρχοντα πίνακα
+DefinePropertiesFromExistingTable=Define the fields/properties from an existing table
 DefinePropertiesFromExistingTableDesc=Εάν υπάρχει ήδη ένας πίνακας στη βάση δεδομένων (για τη δημιουργία του αντικειμένου), μπορείτε να τον χρησιμοποιήσετε για να ορίσετε τις ιδιότητες του αντικειμένου.
 DefinePropertiesFromExistingTableDesc2=Διατηρήστε το κενό εάν ο πίνακας δεν υπάρχει ακόμα. Ο code generator θα χρησιμοποιήσει διαφορετικά είδη πεδίων για να δημιουργήσει ένα παράδειγμα πίνακα που μπορείτε να επεξεργαστείτε αργότερα.
-GeneratePermissions=Θέλω να προσθέσω δικαιώματα για αυτό το αντικείμενο
-GeneratePermissionsHelp=δημιουργία προεπιλεγμένων δικαιωμάτων για αυτό το αντικείμενο
+GeneratePermissions=I want to manage permissions on this object
+GeneratePermissionsHelp=If you check this, some code will be added to manage permissions to read, write and delete record of the objects
 PermissionDeletedSuccesfuly=Η άδεια καταργήθηκε με επιτυχία
 PermissionUpdatedSuccesfuly=Η άδεια ενημερώθηκε με επιτυχία
 PermissionAddedSuccesfuly=Η άδεια προστέθηκε με επιτυχία
@@ -178,5 +178,6 @@ ApiObjectDeleted=Το API για το αντικείμενο %s διαγράφη
 CRUDRead=Ανάγνωση
 CRUDCreateWrite=Δημιουργία ή Ενημέρωση
 FailedToAddCodeIntoDescriptor=Αποτυχία προσθήκης κώδικα στον descriptor. Ελέγξτε ότι το string comment "%s" εξακολουθεί να υπάρχει στο αρχείο.
-DictionariesCreated=Dictionary <b>%s</b> created successfully
-DictionaryDeleted=Dictionary <b>%s</b> removed successfully
+DictionariesCreated=Το λεξικό <b> %s </b> δημιουργήθηκε με επιτυχία
+DictionaryDeleted=Το λεξικό <b> %s </b> καταργήθηκε με επιτυχία
+PropertyModuleUpdated=Property <b>%s</b> has been update successfully
diff --git a/htdocs/langs/el_GR/stocks.lang b/htdocs/langs/el_GR/stocks.lang
index 6ac2b27973c..4cc72e1ed4b 100644
--- a/htdocs/langs/el_GR/stocks.lang
+++ b/htdocs/langs/el_GR/stocks.lang
@@ -321,5 +321,5 @@ BatchNotFound=Δεν βρέθηκε παρτίδα / σειριακός αριθ
 StockMovementWillBeRecorded=Stock movement will be recorded
 StockMovementNotYetRecorded=Stock movement will not be affected by this step
 WarningThisWIllAlsoDeleteStock=Προειδοποίηση, αυτό θα διαγράψει επίσης όλες τις ποσότητες απόθεματος στην αποθήκη
-DeleteBatch=Delete lot/serial
-ConfirmDeleteBatch=Are you sure you want to delete lot/serial ?
+DeleteBatch=Διαγραφή παρτίδας/σειράς
+ConfirmDeleteBatch=Είστε σίγουροι ότι θέλετε να διαγράψετε την παρτίδα/σειρά;
diff --git a/htdocs/langs/el_GR/stripe.lang b/htdocs/langs/el_GR/stripe.lang
index 492e26bcc58..1eef9e2d2dd 100644
--- a/htdocs/langs/el_GR/stripe.lang
+++ b/htdocs/langs/el_GR/stripe.lang
@@ -51,6 +51,7 @@ StripeAccount=Λογαριασμός Stripe
 StripeChargeList=Λίστα χρεώσεων Stripe
 StripeTransactionList=Κατάλογος των συναλλαγών Stripe
 StripeCustomerId=Αναγνωριστικό πελάτη Sripe
+StripePaymentId=Αναγνωριστικό πληρωμής Stripe
 StripePaymentModes=Λειτουργίες πληρωμής Stripe
 LocalID=Τοπικό αναγνωριστικό
 StripeID=Αναγνωριστικό Stripe
diff --git a/htdocs/langs/el_GR/supplier_proposal.lang b/htdocs/langs/el_GR/supplier_proposal.lang
index 84ef2b03e77..fa881a73bec 100644
--- a/htdocs/langs/el_GR/supplier_proposal.lang
+++ b/htdocs/langs/el_GR/supplier_proposal.lang
@@ -36,13 +36,14 @@ SupplierProposalStatusNotSignedShort=Απορρίφθηκε
 CopyAskFrom=Δημιουργήστε ένα αίτημα τιμής αντιγράφοντας ένα υπάρχον αίτημα
 CreateEmptyAsk=Δημιουργία κενής αίτησης τιμής
 ConfirmCloneAsk=Είστε σίγουροι πως θέλετε να αντιγράψετε την αίτηση τιμής <b>%s</b>;
-ConfirmReOpenAsk=Είστε βέβαιοι ότι θέλετε να ανοίξετε πάλι την αίτηση τιμής <b> %s </b>;
+ConfirmReOpenAsk=Είστε σίγουροι ότι θέλετε να ανοίξετε πάλι την αίτηση τιμής <b> %s </b>;
 SendAskByMail=Αποστολή αίτησης τιμής με email
 SendAskRef=Αποστολή της αίτησης τιμής %s
 SupplierProposalCard=Καρτέλα αιτήσεων
 ConfirmDeleteAsk=Είστε σίγουροι πως θέλετε να διαγράψετε την αίτηση τιμής <b>%s</b>;
 ActionsOnSupplierProposal=Ενέργειες κατόπιν αιτήσεως τιμής
-DocModelAuroreDescription=Ένα πλήρες μοντέλο αίτησης τιμής (logo. ..)
+DocModelAuroreDescription=A complete template for a vendor quotation request template (old implementation of Sponge template)
+DocModelZenithDescription=A complete template for a vendor quotation request template
 CommercialAsk=Αίτηση τιμής
 DefaultModelSupplierProposalCreate=Δημιουργία προεπιλεγμένου μοντέλου
 DefaultModelSupplierProposalToBill=Προκαθορισμένο πρότυπο κατά το κλείσιμο αιτήματος τιμής (αποδεκτό)
diff --git a/htdocs/langs/el_GR/ticket.lang b/htdocs/langs/el_GR/ticket.lang
index 76cb92e4321..61fc94d747a 100644
--- a/htdocs/langs/el_GR/ticket.lang
+++ b/htdocs/langs/el_GR/ticket.lang
@@ -126,9 +126,9 @@ TicketParams=Παράμετροι
 TicketsShowModuleLogo=Εμφανίστε το λογότυπο της ενότητας στη δημόσια διεπαφή
 TicketsShowModuleLogoHelp=Ενεργοποιήστε αυτήν την επιλογή για να αποκρύψετε την ενότητα λογότυπου στις σελίδες της δημόσιας διεπαφής
 TicketsShowCompanyLogo=Εμφανίστε το λογότυπο της εταιρείας στη δημόσια διεπαφή
-TicketsShowCompanyLogoHelp=Enable this option to show the logo of the main company in the pages of the public interface
+TicketsShowCompanyLogoHelp=Ενεργοποιήστε αυτήν την επιλογή για να εμφανίζεται το λογότυπο της εταιρείας σας στις σελίδες της δημόσιας διεπαφής
 TicketsShowCompanyFooter=Εμφάνιση του υποσέλιδου της εταιρείας στη δημόσια διεπαφή
-TicketsShowCompanyFooterHelp=Enable this option to show the footer of the main company in the pages of the public interface
+TicketsShowCompanyFooterHelp=Ενεργοποιήστε αυτήν την επιλογή για να εμφανίζεται το υποσέλιδο της εταιρείας σας στις σελίδες της δημόσιας διεπαφής
 TicketsEmailAlsoSendToMainAddress=Στείλτε επίσης μια ειδοποίηση στην κύρια διεύθυνση email
 TicketsEmailAlsoSendToMainAddressHelp=Ενεργοποιήστε αυτήν την επιλογή για να στείλετε επίσης ένα μήνυμα ηλεκτρονικού ταχυδρομείου στη διεύθυνση που ορίστηκε στη ρύθμιση "%s" (δείτε την καρτέλα "%s")
 TicketsLimitViewAssignedOnly=Περιορίστε την εμφάνιση σε tickets που έχουν εκχωρηθεί στον τρέχοντα χρήστη (δεν έχει εφαρμογή για εξωτερικούς χρήστες, πάντα περιορίζονται στο τρίτο μέρος από το οποίο εξαρτώνται)
diff --git a/htdocs/langs/el_GR/users.lang b/htdocs/langs/el_GR/users.lang
index b0a623b4e22..85adf3c663b 100644
--- a/htdocs/langs/el_GR/users.lang
+++ b/htdocs/langs/el_GR/users.lang
@@ -99,7 +99,7 @@ YourRole=Οι ρόλοι σας
 YourQuotaOfUsersIsReached=Συμπληρώθηκε το όριο ενεργών χρηστών σας!
 NbOfUsers=Αριθμός χρηστών
 NbOfPermissions=Αριθμός αδειών
-DontDowngradeSuperAdmin=Only another admin can downgrade an admin
+DontDowngradeSuperAdmin=Μόνο ένας άλλος διαχειριστής μπορεί να υποβαθμίσει έναν διαχειριστή
 HierarchicalResponsible=Επόπτης
 HierarchicView=Ιεραρχική προβολή
 UseTypeFieldToChange=Χρησιμοποιήστε τύπο πεδίου προς αλλαγή
diff --git a/htdocs/langs/el_GR/website.lang b/htdocs/langs/el_GR/website.lang
index e1879ab243b..dacc7c95a02 100644
--- a/htdocs/langs/el_GR/website.lang
+++ b/htdocs/langs/el_GR/website.lang
@@ -158,5 +158,5 @@ Reservation=Κράτηση
 PagesViewedPreviousMonth=Σελίδες που προβλήθηκαν (προηγούμενος μήνας)
 PagesViewedTotal=Σελίδες που προβλήθηκαν (σύνολο)
 Visibility=Ορατότητα
-Everyone=Everyone
+Everyone=Όλοι
 AssignedContacts=Εκχωρημένες επαφές
diff --git a/htdocs/langs/en_AE/supplier_proposal.lang b/htdocs/langs/en_AE/supplier_proposal.lang
new file mode 100644
index 00000000000..a1b23cd956e
--- /dev/null
+++ b/htdocs/langs/en_AE/supplier_proposal.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - supplier_proposal
+DocModelAuroreDescription=A complete template for a vendor quotation request template (old implementation of Sponge template)
diff --git a/htdocs/langs/en_AU/supplier_proposal.lang b/htdocs/langs/en_AU/supplier_proposal.lang
new file mode 100644
index 00000000000..a1b23cd956e
--- /dev/null
+++ b/htdocs/langs/en_AU/supplier_proposal.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - supplier_proposal
+DocModelAuroreDescription=A complete template for a vendor quotation request template (old implementation of Sponge template)
diff --git a/htdocs/langs/en_CA/supplier_proposal.lang b/htdocs/langs/en_CA/supplier_proposal.lang
new file mode 100644
index 00000000000..a1b23cd956e
--- /dev/null
+++ b/htdocs/langs/en_CA/supplier_proposal.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - supplier_proposal
+DocModelAuroreDescription=A complete template for a vendor quotation request template (old implementation of Sponge template)
diff --git a/htdocs/langs/en_GB/accountancy.lang b/htdocs/langs/en_GB/accountancy.lang
index 3602a61932d..fc5fbfbb367 100644
--- a/htdocs/langs/en_GB/accountancy.lang
+++ b/htdocs/langs/en_GB/accountancy.lang
@@ -7,9 +7,6 @@ OverviewOfAmountOfLinesBound=Overview of number of lines already bound to an fin
 DeleteCptCategory=Remove finance account from group
 JournalizationInLedgerStatus=Status of journals
 GroupIsEmptyCheckSetup=Group is empty, check setup of the personalised finance group
-MainAccountForCustomersNotDefined=Main finance account for customers not defined in setup
-MainAccountForUsersNotDefined=Main finance account for users not defined in setup
-MainAccountForVatPaymentNotDefined=Main finance account for VAT payment not defined in setup
 AccountancyAreaDescIntro=Usage of the accountancy module is done in several steps:
 AccountancyAreaDescVat=STEP %s: Define finance accounts for each VAT Rate. For this, use the menu entry %s.
 AccountancyAreaDescSal=STEP %s: Define default finance accounts for payment of salaries. For this, use the menu entry %s.
diff --git a/htdocs/langs/en_GB/admin.lang b/htdocs/langs/en_GB/admin.lang
index 9a7cec776f4..72698601b14 100644
--- a/htdocs/langs/en_GB/admin.lang
+++ b/htdocs/langs/en_GB/admin.lang
@@ -31,30 +31,14 @@ ModuleFamilyTechnic=Multi-module tools
 NotExistsDirect=The alternative root directory is not defined in an existing directory.<br>
 InfDirAlt=Since version 3, it is possible to define an alternative root directory. This allows you to store, in a dedicated directory, plug-ins and custom templates.<br>Just create a directory at the root of Dolibarr (eg: custom).<br>
 InfDirExample=<br>Then declare it in the file <strong>conf.php</strong><br> $dolibarr_main_url_root_alt='/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>If these lines start with a "#", they are comments. To enable them, just remove the "#" character and save the file.
-GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany, with date 2023-01-31:</u><br>
-GenericMaskCodes4b=<u>Example on third party created on 2023-01-31:</u><br>
-GenericMaskCodes4c=<u>Example on product created on 2023-01-31:</u><br>
-GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> will give <b>ABC2301-000099</b><br><b>{0000+100@1}-ZZZ/{dd}/XXX</b> will give <b>0199-ZZZ/31/XXX</b><br><b>IN{yy}{mm}-{0000}-{t}</b> will give <b>IN2301-0099-A</b> if the type of company is 'Responsable Inscripto' with code for type that is 'A_RI'
 GenericNumRefModelDesc=Returns a customisable number according to a defined mask.
 ListOfDirectories=List of OpenDocument template directories
 ListOfDirectoriesForModelGenODT=List of directories containing template files in OpenDocument format.<br><br>Put here full path of directories.<br>Add a carriage return between each directory.<br>To add a directory of the GED module, add here <b>DOL_DATA_ROOT/ecm/yourdirectoryname</b>.<br><br>Files in those directories must end with <b>.odt</b> or <b>.ods</b>.
 FollowingSubstitutionKeysCanBeUsed=<br>To learn how to create your .odt document templates, before storing them in those directories, read wiki documentation:
-FullListOnOnlineDocumentation=https://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
 Module50200Name=PayPal
 DictionaryAccountancyJournal=Finance journals
 CompanyZip=Postcode
 AdherentLoginRequired=Manage a Login for each member
 LDAPFieldZip=Postcode
-LDAPFieldGroupidExample=Example : gidnumber
-LDAPFieldUseridExample=Example : uidnumber
 GenbarcodeLocation=Barcode generation command line tool (used by internal engine for some bar code types). Must be compatible with "genbarcode".<br>For example: /usr/local/bin/genbarcode
-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).
-oauthToken=OAuth2 token
 FormatZip=Postcode
-INVOICE_ADD_SWISS_QR_CODEMore=Switzerland's standard for invoices; make sure ZIP & City are filled and that the accounts have valid Swiss/Liechtenstein IBANs.
-CssOnEdit=CSS on edit pages
-CssOnView=CSS on view pages
-CssOnList=CSS on lists
-HelpCssOnEditDesc=The CSS used when editing the field.<br>Example: "minwiwdth100 maxwidth500 widthcentpercentminusx"
-HelpCssOnViewDesc=The CSS used when viewing the field.
-HelpCssOnListDesc=The CSS used when field is inside a list table.<br>Example: "tdoverflowmax200"
diff --git a/htdocs/langs/en_GB/supplier_proposal.lang b/htdocs/langs/en_GB/supplier_proposal.lang
index aaa6cb73ec3..53ca259cf3c 100644
--- a/htdocs/langs/en_GB/supplier_proposal.lang
+++ b/htdocs/langs/en_GB/supplier_proposal.lang
@@ -8,7 +8,7 @@ SupplierProposalsShort=Vendor quotes
 SupplierProposalRefFournNotice=Before closing as "Accepted", think of obtaining suppliers references.
 ConfirmReOpenAsk=Are you sure you want to reopen the price request <b>%s</b>?
 ActionsOnSupplierProposal=Actions on price request
-DocModelAuroreDescription=A complete request example (logo...)
+DocModelAuroreDescription=A complete template for a vendor quotation request template (old implementation of Sponge template)
 DefaultModelSupplierProposalCreate=Default template creation
 ListOfSupplierProposals=List of vendor quotes requested
 ListSupplierProposalsAssociatedProject=List of vendor quotes associated with project
diff --git a/htdocs/langs/en_IN/supplier_proposal.lang b/htdocs/langs/en_IN/supplier_proposal.lang
new file mode 100644
index 00000000000..a1b23cd956e
--- /dev/null
+++ b/htdocs/langs/en_IN/supplier_proposal.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - supplier_proposal
+DocModelAuroreDescription=A complete template for a vendor quotation request template (old implementation of Sponge template)
diff --git a/htdocs/langs/en_SG/supplier_proposal.lang b/htdocs/langs/en_SG/supplier_proposal.lang
new file mode 100644
index 00000000000..a1b23cd956e
--- /dev/null
+++ b/htdocs/langs/en_SG/supplier_proposal.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - supplier_proposal
+DocModelAuroreDescription=A complete template for a vendor quotation request template (old implementation of Sponge template)
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 2f6a6e5a2be..57d69715922 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -365,10 +365,10 @@ GenericMaskCodes=You may enter any numbering mask. In this mask, the following t
 GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated to the customer. This counter dedicated to customer is reset at same time as the global counter.<br><b>{tttt}</b> The code of third party type on n characters (see menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
 GenericMaskCodes3=All other characters in the mask will remain intact.<br>Spaces are not allowed.<br>
 GenericMaskCodes3EAN=All other characters in the mask will remain intact (except * or ? in 13th position in EAN13).<br>Spaces are not allowed.<br>In EAN13, the last character after the last } in 13th position should be * or ? . It will be replaced by the calculated key.<br>
-GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany, with date 2007-01-31:</u><br>
-GenericMaskCodes4b=<u>Example on third party created on 2007-03-01:</u><br>
-GenericMaskCodes4c=<u>Example on product created on 2007-03-01:</u><br>
-GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> will give <b>ABC0701-000099</b><br><b>{0000+100@1}-ZZZ/{dd}/XXX</b> will give <b>0199-ZZZ/31/XXX</b><br><b>IN{yy}{mm}-{0000}-{t}</b> will give <b>IN0701-0099-A</b> if the type of company is 'Responsable Inscripto' with code for type that is 'A_RI'
+GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany, with date 2023-01-31:</u><br>
+GenericMaskCodes4b=<u>Example on third party created on 2023-01-31:</u><br>
+GenericMaskCodes4c=<u>Example on product created on 2023-01-31:</u><br>
+GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> will give <b>ABC2301-000099</b><br><b>{0000+100@1}-ZZZ/{dd}/XXX</b> will give <b>0199-ZZZ/31/XXX</b><br><b>IN{yy}{mm}-{0000}-{t}</b> will give <b>IN2301-0099-A</b> if the type of company is 'Responsable Inscripto' with code for type that is 'A_RI'
 GenericNumRefModelDesc=Returns a customizable number according to a defined mask.
 ServerAvailableOnIPOrPort=Server is available at address <b>%s</b> on port <b>%s</b>
 ServerNotAvailableOnIPOrPort=Server is not available at address <b>%s</b> on port <b>%s</b>
@@ -394,7 +394,7 @@ ListOfDirectoriesForModelGenODT=List of directories containing templates files w
 NumberOfModelFilesFound=Number of ODT/ODS template files found in these directories
 ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\myapp\\mydocumentdir\\mysubdir<br>/home/myapp/mydocumentdir/mysubdir<br>DOL_DATA_ROOT/ecm/ecmdir
 FollowingSubstitutionKeysCanBeUsed=<br>To know how to create your odt document templates, before storing them in those directories, read wiki documentation:
-FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
+FullListOnOnlineDocumentation=https://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
 FirstnameNamePosition=Position of Name/Lastname
 DescWeather=The following images will be shown on the dashboard when the number of late actions reach the following values:
 KeyForWebServicesAccess=Key to use Web Services (parameter "dolibarrkey" in webservices)
@@ -542,7 +542,7 @@ DAV_ALLOW_PUBLIC_DIR=Enable the generic public directory (WebDAV dedicated direc
 DAV_ALLOW_PUBLIC_DIRTooltip=The generic public directory is a WebDAV directory anybody can access (in read and write mode), with no authorization required (login/password account).
 DAV_ALLOW_ECM_DIR=Enable the DMS/ECM private directory (root directory of the DMS/ECM module - login required)
 DAV_ALLOW_ECM_DIRTooltip=The root directory where all files are manually uploaded when using the DMS/ECM module. Similarly as access from the web interface, you will need a valid login/password with adecuate permissions to access it.
-# Modules
+##### Modules #####
 Module0Name=Users & Groups
 Module0Desc=Users / Employees and Groups management
 Module1Name=Third Parties
@@ -712,6 +712,7 @@ Module63000Desc=Manage resources (printers, cars, rooms, ...) for allocating to
 Module66000Name=OAuth2 token management
 Module66000Desc=Provide a tool to generate and manage OAuth2 tokens. The token can then be used by some other modules.
 Module94160Name=Receptions
+##### Permissions #####
 Permission11=Read customer invoices (and payments)
 Permission12=Create/modify customer invoices
 Permission13=Invalidate customer invoices
@@ -1439,10 +1440,10 @@ MustBeUnique=Must be unique?
 MustBeMandatory=Mandatory to create third parties (if VAT number or type of company defined) ?
 MustBeInvoiceMandatory=Mandatory to validate invoices?
 TechnicalServicesProvided=Technical services provided
-#####DAV #####
+##### WebDAV #####
 WebDAVSetupDesc=This is the link to access the WebDAV directory. It contains a "public" dir open to any user knowing the URL (if public directory access allowed) and a "private" directory that needs an existing login account/password for access.
 WebDavServer=Root URL of %s server: %s
-##### Webcal setup #####
+##### WebCAL setup #####
 WebCalUrlForVCalExport=An export link to <b>%s</b> format is available at following link: %s
 ##### Invoices #####
 BillsSetup=Invoices module setup
@@ -1642,9 +1643,9 @@ LDAPFieldEndLastSubscription=Date of subscription end
 LDAPFieldTitle=Job position
 LDAPFieldTitleExample=Example: title
 LDAPFieldGroupid=Group id
-LDAPFieldGroupidExample=Exemple : gidnumber
+LDAPFieldGroupidExample=Example : gidnumber
 LDAPFieldUserid=User id
-LDAPFieldUseridExample=Exemple : uidnumber
+LDAPFieldUseridExample=Example : uidnumber
 LDAPFieldHomedirectory=Home directory
 LDAPFieldHomedirectoryExample=Exemple : homedirectory
 LDAPFieldHomedirectoryprefix=Home directory prefix
@@ -1835,26 +1836,26 @@ AccountancyCodeSell=Sale account. code
 AccountancyCodeBuy=Purchase account. code
 CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=Keep the checkbox “Automatically create the payment” empty by default when creating a new tax
 ##### Agenda #####
-AgendaSetup=Events and agenda module setup
-PasswordTogetVCalExport=Key to authorize export link
-SecurityKey = Security Key
+AgendaSetup = Events and agenda module setup
+AGENDA_DEFAULT_FILTER_TYPE = Automatically set this type of event in search filter of agenda view
+AGENDA_DEFAULT_FILTER_STATUS = Automatically set this status for events in search filter of agenda view
+AGENDA_DEFAULT_VIEW = Which view do you want to open by default when selecting menu Agenda
+AGENDA_EVENT_PAST_COLOR = Past event color
+AGENDA_EVENT_CURRENT_COLOR = Current event color
+AGENDA_EVENT_FUTURE_COLOR = Future event color
+AGENDA_REMINDER_BROWSER = Enable event reminder <b>on user's browser</b> (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup).
+AGENDA_REMINDER_BROWSER_SOUND = Enable sound notification
+AGENDA_REMINDER_EMAIL = Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event).
+AGENDA_REMINDER_EMAIL_NOTE = Note: The frequency of the scheduled job %s must be enough to be sure that the remind are sent at the correct moment.
+AGENDA_SHOW_LINKED_OBJECT = Show linked object into agenda view
+AGENDA_USE_EVENT_TYPE = Use events types (managed in menu Setup -> Dictionaries -> Type of agenda events)
+AGENDA_USE_EVENT_TYPE_DEFAULT = Automatically set this default value for type of event in event create form
+PasswordTogetVCalExport = Key to authorize export link
 PastDelayVCalExport=Do not export event older than
-AGENDA_USE_EVENT_TYPE=Use events types (managed in menu Setup -> Dictionaries -> Type of agenda events)
-AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of event in event create form
-AGENDA_DEFAULT_FILTER_TYPE=Automatically set this type of event in search filter of agenda view
-AGENDA_DEFAULT_FILTER_STATUS=Automatically set this status for events in search filter of agenda view
-AGENDA_EVENT_PAST_COLOR=Past event color
-AGENDA_EVENT_CURRENT_COLOR=Current event color
-AGENDA_EVENT_FUTURE_COLOR=Future event color
-AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting menu Agenda
-AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup).
-AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification
-AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event).
-AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the scheduled job %s must be enough to be sure that the remind are sent at the correct moment.
-AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
-##### Clicktodial #####
+SecurityKey = Security Key
+##### ClickToDial #####
 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).
+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 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.
@@ -2067,6 +2068,7 @@ BaseCurrency=Reference currency of the company (go into setup of company to chan
 WarningNoteModuleInvoiceForFrenchLaw=This module %s is compliant with French laws (Loi Finance 2016).
 WarningNoteModulePOSForFrenchLaw=This module %s is compliant with French laws (Loi Finance 2016) because module Non Reversible Logs is automatically activated.
 WarningInstallationMayBecomeNotCompliantWithLaw=You are trying to install module %s that is an external module. Activating an external module means you trust the publisher of that module and that you are sure that this module does not adversely impact the behavior of your application, and is compliant with laws of your country (%s). If the module introduces an illegal feature, you become responsible for the use of illegal software.
+
 MAIN_PDF_MARGIN_LEFT=Left margin on PDF
 MAIN_PDF_MARGIN_RIGHT=Right margin on PDF
 MAIN_PDF_MARGIN_TOP=Top margin on PDF
@@ -2075,6 +2077,10 @@ MAIN_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
 DOC_SHOW_FIRST_SALES_REP=Show first sales representative
 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_GENERATE_DOCUMENTS_SUPPLIER_PROPOSAL_WITHOUT_UNIT_PRICE=Hide the unit price column on quotation requests
+MAIN_GENERATE_DOCUMENTS_SUPPLIER_PROPOSAL_WITHOUT_TOTAL_COLUMN=Hide the total price column on quotation requests
+MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_UNIT_PRICE=Hide the unit price column on purchase orders
+MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_TOTAL_COLUMN=Hide the total price column on puchase orders
 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
@@ -2111,7 +2117,7 @@ NewEmailCollector=New Email Collector
 EMailHost=Host of email IMAP server
 EMailHostPort=Port of email IMAP server
 loginPassword=Login/Password
-oauthToken=Oauth2 token
+oauthToken=OAuth2 token
 accessType=Acces type
 oauthService=Oauth service
 TokenMustHaveBeenCreated=Module OAuth2 must be enabled and an oauth2 token must have been created with the correct permissions (for example scope "gmail_full" with OAuth for Gmail).
@@ -2210,7 +2216,7 @@ IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is fo
 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 (search will be done on the defined property among 'id','name','name_alias','email'). 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 from a string 'Name: name to find' present into the body, use the 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>
-FilterSearchImapHelp=Warning: a lot of email servers (like Gmail) are doing full word searches when searching on a string and will not return a result if the string is only found partially into a word. For this reason too, use special characters into a search criteria will be ignored are they are not part of existing words.<br>To make an exclude search on a word (return email if word is not found), you can use the ! character before the word (may not work on some mail servers).  
+FilterSearchImapHelp=Warning: a lot of email servers (like Gmail) are doing full word searches when searching on a string and will not return a result if the string is only found partially into a word. For this reason too, use special characters into a search criteria will be ignored are they are not part of existing words.<br>To make an exclude search on a word (return email if word is not found), you can use the ! character before the word (may not work on some mail servers).
 EndPointFor=End point for %s : %s
 DeleteEmailCollector=Delete email collector
 ConfirmDeleteEmailCollector=Are you sure you want to delete this email collector?
@@ -2337,7 +2343,7 @@ IconOnly=Icon only - Text on tooltip only
 INVOICE_ADD_ZATCA_QR_CODE=Show the ZATCA QR code on invoices
 INVOICE_ADD_ZATCA_QR_CODEMore=Some Arabic countries need this QR Code on their invoices
 INVOICE_ADD_SWISS_QR_CODE=Show the swiss QR-Bill code on invoices
-INVOICE_ADD_SWISS_QR_CODEMore=Switzerland's standard for invoices; make sure ZIP&City are filled and that the accounts have valid Swiss/Liechtenstein IBANs.
+INVOICE_ADD_SWISS_QR_CODEMore=Switzerland's standard for invoices; make sure ZIP & City are filled and that the accounts have valid Swiss/Liechtenstein IBANs.
 INVOICE_SHOW_SHIPPING_ADDRESS=Show shipping address
 INVOICE_SHOW_SHIPPING_ADDRESSMore=Compulsory indication in some countries (France, ...)
 UrlSocialNetworksDesc=Url link of social network. Use {socialid} for the variable part that contains the social network ID.
@@ -2367,12 +2373,12 @@ DefinedAPathForAntivirusCommandIntoSetup=Define a path for an antivirus program
 TriggerCodes=Triggerable events
 TriggerCodeInfo=Enter here the trigger code(s) that must generate a post of a web request (only external URL are allowed). You can enter several trigger codes separated by a comma.
 EditableWhenDraftOnly=If unchecked, the value can only be modified when object has a draft status
-CssOnEdit=Css on edit pages
-CssOnView=Css on view pages
-CssOnList=Css on lists
-HelpCssOnEditDesc=The Css used when editing the field.<br>Example: "minwiwdth100 maxwidth500 widthcentpercentminusx"
-HelpCssOnViewDesc=The Css used when viewing the field.
-HelpCssOnListDesc=The Css used when field is inside a list table.<br>Example: "tdoverflowmax200"
+CssOnEdit=CSS on edit pages
+CssOnView=CSS on view pages
+CssOnList=CSS on lists
+HelpCssOnEditDesc=The CSS used when editing the field.<br>Example: "minwiwdth100 maxwidth500 widthcentpercentminusx"
+HelpCssOnViewDesc=The CSS used when viewing the field.
+HelpCssOnListDesc=The CSS used when field is inside a list table.<br>Example: "tdoverflowmax200"
 RECEPTION_PDF_HIDE_ORDERED=Hide the quantity ordered on the generated documents for receptions
 MAIN_PDF_RECEPTION_DISPLAY_AMOUNT_HT=Show the price on the generated documents for receptions
 WarningDisabled=Warning disabled
@@ -2387,7 +2393,7 @@ IfDefinedUseAValueBeetween=If defined, use a value between %s and %s
 Reload=Reload
 ConfirmReload=Confirm module reload
 WarningModuleHasChangedLastVersionCheckParameter=Warning: the module %s has set a parameter to check its version at each page access. This is a bad and not allowed practice that may make the page to administer modules instable. Please contact author of module to fix this.
-WarningModuleHasChangedSecurityCsrfParameter=Warning: the module %s has disabled the CSRF security of your instance. This action is suspect and your installation may no more be secured. Please contact the author of the module for explanation.  
+WarningModuleHasChangedSecurityCsrfParameter=Warning: the module %s has disabled the CSRF security of your instance. This action is suspect and your installation may no more be secured. Please contact the author of the module for explanation.
 EMailsInGoingDesc=Incoming emails are managed by the module %s. You must enable and configure it if you need to support ingoing emails.
 MAIN_IMAP_USE_PHPIMAP=Use the PHP-IMAP library for IMAP instead of native PHP IMAP. This also allows the use of an OAuth2 connection for IMAP (module OAuth must also be activated).
 MAIN_CHECKBOX_LEFT_COLUMN=Show the column for field and line selection on the left (on the right by default)
@@ -2397,4 +2403,6 @@ Defaultfortype=Default
 DefaultForTypeDesc=Template used by default when creating a new email for the template type
 OptionXShouldBeEnabledInModuleY=Option "<b>%s</b>" should be enabled into module <b>%s</b>
 OptionXIsCorrectlyEnabledInModuleY=Option "<b>%s</b>" is enabled into module <b>%s</b>
-AtBottomOfPage=At bottom of page
\ No newline at end of file
+AtBottomOfPage=At bottom of page
+FailedAuth=failed authentications
+MaxNumberOfFailedAuth=Max number of failed authentication in 24h to deny login.
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index 06f28f81700..87e05bdf376 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -235,6 +235,8 @@ PersonalValue=Personal value
 NewObject=New %s
 NewValue=New value
 OldValue=Old value %s
+FieldXModified=Field %s modified
+FieldXModifiedFromYToZ=Field %s modified from %s to %s
 CurrentValue=Current value
 Code=Code
 Type=Type
@@ -556,6 +558,7 @@ Unknown=Unknown
 General=General
 Size=Size
 OriginalSize=Original size
+RotateImage=Rotate 90°
 Received=Received
 Paid=Paid
 Topic=Subject
@@ -1233,6 +1236,6 @@ UploadFileDragDropSuccess=The file(s) have been uploaded successfully
 SearchSyntaxTooltipForStringOrNum=For searching inside text fields, you can use the characters ^ or $ to make a 'start or end with' search or use the ! to make a 'does not contain' test. You can use the | between two strings instead of a space for a 'OR' condition instead of 'AND'. For numeric values, you can use the operator <, >, <=, >= or != before the value, to filter using a mathematical comparison
 InProgress=In progress
 DateOfPrinting=Date of printing
-ClickFullScreenEscapeToLeave=Click here to swith in Full screen mode. Type ESCAPE to leave Full screen mode.
+ClickFullScreenEscapeToLeave=Click here to switch in Full screen mode. Press ESCAPE to leave Full screen mode.
 UserNotYetValid=Not yet valid
-UserExpired=Expired
\ No newline at end of file
+UserExpired=Expired
diff --git a/htdocs/langs/en_ZA/supplier_proposal.lang b/htdocs/langs/en_ZA/supplier_proposal.lang
new file mode 100644
index 00000000000..a1b23cd956e
--- /dev/null
+++ b/htdocs/langs/en_ZA/supplier_proposal.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - supplier_proposal
+DocModelAuroreDescription=A complete template for a vendor quotation request template (old implementation of Sponge template)
diff --git a/htdocs/langs/es_AR/admin.lang b/htdocs/langs/es_AR/admin.lang
index e5702d9da8f..a08fdcb12f1 100644
--- a/htdocs/langs/es_AR/admin.lang
+++ b/htdocs/langs/es_AR/admin.lang
@@ -468,7 +468,6 @@ FreeLegalTextOnContracts=Texto libre sobre contratos.
 WatermarkOnDraftContractCards=Marca de agua en los proyectos de contrato (ninguno si está vacío)
 MembersSetup=Configuración del módulo de miembros
 MemberMainOptions=Principales opciones
-AdherentLoginRequired=Administrar un inicio de sesión para cada miembro
 AdherentMailRequired=Correo electrónico requerido para crear un nuevo miembro
 MemberSendInformationByMailByDefault=La casilla de verificación para enviar la confirmación de correo a los miembros (validación o nueva suscripción) está activada de forma predeterminada
 MEMBER_REMINDER_EMAIL=Habilite el recordatorio automático <b> por correo electrónico </b> de las suscripciones caducadas. Nota: el módulo <strong> %s </strong> debe estar habilitado y configurado correctamente para enviar recordatorios.
diff --git a/htdocs/langs/es_AR/main.lang b/htdocs/langs/es_AR/main.lang
index 899446f7ef0..6227b5019c4 100644
--- a/htdocs/langs/es_AR/main.lang
+++ b/htdocs/langs/es_AR/main.lang
@@ -578,4 +578,4 @@ SelectYourGraphOptionsFirst=Elija sus opciones de gráfico para construir un gr
 XAxis=Eje-X
 YAxis=Eje-Y
 Terminated=Terminado
-ClickFullScreenEscapeToLeave=Click here to switch in Full screen mode. Press ESCAPE to leave Full screen mode.
+UserExpired=Vencidos
diff --git a/htdocs/langs/es_AR/supplier_proposal.lang b/htdocs/langs/es_AR/supplier_proposal.lang
index cc00f748bb2..834deba18ad 100644
--- a/htdocs/langs/es_AR/supplier_proposal.lang
+++ b/htdocs/langs/es_AR/supplier_proposal.lang
@@ -12,6 +12,7 @@ RequestsOpened=Solicitudes de precio abiertas
 SupplierProposalArea=Área de presupuestos de proveedores
 SupplierProposals=Presupuestos de proveedores
 SupplierProposalsShort=Presupuestos de proveedores
+AskPrice=Solicitud de precio
 NewAskPrice=Nueva solicitud de precio
 ShowSupplierProposal=Mostrar solicitud de precio
 AddSupplierProposal=Crear una solicitud de precio
@@ -30,7 +31,7 @@ SendAskRef=Enviando la solicitud de precio %s
 SupplierProposalCard=Ficha de solicitud de precio
 ConfirmDeleteAsk=¿Estás seguro que quieres eliminar esta solicitud de precio <b>%s</b>?
 ActionsOnSupplierProposal=Eventos con solicitud de precio
-DocModelAuroreDescription=Un modelo de solicitud completo (logo...)
+DocModelAuroreDescription=A complete template for a vendor quotation request template (old implementation of Sponge template)
 CommercialAsk=Solicitud de precio
 DefaultModelSupplierProposalCreate=Creación de modelo por defecto
 DefaultModelSupplierProposalToBill=Plantilla predeterminada para cerrar una solicitud de precio (aceptada)
diff --git a/htdocs/langs/es_BO/supplier_proposal.lang b/htdocs/langs/es_BO/supplier_proposal.lang
new file mode 100644
index 00000000000..a1b23cd956e
--- /dev/null
+++ b/htdocs/langs/es_BO/supplier_proposal.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - supplier_proposal
+DocModelAuroreDescription=A complete template for a vendor quotation request template (old implementation of Sponge template)
diff --git a/htdocs/langs/es_CL/accountancy.lang b/htdocs/langs/es_CL/accountancy.lang
index d609bd72585..fee46dba0b0 100644
--- a/htdocs/langs/es_CL/accountancy.lang
+++ b/htdocs/langs/es_CL/accountancy.lang
@@ -27,11 +27,6 @@ GroupIsEmptyCheckSetup=El grupo está vacío, verifique la configuración del gr
 DetailByAccount=Mostrar detalles por cuenta
 AccountWithNonZeroValues=Cuentas con valores distintos de cero.
 CountriesInEECExceptMe=Países en EEC excepto %s
-MainAccountForCustomersNotDefined=Cuenta de contabilidad principal para los clientes no definidos en la configuración
-MainAccountForSuppliersNotDefined=Cuenta de contabilidad principal para proveedores no definidos en la configuración
-MainAccountForUsersNotDefined=Cuenta de contabilidad principal para los usuarios no definidos en la configuración
-MainAccountForVatPaymentNotDefined=Cuenta de contabilidad principal para el pago de IVA no definido en la configuración
-MainAccountForSubscriptionPaymentNotDefined=Cuenta contable principal para el pago de suscripción no definido en la configuración
 AccountancyArea=Área de contabilidad
 AccountancyAreaDescActionOnce=Las siguientes acciones generalmente se ejecutan una sola vez o una vez al año ...
 AccountancyAreaDescActionFreq=Las siguientes acciones generalmente se ejecutan cada mes, semana o día para empresas muy grandes ...
diff --git a/htdocs/langs/es_CL/admin.lang b/htdocs/langs/es_CL/admin.lang
index 2624989703d..3859c5b12c5 100644
--- a/htdocs/langs/es_CL/admin.lang
+++ b/htdocs/langs/es_CL/admin.lang
@@ -254,10 +254,6 @@ GenericMaskCodes=Puede ingresar cualquier máscara de numeración. En esta másc
 GenericMaskCodes2=<b> {cccc} </b> el código de cliente en n caracteres <br> <b> {cccc000} </b> el código de cliente es un código de cliente dedicado a n. Este contador dedicado al cliente se pone a cero al mismo tiempo que el contador global. <br> <b> {tttt} </b> El código del tipo de terceros en n caracteres (ver menú Inicio - Configuración - Diccionario - Tipos de terceros). Si agrega esta etiqueta, el contador será diferente para cada tipo de tercero. <br>
 GenericMaskCodes3=Todos los demás personajes de la máscara permanecerán intactos. <br> No se permiten espacios. <br>
 GenericMaskCodes3EAN=Todos los demás caracteres de la máscara permanecerán intactos (excepto * o? En la 13ª posición en EAN13). <br> No se permiten espacios. <br> En EAN13, el último carácter después del último} en la posición 13 debe ser * o? . Será reemplazado por la clave calculada. <br>
-GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany, with date 2023-01-31:</u><br>
-GenericMaskCodes4b=<u>Example on third party created on 2023-01-31:</u><br>
-GenericMaskCodes4c=<u>Example on product created on 2023-01-31:</u><br>
-GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> will give <b>ABC2301-000099</b><br><b>{0000+100@1}-ZZZ/{dd}/XXX</b> will give <b>0199-ZZZ/31/XXX</b><br><b>IN{yy}{mm}-{0000}-{t}</b> will give <b>IN2301-0099-A</b> if the type of company is 'Responsable Inscripto' with code for type that is 'A_RI'
 GenericNumRefModelDesc=Devuelve un número personalizable según una máscara definida.
 ServerAvailableOnIPOrPort=El servidor está disponible en la dirección <b>%s</b> en el puerto <b>%s</b>
 ServerNotAvailableOnIPOrPort=El servidor no esta disponible en la dirección <b>%s</b> en el puerto <b>%s</b>
@@ -933,7 +929,6 @@ ContractsNumberingModules=Módulos de numeración de contratos
 TemplatePDFContracts=Modelos de documentos de contratos
 WatermarkOnDraftContractCards=Marca de agua en los proyectos de contratos (ninguno si está vacío)
 MembersSetup=Configuración del módulo de miembros
-AdherentLoginRequired=Administre un inicio de sesión para cada miembro
 AdherentMailRequired=Correo electrónico requerido para crear un nuevo miembro
 MemberSendInformationByMailByDefault=La casilla de verificación para enviar la confirmación de correo a los miembros (validación o nueva suscripción) está activada por defecto
 MEMBER_REMINDER_EMAIL=Habilitar recordatorio automático <b>por correo electrónico</b> de suscripciones caducadas. Nota: El módulo <strong>%s</strong> debe estar habilitado y configurado correctamente para enviar recordatorios.
@@ -1020,8 +1015,6 @@ LDAPFieldSidExample=Ejemplo: objectid
 LDAPFieldEndLastSubscription=Fecha de finalización de la suscripción
 LDAPFieldTitleExample=Ejemplo: título
 LDAPFieldGroupid=Identificación del grupo
-LDAPFieldGroupidExample=Example : gidnumber
-LDAPFieldUseridExample=Example : uidnumber
 LDAPFieldHomedirectoryprefix=Prefijo del directorio de inicio
 LDAPSetupNotComplete=La configuración de LDAP no está completa (vaya a las pestañas de otros)
 LDAPNoUserOrPasswordProvidedAccessIsReadOnly=No se proporciona ningún administrador o contraseña. El acceso LDAP será anónimo y en modo solo lectura.
@@ -1152,8 +1145,15 @@ InvoiceDateUsed=Fecha de la factura utilizada
 YourCompanyDoesNotUseVAT=Su empresa ha sido definida para no usar el IVA (Inicio - Configuración - Compañía / Organización), por lo que no hay opciones de IVA para configurar.
 AccountancyCodeSell=Cuenta de venta. código
 AccountancyCodeBuy=Cuenta de compra código
+AgendaSetup =Configuración del módulo de eventos y agenda
+AGENDA_DEFAULT_FILTER_TYPE =Configure automáticamente este tipo de evento en el filtro de búsqueda de la vista de agenda
+AGENDA_DEFAULT_FILTER_STATUS =Establecer automáticamente este estado para eventos en el filtro de búsqueda de la vista de agenda
+AGENDA_REMINDER_BROWSER_SOUND =Habilitar notificación de sonido
+AGENDA_SHOW_LINKED_OBJECT =Mostrar objeto vinculado en la vista de agenda
+AGENDA_USE_EVENT_TYPE =Usar tipos de eventos (administrados en el menú Configuración -&gt; Diccionarios -&gt; Tipo de eventos de agenda)
+AGENDA_USE_EVENT_TYPE_DEFAULT =Establecer automáticamente este valor predeterminado para el tipo de evento en el formulario de creación de evento
+PasswordTogetVCalExport =Clave para autorizar el enlace de exportación
 PastDelayVCalExport=No exportar evento más antiguo que
-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).
 ClickToDialUseTelLink=Use solo un enlace "tel:" en los números de teléfono
 CashDeskSetup=Configuración del módulo de punto de venta
 CashDeskThirdPartyForSell=Tercero genérico predeterminado para usar en ventas
@@ -1312,7 +1312,6 @@ EmailCollector=Recolector de correo electronico
 EmailCollectorDescription=Agregue un trabajo programado y una página de configuración para escanear los buzones de correo electrónico con regularidad (utilizando el protocolo IMAP) y registre los correos electrónicos recibidos en su aplicación, en el lugar correcto y / o cree algunos registros automáticamente (como clientes potenciales).
 NewEmailCollector=Nuevo coleccionista de email
 EMailHost=Host del servidor de correo electrónico IMAP
-oauthToken=OAuth2 token
 EmailcollectorOperations=Operaciones a realizar por coleccionista.
 MaxEmailCollectPerCollect=Número máximo de correos electrónicos recogidos por cobro
 EmailCollectorConfirmCollectTitle=Correo electrónico recoger confirmación
@@ -1349,10 +1348,3 @@ MakeAnonymousPing=Realice un Ping anónimo &#39;+1&#39; al servidor de la base D
 FeatureNotAvailableWithReceptionModule=Función no disponible cuando la recepción del módulo está habilitada
 EmailTemplate=Plantila para email
 Recommended=Recomendado
-INVOICE_ADD_SWISS_QR_CODEMore=Switzerland's standard for invoices; make sure ZIP & City are filled and that the accounts have valid Swiss/Liechtenstein IBANs.
-CssOnEdit=CSS on edit pages
-CssOnView=CSS on view pages
-CssOnList=CSS on lists
-HelpCssOnEditDesc=The CSS used when editing the field.<br>Example: "minwiwdth100 maxwidth500 widthcentpercentminusx"
-HelpCssOnViewDesc=The CSS used when viewing the field.
-HelpCssOnListDesc=The CSS used when field is inside a list table.<br>Example: "tdoverflowmax200"
diff --git a/htdocs/langs/es_CL/main.lang b/htdocs/langs/es_CL/main.lang
index 170ab4016d3..800cd439d11 100644
--- a/htdocs/langs/es_CL/main.lang
+++ b/htdocs/langs/es_CL/main.lang
@@ -528,3 +528,4 @@ ContactDefault_invoice_supplier=Factura del proveedor
 ContactDefault_propal=Cotización
 ContactDefault_supplier_proposal=Propuesta de proveedor
 ContactAddedAutomatically=Contacto agregado de roles de terceros de contacto
+UserExpired=Expirado
diff --git a/htdocs/langs/es_CL/supplier_proposal.lang b/htdocs/langs/es_CL/supplier_proposal.lang
index 649d19042a4..591259af97f 100644
--- a/htdocs/langs/es_CL/supplier_proposal.lang
+++ b/htdocs/langs/es_CL/supplier_proposal.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - supplier_proposal
-SupplierProposal=Propuestas comerciales del vendedor
+SupplierProposal=Cotizaciones de proveedor
 supplier_proposalDESC=Gestionar solicitudes de precios a proveedores.
 SupplierProposalNew=Nueva solicitud de precio
 CommRequest=Precio requerido
@@ -11,8 +11,9 @@ LastModifiedRequests=Últimas %s solicitudes de precios modificados
 RequestsOpened=Solicitudes de precio abierto
 SupplierProposalArea=Área de propuestas de proveedores
 SupplierProposalShort=Propuesta del vendedor
-SupplierProposals=Propuestas del vendedor
-SupplierProposalsShort=Propuestas del vendedor
+SupplierProposals=Cotizaciones de proveedor
+SupplierProposalsShort=Cotizaciones de proveedor
+AskPrice=Precio requerido
 NewAskPrice=Nueva solicitud de precio
 ShowSupplierProposal=Mostrar solicitud de precio
 AddSupplierProposal=Crear cotización
@@ -23,7 +24,6 @@ DeleteAsk=Borrar petición
 ValidateAsk=Validar solicitud
 SupplierProposalStatusDraft=Borrador (debe ser validado)
 SupplierProposalStatusValidated=Validado (la solicitud está abierta)
-CopyAskFrom=Crear cotización copiando una existente
 CreateEmptyAsk=Crear solicitud en blanco
 ConfirmCloneAsk=¿Seguro que quieres clonar la solicitud de precio <b>%s</b>?
 ConfirmReOpenAsk=¿Estás seguro de que deseas volver a abrir la solicitud de precio <b>%s</b>?
@@ -32,7 +32,7 @@ SendAskRef=Enviando la solicitud de precio %s
 SupplierProposalCard=Tarjeta de solicitud
 ConfirmDeleteAsk=¿Estás seguro de que deseas eliminar esta solicitud de precio <b>%s</b>?
 ActionsOnSupplierProposal=Eventos sobre la solicitud de precio
-DocModelAuroreDescription=Un modelo de solicitud completo (logotipo ...)
+DocModelAuroreDescription=A complete template for a vendor quotation request template (old implementation of Sponge template)
 CommercialAsk=Precio requerido
 DefaultModelSupplierProposalCreate=Creación de modelo por defecto
 DefaultModelSupplierProposalToBill=Plantilla predeterminada al cerrar una solicitud de precio (aceptada)
@@ -43,3 +43,4 @@ SupplierProposalsToClose=Propuestas del proveedor para cerrar
 SupplierProposalsToProcess=Propuestas del proveedor para procesar
 LastSupplierProposals=Últimas %s solicitudes de precios
 AllPriceRequests=Todas las solicitudes
+TypeContact_supplier_proposal_external_SERVICE=Comercial seguimiento cotización
diff --git a/htdocs/langs/es_CO/accountancy.lang b/htdocs/langs/es_CO/accountancy.lang
index 48068589569..bbad0adfab4 100644
--- a/htdocs/langs/es_CO/accountancy.lang
+++ b/htdocs/langs/es_CO/accountancy.lang
@@ -31,11 +31,6 @@ GroupIsEmptyCheckSetup=El grupo está vacío, verifique la configuración del gr
 DetailByAccount=Mostrar detalle por cuenta
 AccountWithNonZeroValues=Cuentas con valores distintos de cero.
 CountriesInEECExceptMe=Países en EEC excepto %s
-MainAccountForCustomersNotDefined=Cuenta contable principal para clientes no definidos en la configuración.
-MainAccountForSuppliersNotDefined=Cuenta de contabilidad principal para proveedores no definidos en la configuración.
-MainAccountForUsersNotDefined=Cuenta de contabilidad principal para usuarios no definidos en la configuración.
-MainAccountForVatPaymentNotDefined=Cuenta contable principal para el pago del IVA no definido en la configuración
-MainAccountForSubscriptionPaymentNotDefined=Cuenta de contabilidad principal para el pago de la suscripción no definida en la configuración
 UserAccountNotDefined=Cuenta de contabilidad para el usuario no definida en la configuración
 AccountancyArea=Area de contabilidad
 AccountancyAreaDescActionOnce=Las siguientes acciones generalmente se ejecutan una sola vez, o una vez al año ...
diff --git a/htdocs/langs/es_CO/admin.lang b/htdocs/langs/es_CO/admin.lang
index 9cb6c4cd7ef..34cb0496f5a 100644
--- a/htdocs/langs/es_CO/admin.lang
+++ b/htdocs/langs/es_CO/admin.lang
@@ -270,10 +270,6 @@ GenericMaskCodes=Puede ingresar cualquier máscara de numeración. En esta másc
 GenericMaskCodes2=<b>{cccc}</b> el código de cliente en n caracteres <br> <b>{cccc000}</b> el código de cliente es un código de cliente dedicado a n. Este contador dedicado al cliente se pone a cero al mismo tiempo que el contador global. <br> <b>{tttt}</b> El código del tipo de terceros en n caracteres (ver menú Inicio - Configuración - Diccionario - Tipos de terceros). Si agrega esta etiqueta, el contador será diferente para cada tipo de tercero.<br>
 GenericMaskCodes3=Todos los demás caracteres de la máscara permanecerán intactos. <br> No se permiten espacios. <br>
 GenericMaskCodes3EAN=Todos los demás caracteres de la máscara permanecerán intactos (excepto * o ? En la 13ª posición en EAN13).<br> No se permiten espacios.<br> En EAN13, el último carácter después del último} en la posición 13 debe ser * o ? . Será reemplazado por la clave calculada.<br>
-GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany, with date 2023-01-31:</u><br>
-GenericMaskCodes4b=<u>Example on third party created on 2023-01-31:</u><br>
-GenericMaskCodes4c=<u>Example on product created on 2023-01-31:</u><br>
-GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> will give <b>ABC2301-000099</b><br><b>{0000+100@1}-ZZZ/{dd}/XXX</b> will give <b>0199-ZZZ/31/XXX</b><br><b>IN{yy}{mm}-{0000}-{t}</b> will give <b>IN2301-0099-A</b> if the type of company is 'Responsable Inscripto' with code for type that is 'A_RI'
 GenericNumRefModelDesc=Devuelve un número personalizable de acuerdo con una máscara definida.
 ServerAvailableOnIPOrPort=El servidor está disponible en la dirección <b> %s </b> en el puerto <b> %s </b>
 ServerNotAvailableOnIPOrPort=El servidor no está disponible en la dirección <b> %s </b> en el puerto <b> %s </b>
@@ -1099,7 +1095,6 @@ FreeLegalTextOnContracts=Texto libre sobre contratos.
 WatermarkOnDraftContractCards=Marca de agua en los proyectos de contrato (ninguno si está vacío)
 MembersSetup=Configuración del módulo de miembros
 MemberMainOptions=Principales opciones
-AdherentLoginRequired=Administrar un inicio de sesión para cada miembro
 AdherentMailRequired=Se requiere correo electrónico para crear un nuevo miembro
 MemberSendInformationByMailByDefault=La casilla de verificación para enviar la confirmación de correo a los miembros (validación o nueva suscripción) está activada de forma predeterminada
 MemberCreateAnExternalUserForSubscriptionValidated=Cree un inicio de sesión de usuario externo para cada nueva suscripción de miembro validada
@@ -1192,8 +1187,6 @@ LDAPFieldSidExample=Ejemplo: objectid
 LDAPFieldEndLastSubscription=Fecha de finalización de la suscripción
 LDAPFieldTitleExample=Ejemplo: titulo
 LDAPFieldGroupid=Identificación del grupo
-LDAPFieldGroupidExample=Example : gidnumber
-LDAPFieldUseridExample=Example : uidnumber
 LDAPFieldHomedirectoryprefix=Prefijo del directorio de inicio
 LDAPSetupNotComplete=La configuración de LDAP no está completa (vaya a otras pestañas)
 LDAPNoUserOrPasswordProvidedAccessIsReadOnly=No hay administrador o contraseña proporcionada. El acceso LDAP será anónimo y en modo de solo lectura.
@@ -1345,9 +1338,19 @@ InvoiceDateUsed=Fecha de factura utilizada
 YourCompanyDoesNotUseVAT=Su empresa ha sido definida para no utilizar el IVA (Inicio - Configuración - Empresa / Organización), por lo que no hay opciones de IVA para configurar.
 AccountancyCodeSell=Cuenta de venta. código
 AccountancyCodeBuy=Cuenta de compra. código
+AgendaSetup =Configuración del módulo de eventos y agenda.
+AGENDA_DEFAULT_FILTER_TYPE =Configure automáticamente este tipo de evento en el filtro de búsqueda de la vista de agenda
+AGENDA_DEFAULT_FILTER_STATUS =Establecer automáticamente este estado para eventos en el filtro de búsqueda de la vista de agenda
+AGENDA_DEFAULT_VIEW =¿Qué vista desea abrir de forma predeterminada al seleccionar el menú Agenda?
+AGENDA_REMINDER_BROWSER =Habilite el recordatorio de eventos <b> en el navegador del usuario </b> (Cuando se alcanza la fecha de recordatorio, el navegador muestra una ventana emergente. Cada usuario puede deshabilitar dichas notificaciones desde la configuración de notificaciones del navegador).
+AGENDA_REMINDER_BROWSER_SOUND =Habilitar notificación de sonido
+AGENDA_REMINDER_EMAIL =Habilite el recordatorio de evento <b> por correo electrónico </b> (la opción de recordatorio / retraso se puede definir en cada evento).
+AGENDA_SHOW_LINKED_OBJECT =Mostrar objeto vinculado en vista de agenda
+AGENDA_USE_EVENT_TYPE =Usar tipos de eventos (administrados en el menú Configuración -> Diccionarios -> Tipo de eventos de agenda)
+AGENDA_USE_EVENT_TYPE_DEFAULT =Establecer automáticamente este valor predeterminado para el tipo de evento en el formulario de creación de evento
+PasswordTogetVCalExport =Clave para autorizar el enlace de exportación.
 PastDelayVCalExport=No exportar eventos anteriores a
 ClickToDialSetup=Haga clic para configurar el módulo de marcado.
-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=Este módulo cambia los números de teléfono, cuando se usa una computadora de escritorio, en enlaces en los que se puede hacer clic. Un clic llamará al número. Esto se puede usar para iniciar la llamada telefónica cuando usa un softphone en su escritorio o cuando usa un sistema CTI basado en el protocolo SIP, por ejemplo. Nota: cuando se usa un teléfono inteligente, siempre se puede hacer clic en los números de teléfono.
 ClickToDialUseTelLink=Use solo un enlace "tel:" en los números de teléfono
 ClickToDialUseTelLinkDesc=Utilice este método si sus usuarios tienen un softphone o una interfaz de software, instalados en la misma computadora que el navegador, y se les llama cuando hace clic en un enlace que comienza con "tel:" en su navegador. Si necesita un enlace que comience con "sip:" o una solución de servidor completa (no es necesario instalar el software local), debe establecerlo en "No" y completar el siguiente campo.
@@ -1539,7 +1542,6 @@ EmailCollectorDescription=Agregue un trabajo programado y una página de configu
 NewEmailCollector=Nuevo recolector de email
 EMailHost=Host de correo electrónico del servidor IMAP
 EMailHostPort=Puerto de servidor IMAP de correo electrónico
-oauthToken=OAuth2 token
 EmailcollectorOperations=Operaciones a realizar por coleccionista.
 EmailcollectorOperationsDesc=Las operaciones se ejecutan de arriba a abajo.
 MaxEmailCollectPerCollect=Número máximo de correos electrónicos recolectados por recolección
@@ -1645,7 +1647,6 @@ InventorySetup=Configuración de inventario
 Settings =Ajustes
 DEBUGBAR_USE_LOG_FILE=Use el archivo <b>dolibarr.log</b> para capturar registros
 FixedOrPercent=Fijo (use la palabra clave 'fijo') o porcentaje (use la palabra clave 'porcentaje')
-INVOICE_ADD_SWISS_QR_CODEMore=Switzerland's standard for invoices; make sure ZIP & City are filled and that the accounts have valid Swiss/Liechtenstein IBANs.
 CIDLookupURL=El módulo trae una URL que puede ser utilizada por una herramienta externa para obtener el nombre de un tercero o contacto a partir de su número de teléfono. URL a utilizar es:
 UsePassword=usa una contraseña
 UseOauth=Usar un token OAUTH
@@ -1653,10 +1654,4 @@ ScriptIsEmpty=el guion esta vacio
 ShowHideTheNRequests=Mostrar/ocultar las %s solicitudes SQL
 DefinedAPathForAntivirusCommandIntoSetup=Defina una ruta para un programa antivirus en <b>%s</b>
 TriggerCodeInfo=Ingrese aquí el/los código(s) de activación que deben generar una publicación de una solicitud web (solo se permiten URL externas). Puede introducir varios códigos de activación separados por una coma.
-CssOnEdit=CSS on edit pages
-CssOnView=CSS on view pages
-CssOnList=CSS on lists
-HelpCssOnEditDesc=The CSS used when editing the field.<br>Example: "minwiwdth100 maxwidth500 widthcentpercentminusx"
-HelpCssOnViewDesc=The CSS used when viewing the field.
-HelpCssOnListDesc=The CSS used when field is inside a list table.<br>Example: "tdoverflowmax200"
 DesktopsAndSmartphones=Computadoras de escritorio y teléfonos inteligentes
diff --git a/htdocs/langs/es_CO/main.lang b/htdocs/langs/es_CO/main.lang
index ddfc35df82e..e43d4e6cb22 100644
--- a/htdocs/langs/es_CO/main.lang
+++ b/htdocs/langs/es_CO/main.lang
@@ -362,4 +362,3 @@ Terminate=Terminar
 Terminated=Terminado
 ConfirmAllocateCommercialQuestion=¿Está seguro de que desea asignar los %s registros seleccionados?
 CommercialAffected=representante de ventas asignado
-ClickFullScreenEscapeToLeave=Click here to switch in Full screen mode. Press ESCAPE to leave Full screen mode.
diff --git a/htdocs/langs/es_CO/supplier_proposal.lang b/htdocs/langs/es_CO/supplier_proposal.lang
index 3c1b3ef3db1..d81a9b0ac41 100644
--- a/htdocs/langs/es_CO/supplier_proposal.lang
+++ b/htdocs/langs/es_CO/supplier_proposal.lang
@@ -33,7 +33,7 @@ SendAskRef=Envío de la solicitud de precio %s
 SupplierProposalCard=Solicitar tarjeta
 ConfirmDeleteAsk=¿Está seguro de que desea eliminar esta solicitud de precio <b> %s </b>?
 ActionsOnSupplierProposal=Eventos bajo petición de precio
-DocModelAuroreDescription=Un modelo de solicitud completo (logo ...)
+DocModelAuroreDescription=A complete template for a vendor quotation request template (old implementation of Sponge template)
 CommercialAsk=Solicitud de precio
 DefaultModelSupplierProposalCreate=Creación de modelo predeterminado
 DefaultModelSupplierProposalToBill=Plantilla predeterminada al cerrar una solicitud de precio (aceptado)
@@ -44,3 +44,5 @@ SupplierProposalsToClose=Propuestas de proveedores para cerrar
 SupplierProposalsToProcess=Propuestas de proveedores para procesar
 LastSupplierProposals=Últimas solicitudes de precios %s
 AllPriceRequests=Todas las solicitudes
+TypeContact_supplier_proposal_external_SHIPPING=Contacto con el proveedor para la entrega
+TypeContact_supplier_proposal_external_SERVICE=Propuesta de seguimiento representativa
diff --git a/htdocs/langs/es_CR/accountancy.lang b/htdocs/langs/es_CR/accountancy.lang
index fb47362ec9a..3bc12bf1b07 100644
--- a/htdocs/langs/es_CR/accountancy.lang
+++ b/htdocs/langs/es_CR/accountancy.lang
@@ -25,10 +25,6 @@ DetailByAccount=Mostrar detalles por cuenta
 AccountWithNonZeroValues=Cuentas con valores distintos de cero
 CountriesInEEC=Países de la Comunidad Europea
 ExportAccountingSourceDocHelp2=Para exportar sus diarios, utilice la entrada de menú %s - %s.
-MainAccountForCustomersNotDefined=Cuenta contable principal para clientes no definidos en la configuración
-MainAccountForSuppliersNotDefined=Cuenta contable principal para proveedores no definidos en la configuración
-MainAccountForUsersNotDefined=Cuenta contable principal para usuarios no definidos en la configuración
-MainAccountForSubscriptionPaymentNotDefined=Cuenta contable principal para el pago de suscripción no definida en la configuración
 AccountancyArea=Área de contabilidad
 AccountancyAreaDescActionOnce=Las siguientes acciones generalmente se ejecutan una sola vez, o una vez al año ...
 AccountancyAreaDescActionFreq=Las siguientes acciones generalmente se ejecutan cada mes, semana o día para empresas muy grandes ...
diff --git a/htdocs/langs/es_CR/admin.lang b/htdocs/langs/es_CR/admin.lang
index eeae495d6fd..32acbfe6a78 100644
--- a/htdocs/langs/es_CR/admin.lang
+++ b/htdocs/langs/es_CR/admin.lang
@@ -1079,7 +1079,6 @@ TemplatePDFContracts=Modelos de documentos de contratos
 FreeLegalTextOnContracts=Texto libre sobre contratos
 WatermarkOnDraftContractCards=Marca de agua en borradores de contratos (ninguno si está vacío)
 MembersSetup=Configuración del módulo de miembros
-AdherentLoginRequired=Administrar un inicio de sesión para cada miembro
 AdherentMailRequired=Correo electrónico requerido para crear un nuevo miembro
 MemberSendInformationByMailByDefault=La casilla de verificación para enviar correo de confirmación a los miembros (validación o nueva suscripción) está activada de forma predeterminada
 MemberCreateAnExternalUserForSubscriptionValidated=Cree un inicio de sesión de usuario externo para cada nueva suscripción de miembro validada
@@ -1335,6 +1334,18 @@ YourCompanyDoesNotUseVAT=Su empresa se ha definido para no utilizar el IVA (Inic
 AccountancyCodeSell=Cuenta de venta. código
 AccountancyCodeBuy=Cuenta de compra. código
 CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=Mantenga la casilla de verificación "Crear automáticamente el pago" vacía de forma predeterminada al crear un nuevo impuesto
+AgendaSetup =Configuración del módulo de eventos y agenda
+AGENDA_DEFAULT_FILTER_TYPE =Establecer automáticamente este tipo de evento en el filtro de búsqueda de la vista de agenda
+AGENDA_DEFAULT_FILTER_STATUS =Establecer automáticamente este estado para eventos en el filtro de búsqueda de la vista de agenda
+AGENDA_DEFAULT_VIEW =¿Qué vista quieres abrir por defecto al seleccionar el menú Agenda?
+AGENDA_REMINDER_BROWSER =Habilite el recordatorio de eventos <b> en el navegador del usuario </b> (cuando se alcanza la fecha de recordatorio, el navegador muestra una ventana emergente. Cada usuario puede deshabilitar dichas notificaciones desde la configuración de notificaciones de su navegador).
+AGENDA_REMINDER_BROWSER_SOUND =Habilitar notificación de sonido
+AGENDA_REMINDER_EMAIL =Habilite el recordatorio de eventos <b> por correo electrónico </b> (la opción de recordatorio/retraso se puede definir en cada evento).
+AGENDA_REMINDER_EMAIL_NOTE =Nota: La frecuencia del trabajo programado %s debe ser suficiente para garantizar que los recordatorios se envíen en el momento correcto.
+AGENDA_SHOW_LINKED_OBJECT =Mostrar objeto vinculado en la vista de agenda
+AGENDA_USE_EVENT_TYPE =Usar tipos de eventos (administrados en el menú Configuración -> Diccionarios -> Tipo de agenda de eventos)
+AGENDA_USE_EVENT_TYPE_DEFAULT =Establezca automáticamente este valor predeterminado para el tipo de evento en el formulario de creación de eventos
+PasswordTogetVCalExport =Clave para autorizar enlace de exportación
 PastDelayVCalExport=No exportar eventos anteriores a
 ClickToDialUrlDesc=URL llamada cuando se hace clic en el icono de teléfono. En URL, puede usar las etiquetas <br> <b> __PHONETO__ </b> que se reemplazarán con el número de teléfono de la persona a llamar <br> <b> __PHONEFROM__ </b> que será reemplazado por el número de teléfono de la persona que llama (suyo) <br> <b> __LOGIN__ </b> que se reemplazará con el inicio de sesión de "hacer clic para marcar" (definido en la tarjeta de usuario) <br> <b> __PASS __ </b> que se reemplazará con la contraseña de "haga clic para marcar" (definida en el usuario tarjeta).
 ClickToDialDesc=Este módulo cambia los números de teléfono, cuando se usa una computadora de escritorio, en enlaces en los que se puede hacer clic. Un clic llamará al número. Esto se puede usar para iniciar la llamada telefónica cuando usa un teléfono virtual en su escritorio o cuando usa un sistema CTI basado en el protocolo SIP, por ejemplo. Nota: cuando se utiliza un teléfono inteligente, siempre se puede hacer clic en los números de teléfono.
@@ -1664,3 +1675,4 @@ HelpCssOnListDesc=El CSS utilizado cuando el campo está dentro de una tabla de
 DesktopsAndSmartphones=Computadoras de escritorio y teléfonos inteligentes
 Defaultfortype=Predeterminados
 AtBottomOfPage=Al final de la pagina
+FailedAuth=Autenticaciones fallidas
diff --git a/htdocs/langs/es_CR/banks.lang b/htdocs/langs/es_CR/banks.lang
index 7d12f886f9a..0e2df07fa48 100644
--- a/htdocs/langs/es_CR/banks.lang
+++ b/htdocs/langs/es_CR/banks.lang
@@ -68,6 +68,7 @@ DateConciliating=Conciliar fecha
 BankLineConciliated=Entrada conciliada con recibo bancario
 BankLineReconciled=Conciliado
 SupplierInvoicePayment=Pago de proveedor
+WithdrawalPayment=Pago por domiciliación bancaria
 SocialContributionPayment=Pago de impuestos sociales / fiscales
 BankTransfer=Transferencia de crédito
 BankTransfers=Transferencia de crédito
diff --git a/htdocs/langs/es_CR/ecm.lang b/htdocs/langs/es_CR/ecm.lang
index 981e4ed764a..43dd43c4d27 100644
--- a/htdocs/langs/es_CR/ecm.lang
+++ b/htdocs/langs/es_CR/ecm.lang
@@ -18,3 +18,4 @@ DirNotSynchronizedSyncFirst=Esta carpeta parece haberse creado o modificado por
 ReSyncListOfDir=Re-sincronizar lista de carpetas
 HashOfFileContent=Hash del contenido del archivo
 FileNotYetIndexedInDatabase=El archivo no se ha indizado todavía en la base de datos (intenta volver a cargarlo)
+ConfirmGenerateChosenImgWebp=Si usted confirma, va a generar una imagen en. web format for the image %s
diff --git a/htdocs/langs/es_CR/main.lang b/htdocs/langs/es_CR/main.lang
index ed5a7b85f4c..962131131db 100644
--- a/htdocs/langs/es_CR/main.lang
+++ b/htdocs/langs/es_CR/main.lang
@@ -136,6 +136,8 @@ PasswordRetype=repita su contraseña
 NoteSomeFeaturesAreDisabled=Tenga en cuenta que muchas características/módulos están deshabilitados en esta demostración.
 PersonalValue=Valor personal
 NewObject=nuevo %s
+FieldXModified=Archivo %smodificado
+FieldXModifiedFromYToZ=Archivo %smodificado de %sa %s
 MultiLanguage=Multi lenguaje
 RefOrLabel=Árbitro. o etiqueta
 Info=Registro
@@ -173,6 +175,7 @@ UserValidationShort=Válido. usuario
 Quadri=cuádruple
 MonthOfDay=mes del dia
 MinuteShort=Minnesota
+SecondShort=Segundo
 Rate=Tasa
 UseLocalTax=Incluye impuestos
 Bytes=bytes
@@ -292,6 +295,7 @@ Reporting=Informes
 ValidatedToProduce=Validado (Para producir)
 Opened=Abierto
 ClosedAll=Cerrado (Todos)
+RotateImage=Girar 90
 Received=Recibió
 Topic=Sujeto
 ByCompanies=por terceros
@@ -638,3 +642,4 @@ ConfirmAllocateCommercialQuestion=¿Está seguro de que desea asignar los regist
 CommercialAffected=representante de ventas asignado
 InternalUser=Usuario Interno
 UploadFileDragDropSuccess=Los archivo(s) se han subido correctamente
+UserExpired=Expirado
diff --git a/htdocs/langs/es_CR/modulebuilder.lang b/htdocs/langs/es_CR/modulebuilder.lang
index 0bb766870d4..310fe53c99e 100644
--- a/htdocs/langs/es_CR/modulebuilder.lang
+++ b/htdocs/langs/es_CR/modulebuilder.lang
@@ -28,5 +28,4 @@ UseDocFolder=Desactivar la carpeta de documentación.
 UseSpecificReadme=Use un archivo Léame específico
 IncludeDocGenerationHelp=Si marca esto, se generará algún código para agregar un cuadro "Generar documento" en el registro.
 ForeignKey=Clave extranjera
-GeneratePermissionsHelp=Generar derechos predeterminados para este objeto
 CRUDRead=Leer
diff --git a/htdocs/langs/es_CR/partnership.lang b/htdocs/langs/es_CR/partnership.lang
index 5fbb7750535..07d5617d5f5 100644
--- a/htdocs/langs/es_CR/partnership.lang
+++ b/htdocs/langs/es_CR/partnership.lang
@@ -2,4 +2,7 @@
 Partnership=Asociación
 PartnershipAbout=Acerca de la asociación
 PublicFormRegistrationPartnerDesc=Dolibarr puede proporcionarle una URL/sitio web público para permitir que los visitantes externos soliciten ser parte del programa de asociación
+KeywordToCheckInWebsite=Si desea comprobar que una determinada palabra clave está presente en el sitio web de cada socio, defina esta palabra clave aquí
 PartnershipCanceled=Cancelado
+PartnershipManagedFor=Los socios son
+NewPartnershipRequestDesc=Este formulario le permite solicitar ser parte de uno de nuestros programas de asociación. Si necesita ayuda para completar este formulario, comuníquese por correo electrónico <b>%s</b>.
diff --git a/htdocs/langs/es_CR/paybox.lang b/htdocs/langs/es_CR/paybox.lang
new file mode 100644
index 00000000000..39a25bb0023
--- /dev/null
+++ b/htdocs/langs/es_CR/paybox.lang
@@ -0,0 +1,22 @@
+# Dolibarr language file - Source file is en_US - paybox
+PayBoxSetup=Configuración del módulo PayBox
+FollowingUrlAreAvailableToMakePayments=Las siguientes URL están disponibles para ofrecer a un cliente una página para realizar un pago para elementos de Dolibarr
+WelcomeOnPaymentPage=Bienvenido a nuestro servicio de pago en línea
+ThisScreenAllowsYouToPay=Esta pantalla le permite realizar un pago en línea a %s.
+ThisIsInformationOnPayment=Esta es la información sobre el pago a realizar
+ToComplete=Para completar
+YourEMail=Correo electrónico para recibir confirmación de pago
+Creditor=Acreedor
+PayBoxDoPayment=Pagar con Paybox
+YouWillBeRedirectedOnPayBox=Serás redirigido al sitio seguro de Paybox para ingresar la información de su tarjeta de crédito
+Continue=Siguiente
+SetupPayBoxToHavePaymentCreatedAutomatically=Configure su Paybox con la URL <b> %s </b> para que el pago se cree automáticamente cuando Paybox lo valide.
+YourPaymentHasBeenRecorded=Esta página confirma que su pago ha sido registrado. Gracias.
+YourPaymentHasNotBeenRecorded=Su pago NO ha sido registrado y la transacción ha sido cancelada. Gracias.
+InformationToFindParameters=Ayuda para encontrar la información de su cuenta %s
+PAYBOX_CGI_URL_V2=URL del módulo CGI para pago con Paybox
+CSSUrlForPaymentForm=URL de hoja de estilo CSS para formulario de pago
+NewPayboxPaymentReceived=Nuevo pago de Paybox recibido
+NewPayboxPaymentFailed=Se intentó un nuevo pago de Paybox pero falló
+PAYBOX_PAYONLINE_SENDEMAIL=Notificación por correo luego del intento de pago (exitoso o fallido)
+PAYBOX_PBX_RANG=Valor para PBX Rang
diff --git a/htdocs/langs/es_CR/paypal.lang b/htdocs/langs/es_CR/paypal.lang
new file mode 100644
index 00000000000..e6787a2242c
--- /dev/null
+++ b/htdocs/langs/es_CR/paypal.lang
@@ -0,0 +1,30 @@
+# Dolibarr language file - Source file is en_US - paypal
+PaypalSetup=Configuración de módulo de PayPal
+PaypalOrCBDoPayment=Pagar con PayPal (tarjeta o PayPal)
+PaypalDoPayment=Pagar con PayPal
+PAYPAL_API_SANDBOX=Modo de prueba/sandbox
+PAYPAL_API_USER=Nombre de Usuario de la API
+PAYPAL_API_PASSWORD=Contraseña de la API
+PAYPAL_API_SIGNATURE=Firma de la API
+PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Ofrecer pago "integral" (tarjeta de crédito+PayPal) o sólo "PayPal"
+ONLINE_PAYMENT_CSS_URL=URL opcional de hoja de estilo CSS en sitio online de pagos
+ThisIsTransactionId=Este es el ID de transacción: <b>%s</b>
+PAYPAL_ADD_PAYMENT_URL=Incluír la URL para pago por PayPal en documentos enviados por e-mail.
+NewOnlinePaymentReceived=Nuevo pago online recibido
+NewOnlinePaymentFailed=Nuevo intento fallido de pago online
+ONLINE_PAYMENT_SENDEMAIL=La dirección de e-mail para las notificaciones luego de cada intento de pago (tanto para los correctos como los fallidos)
+ReturnURLAfterPayment=Volver a la URL luego del pago
+ValidationOfOnlinePaymentFailed=La validación de pago online ha fallado
+PaymentSystemConfirmPaymentPageWasCalledButFailed=El sitio de confirmación del pago que fue llamado por el sistema de pagos ha devuelto un error
+SetExpressCheckoutAPICallFailed=Llamada a función API SetExpressCheckout ha fallado
+DoExpressCheckoutPaymentAPICallFailed=Falló la llamada a la API de DoExpressCheckoutPayment.
+DetailedErrorMessage=Mensaje detallado del error
+ShortErrorMessage=Mensaje breve del error
+ErrorCode=Códgo de error
+ErrorSeverityCode=Código de severidad del error
+PaypalLiveEnabled=Modo "en vivo" de PayPal activo (caso contrario modo prueba/sandbox)
+PaypalImportPayment=Importar pagos de PayPal
+PostActionAfterPayment=Acciones posteriores a los pagos
+ARollbackWasPerformedOnPostActions=Se han deshecho los cambios en las acciones de posteo. Deberás completar estas acciones manualmente si fueran necesarias.
+ValidationOfPaymentFailed=La validación del pago ha fallado
+PayPalBalance=Crédito PayPal
diff --git a/htdocs/langs/es_CR/printing.lang b/htdocs/langs/es_CR/printing.lang
new file mode 100644
index 00000000000..dc779366d20
--- /dev/null
+++ b/htdocs/langs/es_CR/printing.lang
@@ -0,0 +1,40 @@
+# Dolibarr language file - Source file is en_US - printing
+PrintingDriverDesc=Configuración de variables para Driver de Impresión
+ListDrivers=Lista de drivers
+PrintTestDesc=Lista de Iimpresoras
+FileWasSentToPrinter=Archivo %s fue enviado a la impresora
+ViaModule=A través del módulo
+NoActivePrintingModuleFound=No hay un driver activo para imprimir el documento. Revisa la configuración del módulo %s
+PleaseSelectaDriverfromList=Por favor elige un driver de la lista.
+PleaseConfigureDriverfromList=Por favor configure el driver seleccionado de la lista.
+SetupDriver=Configuración del controlador
+TargetedPrinter=Impresora orientada
+PRINTGCP_INFO=Configuración de Google OAuth API
+PRINTGCP_TOKEN_ACCESS=Token para Google Cloud Print OAuth
+PrintGCPDesc=Este driver permite el envío de documentos directamente a una impresora utilizando Google Cloud Print.
+GCP_displayName=Mostrar Nombre
+GCP_Id=ID de Impresora
+GCP_OwnerName=Nombre del Dueño
+GCP_State=Estado de la Impresora
+GCP_connectionStatus=Estado En Línea
+GCP_Type=Tipo de Impresora
+PrintIPPDesc=Este driver permite el envío de documentos directamente a una impresora. Requiere sistema Linux con CUPS instalado.
+PRINTIPP_HOST=Servidor de impresora
+PRINTIPP_USER=Iniciar Sesión
+NoDefaultPrinterDefined=No se ha predeterminado una impresora
+DefaultPrinter=Impresora predeterminada
+IPP_Uri=URL de Impresora
+IPP_Name=Nombre de Impresora
+IPP_State=Estado de la Impresora
+IPP_State_reason=Motivo del Estado
+IPP_State_reason1=Motivo1 del Estado
+IPP_BW=Blanco y Negro
+IPP_Media=Calidad de Impresión
+IPP_Supported=Tipo de medio
+DirectPrintingJobsDesc=Esta página muestra todos los trabajos de impresión encontrados para las impresoras disponibles.
+GoogleAuthNotConfigured=Google OAuth no se ha configurado. Habilite el módulo OAuth y configure un ID / secreto de Google.
+GoogleAuthConfigured=Las credenciales de Google OAuth fueron encontradas en la configuración del módulo OAuth
+PrintingDriverDescprintgcp=Las variables de configuración para el driver de impresión Google Cloud Print.
+PrintingDriverDescprintipp=Variables de configuración para los controladores de impresión CUPS.
+PrintTestDescprintgcp=Lista de Impresoras para Google Cloud Print
+PrintTestDescprintipp=Lista de impresoras para CUPS.
diff --git a/htdocs/langs/es_CR/products.lang b/htdocs/langs/es_CR/products.lang
index 61a306aab84..aa0faffb851 100644
--- a/htdocs/langs/es_CR/products.lang
+++ b/htdocs/langs/es_CR/products.lang
@@ -1,2 +1,191 @@
 # Dolibarr language file - Source file is en_US - products
+ProductRef=Ref. Producto
+ProductLabel=Etiqueta del producto
+ProductLabelTranslated=Etiqueta traducida del producto
+ProductDescription=Descripción del Producto
+ProductDescriptionTranslated=Descripción traducida del producto
+ProductNoteTranslated=Nota de producto traducida
+ProductServiceCard=Ficha de Productos/Servicios
+ProductId=ID del producto/servicio
+NewProduct=Nuevo Producto
+NewService=Nuevo Servicio
+ProductVatMassChange=Actualización global del IVA
+MassBarcodeInit=Inicialización masiva de código de barra
+MassBarcodeInitDesc=Esta página se puede utilizar para inicializar un código de barras en objetos que no tienen un código de barras definido. Verifique antes de que se complete la configuración del código de barras del módulo.
+ProductAccountancyBuyCode=Código de contabilidad (compra)
+ProductAccountancySellCode=Código de contabilidad (venta)
+ProductsAndServices=Productos y Servicios
+ProductsOrServices=Productos o Servicios
+ProductsOnPurchase=Productos a comprar
+ProductsOnSaleOnly=Productos solo a para venta
+ProductsOnPurchaseOnly=Productos solo para compra
+ProductsNotOnSell=Productos que no se venden ni se compran
+ProductsOnSellAndOnBuy=Productos para vender y para comprar
+ServicesOnSale=Servicios a la venta
+ServicesOnPurchase=Servicios que se adquieren
+ServicesOnSaleOnly=Servicios que se venden únicamente
+ServicesOnPurchaseOnly=Servicios para la compra solamente
+ServicesNotOnSell=Servicios no a la venta y no a la compra
+ServicesOnSellAndOnBuy=Servicios para venta y compra
+MenuStocks=Inventario
+Stocks=Inventarios y ubicaciones (almacenes) de productos
+NotOnSell=No para la venta
+ProductStatusNotOnSell=No para la venta
+ProductStatusNotOnSellShort=No para la venta
+ProductStatusNotOnBuy=No para la compra
+ProductStatusNotOnBuyShort=No para la compra
+UpdateVAT=Actualizar IVA
+UpdateDefaultPrice=Actualizar precio por defecto
+UpdateLevelPrices=Actualizar precio para cada nivel
+SellingPriceHT=Precio de venta (excluyente impuestos)
+SellingPriceTTC=Precio de venta (incluyendo impuestos)
+SellingMinPriceTTC=Precio de Venta Mínimo (incluyendo impuestos)
+CostPriceUsage=Este valor podría utilizarse para el cálculo del margen.
+SoldAmount=Cantidad vendida
+PurchasedAmount=Cantidad comprada
+EditSellingPriceLabel=Editar etiqueta de precio
+CantBeLessThanMinPrice=El precio de venta no puede ser menor al mínimo permitido por el producto (%s sin impuestos). Este mensaje también parece si el descuento es demasiado importante.
+ErrorProductAlreadyExists=Ya existe un producto con la referencia %s.
+ErrorProductBadRefOrLabel=Valor incorrecto de referencia o etiqueta.
+ErrorProductClone=Hubo un problema al tratar de clonar el productos o servicio.
+ErrorPriceCantBeLowerThanMinPrice=¡Error! El precio no puede ser menor a precio mínimo.
+SupplierRef=SKU del proveedor
+ProductsAndServicesArea=Área de Productos y Servicios
+ProductsArea=Área de Productos
+ServicesArea=Área de Servicios
+ListOfStockMovements=Lista de movimientos de stock
+PriceForEachProduct=Productos con precios particulares
+SupplierCard=Ficha de proveedor
+PriceRemoved=Precio removido
+SetDefaultBarcodeType=Definir tipo de código de barras
+NoteNotVisibleOnBill=Nota (No visible en facturas, presupuestos...)
+ServiceLimitedDuration=Si un producto es un servicio con duración limitada:
+MultiPricesNumPrices=Número de precios
+ParentProductsNumber=Número de producto de embalaje principal
+KeywordFilter=Filtro por Palabra Clave
+CategoryFilter=Filtro por Categoría
+ProductToAddSearch=Buscar producto para agregar
+NoMatchFound=No se encontraron coincidencias
+ListOfProductsServices=Lista de productos/servicios
+ProductAssociationList=Lista de productos / servicios que son componente(s) de este kit
+ErrorAssociationIsFatherOfThis=Uno del producto seleccionado es padre con el producto actual
+ConfirmDeleteProduct=¿Seguro que quieres eliminar este producto/servicio?
+ProductDeleted=Producto/Servicio "%s" eliminado de la base de datos.
 ExportDataset_produit_1=Productos
+DeleteProductLine=Eliminar línea de productos
+ConfirmDeleteProductLine=¿Está seguro que quiere borrar esta línea de producto?
+QtyMin=Mín. cantidad a comprar
+PriceQtyMin=Precio para cantidad mín.
+PriceQtyMinCurrency=Precio (moneda) para esta cant.
+PredefinedProductsToSell=Producto Predefinido
+PredefinedProductsAndServicesToSell=productos/servicios predefinidos para vender
+PredefinedProductsToPurchase=Producto predefinido para compra
+PredefinedProductsAndServicesToPurchase=Productos/servicios predefinidos para comprar.
+NotPredefinedProducts=productos/servicios no predefinidos
+GenerateThumb=Generar pulgar
+ServiceNb=Servicio #%s
+ListProductServiceByPopularity=Lista de productos/servicios por popularidad
+ListProductByPopularity=Lista de productos por popularidad
+ListServiceByPopularity=Lista de servicios por popularidad
+ConfirmCloneProduct=¿Está seguro que desea clonar el producto o servicio <b>%s</b>?
+ProductIsUsed=Este producto se utiliza
+NewRefForClone=Ref. de nuevo producto / servicio
+CustomerPrices=Precios de cliente
+SuppliersPrices=Precios de proveedor
+unitP=Unidad
+unitIN=Pulgada
+ProductCodeModel=Plantilla de referencia de producto
+ServiceCodeModel=Plantilla de referencia de servicio
+AlwaysUseNewPrice=Utilice siempre el precio actual del producto/servicio
+AlwaysUseFixedPrice=Utilizar el precio fijo
+PriceByQuantity=Diferentes precios por cantidad
+PriceByQuantityRange=Rango Cantidad
+UseMultipriceRules=Utilice las reglas de segmento de precios (definidas en la configuración del módulo del producto) para calcular automáticamente los precios de todos los demás segmentos de acuerdo con el primer segmento
+KeepEmptyForAutoCalculation=Manténgase vacío para que esto se calcule automáticamente de peso o volumen de productos
+Build=Producir
+ProductsOrServiceMultiPrice=Precios de clientes (de productos o servicios, precios múltiples)
+ProductSellByQuarterHT=Volumen de productos trimestral antes de impuestos
+ServiceSellByQuarterHT=Volumen de ventas de los servicios trimestralmente antes de impuestos
+Quarter1=1er. Trimestre
+Quarter2=2do. Trimestre
+Quarter3=3er. Trimestre
+Quarter4=4to. Trimestre
+PageToGenerateBarCodeSheets=Con esta herramienta, puede imprimir hojas de etiquetas de códigos de barras. Elija el formato de su página de calcomanías, el tipo de código de barras y el valor del código de barras, luego haga clic en el botón <b>%s</b>.
+NumberOfStickers=Número de stickers para imprimir en la página
+PrintsheetForOneBarCode=Imprime varios stickers para un código de barras
+BuildPageToPrint=Generar página para imprimir
+FillBarCodeTypeAndValueManually=Llenar el tipo y el valor del código de barras manualmente.
+FillBarCodeTypeAndValueFromProduct=Llenar el tipo y el valor del código de barras de un producto.
+FillBarCodeTypeAndValueFromThirdParty=Llenar el tipo y el valor del código de barras de un tercero.
+ResetBarcodeForAllRecords=Define el valor del código de barras para todos los registros (esto también restablecerá el valor del código de barras ya definido con nuevos valores)
+PriceByCustomer=Diferentes precios para cada cliente
+PriceCatalogue=Un precio de venta único por producto/servicio
+PricingRule=Reglas para los precios de venta.
+AddCustomerPrice=Añadir precio por cliente
+PriceByCustomerLog=Registro de precios anteriores del cliente
+MinimumPriceLimit=El precio mínimo no puede ser inferior a %s
+PriceExpressionEditor=Editor de expresiones de precios
+PriceExpressionSelected=Expresión de precio seleccionada
+PriceExpressionEditorHelp1=precio = 2 + 2 o "2 + 2" para establecer el precio. Utilizar ; separar las expresiones
+PriceExpressionEditorHelp3=Tanto en el producto / servicio como en los precios del proveedor hay disponibles estas variables: <br><b>#tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#</b>
+PriceExpressionEditorHelp4=Solo en precio de producto / servicio: <b># Supplier_min_price #</b><br> Solo en precios de proveedor: <b> # Supplier_quantity # y # Supplier_tva_tx #</b>
+PriceMode=Modo de precio
+ComposedProductIncDecStock=Aumentar / Disminuir el stock al cambiar producto padre
+DynamicPriceConfiguration=Configuración dinámica de precios
+AddUpdater=Añadir actualizador
+VariableToUpdate=Variable para actualizar
+GlobalVariableUpdaterType0=Datos JSON
+GlobalVariableUpdaterHelp0=Analiza los datos JSON de la URL especificada, VALUE especifica la ubicación del valor relevante,
+GlobalVariableUpdaterHelpFormat0=Formato de la solicitud {"URL": "http://example.com/urlofjson", "VALUE": "array1, array2, targetvalue"}
+GlobalVariableUpdaterType1=Datos de WebService
+GlobalVariableUpdaterHelp1=Analiza los datos de WebService desde la URL especificada, NS especifica el espacio de nombres, VALUE especifica la ubicación del valor relevante, DATA debe contener los datos a enviar y METHOD es el método WS llamante
+GlobalVariableUpdaterHelpFormat1=El formato de la solicitud es {"URL": "http://example.com/urlofws", "VALUE": "array, targetvalue", "NS": "http://example.com/urlofns", "METHOD" : "myWSMethod", "DATA": {"tu": "datos", "para": "enviar"}}
+PropalMergePdfProductActualFile=Los archivos se usan para agregar a PDF Azur son/es
+PropalMergePdfProductChooseFile=Seleccionar archivos PDF
+DefaultPriceRealPriceMayDependOnCustomer=Precio predeterminado, el precio real puede depender del cliente
+ClinkOnALinkOfColumn=Haga clic en un enlace de la columna %s para obtener una vista detallada ...
+TranslatedLabel=Etiqueta traducida
+TranslatedDescription=Descripción traducida
+TranslatedNote=Notas traducidas
+WeightUnits=Unidad de peso
+VolumeUnits=Unidad de volumen
+SizeUnits=Unidad de tamaño
+ConfirmDeleteProductBuyPrice=¿Seguro que quieres eliminar este precio de compra?
+VariantAttributes=Atributos variantes
+ProductAttributes=Atributos variantes para los productos
+ProductAttributeName=Atributo de variante %s
+ProductAttributeDeleteDialog=¿Seguro que desea eliminar este atributo? Todos los valores se eliminarán
+ProductAttributeValueDeleteDialog=¿Seguro que desea eliminar el valor "%s" con la referencia "%s" de este atributo?
+ProductCombinationDeleteDialog=¿Está seguro que deseas eliminar la variante del producto "<strong>%s</strong>"?
+ProductCombinationAlreadyUsed=Se ha producido un error al eliminar la variante. Compruebe que no se está utilizando en ningún objeto
+PropagateVariant=Propagación de variantes
+HideProductCombinations=Ocultar productos variantes en el selector de productos
+EditProductCombination=Variante de edición
+EditProductCombinations=Edición de variantes
+SelectCombination=Seleccionar combinación
+Features=Caracteristicas
+PriceImpact=Impacto en los precios
+WeightImpact=Impacto de peso
+ErrorCreatingProductAttributeValue=Se ha producido un error al crear el valor del atributo. Podría ser porque ya existe un valor existente con esa referencia
+ProductCombinationGeneratorWarning=Si continúa, antes de generar nuevas variantes, todas las anteriores serán eliminadas. Los ya existentes se actualizarán con los nuevos valores
+DoNotRemovePreviousCombinations=No elimine las variantes anteriores
+ErrorDeletingGeneratedProducts=Se produjo un error al intentar eliminar variantes de producto existentes
+NbOfDifferentValues=No. de valores diferentes
+NbProducts=Numero de productos
+HideChildProducts=Ocultar productos variantes
+ShowChildProducts=Mostrar productos variantes
+NoEditVariants=Vaya a la tarjeta del producto principal y edite el impacto del precio de las variantes en la pestaña de variantes
+ConfirmCloneProductCombinations=¿Desea copiar todas las variantes del producto en el otro producto padre con la referencia dada?
+ErrorCopyProductCombinations=Se produjo un error al copiar las variantes del producto
+ErrorDestinationProductNotFound=Producto de destino no encontrado
+ErrorProductCombinationNotFound=Variante del producto no encontrada
+PMPValue=Precio promedio ponderado
+MergeOriginProduct=Duplicar el tercero (tercero que quieres eliminar)
+ConfirmMergeProducts=¿Está seguro de que desea fusionar el tercero elegido con el actual? Todos los objetos vinculados (facturas, pedidos, ...) se moverán al producto actual, después de lo cual se eliminará el producto elegido.
+ProductsMergeSuccess=Los productos han sido fusionados
+SwitchOnPurchaseStatus=Activar el estado de compra
+PMPExpected=PMP. Esperado
+ExpectedValuation=Valoración esperada
+ConfirmEditExtrafield =Seleccione el extracampo que desea modificar
+ConfirmEditExtrafieldQuestion =¿Está seguro que quiere modificar este extracampo?
+ModifyValueExtrafields =Modificar valor de un extracampo
diff --git a/htdocs/langs/es_CR/stocks.lang b/htdocs/langs/es_CR/stocks.lang
index c34d07e9d8e..7bdea83791a 100644
--- a/htdocs/langs/es_CR/stocks.lang
+++ b/htdocs/langs/es_CR/stocks.lang
@@ -1,8 +1,10 @@
 # Dolibarr language file - Source file is en_US - stocks
 Location=Ubicaciòn
+AverageUnitPricePMPShort=Precio promedio ponderado
 inventoryEdit=Editar
 inventoryValidate=Validada
 inventoryDraft=En ejecución
+SelectCategory=Filtro por Categoría
 ListInventory=Lista
 AlwaysShowFullArbo=Display the full path of a warehouse (parent warehouses) on the popup of warehouse links (Warning: This may decrease dramatically performances)
 InventoryStartedShort=Iniciado
diff --git a/htdocs/langs/es_CR/stripe.lang b/htdocs/langs/es_CR/stripe.lang
deleted file mode 100644
index 14335fc610b..00000000000
--- a/htdocs/langs/es_CR/stripe.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - stripe
-ExampleOfTestCreditCard=Example of credit card for SEPA test: %s => valid, %s => error CVC, %s => expired, %s => charge fails
diff --git a/htdocs/langs/es_CR/suppliers.lang b/htdocs/langs/es_CR/suppliers.lang
index 15e2750424f..d4e303f8b49 100644
--- a/htdocs/langs/es_CR/suppliers.lang
+++ b/htdocs/langs/es_CR/suppliers.lang
@@ -1,4 +1,6 @@
 # Dolibarr language file - Source file is en_US - suppliers
 SuppliersInvoice=Factura de proveedor
 SupplierInvoices=Facturas de proveedor
+SupplierPrices=Precios de proveedor
 SupplierPayment=Pago de proveedor
+BuyingPriceNumShort=Precios de proveedor
diff --git a/htdocs/langs/es_CU/accountancy.lang b/htdocs/langs/es_CU/accountancy.lang
index e12a1ec3cbf..8fc7a3bfe46 100644
--- a/htdocs/langs/es_CU/accountancy.lang
+++ b/htdocs/langs/es_CU/accountancy.lang
@@ -34,11 +34,6 @@ CountriesNotInEEC=Países fuera de la CEE
 CountriesInEECExceptMe=Países en EEC excepto %s
 ExportAccountingSourceDocHelp=Con esta herramienta, puede buscar y exportar los eventos de origen que se utilizan para generar su contabilidad. <br> El archivo ZIP exportado contendrá las listas de elementos solicitados en CSV, así como sus archivos adjuntos en su formato original (PDF, ODT, DOCX...).
 ExportAccountancy=Contabilidad de exportaciones
-MainAccountForCustomersNotDefined=Cuenta contable principal para clientes no definidos en la configuración
-MainAccountForSuppliersNotDefined=Cuenta contable principal para proveedores no definidos en la configuración
-MainAccountForUsersNotDefined=Cuenta de contabilidad principal para usuarios no definidos en la configuración
-MainAccountForVatPaymentNotDefined=Cuenta contable principal para el pago del IVA no definida en la configuración
-MainAccountForSubscriptionPaymentNotDefined=Cuenta contable principal para pago de suscripción no definida en la configuración
 UserAccountNotDefined=Cuenta de contabilidad para el usuario no definida en la configuración
 AccountancyArea=área de contabilidad
 AccountancyAreaDescActionOnce=Las siguientes acciones generalmente se ejecutan una sola vez, o una vez al año...
diff --git a/htdocs/langs/es_CU/admin.lang b/htdocs/langs/es_CU/admin.lang
index a928d06112c..47f13fb5bda 100644
--- a/htdocs/langs/es_CU/admin.lang
+++ b/htdocs/langs/es_CU/admin.lang
@@ -271,10 +271,6 @@ GenericMaskCodes=Puede ingresar cualquier máscara de numeración. En esta másc
 GenericMaskCodes2=<b> {cccc} </b> el código de cliente en n caracteres <br> <b> {cccc000} </b> el código de cliente en n caracteres va seguido de un contador dedicado al cliente. Este contador dedicado al cliente se pone a cero al mismo tiempo que el contador global. <br> <b> {tttt} </b> El código de terceros escribe en n caracteres (ver menú Inicio - Configuración - Diccionario - Tipos de terceros). Si agrega esta etiqueta, el contador será diferente para cada tipo de tercero. <br>
 GenericMaskCodes3=Todos los demás personajes de la máscara permanecerán intactos. <br> No se permiten espacios. <br>
 GenericMaskCodes3EAN=Todos los demás caracteres de la máscara permanecerán intactos (excepto * o ? en la posición 13 en EAN13). <br> No se permiten espacios. <br> En EAN13, el último carácter después del último } en la posición 13 debe ser * o ? . Será reemplazada por la clave calculada. <br>
-GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany, with date 2023-01-31:</u><br>
-GenericMaskCodes4b=<u>Example on third party created on 2023-01-31:</u><br>
-GenericMaskCodes4c=<u>Example on product created on 2023-01-31:</u><br>
-GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> will give <b>ABC2301-000099</b><br><b>{0000+100@1}-ZZZ/{dd}/XXX</b> will give <b>0199-ZZZ/31/XXX</b><br><b>IN{yy}{mm}-{0000}-{t}</b> will give <b>IN2301-0099-A</b> if the type of company is 'Responsable Inscripto' with code for type that is 'A_RI'
 GenericNumRefModelDesc=Devuelve un número personalizable según una máscara definida.
 ServerAvailableOnIPOrPort=El servidor está disponible en la dirección <b> %s </b> en el puerto <b> %s </b>
 ServerNotAvailableOnIPOrPort=El servidor no está disponible en la dirección <b> %s </b> en el puerto <b> %s </b>
@@ -1088,7 +1084,6 @@ TemplatePDFContracts=Modelos de documentos de contratos
 FreeLegalTextOnContracts=Texto libre sobre contratos
 WatermarkOnDraftContractCards=Marca de agua en borradores de contratos (ninguno si está vacío)
 MembersSetup=Configuración del módulo de miembros
-AdherentLoginRequired=Administrar un inicio de sesión para cada miembro
 AdherentMailRequired=Correo electrónico requerido para crear un nuevo miembro
 MemberSendInformationByMailByDefault=La casilla de verificación para enviar correo de confirmación a los miembros (validación o nueva suscripción) está activada de forma predeterminada
 MemberCreateAnExternalUserForSubscriptionValidated=Cree un inicio de sesión de usuario externo para cada nueva suscripción de miembro validada
@@ -1188,9 +1183,7 @@ LDAPFieldSidExample=Ejemplo: objectid
 LDAPFieldEndLastSubscription=Fecha de finalización de la suscripción
 LDAPFieldTitleExample=Ejemplo: título
 LDAPFieldGroupid=Identificación del grupo
-LDAPFieldGroupidExample=Example : gidnumber
 LDAPFieldUserid=Identificación de usuario
-LDAPFieldUseridExample=Example : uidnumber
 LDAPFieldHomedirectory=directorio de inicio
 LDAPFieldHomedirectoryExample=Ejemplo: directorio de inicio
 LDAPFieldHomedirectoryprefix=Prefijo del directorio de inicio
@@ -1344,8 +1337,19 @@ YourCompanyDoesNotUseVAT=Su empresa se ha definido para no utilizar el IVA (Inic
 AccountancyCodeSell=Cuenta de venta. código
 AccountancyCodeBuy=Cuenta de compra. código
 CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=Mantenga la casilla de verificación "Crear automáticamente el pago" vacía de forma predeterminada al crear un nuevo impuesto
+AgendaSetup =Configuración del módulo de eventos y agenda
+AGENDA_DEFAULT_FILTER_TYPE =Establecer automáticamente este tipo de evento en el filtro de búsqueda de la vista de agenda
+AGENDA_DEFAULT_FILTER_STATUS =Establecer automáticamente este estado para eventos en el filtro de búsqueda de la vista de agenda
+AGENDA_DEFAULT_VIEW =¿Qué vista quieres abrir por defecto al seleccionar el menú Agenda?
+AGENDA_REMINDER_BROWSER =Habilite el recordatorio de eventos <b> en el navegador del usuario </b> (cuando se alcanza la fecha de recordatorio, el navegador muestra una ventana emergente. Cada usuario puede desactivar dichas notificaciones desde la configuración de notificaciones de su navegador).
+AGENDA_REMINDER_BROWSER_SOUND =Habilitar notificación de sonido
+AGENDA_REMINDER_EMAIL =Habilite el recordatorio de eventos <b> por correo electrónico </b> (la opción de recordatorio/retraso se puede definir en cada evento).
+AGENDA_REMINDER_EMAIL_NOTE =Nota: La frecuencia del trabajo programado %s debe ser suficiente para garantizar que los recordatorios se envíen en el momento correcto.
+AGENDA_SHOW_LINKED_OBJECT =Mostrar objeto vinculado en la vista de agenda
+AGENDA_USE_EVENT_TYPE =Usar tipos de eventos (administrados en el menú Configuración -> Diccionarios -> Tipo de agenda de eventos)
+AGENDA_USE_EVENT_TYPE_DEFAULT =Establezca automáticamente este valor predeterminado para el tipo de evento en el formulario de creación de eventos
+PasswordTogetVCalExport =Clave para autorizar enlace de exportación
 PastDelayVCalExport=No exportar eventos anteriores a
-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=Este módulo cambia los números de teléfono, cuando se usa una computadora de escritorio, en enlaces en los que se puede hacer clic. Un clic llamará al número. Esto se puede usar para iniciar la llamada telefónica cuando usa un teléfono virtual en su escritorio o cuando usa un sistema CTI basado en el protocolo SIP, por ejemplo. Nota: cuando se utiliza un teléfono inteligente, siempre se puede hacer clic en los números de teléfono.
 ClickToDialUseTelLink=Use solo un enlace "tel:" en los números de teléfono
 ClickToDialUseTelLinkDesc=Utilice este método si sus usuarios tienen un softphone o una interfaz de software, instalados en la misma computadora que el navegador, y se les llama cuando hacen clic en un enlace que comienza con "tel:" en su navegador. Si necesita un enlace que comience con "sip:" o una solución de servidor completa (sin necesidad de instalación de software local), debe establecer esto en "No" y completar el siguiente campo.
@@ -1531,7 +1535,6 @@ EmailCollectorDescription=Agregue un trabajo programado y una página de configu
 NewEmailCollector=Nuevo recopilador de correo electrónico
 EMailHost=Host del servidor IMAP de correo electrónico
 EMailHostPort=Puerto de servidor IMAP de correo electrónico
-oauthToken=OAuth2 token
 ImapEncryption =método de encriptación IMAP
 MailboxSourceDirectory=Directorio de origen del buzón
 EmailcollectorOperations=Operaciones a realizar por cobrador
@@ -1649,19 +1652,12 @@ PreviousHash=Hachís anterior
 InventorySetup=Configuración de inventario
 Settings =Ajustes
 FixedOrPercent=Fijo (use la palabra clave 'fijo') o porcentaje (use la palabra clave 'porcentaje')
-INVOICE_ADD_SWISS_QR_CODEMore=Switzerland's standard for invoices; make sure ZIP & City are filled and that the accounts have valid Swiss/Liechtenstein IBANs.
 UrlSocialNetworksDesc=Enlace URL de la red social. Utilice {socialid} para la parte variable que contiene el ID de la red social.
 CIDLookupURL=El módulo trae una URL que puede ser utilizada por una herramienta externa para obtener el nombre de un tercero o contacto a partir de su número de teléfono. URL a utilizar es:
 UsePassword=usa una contraseña
 UseOauth=Usar un token OAUTH
 ScriptIsEmpty=el guion esta vacio
 ShowHideTheNRequests=Mostrar/ocultar las solicitudes SQL %s
-CssOnEdit=CSS on edit pages
-CssOnView=CSS on view pages
-CssOnList=CSS on lists
-HelpCssOnEditDesc=The CSS used when editing the field.<br>Example: "minwiwdth100 maxwidth500 widthcentpercentminusx"
-HelpCssOnViewDesc=The CSS used when viewing the field.
-HelpCssOnListDesc=The CSS used when field is inside a list table.<br>Example: "tdoverflowmax200"
 DesktopsAndSmartphones=Computadoras de escritorio y teléfonos inteligentes
 WarningModuleHasChangedLastVersionCheckParameter=Advertencia: el módulo %s ha configurado un parámetro para verificar su versión en cada acceso a la página. Esta es una práctica mala y no permitida que puede hacer que la página para administrar módulos sea inestable. Póngase en contacto con el autor del módulo para solucionar este problema.
 Defaultfortype=Por defecto
diff --git a/htdocs/langs/es_CU/supplier_proposal.lang b/htdocs/langs/es_CU/supplier_proposal.lang
index 0df52b50a5f..60b9972ffae 100644
--- a/htdocs/langs/es_CU/supplier_proposal.lang
+++ b/htdocs/langs/es_CU/supplier_proposal.lang
@@ -33,7 +33,7 @@ SendAskRef=Enviando la solicitud de precio %s
 SupplierProposalCard=Solicitar tarjeta
 ConfirmDeleteAsk=¿Está seguro de que desea eliminar esta solicitud de precio <b> %s </b>?
 ActionsOnSupplierProposal=Eventos bajo petición de precio
-DocModelAuroreDescription=Un modelo de solicitud completo (logo...)
+DocModelAuroreDescription=A complete template for a vendor quotation request template (old implementation of Sponge template)
 CommercialAsk=Precio requerido
 DefaultModelSupplierProposalCreate=Creación de modelo por defecto
 DefaultModelSupplierProposalToBill=Plantilla por defecto al cerrar una solicitud de precio (aceptada)
@@ -44,3 +44,4 @@ SupplierProposalsToClose=Propuestas de proveedores para cerrar
 SupplierProposalsToProcess=Propuestas de proveedores para procesar
 LastSupplierProposals=Últimas solicitudes de precio %s
 AllPriceRequests=Todas las solicitudes
+TypeContact_supplier_proposal_external_SERVICE=Propuesta de seguimiento representativa
diff --git a/htdocs/langs/es_DO/supplier_proposal.lang b/htdocs/langs/es_DO/supplier_proposal.lang
new file mode 100644
index 00000000000..a1b23cd956e
--- /dev/null
+++ b/htdocs/langs/es_DO/supplier_proposal.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - supplier_proposal
+DocModelAuroreDescription=A complete template for a vendor quotation request template (old implementation of Sponge template)
diff --git a/htdocs/langs/es_EC/accountancy.lang b/htdocs/langs/es_EC/accountancy.lang
index a774b6e9706..84109b3560f 100644
--- a/htdocs/langs/es_EC/accountancy.lang
+++ b/htdocs/langs/es_EC/accountancy.lang
@@ -24,11 +24,6 @@ JournalizationInLedgerStatus=Estado de la publicación
 GroupIsEmptyCheckSetup=El grupo está vacío, compruebe la configuración del grupo de contabilidad personalizado
 DetailByAccount=Mostrar detalles por cuenta
 AccountWithNonZeroValues=Cuentas con valores distintos de cero.
-MainAccountForCustomersNotDefined=Cuenta principal de contabilidad para clientes no definidos en la configuración
-MainAccountForSuppliersNotDefined=Cuenta contable principal para proveedores no definidos en la configuración
-MainAccountForUsersNotDefined=Cuenta principal de contabilidad para usuarios no definidos en la configuración
-MainAccountForVatPaymentNotDefined=Principal cuenta contable para el pago del IVA no definido en la configuración
-MainAccountForSubscriptionPaymentNotDefined=Cuenta contable principal para el pago de suscripción no definida en la configuración
 AccountancyArea=Área de contabilidad
 AccountancyAreaDescActionOnce=Las siguientes acciones normalmente se ejecutan una sola vez, o una vez al año ...
 AccountancyAreaDescActionFreq=Las siguientes acciones se ejecutan generalmente cada mes, semana o día para empresas muy grandes ...
diff --git a/htdocs/langs/es_EC/admin.lang b/htdocs/langs/es_EC/admin.lang
index 1c1ee2e145c..9f21bf23c39 100644
--- a/htdocs/langs/es_EC/admin.lang
+++ b/htdocs/langs/es_EC/admin.lang
@@ -250,10 +250,6 @@ LastActivationIP=Última activación IP
 UpdateServerOffline=Actualización de servidor fuera de línea
 WithCounter=Administrar un contador
 GenericMaskCodes3=Todos los demás caracteres de la máscara permanecerán intactos. <br> No se permiten espacios. <br>
-GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany, with date 2023-01-31:</u><br>
-GenericMaskCodes4b=<u>Example on third party created on 2023-01-31:</u><br>
-GenericMaskCodes4c=<u>Example on product created on 2023-01-31:</u><br>
-GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> will give <b>ABC2301-000099</b><br><b>{0000+100@1}-ZZZ/{dd}/XXX</b> will give <b>0199-ZZZ/31/XXX</b><br><b>IN{yy}{mm}-{0000}-{t}</b> will give <b>IN2301-0099-A</b> if the type of company is 'Responsable Inscripto' with code for type that is 'A_RI'
 GenericNumRefModelDesc=Devuelve un número personalizable de acuerdo con una máscara definida.
 ServerAvailableOnIPOrPort=Servidor está disponible en la dirección <b>%s</b> en el puerto <b>%s</b>
 ServerNotAvailableOnIPOrPort=Servidor no está disponible en la dirección <b>%s</b> en el puerto <b>%s</b>
@@ -963,7 +959,6 @@ TemplatePDFContracts=Modelos de documentos de contratos
 FreeLegalTextOnContracts=Texto libre en los contratos
 WatermarkOnDraftContractCards=Marca de agua en los contratos de borrador.
 MembersSetup=Configuración de módulos de miembros
-AdherentLoginRequired= Administrar un Login para cada miembro
 AdherentMailRequired=Correo electrónico requerido para crear un nuevo miembro
 MemberSendInformationByMailByDefault=Marque la casilla de verificación para enviar un correo de confirmación a los miembros (validación o nueva suscripción), está activada de forma predeterminada
 MEMBER_REMINDER_EMAIL=Habilite el recordatorio automático <b> por correo electrónico </b> de las suscripciones caducadas. Nota: el módulo <strong> %s </strong> debe estar habilitado y configurado correctamente para enviar recordatorios.
@@ -1061,8 +1056,6 @@ LDAPFieldSidExample=Ejemplo: objectid
 LDAPFieldEndLastSubscription=Fecha de finalización de la suscripción
 LDAPFieldTitleExample=Ejemplo: título
 LDAPFieldGroupid=Identificación del grupo
-LDAPFieldGroupidExample=Example : gidnumber
-LDAPFieldUseridExample=Example : uidnumber
 LDAPFieldHomedirectoryprefix=Prefijo del directorio de inicio
 LDAPSetupNotComplete=La configuración de LDAP no está completa (vaya a otras pestañas)
 LDAPNoUserOrPasswordProvidedAccessIsReadOnly=No se ha proporcionado administrador ni contraseña. El acceso LDAP será anónimo y en modo de sólo lectura.
@@ -1194,9 +1187,16 @@ InvoiceDateUsed=Fecha de factura debidamente
 YourCompanyDoesNotUseVAT=Su empresa ha sido definida para no usar el IVA (Inicio - Configuración - Compañía / Organización), por lo que no hay opciones de IVA para configurar.
 AccountancyCodeSell=Cuenta de venta. código
 AccountancyCodeBuy=Cuenta de compra. código
+AgendaSetup =Eventos y configuración del módulo de agenda
+AGENDA_DEFAULT_FILTER_TYPE =Configure automáticamente este tipo de evento en el filtro de búsqueda de la vista de agenda
+AGENDA_DEFAULT_FILTER_STATUS =Establecer automáticamente este estado para eventos en el filtro de búsqueda de la vista de agenda
+AGENDA_REMINDER_BROWSER_SOUND =Habilitar la notificación de sonido
+AGENDA_SHOW_LINKED_OBJECT =Mostrar objeto relacionado en la vista de la agenda
+AGENDA_USE_EVENT_TYPE =Usar tipos de eventos (administrados en el menú Configuración -> Diccionarios -> Tipo de eventos de agenda)
+AGENDA_USE_EVENT_TYPE_DEFAULT =Establecer automáticamente este valor predeterminado para el tipo de evento en el formulario de creación de evento
+PasswordTogetVCalExport =Clave para autorizar enlace de exportación
 PastDelayVCalExport=No exportar eventos más antiguos de
 ClickToDialSetup=Configuración del módulo - Haga clic para marcar
-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).
 ClickToDialUseTelLink=Utilizar sólo un enlace "tel:" en los números de teléfono
 CashDeskSetup=Configuración del módulo de punto de venta
 CashDeskThirdPartyForSell=Tercero genérico predeterminado para usar en ventas
@@ -1368,7 +1368,6 @@ EmailCollector=Recolector de correo electronico
 EmailCollectorDescription=Agregue un trabajo programado y una página de configuración para escanear los buzones de correo electrónico con regularidad (usando el protocolo IMAP) y registre los correos electrónicos recibidos en su aplicación, en el lugar correcto y / o cree algunos registros automáticamente (como clientes potenciales).
 NewEmailCollector=Nuevo recolector de email
 EMailHost=Host de correo electrónico del servidor IMAP
-oauthToken=OAuth2 token
 EmailcollectorOperations=Operaciones a realizar por coleccionista.
 MaxEmailCollectPerCollect=Número máximo de correos electrónicos recopilados por recopilación
 EmailCollectorConfirmCollectTitle=Correo electrónico recoger confirmación
@@ -1414,11 +1413,4 @@ EMailsWillHaveMessageID=Los correos electrónicos tendrán una etiqueta 'Referen
 JumpToBoxes=Vaya a Configuración -> Widgets
 Recommended=Recomendado
 InventorySetup=Configuración del inventario
-INVOICE_ADD_SWISS_QR_CODEMore=Switzerland's standard for invoices; make sure ZIP & City are filled and that the accounts have valid Swiss/Liechtenstein IBANs.
-CssOnEdit=CSS on edit pages
-CssOnView=CSS on view pages
-CssOnList=CSS on lists
-HelpCssOnEditDesc=The CSS used when editing the field.<br>Example: "minwiwdth100 maxwidth500 widthcentpercentminusx"
-HelpCssOnViewDesc=The CSS used when viewing the field.
-HelpCssOnListDesc=The CSS used when field is inside a list table.<br>Example: "tdoverflowmax200"
 Defaultfortype=Predeterminados
diff --git a/htdocs/langs/es_EC/main.lang b/htdocs/langs/es_EC/main.lang
index 50a7b34d42c..1d3852a9615 100644
--- a/htdocs/langs/es_EC/main.lang
+++ b/htdocs/langs/es_EC/main.lang
@@ -551,4 +551,4 @@ ContactAddedAutomatically=Contacto agregado de roles de terceros de contacto
 ClientTZ=Zona horaria del cliente
 Terminate=Terminar
 Terminated=Terminado
-ClickFullScreenEscapeToLeave=Click here to switch in Full screen mode. Press ESCAPE to leave Full screen mode.
+UserExpired=Muerto
diff --git a/htdocs/langs/es_EC/supplier_proposal.lang b/htdocs/langs/es_EC/supplier_proposal.lang
index 5fe0738f765..95e18e4a474 100644
--- a/htdocs/langs/es_EC/supplier_proposal.lang
+++ b/htdocs/langs/es_EC/supplier_proposal.lang
@@ -13,6 +13,7 @@ SupplierProposalArea=Área de propuestas de proveedores
 SupplierProposalShort=Propuesta del vendedor
 SupplierProposals=Propuestas del vendedor
 SupplierProposalsShort=Propuestas del vendedor
+AskPrice=Precio requerido
 NewAskPrice=Nueva solicitud de precio
 ShowSupplierProposal=Mostrar pedido de precio
 AddSupplierProposal=Crear una solicitud de precio
@@ -33,7 +34,7 @@ SendAskRef=Enviando la solicitud de precio %s
 SupplierProposalCard=Solicitar tarjeta
 ConfirmDeleteAsk=¿Seguro que desea eliminar esta solicitud de precios <b>%s</b>?
 ActionsOnSupplierProposal=Eventos sobre la solicitud de precio
-DocModelAuroreDescription=Un modelo de solicitud completa (logo ...)
+DocModelAuroreDescription=A complete template for a vendor quotation request template (old implementation of Sponge template)
 CommercialAsk=Precio requerido
 DefaultModelSupplierProposalCreate=Creación de modelo predeterminada
 DefaultModelSupplierProposalToBill=Plantilla predeterminada al cerrar una solicitud de precio (aceptada)
@@ -44,3 +45,4 @@ SupplierProposalsToClose=Propuestas del proveedor para cerrar
 SupplierProposalsToProcess=Propuestas del proveedor para procesar
 LastSupplierProposals=Últimas solicitudes de precios%s
 AllPriceRequests=Todas las solicitudes
+TypeContact_supplier_proposal_external_SERVICE=Propuestas de seguimiento representativas
diff --git a/htdocs/langs/es_ES/accountancy.lang b/htdocs/langs/es_ES/accountancy.lang
index 9f7061d4fdd..4a898326dac 100644
--- a/htdocs/langs/es_ES/accountancy.lang
+++ b/htdocs/langs/es_ES/accountancy.lang
@@ -57,11 +57,14 @@ WarningDataDisappearsWhenDataIsExported=Advertencia, esta lista contiene solo lo
 VueByAccountAccounting=Ver por cuenta contable
 VueBySubAccountAccounting=Ver por subcuenta contable
 
-MainAccountForCustomersNotDefined=Cuenta contable para clientes no definida en la configuración
-MainAccountForSuppliersNotDefined=Cuenta contable para proveedores no definida en la configuración
-MainAccountForUsersNotDefined=Cuenta contable para usuarios no definida en la configuración
-MainAccountForVatPaymentNotDefined=Cuenta contable para IVA no definida en la configuración
-MainAccountForSubscriptionPaymentNotDefined=Cuenta contable para subscripciones no definida en la configuración
+MainAccountForCustomersNotDefined=Cuenta principal (del Plan Contable) para clientes no definidos en la configuración
+MainAccountForSuppliersNotDefined=Cuenta principal (del Plan Contable) para proveedores no definidos en la configuración
+MainAccountForUsersNotDefined=Cuenta principal (del Plan Contable) para usuarios no definidos en la configuración
+MainAccountForRevenueStampSaleNotDefined=Cuenta (del Plan Contable) para el sello de ingresos (ventas) no definido en la configuración
+MainAccountForRevenueStampPurchaseNotDefined=Cuenta (del Plan Contable) para el sello de ingresos (compras) no definido en la configuración
+MainAccountForVatPaymentNotDefined=Cuenta (del Plan Contable) para el pago del IVA no definida en la configuración
+MainAccountForSubscriptionPaymentNotDefined=Cuenta (del Plan Contable) para pago de membresía no definida en la configuración
+MainAccountForRetainedWarrantyNotDefined=Cuenta (del Plan Contable) para la garantía retenida no definida en la configuración
 UserAccountNotDefined=Cuenta contable para usuarios no definida en la configuración
 
 AccountancyArea=Área contabilidad
diff --git a/htdocs/langs/es_ES/admin.lang b/htdocs/langs/es_ES/admin.lang
index ffad0e7de00..97b47a902b5 100644
--- a/htdocs/langs/es_ES/admin.lang
+++ b/htdocs/langs/es_ES/admin.lang
@@ -1509,7 +1509,8 @@ WatermarkOnDraftContractCards=Marca de agua en contratos (nada si está vacía)
 MembersSetup=Configuración del módulo Asociaciones
 MemberMainOptions=Opciones principales
 MemberCodeChecker=Opciones para la generación automática de códigos de miembros
-AdherentLoginRequired= Gestionar un login para cada miembro
+AdherentLoginRequired=Administre un nombre de usuario/contraseña para cada miembro
+AdherentLoginRequiredDesc=Agregue un valor para un inicio de sesión y una contraseña en el archivo de miembros. Si el miembro está vinculado a un usuario, actualizar el inicio de sesión y la contraseña del miembro también actualizará el inicio de sesión y la contraseña del usuario.
 AdherentMailRequired=E-Mail obligatorio para crear un miembro nuevo
 MemberSendInformationByMailByDefault=Casilla de verificación para enviar el correo de confirmación (validación ó nueva cotización) a los miembros es por defecto "sí"
 MemberCreateAnExternalUserForSubscriptionValidated=Crear un nuevo usuario externo para cada nueva suscripción de miembro validada
@@ -2076,6 +2077,10 @@ MAIN_DOCUMENTS_LOGO_HEIGHT=Altura del logo en PDF
 DOC_SHOW_FIRST_SALES_REP=Mostrar primer representante de ventas
 MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Añadir una columna para una imagen en las líneas de presupuesto
 MAIN_DOCUMENTS_WITH_PICTURE_WIDTH=Ancho de la columna si se añade una imagen en las líneas
+MAIN_GENERATE_DOCUMENTS_SUPPLIER_PROPOSAL_WITHOUT_UNIT_PRICE=Ocultar la columna de precio unitario en las solicitudes de cotización
+MAIN_GENERATE_DOCUMENTS_SUPPLIER_PROPOSAL_WITHOUT_TOTAL_COLUMN=Ocultar la columna de precio total en las solicitudes de cotización
+MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_UNIT_PRICE=Ocultar la columna de precio unitario en las órdenes de compra
+MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_TOTAL_COLUMN=Ocultar la columna de precio total en órdenes de compra
 MAIN_PDF_NO_SENDER_FRAME=Ocultar bordes en el marco de la dirección del emisor
 MAIN_PDF_NO_RECIPENT_FRAME=Ocultar bordes en el marco de la dirección del destinatario
 MAIN_PDF_HIDE_CUSTOMER_CODE=Ocultar código de cliente
@@ -2400,4 +2405,4 @@ OptionXShouldBeEnabledInModuleY=La opción "<b> %s </b>" debe habilitarse en el
 OptionXIsCorrectlyEnabledInModuleY=La opción "<b> %s </b>" está habilitada en el módulo <b> %s </b>
 AtBottomOfPage=En la parte inferior de la página
 FailedAuth=autenticaciones fallidas
-MaxNumberOfFailedAuth=Número máximo de autenticación fallida en 24 horas para deshabilitar el inicio de sesión.
+MaxNumberOfFailedAuth=Número máximo de autenticación fallida en 24 horas para denegar el inicio de sesión.
diff --git a/htdocs/langs/es_ES/banks.lang b/htdocs/langs/es_ES/banks.lang
index cc0f612a4ef..060873b4648 100644
--- a/htdocs/langs/es_ES/banks.lang
+++ b/htdocs/langs/es_ES/banks.lang
@@ -106,8 +106,8 @@ BankLineNotReconciled=No reconciliado
 CustomerInvoicePayment=Cobro a cliente
 SupplierInvoicePayment=Pago a proveedor
 SubscriptionPayment=Pago cuota
-WithdrawalPayment=Direct Debit payment
-BankTransferPayment=Credit Transfer payment
+WithdrawalPayment=Pago por Débito Directo
+BankTransferPayment=Pago por transferencia de crédito
 SocialContributionPayment=Pago impuesto social/fiscal
 BankTransfer=Transferencia bancaria
 BankTransfers=Transferencias bancarias
diff --git a/htdocs/langs/es_ES/compta.lang b/htdocs/langs/es_ES/compta.lang
index 9e553eec8af..5a21d2fb749 100644
--- a/htdocs/langs/es_ES/compta.lang
+++ b/htdocs/langs/es_ES/compta.lang
@@ -253,6 +253,8 @@ CalculationMode=Modo de cálculo
 AccountancyJournal=Código contable diario
 ACCOUNTING_VAT_SOLD_ACCOUNT=Cuenta (del Plan Contable) que se usará como cuenta predeterminada para el IVA sobre las ventas (se usa si no está definida en la configuración del diccionario de IVA)
 ACCOUNTING_VAT_BUY_ACCOUNT=Cuenta (del Plan Contable) que se usará como la cuenta predeterminada para el IVA en las compras (se usa si no está definida en la configuración del diccionario de IVA)
+ACCOUNTING_REVENUESTAMP_SOLD_ACCOUNT=Cuenta (del Plan Contable) que se usará para el sello de ingresos en las ventas
+ACCOUNTING_REVENUESTAMP_BUY_ACCOUNT=Cuenta (del Plan Contable) que se utilizará para el sello de ingresos en las compras
 ACCOUNTING_VAT_PAY_ACCOUNT=Cuenta (del Plan Contable) que se utilizará como cuenta predeterminada para pagar el IVA
 ACCOUNTING_VAT_BUY_REVERSE_CHARGES_CREDIT=Cuenta (del Plan de Contable) que se utilizará como cuenta predeterminada para el IVA en las compras para cobro revertido (crédito)
 ACCOUNTING_VAT_BUY_REVERSE_CHARGES_DEBIT=Cuenta (del Plan de Contable) que se usará como cuenta predeterminada para el IVA en las compras para cobro revertido (débito)
diff --git a/htdocs/langs/es_ES/ecm.lang b/htdocs/langs/es_ES/ecm.lang
index cd46875bda4..1cab48f67cd 100644
--- a/htdocs/langs/es_ES/ecm.lang
+++ b/htdocs/langs/es_ES/ecm.lang
@@ -48,7 +48,7 @@ GenerateImgWebp=Duplica todas las imágenes con otra versión con formato .webp
 ConfirmGenerateImgWebp=Si confirma, generará una imagen en formato .webp para todas las imágenes que se encuentran actualmente en esta carpeta (las subcarpetas no están incluidas) ...
 ConfirmImgWebpCreation=Confirmar la duplicación de todas las imágenes
 GenerateChosenImgWebp=Duplicar la imagen elegida con otra versión con formato .webp
-ConfirmGenerateChosenImgWebp=If you confirm, you will generate an image in .webp format for the image %s
+ConfirmGenerateChosenImgWebp=Si confirma, generará una imagen en formato .webp para la imagen %s
 ConfirmChosenImgWebpCreation=Confirmar la duplicación de imágenes elegidas
 SucessConvertImgWebp=Imágenes duplicadas correctamente
 SucessConvertChosenImgWebp=Imagen elegida duplicada con éxito
diff --git a/htdocs/langs/es_ES/errors.lang b/htdocs/langs/es_ES/errors.lang
index 9e06b7f594b..3e0e65d8706 100644
--- a/htdocs/langs/es_ES/errors.lang
+++ b/htdocs/langs/es_ES/errors.lang
@@ -318,8 +318,10 @@ ErrorTheUrlOfYourDolInstanceDoesNotMatchURLIntoOAuthSetup=Error: la URL de su in
 ErrorMenuExistValue=Ya existe un menú con este título o URL
 ErrorSVGFilesNotAllowedAsLinksWithout=Los archivos SVG no están permitidos como enlaces externos sin la opción %s
 ErrorTypeMenu=Imposible agregar otro menú para el mismo módulo en la barra de navegación, aún no se maneja
-ErrorTableExist=Table <b>%s</b> already exist
-ErrorDictionaryNotFound=Dictionary <b>%s</b> not found
+ErrorTableExist=La tabla <b> %s </b> ya existe
+ErrorDictionaryNotFound=Diccionario <b> %s </b> no encontrado
+ErrorFailedToCreateSymLinkToMedias=Error al crear los enlaces simbólicos %s para apuntar a %s
+
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=El parámetro PHP upload_max_filesize (%s) es más alto que el parámetro PHP post_max_size (%s). Esta no es una configuración consistente.
 WarningPasswordSetWithNoAccount=Se fijó una contraseña para este miembro. Sin embargo, no se ha creado ninguna cuenta de usuario. Así que esta contraseña no se puede utilizar para acceder a Dolibarr. Puede ser utilizada por un módulo/interfaz externo, pero si no necesitar definir accesos de un miembro, puede desactivar la opción "Administrar un inicio de sesión para cada miembro" en la configuración del módulo miembros. Si necesita administrar un inicio de sesión, pero no necesita ninguna contraseña, puede dejar este campo vacío para evitar esta advertencia. Nota: También puede usarse el correo electrónico como inicio de sesión si el miembro está vinculada a un usuario.
@@ -360,7 +362,7 @@ WarningAutoValNotPossibleWhenStockIsDecreasedOnInvoiceVal=La validación automá
 WarningModuleNeedRefrech = El módulo <b> %s </b> ha sido deshabilitado. No olvides habilitarlo
 WarningPermissionAlreadyExist=Permisos existentes para este objeto
 WarningGoOnAccountancySetupToAddAccounts=Si esta lista está vacía, vaya al menú %s - %s - %s para cargar o crear cuentas para su plan de cuentas.
-WarningCorrectedInvoiceNotFound=Corrected invoice not found
+WarningCorrectedInvoiceNotFound=Factura corregida no encontrada
 
 SwissQrOnlyVIR = La factura SwissQR solo se puede agregar en facturas configuradas para pagarse con pagos de transferencia de crédito.
 SwissQrCreditorAddressInvalid = La dirección del acreedor no es válida (¿están configurados el código postal y la ciudad? (%s)
diff --git a/htdocs/langs/es_ES/main.lang b/htdocs/langs/es_ES/main.lang
index fa6f5cca8e6..7d426315bc2 100644
--- a/htdocs/langs/es_ES/main.lang
+++ b/htdocs/langs/es_ES/main.lang
@@ -235,8 +235,8 @@ PersonalValue=Valor personalizado
 NewObject=Nuevo %s
 NewValue=Nuevo valor
 OldValue=Valor antiguo %s
-FieldXModified=Field %s modified
-FieldXModifiedFromYToZ=Field %s modified from %s to %s
+FieldXModified=Campo %s modificado
+FieldXModifiedFromYToZ=Campo %s modificado de %s a %s
 CurrentValue=Valor actual
 Code=Código
 Type=Tipo
@@ -558,7 +558,7 @@ Unknown=Desconocido
 General=General
 Size=Tamaño
 OriginalSize=Tamaño original
-RotateImage=Rotate 90°
+RotateImage=Girar 90°
 Received=Recibido
 Paid=Pagado
 Topic=Asunto
@@ -1237,3 +1237,5 @@ SearchSyntaxTooltipForStringOrNum=Para buscar dentro de los campos de texto, pue
 InProgress=En progreso
 DateOfPrinting=Fecha de impresión
 ClickFullScreenEscapeToLeave=Haga clic aquí para cambiar al modo de pantalla completa. Presione ESCAPE para salir del modo de pantalla completa.
+UserNotYetValid=Aún no es válido
+UserExpired=No al día
diff --git a/htdocs/langs/es_ES/modulebuilder.lang b/htdocs/langs/es_ES/modulebuilder.lang
index 2a4b903c1ab..e1dfe712277 100644
--- a/htdocs/langs/es_ES/modulebuilder.lang
+++ b/htdocs/langs/es_ES/modulebuilder.lang
@@ -28,6 +28,7 @@ ModuleBuilderDescwidgets=Esta pestaña está dedicada a administrar/crear widget
 ModuleBuilderDescbuildpackage=Puedes generar aquí un archivo comprimido "listo para distribuir" (un archivo .zip normalizado) de tu módulo y un archivo de documentación "listo para distribuir". Simplemente haga clic en el botón para crear el paquete o el archivo de documentación.
 EnterNameOfModuleToDeleteDesc=Puede eliminar su módulo. ATENCIÓN: ¡Todos los ficheros del módulo (generados o creados manualmente), los datos estructurados y la documentación será eliminada definitivamente!
 EnterNameOfObjectToDeleteDesc=Puede eliminar un objeto. ATENCIÓN: ¡Todos los ficheros (generados o creados manualmente) relacionados con el objeto serán eliminados!
+EnterNameOfObjectToDeleteDesc=Puede eliminar un objeto. ATENCIÓN: ¡Todos los ficheros (generados o creados manualmente) relacionados con el objeto serán eliminados!
 DangerZone=Zona peligrosa
 BuildPackage=Crear paquete
 BuildPackageDesc=Puede generar un paquete zip de su módulo para que esté listo para distribuirlo en cualquier Dolibarr. También puede distribuirlo o venderlo en un una tienda como <a href="https://www.dolistore.com">DoliStore.com</a> .
@@ -162,11 +163,11 @@ ListOfTabsEntries=Lista de entradas de pestañas
 TabsDefDesc=Defina aquí las pestañas proporcionadas por su módulo
 TabsDefDescTooltip=Las pestañas proporcionadas por su módulo/aplicación se definen en la matriz <strong> $this->tabs </strong> en el archivo descriptor del módulo. Puede editar manualmente este archivo o usar el editor incorporado.
 BadValueForType=Valor incorrecto para el tipo %s
-DefinePropertiesFromExistingTable=Definir propiedades de una tabla existente
+DefinePropertiesFromExistingTable=Definir los campos/propiedades de una tabla existente
 DefinePropertiesFromExistingTableDesc=Si ya existe una tabla en la base de datos (para el objeto a crear), puede usarla para definir las propiedades del objeto.
 DefinePropertiesFromExistingTableDesc2=Manténgalo vacío si la tabla aún no existe. El generador de código utilizará diferentes tipos de campos para crear un ejemplo de tabla que podrá editar más adelante.
-GeneratePermissions=Quiero agregar los derechos para este objeto.
-GeneratePermissionsHelp=generar derechos predeterminados para este objeto
+GeneratePermissions=Quiero administrar los permisos en este objeto
+GeneratePermissionsHelp=Si marca esto, se agregará un código para administrar los permisos para leer, escribir y eliminar el registro de los objetos.
 PermissionDeletedSuccesfuly=El permiso ha sido eliminado con éxito
 PermissionUpdatedSuccesfuly=El permiso se ha actualizado correctamente
 PermissionAddedSuccesfuly=El permiso se ha agregado con éxito
@@ -177,3 +178,6 @@ ApiObjectDeleted=La API para el objeto %s se eliminó con éxito
 CRUDRead=Leido
 CRUDCreateWrite=Crear o Actualizar
 FailedToAddCodeIntoDescriptor=No se pudo agregar el código en el descriptor. Verifique que el comentario de cadena "%s" todavía esté presente en el archivo.
+DictionariesCreated=Diccionario <b> %s </b> creado correctamente
+DictionaryDeleted=Diccionario <b> %s </b> eliminado correctamente
+PropertyModuleUpdated=La propiedad <b> %s </b> se ha actualizado correctamente
diff --git a/htdocs/langs/es_ES/stripe.lang b/htdocs/langs/es_ES/stripe.lang
index 7597687e661..a443ef63f5d 100644
--- a/htdocs/langs/es_ES/stripe.lang
+++ b/htdocs/langs/es_ES/stripe.lang
@@ -51,6 +51,7 @@ StripeAccount=Cuenta Stripe
 StripeChargeList=Listado de gastos de Stripe
 StripeTransactionList=Listado de transacciones
 StripeCustomerId=Id de cliente de Stripe
+StripePaymentId=ID de pago de Stripe
 StripePaymentModes=Modos de pago de Stripe
 LocalID=ID local
 StripeID=ID Stripe
diff --git a/htdocs/langs/es_ES/supplier_proposal.lang b/htdocs/langs/es_ES/supplier_proposal.lang
index 4fea43e5c77..663a934398a 100644
--- a/htdocs/langs/es_ES/supplier_proposal.lang
+++ b/htdocs/langs/es_ES/supplier_proposal.lang
@@ -42,7 +42,8 @@ SendAskRef=Enviando el presupuesto %s
 SupplierProposalCard=Ficha presupuesto
 ConfirmDeleteAsk=¿Está seguro de querer eliminar este presupuesto <b>%s</b>?
 ActionsOnSupplierProposal=Eventos del presupuesto
-DocModelAuroreDescription=Modelo de presupuesto completo (logo...)
+DocModelAuroreDescription=Una plantilla completa para una plantilla de solicitud de cotización de proveedor (implementación anterior de la plantilla de Sponge)
+DocModelZenithDescription=Una plantilla completa para una plantilla de solicitud de cotización de proveedor
 CommercialAsk=Presupuesto
 DefaultModelSupplierProposalCreate=Modelo por defecto
 DefaultModelSupplierProposalToBill=Modelo por defecto al cerrar un presupuesto (aceptado)
@@ -53,3 +54,6 @@ SupplierProposalsToClose=Presupuestos de proveedor a cerrar
 SupplierProposalsToProcess=Presupuestos de proveedor a procesar
 LastSupplierProposals=Últimos %s presupuestos
 AllPriceRequests=Todos los presupuestos
+TypeContact_supplier_proposal_external_SHIPPING=Contacto del proveedor para la entrega
+TypeContact_supplier_proposal_external_BILLING=Contacto del proveedor para facturación
+TypeContact_supplier_proposal_external_SERVICE=Comercial seguimiento presupuesto
diff --git a/htdocs/langs/es_ES/ticket.lang b/htdocs/langs/es_ES/ticket.lang
index 7345345e809..7bbcf1b9abc 100644
--- a/htdocs/langs/es_ES/ticket.lang
+++ b/htdocs/langs/es_ES/ticket.lang
@@ -329,8 +329,8 @@ OldUser=Usuario antiguo
 NewUser=Nuevo usuario
 NumberOfTicketsByMonth=Número de tickets por mes
 NbOfTickets=Número de tickets
-ExternalContributors=External contributors
-AddContributor=Add external contributor
+ExternalContributors=Colaboradores externos
+AddContributor=Agregar colaborador externo
 
 # notifications
 TicketCloseEmailSubjectCustomer=Ticket cerrado
diff --git a/htdocs/langs/es_ES/website.lang b/htdocs/langs/es_ES/website.lang
index 584d2047974..8cb7e8a6693 100644
--- a/htdocs/langs/es_ES/website.lang
+++ b/htdocs/langs/es_ES/website.lang
@@ -158,5 +158,5 @@ Reservation=Reserva
 PagesViewedPreviousMonth=Páginas vistas (mes anterior)
 PagesViewedTotal=Páginas vistas (total)
 Visibility=Visibilidad
-Everyone=Everyone
-AssignedContacts=Assigned contacts
+Everyone=Todos
+AssignedContacts=Contactos asignados
diff --git a/htdocs/langs/es_GT/supplier_proposal.lang b/htdocs/langs/es_GT/supplier_proposal.lang
new file mode 100644
index 00000000000..a1b23cd956e
--- /dev/null
+++ b/htdocs/langs/es_GT/supplier_proposal.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - supplier_proposal
+DocModelAuroreDescription=A complete template for a vendor quotation request template (old implementation of Sponge template)
diff --git a/htdocs/langs/es_HN/supplier_proposal.lang b/htdocs/langs/es_HN/supplier_proposal.lang
new file mode 100644
index 00000000000..a1b23cd956e
--- /dev/null
+++ b/htdocs/langs/es_HN/supplier_proposal.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - supplier_proposal
+DocModelAuroreDescription=A complete template for a vendor quotation request template (old implementation of Sponge template)
diff --git a/htdocs/langs/es_MX/accountancy.lang b/htdocs/langs/es_MX/accountancy.lang
index cc14647f239..8ea3d2c4985 100644
--- a/htdocs/langs/es_MX/accountancy.lang
+++ b/htdocs/langs/es_MX/accountancy.lang
@@ -16,11 +16,6 @@ GroupIsEmptyCheckSetup=El grupo está vacío, verifique la configuración del gr
 DetailByAccount=Mostrar detalles por cuenta
 AccountWithNonZeroValues=Cuentas con valores distintos de cero
 CountriesInEEC=Países de la Comunidad Europea
-MainAccountForCustomersNotDefined=Cuenta contable principal para clientes no definidos en la configuración
-MainAccountForSuppliersNotDefined=Cuenta contable principal para proveedores no definidos en la configuración
-MainAccountForUsersNotDefined=Cuenta contable principal para usuarios no definidos en la configuración
-MainAccountForVatPaymentNotDefined=Cuenta contable principal para el pago del IVA no definida en la configuración
-MainAccountForSubscriptionPaymentNotDefined=Cuenta contable principal para el pago de suscripción no definida en la configuración
 AccountancyArea=Área contable
 AccountancyAreaDescActionOnce=Las siguientes acciones generalmente se ejecutan una sola vez, o una vez al año ...
 AccountancyAreaDescActionFreq=Las siguientes acciones generalmente se ejecutan cada mes, semana o día para empresas muy grandes ...
diff --git a/htdocs/langs/es_MX/admin.lang b/htdocs/langs/es_MX/admin.lang
index ed900d07ff0..0d1c6daf094 100644
--- a/htdocs/langs/es_MX/admin.lang
+++ b/htdocs/langs/es_MX/admin.lang
@@ -214,10 +214,6 @@ NotExistsDirect=El directorio raíz alternativo no está definido en un director
 InfDirAlt=Desde la versión 3, es posible definir un directorio raíz alternativo. Esto le permite almacenar, en un directorio dedicado, complementos y plantillas personalizadas. <br> Simplemente cree un directorio en la raíz de Dolibarr (por ejemplo: personalizado). <br>
 LastActivationIP=IP de activación más reciente
 UpdateServerOffline=Actualizar servidor sin conexión
-GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany, with date 2023-01-31:</u><br>
-GenericMaskCodes4b=<u>Example on third party created on 2023-01-31:</u><br>
-GenericMaskCodes4c=<u>Example on product created on 2023-01-31:</u><br>
-GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> will give <b>ABC2301-000099</b><br><b>{0000+100@1}-ZZZ/{dd}/XXX</b> will give <b>0199-ZZZ/31/XXX</b><br><b>IN{yy}{mm}-{0000}-{t}</b> will give <b>IN2301-0099-A</b> if the type of company is 'Responsable Inscripto' with code for type that is 'A_RI'
 GenericNumRefModelDesc=Devuelve un número personalizable de acuerdo con una máscara definida.
 ServerAvailableOnIPOrPort=El servidor está disponible en la dirección <b>%s</b> en el puerto <b>%s</b>
 ServerNotAvailableOnIPOrPort=El servidor no está disponible en la dirección <b>%s</b> en el puerto <b>%s</b>
@@ -258,11 +254,8 @@ SuppliersPayment=Pagos al proveedor
 AdherentLoginRequired=Manage a Login for each member
 LDAPServerUseTLS=Usar TLS
 LDAPFieldFirstName=Nombre(s)
-LDAPFieldGroupidExample=Example : gidnumber
-LDAPFieldUseridExample=Example : uidnumber
 Buy=Comprar
 Sell=Vender
-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).
 ShowFiscalYear=Mostrar período contable
 AlwaysEditable=Siempre se puede editar
 Format=Formato
@@ -278,17 +271,9 @@ MailToExpenseReport=Reporte de gastos
 AllPublishers=Todos los editores
 AddMenus=Añadir menús
 AddPermissions=Añadir permisos
-oauthToken=OAuth2 token
 CodeLastResult=Último código de resultado
 ShowProjectLabel=Etiqueta de proyecto
 TemplateAdded=Plantilla agregada
 MailToSendEventOrganization=Organización de Eventos
 ModuleUpdateAvailable=Una actualización está disponible
 Settings =Configuración
-INVOICE_ADD_SWISS_QR_CODEMore=Switzerland's standard for invoices; make sure ZIP & City are filled and that the accounts have valid Swiss/Liechtenstein IBANs.
-CssOnEdit=CSS on edit pages
-CssOnView=CSS on view pages
-CssOnList=CSS on lists
-HelpCssOnEditDesc=The CSS used when editing the field.<br>Example: "minwiwdth100 maxwidth500 widthcentpercentminusx"
-HelpCssOnViewDesc=The CSS used when viewing the field.
-HelpCssOnListDesc=The CSS used when field is inside a list table.<br>Example: "tdoverflowmax200"
diff --git a/htdocs/langs/es_MX/main.lang b/htdocs/langs/es_MX/main.lang
index 02d95c7f932..ca5d940338c 100644
--- a/htdocs/langs/es_MX/main.lang
+++ b/htdocs/langs/es_MX/main.lang
@@ -331,3 +331,4 @@ ContactDefault_order_supplier=Orden de compra
 ContactDefault_propal=Cotización
 ClientTZ=Zona Horaria cliente (usuario)
 Terminate=Terminar
+UserExpired=Expirado
diff --git a/htdocs/langs/es_PA/supplier_proposal.lang b/htdocs/langs/es_PA/supplier_proposal.lang
new file mode 100644
index 00000000000..a1b23cd956e
--- /dev/null
+++ b/htdocs/langs/es_PA/supplier_proposal.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - supplier_proposal
+DocModelAuroreDescription=A complete template for a vendor quotation request template (old implementation of Sponge template)
diff --git a/htdocs/langs/es_PE/supplier_proposal.lang b/htdocs/langs/es_PE/supplier_proposal.lang
new file mode 100644
index 00000000000..a1b23cd956e
--- /dev/null
+++ b/htdocs/langs/es_PE/supplier_proposal.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - supplier_proposal
+DocModelAuroreDescription=A complete template for a vendor quotation request template (old implementation of Sponge template)
diff --git a/htdocs/langs/es_PY/supplier_proposal.lang b/htdocs/langs/es_PY/supplier_proposal.lang
new file mode 100644
index 00000000000..a1b23cd956e
--- /dev/null
+++ b/htdocs/langs/es_PY/supplier_proposal.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - supplier_proposal
+DocModelAuroreDescription=A complete template for a vendor quotation request template (old implementation of Sponge template)
diff --git a/htdocs/langs/es_US/supplier_proposal.lang b/htdocs/langs/es_US/supplier_proposal.lang
new file mode 100644
index 00000000000..a1b23cd956e
--- /dev/null
+++ b/htdocs/langs/es_US/supplier_proposal.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - supplier_proposal
+DocModelAuroreDescription=A complete template for a vendor quotation request template (old implementation of Sponge template)
diff --git a/htdocs/langs/es_UY/supplier_proposal.lang b/htdocs/langs/es_UY/supplier_proposal.lang
new file mode 100644
index 00000000000..a1b23cd956e
--- /dev/null
+++ b/htdocs/langs/es_UY/supplier_proposal.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - supplier_proposal
+DocModelAuroreDescription=A complete template for a vendor quotation request template (old implementation of Sponge template)
diff --git a/htdocs/langs/es_VE/admin.lang b/htdocs/langs/es_VE/admin.lang
index 74b34624a91..f3aeaf2ce7c 100644
--- a/htdocs/langs/es_VE/admin.lang
+++ b/htdocs/langs/es_VE/admin.lang
@@ -5,10 +5,6 @@ ConfirmPurgeSessions=¿De verdad quieres purgar todas las sesiones? Esto descone
 SetupArea=Parametrizaje
 NotConfigured=Módulo / Aplicación no configurada
 GenericMaskCodes3=Cualquier otro carácter en la máscara se quedará sin cambios. <br>No se permiten espacios <br>
-GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany, with date 2023-01-31:</u><br>
-GenericMaskCodes4b=<u>Example on third party created on 2023-01-31:</u><br>
-GenericMaskCodes4c=<u>Example on product created on 2023-01-31:</u><br>
-GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> will give <b>ABC2301-000099</b><br><b>{0000+100@1}-ZZZ/{dd}/XXX</b> will give <b>0199-ZZZ/31/XXX</b><br><b>IN{yy}{mm}-{0000}-{t}</b> will give <b>IN2301-0099-A</b> if the type of company is 'Responsable Inscripto' with code for type that is 'A_RI'
 Module1780Desc=Crear etiquetas/Categoría (Productos, clientes, proveedores, contactos y miembros)
 Permission254=Modificar la contraseña de otros usuarios
 Permission255=Eliminar o desactivar otros usuarios
@@ -35,14 +31,3 @@ WatermarkOnDraftSupplierProposal=Marca de agua en solicitudes de precios a prove
 LDAPMemberObjectClassListExample=Lista de ObjectClass que definen los atributos de un registro (ej: top,inetOrgPerson o top,user for active directory)
 LDAPUserObjectClassListExample=Lista de ObjectClass que definen los atributos de un registro (ej: top,inetOrgPerson o top,user for active directory)
 LDAPContactObjectClassListExample=Lista de objectClass que definen los atributos de un registro (ej: top,inetOrgPerson o top,user for active directory)
-LDAPFieldGroupidExample=Example : gidnumber
-LDAPFieldUseridExample=Example : uidnumber
-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).
-oauthToken=OAuth2 token
-INVOICE_ADD_SWISS_QR_CODEMore=Switzerland's standard for invoices; make sure ZIP & City are filled and that the accounts have valid Swiss/Liechtenstein IBANs.
-CssOnEdit=CSS on edit pages
-CssOnView=CSS on view pages
-CssOnList=CSS on lists
-HelpCssOnEditDesc=The CSS used when editing the field.<br>Example: "minwiwdth100 maxwidth500 widthcentpercentminusx"
-HelpCssOnViewDesc=The CSS used when viewing the field.
-HelpCssOnListDesc=The CSS used when field is inside a list table.<br>Example: "tdoverflowmax200"
diff --git a/htdocs/langs/es_VE/supplier_proposal.lang b/htdocs/langs/es_VE/supplier_proposal.lang
index 01873769c74..d18fce52a27 100644
--- a/htdocs/langs/es_VE/supplier_proposal.lang
+++ b/htdocs/langs/es_VE/supplier_proposal.lang
@@ -7,6 +7,7 @@ SearchRequest=Encontrar una solicitud
 DraftRequests=Solicitudes en borrador
 LastModifiedRequests=Últimas %s solicitudes de precios modificadas
 RequestsOpened=Abrir solicitudes de precios
+AskPrice=Solicitud de precio
 NewAskPrice=Nueva solicitud de precio
 ShowSupplierProposal=Mostrar solicitud de precio
 AddSupplierProposal=Crear solicitud de precio
@@ -23,7 +24,6 @@ SupplierProposalStatusValidatedShort=Validada
 SupplierProposalStatusClosedShort=Cerrada
 SupplierProposalStatusSignedShort=Aceptada
 SupplierProposalStatusNotSignedShort=Devuelta
-CopyAskFrom=Crear solicitud de precio copiando una solicitud existente
 CreateEmptyAsk=Crear solicitud en blanco
 ConfirmCloneAsk=¿Seguro que deseas clonar la solicitud de precio <b>%s</b>?
 ConfirmReOpenAsk=¿Seguro que desea abrir otra vez la solicitud de precio <b>%s</b>?
@@ -32,7 +32,7 @@ SendAskRef=Enviando la solicitud de precio %s
 SupplierProposalCard=Tarjeta de solicitud
 ConfirmDeleteAsk=¿Seguro que desea borrar esta solicitud de precio <b>%s</b>?
 ActionsOnSupplierProposal=Eventos en solicitud de precio
-DocModelAuroreDescription=Modelo completo de solicitud (logo...)
+DocModelAuroreDescription=A complete template for a vendor quotation request template (old implementation of Sponge template)
 CommercialAsk=Solicitud de precio
 DefaultModelSupplierProposalToBill=Plantilla por defecto cuando cierra una solicitud de precio (aceptada)
 DefaultModelSupplierProposalClosed=Plantilla por defecto cuando cierra una solicitud de precio (rechazada)
diff --git a/htdocs/langs/et_EE/accountancy.lang b/htdocs/langs/et_EE/accountancy.lang
index 9c12b91c36f..9c572a6a86a 100644
--- a/htdocs/langs/et_EE/accountancy.lang
+++ b/htdocs/langs/et_EE/accountancy.lang
@@ -14,8 +14,8 @@ ACCOUNTING_EXPORT_ENDLINE=Select the carriage return type
 ACCOUNTING_EXPORT_PREFIX_SPEC=Specify the prefix for the file name
 ThisService=This service
 ThisProduct=This product
-DefaultForService=Default for service
-DefaultForProduct=Default for product
+DefaultForService=Default for services
+DefaultForProduct=Default for products
 ProductForThisThirdparty=Product for this thirdparty
 ServiceForThisThirdparty=Service for this thirdparty
 CantSuggest=Can't suggest
@@ -33,7 +33,7 @@ AssignDedicatedAccountingAccount=New account to assign
 InvoiceLabel=Invoice label
 OverviewOfAmountOfLinesNotBound=Overview of amount of lines not bound to an accounting account
 OverviewOfAmountOfLinesBound=Overview of amount of lines already bound to an accounting account
-OtherInfo=Other information
+OtherInfo=Muu informatsioon
 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
@@ -41,6 +41,7 @@ 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
+DetailBy=Detail by
 AccountWithNonZeroValues=Accounts with non-zero values
 ListOfAccounts=List of accounts
 CountriesInEEC=Countries in EEC
@@ -51,14 +52,19 @@ AccountantFiles=Export source documents
 ExportAccountingSourceDocHelp=With this tool, you can search and export the source events that are used to generate your accountancy. <br>The exported ZIP file will contain the lists of requested items in CSV, as well as their attached files in their original format (PDF, ODT, DOCX...).
 ExportAccountingSourceDocHelp2=To export your journals, use the menu entry %s - %s.
 ExportAccountingProjectHelp=Specify a project if you need an accounting report only for a specific project. Expense reports and loan payments are not included in project reports.
+ExportAccountancy=Export accountancy
+WarningDataDisappearsWhenDataIsExported=Warning, this list contains only the accounting entries that have not been already exported (Export date is empty). If you want to include the accounting entries already exported to re-export them, click on the button above.
 VueByAccountAccounting=View by accounting account
 VueBySubAccountAccounting=View by accounting subaccount
 
-MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup
-MainAccountForSuppliersNotDefined=Main accounting account for vendors not defined in setup
-MainAccountForUsersNotDefined=Main accounting account for users not defined in setup
-MainAccountForVatPaymentNotDefined=Main accounting account for VAT payment not defined in setup
-MainAccountForSubscriptionPaymentNotDefined=Main accounting account for subscription payment not defined in setup
+MainAccountForCustomersNotDefined=Main account (from the Chart of Account) for customers not defined in setup
+MainAccountForSuppliersNotDefined=Main account (from the Chart of Account) for vendors not defined in setup
+MainAccountForUsersNotDefined=Main account (from the Chart of Account) for users not defined in setup
+MainAccountForRevenueStampSaleNotDefined=Account (from the Chart of Account) for the revenue stamp (sales) not defined in setup
+MainAccountForRevenueStampPurchaseNotDefined=Account (from the Chart of Account) for the revenue stamp (purchases) not defined in setup
+MainAccountForVatPaymentNotDefined=Account (from the Chart of Account) for VAT payment not defined in setup
+MainAccountForSubscriptionPaymentNotDefined=Account (from the Chart of Account) for membership payment not defined in setup
+MainAccountForRetainedWarrantyNotDefined=Account (from the Chart of Account) for the retained warranty not defined in setup
 UserAccountNotDefined=Accounting account for user not defined in setup
 
 AccountancyArea=Accounting area
@@ -101,7 +107,8 @@ ShowAccountingAccount=Show accounting account
 ShowAccountingJournal=Show accounting journal
 ShowAccountingAccountInLedger=Show accounting account in ledger
 ShowAccountingAccountInJournals=Show accounting account in journals
-AccountAccountingSuggest=Accounting account suggested
+DataUsedToSuggestAccount=Data used to suggest account
+AccountAccountingSuggest=Account suggested
 MenuDefaultAccounts=Default accounts
 MenuBankAccounts=Pangakontod
 MenuVatAccounts=Vat accounts
@@ -111,6 +118,7 @@ MenuLoanAccounts=Loan accounts
 MenuProductsAccounts=Product accounts
 MenuClosureAccounts=Closure accounts
 MenuAccountancyClosure=Closure
+MenuExportAccountancy=Export accountancy
 MenuAccountancyValidationMovements=Validate movements
 ProductsBinding=Products accounts
 TransferInAccounting=Transfer in accounting
@@ -126,6 +134,7 @@ WriteBookKeeping=Record transactions in accounting
 Bookkeeping=Ledger
 BookkeepingSubAccount=Subledger
 AccountBalance=Account balance
+AccountBalanceSubAccount=Sub-accounts balance
 ObjectsRef=Source object ref
 CAHTF=Total purchase vendor before tax
 TotalExpenseReport=Total expense report
@@ -165,9 +174,9 @@ ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow
 ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
 ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, what is the period selected by default
 
-ACCOUNTING_SELL_JOURNAL=Sales journal (sales and returns)
-ACCOUNTING_PURCHASE_JOURNAL=Purchase journal (purchase and returns)
-ACCOUNTING_BANK_JOURNAL=Cash journal (receipts and disbursements)
+ACCOUNTING_SELL_JOURNAL=Sales journal - sales and returns
+ACCOUNTING_PURCHASE_JOURNAL=Purchase journal - purchase and returns
+ACCOUNTING_BANK_JOURNAL=Cash journal - receipts and disbursements
 ACCOUNTING_EXPENSEREPORT_JOURNAL=Expense report journal
 ACCOUNTING_MISCELLANEOUS_JOURNAL=General journal
 ACCOUNTING_HAS_NEW_JOURNAL=Has new Journal
@@ -189,6 +198,7 @@ ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Account (from the Chart Of Account) to be us
 UseAuxiliaryAccountOnCustomerDeposit=Store customer account as individual account in subsidiary ledger for lines of down payments (if disabled, individual account for down payment lines will remain empty)
 ACCOUNTING_ACCOUNT_SUPPLIER_DEPOSIT=Account (from the Chart Of Account) to be used as the default
 UseAuxiliaryAccountOnSupplierDeposit=Store supplier account as individual account in subsidiary ledger for lines of down payments (if disabled, individual account for down payment lines will remain empty)
+ACCOUNTING_ACCOUNT_CUSTOMER_RETAINED_WARRANTY=Accounting account by default to register customer retained warranty
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the products purchased within same country (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the products purchased from EEC to another EEC country (used if not defined in the product sheet)
@@ -218,6 +228,7 @@ JournalLabel=Journal label
 NumPiece=Piece number
 TransactionNumShort=Num. transaction
 AccountingCategory=Custom group of accounts
+AccountingCategories=Custom groups of accounts
 GroupByAccountAccounting=Group by general ledger account
 GroupBySubAccountAccounting=Group by subledger account
 AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports.
@@ -234,6 +245,7 @@ ConfirmDeleteMvt=This will delete all lines in accountancy for the year/month an
 ConfirmDeleteMvtPartial=This will delete the transaction from the accounting (all lines related to the same transaction will be deleted)
 FinanceJournal=Finance journal
 ExpenseReportsJournal=Expense reports journal
+InventoryJournal=Inventory journal
 DescFinanceJournal=Finance journal including all the types of payments by bank account
 DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Journals and Ledger.
 VATAccountNotDefined=Account for VAT not defined
@@ -265,6 +277,7 @@ ShowSubtotalByGroup=Show subtotal by level
 
 Pcgtype=Group of account
 PcgtypeDesc=Group of account are used as predefined 'filter' and 'grouping' criteria for some accounting reports. For example, 'INCOME' or 'EXPENSE' are used as groups for accounting accounts of products to build the expense/income report.
+AccountingCategoriesDesc=Custom group of accounts can be used to group accounting accounts into one name to ease filter use or building of custom reports.
 
 Reconcilable=Reconcilable
 
@@ -273,7 +286,7 @@ TotalMarge=Total sales margin
 
 DescVentilCustomer=Consult here the list of customer invoice lines bound (or not) to a product account from chart of account
 DescVentilMore=In most cases, if you use predefined products or services and you set the account (from chart of account) on the product/service card, the application will be able to make all the binding between your invoice lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on product/service cards or if you still have some lines not bound to an account, you will have to make a manual binding from the menu "<strong>%s</strong>".
-DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their product account from chart of account
+DescVentilDoneCustomer=Siit leiate loendit klientide arvete ridadest ja nende tootekontost kontoplaanist
 DescVentilTodoCustomer=Bind invoice lines not already bound with a product account from chart of account
 ChangeAccount=Change the product/service account (from chart of account) for the selected lines with the following account:
 Vide=-
@@ -289,11 +302,12 @@ DescClosure=Consult here the number of movements by month not yet validated & lo
 OverviewOfMovementsNotValidated=Overview of movements not validated and locked
 AllMovementsWereRecordedAsValidated=All movements were recorded as validated and locked
 NotAllMovementsCouldBeRecordedAsValidated=Not all movements could be recorded as validated and locked
-ValidateMovements=Validate and lock movements...
+ValidateMovements=Validate and lock movements
 DescValidateMovements=Any modification or deletion of writing, lettering and deletes will be prohibited. All entries for an exercise must be validated otherwise closing will not be possible
 
 ValidateHistory=Bind Automatically
 AutomaticBindingDone=Automatic bindings done (%s) - Automatic binding not possible for some record (%s)
+DoManualBindingForFailedRecord=You have to do a manual link for the %s row(s) not linked automatically.
 
 ErrorAccountancyCodeIsAlreadyUse=Error, you cannot remove or disable this account of chart of account because it is used
 MvtNotCorrectlyBalanced=Movement not correctly balanced. Debit = %s & Credit = %s
@@ -325,23 +339,31 @@ AccountingJournalType1=Miscellaneous operations
 AccountingJournalType2=Müügid
 AccountingJournalType3=Ostud
 AccountingJournalType4=Pank
-AccountingJournalType5=Expense reports
-AccountingJournalType8=Inventory
+AccountingJournalType5=Kuluaruanded
+AccountingJournalType8=Laoseis
 AccountingJournalType9=Has-new
 GenerationOfAccountingEntries=Generation of accounting entries
 ErrorAccountingJournalIsAlreadyUse=This journal is already use
 AccountingAccountForSalesTaxAreDefinedInto=Note: Accounting account for Sales tax are defined into menu <b>%s</b> - <b>%s</b>
 NumberOfAccountancyEntries=Number of entries
 NumberOfAccountancyMovements=Number of movements
-ACCOUNTING_DISABLE_BINDING_ON_SALES=Disable binding & transfer in accountancy on sales (customer invoices will not be taken into account in accounting)
+ACCOUNTING_DISABLE_BINDING_ON_SALES=Keela sidumine ja ülekandmine müügiarvestuses (kliendi arveid ei võeta raamatupidamises arvesse)
 ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountancy on purchases (vendor invoices will not be taken into account in accounting)
 ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting)
 ACCOUNTING_ENABLE_LETTERING=Enable the lettering function in the accounting
+ACCOUNTING_ENABLE_LETTERING_DESC=When this options is enabled, you can define, on each accounting entry, a code so you can group different accounting movements together. In the past, when different journals was managed independently, this feature was necessary to group movement lines of different journals together. However, with Dolibarr accountancy, such a tracking code, called "<b>%s</b>" is already saved automatically, so an automatic lettering is already done, with no risk of error so this feature has become useless for a common usage. Manual lettering feature is provided for end users that really don't trust the computer engine making the transfer of data in accountancy.
+EnablingThisFeatureIsNotNecessary=Enabling this feature is no more necessary for a rigourous accounting management.
+ACCOUNTING_ENABLE_AUTOLETTERING=Enable the automatic lettering when transferring to accounting
+ACCOUNTING_ENABLE_AUTOLETTERING_DESC=Kirja kood genereeritakse automaatselt ja seda suurendatakse ning seda ei vali lõppkasutaja
+OptionsAdvanced=Advanced options
+ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE=Activate the management of VAT reverse charge on supplier purchases
+ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE_DESC=When this option is enabled, you can define that a supplier or a given vendor invoice must be transfered into accountancy differently: A additionnal debit and a credit line will generated into the accounting on 2 given accounts from the chart of account defined into the "%s" setup page.
 
 ## Export
 NotExportLettering=Do not export the lettering when generating the file
-NotifiedExportDate=Flag exported lines as Exported <span class="warning">(to modify a line, you will need to delete the whole transaction and re-transfert it into accounting)</span>
-NotifiedValidationDate=Validate and Lock the exported entries <span class="warning">(same effect than the "%s" feature, modification and deletion of the lines will DEFINITELY not be possible)</span>
+NotifiedExportDate=Flag not yet exported lines as Exported <span class="warning">(to modify a line flagged as exported, you will need to delete the whole transaction and re-transfert it into accounting)</span>
+NotifiedValidationDate=Validate and Lock the exported entries not yet already locked <span class="warning">(same effect than the "%s" feature, modification and deletion of the lines will DEFINITELY not be possible)</span>
+NotifiedExportFull=Export documents ?
 DateValidationAndLock=Date validation and lock
 ConfirmExportFile=Confirmation of the generation of the accounting export file ?
 ExportDraftJournal=Export draft journal
@@ -372,7 +394,7 @@ ChartofaccountsId=Chart of accounts Id
 ## Tools - Init accounting account on product / service
 InitAccountancy=Init accountancy
 InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accounting account defined for sales and purchases.
-DefaultBindingDesc=This page can be used to set a default account to use to link transactions record about payment salaries, donation, taxes and vat when no specific accounting account were already set.
+DefaultBindingDesc=This page can be used to set the default accounts (from the chart of account) to use to link business objects with an account, like payment salaries, donation, taxes and VAT, when no specific account were already set.
 DefaultClosureDesc=This page can be used to set parameters used for accounting closures.
 Options=Options
 OptionModeProductSell=Mode sales
@@ -398,12 +420,12 @@ SaleLocal=Local sale
 SaleExport=Export sale
 SaleEEC=Sale in EEC
 SaleEECWithVAT=Sale in EEC with a VAT not null, so we suppose this is NOT an intracommunautary sale and the suggested account is the standard product account.
-SaleEECWithoutVATNumber=Sale in EEC with no VAT but the VAT ID of thirdparty is not defined. We fallback on the product account for standard sales. You can fix the VAT ID of thirdparty or the product account if needed.
+SaleEECWithoutVATNumber=Sale in EEC with no VAT but the VAT ID of thirdparty is not defined. We fall back on the account for standard sales. You can fix the VAT ID of the thirdparty, or change the product account suggested for binding if needed.
 ForbiddenTransactionAlreadyExported=Forbidden: The transaction has been validated and/or exported.
 ForbiddenTransactionAlreadyValidated=Forbidden: The transaction has been validated.
 ## Dictionary
 Range=Range of accounting account
-Calculated=Calculated
+Calculated=Arvutatud
 Formula=Formula
 
 ## Reconcile
@@ -423,8 +445,8 @@ AccountancyUnletteringModifiedSuccessfully=%s unreconcile successfully modified
 ConfirmMassUnletteringAuto=Bulk auto unreconcile confirmation
 ConfirmMassUnletteringManual=Bulk manual unreconcile confirmation
 ConfirmMassUnletteringQuestion=Are you sure you want to unreconcile the %s selected record(s)?
-ConfirmMassDeleteBookkeepingWriting=Bulk Delete confirmation
-ConfirmMassDeleteBookkeepingWritingQuestion=This will delete the transaction from the accounting (all lines related to the same transaction will be deleted) Are you sure you want to delete the %s selected record(s)?
+ConfirmMassDeleteBookkeepingWriting=Hulgikustutamise kinnitus
+ConfirmMassDeleteBookkeepingWritingQuestion=This will delete the transaction from the accounting (all line entries related to the same transaction will be deleted). Are you sure you want to delete the %s selected entries?
 
 ## Error
 SomeMandatoryStepsOfSetupWereNotDone=Some mandatory steps of setup was not done, please complete them
@@ -437,11 +459,12 @@ NoJournalDefined=No journal defined
 Binded=Lines bound
 ToBind=Lines to bind
 UseMenuToSetBindindManualy=Lines not yet bound, use menu <a href="%s">%s</a> to make the binding manually
-SorryThisModuleIsNotCompatibleWithTheExperimentalFeatureOfSituationInvoices=Sorry this module is not compatible with the experimental feature of situation invoices
+SorryThisModuleIsNotCompatibleWithTheExperimentalFeatureOfSituationInvoices=Note: this module or page is not completely compatible with the experimental feature of situation invoices. Some data may be wrong.
 AccountancyErrorMismatchLetterCode=Mismatch in reconcile code
 AccountancyErrorMismatchBalanceAmount=The balance (%s) is not equal to 0
 AccountancyErrorLetteringBookkeeping=Errors have occurred concerning the transactions: %s
 ErrorAccountNumberAlreadyExists=The accounting number %s already exists
+ErrorArchiveAddFile=Can't put "%s" file in archive
 
 ## Import
 ImportAccountingEntries=Accounting entries
@@ -466,7 +489,9 @@ FECFormatMulticurrencyAmount=Multicurrency amount (Montantdevise)
 FECFormatMulticurrencyCode=Multicurrency code (Idevise)
 
 DateExport=Date export
-WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manually in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate.
+WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contain transactions modified manually in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate.
 ExpenseReportJournal=Expense Report Journal
+DocsAlreadyExportedAreIncluded=Docs already exported are included
+ClickToShowAlreadyExportedLines=Click to show already exported lines
 
 NAccounts=%s accounts
diff --git a/htdocs/langs/et_EE/admin.lang b/htdocs/langs/et_EE/admin.lang
index 352c8f34836..4cd18ad1e01 100644
--- a/htdocs/langs/et_EE/admin.lang
+++ b/htdocs/langs/et_EE/admin.lang
@@ -58,7 +58,7 @@ ExternalUsers=Välised kasutajad
 UserInterface=User interface
 GUISetup=Kuva
 SetupArea=Seadistamine
-UploadNewTemplate=Upload new template(s)
+UploadNewTemplate=Laadi üles uus mall(id)
 FormToTestFileUploadForm=Failide üleslaadimise teistimiseks kasutatav vorm (vastavalt seadistustele)
 ModuleMustBeEnabled=The module/application <b>%s</b> must be enabled
 ModuleIsEnabled=The module/application <b>%s</b> has been enabled
@@ -86,7 +86,7 @@ NumberOfKeyToSearch=Number of characters to trigger search: %s
 NumberOfBytes=Number of Bytes
 SearchString=Otsingutekst
 NotAvailableWhenAjaxDisabled=Ei ole saadaval, kui Ajax on välja lülitatud
-AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a project linked to another third party
+AllowToSelectProjectFromOtherCompany=Kolmanda osapoole dokumendil saab valida teise kolmanda osapoolega seotud projekti
 TimesheetPreventAfterFollowingMonths=Prevent recording time spent after the following number of months
 JavascriptDisabled=JavaScript on välja lülitatud
 UsePreviewTabs=Kasuta eelvaate sakke
@@ -494,11 +494,11 @@ DisplayCompanyInfo=Kuva ettevõtte aadressi
 DisplayCompanyManagers=Kuva haldajate nimed
 DisplayCompanyInfoAndManagers=Kuva ettevõtte aadress ja haldaja nimed
 EnableAndSetupModuleCron=If you want to have this recurring invoice generated automatically, module *%s* must be enabled and correctly setup. Otherwise, generation of invoices must be done manually from this template using the *Create* button. Note that even if you enabled automatic generation, you can still safely launch manual generation. Generation of duplicates for the same period is not possible.
-ModuleCompanyCodeCustomerAquarium=%s followed by customer code for a customer accounting code
+ModuleCompanyCodeCustomerAquarium=%s, millele järgneb kliendi kood kliendi raamatupidamiskoodi jaoks
 ModuleCompanyCodeSupplierAquarium=%s followed by vendor code for a vendor accounting code
 ModuleCompanyCodePanicum=Return an empty accounting code.
 ModuleCompanyCodeDigitaria=Returns a compound accounting code according to the name of the third party. The code consists of a prefix that can be defined in the first position followed by the number of characters defined in the third party code.
-ModuleCompanyCodeCustomerDigitaria=%s followed by the truncated customer name by the number of characters: %s for the customer accounting code.
+ModuleCompanyCodeCustomerDigitaria=%s, millele järgneb kärbitud kliendinimi märkide arvuga: %s kliendi raamatupidamiskoodi jaoks.
 ModuleCompanyCodeSupplierDigitaria=%s followed by the truncated supplier name by the number of characters: %s for the supplier accounting code.
 Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
@@ -547,8 +547,8 @@ Module0Name=Kasutajad ja grupid
 Module0Desc=Users / Employees and Groups management
 Module1Name=Kolmandad isikud
 Module1Desc=Ettevõtete ja kontaktide haldamine (kliendid, huvilised ...)
-Module2Name=Äritegevus
-Module2Desc=Äritegevuse seadistamine
+Module2Name=Pakkumised
+Module2Desc=Pakkumiste seadistamine
 Module10Name=Raamatupidamine (lihtsustatud)
 Module10Desc=Simple accounting reports (journals, turnover) based on database content. Does not use any ledger table.
 Module20Name=Pakkumised
@@ -634,8 +634,8 @@ Module700Name=Annetused
 Module700Desc=Annetuste haldamine
 Module770Name=Kulude aruanne
 Module770Desc=Manage expense reports claims (transportation, meal, ...)
-Module1120Name=Vendor Commercial Proposals
-Module1120Desc=Request vendor commercial proposal and prices
+Module1120Name=Müüja äripakkumised
+Module1120Desc=Küsige müüjalt pakkumist ja hindu
 Module1200Name=Mantis
 Module1200Desc=Mantise integratsioon
 Module1520Name=Document Generation
@@ -713,9 +713,9 @@ Module66000Name=OAuth2 token management
 Module66000Desc=Provide a tool to generate and manage OAuth2 tokens. The token can then be used by some other modules.
 Module94160Name=Receptions
 ##### Permissions #####
-Permission11=Read customer invoices (and payments)
+Permission11=Vaata kliendi arveid (ja makseid)
 Permission12=Müügiarvete loomine/toimetamine
-Permission13=Invalidate customer invoices
+Permission13=Klientide arvete kehtetuks tunnistamine
 Permission14=Müügiarvete kinnitamine
 Permission15=Müügiarvete saatmine e-postiga
 Permission16=Müügiarvetega seotud maksete loomine
@@ -937,7 +937,7 @@ Permission1102=Create/modify delivery receipts
 Permission1104=Validate delivery receipts
 Permission1109=Delete delivery receipts
 Permission1121=Read supplier proposals
-Permission1122=Create/modify supplier proposals
+Permission1122=Loo/muutke tarnija hinnapakkumisi
 Permission1123=Validate supplier proposals
 Permission1124=Send supplier proposals
 Permission1125=Delete supplier proposals
@@ -1283,7 +1283,7 @@ TriggerDisabledByName=Selles failis olevaid trigereid saab blokeerida <b>-NORUN<
 TriggerDisabledAsModuleDisabled=Selles failis olevad trigerid on blokeeritud, kuna moodul <b>%s</b> on blokeeritud.
 TriggerAlwaysActive=Selles failis olevad trigerid on alati aktiivsed hoolimata aktiveeritud Dolibarri moodulitest.
 TriggerActiveAsModuleActive=Selles failis olevad trigerid on aktiivsed, kuna moodul <b>%s</b> on aktiivne.
-GeneratedPasswordDesc=Choose the method to be used for auto-generated passwords.
+GeneratedPasswordDesc=Valige automaatselt genereeritud paroolide jaoks kasutatav meetod.
 DictionaryDesc=Insert all reference data. You can add your values to the default.
 ConstDesc=This page allows you to edit (override) parameters not available in other pages. These are mostly reserved parameters for developers/advanced troubleshooting only.
 MiscellaneousOptions=Miscellaneous options
@@ -1426,7 +1426,7 @@ HRMSetup=HRM module setup
 ##### Company setup #####
 CompanySetup=Ettevõtete mooduli seadistamine
 CompanyCodeChecker=Options for automatic generation of customer/vendor codes
-AccountCodeManager=Options for automatic generation of customer/vendor accounting codes
+AccountCodeManager=Kliendi/müüja raamatupidamiskoodide automaatse genereerimise võimalused
 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.
@@ -1509,11 +1509,12 @@ WatermarkOnDraftContractCards=Vesimärk lepingu mustanditel (mitte midagi, kui t
 MembersSetup=Liikmete mooduli seadistamine
 MemberMainOptions=Põhilised seaded
 MemberCodeChecker=Options for automatic generation of member codes
-AdherentLoginRequired= Halda iga liikme kasutajanime
+AdherentLoginRequired=Manage a login/password for each member
+AdherentLoginRequiredDesc=Add a value for a login and a password on the member file. If the member is linked to a user, updating the member login and password will also update the user login and password.
 AdherentMailRequired=Email required to create a new member
 MemberSendInformationByMailByDefault=Liikmetele e-kirja kinnituse saatmise (kinnitamise või uue tellimuse puhul) märkeruut on vaikimisi valitud
 MemberCreateAnExternalUserForSubscriptionValidated=Create an external user login for each new member subscription validated
-VisitorCanChooseItsPaymentMode=Visitor can choose from any available payment modes
+VisitorCanChooseItsPaymentMode=Külastaja saab valida mis tahes saadaolevate makseviiside vahel
 MEMBER_REMINDER_EMAIL=Enable automatic reminder <b>by email</b> of expired subscriptions. Note: Module <strong>%s</strong> must be enabled and correctly setup to send reminders.
 MembersDocModules=Document templates for documents generated from member record
 ##### LDAP setup #####
@@ -1696,7 +1697,7 @@ AutoFillFormFieldBeforeSubmit=Auto fill the description input field with the des
 DoNotAutofillButAutoConcat=Do not autofill the input field with description of product. Description of the product will be concatenated to the entered description automatically.
 DoNotUseDescriptionOfProdut=Description of the product will never be included into the description of lines of documents
 MergePropalProductCard=Activate in product/service Attached Files tab an option to merge product PDF document to proposal PDF azur if product/service is in the proposal
-ViewProductDescInThirdpartyLanguageAbility=Display products descriptions in forms in the language of the third party (otherwise in the language of the user)
+ViewProductDescInThirdpartyLanguageAbility=Kuva toodete kirjeldused vormides kolmanda osapoole keeles (muul juhul kasutaja keeles)
 UseSearchToSelectProductTooltip=Also if you have a large number of products (> 100 000), you can increase speed by setting constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectProduct=Wait until you press a key before loading content of product combo list (This may increase performance if you have a large number of products, but it is less convenient)
 SetDefaultBarcodeTypeProducts=Vaikimisi vöötkoodi tüüp toodetel
@@ -2054,7 +2055,7 @@ AddOtherPagesOrServices=Add other pages or services
 AddModels=Add document or numbering templates
 AddSubstitutions=Add keys substitutions
 DetectionNotPossible=Detection not possible
-UrlToGetKeyToUseAPIs=Url to get token to use API (once token has been received it is saved in database user table and must be provided on each API call)
+UrlToGetKeyToUseAPIs=URL API kasutamiseks loa saamiseks (kui token on vastu võetud, salvestatakse see andmebaasi kasutajate tabelisse ja see tuleb esitada igal API-kõnel)
 ListOfAvailableAPIs=List of available APIs
 activateModuleDependNotSatisfied=Module "%s" depends on module "%s", that is missing, so module "%1$s" may not work correctly. Please install module "%2$s" or disable module "%1$s" if you want to be safe from any surprise
 CommandIsNotInsideAllowedCommands=The command you are trying to run is not in the list of allowed commands defined in parameter <strong>$dolibarr_main_restrict_os_commands</strong> in the <strong>conf.php</strong> file.
@@ -2076,6 +2077,10 @@ MAIN_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
 DOC_SHOW_FIRST_SALES_REP=Show first sales representative
 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_GENERATE_DOCUMENTS_SUPPLIER_PROPOSAL_WITHOUT_UNIT_PRICE=Hide the unit price column on quotation requests
+MAIN_GENERATE_DOCUMENTS_SUPPLIER_PROPOSAL_WITHOUT_TOTAL_COLUMN=Hide the total price column on quotation requests
+MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_UNIT_PRICE=Hide the unit price column on purchase orders
+MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_TOTAL_COLUMN=Hide the total price column on puchase orders
 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
@@ -2128,9 +2133,9 @@ MaxEmailCollectPerCollect=Max number of emails collected per collect
 TestCollectNow=Test collect
 CollectNow=Collect now
 ConfirmCloneEmailCollector=Are you sure you want to clone the Email collector %s?
-DateLastCollectResult=Date of latest collect try
-DateLastcollectResultOk=Date of latest collect success
-LastResult=Latest result
+DateLastCollectResult=Viimase kogumiskatse kuupäev
+DateLastcollectResultOk=Viimase eduka kogumise kuupäev
+LastResult=Viimane tulemus
 EmailCollectorHideMailHeaders=Do not include the content of email header into the saved content of collected e-mails
 EmailCollectorHideMailHeadersHelp=When enabled, e-mail headers are not added at the end of the email content that is saved as an agenda event.
 EmailCollectorConfirmCollectTitle=Email collect confirmation
@@ -2168,7 +2173,7 @@ OperationParamDesc=Define the rules to use to extract some data or set values to
 OpeningHours=Opening hours
 OpeningHoursDesc=Enter here the regular opening hours of your company.
 ResourceSetup=Configuration of Resource module
-UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
+UseSearchToSelectResource=Kasutage ressursi valimiseks otsinguvormi (mitte ripploendit).
 DisabledResourceLinkUser=Disable feature to link a resource to users
 DisabledResourceLinkContact=Disable feature to link a resource to contacts
 EnableResourceUsedInEventCheck=Prohibit the use of the same resource at the same time in the agenda
@@ -2223,7 +2228,7 @@ BaseOnSabeDavVersion=Based on the library SabreDAV version
 NotAPublicIp=Not a public IP
 MakeAnonymousPing=Make an anonymous Ping '+1' to the Dolibarr foundation server (done 1 time only after installation) to allow the foundation to count the number of Dolibarr installation.
 FeatureNotAvailableWithReceptionModule=Feature not available when module Reception is enabled
-EmailTemplate=Template for email
+EmailTemplate=Meili mall
 EMailsWillHaveMessageID=Emails will have a tag 'References' matching this syntax
 PDF_SHOW_PROJECT=Show project on document
 ShowProjectLabel=Projekti nimi
@@ -2238,9 +2243,9 @@ RssNote=Note: Each RSS feed definition provides a widget that you must enable to
 JumpToBoxes=Jump to Setup -> Widgets
 MeasuringUnitTypeDesc=Use here a value like "size", "surface", "volume", "weight", "time"
 MeasuringScaleDesc=The scale is the number of places you have to move the decimal part to match the default reference unit. For "time" unit type, it is the number of seconds. Values between 80 and 99 are reserved values.
-TemplateAdded=Template added
-TemplateUpdated=Template updated
-TemplateDeleted=Template deleted
+TemplateAdded=Mall lisatud
+TemplateUpdated=Mall on värskendatud
+TemplateDeleted=Mall kustutatud
 MailToSendEventPush=Event reminder email
 SwitchThisForABetterSecurity=Switching this value to %s is recommended for more security
 DictionaryProductNature= Nature of product
@@ -2284,7 +2289,7 @@ 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
+DashboardDisableBlocks=Avatud objektide hulk (töötlemiseks või hilinemiseks) peamisel töölaual
 DashboardDisableBlockAgenda=Disable the thumb for agenda
 DashboardDisableBlockProject=Disable the thumb for projects
 DashboardDisableBlockCustomer=Disable the thumb for customers
@@ -2310,14 +2315,14 @@ API_DISABLE_COMPRESSION=Disable compression of API responses
 EachTerminalHasItsOwnCounter=Each terminal use its own counter.
 FillAndSaveAccountIdAndSecret=Fill and save account ID and secret first
 PreviousHash=Previous hash
-LateWarningAfter="Late" warning after
-TemplateforBusinessCards=Template for a business card in different size
+LateWarningAfter="Hilinenud" hoiatus pärast
+TemplateforBusinessCards=Erinevas suuruses visiitkaardi mall
 InventorySetup= Inventory Setup
 ExportUseLowMemoryMode=Use a low memory mode
 ExportUseLowMemoryModeHelp=Use the low memory mode to generate the dump file (compression is done through a pipe instead of into the PHP memory). This method does not allow to check that the file is complete and error message can't be reported if it fails. Use it if you experience not enough memory errors.
 
 ModuleWebhookName = Webhook
-ModuleWebhookDesc = Interface to catch dolibarr triggers and send data of the event to an URL
+ModuleWebhookDesc = Liides dolibarri päästikute püüdmiseks ja sündmuse andmete saatmiseks URL-ile
 WebhookSetup = Webhook setup
 Settings = Seaded
 WebhookSetupPage = Webhook setup page
@@ -2351,7 +2356,7 @@ DoesNotWorkWithAllThemes=Will not work with all themes
 NoName=No name
 ShowAdvancedOptions= Show advanced options
 HideAdvancedoptions= Hide advanced options
-CIDLookupURL=The module brings an URL that can be used by an external tool to get the name of a thirdparty or contact from its phone number. URL to use is:
+CIDLookupURL=Moodul toob kaasa URL-i, mille abil saab väline tööriist saada oma telefoninumbrilt kolmanda osapoole või kontakti nime. Kasutatav URL on:
 OauthNotAvailableForAllAndHadToBeCreatedBefore=OAUTH2 authentication is not available for all hosts, and a token with the right permissions must have been created upstream with the OAUTH module
 MAIN_MAIL_SMTPS_OAUTH_SERVICE=OAUTH2 authentication service
 DontForgetCreateTokenOauthMod=A token with the right permissions must have been created upstream with the OAUTH module
@@ -2361,7 +2366,7 @@ UseOauth=Use a OAUTH token
 Images=Images
 MaxNumberOfImagesInGetPost=Max number of images allowed in a HTML field submitted in a form
 MaxNumberOfPostOnPublicPagesByIP=Max number of posts on public pages with the same IP address in a month
-CIDLookupURL=The module brings an URL that can be used by an external tool to get the name of a thirdparty or contact from its phone number. URL to use is:
+CIDLookupURL=Moodul toob kaasa URL-i, mille abil saab väline tööriist saada oma telefoninumbrilt kolmanda osapoole või kontakti nime. Kasutatav URL on:
 ScriptIsEmpty=The script is empty
 ShowHideTheNRequests=Show/hide the %s SQL request(s)
 DefinedAPathForAntivirusCommandIntoSetup=Define a path for an antivirus program into <b>%s</b>
@@ -2395,9 +2400,9 @@ MAIN_CHECKBOX_LEFT_COLUMN=Show the column for field and line selection on the le
 NotAvailableByDefaultEnabledOnModuleActivation=Not created by default. Created on module activation only.
 CSSPage=CSS Style
 Defaultfortype=Vaikimisi
-DefaultForTypeDesc=Template used by default when creating a new email for the template type
+DefaultForTypeDesc=Mallitüübi jaoks uue meilisõnumi loomisel vaikimisi kasutatav mall
 OptionXShouldBeEnabledInModuleY=Option "<b>%s</b>" should be enabled into module <b>%s</b>
 OptionXIsCorrectlyEnabledInModuleY=Option "<b>%s</b>" is enabled into module <b>%s</b>
 AtBottomOfPage=At bottom of page
 FailedAuth=failed authentications
-MaxNumberOfFailedAuth=Max number of failed authentication in 24h to disable login.
+MaxNumberOfFailedAuth=Max number of failed authentication in 24h to deny login.
diff --git a/htdocs/langs/et_EE/banks.lang b/htdocs/langs/et_EE/banks.lang
index 3f1dac27b4b..35061a37a19 100644
--- a/htdocs/langs/et_EE/banks.lang
+++ b/htdocs/langs/et_EE/banks.lang
@@ -111,7 +111,7 @@ BankTransferPayment=Credit Transfer payment
 SocialContributionPayment=Sotsiaalmaksu makse
 BankTransfer=Krediidiülekanne
 BankTransfers=Kreeditülekanded
-MenuBankInternalTransfer=Internal transfer
+MenuBankInternalTransfer=Sisemine ülekanne
 TransferDesc=Kasutage sisemist ülekannet, et teha ülekanne ühelt kontolt teisele, rakendus kirjutab kaks kirjet: deebet lähtekontole ja kreedit sihtkontole. Selle tehingu puhul kasutatakse sama summat, märget ja kuupäeva.
 TransferFrom=Kust
 TransferTo=Kuhu
@@ -148,7 +148,7 @@ ShowAllAccounts=Näita kõigil kontodel
 FutureTransaction=Tulevane tehing. Ei ole võimalik vastavusse viia.
 SelectChequeTransactionAndGenerate=Vali välja tšekid, mida lisada tšeki deponeerimise kinnitusse ning klõpsa "Loo" nupul.
 SelectPaymentTransactionAndGenerate=Select/filter the documents which are to be included in the %s deposit receipt. Then, click on "Create".
-InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value
+InputReceiptNumber=Valige lepitusmenetlusega seotud pangaväljavõte. Kasutage sorteeritavat arvväärtust
 InputReceiptNumberBis=YYYYMM or YYYYMMDD
 EventualyAddCategory=Lõpuks vali kategooria, mille alla kanded klassifitseerida
 ToConciliate=To reconcile?
diff --git a/htdocs/langs/et_EE/bills.lang b/htdocs/langs/et_EE/bills.lang
index c47c78304a7..3773973cf2a 100644
--- a/htdocs/langs/et_EE/bills.lang
+++ b/htdocs/langs/et_EE/bills.lang
@@ -165,19 +165,19 @@ BillTo=Kellele
 ShippingTo=Shipping to
 ActionsOnBill=Tegevused arvel
 ActionsOnBillRec=Actions on recurring invoice
-RecurringInvoiceTemplate=Template / Recurring invoice
-NoQualifiedRecurringInvoiceTemplateFound=No recurring template invoice qualified for generation.
+RecurringInvoiceTemplate=Mall / Korduv arve
+NoQualifiedRecurringInvoiceTemplateFound=Korduvat mallarvet pole genereerimiseks kvalifitseeritud.
 FoundXQualifiedRecurringInvoiceTemplate=Found %s recurring template invoice(s) qualified for generation.
 NotARecurringInvoiceTemplate=Not a recurring template invoice
 NewBill=Uus arve
 LastBills=Viimased %s arvet
-LatestTemplateInvoices=Latest %s template invoices
-LatestCustomerTemplateInvoices=Latest %s customer template invoices
-LatestSupplierTemplateInvoices=Latest %s vendor template invoices
+LatestTemplateInvoices=Viimased %s mallarved
+LatestCustomerTemplateInvoices=Viimased %s kliendi mallarved
+LatestSupplierTemplateInvoices=Viimased %s hankija malliarved
 LastCustomersBills=Latest %s customer invoices
-LastSuppliersBills=Latest %s vendor invoices
+LastSuppliersBills=Viimased %s hankija arved
 AllBills=Kõik arved
-AllCustomerTemplateInvoices=All template invoices
+AllCustomerTemplateInvoices=Kõik mall arved
 OtherBills=Muud arved
 DraftBills=Arve mustandid
 CustomersDraftInvoices=Mustand müügiarved
@@ -272,7 +272,7 @@ RemainderToBill=Ülejääk, mille eest arve esitada
 SendBillByMail=Saada arve e-posti teel
 SendReminderBillByMail=Saada meeldetuletus e-posti teel
 RelatedCommercialProposals=Seotud pakkumised
-RelatedRecurringCustomerInvoices=Related recurring customer invoices
+RelatedRecurringCustomerInvoices=Seotud korduvad klientide arved
 MenuToValid=Kehtivatele
 DateMaxPayment=Maksetähtaeg
 DateInvoice=Arve kuupäev
@@ -300,9 +300,9 @@ Repeatables=Mallid
 ChangeIntoRepeatableInvoice=Muuda arve malliks
 CreateRepeatableInvoice=Loo arve mall
 CreateFromRepeatableInvoice=Loo arve mallist
-CustomersInvoicesAndInvoiceLines=Customer invoices and invoice details
+CustomersInvoicesAndInvoiceLines=Klientide arved ja arve üksikasjad
 CustomersInvoicesAndPayments=Müügiarved ja maksed
-ExportDataset_invoice_1=Customer invoices and invoice details
+ExportDataset_invoice_1=Klientide arved ja arve üksikasjad
 ExportDataset_invoice_2=Müügiarved ja maksed
 ProformaBill=Proforma arve:
 Reduction=Vähendus
@@ -376,9 +376,9 @@ TotalOfTwoDiscountMustEqualsOriginal=The total of the two new discounts must be
 ConfirmRemoveDiscount=Are you sure you want to remove this discount?
 RelatedBill=Seotud arve
 RelatedBills=Seotud arved
-RelatedCustomerInvoices=Related customer invoices
-RelatedSupplierInvoices=Related vendor invoices
-LatestRelatedBill=Latest related invoice
+RelatedCustomerInvoices=Seotud klientide arved
+RelatedSupplierInvoices=Seotud hankijate arved
+LatestRelatedBill=Viimane seotud arve
 WarningBillExist=Hoiatus, üks või rohkem arvet on juba olemas
 MergingPDFTool=Merging PDF tool
 AmountPaymentDistributedOnInvoice=Payment amount distributed on invoice
@@ -399,8 +399,8 @@ FrequencyUnit=Frequency unit
 toolTipFrequency=Examples:<br><b>Set 7, Day</b>: give a new invoice every 7 days<br><b>Set 3, Month</b>: give a new invoice every 3 month
 NextDateToExecution=Date for next invoice generation
 NextDateToExecutionShort=Date next gen.
-DateLastGeneration=Date of latest generation
-DateLastGenerationShort=Date latest gen.
+DateLastGeneration=Viimase genereerimise kuupäev
+DateLastGenerationShort=Kuupäev viimane gen.
 MaxPeriodNumber=Max. number of invoice generation
 NbOfGenerationDone=Number of invoice generation already done
 NbOfGenerationOfRecordDone=Number of record generation already done
@@ -417,8 +417,8 @@ ViewAvailableGlobalDiscounts=View available discounts
 GroupPaymentsByModOnReports=Group payments by mode on reports
 # PaymentConditions
 Statut=Staatus
-PaymentConditionShortRECEP=Due Upon Receipt
-PaymentConditionRECEP=Due Upon Receipt
+PaymentConditionShortRECEP=Tähtaeg kättesaamisel
+PaymentConditionRECEP=Tähtaeg kättesaamisel
 PaymentConditionShort30D=30 päeva
 PaymentCondition30D=30 päeva
 PaymentConditionShort30DENDMONTH=30 päeva kuu lõpust
@@ -608,8 +608,8 @@ updatePriceNextInvoiceErrorUpdateline=Error: update price on invoice line: %s
 ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
 ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
 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?
+DeleteRepeatableInvoice=Kustuta arve mall
+ConfirmDeleteRepeatableInvoice=Kas olete kindel, et soovite malli arve kustutada?
 CreateOneBillByThird=Create one invoice per third party (otherwise, one invoice per selected object)
 BillCreated=%s invoice(s) generated
 BillXCreated=Invoice %s generated
diff --git a/htdocs/langs/et_EE/boxes.lang b/htdocs/langs/et_EE/boxes.lang
index 27bdd641b97..8ef7dd45130 100644
--- a/htdocs/langs/et_EE/boxes.lang
+++ b/htdocs/langs/et_EE/boxes.lang
@@ -5,64 +5,64 @@ BoxLastRssInfos=RSS Information
 BoxLastProducts=Latest %s Products/Services
 BoxProductsAlertStock=Stock alerts for products
 BoxLastProductsInContract=Latest %s contracted products/services
-BoxLastSupplierBills=Latest Vendor invoices
-BoxLastCustomerBills=Latest Customer invoices
+BoxLastSupplierBills=Viimased hankija arved
+BoxLastCustomerBills=Viimased klientide arved
 BoxOldestUnpaidCustomerBills=Oldest unpaid customer invoices
 BoxOldestUnpaidSupplierBills=Oldest unpaid vendor invoices
-BoxLastProposals=Latest commercial proposals
-BoxLastProspects=Latest modified prospects
-BoxLastCustomers=Latest modified customers
-BoxLastSuppliers=Latest modified suppliers
-BoxLastCustomerOrders=Latest sales orders
-BoxLastActions=Latest actions
-BoxLastContracts=Latest contracts
-BoxLastContacts=Latest contacts/addresses
-BoxLastMembers=Latest members
-BoxLastModifiedMembers=Latest modified members
-BoxLastMembersSubscriptions=Latest member subscriptions
-BoxFicheInter=Latest interventions
+BoxLastProposals=Viimased äripakkumised
+BoxLastProspects=Viimased muudetud väljavaated
+BoxLastCustomers=Viimased muudetud kliendid
+BoxLastSuppliers=Viimased muudetud tarnijad
+BoxLastCustomerOrders=Viimased müügitellimused
+BoxLastActions=Viimased toimingud
+BoxLastContracts=Viimased lepingud
+BoxLastContacts=Viimased kontaktid/aadressid
+BoxLastMembers=Viimased liikmed
+BoxLastModifiedMembers=Viimased muudetud liikmed
+BoxLastMembersSubscriptions=Viimased liikmetellimused
+BoxFicheInter=Viimased sekkumised
 BoxCurrentAccounts=Open accounts balance
 BoxTitleMemberNextBirthdays=Birthdays of this month (members)
 BoxTitleMembersByType=Members by type and status
 BoxTitleMembersByTags=Members by tags and status
 BoxTitleMembersSubscriptionsByYear=Members Subscriptions by year
-BoxTitleLastRssInfos=Latest %s news from %s
+BoxTitleLastRssInfos=Viimased %s uudised kasutajalt %s
 BoxTitleLastProducts=Products/Services: last %s modified
 BoxTitleProductsAlertStock=Products: stock alert
-BoxTitleLastSuppliers=Latest %s recorded suppliers
+BoxTitleLastSuppliers=Viimased %s registreeritud tarnijad
 BoxTitleLastModifiedSuppliers=Vendors: last %s modified
 BoxTitleLastModifiedCustomers=Customers: last %s modified
-BoxTitleLastCustomersOrProspects=Latest %s customers or prospects
-BoxTitleLastCustomerBills=Latest %s modified Customer invoices
-BoxTitleLastSupplierBills=Latest %s modified Vendor invoices
+BoxTitleLastCustomersOrProspects=Viimased %s kliendid või potentsiaalsed kliendid
+BoxTitleLastCustomerBills=Viimased %s muudetud kliendi arved
+BoxTitleLastSupplierBills=Viimased %s muudetud hankija arved
 BoxTitleLastModifiedProspects=Prospects: last %s modified
-BoxTitleLastModifiedMembers=Latest %s members
-BoxTitleLastFicheInter=Latest %s modified interventions
-BoxTitleOldestUnpaidCustomerBills=Customer Invoices: oldest %s unpaid
+BoxTitleLastModifiedMembers=Viimased %s liikmed
+BoxTitleLastFicheInter=Viimased %s muudetud sekkumised
+BoxTitleOldestUnpaidCustomerBills=Kliendiarved: vanimad %s tasumata
 BoxTitleOldestUnpaidSupplierBills=Vendor Invoices: oldest %s unpaid
 BoxTitleCurrentAccounts=Open Accounts: balances
 BoxTitleSupplierOrdersAwaitingReception=Supplier orders awaiting reception
 BoxTitleLastModifiedContacts=Contacts/Addresses: last %s modified
-BoxMyLastBookmarks=Bookmarks: latest %s
+BoxMyLastBookmarks=Järjehoidjad: uusim %s
 BoxOldestExpiredServices=Vanimad aktiivsed aegunud teenused
 BoxOldestActions=Oldest events to do
-BoxLastExpiredServices=Latest %s oldest contacts with active expired services
-BoxTitleLastActionsToDo=Latest %s actions to do
+BoxLastExpiredServices=Viimased %s vanimad kontaktid aktiivsete aegunud teenustega
+BoxTitleLastActionsToDo=Viimased %s toimingud, mida teha
 BoxTitleOldestActionsToDo=Oldest %s events to do, not completed
 BoxTitleFutureActions=The next %s upcoming events
-BoxTitleLastContracts=Latest %s contracts which were modified
-BoxTitleLastModifiedDonations=Latest %s donations which were modified
-BoxTitleLastModifiedExpenses=Latest %s expense reports which were modified
-BoxTitleLatestModifiedBoms=Latest %s BOMs which were modified
-BoxTitleLatestModifiedMos=Latest %s Manufacturing Orders which were modified
+BoxTitleLastContracts=Viimased %s lepingud, mida muudeti
+BoxTitleLastModifiedDonations=Viimased %s annetused, mida muudeti
+BoxTitleLastModifiedExpenses=Viimased %s kuluaruanded, mida muudeti
+BoxTitleLatestModifiedBoms=Viimased %s BOM-id, mida muudeti
+BoxTitleLatestModifiedMos=Viimased %s tootmistellimused, mida muudeti
 BoxTitleLastOutstandingBillReached=Customers with maximum outstanding exceeded
 BoxGlobalActivity=Üldine tegevus (arved, pakkumised, tellimused)
 BoxGoodCustomers=Good customers
 BoxTitleGoodCustomers=%s Good customers
 BoxScheduledJobs=Plaanitud käivitused
 BoxTitleFunnelOfProspection=Lead funnel
-FailedToRefreshDataInfoNotUpToDate=Failed to refresh RSS flux. Latest successful refresh date: %s
-LastRefreshDate=Latest refresh date
+FailedToRefreshDataInfoNotUpToDate=RSS-voo värskendamine ebaõnnestus. Viimane õnnestunud värskenduskuupäev: %s
+LastRefreshDate=Viimane värskenduskuupäev
 NoRecordedBookmarks=Järjehoidjaid pole määratletud.
 ClickToAdd=Klõpsa lisamiseks siia.
 NoRecordedCustomers=Kliente pole salvestatud
@@ -70,8 +70,8 @@ NoRecordedContacts=Kontakte pole salvestatud
 NoActionsToDo=Täitmist vajavaid tegevusi ei ole
 NoRecordedOrders=No recorded sales orders
 NoRecordedProposals=Pakkumisi pole salvestatud
-NoRecordedInvoices=No recorded customer invoices
-NoUnpaidCustomerBills=No unpaid customer invoices
+NoRecordedInvoices=Salvestatud kliendiarveid pole
+NoUnpaidCustomerBills=Tasumata kliendiarveid pole
 NoUnpaidSupplierBills=No unpaid vendor invoices
 NoModifiedSupplierBills=No recorded vendor invoices
 NoRecordedProducts=Tooteid/teenuseid pole salvestatud
@@ -79,10 +79,10 @@ NoRecordedProspects=Huvilisi pole salvestatud
 NoContractedProducts=Lepingulisi tooteid/teenuseid ei ole
 NoRecordedContracts=Lepinguid pole salvestatud
 NoRecordedInterventions=Sekkumisi pole salvestatud
-BoxLatestSupplierOrders=Latest purchase orders
-BoxLatestSupplierOrdersAwaitingReception=Latest Purchase Orders (with a pending reception)
+BoxLatestSupplierOrders=Viimased ostutellimused
+BoxLatestSupplierOrdersAwaitingReception=Viimased ostutellimused (ootel vastuvõtuga)
 NoSupplierOrder=No recorded purchase order
-BoxCustomersInvoicesPerMonth=Customer Invoices per month
+BoxCustomersInvoicesPerMonth=Klientide arved kuus
 BoxSuppliersInvoicesPerMonth=Vendor Invoices per month
 BoxCustomersOrdersPerMonth=Sales Orders per month
 BoxSuppliersOrdersPerMonth=Vendor Orders per month
@@ -92,28 +92,28 @@ BoxProductDistribution=Products/Services Distribution
 ForObject=On %s
 BoxTitleLastModifiedSupplierBills=Vendor Invoices: last %s modified
 BoxTitleLatestModifiedSupplierOrders=Vendor Orders: last %s modified
-BoxTitleLastModifiedCustomerBills=Customer Invoices: last %s modified
+BoxTitleLastModifiedCustomerBills=Kliendiarved: viimati %s muudetud
 BoxTitleLastModifiedCustomerOrders=Sales Orders: last %s modified
 BoxTitleLastModifiedPropals=Viimased %s muudetud pakkumised
-BoxTitleLatestModifiedJobPositions=Latest %s modified job positions
-BoxTitleLatestModifiedCandidatures=Latest %s modified job applications
+BoxTitleLatestModifiedJobPositions=Viimased %s muudetud ametikohad
+BoxTitleLatestModifiedCandidatures=Viimased %s muudetud tööavaldused
 ForCustomersInvoices=Müügiarved
 ForCustomersOrders=Müügiarved
 ForProposals=Pakkumised
-LastXMonthRolling=The latest %s month rolling
+LastXMonthRolling=Viimane %s kuu jooksev
 ChooseBoxToAdd=Add widget to your dashboard
 BoxAdded=Widget was added in your dashboard
 BoxTitleUserBirthdaysOfMonth=Birthdays of this month (users)
-BoxLastManualEntries=Latest record in accountancy entered manually or without source document
-BoxTitleLastManualEntries=%s latest record entered manually or without source document
+BoxLastManualEntries=Viimane raamatupidamiskirje sisestatud käsitsi või ilma algdokumendita
+BoxTitleLastManualEntries=%s viimane kirje sisestatud käsitsi või ilma algdokumendita
 NoRecordedManualEntries=No manual entries record in accountancy
 BoxSuspenseAccount=Count accountancy operation with suspense account
 BoxTitleSuspenseAccount=Number of unallocated lines
 NumberOfLinesInSuspenseAccount=Number of line in suspense account
 SuspenseAccountNotDefined=Suspense account isn't defined
 BoxLastCustomerShipments=Last customer shipments
-BoxTitleLastCustomerShipments=Latest %s customer shipments
-BoxTitleLastLeaveRequests=Latest %s modified leave requests
+BoxTitleLastCustomerShipments=Viimased %s kliendisaadetised
+BoxTitleLastLeaveRequests=Viimased %s muudetud puhkusetaotlused
 NoRecordedShipments=No recorded customer shipment
 BoxCustomersOutstandingBillReached=Customers with oustanding limit reached
 # Pages
diff --git a/htdocs/langs/et_EE/cashdesk.lang b/htdocs/langs/et_EE/cashdesk.lang
index 444fcfbeb85..7134f608ba1 100644
--- a/htdocs/langs/et_EE/cashdesk.lang
+++ b/htdocs/langs/et_EE/cashdesk.lang
@@ -50,8 +50,8 @@ Footer=Footer
 AmountAtEndOfPeriod=Amount at end of period (day, month or year)
 TheoricalAmount=Theorical amount
 RealAmount=Real amount
-CashFence=Cash desk closing
-CashFenceDone=Cash desk closing done for the period
+CashFence=Cash box closing
+CashFenceDone=Cash box closing done for the period
 NbOfInvoices=Arveid
 Paymentnumpad=Type of Pad to enter payment
 Numberspad=Numbers Pad
@@ -102,13 +102,13 @@ CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal numb
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
 SaleStartedAt=Sale started at %s
-ControlCashOpening=Open the "Control cash" popup when opening the POS
-CloseCashFence=Close cash desk control
+ControlCashOpening=Open the "Control cash box" popup when opening the POS
+CloseCashFence=Close cash box control
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
 OrderPrinterToUse=Order printer to use
-MainTemplateToUse=Main template to use
-OrderTemplateToUse=Order template to use
+MainTemplateToUse=Peamine kasutatav mall
+OrderTemplateToUse=Tellimuse mall kasutamiseks
 BarRestaurant=Bar Restaurant
 AutoOrder=Order by the customer himself
 RestaurantMenu=Menu
@@ -134,3 +134,14 @@ PrintWithoutDetailsButton=Add "Print without details" button
 PrintWithoutDetailsLabelDefault=Line label by default on printing without details
 PrintWithoutDetails=Print without details
 YearNotDefined=Year is not defined
+TakeposBarcodeRuleToInsertProduct=Barcode rule to insert product
+TakeposBarcodeRuleToInsertProductDesc=Rule to extract the product reference + a quantity from a scanned barcode.<br>If empty (default value), application will use the full barcode scanned to find the product.<br><br>If defined, syntax must be:<br><b>ref:NB+qu:NB+qd:NB+other:NB</b><br>where NB is the number of characters to use to extract data from the scanned barcode with: <ul><li><b>ref</b> : product reference</li><li><b>qu</b> : quantity to set when inserting item (units)<l/i><li><b>qd</b> : quantity to set when inserting item (decimals)</li><li><b>other</b> : others characters</li></ul>
+AlreadyPrinted=Already printed
+HideCategories=Hide categories
+HideStockOnLine=Hide stock on line
+ShowOnlyProductInStock=Show the products in stock
+ShowCategoryDescription=Show category description
+ShowProductReference=Show reference of products
+UsePriceHT=Use price excl. taxes and not price incl. taxes
+TerminalName=Terminal %s
+TerminalNameDesc=Terminal name
diff --git a/htdocs/langs/et_EE/compta.lang b/htdocs/langs/et_EE/compta.lang
index 95aef416777..d3b8a2cd6db 100644
--- a/htdocs/langs/et_EE/compta.lang
+++ b/htdocs/langs/et_EE/compta.lang
@@ -9,7 +9,7 @@ OptionModeTrueDesc=Selles kontekstis arvutatakse käive maksete põhjal (maksete
 OptionModeVirtualDesc=Selles kontekstis arvutatakse käive arvete põhjal (kinnitamise kuupäev). Kui arvete maksetähtaeg on käes, siis lisatakse arvete summad käibe arvutamisse hoolimata sellest, kas nad on makstud või mitte.
 FeatureIsSupportedInInOutModeOnly=See funktsioon saadaval vaid KREDIIT-DEEBET raamatupidamise režiimis (vt mooduli Raamatupidamine seadistust)
 VATReportBuildWithOptionDefinedInModule=Siin näidatud summade arvutamiseks kasutatakse Maksude mooduli seadistuses kasutatavaid reegleid.
-LTReportBuildWithOptionDefinedInModule=Amounts shown here are calculated using rules defined by Company setup.
+LTReportBuildWithOptionDefinedInModule=Siin näidatud summad on arvutatud ettevõtte seadistustega määratud reeglite alusel.
 Param=Seadistamine
 RemainingAmountPayment=Amount payment remaining:
 Account=Konto
@@ -77,7 +77,7 @@ LabelContrib=Label contribution
 TypeContrib=Type contribution
 MenuSpecialExpenses=Erikulud
 MenuTaxAndDividends=Maksud ja dividendid
-MenuSocialContributions=Social/fiscal taxes
+MenuSocialContributions=Sotsiaal-/fiskaalmaksud
 MenuNewSocialContribution=New social/fiscal tax
 NewSocialContribution=New social/fiscal tax
 AddSocialContribution=Add social/fiscal tax
@@ -115,11 +115,11 @@ VATRefund=Sales tax refund
 NewVATPayment=New sales tax payment
 NewLocalTaxPayment=New tax %s payment
 Refund=Tagasimakse
-SocialContributionsPayments=Social/fiscal taxes payments
+SocialContributionsPayments=Sotsiaal-/fiskaalmaksud
 ShowVatPayment=Näita käibemaksu makset
 TotalToPay=Kokku maksta
 BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted on %s and filtered on 1 bank account (with no other filters)
-CustomerAccountancyCode=Customer accounting code
+CustomerAccountancyCode=Kliendi raamatupidamiskood
 SupplierAccountancyCode=Vendor accounting code
 CustomerAccountancyCodeShort=Cust. account. code
 SupplierAccountancyCodeShort=Sup. account. code
@@ -133,8 +133,8 @@ ByThirdParties=Kolmandate isikute poolt
 ByUserAuthorOfInvoice=Arve koostaja poolt
 CheckReceipt=Deposit slip
 CheckReceiptShort=Deposit slip
-LastCheckReceiptShort=Latest %s deposit slips
-LastPaymentForDepositShort=Latest %s %s deposit slips
+LastCheckReceiptShort=Viimased %s sissemakselehed
+LastPaymentForDepositShort=Viimased %s %s sissemakselehed
 NewCheckReceipt=Uus allahindlus
 NewCheckDeposit=New deposit slip
 NewCheckDepositOn=Loo kviitung kontole deponeerimise eest: %s
@@ -164,11 +164,11 @@ CalcModeDebt=Analysis of known recorded documents
 CalcModeEngagement=Analysis of known recorded payments
 CalcModeBookkeeping=Analysis of data journalized in Bookkeeping Ledger table.
 CalcModeNoBookKeeping=Even if they are not yet accounted in Ledger
-CalcModeLT1= Mode <b>%sRE on customer invoices - suppliers invoices%s</b>
-CalcModeLT1Debt=Mode <b>%sRE on customer invoices%s</b>
+CalcModeLT1= Režiim <b> %sRE klientide arvetel – tarnijate arved%s </b>
+CalcModeLT1Debt=Režiim <b> %sRE klientide arvetel%s </b>
 CalcModeLT1Rec= Mode <b>%sRE on suppliers invoices%s</b>
-CalcModeLT2= Mode <b>%sIRPF on customer invoices - suppliers invoices%s</b>
-CalcModeLT2Debt=Mode <b>%sIRPF on customer invoices%s</b>
+CalcModeLT2= Režiim <b> %sIRPF klientide arvetel – tarnijate arved%s </b>
+CalcModeLT2Debt=Režiim <b> %sIRPF klientide arvetel%s </b>
 CalcModeLT2Rec= Mode <b>%sIRPF on suppliers invoices%s</b>
 AnnualSummaryDueDebtMode=Tulude ja kulude saldo, aasta kokkuvõte
 AnnualSummaryInputOutputMode=Tulude ja kulude saldo, aasta kokkuvõte
@@ -182,8 +182,8 @@ RulesAmountWithTaxIncluded=- Näidatud summad sisaldavad kõiki makse
 RulesAmountWithTaxExcluded=- Amounts of invoices shown are with all taxes excluded
 RulesResultDue=- It includes all invoices, expenses, VAT, donations, salaries, whether they are paid or not.<br>- It is based on the billing date of invoices and on the due date for expenses or tax payments. For salaries, the date of end of period is used.
 RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT, donations and salaries.
-RulesCADue=- It includes the customer's due invoices whether they are paid or not. <br>- It is based on the billing date of these invoices.<br>
-RulesCAIn=- It includes all the effective payments of invoices received from customers.<br>- It is based on the payment date of these invoices<br>
+RulesCADue=- See sisaldab kliendi tasumisele kuuluvaid arveid olenemata sellest, kas need on tasutud või mitte. <br> – see põhineb nende arvete arvelduskuupäeval. <br>
+RulesCAIn=- See sisaldab kõiki klientidelt saadud arvete tõhusaid makseid. <br> – see põhineb nende arvete maksekuupäeval <br>
 RulesCATotalSaleJournal=It includes all credit lines from the Sale journal.
 RulesSalesTurnoverOfIncomeAccounts=It includes (credit - debit) of lines for product accounts in group INCOME
 RulesAmountOnInOutBookkeepingRecord=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
@@ -241,7 +241,7 @@ Pcg_subtype=Pcg alamtüüp
 InvoiceLinesToDispatch=Saadetavate arvete read
 ByProductsAndServices=By product and service
 RefExt=Väline viide
-ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click on button "%s".
+ToCreateAPredefinedInvoice=Mallarve loomiseks looge standardarve, seejärel klõpsake seda kinnitamata nupul "%s".
 LinkedOrder=Viide tellimusele
 Mode1=Meetod 1
 Mode2=Meetod 2
@@ -253,6 +253,8 @@ CalculationMode=Arvutusrežiim
 AccountancyJournal=Accounting code journal
 ACCOUNTING_VAT_SOLD_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for VAT on sales (used if not defined on VAT dictionary setup)
 ACCOUNTING_VAT_BUY_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for VAT on purchases (used if not defined on VAT dictionary setup)
+ACCOUNTING_REVENUESTAMP_SOLD_ACCOUNT=Account (from the Chart Of Account) to be used for the revenue stamp on sales
+ACCOUNTING_REVENUESTAMP_BUY_ACCOUNT=Account (from the Chart Of Account) to be used for the revenue stamp on purchases
 ACCOUNTING_VAT_PAY_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for paying VAT
 ACCOUNTING_VAT_BUY_REVERSE_CHARGES_CREDIT=Account (from the Chart Of Account) to be used as the default account for VAT on purchases for reverse charges (Credit)
 ACCOUNTING_VAT_BUY_REVERSE_CHARGES_DEBIT=Account (from the Chart Of Account) to be used as the default account for VAT on purchases for reverse charges (Debit)
@@ -271,14 +273,14 @@ BasedOnTwoFirstLettersOfVATNumberBeingDifferentFromYourCompanyCountry=Based on t
 SameCountryCustomersWithVAT=National customers report
 BasedOnTwoFirstLettersOfVATNumberBeingTheSameAsYourCompanyCountry=Based on the two first letters of the VAT number being the same as your own company's country code
 LinkedFichinter=Link to an intervention
-ImportDataset_tax_contrib=Social/fiscal taxes
+ImportDataset_tax_contrib=Sotsiaal-/fiskaalmaksud
 ImportDataset_tax_vat=Vat payments
 ErrorBankAccountNotFound=Error: Bank account not found
 FiscalPeriod=Accounting period
 ListSocialContributionAssociatedProject=List of social contributions associated with the project
 DeleteFromCat=Remove from accounting group
 AccountingAffectation=Accounting assignment
-LastDayTaxIsRelatedTo=Last day of period the tax is related to
+LastDayTaxIsRelatedTo=Perioodi viimane päev, millega maks on seotud
 VATDue=Sale tax claimed
 ClaimedForThisPeriod=Claimed for the period
 PaidDuringThisPeriod=Paid for this period
@@ -298,12 +300,12 @@ ReportPurchaseTurnover=Purchase turnover invoiced
 ReportPurchaseTurnoverCollected=Purchase turnover collected
 IncludeVarpaysInResults = Include various payments in reports
 IncludeLoansInResults = Include loans in reports
-InvoiceLate30Days = Late (> 30 days)
-InvoiceLate15Days = Late (15 to 30 days)
-InvoiceLateMinus15Days = Late (< 15 days)
-InvoiceNotLate = To be collected (< 15 days)
-InvoiceNotLate15Days = To be collected (15 to 30 days)
-InvoiceNotLate30Days = To be collected (> 30 days)
+InvoiceLate30Days = Hilinenud (> 30 päeva)
+InvoiceLate15Days = Hiline (15 kuni 30 päeva)
+InvoiceLateMinus15Days = Hilinenud (< 15 päeva)
+InvoiceNotLate = Laekumises (< 15 päeva)
+InvoiceNotLate15Days = Laekumises (15 kuni 30 päeva)
+InvoiceNotLate30Days = Laekumises (> 30 päeva)
 InvoiceToPay=To pay (< 15 days)
 InvoiceToPay15Days=To pay (15 to 30 days)
 InvoiceToPay30Days=To pay (> 30 days)
diff --git a/htdocs/langs/et_EE/cron.lang b/htdocs/langs/et_EE/cron.lang
index 89a03115a29..da61949223d 100644
--- a/htdocs/langs/et_EE/cron.lang
+++ b/htdocs/langs/et_EE/cron.lang
@@ -7,7 +7,7 @@ Permission23103 = Delete Scheduled job
 Permission23104 = Execute Scheduled job
 # Admin
 CronSetup=Plaanitavata programmide haldamise seadistamine
-URLToLaunchCronJobs=URL to check and launch qualified cron jobs from a browser
+URLToLaunchCronJobs=URL kvalifitseeritud cron-tööde kontrollimiseks ja käivitamiseks brauserist
 OrToLaunchASpecificJob=Or to check and launch a specific job from a browser
 KeyForCronAccess=Croni käivitatavate programmide URLile ligipääsu turvavõti
 FileToLaunchCronJobs=Command line to check and launch qualified cron jobs
@@ -20,8 +20,8 @@ CronJobProfiles=List of predefined cron job profiles
 # Menu
 EnabledAndDisabled=Enabled and disabled
 # Page list
-CronLastOutput=Latest run output
-CronLastResult=Latest result code
+CronLastOutput=Viimase käitamise väljund
+CronLastResult=Viimane tulemuse kood
 CronCommand=Käsk
 CronList=Plaanitud käivitused
 CronDelete=Delete scheduled jobs
@@ -34,8 +34,8 @@ CronNone=Mitte ükski
 CronDtStart=Not before
 CronDtEnd=Not after
 CronDtNextLaunch=Järgmine käivitus
-CronDtLastLaunch=Start date of latest execution
-CronDtLastResult=End date of latest execution
+CronDtLastLaunch=Viimase täitmise alguskuupäev
+CronDtLastResult=Viimase täitmise lõppkuupäev
 CronFrequency=Sagedus
 CronClass=Class
 CronMethod=Meetod
diff --git a/htdocs/langs/et_EE/donations.lang b/htdocs/langs/et_EE/donations.lang
index 1642553abef..82d80b9cd25 100644
--- a/htdocs/langs/et_EE/donations.lang
+++ b/htdocs/langs/et_EE/donations.lang
@@ -21,7 +21,7 @@ DonationDatePayment=Maksekuupäev
 ValidPromess=Kinnita lubadus
 DonationReceipt=Annetuse kviitung
 DonationsModels=Annetuse kviitungi dokumendi mudel
-LastModifiedDonations=Latest %s modified donations
+LastModifiedDonations=Viimased %s muudetud annetused
 DonationRecipient=Annetuse saaja
 IConfirmDonationReception=Saaja kinnitab saadava summa vastu võtmist annetusena summas
 MinimumAmount=Minimum amount is  %s
@@ -29,6 +29,7 @@ FreeTextOnDonations=Free text to show in footer
 FrenchOptions=Options for France
 DONATION_ART200=Show article 200 from CGI if you are concerned
 DONATION_ART238=Show article 238 from CGI if you are concerned
-DONATION_ART885=Show article 885 from CGI if you are concerned
+DONATION_ART978=Show article 978 from CGI if you are concerned
 DonationPayment=Donation payment
 DonationValidated=Donation %s validated
+DonationUseThirdparties=Use an existing thirdparty as coordinates of donators
diff --git a/htdocs/langs/et_EE/errors.lang b/htdocs/langs/et_EE/errors.lang
index 4212b50eae2..106c87fcf6b 100644
--- a/htdocs/langs/et_EE/errors.lang
+++ b/htdocs/langs/et_EE/errors.lang
@@ -134,7 +134,7 @@ ErrorBothFieldCantBeNegative=Mõlemad väljad %s ja %s ei saa olla negatiivse v
 ErrorFieldCantBeNegativeOnInvoice=Field <strong>%s</strong> cannot be negative on this type of invoice. If you need to add a discount line, just create the discount first (from field '%s' in thirdparty card) and apply it to the invoice.
 ErrorLinesCantBeNegativeForOneVATRate=Total of lines (net of tax) can't be negative for a given not null VAT rate (Found a negative total for VAT rate <b>%s</b>%%).
 ErrorLinesCantBeNegativeOnDeposits=Lines can't be negative in a deposit. You will face problems when you will need to consume the deposit in final invoice if you do so.
-ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative
+ErrorQtyForCustomerInvoiceCantBeNegative=Kliendiarvete rea kogus ei tohi olla negatiivne
 ErrorWebServerUserHasNotPermission=Veebiserveri käivitamiseks kasutataval kontrol <b>%s</b> ei ole selleks õigusi
 ErrorNoActivatedBarcode=Ühtki vöötkoodi tüüpi pole aktiveeritud
 ErrUnzipFails=%s lahti pakkimine ZipArchivega ebaõnnestus
@@ -250,7 +250,7 @@ ProblemIsInSetupOfTerminal=Problem is in setup of terminal %s.
 ErrorAddAtLeastOneLineFirst=Add at least one line first
 ErrorRecordAlreadyInAccountingDeletionNotPossible=Error, record is already transferred in accounting, deletion is not possible.
 ErrorLanguageMandatoryIfPageSetAsTranslationOfAnother=Error, language is mandatory if you set the page as a translation of another one.
-ErrorLanguageOfTranslatedPageIsSameThanThisPage=Error, language of translated page is same than this one.
+ErrorLanguageOfTranslatedPageIsSameThanThisPage=Viga, tõlgitud lehe keel on sama kui see.
 ErrorBatchNoFoundForProductInWarehouse=No lot/serial found for product "%s" in warehouse "%s".
 ErrorBatchNoFoundEnoughQuantityForProductInWarehouse=No enough quantity for this lot/serial for product "%s" in warehouse "%s".
 ErrorOnlyOneFieldForGroupByIsPossible=Only 1 field for the 'Group by' is possible (others are discarded)
@@ -273,8 +273,8 @@ ErrorDateIsInFuture=Error, the date can't be in the future
 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.
+ErrorFailedToFindEmailTemplate=Koodinimega malli %s leidmine nurjus
+ErrorDurationForServiceNotDefinedCantCalculateHourlyPrice=Teenuse kestus pole määratletud. Tunnihinda pole võimalik arvutada.
 ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
 ErrorActionCommBadType=Selected event type (id: %s, code: %s) do not exist in Event Type dictionary
 CheckVersionFail=Version check fail
@@ -320,6 +320,8 @@ ErrorSVGFilesNotAllowedAsLinksWithout=SVG files are not allowed as external link
 ErrorTypeMenu=Impossible to add another menu for the same module on the navbar, not handle yet
 ErrorTableExist=Table <b>%s</b> already exist
 ErrorDictionaryNotFound=Dictionary <b>%s</b> not found
+ErrorFailedToCreateSymLinkToMedias=Failed to create the symlinks %s to point to %s
+
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
@@ -355,7 +357,7 @@ WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connec
 WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So you may miss a lot of event here.
 WarningPaypalPaymentNotCompatibleWithStrict=The value 'Strict' makes the online payment features not working correctly. Use 'Lax' instead.
 WarningThemeForcedTo=Warning, theme has been forced to <b>%s</b> by hidden constant MAIN_FORCETHEME
-WarningPagesWillBeDeleted=Warning, this will also delete all existing pages/containers of the website. You should export your website before, so you have a backup to re-import it later.
+WarningPagesWillBeDeleted=Hoiatus, see kustutab ka kõik veebisaidi olemasolevad lehed/konteinerid. Peaksite oma veebisaidi varem eksportima, et saaksite selle hiljem uuesti importida.
 WarningAutoValNotPossibleWhenStockIsDecreasedOnInvoiceVal=Automatic validation is disabled when option to decrease stock is set on "Invoice validation".
 WarningModuleNeedRefrech = Module <b>%s</b> has been disabled. Don't forget to enable it
 WarningPermissionAlreadyExist=Existing permissions for this object
@@ -389,4 +391,4 @@ 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
-ErrorTooManyAttempts= Too many attempts, please try again later
+ErrorTooManyAttempts= Liiga palju katseid, proovige hiljem uuesti
diff --git a/htdocs/langs/et_EE/exports.lang b/htdocs/langs/et_EE/exports.lang
index 3976fba5679..eaec841ced1 100644
--- a/htdocs/langs/et_EE/exports.lang
+++ b/htdocs/langs/et_EE/exports.lang
@@ -10,7 +10,7 @@ SelectImportDataSet=Vali imporditav andmehulk...
 SelectExportFields=Choose the fields you want to export, or select a predefined export profile
 SelectImportFields=Choose the source file fields you want to import and their target field in database by moving them up and down with anchor %s, or select a predefined import profile:
 NotImportedFields=Lähtefaili väljad, mida ei impordita
-SaveExportModel=Save your selections as an export profile/template (for reuse).
+SaveExportModel=Salvestage oma valikud ekspordiprofiili/mallina (taaskasutamiseks).
 SaveImportModel=Save this import profile (for reuse) ...
 ExportModelName=Ekspordi profiili nimi
 ExportModelSaved=Export profile saved as <b>%s</b>.
@@ -18,6 +18,7 @@ ExportableFields=Eksporditavad väljad
 ExportedFields=Eksporditud väljad
 ImportModelName=Impordi profiili nimi
 ImportModelSaved=Import profile saved as <b>%s</b>.
+ImportProfile=Import profile
 DatasetToExport=Eksporditav andmekogu
 DatasetToImport=Impordi fail andmekogusse
 ChooseFieldsOrdersAndTitle=Vali väljade järjekord...
@@ -53,8 +54,9 @@ TypeOfLineServiceOrProduct=Rea liik (0=toode, 1=teenus)
 FileWithDataToImport=Imporditavate andmetega fai
 FileToImport=Imporditav lähtefai
 FileMustHaveOneOfFollowingFormat=File to import must have one of following formats
-DownloadEmptyExample=Download template file with field content information
-StarAreMandatory=* are mandatory fields
+DownloadEmptyExampleShort=Download a sample file
+DownloadEmptyExample=Laadige alla mallifail näidete ja teabega väljade kohta, mida saate importida
+StarAreMandatory=Mallfailis on kõik *-ga väljad kohustuslikud
 ChooseFormatOfFileToImport=Choose the file format to use as import file format by clicking on the %s icon to select it...
 ChooseFileToImport=Upload file then click on the %s icon to select file as source import file...
 SourceFileFormat=Lähtefaili formaat
@@ -82,7 +84,7 @@ SelectFormat=Vali selle impordi faili formaat
 RunImportFile=Import Data
 NowClickToRunTheImport=Check the results of the import simulation. Correct any errors and re-test.<br>When the simulation reports no errors you may proceed to import the data into the database.
 DataLoadedWithId=The imported data will have an additional field in each database table with this import id: <b>%s</b>, to allow it to be searchable in the case of investigating a problem related to this import.
-ErrorMissingMandatoryValue=Mandatory data is empty in the source file for field <b>%s</b>.
+ErrorMissingMandatoryValue=Mandatory data is empty in the source file in column <b>%s</b>.
 TooMuchErrors=There are still <b>%s</b> other source lines with errors but output has been limited.
 TooMuchWarnings=There are still <b>%s</b> other source lines with warnings but output has been limited.
 EmptyLine=Tühi rida (ära visata)
@@ -92,9 +94,9 @@ YouCanUseImportIdToFindRecord=You can find all the imported records in your data
 NbOfLinesOK=Hoiatuste ja vigadeta ridu: <b>%s</b>.
 NbOfLinesImported=Edukalt imporditud ridu: <b>%s</b>.
 DataComeFromNoWhere=Sisestavat väärtust ei ole mitte kuskil lähtefailis.
-DataComeFromFileFieldNb=Sisestav väärtus pärineb lähtefaili <b>%s</b>. väljalt.
-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.
+DataComeFromFileFieldNb=Value to insert comes from column <b>%s</b> in source file.
+DataComeFromIdFoundFromRef=The value that comes from the 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=The value of code that comes from 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=Lähtefailist pärinevad andmed sisestatakse järgmisse välja:
 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:
@@ -132,6 +134,14 @@ FormatControlRule=Format control rule
 ## imports updates
 KeysToUseForUpdates=Key (column) to use for <b>updating</b> existing data
 NbInsert=Number of inserted lines: %s
+NbInsertSim=Number of lines that will be inserted: %s
 NbUpdate=Number of updated lines: %s
+NbUpdateSim=Number of lines that will be updated : %s
 MultipleRecordFoundWithTheseFilters=Multiple records have been found with these filters: %s
 StocksWithBatch=Stocks and location (warehouse) of products with batch/serial number
+WarningFirstImportedLine=The first line(s) will not be imported with the current selection
+NotUsedFields=Fields of database not used
+SelectImportFieldsSource = Valige lähtefaili väljad, mida soovite importida, ja nende sihtväljad andmebaasis, valides igas valikukastis olevad väljad, või valige eelmääratletud impordiprofiil:
+MandatoryTargetFieldsNotMapped=Some mandatory target fields are not mapped
+AllTargetMandatoryFieldsAreMapped=All target fields that need a mandatory value are mapped
+ResultOfSimulationNoError=Result of simulation: No error
diff --git a/htdocs/langs/et_EE/holiday.lang b/htdocs/langs/et_EE/holiday.lang
index 556389c89e4..5b2f21ac987 100644
--- a/htdocs/langs/et_EE/holiday.lang
+++ b/htdocs/langs/et_EE/holiday.lang
@@ -1,8 +1,8 @@
 # Dolibarr language file - Source file is en_US - holiday
 HRM=Personalihaldus
 Holidays=Leaves
-Holiday=Leave
-CPTitreMenu=Leave
+Holiday=Puhkus
+CPTitreMenu=Puhkus
 MenuReportMonth=Kuu aruanne
 MenuAddCP=New leave request
 MenuCollectiveAddCP=New collective leave request
@@ -29,7 +29,7 @@ DescCP=Kirjeldus
 SendRequestCP=Create leave request
 DelayToRequestCP=Leave requests must be made at least <b>%s day(s)</b> before them.
 MenuConfCP=Balance of leave
-SoldeCPUser=Leave balance (in days) <b>%s</b>
+SoldeCPUser=Leave balance (in days) : <b>%s</b>
 ErrorEndDateCP=Lõppkuupäev peab olema alguskuupäevast suurem.
 ErrorSQLCreateCP=Loomisel tekkis SQLi viga:
 ErrorIDFicheCP=An error has occurred, the leave request does not exist.
@@ -57,7 +57,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 the approver for your leave request.
+InvalidValidatorCP=Peate valima oma puhkusetaotluse kinnitaja.
 InvalidValidator=The user chosen isn't an approver.
 NoDateDebut=Pead valima alguskuupäeva.
 NoDateFin=Pead valima lõppkuupäeva.
@@ -86,7 +86,7 @@ ErrorFieldRequiredUserOrGroup=The "group" field or the "user" field must be fill
 fusionGroupsUsers=The groups field and the user field will be merged
 MenuLogCP=View change logs
 LogCP=Log of all updates made to "Balance of Leave"
-ActionByCP=Updated by
+ActionByCP=Uuendaja
 UserUpdateCP=Updated for
 PrevSoldeCP=Eelmine saldo
 NewSoldeCP=Uus saldo
@@ -100,14 +100,13 @@ SendRequestCollectiveCP=Send collective leave request
 AutoValidationOnCreate=Automatic validation
 FirstDayOfHoliday=Beginning day of leave request
 LastDayOfHoliday=Ending day of leave request
-BoxTitleLastLeaveRequests=Latest %s modified leave requests
 HolidaysMonthlyUpdate=Igakuine uuendus
 ManualUpdate=Käsitsi uuendus
 HolidaysCancelation=Leave request cancelation
 EmployeeLastname=Employee last name
 EmployeeFirstname=Employee first name
 TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
-LastHolidays=Latest %s leave requests
+LastHolidays=Viimased %s lahkumistaotlused
 AllHolidays=All leave requests
 HalfDay=Half day
 NotTheAssignedApprover=You are not the assigned approver
@@ -139,20 +138,20 @@ NoLeaveWithCounterDefined=There is no leave types defined that need to be follow
 GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leave</strong> to setup the different types of leaves.
 HolidaySetup=Setup of module Leave
 HolidaysNumberingModules=Numbering models for leave requests
-TemplatePDFHolidays=Template for leave requests PDF
+TemplatePDFHolidays=PDF puhkusetaotluste mall
 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
+NobodyHasPermissionToValidateHolidays=Nobody has permission to validate leave requests
+HolidayBalanceMonthlyUpdate=Monthly update of leave balance
 XIsAUsualNonWorkingDay=%s is usualy a NON working day
 BlockHolidayIfNegative=Block if balance negative
 LeaveRequestCreationBlockedBecauseBalanceIsNegative=The creation of this leave request is blocked because your balance is negative
 ErrorLeaveRequestMustBeDraftCanceledOrRefusedToBeDeleted=Leave request %s must be draft, canceled or refused to be deleted
-IncreaseHolidays=Increase holiday
-HolidayRecordsIncreased= %s holiday records increased
-HolidayRecordIncreased=Holiday record increased
-ConfirmMassIncreaseHoliday=Bulk holiday increase
+IncreaseHolidays=Increase leave balance
+HolidayRecordsIncreased= %s leave balances increased
+HolidayRecordIncreased=Leave balance increased
+ConfirmMassIncreaseHoliday=Bulk leave balance increase
 NumberDayAddMass=Number of day to add to the selection
 ConfirmMassIncreaseHolidayQuestion=Are you sure you want to increase holiday of the %s selected record(s)?
 HolidayQtyNotModified=Balance of remaining days for %s has not been changed
diff --git a/htdocs/langs/et_EE/install.lang b/htdocs/langs/et_EE/install.lang
index ab9898d7bd5..f5d930546cc 100644
--- a/htdocs/langs/et_EE/install.lang
+++ b/htdocs/langs/et_EE/install.lang
@@ -51,7 +51,6 @@ DatabaseName=Andmebaasi nimi
 DatabasePrefix=Database table prefix
 DatabasePrefixDescription=Database table prefix. If empty, defaults to llx_.
 AdminLogin=User account for the Dolibarr database owner.
-PasswordAgain=Retype password confirmation
 AdminPassword=Dolibarri andmebaasi omaniku parool.
 CreateDatabase=Loo andmebaas
 CreateUser=Create user account or grant user account permission on the Dolibarr database
@@ -89,7 +88,7 @@ LoginAlreadyExists=On juba olemas
 DolibarrAdminLogin=Dolibarri administraatori kasutajanimi
 AdminLoginAlreadyExists=Dolibarr administrator account '<b>%s</b>' already exists. Go back if you want to create another one.
 FailedToCreateAdminLogin=Failed to create Dolibarr administrator account.
-WarningRemoveInstallDir=Warning, for security reasons, once the install or upgrade is complete, you should add a file called <b>install.lock</b> into the Dolibarr document directory in order to prevent the accidental/malicious use of the install tools again.
+WarningRemoveInstallDir=Warning, for security reasons, once the installation process is complete, you must add a file called <b>install.lock</b> into the Dolibarr document directory in order to prevent the accidental/malicious use of the install tools again.
 FunctionNotAvailableInThisPHP=Not available in this PHP
 ChoosedMigrateScript=Vali migratsiooni skript
 DataMigration=Database migration (data)
@@ -97,7 +96,7 @@ DatabaseMigration=Database migration (structure + some data)
 ProcessMigrateScript=Skripti töötlemine
 ChooseYourSetupMode=Vali paigalduse režiim ja klõpsa "Start" nupule...
 FreshInstall=Värske paigaldus
-FreshInstallDesc=Use this mode if this is your first install. If not, this mode can repair a incomplete previous install. If you want to upgrade your version, choose "Upgrade" mode.
+FreshInstallDesc=Kasutage seda režiimi, kui installite seda esimest korda. Kui ei, võib see režiim parandada eelmise mittetäieliku installi. Kui soovite oma versiooni uuendada, valige režiim "Uuendus".
 Upgrade=Uuenda
 UpgradeDesc=Kasuta seda režiimi, kui tahad vanad Dolibarri failid asendada uuema versiooni failidega. See uuendab andmebaasi ja andmed.
 Start=Alusta
@@ -209,7 +208,12 @@ HideNotAvailableOptions=Hide unavailable options
 ErrorFoundDuringMigration=Error(s) were reported during the migration process so next step is not available. To ignore errors, you can <a href="%s">click here</a>, but the application or some features may not work correctly until the errors are resolved.
 YouTryInstallDisabledByDirLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (directory renamed with .lock suffix).<br>
 YouTryInstallDisabledByFileLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (by the existence of a lock file <strong>install.lock</strong> in the dolibarr documents directory).<br>
+YouTryUpgradeDisabledByMissingFileUnLock=The application tried to self-upgrade, but the upgrade process is currently not allowed.<br>
 ClickHereToGoToApp=Click here to go to your application
 ClickOnLinkOrRemoveManualy=If an upgrade is in progress, please wait. If not, click on the following link. If you always see this same page, you must remove/rename the file install.lock in the documents directory.
+ClickOnLinkOrCreateUnlockFileManualy=If an upgrade is in progress, please wait... If not, you must create a file upgrade.unlock into the Dolibarr documents directory.
 Loaded=Loaded
 FunctionTest=Function test
+NodoUpgradeAfterDB=No action requested by external modules after upgrade of database
+NodoUpgradeAfterFiles=No action requested by external modules after upgrade of files or directories
+MigrationContractLineRank=Migrate Contract Line to use Rank (and enable Reorder)
diff --git a/htdocs/langs/et_EE/interventions.lang b/htdocs/langs/et_EE/interventions.lang
index 98372242cc4..9098441d54b 100644
--- a/htdocs/langs/et_EE/interventions.lang
+++ b/htdocs/langs/et_EE/interventions.lang
@@ -3,11 +3,11 @@ Intervention=Sekkumine
 Interventions=Sekkumised
 InterventionCard=Sekkumise kaart
 NewIntervention=Uus sekkumine
-AddIntervention=Create intervention
-ChangeIntoRepeatableIntervention=Change to repeatable intervention
+AddIntervention=Loo sekkumine
+ChangeIntoRepeatableIntervention=Muuda korduvaks sekkumiseks
 ListOfInterventions=Sekkumiste nimekiri
 ActionsOnFicheInter=Sekkumise tegevused
-LastInterventions=Latest %s interventions
+LastInterventions=Viimased %s sekkumist
 AllInterventions=Kõik sekkumised
 CreateDraftIntervention=Loo mustand
 InterventionContact=Sekkumise kontakt
@@ -15,54 +15,58 @@ DeleteIntervention=Kustuta sekkumine
 ValidateIntervention=Kinnita sekkumine
 ModifyIntervention=Muuda sekkumist
 DeleteInterventionLine=Kustuta sekkumise rida
-ConfirmDeleteIntervention=Are you sure you want to delete this intervention?
-ConfirmValidateIntervention=Are you sure you want to validate this intervention under name <b>%s</b>?
-ConfirmModifyIntervention=Are you sure you want to modify this intervention?
-ConfirmDeleteInterventionLine=Are you sure you want to delete this intervention line?
-ConfirmCloneIntervention=Are you sure you want to clone this intervention?
-NameAndSignatureOfInternalContact=Name and signature of intervening:
-NameAndSignatureOfExternalContact=Name and signature of customer:
+ConfirmDeleteIntervention=Kas tahad kindlasti selle sekkumise kustutada?
+ConfirmValidateIntervention=Kas tahad kindlasti kinnitada selle sekkumise nimega <b>%s</b> ?
+ConfirmModifyIntervention=Kas tahad kindlasti seda sekkumist muuta?
+ConfirmDeleteInterventionLine=Kas tahad kindlasti antud sekkumise rea kustutada?
+ConfirmCloneIntervention=Kas tahad kindlasti kloonida antud sekkumist?
+NameAndSignatureOfInternalContact=Sekkuja nimi ja allkiri:
+NameAndSignatureOfExternalContact=Kliendi nimi ja allkiri:
 DocumentModelStandard=Sekkumiste tüüpvormi mudel
 InterventionCardsAndInterventionLines=Sekkumised ja sekkumiste read
 InterventionClassifyBilled=Liigita "Arve esitatud"
-InterventionClassifyUnBilled=Classify "Unbilled"
-InterventionClassifyDone=Classify "Done"
+InterventionClassifyUnBilled=Liigita "Arve esitamata"
+InterventionClassifyDone=Liigita "Tehtud"
 StatusInterInvoiced=Arve esitatud
-SendInterventionRef=Submission of intervention %s
-SendInterventionByMail=Send intervention by email
-InterventionCreatedInDolibarr=Intervention %s created
+SendInterventionRef=Sekkumise %s saatmine
+SendInterventionByMail=Saada sekkumine e-postiga
+InterventionCreatedInDolibarr=Sekkumine %s loodud
 InterventionValidatedInDolibarr=Sekkumine %s on kinnitatud
-InterventionModifiedInDolibarr=Intervention %s modified
-InterventionClassifiedBilledInDolibarr=Intervention %s set as billed
-InterventionClassifiedUnbilledInDolibarr=Intervention %s set as unbilled
+InterventionModifiedInDolibarr=Sekkumine %s muudetud
+InterventionClassifiedBilledInDolibarr=Sekkumisele %s seatud "arve esitatud"
+InterventionClassifiedUnbilledInDolibarr=Sekkumisele %s seatud "arve esitamata"
 InterventionSentByEMail=Sekkumine %s saadetud e-postiga
-InterventionDeletedInDolibarr=Intervention %s deleted
-InterventionsArea=Interventions area
-DraftFichinter=Draft interventions
-LastModifiedInterventions=Latest %s modified interventions
-FichinterToProcess=Interventions to process
+InterventionDeletedInDolibarr=Sekkumine %s kustutatud
+InterventionsArea=Sekkumiste ala
+DraftFichinter=Sekkumiste mustandid
+LastModifiedInterventions=Viimased %s muudetud sekkumised
+FichinterToProcess=Töötlemist ootavad sekkumised
 TypeContact_fichinter_external_CUSTOMER=Kliendi kontakt järelkajaks
-PrintProductsOnFichinter=Print also lines of type "product" (not only services) on intervention card
-PrintProductsOnFichinterDetails=interventions generated from orders
-UseServicesDurationOnFichinter=Use services duration for interventions generated from orders
-UseDurationOnFichinter=Hides the duration field for intervention records
-UseDateWithoutHourOnFichinter=Hides hours and minutes off the date field for intervention records
-InterventionStatistics=Statistics of interventions
-NbOfinterventions=No. of intervention cards
-NumberOfInterventionsByMonth=No. of intervention cards by month (date of validation)
-AmountOfInteventionNotIncludedByDefault=Amount of intervention is not included by default into profit (in most cases, timesheets are used to count time spent). Add option PROJECT_INCLUDE_INTERVENTION_AMOUNT_IN_PROFIT to 1 into home-setup-other to include them.
-InterId=Intervention id
-InterRef=Intervention ref.
-InterDateCreation=Date creation intervention
-InterDuration=Duration intervention
-InterStatus=Status intervention
-InterNote=Note intervention
-InterLine=Line of intervention
-InterLineId=Line id intervention
-InterLineDate=Line date intervention
-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
-ConfirmReopenIntervention=Are you sure you want to open back the intervention <b>%s</b>?
-GenerateInter=Generate intervention
+PrintProductsOnFichinter=Trüki sekkumiste kaardile samuti "toodete" tüübid (mitte ainult teenused)
+PrintProductsOnFichinterDetails=sekkumistele, mis on loodud tellimuste põhjal
+UseServicesDurationOnFichinter=Tellimuste põhjal loodud sekkumistele kasuta teenuste kestust
+UseDurationOnFichinter=Peidab sekkumiste kirjete jaoks kestuse välja
+UseDateWithoutHourOnFichinter=Peidab sekkumiste kirjete juures kuupäeva väljal tunnid ja minutid
+InterventionStatistics=Sekkumiste statistika
+NbOfinterventions=Sekkumiste kaartide arv
+NumberOfInterventionsByMonth=Sekkumiste kaartide arv kuu kaupa (kinnitamise kuupäevaga)
+AmountOfInteventionNotIncludedByDefault=Vaikimisi ei sisalda kasum sekkumiste hulka (enamikel juhtudel on kulutatud aja arvestamiseks kasutusel ajatabelid). Kasumiarvestusse kaasatud elementide täiendamiseks võid lisada muutujad PROJECT_ELEMENTS_FOR_ADD_MARGIN  ja PROJECT_ELEMENTS_FOR_MINUS_MARGIN nimestikku Kodu-->Seaded-->Muud
+InterId=Sekkumise ID
+InterRef=Sekkumise viide
+InterDateCreation=Sekkumise loomise kuupäev
+InterDuration=Sekkumise kestus
+InterStatus=Sekkumise olek
+InterNote=Sekkumise märkus
+InterLine=Sekkumise rida
+InterLineId=Sekkumise rea ID
+InterLineDate=Sekkumise rea kuupäev
+InterLineDuration=Sekkumise rea kestus
+InterLineDesc=Sekkumise rea kirjeldus
+RepeatableIntervention=Sekkumise mall
+ToCreateAPredefinedIntervention=Ettemääratud või korduva sekkumise loomiseks, loo enne tavaline sekkumine ja konverteeri see sekkumise malliks
+ConfirmReopenIntervention=Kas tahad kindlasti avada uuesti sekkumist <b>%s</b>?
+GenerateInter=Loo sekkumine
+FichinterNoContractLinked=Sekkumine %s loodi ilma seotud lepinguta.
+ErrorFicheinterCompanyDoesNotExist=Ettevõtet ei ole olemas. Sekkumist ei loodud.
+NextDateToIntervention=Kuupäev järgmise sekkumise loomise jaoks
+NoIntervention=Sekkumisi ei ole
diff --git a/htdocs/langs/et_EE/ldap.lang b/htdocs/langs/et_EE/ldap.lang
index ca8304e7f0b..d74bb800699 100644
--- a/htdocs/langs/et_EE/ldap.lang
+++ b/htdocs/langs/et_EE/ldap.lang
@@ -13,10 +13,10 @@ LDAPUsers=LDAPi andmebaasis olevad kasutajad
 LDAPFieldStatus=Staatus
 LDAPFieldFirstSubscriptionDate=Esimese tellimuse kuupäev
 LDAPFieldFirstSubscriptionAmount=Esimese tellimuse kogus
-LDAPFieldLastSubscriptionDate=Latest subscription date
-LDAPFieldLastSubscriptionAmount=Latest subscription amount
+LDAPFieldLastSubscriptionDate=Viimane tellimiskuupäev
+LDAPFieldLastSubscriptionAmount=Viimane tellimuse summa
 LDAPFieldSkype=Skype id
-LDAPFieldSkypeExample=Example : skypeName
+LDAPFieldSkypeExample=Example: skypeName
 UserSynchronized=Kasutaja sünkroniseeritud
 GroupSynchronized=Grupp sünkroniseeritud
 MemberSynchronized=Liige sünkroniseeritud
@@ -25,3 +25,9 @@ ContactSynchronized=Kontakt sünkroniseeritud
 ForceSynchronize=Sunni Dolibarr -> LDAP sünkroniseerimine
 ErrorFailedToReadLDAP=LDAPi andmebaasi lugemine ebaõnnestus. Kontrolli LDAPi mooduli seadistust ja ligipääsu andmebaasile.
 PasswordOfUserInLDAP=Password of user in LDAP
+LDAPPasswordHashType=Password hash type
+LDAPPasswordHashTypeExample=Type of password hash used on the server
+SupportedForLDAPExportScriptOnly=Only supported by an ldap export script
+SupportedForLDAPImportScriptOnly=Only supported by an ldap import script
+LDAPUserAccountControl = userAccountControl on creation (active directory)
+LDAPUserAccountControlExample = 512 Normal Account / 546 Normal Account + No Passwd + Disabled (see : https://fr.wikipedia.org/wiki/Active_Directory)
diff --git a/htdocs/langs/et_EE/mails.lang b/htdocs/langs/et_EE/mails.lang
index f2d5d0f39b3..a769812b7ae 100644
--- a/htdocs/langs/et_EE/mails.lang
+++ b/htdocs/langs/et_EE/mails.lang
@@ -64,7 +64,7 @@ EMailNotDefined=Email not defined
 ConfirmCloneEMailing=Are you sure you want to clone this emailing?
 CloneContent=Klooni sõnu
 CloneReceivers=Klooni saajad
-DateLastSend=Date of latest sending
+DateLastSend=Viimase saatmise kuupäev
 DateSending=Saatmise kuupäev
 SentTo=Saadetud üksusele <b>%s</b>
 MailingStatusRead=Loe
@@ -93,14 +93,14 @@ MailingModuleDescEmailsFromUser=Emails input by user
 MailingModuleDescDolibarrUsers=Users with Emails
 MailingModuleDescThirdPartiesByCategories=Kolmandad isikud
 SendingFromWebInterfaceIsNotAllowed=Sending from web interface is not allowed.
-EmailCollectorFilterDesc=All filters must match to have an email being collected
+EmailCollectorFilterDesc=All filters must match to have an email being collected.<br>You can use the character "!" before the search string value if you need a negative test
 
 # Libelle des modules de liste de destinataires mailing
 LineInFile=Rida %s failis
 RecipientSelectionModules=Määratletud päringud saaja valimiseks
 MailSelectedRecipients=Valitud saajad
 MailingArea=E-postituste ala
-LastMailings=Latest %s emailings
+LastMailings=Viimased %s meilid
 TargetsStatistics=Sihtmärkide statistika
 NbOfCompaniesContacts=Unikaalseid kontakte/aadresse
 MailNoChangePossible=Kinnitatud e-postituse saajaid ei ole võimalik muuta
@@ -180,3 +180,7 @@ DefaultBlacklistMailingStatus=Default value for field '%s' when creating a new c
 DefaultStatusEmptyMandatory=Empty but mandatory
 WarningLimitSendByDay=WARNING: The setup or contract of your instance limits your number of emails per day to <b>%s</b>. Trying to send more may result in having your instance slow down or suspended. Please contact your support if you need a higher quota.
 NoMoreRecipientToSendTo=No more recipient to send the email to
+EmailOptedOut=Email owner has requested to not contact him with this email anymore
+EvenUnsubscribe=Include opt-out emails
+EvenUnsubscribeDesc=Include opt-out emails when you select emails as targets. Usefull for mandatory service emails for example.
+XEmailsDoneYActionsDone=%s emails pre-qualified, %s emails successfully processed (for %s record/actions done)
diff --git a/htdocs/langs/et_EE/main.lang b/htdocs/langs/et_EE/main.lang
index c2afddc0cbc..c44b831bfdb 100644
--- a/htdocs/langs/et_EE/main.lang
+++ b/htdocs/langs/et_EE/main.lang
@@ -1237,3 +1237,5 @@ SearchSyntaxTooltipForStringOrNum=For searching inside text fields, you can use
 InProgress=Tegemisel
 DateOfPrinting=Date of printing
 ClickFullScreenEscapeToLeave=Click here to switch in Full screen mode. Press ESCAPE to leave Full screen mode.
+UserNotYetValid=Not yet valid
+UserExpired=Aegunud
diff --git a/htdocs/langs/et_EE/members.lang b/htdocs/langs/et_EE/members.lang
index 962dda41937..272c03c04bf 100644
--- a/htdocs/langs/et_EE/members.lang
+++ b/htdocs/langs/et_EE/members.lang
@@ -117,13 +117,13 @@ 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=Liikmete avalik nimekiri
 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.
+BlankSubscriptionFormDesc=Dolibarr võib pakkuda teile avaliku URL-i/veebisaidi, et väliskülastajad saaksid taotleda sihtasutusega liitumist. Kui võrgumakse moodul on lubatud, võidakse automaatselt esitada ka maksevorm.
 EnablePublicSubscriptionForm=Enable the public website with self-subscription form
 ForceMemberType=Force the member type
 ExportDataset_member_1=Members and contributions
 ImportDataset_member_1=Liikmed
-LastMembersModified=Latest %s modified members
-LastSubscriptionsModified=Latest %s modified contributions
+LastMembersModified=Viimased %s muudetud liikmed
+LastSubscriptionsModified=Viimased %s muudetud kaastööd
 String=Sõne
 Text=Tekst
 Int=Täisarv
@@ -155,12 +155,12 @@ 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 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 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_EMAIL_TEMPLATE_AUTOREGISTER=Meilimall, mida kasutatakse liikme automaatse registreerimisega liikmele meili saatmiseks
+DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Meili mall, mida kasutatakse liikme kinnitamisel e-kirjade saatmiseks
+DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Meilimall, mida kasutatakse liikmele uue kaastöö salvestamise kohta meili saatmiseks
+DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Meilimall, mida kasutada e-kirjade meeldetuletuse saatmiseks, kui kaastöö hakkab aeguma
+DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Meili mall, mida kasutatakse liikme tühistamise korral liikmele meili saatmiseks
+DescADHERENT_EMAIL_TEMPLATE_EXCLUSION=Meilimall, mida kasutatakse liikme välistamise korral liikmele meili saatmiseks
 DescADHERENT_MAIL_FROM=Sender Email for automatic emails
 DescADHERENT_CC_MAIL_FROM=Send automatic email copy to
 DescADHERENT_ETIQUETTE_TYPE=Siltide lehe formaat
@@ -185,8 +185,8 @@ DocForAllMembersCards=Loo kõigi liikmete kohta visiitkaardid
 DocForOneMemberCards=Loo mõne kindla liikme visiitkaart
 DocForLabels=Loo aadressilehed
 SubscriptionPayment=Contribution payment
-LastSubscriptionDate=Date of latest contribution payment
-LastSubscriptionAmount=Amount of latest contribution
+LastSubscriptionDate=Viimase sissemakse maksmise kuupäev
+LastSubscriptionAmount=Viimase panuse summa
 LastMemberType=Last Member type
 MembersStatisticsByCountries=Liikmete statistika riigi alusel
 MembersStatisticsByState=Liikmete statistika osariigi/provintsi alusel
@@ -202,8 +202,8 @@ MembersByNature=This screen show you statistics of members by nature.
 MembersByRegion=This screen show you statistics of members by region.
 MembersStatisticsDesc=Vali soovitud statistika...
 MenuMembersStats=Statistika
-LastMemberDate=Latest membership date
-LatestSubscriptionDate=Latest contribution date
+LastMemberDate=Viimane liikmelisuse kuupäev
+LatestSubscriptionDate=Viimane panuse kuupäev
 MemberNature=Nature of the member
 MembersNature=Nature of the members
 Public=%s can publish my membership in <a target="_blank" href="%s">the public register</a>
@@ -216,7 +216,7 @@ TurnoverOrBudget=Käive (ettevõttel) või eelarve maht (ühendusel)
 DefaultAmount=Default amount of contribution (used only if no amount is defined at member type level)
 MinimumAmount=Minimum amount (used only when contribution amount is free)
 CanEditAmount=Subscription amount can be defined by the member
-CanEditAmountDetail=Visitor can choose/edit amount of its contribution regardless of the member type
+CanEditAmountDetail=Külastaja saab valida/muuta oma panuse suurust olenemata liikme tüübist
 AmountIsLowerToMinimumNotice=sur un dû total de %s
 MEMBER_NEWFORM_PAYONLINE=After the online registration, switch automatically on the online payment page
 ByProperties=By nature
@@ -236,7 +236,7 @@ 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.
+CreateDolibarrThirdPartyDesc=Kolmas osapool on juriidiline isik, mida kasutatakse arvel, kui otsustate iga panuse kohta arve koostada. Saate selle luua hiljem kaastöö salvestamise käigus.
 MemberFirstname=Member firstname
 MemberLastname=Member lastname
 MemberCodeDesc=Member Code, unique for all members
diff --git a/htdocs/langs/et_EE/oauth.lang b/htdocs/langs/et_EE/oauth.lang
index 075ff49a895..fdb175ded5f 100644
--- a/htdocs/langs/et_EE/oauth.lang
+++ b/htdocs/langs/et_EE/oauth.lang
@@ -9,12 +9,14 @@ HasAccessToken=A token was generated and saved into local database
 NewTokenStored=Token received and saved
 ToCheckDeleteTokenOnProvider=Click here to check/delete authorization saved by %s OAuth provider
 TokenDeleted=Token deleted
-RequestAccess=Click here to request/renew access and receive a new token to save
-DeleteAccess=Click here to delete token
-UseTheFollowingUrlAsRedirectURI=Use the following URL as the Redirect URI when creating your credentials with your OAuth provider:
-ListOfSupportedOauthProviders=Enter the credentials provided by your OAuth2 provider. Only supported OAuth2 providers are listedd here. These services may be used by other modules that need OAuth2 authentication.
-OAuthSetupForLogin=Page to generate an OAuth token
+GetAccess=Click here to get a token
+RequestAccess=Click here to request/renew access and receive a new token
+DeleteAccess=Click here to delete the token
+UseTheFollowingUrlAsRedirectURI=Kasutage OAuthi pakkujaga mandaatide loomisel ümbersuunamise URI-na järgmist URL-i:
+ListOfSupportedOauthProviders=Add your OAuth2 token providers. Then, go on your OAuth provider admin page to create/get an OAuth ID and Secret and save them here. Once done, switch on the other tab to generate your token.
+OAuthSetupForLogin=Page to manage (generate/delete) OAuth tokens
 SeePreviousTab=See previous tab
+OAuthProvider=OAuth provider
 OAuthIDSecret=OAuth ID and Secret
 TOKEN_REFRESH=Token Refresh Present
 TOKEN_EXPIRED=Token expired
@@ -23,10 +25,17 @@ TOKEN_DELETE=Delete saved token
 OAUTH_GOOGLE_NAME=OAuth Google service
 OAUTH_GOOGLE_ID=OAuth Google Id
 OAUTH_GOOGLE_SECRET=OAuth Google Secret
-OAUTH_GOOGLE_DESC=Go to <a class="notasortlink" href="https://console.developers.google.com/" target="_blank">this page</a> then "Credentials" to create OAuth credentials
 OAUTH_GITHUB_NAME=OAuth GitHub service
 OAUTH_GITHUB_ID=OAuth GitHub Id
 OAUTH_GITHUB_SECRET=OAuth GitHub Secret
-OAUTH_GITHUB_DESC=Go to <a class="notasortlink" href="https://github.com/settings/developers" target="_blank">this page</a> then "Register a new application" to create OAuth credentials
+OAUTH_URL_FOR_CREDENTIAL=Go to <a class="notasortlink" href="%s" target="_blank" rel="noopener noreferrer external">this page<span class="fas fa-external-link-alt paddingleft"></span></a> to create or get your OAuth ID and Secret
 OAUTH_STRIPE_TEST_NAME=OAuth Stripe Test
 OAUTH_STRIPE_LIVE_NAME=OAuth Stripe Live
+OAUTH_ID=OAuth Client ID
+OAUTH_SECRET=OAuth secret
+OAUTH_TENANT=OAuth tenant
+OAuthProviderAdded=OAuth provider added
+AOAuthEntryForThisProviderAndLabelAlreadyHasAKey=An OAuth entry for this provider and label already exists
+URLOfServiceForAuthorization=URL provided by OAuth service for authentication
+Scopes=Permissions (Scopes)
+ScopeUndefined=Permissions (Scopes) undefined (see previous tab)
diff --git a/htdocs/langs/et_EE/opensurvey.lang b/htdocs/langs/et_EE/opensurvey.lang
index e9692d84083..2d83b1d9885 100644
--- a/htdocs/langs/et_EE/opensurvey.lang
+++ b/htdocs/langs/et_EE/opensurvey.lang
@@ -19,11 +19,11 @@ SelectedDays=Valitud päevad
 TheBestChoice=Hetkel on parim vali
 TheBestChoices=Hetkel on parimad valikud
 with=üksusega
-OpenSurveyHowTo=If you agree to vote in this poll, you have to give your name, choose the values that fit best for you and validate with the plus button at the end of the line.
+OpenSurveyHowTo=Kui olete nõus selles küsitluses hääletama, peate ütlema oma nime, valima teile kõige paremini sobivad väärtused ja kinnitama rea lõpus oleva plussnupuga.
 CommentsOfVoters=Hääletajate kommentaarid
 ConfirmRemovalOfPoll=Kas oled täiesti kindel, et soovid antud küsitluse (ja kõik hääled) kustutada
 RemovePoll=Kustuta küsitlus
-UrlForSurvey=URL to communicate to get a direct access to poll
+UrlForSurvey=URL suhtlemiseks, et saada küsitlusele otsene juurdepääs
 PollOnChoice=You are creating a poll to make a multi-choice for a poll. First enter all possible choices for your poll:
 CreateSurveyDate=Create a date poll
 CreateSurveyStandard=Loo tavaline küsitlus
diff --git a/htdocs/langs/et_EE/paypal.lang b/htdocs/langs/et_EE/paypal.lang
index 8916af3530e..d97fb284742 100644
--- a/htdocs/langs/et_EE/paypal.lang
+++ b/htdocs/langs/et_EE/paypal.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - paypal
 PaypalSetup=PayPal mooduli seadistamine
-PaypalDesc=This module allows payment by customers via <a href="http://www.paypal.com" target="_blank">PayPal</a>. This can be used for a ad-hoc payment or for a payment related to a Dolibarr object (invoice, order, ...)
+PaypalDesc=See moodul võimaldab klientidel maksta <a href="https://www.paypal.com" target="_blank" rel="noopener noreferrer external"> PayPali </a> kaudu. Seda saab kasutada ad hoc makseks või Dolibarri objektiga seotud makseks (arve, tellimus jne)
 PaypalOrCBDoPayment=Pay with PayPal (Card or PayPal)
 PaypalDoPayment=Pay with PayPal
 PAYPAL_API_SANDBOX=Testimise/liivakasti režii
@@ -34,3 +34,4 @@ ARollbackWasPerformedOnPostActions=A rollback was performed on all Post actions.
 ValidationOfPaymentFailed=Validation of payment has failed
 CardOwner=Card holder
 PayPalBalance=Paypal credit
+OnlineSubscriptionPaymentLine=Online subscription recorded on %s<br>Paid via %s<br>Originating IP address: %s<br>Transaction ID: %s
diff --git a/htdocs/langs/et_EE/printing.lang b/htdocs/langs/et_EE/printing.lang
index 394fe27d85e..96b0d063880 100644
--- a/htdocs/langs/et_EE/printing.lang
+++ b/htdocs/langs/et_EE/printing.lang
@@ -47,7 +47,7 @@ IPP_Media=Printer media
 IPP_Supported=Type of media
 DirectPrintingJobsDesc=This page lists printing jobs found for available printers.
 GoogleAuthNotConfigured=Google OAuth has not been setup. Enable module OAuth and set a Google ID/Secret.
-GoogleAuthConfigured=Google OAuth credentials were found into setup of module OAuth.
+GoogleAuthConfigured=Mooduli OAuth seadistamisel leiti Google OAuthi mandaat.
 PrintingDriverDescprintgcp=Configuration variables for printing driver Google Cloud Print.
 PrintingDriverDescprintipp=Configuration variables for printing driver Cups.
 PrintTestDescprintgcp=List of Printers for Google Cloud Print.
diff --git a/htdocs/langs/et_EE/products.lang b/htdocs/langs/et_EE/products.lang
index 1027939457d..252396e3654 100644
--- a/htdocs/langs/et_EE/products.lang
+++ b/htdocs/langs/et_EE/products.lang
@@ -1,10 +1,10 @@
 # Dolibarr language file - Source file is en_US - products
 ProductRef=Toote viide
 ProductLabel=Toote nimi
-ProductLabelTranslated=Translated product label
+ProductLabelTranslated=Tõlgitud toote etikett
 ProductDescription=Product description
-ProductDescriptionTranslated=Translated product description
-ProductNoteTranslated=Translated product note
+ProductDescriptionTranslated=Tõlgitud tootekirjeldus
+ProductNoteTranslated=Tõlgitud tootemärkus
 ProductServiceCard=Toodete/teenuste kaart
 TMenuProducts=Tooted
 TMenuServices=Teenused
@@ -44,8 +44,8 @@ ServicesOnPurchaseOnly=Teenused ainult ostuks
 ServicesNotOnSell=Teenused, mis ei ole müügiks või ostuks
 ServicesOnSellAndOnBuy=Teenused müügiks ja ostuks
 LastModifiedProductsAndServices=Viimased %s muudetud toodet/teenust
-LastRecordedProducts=Latest %s recorded products
-LastRecordedServices=Latest %s recorded services
+LastRecordedProducts=Viimased %s salvestatud tooted
+LastRecordedServices=Viimased %s salvestatud teenused
 CardProduct0=Toode
 CardProduct1=Teenus
 Stock=Laojääk
@@ -73,7 +73,7 @@ SellingPrice=Müügihind
 SellingPriceHT=Selling price (excl. tax)
 SellingPriceTTC=Müügihinna (km-ga)
 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.
+CostPriceDescription=Seda hinnavälja (ilma käibemaksuta) saab kasutada selleks, et jäädvustada keskmine summa, mille see toode teie ettevõttele maksab. See võib olla mis tahes hind, mille te ise arvutate, näiteks keskmisest ostuhinnast pluss keskmised tootmis- ja turustuskulud.
 CostPriceUsage=This value could be used for margin calculation.
 ManufacturingPrice=Manufacturing price
 SoldAmount=Sold amount
@@ -88,7 +88,7 @@ ErrorProductBadRefOrLabel=Vale viite või nime väärtus.
 ErrorProductClone=Toote või teenuse kloonimisel tekkis probleem.
 ErrorPriceCantBeLowerThanMinPrice=Error, price can't be lower than minimum price.
 Suppliers=Tarnijad
-SupplierRef=Vendor SKU
+SupplierRef=Tarnija SKU
 ShowProduct=Näita toodet
 ShowService=Näita teenust
 ProductsAndServicesArea=Toodete ja teenuste ala
@@ -237,8 +237,8 @@ unitFT3=ft³
 unitIN3=in³
 unitOZ3=unts
 unitgallon=gallon
-ProductCodeModel=Product ref template
-ServiceCodeModel=Service ref template
+ProductCodeModel=Tooteviite mall
+ServiceCodeModel=Teenusviite mall
 CurrentProductPrice=Hetkehind
 AlwaysUseNewPrice=Kasuta alati toote/teenuse hetkehinda
 AlwaysUseFixedPrice=Kasuta fikseeritud hinda
@@ -246,10 +246,10 @@ PriceByQuantity=Different prices by quantity
 DisablePriceByQty=Disable prices by quantity
 PriceByQuantityRange=Koguse ulatus
 MultipriceRules=Automatic prices for segment
-UseMultipriceRules=Use price segment rules (defined into product module setup) to auto calculate prices of all other segments according to first segment
+UseMultipriceRules=Kasutage hinnasegmendi reegleid (määratletud tootemooduli seadistustes), et arvutada automaatselt kõigi teiste segmentide hinnad vastavalt esimesele segmendile
 PercentVariationOver=%% variation over %s
 PercentDiscountOver=%% discount over %s
-KeepEmptyForAutoCalculation=Keep empty to have this calculated automatically from weight or volume of products
+KeepEmptyForAutoCalculation=Hoidke tühjana, et see arvutataks automaatselt toodete kaalu või mahu järgi
 VariantRefExample=Examples: COL, SIZE
 VariantLabelExample=Examples: Color, Size
 ### composition fabrication
@@ -263,7 +263,7 @@ Quarter2=2. kvartal
 Quarter3=3. kvartal
 Quarter4=4. kvartal
 BarCodePrintsheet=Print barcodes
-PageToGenerateBarCodeSheets=With this tool, you can print sheets of barcode stickers. Choose format of your sticker page, type of barcode and value of barcode, then click on button <b>%s</b>.
+PageToGenerateBarCodeSheets=Selle tööriistaga saate printida vöötkoodikleebiste lehti. Valige oma kleebise lehe vorming, vöötkoodi tüüp ja vöötkoodi väärtus, seejärel klõpsake nuppu <b> %s </b> .
 NumberOfStickers=Lehele prinditavate kleepsude arv
 PrintsheetForOneBarCode=Prindi ühe vöötkoodi jaoks mitu etiketti
 BuildPageToPrint=Loo prinditav leht
@@ -300,7 +300,7 @@ MinSupplierPrice=Minimaalne ostuhind
 MinCustomerPrice=Minimum selling price
 NoDynamicPrice=No dynamic price
 DynamicPriceConfiguration=Dynamic price configuration
-DynamicPriceDesc=You may define mathematical formulae to calculate Customer or Vendor prices. Such formulas can use all mathematical operators, some constants and variables. You can define here the variables you wish to use. If the variable needs an automatic update, you may define the external URL to allow Dolibarr to update the value automatically.
+DynamicPriceDesc=Kliendi või hankija hindade arvutamiseks võite määratleda matemaatilised valemid. Sellised valemid võivad kasutada kõiki matemaatilisi operaatoreid, mõningaid konstante ja muutujaid. Siin saate määratleda muutujad, mida soovite kasutada. Kui muutuja vajab automaatset värskendamist, võite määrata välise URL-i, et Dolibarr saaks väärtust automaatselt värskendada.
 AddVariable=Add Variable
 AddUpdater=Add Updater
 GlobalVariables=Global variables
@@ -313,7 +313,7 @@ GlobalVariableUpdaterType1=WebService andmed
 GlobalVariableUpdaterHelp1=Parses WebService data from specified URL, NS specifies the namespace, VALUE specifies the location of relevant value, DATA should contain the data to send and METHOD is the calling WS method
 GlobalVariableUpdaterHelpFormat1=Format for request is {"URL": "http://example.com/urlofws", "VALUE": "array,targetvalue", "NS": "http://example.com/urlofns", "METHOD": "myWSMethod", "DATA": {"your": "data", "to": "send"}}
 UpdateInterval=Uuendamise intervall (minutities)
-LastUpdated=Latest update
+LastUpdated=Viimane värskendus
 CorrectlyUpdated=Õigesti uuendatud
 PropalMergePdfProductActualFile=Files use to add into PDF Azur are/is
 PropalMergePdfProductChooseFile=Select PDF files
@@ -324,9 +324,9 @@ DefaultUnitToShow=Ühik
 NbOfQtyInProposals=Qty in proposals
 ClinkOnALinkOfColumn=Click on a link of column %s to get a detailed view...
 ProductsOrServicesTranslations=Products/Services translations
-TranslatedLabel=Translated label
-TranslatedDescription=Translated description
-TranslatedNote=Translated notes
+TranslatedLabel=Tõlgitud silt
+TranslatedDescription=Tõlgitud kirjeldus
+TranslatedNote=Tõlgitud märkmed
 ProductWeight=Weight for 1 product
 ProductVolume=Volume for 1 product
 WeightUnits=Weight unit
@@ -345,10 +345,10 @@ PossibleValues=Possible values
 GoOnMenuToCreateVairants=Go on menu %s - %s to prepare attribute variants (like colors, size, ...)
 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 the "packaging" feature to round the quantities to some given multiples (when adding/updating line in a vendor documents, recalculate quantities and purchase prices according to the higher multiple set on the purchase prices of a product)
+UseProductSupplierPackaging=Kasutage funktsiooni "pakendamine" koguste ümardamiseks teatud kordseteks (tarnija dokumentides rea lisamisel/värskendamisel arvutage kogused ja ostuhinnad ümber vastavalt toote ostuhindadele määratud kõrgemale kordsele)
 PackagingForThisProduct=Packaging of quantities
 PackagingForThisProductDesc=You will automaticaly purchase a multiple of this quantity.
-QtyRecalculatedWithPackaging=The quantity of the line were recalculated according to supplier packaging
+QtyRecalculatedWithPackaging=Liini kogus arvutati ümber vastavalt tarnija pakenditele
 
 #Attributes
 VariantAttributes=Variant attributes
diff --git a/htdocs/langs/et_EE/projects.lang b/htdocs/langs/et_EE/projects.lang
index b2767cd0033..90d28630d0b 100644
--- a/htdocs/langs/et_EE/projects.lang
+++ b/htdocs/langs/et_EE/projects.lang
@@ -94,21 +94,21 @@ ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GanttView=Gantt View
 ListWarehouseAssociatedProject=List of warehouses associated to the project
-ListProposalsAssociatedProject=List of the commercial proposals related to the project
-ListOrdersAssociatedProject=List of sales orders related to the project
-ListInvoicesAssociatedProject=List of customer invoices related to the project
-ListPredefinedInvoicesAssociatedProject=List of customer template invoices related to the project
-ListSupplierOrdersAssociatedProject=List of purchase orders related to the project
-ListSupplierInvoicesAssociatedProject=List of vendor invoices related to the project
-ListContractAssociatedProject=List of contracts related to the project
-ListShippingAssociatedProject=List of shippings related to the project
-ListFichinterAssociatedProject=List of interventions related to the project
-ListExpenseReportsAssociatedProject=List of expense reports related to the project
-ListDonationsAssociatedProject=List of donations related to the project
-ListVariousPaymentsAssociatedProject=List of miscellaneous payments related to the project
-ListSalariesAssociatedProject=List of payments of salaries related to the project
-ListActionsAssociatedProject=List of events related to the project
-ListMOAssociatedProject=List of manufacturing orders related to the project
+ListProposalsAssociatedProject=Projektiga seotud äripakkumiste loend
+ListOrdersAssociatedProject=Projektiga seotud müügitellimuste nimekiri
+ListInvoicesAssociatedProject=Projektiga seotud kliendiarvete nimekiri
+ListPredefinedInvoicesAssociatedProject=Projektiga seotud kliendi mallarvete loend
+ListSupplierOrdersAssociatedProject=Projektiga seotud ostutellimuste nimekiri
+ListSupplierInvoicesAssociatedProject=Projektiga seotud hankija arvete loend
+ListContractAssociatedProject=Projektiga seotud lepingute loetelu
+ListShippingAssociatedProject=Projektiga seotud saadetiste nimekiri
+ListFichinterAssociatedProject=Projektiga seotud sekkumiste loetelu
+ListExpenseReportsAssociatedProject=Projektiga seotud kuluaruannete loetelu
+ListDonationsAssociatedProject=Projektiga seotud annetuste nimekiri
+ListVariousPaymentsAssociatedProject=Projektiga seotud mitmesuguste maksete loetelu
+ListSalariesAssociatedProject=Projektiga seotud palkade väljamaksete nimekiri
+ListActionsAssociatedProject=Projektiga seotud sündmuste nimekiri
+ListMOAssociatedProject=Projektiga seotud tootmistellimuste nimekiri
 ListTaskTimeUserProject=List of time consumed on tasks of project
 ListTaskTimeForTask=List of time consumed on task
 ActivityOnProjectToday=Activity on project today
@@ -188,9 +188,9 @@ SelectElement=Vali element
 AddElement=Seosta elemendiga
 LinkToElementShort=Seosta
 # Documents models
-DocumentModelBeluga=Project document template for linked objects overview
-DocumentModelBaleine=Project document template for tasks
-DocumentModelTimeSpent=Project report template for time spent
+DocumentModelBeluga=Projekti dokumendi mall lingitud objektide ülevaate jaoks
+DocumentModelBaleine=Projekti dokumendi mall ülesannete jaoks
+DocumentModelTimeSpent=Projekti aruande mall ajakulu kohta
 PlannedWorkload=Planeeritav koormus
 PlannedWorkloadShort=Workload
 ProjectReferers=Seotud elemendid
@@ -244,13 +244,13 @@ OppStatusWON=Won
 OppStatusLOST=Lost
 Budget=Eelarve
 AllowToLinkFromOtherCompany=Allow to link an element with a project of other company<br><br><u>Supported values:</u><br>- Keep empty: Can link elements with any projects in the same company (default)<br>- "all": Can link elements with any projects, even projects of other companies<br>- A list of third-party ids separated by commas: can link elements with any projects of these third partys (Example: 123,4795,53)<br>
-LatestProjects=Latest %s projects
+LatestProjects=Viimased %s projektid
 LatestModifiedProjects=Viimased %s muudetud projekti
 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
+ChooseANotYetAssignedTask=Valige ülesanne, mis pole teile veel määratud
 # Comments trans
 AllowCommentOnTask=Allow user comments on tasks
 AllowCommentOnProject=Allow user comments on projects
@@ -284,7 +284,7 @@ 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
+ProfitIsCalculatedWith=Kasum arvutatakse kasutades
 AddPersonToTask=Add also to tasks
 UsageOrganizeEvent=Usage: Event Organization
 PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=Classify project as closed when all its tasks are completed (100%% progress)
diff --git a/htdocs/langs/et_EE/salaries.lang b/htdocs/langs/et_EE/salaries.lang
index b231479c53c..884b3173f89 100644
--- a/htdocs/langs/et_EE/salaries.lang
+++ b/htdocs/langs/et_EE/salaries.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - salaries
-SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accounting account used for user third parties
-SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=The dedicated accounting account defined on user card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated user accounting account on user is not defined.
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Account (from the Chart of Account) used by default for "user" third parties
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=The dedicated account defined on user card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated user accounting account on user is not defined.
 SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accounting account by default for wage payments
 CREATE_NEW_SALARY_WITHOUT_AUTO_PAYMENT=By default, leave empty the option "Automatically create a total payment" when creating a Salary
 Salary=Palk
@@ -13,14 +13,15 @@ SalaryPayment=Palga makse
 SalariesPayments=Palkade maksed
 SalariesPaymentsOf=Salaries payments of %s
 ShowSalaryPayment=Näita palga makset
-THM=Average hourly rate
-TJM=Average daily rate
+THM=Keskmine tunnitasu
+TJM=Keskmine päevamäär
 CurrentSalary=Current salary
 THMDescription=This value may be used to calculate the cost of time consumed on a project entered by users if module project is used
 TJMDescription=This value is currently for information only and is not used for any calculation
-LastSalaries=Latest %s salaries
+LastSalaries=Viimased %s palgad
 AllSalaries=All salaries
 SalariesStatistics=Salary statistics
 SalariesAndPayments=Salaries and payments
 ConfirmDeleteSalaryPayment=Do you want to delete this salary payment ?
 FillFieldFirst=Fill employee field first
+UpdateAmountWithLastSalary=Set amount of last salary
diff --git a/htdocs/langs/et_EE/sendings.lang b/htdocs/langs/et_EE/sendings.lang
index ce471761e73..54db7294e0a 100644
--- a/htdocs/langs/et_EE/sendings.lang
+++ b/htdocs/langs/et_EE/sendings.lang
@@ -10,7 +10,7 @@ Receivings=Delivery Receipts
 SendingsArea=Saadetiste ala
 ListOfSendings=Saadetiste nimekiri
 SendingMethod=Saatmisviis
-LastSendings=Latest %s shipments
+LastSendings=Viimased %s saadetised
 StatisticsOfSendings=Saadetiste statistika
 NbOfSendings=Saadetiste arv
 NumberOfShipmentsByMonth=Saadetiste arv kuude järgi
@@ -48,7 +48,7 @@ DateDeliveryPlanned=Planned date of delivery
 RefDeliveryReceipt=Ref delivery receipt
 StatusReceipt=Status delivery receipt
 DateReceived=Saadetise kättesaamise kuupäev
-ClassifyReception=Classify reception
+ClassifyReception=Classify Received
 SendShippingByEMail=Send shipment by email
 SendShippingRef=Submission of shipment %s
 ActionsOnShipping=Saatmisel toimuvad tegevused
@@ -59,7 +59,7 @@ ProductQtyInCustomersOrdersRunning=Product quantity from open sales orders
 ProductQtyInSuppliersOrdersRunning=Product quantity from open purchase orders
 ProductQtyInShipmentAlreadySent=Product quantity from open sales order already sent
 ProductQtyInSuppliersShipmentAlreadyRecevied=Product quantity from open purchase orders already received
-NoProductToShipFoundIntoStock=No product to ship found in warehouse <b>%s</b>. Correct stock or go back to choose another warehouse.
+NoProductToShipFoundIntoStock=Laost ei leitud ühtegi tarnitavat toodet <b> %s </b> . Parandage laoseisu või minge tagasi, et valida mõni muu ladu.
 WeightVolShort=Weight/Vol.
 ValidateOrderFirstBeforeShipment=You must first validate the order before being able to make shipments.
 
@@ -74,3 +74,8 @@ SumOfProductWeights=Toodete kaalude summa
 # warehouse details
 DetailWarehouseNumber= Warehouse details
 DetailWarehouseFormat= W:%s (Qty: %d)
+
+ShipmentDistribution=Shipment distribution
+
+ErrorTooManyCombinationBatchcode=No dispatch for line %s as too many combination warehouse, product, batch code was found (%s).
+ErrorNoCombinationBatchcode=No dispatch for line %s as no combination warehouse, product, batch code was found.
diff --git a/htdocs/langs/et_EE/stocks.lang b/htdocs/langs/et_EE/stocks.lang
index 1082daa52af..649f3d8e19f 100644
--- a/htdocs/langs/et_EE/stocks.lang
+++ b/htdocs/langs/et_EE/stocks.lang
@@ -24,6 +24,7 @@ StockAtDateInFuture=Date in the future
 StocksByLotSerial=Stocks by lot/serial
 LotSerial=Lots/Serials
 LotSerialList=List of lot/serials
+SubjectToLotSerialOnly=Products subject to lot/serial only
 Movements=Liikumised
 ErrorWarehouseRefRequired=Lao viide on nõutud
 ListOfWarehouses=Ladude nimekiri
@@ -40,15 +41,15 @@ Location=Asukoht
 LocationSummary=Short name of location
 NumberOfDifferentProducts=Number of unique products
 NumberOfProducts=Toodete koguarv
-LastMovement=Latest movement
-LastMovements=Latest movements
+LastMovement=Viimane liikumine
+LastMovements=Viimased liikumised
 Units=Ühikud
 Unit=Ühik
 StockCorrection=Stock correction
 CorrectStock=Õige laojääk
 StockTransfer=Laojäägi ülekanne
 TransferStock=Transfer stock
-MassStockTransferShort=Mass stock transfer
+MassStockTransferShort=Bulk stock change
 StockMovement=Stock movement
 StockMovements=Stock movements
 NumberOfUnit=Ühikute arv
@@ -73,8 +74,8 @@ QtyDispatched=Saadetud kogus
 QtyDispatchedShort=Qty dispatched
 QtyToDispatchShort=Qty to dispatch
 OrderDispatch=Item receipts
-RuleForStockManagementDecrease=Choose Rule for automatic stock decrease (manual decrease is always possible, even if an automatic decrease rule is activated)
-RuleForStockManagementIncrease=Choose Rule for automatic stock increase (manual increase is always possible, even if an automatic increase rule is activated)
+RuleForStockManagementDecrease=Valige laoseisu automaatse vähendamise reegel (käsitsi vähendamine on alati võimalik, isegi kui automaatse vähendamise reegel on aktiveeritud)
+RuleForStockManagementIncrease=Valige laoseisu automaatse suurendamise reegel (käsitsi suurendamine on alati võimalik, isegi kui automaatse suurendamise reegel on aktiveeritud)
 DeStockOnBill=Decrease real stocks on validation of customer invoice/credit note
 DeStockOnValidateOrder=Decrease real stocks on validation of sales order
 DeStockOnShipment=Decrease real stocks on shipping validation
@@ -98,7 +99,7 @@ RealStockWillAutomaticallyWhen=The real stock will be modified according to this
 VirtualStock=Virtuaalne laojääk
 VirtualStockAtDate=Virtual stock at a future date
 VirtualStockAtDateDesc=Virtual stock once all the pending orders that are planned to be processed before the chosen date will be finished
-VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped, manufacturing orders produced, etc)
+VirtualStockDesc=Virtual stock is the stock that will remain after all open/pending actions (that affect stocks) have been performed (purchase orders received, sales orders shipped, manufacturing orders produced, etc)
 AtDate=At date
 IdWarehouse=Lao ID
 DescWareHouse=Lao kirjeldus
@@ -146,8 +147,9 @@ Replenishments=Värskendamised
 NbOfProductBeforePeriod=Toote %s laojääk enne valitud perioodi (< %s)
 NbOfProductAfterPeriod=Toote %s laojääk pärast valitud perioodi (> %s)
 MassMovement=Mass movement
-SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click on "%s".
+SelectProductInAndOutWareHouse=Select a source warehouse (optional), a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click on "%s".
 RecordMovement=Record transfer
+RecordMovements=Record stock movements
 ReceivingForSameOrder=Receipts for this order
 StockMovementRecorded=Stock movements recorded
 RuleForStockAvailability=Rules on stock requirements
@@ -171,10 +173,11 @@ ThisSerialAlreadyExistWithDifferentDate=This lot/serial number (<strong>%s</stro
 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
+OptionMULTIPRICESIsOn=Valik "mitu hinda segmendi kohta" on sisse lülitatud. See tähendab, et tootel on mitu müügihinda, nii et müügiväärtust ei saa arvutada
 ProductStockWarehouseCreated=Stock limit for alert and desired optimal stock correctly created
 ProductStockWarehouseUpdated=Stock limit for alert and desired optimal stock correctly updated
 ProductStockWarehouseDeleted=Stock limit for alert and desired optimal stock correctly deleted
+ProductStockWarehouse=Stock limit for alert and desired optimal stock by product and warehouse
 AddNewProductStockWarehouse=Set new limit for alert and desired optimal stock
 AddStockLocationLine=Decrease quantity then click to split the line
 InventoryDate=Inventory date
@@ -186,7 +189,7 @@ inventoryReadPermission=View inventories
 inventoryWritePermission=Update inventories
 inventoryValidatePermission=Validate inventory
 inventoryDeletePermission=Delete inventory
-inventoryTitle=Inventory
+inventoryTitle=Laoseis
 inventoryListTitle=Inventories
 inventoryListEmpty=No inventory in progress
 inventoryCreateDelete=Create/Delete inventory
@@ -202,7 +205,7 @@ inventoryMvtStock=By inventory
 inventoryWarningProductAlreadyExists=This product is already into list
 SelectCategory=Kategooriate filter
 SelectFournisseur=Vendor filter
-inventoryOnDate=Inventory
+inventoryOnDate=Laoseis
 INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Stock movements will have the date of inventory (instead of the date of inventory validation)
 inventoryChangePMPPermission=Allow to change PMP value for a product
 ColumnNewPMP=New unit PMP
@@ -214,7 +217,7 @@ CurrentPA=Curent BP
 RecordedQty=Recorded Qty
 RealQty=Real Qty
 RealValue=Real Value
-RegulatedQty=Regulated Qty
+RegulatedQty=Reguleeritud kogus
 AddInventoryProduct=Add product to inventory
 AddProduct=Lisa
 ApplyPMP=Apply PMP
@@ -223,7 +226,7 @@ ConfirmFlushInventory=Do you confirm this action?
 InventoryFlushed=Inventory flushed
 ExitEditMode=Exit edition
 inventoryDeleteLine=Kustuta rida
-RegulateStock=Regulate Stock
+RegulateStock=Varude reguleerimine
 ListInventory=Loend
 StockSupportServices=Stock management supports Services
 StockSupportServicesDesc=By default, you can stock only products of type "product". You may also stock a product of type "service" if both module Services and this option are enabled.
@@ -234,9 +237,9 @@ StockIncrease=Stock increase
 StockDecrease=Stock decrease
 InventoryForASpecificWarehouse=Inventory for a specific warehouse
 InventoryForASpecificProduct=Inventory for a specific product
-StockIsRequiredToChooseWhichLotToUse=Stock is required to choose which lot to use
+StockIsRequiredToChooseWhichLotToUse=Olemasolev laovaru on vajalik selleks, et oleks võimalik valida, millist partii kasutada
 ForceTo=Force to
-AlwaysShowFullArbo=Display full tree of warehouse on popup of warehouse links (Warning: This may decrease dramatically performances)
+AlwaysShowFullArbo=Display the full path of a warehouse (parent warehouses) on the popup of warehouse links (Warning: This may decrease dramatically performances)
 StockAtDatePastDesc=You can view here the stock (real stock) at a given date in the past
 StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in the future
 CurrentStock=Current stock
@@ -270,7 +273,7 @@ InventoryStartedShort=Alustatud
 ErrorOnElementsInventory=Operation canceled for the following reason:
 ErrorCantFindCodeInInventory=Can't find the following code in inventory
 QtyWasAddedToTheScannedBarcode=Success !! The quantity was added to all the requested barcode. You can close the Scanner tool.
-StockChangeDisabled=Change on stock disabled
+StockChangeDisabled=Stock change disabled
 NoWarehouseDefinedForTerminal=No warehouse defined for terminal
 ClearQtys=Clear all quantities
 ModuleStockTransferName=Advanced Stock Transfer
@@ -315,3 +318,8 @@ StockTransferRightRead=Read stocks transfers
 StockTransferRightCreateUpdate=Create/Update stocks transfers
 StockTransferRightDelete=Delete stocks transfers
 BatchNotFound=Lot / serial not found for this product
+StockMovementWillBeRecorded=Stock movement will be recorded
+StockMovementNotYetRecorded=Stock movement will not be affected by this step
+WarningThisWIllAlsoDeleteStock=Warning, this will also destroy all quantities in stock in the warehouse
+DeleteBatch=Delete lot/serial
+ConfirmDeleteBatch=Are you sure you want to delete lot/serial ?
diff --git a/htdocs/langs/et_EE/supplier_proposal.lang b/htdocs/langs/et_EE/supplier_proposal.lang
index 36e7336e019..3fb45007b34 100644
--- a/htdocs/langs/et_EE/supplier_proposal.lang
+++ b/htdocs/langs/et_EE/supplier_proposal.lang
@@ -1,54 +1,59 @@
 # Dolibarr language file - Source file is en_US - supplier_proposal
-SupplierProposal=Vendor commercial proposals
-supplier_proposalDESC=Manage price requests to suppliers
-SupplierProposalNew=New price request
-CommRequest=Price request
-CommRequests=Price requests
-SearchRequest=Find a request
-DraftRequests=Draft requests
-SupplierProposalsDraft=Draft vendor proposals
-LastModifiedRequests=Latest %s modified price requests
-RequestsOpened=Open price requests
-SupplierProposalArea=Vendor proposals area
-SupplierProposalShort=Vendor proposal
-SupplierProposals=Vendor proposals
-SupplierProposalsShort=Vendor proposals
-NewAskPrice=New price request
-ShowSupplierProposal=Show price request
-AddSupplierProposal=Create a price request
-SupplierProposalRefFourn=Vendor ref
+SupplierProposal=Tarnija äripakkumised
+supplier_proposalDESC=Halda hinnapäringuid tarnijatele
+SupplierProposalNew=Uus hinnapäring
+CommRequest=Hinnapäring
+CommRequests=Hinnapäringud
+SearchRequest=Leia päring
+DraftRequests=Päringumustandid
+SupplierProposalsDraft=Tarnija pakkumiste mustandid
+LastModifiedRequests=Viimati muudetud %s hinnapäringut
+RequestsOpened=Avatud hinnapäringud
+SupplierProposalArea=Tarnija pakkumiste ala
+SupplierProposalShort=Tarnija pakkumine
+SupplierProposals=Tarnija pakkumised
+SupplierProposalsShort=Tarnija pakkumised
+AskPrice=Hinnapäring
+NewAskPrice=Uus hinnapäring
+ShowSupplierProposal=Näita hinnapäringut
+AddSupplierProposal=Loo hinnapäring
+SupplierProposalRefFourn=Tarnija viide
 SupplierProposalDate=Kohaletoimetamise kuupäev
-SupplierProposalRefFournNotice=Before closing to "Accepted", think to grasp suppliers references.
-ConfirmValidateAsk=Are you sure you want to validate this price request under name <b>%s</b>?
-DeleteAsk=Delete request
-ValidateAsk=Validate request
+SupplierProposalRefFournNotice=Enne sulgemist olekusse "vastu võetud", mõtle tarnija soovituste mõistmisele
+ConfirmValidateAsk=Kas tahad kindlasti seda hinnapäringut kinnitada nimega <b>%s</b>?
+DeleteAsk=Kustuta päring
+ValidateAsk=Kinnita päring
 SupplierProposalStatusDraft=Mustand (vajab kinnitamist)
-SupplierProposalStatusValidated=Validated (request is open)
+SupplierProposalStatusValidated=Kinnitatud (päring on lahti)
 SupplierProposalStatusClosed=Suletud
-SupplierProposalStatusSigned=Accepted
+SupplierProposalStatusSigned=Vastu võetud
 SupplierProposalStatusNotSigned=Keeldutud
 SupplierProposalStatusDraftShort=Mustand
 SupplierProposalStatusValidatedShort=Kinnitatud
 SupplierProposalStatusClosedShort=Suletud
-SupplierProposalStatusSignedShort=Accepted
+SupplierProposalStatusSignedShort=Vastu võetud
 SupplierProposalStatusNotSignedShort=Keeldutud
-CopyAskFrom=Create price request by copying existing a request
-CreateEmptyAsk=Create blank request
-ConfirmCloneAsk=Are you sure you want to clone the price request <b>%s</b>?
-ConfirmReOpenAsk=Are you sure you want to open back the price request <b>%s</b>?
-SendAskByMail=Send price request by mail
-SendAskRef=Sending the price request %s
-SupplierProposalCard=Request card
-ConfirmDeleteAsk=Are you sure you want to delete this price request <b>%s</b>?
-ActionsOnSupplierProposal=Events on price request
-DocModelAuroreDescription=A complete request model (logo...)
-CommercialAsk=Price request
+CopyAskFrom=Loo hinnapäring kopeerides olemasolevat päringut
+CreateEmptyAsk=Loo tühi päring
+ConfirmCloneAsk=Kas tahad kindlasti kloonida hinnapäringut <b>%s</b> ?
+ConfirmReOpenAsk=Kas tahad kindlasti avada uuesti hinnapäringut <b>%s</b>?
+SendAskByMail=Saada hinnapäring postiga
+SendAskRef=Hinnapäringu %s saatmine
+SupplierProposalCard=Päringu kaart
+ConfirmDeleteAsk=Kas tahad kindlasti kustutada hinnapäringut <b>%s</b>?
+ActionsOnSupplierProposal=Tegevused hinnapäringuga
+DocModelAuroreDescription=A complete template for a vendor quotation request template (old implementation of Sponge template)
+DocModelZenithDescription=A complete template for a vendor quotation request template
+CommercialAsk=Hinnapäring
 DefaultModelSupplierProposalCreate=Vaikimisi mudeli loomine
-DefaultModelSupplierProposalToBill=Default template when closing a price request (accepted)
-DefaultModelSupplierProposalClosed=Default template when closing a price request (refused)
-ListOfSupplierProposals=List of vendor proposal requests
-ListSupplierProposalsAssociatedProject=List of vendor proposals associated with project
-SupplierProposalsToClose=Vendor proposals to close
-SupplierProposalsToProcess=Vendor proposals to process
-LastSupplierProposals=Latest %s price requests
-AllPriceRequests=All requests
+DefaultModelSupplierProposalToBill=Vaikimisi mall hinnapäringu sulgemiseks (vastu võetud)
+DefaultModelSupplierProposalClosed=Vaikimisi mall hinnapäringu sulgemiseks (keeldutud)
+ListOfSupplierProposals=Tarnija pakkumiskutsete nimekiri
+ListSupplierProposalsAssociatedProject=Projektiga seotud tarnija pakkumiste nimestik
+SupplierProposalsToClose=Suletavad tarnija pakkumised
+SupplierProposalsToProcess=Töödeldavad tarnija pakkumised
+LastSupplierProposals=Viimased %s hinnapäringud
+AllPriceRequests=Kõik päringud
+TypeContact_supplier_proposal_external_SHIPPING=Tarnija kontakt saadetisteks
+TypeContact_supplier_proposal_external_BILLING=Tarnija kontakt arveldamiseks
+TypeContact_supplier_proposal_external_SERVICE=Pakkumise järelvalvega tegelev esindaja
diff --git a/htdocs/langs/et_EE/suppliers.lang b/htdocs/langs/et_EE/suppliers.lang
index 9aa574d97a1..dfee18a940d 100644
--- a/htdocs/langs/et_EE/suppliers.lang
+++ b/htdocs/langs/et_EE/suppliers.lang
@@ -4,6 +4,7 @@ SuppliersInvoice=Tarnija arve
 SupplierInvoices=Tarnija arved
 ShowSupplierInvoice=Show Vendor Invoice
 NewSupplier=New vendor
+NewSupplierInvoice = New vendor invoice
 History=Ajalugu
 ListOfSuppliers=List of vendors
 ShowSupplier=Show vendor
@@ -20,7 +21,7 @@ ReferenceSupplierIsAlreadyAssociatedWithAProduct=This vendor reference is alread
 NoRecordedSuppliers=No vendor recorded
 SupplierPayment=Tarnija makse
 SuppliersArea=Vendor area
-RefSupplierShort=Ref. vendor
+RefSupplierShort=Tarnija viide
 Availability=Kättesaadavus
 ExportDataset_fournisseur_1=Vendor invoices and invoice details
 ExportDataset_fournisseur_2=Vendor invoices and payments
@@ -47,3 +48,10 @@ BuyerName=Buyer name
 AllProductServicePrices=All product / service prices
 AllProductReferencesOfSupplier=All references of vendor
 BuyingPriceNumShort=Vendor prices
+RepeatableSupplierInvoice=Tarnija arve mall
+RepeatableSupplierInvoices=Tarnija arvete mall
+RepeatableSupplierInvoicesList=Tarnija arvete mall
+RecurringSupplierInvoices=Recurring supplier invoices
+ToCreateAPredefinedSupplierInvoice=In order to create template supplier invoice, you must create a standard invoice, then, without validating it, click on the "%s" button.
+GeneratedFromSupplierTemplate=Generated from supplier invoice template %s
+SupplierInvoiceGeneratedFromTemplate=Supplier invoice %s Generated from supplier invoice template %s
diff --git a/htdocs/langs/et_EE/ticket.lang b/htdocs/langs/et_EE/ticket.lang
index 3b3b5097fd8..cd6a28f52c4 100644
--- a/htdocs/langs/et_EE/ticket.lang
+++ b/htdocs/langs/et_EE/ticket.lang
@@ -211,7 +211,7 @@ TicketProperties=Classification
 LatestNewTickets=Latest %s newest tickets (not read)
 TicketSeverity=Severity
 ShowTicket=See ticket
-RelatedTickets=Related tickets
+RelatedTickets=Seotud piletid
 TicketAddIntervention=Loo sekkumine
 CloseTicket=Close|Solve
 AbandonTicket=Abandon
diff --git a/htdocs/langs/et_EE/trips.lang b/htdocs/langs/et_EE/trips.lang
index 738b4693685..33882b0d4a1 100644
--- a/htdocs/langs/et_EE/trips.lang
+++ b/htdocs/langs/et_EE/trips.lang
@@ -1,150 +1,152 @@
 # Dolibarr language file - Source file is en_US - trips
-ShowExpenseReport=Show expense report
-Trips=Expense reports
-TripsAndExpenses=Expenses reports
-TripsAndExpensesStatistics=Expense reports statistics
-TripCard=Expense report card
+AUTHOR=Recorded by
+AUTHORPAIEMENT=Maksis
 AddTrip=Create expense report
-ListOfTrips=List of expense reports
-ListOfFees=List tasude
-TypeFees=Types of fees
-ShowTrip=Show expense report
-NewTrip=New expense report
-LastExpenseReports=Latest %s expense reports
+AllExpenseReport=All type of expense report
 AllExpenseReports=All expense reports
-CompanyVisited=Company/organization visited
-FeesKilometersOrAmout=Summa või kilomeetrites
-DeleteTrip=Delete expense report
-ConfirmDeleteTrip=Are you sure you want to delete this expense report?
-ListTripsAndExpenses=List of expense reports
-ListToApprove=Waiting for approval
-ExpensesArea=Expense reports area
+AnyOtherInThisListCanValidate=Person to be informed for validating the request.
+AttachTheNewLineToTheDocument=Attach the line to an uploaded document
+AucuneLigne=There is no expense report declared yet
+BrouillonnerTrip=Move back expense report to status "Draft"
+byEX_DAY=by day (limitation to %s)
+byEX_EXP=by line (limitation to %s)
+byEX_MON=by month (limitation to %s)
+byEX_YEA=by year (limitation to %s)
+CANCEL_USER=Deleted by
+CarCategory=Vehicle category
 ClassifyRefunded=Classify 'Refunded'
+CompanyVisited=Company/organization visited
+ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft"?
+ConfirmCancelTrip=Are you sure you want to cancel this expense report?
+ConfirmCloneExpenseReport=Are you sure you want to clone this expense report ?
+ConfirmDeleteTrip=Are you sure you want to delete this expense report?
+ConfirmPaidTrip=Are you sure you want to change status of this expense report to "Paid"?
+ConfirmRefuseTrip=Are you sure you want to deny this expense report?
+ConfirmSaveTrip=Are you sure you want to validate this expense report?
+ConfirmValideTrip=Are you sure you want to approve this expense report?
+DATE_CANCEL=Cancelation date
+DATE_PAIEMENT=Maksekuupäev
+DATE_REFUS=Deny date
+DATE_SAVE=Kinnitamise kuupäev
+DefaultCategoryCar=Default transportation mode
+DefaultRangeNumber=Default range number
+DeleteTrip=Delete expense report
+ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
+Error_EXPENSEREPORT_ADDON_NotDefined=Error, the rule for expense report numbering ref was not defined into setup of module 'Expense Report'
+ExpenseRangeOffset=Offset amount: %s
+expenseReportCatDisabled=Category disabled - see the c_exp_tax_cat dictionary
+expenseReportCoef=Coefficient
+expenseReportCoefUndefined=(value not defined)
+expenseReportOffset=Nihe
+expenseReportPrintExample=offset + (d x coef) = %s
+expenseReportRangeDisabled=Range disabled - see the c_exp_tax_range dictionay
+expenseReportRangeFromTo=from %d to %d
+expenseReportRangeMoreThan=more than %d
+expenseReportTotalForFive=Example with <u>d</u> = 5
+ExpenseReportApplyTo=Apply to
+ExpenseReportApproved=An expense report was approved
+ExpenseReportApprovedMessage=The expense report %s was approved.<br> - User: %s<br> - Approved by: %s<br>Click here to show the expense report: %s
+ExpenseReportCanceled=An expense report was canceled
+ExpenseReportCanceledMessage=The expense report %s was canceled.<br> - User: %s<br> - Canceled by: %s<br> - Motive for cancellation: %s<br>Click here to show the expense report: %s
+ExpenseReportConstraintViolationError=Max amount exceeded (rule %s): %s is higher than %s (Exceeding forbidden)
+ExpenseReportConstraintViolationWarning=Max amount exceeded (rule %s): %s is higher than %s (Exceeding authorized)
+ExpenseReportDateEnd=Lõppkuupäev
+ExpenseReportDateStart=Alguskuupäev
+ExpenseReportDomain=Domain to apply
+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
+ExpenseReportLimitAmount=Max amount
+ExpenseReportLimitOn=Limit on
+ExpenseReportLine=Expense report line
+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
+ExpenseReportPayment=Expense report payment
+ExpenseReportRef=Ref. expense report
+ExpenseReportRefused=An expense report was refused
+ExpenseReportRefusedMessage=The expense report %s was refused.<br> - User: %s<br> - Refused by: %s<br> - Motive for refusal: %s<br>Click here to show the expense report: %s
+ExpenseReportRestrictive=Exceeding forbidden
+ExpenseReportRuleErrorOnSave=Error: %s
+ExpenseReportRuleSave=Expense report rule saved
+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
 ExpenseReportWaitingForApproval=A new expense report has been submitted for approval
 ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.<br> - User: %s<br> - Period: %s<br>Click here to validate: %s
 ExpenseReportWaitingForReApproval=An expense report has been submitted for re-approval
 ExpenseReportWaitingForReApprovalMessage=An expense report has been submitted and is waiting for re-approval.<br>The %s, you refused to approve the expense report for this reason: %s.<br>A new version has been proposed and waiting for your approval.<br> - User: %s<br> - Period: %s<br>Click here to validate: %s
-ExpenseReportApproved=An expense report was approved
-ExpenseReportApprovedMessage=The expense report %s was approved.<br> - User: %s<br> - Approved by: %s<br>Click here to show the expense report: %s
-ExpenseReportRefused=An expense report was refused
-ExpenseReportRefusedMessage=The expense report %s was refused.<br> - User: %s<br> - Refused by: %s<br> - Motive for refusal: %s<br>Click here to show the expense report: %s
-ExpenseReportCanceled=An expense report was canceled
-ExpenseReportCanceledMessage=The expense report %s was canceled.<br> - User: %s<br> - Canceled by: %s<br> - Motive for cancellation: %s<br>Click here to show the expense report: %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 be informed for validating the request.
-TripSociete=Information company
-TripNDF=Informations expense report
-PDFStandardExpenseReports=Standard template to generate a PDF document for expense report
-ExpenseReportLine=Expense report line
-TF_OTHER=Muu
-TF_TRIP=Transportation
-TF_LUNCH=Lõuna
-TF_METRO=Metro
-TF_TRAIN=Train
-TF_BUS=Bus
-TF_CAR=Car
-TF_PEAGE=Toll
-TF_ESSENCE=Fuel
-TF_HOTEL=Hotel
-TF_TAXI=Taxi
-EX_KME=Mileage costs
-EX_FUE=Fuel CV
-EX_HOT=Hotel
-EX_PAR=Parking CV
-EX_TOL=Toll CV
-EX_TAX=Various Taxes
-EX_IND=Indemnity transportation subscription
-EX_SUM=Maintenance supply
-EX_SUO=Office supplies
-EX_CAR=Car rental
-EX_DOC=Documentation
-EX_CUR=Customers receiving
-EX_OTR=Other receiving
-EX_POS=Postage
-EX_CAM=CV maintenance and repair
-EX_EMM=Employees meal
-EX_GUM=Guests meal
-EX_BRE=Breakfast
-EX_FUE_VP=Fuel PV
-EX_TOL_VP=Toll PV
-EX_PAR_VP=Parking PV
-EX_CAM_VP=PV maintenance and repair
-DefaultCategoryCar=Default transportation mode
-DefaultRangeNumber=Default range number
-UploadANewFileNow=Upload a new document now
-Error_EXPENSEREPORT_ADDON_NotDefined=Error, the rule for expense report numbering ref was not defined into setup of module 'Expense Report'
-ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
-AucuneLigne=There is no expense report declared yet
-ModePaiement=Payment mode
-VALIDATOR=User responsible for approval
-VALIDOR=Kiitis heaks
-AUTHOR=Recorded by
-AUTHORPAIEMENT=Paid by
-REFUSEUR=Denied by
-CANCEL_USER=Deleted by
-MOTIF_REFUS=Põhjus
-MOTIF_CANCEL=Põhjus
-DATE_REFUS=Deny date
-DATE_SAVE=Kinnitamise kuupäev
-DATE_CANCEL=Cancelation date
-DATE_PAIEMENT=Maksekuupäev
-ExpenseReportRef=Ref. expense report
-ValidateAndSubmit=Validate and submit for approval
-ValidatedWaitingApproval=Validated (waiting for approval)
-NOT_AUTHOR=You are not the author of this expense report. Operation cancelled.
-ConfirmRefuseTrip=Are you sure you want to deny this expense report?
-ValideTrip=Approve expense report
-ConfirmValideTrip=Are you sure you want to approve this expense report?
-PaidTrip=Pay an expense report
-ConfirmPaidTrip=Are you sure you want to change status of this expense report to "Paid"?
-ConfirmCancelTrip=Are you sure you want to cancel this expense report?
-BrouillonnerTrip=Move back expense report to status "Draft"
-ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft"?
-SaveTrip=Validate expense report
-ConfirmSaveTrip=Are you sure you want to validate this expense report?
-NoTripsToExportCSV=No expense report to export for this period.
-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=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 define max amount rules for expense reports. These rules will be applied when a new expense is added to an expense report
-expenseReportOffset=Nihe
-expenseReportCoef=Coefficient
-expenseReportTotalForFive=Example with <u>d</u> = 5
-expenseReportRangeFromTo=from %d to %d
-expenseReportRangeMoreThan=more than %d
-expenseReportCoefUndefined=(value not defined)
-expenseReportCatDisabled=Category disabled - see the c_exp_tax_cat dictionary
-expenseReportRangeDisabled=Range disabled - see the c_exp_tax_range dictionay
-expenseReportPrintExample=offset + (d x coef) = %s
-ExpenseReportApplyTo=Apply to
-ExpenseReportDomain=Domain to apply
-ExpenseReportLimitOn=Limit on
-ExpenseReportDateStart=Alguskuupäev
-ExpenseReportDateEnd=Lõppkuupäev
-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=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=Max amount exceeded (rule %s): %s is higher than %s (Exceeding authorized)
+ExpenseReportsToApprove=Expense reports to approve
+ExpenseReportsToPay=Expense reports to pay
+ExpensesArea=Expense reports area
+FeesKilometersOrAmout=Summa või kilomeetrites
+LastExpenseReports=Viimased %s kuluaruanded
+ListOfFees=List tasude
+ListOfTrips=List of expense reports
+ListToApprove=Waiting for approval
+ListTripsAndExpenses=List of expense reports
+MOTIF_CANCEL=Põhjus
+MOTIF_REFUS=Põhjus
+ModePaiement=Payment mode
+NewTrip=New expense report
 nolimitbyEX_DAY=by day (no limitation)
+nolimitbyEX_EXP=by line (no limitation)
 nolimitbyEX_MON=by month (no limitation)
 nolimitbyEX_YEA=by year (no limitation)
-nolimitbyEX_EXP=by line (no limitation)
-CarCategory=Vehicle category
-ExpenseRangeOffset=Offset amount: %s
+NoTripsToExportCSV=No expense report to export for this period.
+NOT_AUTHOR=You are not the author of this expense report. Operation cancelled.
+OnExpense=Expense line
+PDFStandardExpenseReports=Standardmall kuluaruande PDF-dokumendi loomiseks
+PaidTrip=Pay an expense report
+REFUSEUR=Denied by
 RangeIk=Mileage range
-AttachTheNewLineToTheDocument=Attach the line to an uploaded document
+RangeNum=Range %d
+SaveTrip=Validate expense report
+ShowExpenseReport=Show expense report
+ShowTrip=Show expense report
+TripCard=Expense report card
+TripId=Id expense report
+TripNDF=Informations expense report
+TripSociete=Information company
+Trips=Kuluaruanded
+TripsAndExpenses=Expenses reports
+TripsAndExpensesStatistics=Expense reports statistics
+TypeFees=Types of fees
+UploadANewFileNow=Upload a new document now
+VALIDATOR=User responsible for approval
+VALIDOR=Kiitis heaks
+ValidateAndSubmit=Validate and submit for approval
+ValidatedWaitingApproval=Validated (waiting for approval)
+ValideTrip=Approve expense report
+
+## Dictionary
+EX_BRE=Breakfast
+EX_CAM=CV maintenance and repair
+EX_CAM_VP=PV maintenance and repair
+EX_CAR=Car rental
+EX_CUR=Customers receiving
+EX_DOC=Documentation
+EX_EMM=Employees meal
+EX_FUE=Fuel CV
+EX_FUE_VP=Fuel PV
+EX_GUM=Guests meal
+EX_HOT=Hotel
+EX_IND=Indemnity transportation subscription
+EX_KME=Mileage costs
+EX_OTR=Other receiving
+EX_PAR=Parking CV
+EX_PAR_VP=Parking PV
+EX_POS=Postage
+EX_SUM=Maintenance supply
+EX_SUO=Office supplies
+EX_TAX=Various Taxes
+EX_TOL=Toll CV
+EX_TOL_VP=Toll PV
+TF_BUS=Bus
+TF_CAR=Auto
+TF_ESSENCE=Fuel
+TF_HOTEL=Hotel
+TF_LUNCH=Lõuna
+TF_METRO=Metro
+TF_OTHER=Muu
+TF_PEAGE=Toll
+TF_TAXI=Taxi
+TF_TRAIN=Train
+TF_TRIP=Transportation
diff --git a/htdocs/langs/et_EE/users.lang b/htdocs/langs/et_EE/users.lang
index 910e08cd00b..02cb710a16b 100644
--- a/htdocs/langs/et_EE/users.lang
+++ b/htdocs/langs/et_EE/users.lang
@@ -12,8 +12,8 @@ PasswordChangedTo=Salasõna muudetud: %s
 SubjectNewPassword=Your new password for %s
 GroupRights=Grupi õigused
 UserRights=Kasutaja õigused
-Credentials=Credentials
-UserGUISetup=User Display Setup
+Credentials=Mandaat
+UserGUISetup=Kasutaja kuva seadistamine
 DisableUser=Keela
 DisableAUser=Keela kasutaja
 DeleteUser=Kustuta
@@ -51,8 +51,8 @@ IfLoginExistPasswordRequestSent=If this login is a valid account (with a valid e
 IfEmailExistPasswordRequestSent=If this email is a valid account, an email to reset password has been sent (remember to check your SPAM folder if you do not receive anything)
 ConfirmPasswordReset=Confirm password reset
 MenuUsersAndGroups=Kasutajad ja grupid
-LastGroupsCreated=Latest %s groups created
-LastUsersCreated=Latest %s users created
+LastGroupsCreated=Viimased loodud %s rühmad
+LastUsersCreated=Viimased %s kasutajad
 ShowGroup=Näita gruppi
 ShowUser=Näita kasutajat
 NonAffectedUsers=Sidumata kasutajad
@@ -100,30 +100,30 @@ YourQuotaOfUsersIsReached=Sinu aktiivsete kasutajate kvoot on täis!
 NbOfUsers=Number of users
 NbOfPermissions=Number of permissions
 DontDowngradeSuperAdmin=Only another admin can downgrade an admin
-HierarchicalResponsible=Supervisor
+HierarchicalResponsible=Juhendaja
 HierarchicView=Struktuuri vaade
 UseTypeFieldToChange=Kasuta muutmiseks 'Liik' välja
 OpenIDURL=OpenID URL
 LoginUsingOpenID=Kasuta sisselogimiseks OpenIDd
-WeeklyHours=Hours worked (per week)
+WeeklyHours=Töötunnid (nädalas)
 ExpectedWorkedHours=Expected hours worked per week
-ColorUser=Color of the user
+ColorUser=Kasutaja värv
 DisabledInMonoUserMode=Disabled in maintenance mode
 UserAccountancyCode=User accounting code
 UserLogoff=User logout
 UserLogged=User logged
-DateOfEmployment=Employment date
+DateOfEmployment=Tööleasumise kuupäev
 DateEmployment=Employment
-DateEmploymentStart=Employment Start Date
-DateEmploymentEnd=Employment End Date
-RangeOfLoginValidity=Access validity date range
+DateEmploymentStart=Tööle asumise alguskuupäev
+DateEmploymentEnd=Töötamise lõppkuupäev
+RangeOfLoginValidity=Juurdepääsu kehtivuse kuupäevavahemik
 CantDisableYourself=You can't disable your own user record
-ForceUserExpenseValidator=Force expense report validator
+ForceUserExpenseValidator=Sundima kuluaruande valideerija
 ForceUserHolidayValidator=Force leave request validator
-ValidatorIsSupervisorByDefault=By default, the validator is the supervisor of the user. Keep empty to keep this behaviour.
+ValidatorIsSupervisorByDefault=Vaikimisi on validaator kasutaja järelevaataja. Sellise käitumise säilitamiseks hoidke tühjana.
 UserPersonalEmail=Personal email
 UserPersonalMobile=Personal mobile phone
-WarningNotLangOfInterface=Warning, this is the main language the user speak, not the language of the interface he choosed to see. To change the interface language visible by this user, go on tab %s
+WarningNotLangOfInterface=Hoiatus, see on põhikeel, mida kasutaja räägib, mitte kasutaja valitud liidese keel. Sellele kasutajale nähtava liidese keele muutmiseks avage vahekaart %s
 DateLastLogin=Date last login
 DatePreviousLogin=Date previous login
 IPLastLogin=IP last login
diff --git a/htdocs/langs/et_EE/withdrawals.lang b/htdocs/langs/et_EE/withdrawals.lang
index db0cd032f5c..e68531fe4cf 100644
--- a/htdocs/langs/et_EE/withdrawals.lang
+++ b/htdocs/langs/et_EE/withdrawals.lang
@@ -12,8 +12,8 @@ WithdrawalsReceipts=Otsekorraldused
 WithdrawalReceipt=Direct debit order
 BankTransferReceipts=Credit transfer orders
 BankTransferReceipt=Credit transfer order
-LatestBankTransferReceipts=Latest %s credit transfer orders
-LastWithdrawalReceipts=Latest %s direct debit files
+LatestBankTransferReceipts=Viimased %s kreeditülekande korraldused
+LastWithdrawalReceipts=Uusimad %s otsekorraldusfailid
 WithdrawalsLine=Direct debit order line
 CreditTransfer=Krediidiülekanne
 CreditTransferLine=Credit transfer line
@@ -24,7 +24,7 @@ RequestStandingOrderTreated=Requests for direct debit payment order processed
 RequestPaymentsByBankTransferToTreat=Requests for credit transfer to process
 RequestPaymentsByBankTransferTreated=Requests for credit transfer processed
 NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw status must be set to 'credited' before declaring reject on specific lines.
-NbOfInvoiceToWithdraw=No. of qualified customer invoices with waiting direct debit order
+NbOfInvoiceToWithdraw=Ootel otsekorraldusega kvalifitseeritud kliendi arvete arv
 NbOfInvoiceToWithdrawWithInfo=No. of customer invoice with direct debit payment orders having defined bank account information
 NbOfInvoiceToPayByBankTransfer=No. of qualified supplier invoices waiting for a payment by credit transfer
 SupplierInvoiceWaitingWithdraw=Vendor invoice waiting for payment by credit transfer
@@ -40,7 +40,7 @@ CreditTransferSetup=Credit transfer setup
 WithdrawStatistics=Direct debit payment statistics
 CreditTransferStatistics=Credit transfer statistics
 Rejects=Tagasi lükatud
-LastWithdrawalReceipt=Latest %s direct debit receipts
+LastWithdrawalReceipt=Viimased %s otsekorralduskviitungid
 MakeWithdrawRequest=Make a direct debit payment request
 MakeWithdrawRequestStripe=Make a direct debit payment request via Stripe
 MakeBankTransferOrder=Make a credit transfer request
diff --git a/htdocs/langs/et_EE/workflow.lang b/htdocs/langs/et_EE/workflow.lang
index 595666c8aa7..99ae21a1080 100644
--- a/htdocs/langs/et_EE/workflow.lang
+++ b/htdocs/langs/et_EE/workflow.lang
@@ -3,10 +3,11 @@ WorkflowSetup=Töövoo mooduli seaded
 WorkflowDesc=This module provides some automatic actions. By default, the workflow is open (you can do things in the order you want) but here you can activate some automatic actions.
 ThereIsNoWorkflowToModify=There is no workflow modifications available with the activated modules.
 # Autocreate
-descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automatically create a sales order after a commercial proposal is signed (the new order will have same amount as the proposal)
-descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Automatically create a customer invoice after a commercial proposal is signed (the new invoice will have same amount as the proposal)
+descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Looge müügitellimus automaatselt pärast pakkumise allkirjastamist (uuel tellimusel on sama summa kui pakkumisel)
+descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Kliendi arve automaatne koostamine pärast pakkumise allkirjastamist (uuel arvel on sama summa kui pakkumisel)
 descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Automatically create a customer invoice after a contract is validated
 descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Automatically create a customer invoice after a sales order is closed (the new invoice will have same amount as the order)
+descWORKFLOW_TICKET_CREATE_INTERVENTION=On ticket creation, automatically create an intervention.
 # Autoclassify customer proposal or order
 descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal as billed when sales order is set to billed (and if the amount of the order is the same as the total amount of the signed linked proposal)
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposal as billed when customer invoice is validated (and if the amount of the invoice is the same as the total amount of the signed linked proposal)
@@ -14,13 +15,22 @@ descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source sales o
 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
+# Autoclassify purchase proposal
 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)
+# Autoclassify purchase order
 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)
-descWORKFLOW_BILL_ON_RECEPTION=Classify receptions to "billed" when a linked supplier order is validated
+descWORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION=Classify linked source purchase order as received when a reception is validated (and if the quantity received by all receptions is the same as in the purchase order to update)
+descWORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION_CLOSED=Classify linked source purchase order as received when a reception is closed (and if the quantity received by all rceptions is the same as in the purchase order to update)
+# Autoclassify purchase invoice
+descWORKFLOW_EXPEDITION_CLASSIFY_CLOSED_INVOICE=Classify receptions to "billed" when a linked purchase invoice is validated (and if the amount of the invoice is the same as the total amount of the linked receptions)
+# Automatically link ticket to contract
+descWORKFLOW_TICKET_LINK_CONTRACT=When creating a ticket, link available contracts of matching thirdparty
+descWORKFLOW_TICKET_USE_PARENT_COMPANY_CONTRACTS=When linking contracts, search among those of parents companies
 # Autoclose intervention
 descWORKFLOW_TICKET_CLOSE_INTERVENTION=Close all interventions linked to the ticket when a ticket is closed
 AutomaticCreation=Automatic creation
 AutomaticClassification=Automatic classification
 # Autoclassify shipment
-descWORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE=Classify linked source shipment as closed when customer invoice is validated
+descWORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE=Classify linked source shipment as closed when customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked shipments)
+AutomaticClosing=Automatic closing
+AutomaticLinking=Automatic linking
diff --git a/htdocs/langs/eu_ES/admin.lang b/htdocs/langs/eu_ES/admin.lang
index 9702ec53f5f..261dff9f7e6 100644
--- a/htdocs/langs/eu_ES/admin.lang
+++ b/htdocs/langs/eu_ES/admin.lang
@@ -1509,7 +1509,8 @@ WatermarkOnDraftContractCards=Watermark on draft contracts (none if empty)
 MembersSetup=Kideak moduluaren konfigurazioa
 MemberMainOptions=Aukera nagusiak
 MemberCodeChecker=Options for automatic generation of member codes
-AdherentLoginRequired= Kide bakoitzarentzat Sarrera bat kudeatu
+AdherentLoginRequired=Manage a login/password for each member
+AdherentLoginRequiredDesc=Add a value for a login and a password on the member file. If the member is linked to a user, updating the member login and password will also update the user login and password.
 AdherentMailRequired=Email required to create a new member
 MemberSendInformationByMailByDefault=Kideei posta berrespena bidaltzeko kontrol-laukia (balioztapena edo harpidetza berria) aktibatuta dago lehenespenez
 MemberCreateAnExternalUserForSubscriptionValidated=Create an external user login for each new member subscription validated
@@ -2076,6 +2077,10 @@ MAIN_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
 DOC_SHOW_FIRST_SALES_REP=Show first sales representative
 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_GENERATE_DOCUMENTS_SUPPLIER_PROPOSAL_WITHOUT_UNIT_PRICE=Hide the unit price column on quotation requests
+MAIN_GENERATE_DOCUMENTS_SUPPLIER_PROPOSAL_WITHOUT_TOTAL_COLUMN=Hide the total price column on quotation requests
+MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_UNIT_PRICE=Hide the unit price column on purchase orders
+MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_TOTAL_COLUMN=Hide the total price column on puchase orders
 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
@@ -2400,4 +2405,4 @@ OptionXShouldBeEnabledInModuleY=Option "<b>%s</b>" should be enabled into module
 OptionXIsCorrectlyEnabledInModuleY=Option "<b>%s</b>" is enabled into module <b>%s</b>
 AtBottomOfPage=At bottom of page
 FailedAuth=failed authentications
-MaxNumberOfFailedAuth=Max number of failed authentication in 24h to disable login.
+MaxNumberOfFailedAuth=Max number of failed authentication in 24h to deny login.
diff --git a/htdocs/langs/fa_IR/accountancy.lang b/htdocs/langs/fa_IR/accountancy.lang
index 9bbab37c23f..6299fbfe4e7 100644
--- a/htdocs/langs/fa_IR/accountancy.lang
+++ b/htdocs/langs/fa_IR/accountancy.lang
@@ -57,11 +57,14 @@ WarningDataDisappearsWhenDataIsExported=Warning, this list contains only the acc
 VueByAccountAccounting=View by accounting account
 VueBySubAccountAccounting=View by accounting subaccount
 
-MainAccountForCustomersNotDefined=در برپاسازی برای مشتریان حساب حساب‌داری اصلی تعریف نشده است
-MainAccountForSuppliersNotDefined=در برپاسازی برای تامین کنندگان حساب حساب‌داری اصلی تعریف نشده است
-MainAccountForUsersNotDefined=در برپاسازی برای کاربران حساب حساب‌داری اصلی تعریف نشده است
-MainAccountForVatPaymentNotDefined=در برپاسازی برای مالیات بر ارزش افزوده حساب حساب‌داری اصلی تعریف نشده است
-MainAccountForSubscriptionPaymentNotDefined=در برپاسازی برای پرداخت اشتراک حساب حساب‌داری اصلی تعریف نشده است
+MainAccountForCustomersNotDefined=Main account (from the Chart of Account) for customers not defined in setup
+MainAccountForSuppliersNotDefined=Main account (from the Chart of Account) for vendors not defined in setup
+MainAccountForUsersNotDefined=Main account (from the Chart of Account) for users not defined in setup
+MainAccountForRevenueStampSaleNotDefined=Account (from the Chart of Account) for the revenue stamp (sales) not defined in setup
+MainAccountForRevenueStampPurchaseNotDefined=Account (from the Chart of Account) for the revenue stamp (purchases) not defined in setup
+MainAccountForVatPaymentNotDefined=Account (from the Chart of Account) for VAT payment not defined in setup
+MainAccountForSubscriptionPaymentNotDefined=Account (from the Chart of Account) for membership payment not defined in setup
+MainAccountForRetainedWarrantyNotDefined=Account (from the Chart of Account) for the retained warranty not defined in setup
 UserAccountNotDefined=Accounting account for user not defined in setup
 
 AccountancyArea=بخش حساب‌داری
diff --git a/htdocs/langs/fa_IR/admin.lang b/htdocs/langs/fa_IR/admin.lang
index 4594a821a1d..d29aac22936 100644
--- a/htdocs/langs/fa_IR/admin.lang
+++ b/htdocs/langs/fa_IR/admin.lang
@@ -1509,7 +1509,8 @@ WatermarkOnDraftContractCards=نقش‌پس‌زمینه روی قرارداده
 MembersSetup=برپاسازی واحد اعضا
 MemberMainOptions=گزینه‌های اصلی
 MemberCodeChecker=Options for automatic generation of member codes
-AdherentLoginRequired= مدیریت ورود برای هر عضو
+AdherentLoginRequired=Manage a login/password for each member
+AdherentLoginRequiredDesc=Add a value for a login and a password on the member file. If the member is linked to a user, updating the member login and password will also update the user login and password.
 AdherentMailRequired=برای ساخت یک عضو یک رایانامه لازم است
 MemberSendInformationByMailByDefault=کادرتائید برای ارسال تصدیق رایانامه برای اعضا (اعتباردهی یا عضویت جدید) به شکل پیش‌فرض فعال است
 MemberCreateAnExternalUserForSubscriptionValidated=Create an external user login for each new member subscription validated
@@ -2076,6 +2077,10 @@ MAIN_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
 DOC_SHOW_FIRST_SALES_REP=Show first sales representative
 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_GENERATE_DOCUMENTS_SUPPLIER_PROPOSAL_WITHOUT_UNIT_PRICE=Hide the unit price column on quotation requests
+MAIN_GENERATE_DOCUMENTS_SUPPLIER_PROPOSAL_WITHOUT_TOTAL_COLUMN=Hide the total price column on quotation requests
+MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_UNIT_PRICE=Hide the unit price column on purchase orders
+MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_TOTAL_COLUMN=Hide the total price column on puchase orders
 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
@@ -2400,4 +2405,4 @@ OptionXShouldBeEnabledInModuleY=Option "<b>%s</b>" should be enabled into module
 OptionXIsCorrectlyEnabledInModuleY=Option "<b>%s</b>" is enabled into module <b>%s</b>
 AtBottomOfPage=At bottom of page
 FailedAuth=failed authentications
-MaxNumberOfFailedAuth=Max number of failed authentication in 24h to disable login.
+MaxNumberOfFailedAuth=Max number of failed authentication in 24h to deny login.
diff --git a/htdocs/langs/fa_IR/main.lang b/htdocs/langs/fa_IR/main.lang
index 959456e9e0d..937a25fc5fa 100644
--- a/htdocs/langs/fa_IR/main.lang
+++ b/htdocs/langs/fa_IR/main.lang
@@ -1237,3 +1237,5 @@ SearchSyntaxTooltipForStringOrNum=For searching inside text fields, you can use
 InProgress=در حال انجام
 DateOfPrinting=Date of printing
 ClickFullScreenEscapeToLeave=Click here to switch in Full screen mode. Press ESCAPE to leave Full screen mode.
+UserNotYetValid=Not yet valid
+UserExpired=منقضی شده
diff --git a/htdocs/langs/fa_IR/supplier_proposal.lang b/htdocs/langs/fa_IR/supplier_proposal.lang
index b08fcbecbda..2ca546c5968 100644
--- a/htdocs/langs/fa_IR/supplier_proposal.lang
+++ b/htdocs/langs/fa_IR/supplier_proposal.lang
@@ -13,6 +13,7 @@ SupplierProposalArea=بخش پیشنهاد‌های فروشندگان
 SupplierProposalShort=پیشنهادهای فروشندگان
 SupplierProposals=پیشنهادهای فروشندگان
 SupplierProposalsShort=پیشنهادهای فروشندگان
+AskPrice=درخواست قیمت
 NewAskPrice=درخواست قیمت جدید
 ShowSupplierProposal=نمایش درخواست‌قیمت
 AddSupplierProposal=ایجاد یک درخواست‌قیمت
@@ -32,7 +33,7 @@ SupplierProposalStatusValidatedShort=تائیداعتبارشده
 SupplierProposalStatusClosedShort=بسته
 SupplierProposalStatusSignedShort=قبول‌شده
 SupplierProposalStatusNotSignedShort=ردشده
-CopyAskFrom=ایجاد یک درخواست قیمت با نسخه‌برداری از یک درخواست موجود
+CopyAskFrom=Create a price request by copying an existing request
 CreateEmptyAsk=ایجاد یک درخواست خالی
 ConfirmCloneAsk=آیا اطمینان دارید که می‌خواهید درخواست قیمت <b>%s</b> را نسخه‌برداری کنید؟
 ConfirmReOpenAsk=آیا اطمینان دارید که می‌خواهید درخواست قیمت <b>%s</b> را دوباره باز کنید؟
@@ -41,7 +42,8 @@ SendAskRef=ارسال درخواست قیمت %s
 SupplierProposalCard=کارت درخواست
 ConfirmDeleteAsk=آیا اطمینان دارید می‌خواهید درخواست قیمت <b>%s</b> را حذف کنید؟
 ActionsOnSupplierProposal=رخدادهای مربوط به درخواست قیمت
-DocModelAuroreDescription=یک نمونۀ کامل درخواست (نماد...)
+DocModelAuroreDescription=A complete template for a vendor quotation request template (old implementation of Sponge template)
+DocModelZenithDescription=A complete template for a vendor quotation request template
 CommercialAsk=درخواست قیمت
 DefaultModelSupplierProposalCreate=ایجاد نمونۀ پیش‌فرض
 DefaultModelSupplierProposalToBill=قالب پیش‌فرض در هنگام بستن یک درخواست قیمت (قبول شده)
@@ -52,3 +54,6 @@ SupplierProposalsToClose=پیشنهادفروش‌های قابل بستن
 SupplierProposalsToProcess=پیشنهادفروش‌های قابل پردازش
 LastSupplierProposals=آخرین %s درخواست قیمت
 AllPriceRequests=همۀ درخواست‌ها
+TypeContact_supplier_proposal_external_SHIPPING=Vendor contact for delivery
+TypeContact_supplier_proposal_external_BILLING=Vendor contact for billing
+TypeContact_supplier_proposal_external_SERVICE=نماینده زیر تا پیشنهاد
diff --git a/htdocs/langs/fi_FI/admin.lang b/htdocs/langs/fi_FI/admin.lang
index 7652519102f..1db72776815 100644
--- a/htdocs/langs/fi_FI/admin.lang
+++ b/htdocs/langs/fi_FI/admin.lang
@@ -1509,7 +1509,8 @@ WatermarkOnDraftContractCards=Vesileima sopimusluonnoksissa (ei käytössä jos
 MembersSetup=Jäsenet moduulin asetukset
 MemberMainOptions=Päävaihtoehtoa
 MemberCodeChecker=Options for automatic generation of member codes
-AdherentLoginRequired= Hallitse Sisään jokaiselle jäsenelle
+AdherentLoginRequired=Manage a login/password for each member
+AdherentLoginRequiredDesc=Add a value for a login and a password on the member file. If the member is linked to a user, updating the member login and password will also update the user login and password.
 AdherentMailRequired=Uuden jäsenen luomiseen vaaditaan sähköpostiosoite
 MemberSendInformationByMailByDefault=Checkbox lähettää vahvistusviestin jäsenille on oletusarvoisesti
 MemberCreateAnExternalUserForSubscriptionValidated=Create an external user login for each new member subscription validated
@@ -2076,6 +2077,10 @@ MAIN_DOCUMENTS_LOGO_HEIGHT=Logon korkeus PDF-muodossa
 DOC_SHOW_FIRST_SALES_REP=Show first sales representative
 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_GENERATE_DOCUMENTS_SUPPLIER_PROPOSAL_WITHOUT_UNIT_PRICE=Hide the unit price column on quotation requests
+MAIN_GENERATE_DOCUMENTS_SUPPLIER_PROPOSAL_WITHOUT_TOTAL_COLUMN=Hide the total price column on quotation requests
+MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_UNIT_PRICE=Hide the unit price column on purchase orders
+MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_TOTAL_COLUMN=Hide the total price column on puchase orders
 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
@@ -2400,4 +2405,4 @@ OptionXShouldBeEnabledInModuleY=Option "<b>%s</b>" should be enabled into module
 OptionXIsCorrectlyEnabledInModuleY=Option "<b>%s</b>" is enabled into module <b>%s</b>
 AtBottomOfPage=At bottom of page
 FailedAuth=failed authentications
-MaxNumberOfFailedAuth=Max number of failed authentication in 24h to disable login.
+MaxNumberOfFailedAuth=Max number of failed authentication in 24h to deny login.
diff --git a/htdocs/langs/fi_FI/main.lang b/htdocs/langs/fi_FI/main.lang
index 839ec97ca07..7830fd186a5 100644
--- a/htdocs/langs/fi_FI/main.lang
+++ b/htdocs/langs/fi_FI/main.lang
@@ -1237,3 +1237,5 @@ SearchSyntaxTooltipForStringOrNum=For searching inside text fields, you can use
 InProgress=Käsittelyssä
 DateOfPrinting=Date of printing
 ClickFullScreenEscapeToLeave=Click here to switch in Full screen mode. Press ESCAPE to leave Full screen mode.
+UserNotYetValid=Not yet valid
+UserExpired=Lakkaa
diff --git a/htdocs/langs/fr_BE/stocks.lang b/htdocs/langs/fr_BE/stocks.lang
new file mode 100644
index 00000000000..240c8a3f19c
--- /dev/null
+++ b/htdocs/langs/fr_BE/stocks.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - stocks
+AlwaysShowFullArbo=Display the full path of a warehouse (parent warehouses) on the popup of warehouse links (Warning: This may decrease dramatically performances)
diff --git a/htdocs/langs/fr_BE/ticket.lang b/htdocs/langs/fr_BE/ticket.lang
new file mode 100644
index 00000000000..dd733640aa1
--- /dev/null
+++ b/htdocs/langs/fr_BE/ticket.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - ticket
+TicketsShowCompanyLogoHelp=Enable this option to show the logo of the main company in the pages of the public interface
diff --git a/htdocs/langs/fr_CA/accountancy.lang b/htdocs/langs/fr_CA/accountancy.lang
index 6e8dace767d..535df78a46e 100644
--- a/htdocs/langs/fr_CA/accountancy.lang
+++ b/htdocs/langs/fr_CA/accountancy.lang
@@ -30,11 +30,6 @@ CountriesInEEC=Pays membres du CEE
 CountriesNotInEEC=Pays non membres du CEE
 CountriesInEECExceptMe=Pays membres du CEE sauf %s
 CountriesExceptMe=Tous le pays sauf %s
-MainAccountForCustomersNotDefined=Compte comptable principal pour les clients non défini dans la configuration
-MainAccountForSuppliersNotDefined=Compte comptable principal pour les vendeurs non défini dans la configuration
-MainAccountForUsersNotDefined=Compte comptable principal pour les utilisateurs non défini dans la configuration
-MainAccountForVatPaymentNotDefined=Compte comptable principal pour le paiement de la TVA non défini dans la configuration
-MainAccountForSubscriptionPaymentNotDefined=Compte comptable principal pour le paiement de l'abonnement non défini dans la configuration
 AccountancyArea=Espace comptable
 AccountancyAreaDescActionOnce=Les actions suivantes sont généralement exécutées une seule fois, ou une fois par an ...
 AccountancyAreaDescActionFreq=Les actions suivantes sont généralement exécutées chaque mois, semaine ou jour pour de très grandes entreprises ...
diff --git a/htdocs/langs/fr_CA/admin.lang b/htdocs/langs/fr_CA/admin.lang
index 7daf0a4d0b7..795adbe9e92 100644
--- a/htdocs/langs/fr_CA/admin.lang
+++ b/htdocs/langs/fr_CA/admin.lang
@@ -60,12 +60,7 @@ LastStableVersion=Dernière version stable
 LastActivationDate=Dernière date d'activation
 LastActivationAuthor=Dernier auteur d'activation
 LastActivationIP=Dernière activation IP
-GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany, with date 2023-01-31:</u><br>
-GenericMaskCodes4b=<u>Example on third party created on 2023-01-31:</u><br>
-GenericMaskCodes4c=<u>Example on product created on 2023-01-31:</u><br>
-GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> will give <b>ABC2301-000099</b><br><b>{0000+100@1}-ZZZ/{dd}/XXX</b> will give <b>0199-ZZZ/31/XXX</b><br><b>IN{yy}{mm}-{0000}-{t}</b> will give <b>IN2301-0099-A</b> if the type of company is 'Responsable Inscripto' with code for type that is 'A_RI'
 ListOfDirectoriesForModelGenODT=Liste des répertoires contenant des fichiers de modèles avec le format OpenDocument . <br><br> Mettez ici le chemin complet des répertoires .<br>Ajouter un retour chariot entre répertoire eah.<br> Pour ajouter un répertoire du module de GED , ajouter ici<b>DOL_DATA_ROOT/ecm/yourdirectoryname</b>.<br><br> Fichiers dans ces répertoires doit se terminer par <b>.odt</b> or <b>.ods</b>.
-FullListOnOnlineDocumentation=https://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
 PlaceCustomerAddressToIsoLocation=Utilisez french standard position (La Poste) pour le client position d'adresse
 SecurityTokenIsUnique=Utiliser un paramètre securekey unique pour chaque URL ?
 OldVATRates=Ancien taux de TPS/TVH
@@ -160,8 +155,6 @@ WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Demandez une source d'entrepôt pour l'ordr
 ShippableOrderIconInList=Ajouter un icône dans la liste des commandes qui indique si la commande est expédiable.
 LDAPAdminDnExample=DN complet (ex: cn = admin, dc = exemple, dc = com ou cn = Administrateur, cn = Utilisateurs, dc = exemple, dc = com pour le répertoire actif)
 LDAPFieldTitle=Poste
-LDAPFieldGroupidExample=Example : gidnumber
-LDAPFieldUseridExample=Example : uidnumber
 MemcachedNotAvailable=Aucun cache applicatif trouvé. Vous pouvez accélérer les performances de Dolibarr en installant un serveur de cache Memcached et un module de cache applicatif exploitant ce serveur.<br>Plus d'info sur la page <a href="http://wiki.dolibarr.org/index.php/Module_MemCached">http://wiki.dolibarr.org/index.php/Module_MemCached</a>. Notez que de nombreux hébergeurs low-cost ne fournissent pas de tels serveurs de cache dans leur infrastructure.
 DefaultSortOrder=Ordres de tri par défaut
 DefaultFocus=Champs de mise au point par défaut
@@ -178,7 +171,7 @@ ConfirmDeleteMenu=Êtes-vous sûr de vouloir supprimer l'entrée du menu <b>%s</
 FailedToInitializeMenu=Impossible d'initialiser le menu
 TaxSetup=Configuration du module Taxes, charges sociales et dividendes
 OptionVatMode=TPS/TVH due
-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).
+AGENDA_SHOW_LINKED_OBJECT =Afficher l'objet lié dans la vue d'agenda
 ClickToDialUseTelLink=Utilisez juste un lien "tel: " sur les numéros de téléphone
 EndPointIs=Les clients SOAP doivent envoyer leurs demandes au point d'extrémité Dolibarr disponible à l'URL
 ApiSetup=Configuration du module API
@@ -241,13 +234,5 @@ ListOfAvailableAPIs=Liste des API disponibles
 LandingPage=Page d'atterrissage
 ModuleEnabledAdminMustCheckRights=Le module a été activé. Les autorisations pour les modules activés ont été données uniquement aux utilisateurs administratifs. Vous devrez peut-être accorder des autorisations aux autres utilisateurs ou groupes manuellement si nécessaire.
 BaseCurrency=Monnaie de référence de la société (entrer dans la configuration de l'entreprise pour modifier cela)
-oauthToken=OAuth2 token
 FormatZip=Code postal
 UseSearchToSelectResource=Utilisez un formulaire de recherche pour choisir une ressource (plutôt qu'une liste déroulante).
-INVOICE_ADD_SWISS_QR_CODEMore=Switzerland's standard for invoices; make sure ZIP & City are filled and that the accounts have valid Swiss/Liechtenstein IBANs.
-CssOnEdit=CSS on edit pages
-CssOnView=CSS on view pages
-CssOnList=CSS on lists
-HelpCssOnEditDesc=The CSS used when editing the field.<br>Example: "minwiwdth100 maxwidth500 widthcentpercentminusx"
-HelpCssOnViewDesc=The CSS used when viewing the field.
-HelpCssOnListDesc=The CSS used when field is inside a list table.<br>Example: "tdoverflowmax200"
diff --git a/htdocs/langs/fr_CA/supplier_proposal.lang b/htdocs/langs/fr_CA/supplier_proposal.lang
index 3396650a086..35376053a2e 100644
--- a/htdocs/langs/fr_CA/supplier_proposal.lang
+++ b/htdocs/langs/fr_CA/supplier_proposal.lang
@@ -13,7 +13,6 @@ SupplierProposalStatusValidated=Validé (la demande est ouverte)
 SupplierProposalStatusClosed=Fermées
 SupplierProposalStatusValidatedShort=Validée
 SupplierProposalStatusClosedShort=Fermées
-CopyAskFrom=Créer une demande de prix en copiant une demande existante
 CreateEmptyAsk=Créer une requête vierge
 ConfirmCloneAsk=Êtes-vous sûr de vouloir cloner la demande de prix <b> %s</b>?
 ConfirmReOpenAsk=Êtes-vous sûr de vouloir ouvrir la demande de prix <b> %s</b>?
@@ -21,7 +20,6 @@ SendAskByMail=Envoyer la demande de prix par mail
 SupplierProposalCard=Demande de carte
 ConfirmDeleteAsk=Êtes-vous sûr de vouloir supprimer cette demande de prix <b>%s</b>?
 ActionsOnSupplierProposal=Événements sur demande de prix
-DocModelAuroreDescription=Un modèle de demande complet (logo ...)
 DefaultModelSupplierProposalCreate=Création de modèle par défaut
 DefaultModelSupplierProposalToBill=Modèle par défaut lors de la clôture d'une demande de prix (acceptée)
 DefaultModelSupplierProposalClosed=Modèle par défaut lors de la clôture d'une demande de prix (refusée)
diff --git a/htdocs/langs/fr_CH/main.lang b/htdocs/langs/fr_CH/main.lang
index 7b1aec11282..e33b0a1d7ce 100644
--- a/htdocs/langs/fr_CH/main.lang
+++ b/htdocs/langs/fr_CH/main.lang
@@ -22,3 +22,4 @@ FormatDateHourText=%d %B %Y, %H:%M %p
 Unknown=Inconnue
 MenuMembers=Membres
 SearchIntoMembers=Membres
+UserExpired=Expirée
diff --git a/htdocs/langs/fr_CH/stocks.lang b/htdocs/langs/fr_CH/stocks.lang
new file mode 100644
index 00000000000..240c8a3f19c
--- /dev/null
+++ b/htdocs/langs/fr_CH/stocks.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - stocks
+AlwaysShowFullArbo=Display the full path of a warehouse (parent warehouses) on the popup of warehouse links (Warning: This may decrease dramatically performances)
diff --git a/htdocs/langs/fr_CH/ticket.lang b/htdocs/langs/fr_CH/ticket.lang
new file mode 100644
index 00000000000..dd733640aa1
--- /dev/null
+++ b/htdocs/langs/fr_CH/ticket.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - ticket
+TicketsShowCompanyLogoHelp=Enable this option to show the logo of the main company in the pages of the public interface
diff --git a/htdocs/langs/fr_CI/stocks.lang b/htdocs/langs/fr_CI/stocks.lang
new file mode 100644
index 00000000000..240c8a3f19c
--- /dev/null
+++ b/htdocs/langs/fr_CI/stocks.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - stocks
+AlwaysShowFullArbo=Display the full path of a warehouse (parent warehouses) on the popup of warehouse links (Warning: This may decrease dramatically performances)
diff --git a/htdocs/langs/fr_CI/ticket.lang b/htdocs/langs/fr_CI/ticket.lang
new file mode 100644
index 00000000000..dd733640aa1
--- /dev/null
+++ b/htdocs/langs/fr_CI/ticket.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - ticket
+TicketsShowCompanyLogoHelp=Enable this option to show the logo of the main company in the pages of the public interface
diff --git a/htdocs/langs/fr_CM/stocks.lang b/htdocs/langs/fr_CM/stocks.lang
new file mode 100644
index 00000000000..240c8a3f19c
--- /dev/null
+++ b/htdocs/langs/fr_CM/stocks.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - stocks
+AlwaysShowFullArbo=Display the full path of a warehouse (parent warehouses) on the popup of warehouse links (Warning: This may decrease dramatically performances)
diff --git a/htdocs/langs/fr_CM/ticket.lang b/htdocs/langs/fr_CM/ticket.lang
new file mode 100644
index 00000000000..dd733640aa1
--- /dev/null
+++ b/htdocs/langs/fr_CM/ticket.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - ticket
+TicketsShowCompanyLogoHelp=Enable this option to show the logo of the main company in the pages of the public interface
diff --git a/htdocs/langs/fr_FR/accountancy.lang b/htdocs/langs/fr_FR/accountancy.lang
index f704a531562..b8ef78e2d83 100644
--- a/htdocs/langs/fr_FR/accountancy.lang
+++ b/htdocs/langs/fr_FR/accountancy.lang
@@ -57,11 +57,14 @@ WarningDataDisappearsWhenDataIsExported=Attention, cette liste ne contient que l
 VueByAccountAccounting=Vue par comptes comptables
 VueBySubAccountAccounting=Affichage par compte auxiliaire
 
-MainAccountForCustomersNotDefined=Compte comptable général pour les clients non défini dans la configuration
-MainAccountForSuppliersNotDefined=Compte comptable général pour les fournisseurs non défini dans la configuration
-MainAccountForUsersNotDefined=Compte comptable général pour les utilisateurs non défini dans la configuration
-MainAccountForVatPaymentNotDefined=Compte comptable général pour les paiements de TVA non défini dans la configuration
-MainAccountForSubscriptionPaymentNotDefined=Le compte comptable général des paiements de cotisations n'est pas défini dans la configuration
+MainAccountForCustomersNotDefined=Main account (from the Chart of Account) for customers not defined in setup
+MainAccountForSuppliersNotDefined=Main account (from the Chart of Account) for vendors not defined in setup
+MainAccountForUsersNotDefined=Main account (from the Chart of Account) for users not defined in setup
+MainAccountForRevenueStampSaleNotDefined=Account (from the Chart of Account) for the revenue stamp (sales) not defined in setup
+MainAccountForRevenueStampPurchaseNotDefined=Account (from the Chart of Account) for the revenue stamp (purchases) not defined in setup
+MainAccountForVatPaymentNotDefined=Account (from the Chart of Account) for VAT payment not defined in setup
+MainAccountForSubscriptionPaymentNotDefined=Account (from the Chart of Account) for membership payment not defined in setup
+MainAccountForRetainedWarrantyNotDefined=Account (from the Chart of Account) for the retained warranty not defined in setup
 UserAccountNotDefined=Compte comptable pour l'utilisateur non défini dans la configuration
 
 AccountancyArea=Espace comptabilité
diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang
index 6f0f3671272..92e9374efe0 100644
--- a/htdocs/langs/fr_FR/admin.lang
+++ b/htdocs/langs/fr_FR/admin.lang
@@ -365,9 +365,9 @@ GenericMaskCodes=Vous pouvez saisir tout masque de numérotation. Dans ce masque
 GenericMaskCodes2=<b>{cccc}</b> : code client sur n caractères<br><b>{cccc000}</b> : code client sur n caractères suivi d'un compteur propre au client. Ce compteur propre au client est remis à zéro en même temps que le compteur général.<br><b>{tttt}</b> code du type de tiers sur n caractères (Voir menu Accueil > Configuration > Dictionnaires > Types de tiers). Si vous ajoutez cet élément au masque de numérotation, le compteur sera différent pour chaque type de tiers.<br>
 GenericMaskCodes3=Tout autre caractère dans le masque sera laissé inchangé.<br>Les espaces ne sont pas permis.<br>
 GenericMaskCodes3EAN=Tous les autres caractères du masque resteront intacts (sauf * ou ? en 13ème position dans EAN13). <br>Les espaces ne sont pas autorisés.<br> Dans EAN13, le dernier caractère après le dernier } en 13ème position doit être * ou ? . Il sera remplacé par la clé calculée.<br>
-GenericMaskCodes4a=<u>Exemple sur la 99eme %s du tiers LaCompanie faite le 31/01/2007:</u><br>
-GenericMaskCodes4b=<u>Exemple sur un tiers créé le 31/03/2007 :</u><br>
-GenericMaskCodes4c=<u>Exemple sur un produit/service créé le 31/03/2007 :</u><br>
+GenericMaskCodes4a=<u>Exemple sur la 99eme %s du tiers LaCompanie, à la date du 31/01/2023:</u><br>
+GenericMaskCodes4b= <u> Exemple pour un tiers créé le 31/01/2023 : </u>  <br> 
+GenericMaskCodes4c= <u> Exemple pour un produit créé le 31/01/2023 : </u>  <br> 
 GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> donnera <b>ABC0703-000099</b><br><b>{0000+100@1}-XXX-{dd}-YYY</b> donnera <b>0199-XXX-31-YYY</b><br><b>IN{yy}{mm}-{0000}-{t}</b> donnera <b>IN0701-0099-A</b> si la société a le type 'Responsable Inscripto' avec le code type qui est 'A_RI'
 GenericNumRefModelDesc=Renvoie un numéro personnalisable selon un masque à définir.
 ServerAvailableOnIPOrPort=Serveur disponible à l'adresse <b>%s</b> sur le port <b>%s</b>
@@ -394,7 +394,7 @@ ListOfDirectoriesForModelGenODT=Liste des répertoires contenant des documents m
 NumberOfModelFilesFound=Nombre de fichiers modèles ODT/ODS trouvés dans ce(s) répertoire(s)
 ExampleOfDirectoriesForModelGen=Exemples de syntaxe : <br>c:\\myapp\\mydocumentdir\\mysubdir<br>/home/myapp/mydocumentdir/mysubdir<br>DOL_DATA_ROOT/ecm/ecmdir
 FollowingSubstitutionKeysCanBeUsed=<br>Pour savoir comment rédiger des modèles de document odt avant de les placer dans un de ces répertoires, consulter la documentation du wiki :
-FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Créer_un_modèle_de_document_ODT
+FullListOnOnlineDocumentation=https://wiki.dolibarr.org/index.php/Cr%C3%A9er_un_mod%C3%A8le_de_document_ODT
 FirstnameNamePosition=Ordre d'affichage prénom/nom
 DescWeather=Les graphiques suivant seront affichés sur le tableau de bord si le nombre d'éléments en retard atteint ces valeurs :
 KeyForWebServicesAccess=Clé pour utiliser les Web Services (paramètre "dolibarrkey" dans les webservices)
@@ -542,7 +542,7 @@ DAV_ALLOW_PUBLIC_DIR=Activer le répertoire public générique (répertoire WebD
 DAV_ALLOW_PUBLIC_DIRTooltip=Le répertoire public génrique WebDav est un répertoire auquel tout le monde peut accéder (en lecture et en écriture), sans avoir besoin d'identification (pas de besoin de compte login/mot de passe).
 DAV_ALLOW_ECM_DIR=Activer le répertoire privé de la GED (répertoire racine du module GED - identification requise)
 DAV_ALLOW_ECM_DIRTooltip=Répertoire racine où tous les fichiers sont téléchargés manuellement lors de l’utilisation du module GED. Comme pour la fonctionnalité via l'interface Web, vous aurez besoin d'un identifiant / mot de passe valide avec les autorisations accordées pour y accéder.
-# Modules
+##### Modules #####
 Module0Name=Utilisateurs & Groupes
 Module0Desc=Gestion des utilisateurs / employés et groupes
 Module1Name=Tiers
@@ -650,7 +650,7 @@ Module2300Name=Travaux planifiés
 Module2300Desc=Gestion des travaux planifiées (alias cron ou table chrono)
 Module2400Name=Événements/Agenda
 Module2400Desc=Gestion des événements. Laissez l'application tracer automatiquement les événements pour des besoins de suivi ou enregistrer manuellement des événements ou rendez-vous dans l'agenda. Ceci est le module le plus important pour une bonne Gestion de la Relation Client ou Fournisseur.
-Module2430Name=Système de calendrier de réservation
+Module2430Name=Calendrier de réservation en ligne
 Module2430Desc=Proposez un calendrier en ligne pour permettre à quiconque de réserver un rendez-vous, en fonction de plages et de disponibilités prédéfinies.
 Module2500Name=GED
 Module2500Desc=Gestion de documents (GED). Stockage automatic des documents générés ou stockés. Fonction de partage.
@@ -712,6 +712,7 @@ Module63000Desc=Gère les ressources (imprimantes, voitures, salles...). les res
 Module66000Name=Gestion des jetons OAuth2
 Module66000Desc=Fournir un outil pour générer et gérer des jetons OAuth2. Le jeton peut ensuite être utilisé par d'autres modules.
 Module94160Name=Réceptions
+##### Permissions #####
 Permission11=Lire les factures (et paiements) clients
 Permission12=Créer/modifier les factures clients
 Permission13=Dé-valider les factures clients
@@ -904,9 +905,9 @@ Permission609=Supprimer les étiquettes
 Permission611=Lire les attributs des variantes produits
 Permission612=Créer/mettre à jour les attributs des variantes produits
 Permission613=Supprimer les attributs des variantes produits
-Permission651=Lire les Nomenclatures (BOM)
-Permission652=Créer/modifier les Nomenclatures (BOM)
-Permission653=Supprimer les Nomenclatures (BOM)
+Permission650=Lire les Nomenclatures (BOM)
+Permission651=Créer/modifier les Nomenclatures (BOM)
+Permission652=Supprimer les Nomenclatures (BOM)
 Permission660=Lire les ordres de fabrication (OF)
 Permission661=Créer/mettre à jour les ordres de fabrication (OF)
 Permission662=Supprimer les ordres de fabrication (OF)
@@ -1439,10 +1440,10 @@ MustBeUnique=Doit être unique ?
 MustBeMandatory=Obligatoire pour créer des tiers (si le numéro de TVA ou le type d'entreprise est défini) ?
 MustBeInvoiceMandatory=Obligatoire pour valider des factures ?
 TechnicalServicesProvided=Services techniques fournis
-#####DAV #####
+##### WebDAV #####
 WebDAVSetupDesc=Voici les liens pour accéder au répertoire WebDAV. Il contient un répertoire "public" ouvert à tout utilisateur connaissant l'URL (si l'accès au répertoire public est autorisé) et un répertoire "privé" qui a besoin d'un compte/mot de passe existant pour y accéder.
 WebDavServer=URL du serveur %s: %s
-##### Webcal setup #####
+##### WebCAL setup #####
 WebCalUrlForVCalExport=Un lien d'exportation du calendrier au format <b>%s</b> sera disponible à l'url :<br>%s
 ##### Invoices #####
 BillsSetup=Configuration du module Factures
@@ -1508,7 +1509,8 @@ WatermarkOnDraftContractCards=Filigrane sur les brouillons de contrats (aucun si
 MembersSetup=Configuration du module Adhérents
 MemberMainOptions=Options principales
 MemberCodeChecker=Options de génération automatique des codes des adhérents
-AdherentLoginRequired=Gérer un identifiant pour chaque adhérent
+AdherentLoginRequired=Manage a login/password for each member
+AdherentLoginRequiredDesc=Add a value for a login and a password on the member file. If the member is linked to a user, updating the member login and password will also update the user login and password.
 AdherentMailRequired=Email obligatoire pour créer un nouvel adhérent
 MemberSendInformationByMailByDefault=Case à cocher pour envoyer un email de confirmation (validation ou nouvelle cotisation) aux adhérents est à oui par défaut.
 MemberCreateAnExternalUserForSubscriptionValidated=Créer un utilisateur externe pour chaque nouvelle cotisation adhérent validée
@@ -1834,26 +1836,26 @@ AccountancyCodeSell=Code comptable vente
 AccountancyCodeBuy=Code comptable achat
 CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=Laissez la case à cocher "Créer automatiquement le paiement" vide par défaut lors de la création d'une nouvelle taxe
 ##### Agenda #####
-AgendaSetup=Configuration du module actions et agenda
-PasswordTogetVCalExport=Clé pour autoriser le lien d'exportation
-SecurityKey = Clé de sécurité
+AgendaSetup = Configuration du module actions et agenda
+AGENDA_DEFAULT_FILTER_TYPE = Positionner automatiquement ce type d'événement dans le filtre de recherche de la vue agenda
+AGENDA_DEFAULT_FILTER_STATUS = Positionner automatiquement ce statut d'événement dans le filtre de recherche de la vue agenda
+AGENDA_DEFAULT_VIEW = Quel onglet voulez-vous voir ouvrir par défaut quand on choisit le menu Agenda
+AGENDA_EVENT_PAST_COLOR = Couleur de l'événement précédent
+AGENDA_EVENT_CURRENT_COLOR = Couleur de l'événement courant
+AGENDA_EVENT_FUTURE_COLOR = Couleur du prochain événement
+AGENDA_REMINDER_BROWSER = Activer le rappel d'événement <b> sur le navigateur de l'utilisateur </b> (lorsque la date de l'événement est atteinte, une popup est affichée sur la navigateur. Chaque utilisateur peut désactiver de telles notification depuis la configuration des notifications de son navigateur)
+AGENDA_REMINDER_BROWSER_SOUND = Activer les notifications sonores.
+AGENDA_REMINDER_EMAIL = Activer le rappel d'événement <b> par e-mail </b> (l'option de rappel / délai peut être défini pour chaque événement).
+AGENDA_REMINDER_EMAIL_NOTE = Note : la fréquence d'exécution de la tâche %s doit être suffisante pour que le rappel soit envoyé au bon moment.
+AGENDA_SHOW_LINKED_OBJECT = Afficher l'objet lié dans la vue agenda
+AGENDA_USE_EVENT_TYPE = Utiliser les types d'événements (gérés dans le menu Configuration -> Dictionnaires -> Type d'événements de l'agenda)
+AGENDA_USE_EVENT_TYPE_DEFAULT = Configurez automatiquement cette valeur par défaut pour le type d'événement dans le formulaire de création d'événement.
+PasswordTogetVCalExport = Clé pour autoriser le lien d'exportation
 PastDelayVCalExport=Ne pas exporter les événements de plus de
-AGENDA_USE_EVENT_TYPE=Utiliser les types d'événements (gérés dans le menu Configuration -> Dictionnaires -> Type d'événements de l'agenda)
-AGENDA_USE_EVENT_TYPE_DEFAULT=Configurez automatiquement cette valeur par défaut pour le type d'événement dans le formulaire de création d'événement.
-AGENDA_DEFAULT_FILTER_TYPE=Positionner automatiquement ce type d'événement dans le filtre de recherche de la vue agenda
-AGENDA_DEFAULT_FILTER_STATUS=Positionner automatiquement ce statut d'événement dans le filtre de recherche de la vue agenda
-AGENDA_EVENT_PAST_COLOR=Couleur de l'événement précédent
-AGENDA_EVENT_CURRENT_COLOR=Couleur de l'événement courant
-AGENDA_EVENT_FUTURE_COLOR=Couleur du prochain événement
-AGENDA_DEFAULT_VIEW=Quel onglet voulez-vous voir ouvrir par défaut quand on choisit le menu Agenda
-AGENDA_REMINDER_BROWSER=Activer le rappel d'événement <b> sur le navigateur de l'utilisateur </b> (lorsque la date de l'événement est atteinte, une popup est affichée sur la navigateur. Chaque utilisateur peut désactiver de telles notification depuis la configuration des notifications de son navigateur)
-AGENDA_REMINDER_BROWSER_SOUND=Activer les notifications sonores.
-AGENDA_REMINDER_EMAIL=Activer le rappel d'événement <b> par e-mail </b> (l'option de rappel / délai peut être défini pour chaque événement).
-AGENDA_REMINDER_EMAIL_NOTE=Note : la fréquence d'exécution de la tâche %s doit être suffisante pour que le rappel soit envoyé au bon moment.
-AGENDA_SHOW_LINKED_OBJECT=Afficher l'objet lié dans la vue agenda
-##### Clicktodial #####
+SecurityKey = Clé de sécurité
+##### ClickToDial #####
 ClickToDialSetup=Configuration du module Click To Dial
-ClickToDialUrlDesc=URL appelée quand un clic sur l'icône téléphone est fait. Dans l'URL, vous pouvez utiliser les tags<br><b>__PHONETO__</b> qui sera remplacée par le numéro de téléphone de la personne à appeler<br><b>__PHONEFROM__</b> qui sera remplacée par le numéro de l'appelant (vous)<br><b>__LOGIN__</b> qui sera remplacée par l'identifiant d'accès de l'utilisateur à l'application d'appel (à définir sur la fiche utilisateur) et <br><b>__PASS__</b> qui sera remplacée par le mot de passe d'accès de l'utilisateur à l'application d'appel (également à définir sur la fiche utilisateur).
+ClickToDialUrlDesc=URL appelée lorsqu'un clic sur le picto du téléphone est effectué. Dans l'URL, vous pouvez utiliser les balises <br>  <b> __PHONETO__ </b> qui sera remplacé par le numéro de téléphone de la personne à appeler <br>  <b> __PHONEFROM__ </b> qui sera remplacé par le numéro de téléphone de la personne qui appelle (le vôtre) <br>  <b> __LOGIN__ </b>  qui sera remplacé par la connexion clicktodial (définie sur la carte utilisateur) <br>  <b> __PASS__ </b>  qui sera remplacé par le mot de passe clicktodial (défini sur la carte utilisateur).
 ClickToDialDesc=Ce module permet de rendre les numéros de téléphone cliquables lorsque vous utilisez l'application sur un ordinateur de bureau. Un clic sur cette icône composera le numéro de téléphone. Cela peut être utilisé pour commencer une conversation avec un soft phone sur votre bureau ou lorsque vous utilisez un système basé sur le protocole SIP par exemple. Note: Sur un smartphone, les numéros de téléphones sont toujours clicables.
 ClickToDialUseTelLink=Utiliser un lien "tel:" sur les numéros de téléphone
 ClickToDialUseTelLinkDesc=Utilisez cette méthode si vos utilisateurs disposent d'un softphone ou d'une interface logicielle, installés sur le même ordinateur que le navigateur, et appelés lorsque vous cliquez sur un lien commençant par "tel:" dans votre navigateur. Si vous avez besoin d'un lien commençant par "sip:" ou d'une solution via un serveur (pas besoin d'installation de logiciel local), vous devez définir ce champ sur "Non" et remplir le champ suivant.
@@ -2066,6 +2068,7 @@ BaseCurrency=Devise par défaut de votre société/institution (Voir Accueil > c
 WarningNoteModuleInvoiceForFrenchLaw=Ce module %s permet d'être conforme aux lois françaises (Loi Finance 2016 par exemple).
 WarningNoteModulePOSForFrenchLaw=Le module %s est conforme à la législation française ( Loi Finance 2016 ) car les logs non réversibles sont automatiquement activés.
 WarningInstallationMayBecomeNotCompliantWithLaw=Vous tentez d'installer le module %s qui est un module externe. L'activation d'un module externe signifie que vous faites confiance à l'éditeur du module et que vous êtes sûr que ce module ne modifie pas négativement le comportement de votre application et est conforme aux lois de votre pays (%s). Si le module apporte une fonctionnalité illégale, vous devenez responsable pour l'utilisation d'un logiciel illégal.
+
 MAIN_PDF_MARGIN_LEFT=Marge gauche sur les PDF
 MAIN_PDF_MARGIN_RIGHT=Marge droite sur les PDF
 MAIN_PDF_MARGIN_TOP=Marge haute sur les PDF
@@ -2074,6 +2077,10 @@ MAIN_DOCUMENTS_LOGO_HEIGHT=Hauteur du logo sur les PDFs
 DOC_SHOW_FIRST_SALES_REP=Afficher le premier commercial
 MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Ajouter une colonne pour les images dans les propositions commerciales
 MAIN_DOCUMENTS_WITH_PICTURE_WIDTH=Largeur de la colonne si une image est ajoutée sur les lignes
+MAIN_GENERATE_DOCUMENTS_SUPPLIER_PROPOSAL_WITHOUT_UNIT_PRICE=Hide the unit price column on quotation requests
+MAIN_GENERATE_DOCUMENTS_SUPPLIER_PROPOSAL_WITHOUT_TOTAL_COLUMN=Hide the total price column on quotation requests
+MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_UNIT_PRICE=Hide the unit price column on purchase orders
+MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_TOTAL_COLUMN=Hide the total price column on puchase orders
 MAIN_PDF_NO_SENDER_FRAME=Masquer les bordures dans le cadre de l'adresse de l'expéditeur
 MAIN_PDF_NO_RECIPENT_FRAME=Masquer les bordures dans le cadre de l'adresse du destinataire
 MAIN_PDF_HIDE_CUSTOMER_CODE=Cacher le code client
@@ -2277,7 +2284,7 @@ APIsAreNotEnabled=Les modules API ne sont pas activés
 YouShouldSetThisToOff=Vous devriez mettre ceci à 0 ou off
 InstallAndUpgradeLockedBy=L'installation et les mises à jour sont verrouillées par le fichier <b> %s </b>
 InstallLockedBy=L'installation/réinstallation est verrouillée par le fichier <b> %s </b>
-InstallOfAddonIsNotBlocked=Les installations de modules eternes ne sont pas verrouillées. Créez un fichier <b> installmodules.lock </b> dans le répertoire <b> %s </b> pour bloquer les installations d'addons/modules externes.
+InstallOfAddonIsNotBlocked=Les installations de modules externes ne sont pas verrouillées. Créez un fichier <b> installmodules.lock </b> dans le répertoire <b> %s </b> pour bloquer les installations d'addons/modules externes.
 OldImplementation=Ancienne implémentation
 PDF_SHOW_LINK_TO_ONLINE_PAYMENT=Si certains modules de paiement en ligne sont activés (Paypal, Stripe, ...), ajouter un lien sur le PDF pour effectuer le paiement en ligne
 DashboardDisableGlobal=Désactiver complétement toutes les vignettes des éléments ouverts
@@ -2338,7 +2345,7 @@ INVOICE_ADD_ZATCA_QR_CODEMore=Certains pays arabes ont besoin de ce code QR sur
 INVOICE_ADD_SWISS_QR_CODE=Afficher la QR-facture suisse sur les factures
 INVOICE_ADD_SWISS_QR_CODEMore=La norme suisse pour les factures ; assurez-vous que le code postal et la ville sont remplis et que les comptes ont des IBAN Suisse/Liechtenstein valides.
 INVOICE_SHOW_SHIPPING_ADDRESS=Afficher l'adresse de livraison
-INVOICE_SHOW_SHIPPING_ADDRESSMore=Mention obligatoire pour la France
+INVOICE_SHOW_SHIPPING_ADDRESSMore=Indication obligatoire dans certains pays (France, ...)
 UrlSocialNetworksDesc=Lien url du réseau social. Utilisez {socialid} pour la partie variable qui contient l'identifiant du réseau social.
 IfThisCategoryIsChildOfAnother=Si cette catégorie est un enfant d'une autre
 DarkThemeMode=Mode thème sombre
@@ -2368,7 +2375,7 @@ TriggerCodeInfo=Saisissez ici le(s) code(s) déclencheur(s) qui doivent génére
 EditableWhenDraftOnly=Si décochée, la valeur ne peut être modifiée que lorsque l'objet a un état de brouillon
 CssOnEdit=CSS sur les pages d'édition
 CssOnView=CSS sur les pages de visualisation
-CssOnList=CSS sur listes
+CssOnList=CSS sur les listes
 HelpCssOnEditDesc=Le CSS utilisé lors de la modification du champ. <br> Exemple : "minwidth100 maxwidth500 widthcentpercentminusx"
 HelpCssOnViewDesc=Le CSS utilisé lors de l'affichage du champ.
 HelpCssOnListDesc=Le CSS utilisé lorsque le champ est à l'intérieur du tableau d'une liste. <br> Exemple : "tdoverflowmax200"
@@ -2387,7 +2394,7 @@ Reload=Recharger
 ConfirmReload=Confirmer le rechargement du module
 WarningModuleHasChangedLastVersionCheckParameter=Attention :  le module %sa configuré un paramètre de vérification de sa version à chaque chargement de page. Cette mauvaise pratique, non autorisée, pourrait rendre instable la page d'administration des modules. Veuillez contacter l'auteur du module pour qu'il régle ce problème.
 WarningModuleHasChangedSecurityCsrfParameter=Attention : le module %sa désactivé la sécurisation CSRF de votre instance. Cette action est suspecte et votre installation pourrait ne plus être sécurisée. Veuillez contacter l'auteur du module pour obtenir des explications.
-EMailsInGoingDesc=La réception des e-mails est gérée par le module %s. Vous devez l'activer et le configurer si vous avez besoin de prendre en charge messages entrants.
+EMailsInGoingDesc=La réception des e-mails est gérée par le module %s. Vous devez l'activer et le configurer si vous avez besoin de prendre en charge les messages entrants.
 MAIN_IMAP_USE_PHPIMAP=Utiliser la librairie PHP-IMAP pour la prise en charge IMAP, à la place du support IMAP natif de PHP. Ceci permet également l'utilisation d'une connexion OAuth2 pour IMAP (le module OAuth doit aussi être activé).
 MAIN_CHECKBOX_LEFT_COLUMN=Afficher la colonne de sélection de champ et de ligne à gauche (à droite par défaut)
 NotAvailableByDefaultEnabledOnModuleActivation=Non créé par défaut. Créé à l'activation du module uniquement.
@@ -2397,4 +2404,5 @@ DefaultForTypeDesc=Modèle utilisé par défaut lors de la création d'un nouvel
 OptionXShouldBeEnabledInModuleY=L'option "<b>%s</b>" doit être activée dans le module <b>%s</b>
 OptionXIsCorrectlyEnabledInModuleY=L'option "<b>%s</b>" doit être activée dans le module <b>%s</b>
 AtBottomOfPage=En bas de page
-RecommendMitigationOnURL=For a higher security, we also recommend to implement limits and mitigation on number of endpoints per minutes for the following URL
\ No newline at end of file
+FailedAuth=échecs d'authentification
+MaxNumberOfFailedAuth=Max number of failed authentication in 24h to deny login.
diff --git a/htdocs/langs/fr_FR/banks.lang b/htdocs/langs/fr_FR/banks.lang
index 4e5036df978..dafb3da22e0 100644
--- a/htdocs/langs/fr_FR/banks.lang
+++ b/htdocs/langs/fr_FR/banks.lang
@@ -106,8 +106,8 @@ BankLineNotReconciled=Non rapproché
 CustomerInvoicePayment=Règlement client
 SupplierInvoicePayment=Paiement fournisseur
 SubscriptionPayment=Paiement cotisation
-WithdrawalPayment=Direct Debit payment
-BankTransferPayment=Credit Transfer payment
+WithdrawalPayment=Paiement par prélèvement
+BankTransferPayment=Paiement par virement
 SocialContributionPayment=Paiement de charge fiscale/sociale
 BankTransfer=Virement bancaire
 BankTransfers=Virements bancaire
diff --git a/htdocs/langs/fr_FR/bills.lang b/htdocs/langs/fr_FR/bills.lang
index cf24f153d82..1feb9de40bb 100644
--- a/htdocs/langs/fr_FR/bills.lang
+++ b/htdocs/langs/fr_FR/bills.lang
@@ -197,7 +197,7 @@ ConfirmClassifyPaidPartiallyReasonDiscount=Le reste à payer <b> (%s %s) </b> es
 ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Le reste à payer <b>(%s %s)</b> est un escompte accordé après facture. J'accepte de perdre la TVA sur cet escompte
 ConfirmClassifyPaidPartiallyReasonDiscountVat=Le reste à payer <b>(%s %s)</b> est un escompte
 ConfirmClassifyPaidPartiallyReasonBadCustomer=Mauvais payeur
-ConfirmClassifyPaidPartiallyReasonBadSupplier=Bad vendor
+ConfirmClassifyPaidPartiallyReasonBadSupplier=Mauvais vendeur
 ConfirmClassifyPaidPartiallyReasonBankCharge=Prélèvement par banque (frais de banque intermédiaire)
 ConfirmClassifyPaidPartiallyReasonWithholdingTax=Taxe retenue à la source
 ConfirmClassifyPaidPartiallyReasonProductReturned=Produits en partie retournés
@@ -210,7 +210,7 @@ ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=Ce choix sera celui choisi
 ConfirmClassifyPaidPartiallyReasonBankChargeDesc=Le montant impayé est <b> frais de banque intermédiaire </b> , déduit directement du <b> montant correct </b> payé par le Client.
 ConfirmClassifyPaidPartiallyReasonWithholdingTaxDesc=Le montant impayé ne sera jamais payé car il s'agit d'une retenue à la source
 ConfirmClassifyPaidPartiallyReasonOtherDesc=Ce choix sera celui choisi dans tout autre cas, par exemple, dans les cas suivants:<br>- paiement partiel car une partie des produits a été retourné.<br>- trop réclamé suite à oubli d'une remise<br>Dans tous les cas, le trop réclamé doit être régularisé en compta et envers le client par un avoir.
-ConfirmClassifyPaidPartiallyReasonBadSupplierDesc=A <b>bad supplier</b> is a supplier we refuse to pay.
+ConfirmClassifyPaidPartiallyReasonBadSupplierDesc=Un <b> mauvais fournisseur </b> est un fournisseur que nous refusons de payer.
 ConfirmClassifyAbandonReasonOther=Autre
 ConfirmClassifyAbandonReasonOtherDesc=Ce choix sera celui choisi dans tout autre cas. Par exemple suite à l'intention de créer une facture de remplacement.
 ConfirmCustomerPayment=Confirmez-vous la saisie de ce règlement de <b>%s</b> %s ?
diff --git a/htdocs/langs/fr_FR/dict.lang b/htdocs/langs/fr_FR/dict.lang
index 79158f72365..f86a03411db 100644
--- a/htdocs/langs/fr_FR/dict.lang
+++ b/htdocs/langs/fr_FR/dict.lang
@@ -137,7 +137,7 @@ CountryLV=Lettonie
 CountryLB=Liban
 CountryLS=Lesotho
 CountryLR=Liberia
-CountryLY=Libya
+CountryLY=Libye
 CountryLI=Liechtenstein
 CountryLT=Lituanie
 CountryLU=Luxembourg
diff --git a/htdocs/langs/fr_FR/ecm.lang b/htdocs/langs/fr_FR/ecm.lang
index 56e58f13494..975a1003ea4 100644
--- a/htdocs/langs/fr_FR/ecm.lang
+++ b/htdocs/langs/fr_FR/ecm.lang
@@ -48,7 +48,7 @@ GenerateImgWebp=Dupliquer toutes les images avec une autre version au format .we
 ConfirmGenerateImgWebp=Si vous confirmez, vous générerez une image au format .webp pour toutes les images actuellement dans ce dossier (les sous-dossiers ne sont pas inclus)...
 ConfirmImgWebpCreation=Confirmer la duplication de toutes les images
 GenerateChosenImgWebp=Dupliquer l'image choisie avec une autre version au format .webp
-ConfirmGenerateChosenImgWebp=If you confirm, you will generate an image in .webp format for the image %s
+ConfirmGenerateChosenImgWebp=Si vous confirmez, vous générerez une image au format .webp pour l'image %s
 ConfirmChosenImgWebpCreation=Confirmer la duplication des images choisies
 SucessConvertImgWebp=Images dupliquées avec succès
 SucessConvertChosenImgWebp=L'image choisie a été dupliquée avec succès
diff --git a/htdocs/langs/fr_FR/errors.lang b/htdocs/langs/fr_FR/errors.lang
index 4b4f305fb67..2ae0f90bc67 100644
--- a/htdocs/langs/fr_FR/errors.lang
+++ b/htdocs/langs/fr_FR/errors.lang
@@ -191,7 +191,7 @@ ErrorGlobalVariableUpdater4=Le client SOAP a échoué avec l'erreur '%s'
 ErrorGlobalVariableUpdater5=Pas de variable globale
 ErrorFieldMustBeANumeric=Le champ <b>%s</b> doit être un numérique
 ErrorMandatoryParametersNotProvided=Paramètre(s) obligatoire(s) non fournis
-ErrorOppStatusRequiredIfUsage=You set you want to use this project to follow an opportunity, so you must also fill the initial Status of opportunity.
+ErrorOppStatusRequiredIfUsage=Vous définissez que vous souhaitez utiliser ce projet pour suivre une opportunité, vous devez donc également renseigner le Statut initial de l'opportunité.
 ErrorOppStatusRequiredIfAmount=Vous avez fixé un montant estimé pour cette opportunité. Aussi, vous devez également entrer son statut
 ErrorFailedToLoadModuleDescriptorForXXX=Échec de changement de la classe descripteur du module %s
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Mauvaise définition du tableau Menu dans le descripteur de module (mauvaise valeur pour la clé fk_menu)
@@ -318,8 +318,10 @@ ErrorTheUrlOfYourDolInstanceDoesNotMatchURLIntoOAuthSetup=Erreur : L'URL de vot
 ErrorMenuExistValue=Un menu existe déjà avec ce titre ou cette URL
 ErrorSVGFilesNotAllowedAsLinksWithout=Les fichiers SVG ne sont pas autorisés en tant que liens externes sans l'option %s
 ErrorTypeMenu=Impossible d'ajouter un autre menu pour le même module sur la barre de navigation, pas encore géré
-ErrorTableExist=Table <b>%s</b> already exist
-ErrorDictionaryNotFound=Dictionary <b>%s</b> not found
+ErrorTableExist=Le tableau <b> %s </b> existe déjà
+ErrorDictionaryNotFound=Dictionnaire <b> %s </b> introuvable
+ErrorFailedToCreateSymLinkToMedias=Failed to create the symlinks %s to point to %s
+
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Votre paramètre PHP upload_max_filesize (%s) est supérieur au paramètre PHP post_max_size (%s). Ceci n'est pas une configuration cohérente.
 WarningPasswordSetWithNoAccount=Un mot de passe a été fixé pour cet adhérent. Cependant, aucun compte d'utilisateur n'a été créé. Donc, ce mot de passe est stocké, mais ne peut être utilisé pour accéder à Dolibarr. Il peut être utilisé par un module/interface externe, mais si vous n'avez pas besoin de définir ni login ni mot de passe pour un adhérent, vous pouvez désactiver l'option «Gérer un login pour chaque adhérent" depuis la configuration du module Adhérents. Si vous avez besoin de gérer un login, mais pas de mot de passe, vous pouvez laisser ce champ vide pour éviter cet avertissement. Remarque: L'email peut également être utilisé comme login si l'adhérent est lié à un utilisateur.
@@ -360,7 +362,7 @@ WarningAutoValNotPossibleWhenStockIsDecreasedOnInvoiceVal=La validation automati
 WarningModuleNeedRefrech = Le module <b>%s</b> a été désactivé. N'oubliez pas de le réactiver
 WarningPermissionAlreadyExist=Autorisations existantes pour cet objet
 WarningGoOnAccountancySetupToAddAccounts=Si cette liste est vide, allez dans le menu %s - %s - %s pour charger ou créer des comptes pour votre plan comptable.
-WarningCorrectedInvoiceNotFound=Corrected invoice not found
+WarningCorrectedInvoiceNotFound=Facture corrigée introuvable
 
 SwissQrOnlyVIR = La facture SwissQR ne peut être ajoutée que sur les factures définies pour être payées avec des paiements par virement.
 SwissQrCreditorAddressInvalid = L'adresse du créancier n'est pas valide (le code postal et la ville sont-ils définis ? (%s)
@@ -389,4 +391,4 @@ BadSetupOfField = Erreur mauvaise configuration du champ
 BadSetupOfFieldClassNotFoundForValidation = Erreur mauvaise configuration du champ : Classe introuvable pour validation
 BadSetupOfFieldFileNotFound = Erreur mauvaise configuration du champ : Fichier introuvable pour l'inclusion
 BadSetupOfFieldFetchNotCallable = Erreur mauvaise configuration du champ : Fetch non appelable sur la classe
-ErrorTooManyAttempts= Too many attempts, please try again later
+ErrorTooManyAttempts= Trop de tentatives, veuillez réessayer plus tard
diff --git a/htdocs/langs/fr_FR/ldap.lang b/htdocs/langs/fr_FR/ldap.lang
index 1e38215a40e..100aec629d5 100644
--- a/htdocs/langs/fr_FR/ldap.lang
+++ b/htdocs/langs/fr_FR/ldap.lang
@@ -29,3 +29,5 @@ LDAPPasswordHashType=Type de hachage du mot de passe
 LDAPPasswordHashTypeExample=Type de hachage de mot de passe utilisé sur le serveur
 SupportedForLDAPExportScriptOnly=Uniquement pris en charge par un script d'exportation LDAP
 SupportedForLDAPImportScriptOnly=Uniquement pris en charge par un script d'importation LDAP
+LDAPUserAccountControl = userAccountControl à la création (répertoire actif)
+LDAPUserAccountControlExample = 512 Compte normal / 546 Compte normal + Pas de mot de passe + Désactivé (voir : https://fr.wikipedia.org/wiki/Active_Directory)
diff --git a/htdocs/langs/fr_FR/main.lang b/htdocs/langs/fr_FR/main.lang
index 6dd5196b6f6..03cbe16e332 100644
--- a/htdocs/langs/fr_FR/main.lang
+++ b/htdocs/langs/fr_FR/main.lang
@@ -235,8 +235,8 @@ PersonalValue=Valeur personnelle
 NewObject=Nouveau %s
 NewValue=Nouvelle valeur
 OldValue=Ancienne valeur %s
-FieldXModified=Field %s modified
-FieldXModifiedFromYToZ=Field %s modified from %s to %s
+FieldXModified=Champ %s modifié
+FieldXModifiedFromYToZ=Champ %s modifié de %s à %s
 CurrentValue=Valeur courante
 Code=Code
 Type=Type
@@ -558,7 +558,7 @@ Unknown=Inconnu
 General=Général
 Size=Taille
 OriginalSize=Taille d'origine
-RotateImage=Rotate 90°
+RotateImage=Rotation 90°
 Received=Reçu
 Paid=Payé
 Topic=Sujet
@@ -1237,3 +1237,5 @@ SearchSyntaxTooltipForStringOrNum=Pour effectuer une recherche à l'intérieur d
 InProgress=En cours
 DateOfPrinting=Date d'impression
 ClickFullScreenEscapeToLeave=Cliquez ici pour passer en mode plein écran. Appuyez sur ÉCHAP pour quitter le mode plein écran.
+UserNotYetValid=Not yet valid
+UserExpired=Expiré
diff --git a/htdocs/langs/fr_FR/modulebuilder.lang b/htdocs/langs/fr_FR/modulebuilder.lang
index 5fa2c474900..6911e679620 100644
--- a/htdocs/langs/fr_FR/modulebuilder.lang
+++ b/htdocs/langs/fr_FR/modulebuilder.lang
@@ -28,6 +28,7 @@ ModuleBuilderDescwidgets=Cet onglet est dédié à la gestion/construction de wi
 ModuleBuilderDescbuildpackage=Vous pouvez générer ici un fichier de package "prêt à distribuer" (un fichier .zip normalisé) de votre module et un fichier de documentation "prêt à distribuer". Cliquez simplement sur le bouton pour créer le paquet ou le fichier de documentation.
 EnterNameOfModuleToDeleteDesc=Vous pouvez supprimer votre module. ATTENTION: Tous les fichiers relatifs a ce module (générés ou créés manuellement) ET toutes les données et documentation seront supprimés!
 EnterNameOfObjectToDeleteDesc=Vous pouvez effacer un objet. ATTENTION : Tous les fichiers (générés ou créés manuellement) en rapport avec cet objet seront définitivement effacés !
+EnterNameOfObjectToDeleteDesc=Vous pouvez effacer un objet. ATTENTION : Tous les fichiers (générés ou créés manuellement) en rapport avec cet objet seront définitivement effacés !
 DangerZone=Zone de danger
 BuildPackage=Construire le package
 BuildPackageDesc=Vous pouvez générer un package zip de votre application afin d'être prêt à le distribuer sur n’importe quel Dolibarr. Vous pouvez également le distribuer ou le vendre sur une place de marché, comme <a href="https://www.dolistore.com">DoliStore.com</a> .
@@ -162,11 +163,11 @@ ListOfTabsEntries=Liste des entrées d'onglet
 TabsDefDesc=Définissez ici les onglets proposés par votre module
 TabsDefDescTooltip=Les onglets fournis par votre module/application sont définis dans le tableau <strong> $this->tabs </strong> dans le fichier descripteur de module. Vous pouvez modifier manuellement ce fichier ou utiliser l'éditeur intégré.
 BadValueForType=Mauvaise valeur pour le type %s
-DefinePropertiesFromExistingTable=Définir des propriétés à partir d'une table existante
+DefinePropertiesFromExistingTable=Define the fields/properties from an existing table
 DefinePropertiesFromExistingTableDesc=Si une table dans la base de données (pour l'objet à créer) existe déjà, vous pouvez l'utiliser pour définir les propriétés de l'objet.
 DefinePropertiesFromExistingTableDesc2=Laisser vide si la table n'existe pas encore. Le générateur de code utilisera différents types de champs pour créer un exemple de table que vous pourrez modifier ultérieurement.
-GeneratePermissions=Je souhaite ajouter les droits pour cet objet
-GeneratePermissionsHelp=générer les droits par défaut pour cet objet
+GeneratePermissions=I want to manage permissions on this object
+GeneratePermissionsHelp=If you check this, some code will be added to manage permissions to read, write and delete record of the objects
 PermissionDeletedSuccesfuly=Les permissions ont été retirées avec succès
 PermissionUpdatedSuccesfuly=Les permissions ont été mises à jour avec succès
 PermissionAddedSuccesfuly=Les permissions ont été ajoutées avec succès
@@ -177,3 +178,6 @@ ApiObjectDeleted=L'API pour l'objet %s a été supprimée avec succès
 CRUDRead=Lire
 CRUDCreateWrite=Créer ou mettre à jour
 FailedToAddCodeIntoDescriptor=Échec de l'ajout de code dans le descripteur. Vérifiez que le commentaire de chaîne "%s" est toujours présent dans le fichier.
+DictionariesCreated=Dictionnaire <b> %s </b> créé avec succès
+DictionaryDeleted=Dictionnaire <b> %s </b> supprimé avec succès
+PropertyModuleUpdated=Property <b>%s</b> has been update successfully
diff --git a/htdocs/langs/fr_FR/stocks.lang b/htdocs/langs/fr_FR/stocks.lang
index 099b5b8d3a3..e557143a390 100644
--- a/htdocs/langs/fr_FR/stocks.lang
+++ b/htdocs/langs/fr_FR/stocks.lang
@@ -239,7 +239,7 @@ InventoryForASpecificWarehouse=Inventaire pour un entrepôt spécifique
 InventoryForASpecificProduct=Inventaire pour un produit spécifique
 StockIsRequiredToChooseWhichLotToUse=Un stock existant est nécessaire pour pouvoir choisir le lot à utiliser
 ForceTo=Forcer à
-AlwaysShowFullArbo=Display the full path of a warehouse (parent warehouses) on the popup of warehouse links (Warning: This may decrease dramatically performances)
+AlwaysShowFullArbo=Afficher le chemin complet d'un entrepôt (entrepôts parents) sur la popup des liens d'entrepôt (Attention : Cela peut diminuer considérablement les performances)
 StockAtDatePastDesc=Vous pouvez voir ici le stock (stock réel) à une date donnée dans le passé
 StockAtDateFutureDesc=Vous pouvez voir ici le stock (stock virtuel) à une date donnée dans le futur
 CurrentStock=Stock actuel
@@ -321,5 +321,5 @@ BatchNotFound=Lot/série introuvable pour ce produit
 StockMovementWillBeRecorded=Les mouvements de stock seront enregistrés
 StockMovementNotYetRecorded=Le mouvement des stocks ne sera pas affecté par cette étape
 WarningThisWIllAlsoDeleteStock=Attention, cela détruira également toutes les quantités en stock dans l'entrepôt
-DeleteBatch=Delete lot/serial
-ConfirmDeleteBatch=Are you sure you want to delete lot/serial ?
+DeleteBatch=Supprimer le lot/série
+ConfirmDeleteBatch=Voulez-vous vraiment supprimer le lot/série ?
diff --git a/htdocs/langs/fr_FR/stripe.lang b/htdocs/langs/fr_FR/stripe.lang
index 4772aca92f3..a38360f715c 100644
--- a/htdocs/langs/fr_FR/stripe.lang
+++ b/htdocs/langs/fr_FR/stripe.lang
@@ -51,6 +51,7 @@ StripeAccount=Compte Stripe
 StripeChargeList=Liste des encaissements par Stripe
 StripeTransactionList=Liste des transactions Stripe
 StripeCustomerId=Identifiant client Stripe
+StripePaymentId=Identifiant de paiement Stripe
 StripePaymentModes=Modes de paiement Stripe
 LocalID=ID local
 StripeID=Stripe ID
diff --git a/htdocs/langs/fr_FR/supplier_proposal.lang b/htdocs/langs/fr_FR/supplier_proposal.lang
index fabfa805777..d6ff65daf05 100644
--- a/htdocs/langs/fr_FR/supplier_proposal.lang
+++ b/htdocs/langs/fr_FR/supplier_proposal.lang
@@ -42,7 +42,8 @@ SendAskRef=Envoi de la demande de prix %s
 SupplierProposalCard=Fiche demande
 ConfirmDeleteAsk=Êtes-vous sûr de vouloir effacer cette demande de prix <b>%s</b> ?
 ActionsOnSupplierProposal=Evénements sur demande de prix
-DocModelAuroreDescription=Modèle de demande de prix fournisseur complet (logo…)
+DocModelAuroreDescription=A complete template for a vendor quotation request template (old implementation of Sponge template)
+DocModelZenithDescription=A complete template for a vendor quotation request template
 CommercialAsk=Demande de prix
 DefaultModelSupplierProposalCreate=Création d'un modèle par défaut
 DefaultModelSupplierProposalToBill=Modèle par défaut lors de la fermeture d'une demande de prix (accepté)
diff --git a/htdocs/langs/fr_FR/ticket.lang b/htdocs/langs/fr_FR/ticket.lang
index 6a23628f994..6e849456452 100644
--- a/htdocs/langs/fr_FR/ticket.lang
+++ b/htdocs/langs/fr_FR/ticket.lang
@@ -126,9 +126,9 @@ TicketParams=Paramètres
 TicketsShowModuleLogo=Afficher le logo du module dans l'interface publique
 TicketsShowModuleLogoHelp=Activer cette option pour cacher le logo du module dans les pages de l'interface publique
 TicketsShowCompanyLogo=Afficher le logo de la société dans l'interface publique
-TicketsShowCompanyLogoHelp=Enable this option to show the logo of the main company in the pages of the public interface
+TicketsShowCompanyLogoHelp=Activez cette option pour afficher le logo de l'entreprise principale dans les pages de l'interface publique
 TicketsShowCompanyFooter=Afficher le pied de page de l'entreprise dans l'interface publique
-TicketsShowCompanyFooterHelp=Enable this option to show the footer of the main company in the pages of the public interface
+TicketsShowCompanyFooterHelp=Activez cette option pour afficher le pied de page de l'entreprise principale dans les pages de l'interface publique
 TicketsEmailAlsoSendToMainAddress=Envoyer également une notification à l'adresse e-mail principale
 TicketsEmailAlsoSendToMainAddressHelp=Activer cette option pour envoyer aussi un email à l'adresse définie dans la configuration "%s" (Voir onglet "%s")
 TicketsLimitViewAssignedOnly=Limiter l'afficher des tickets assignés à l'utilisateur courant (non valable pour les utilisateurs externes, toujours limité par le tiers dont ils dépendent)
@@ -329,8 +329,8 @@ OldUser=Ancien utilisateur
 NewUser=Nouvel utilisateur
 NumberOfTicketsByMonth=Nombre de tickets par mois
 NbOfTickets=Nombre de tickets
-ExternalContributors=External contributors
-AddContributor=Add external contributor
+ExternalContributors=Contributeurs externes
+AddContributor=Ajouter un contributeur externe
 
 # notifications
 TicketCloseEmailSubjectCustomer=Billet fermé
diff --git a/htdocs/langs/fr_FR/users.lang b/htdocs/langs/fr_FR/users.lang
index a0b3e0b26ad..67a2f84bd0c 100644
--- a/htdocs/langs/fr_FR/users.lang
+++ b/htdocs/langs/fr_FR/users.lang
@@ -99,7 +99,7 @@ YourRole=Vos rôles
 YourQuotaOfUsersIsReached=Votre quota d'utilisateurs actifs est atteint !
 NbOfUsers=Nombre d'utilisateurs
 NbOfPermissions=Nombre de permissions
-DontDowngradeSuperAdmin=Only another admin can downgrade an admin
+DontDowngradeSuperAdmin=Seul un autre administrateur peut rétrograder un administrateur
 HierarchicalResponsible=Responsable hiérarchique
 HierarchicView=Vue hiérarchique
 UseTypeFieldToChange=Modifier le champ Type pour changer
diff --git a/htdocs/langs/fr_FR/website.lang b/htdocs/langs/fr_FR/website.lang
index 681ec2670d7..3d1ca31ef01 100644
--- a/htdocs/langs/fr_FR/website.lang
+++ b/htdocs/langs/fr_FR/website.lang
@@ -158,5 +158,5 @@ Reservation=Réservation
 PagesViewedPreviousMonth=Pages vues (mois précédent)
 PagesViewedTotal=Pages vues (total)
 Visibility=Visibilité
-Everyone=Everyone
+Everyone=Tout le monde
 AssignedContacts=Contacts assignés
diff --git a/htdocs/langs/fr_GA/stocks.lang b/htdocs/langs/fr_GA/stocks.lang
new file mode 100644
index 00000000000..240c8a3f19c
--- /dev/null
+++ b/htdocs/langs/fr_GA/stocks.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - stocks
+AlwaysShowFullArbo=Display the full path of a warehouse (parent warehouses) on the popup of warehouse links (Warning: This may decrease dramatically performances)
diff --git a/htdocs/langs/fr_GA/ticket.lang b/htdocs/langs/fr_GA/ticket.lang
new file mode 100644
index 00000000000..dd733640aa1
--- /dev/null
+++ b/htdocs/langs/fr_GA/ticket.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - ticket
+TicketsShowCompanyLogoHelp=Enable this option to show the logo of the main company in the pages of the public interface
diff --git a/htdocs/langs/gl_ES/accountancy.lang b/htdocs/langs/gl_ES/accountancy.lang
index 31f64baea3e..210a31a3970 100644
--- a/htdocs/langs/gl_ES/accountancy.lang
+++ b/htdocs/langs/gl_ES/accountancy.lang
@@ -57,11 +57,14 @@ WarningDataDisappearsWhenDataIsExported=Aviso, esta listaxe contén só as entra
 VueByAccountAccounting=Ver por conta contable
 VueBySubAccountAccounting=Ver pos subconta contable
 
-MainAccountForCustomersNotDefined=Conta contable principal para clientes non definida na configuración
-MainAccountForSuppliersNotDefined=Conta contable principal para provedores non definida na configuración
-MainAccountForUsersNotDefined=Conta contable principal para usuarios non definida na configuración
-MainAccountForVatPaymentNotDefined=Conta contable principal para pagos de IVE non definida na configuración
-MainAccountForSubscriptionPaymentNotDefined=Conta contable principal para o pago de afiliacións non definida na configuración
+MainAccountForCustomersNotDefined=Conta contable principal (do Plan Contable) para clientes non definidos na configuración
+MainAccountForSuppliersNotDefined=Conta contable principal (do Plan Contable) para provedores non definidos na configuración
+MainAccountForUsersNotDefined=Conta contable principal (do Plan Contable) para usuarios non definidos na configuración
+MainAccountForRevenueStampSaleNotDefined=Conta (do Plan Contable) para o  ingresos (vendas) non definida na configuración
+MainAccountForRevenueStampPurchaseNotDefined=Conta (do Plan Contable) para ingresos (compras) non definida na configuración
+MainAccountForVatPaymentNotDefined=Conta (do Plan Contable) para o pagamento do IVE non definida na configuración
+MainAccountForSubscriptionPaymentNotDefined=Conta (do Plan Contable) para o pagamento da adhesión non  definida na configuración
+MainAccountForRetainedWarrantyNotDefined=Conta (do Plan Contable) para a garantía conservada non definida na configuración
 UserAccountNotDefined=Conta de contabilidade para o usuario non definida na configuración
 
 AccountancyArea=Área contabilidade
diff --git a/htdocs/langs/gl_ES/admin.lang b/htdocs/langs/gl_ES/admin.lang
index 1652186aa5c..f7cf9109a9b 100644
--- a/htdocs/langs/gl_ES/admin.lang
+++ b/htdocs/langs/gl_ES/admin.lang
@@ -1509,7 +1509,8 @@ WatermarkOnDraftContractCards=Marca de auga en contratos (o caso de estar baleir
 MembersSetup=Configuración do módulo Asociacións
 MemberMainOptions=Opcións principais
 MemberCodeChecker=Opcións para a xeración automática de códigos de membros
-AdherentLoginRequired= Xestionar un login para cada membro
+AdherentLoginRequired=Xestiona un inicio de sesión/contrasinal para cada membro
+AdherentLoginRequiredDesc=Engade un valor para un inicio de sesión e un contrasinal no ficheiro de membro. Se o membro está ligado a un usuario, ao actualizar o inicio de sesión e o contrasinal do membro tamén se actualizará o usuario e o contrasinal.
 AdherentMailRequired=E-Mail obrigatorio para crear un membro novo
 MemberSendInformationByMailByDefault=Caixa de verificación para enviar o correo de confirmación (validación ou nova cotización) aos membros é por defecto "sí"
 MemberCreateAnExternalUserForSubscriptionValidated=Crea un inicio de sesión de usuario externo para cada nova subscrición de membro validada 
@@ -2076,6 +2077,10 @@ MAIN_DOCUMENTS_LOGO_HEIGHT=Altura para logotipo en PDF
 DOC_SHOW_FIRST_SALES_REP=Amosar o primeiro representante de vendas
 MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Engade unha columna para a imaxe nas liñas de orzamento á cliente
 MAIN_DOCUMENTS_WITH_PICTURE_WIDTH=Largura da columna se se engade unha imaxe nas liñas 
+MAIN_GENERATE_DOCUMENTS_SUPPLIER_PROPOSAL_WITHOUT_UNIT_PRICE=Ocultar a columna de prezos unitarios nas solicitudes de orzamento
+MAIN_GENERATE_DOCUMENTS_SUPPLIER_PROPOSAL_WITHOUT_TOTAL_COLUMN=Ocultar a columna do prezo total nas solicitudes de orzamento
+MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_UNIT_PRICE=Ocultar a columna de prezos unitarios nos pedimentos
+MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_TOTAL_COLUMN=Ocultar a columna do prezo total nos pedimentos
 MAIN_PDF_NO_SENDER_FRAME=Ocultar os bordos no marco do enderezo do remitente
 MAIN_PDF_NO_RECIPENT_FRAME=Ocultar os bordos no marco do enderezo do destinatario 
 MAIN_PDF_HIDE_CUSTOMER_CODE=Ocultar código de cliente 
@@ -2400,4 +2405,4 @@ OptionXShouldBeEnabledInModuleY=A opción " <b> %s </b> " debe estar habilitada
 OptionXIsCorrectlyEnabledInModuleY=A opción " <b> %s </b> " está habilitada no módulo <b> %s </b>
 AtBottomOfPage=Na parte inferior da páxina
 FailedAuth=autenticacións fallidas
-MaxNumberOfFailedAuth=Número máximo de autenticación fallida en 24 horas para desactivar o inicio de sesión.
+MaxNumberOfFailedAuth=Número máximo de autenticación fallida en 24 horas para denegar o inicio de sesión.
diff --git a/htdocs/langs/gl_ES/compta.lang b/htdocs/langs/gl_ES/compta.lang
index f6a5d2df359..3b8985b2133 100644
--- a/htdocs/langs/gl_ES/compta.lang
+++ b/htdocs/langs/gl_ES/compta.lang
@@ -253,6 +253,8 @@ CalculationMode=Modo de cálculo
 AccountancyJournal=Código contable diario
 ACCOUNTING_VAT_SOLD_ACCOUNT=Conta (do Plan Contable) que se utilizará como conta predeterminada para o IVE nas vendas (utilizada se non está definida na configuración do dicionario de IVE)
 ACCOUNTING_VAT_BUY_ACCOUNT=Conta (do Plan Contable) que se utilizará como conta predeterminada para o IVE nas compras (utilizada se non está definida na configuración do dicionario de IVE)
+ACCOUNTING_REVENUESTAMP_SOLD_ACCOUNT=Conta (do Plan Contable) que se utilizará para o rexistro de ingresos das vendas
+ACCOUNTING_REVENUESTAMP_BUY_ACCOUNT=Conta (do Plan Contable) que se utilizará para o rexistro de ingresos nas compras
 ACCOUNTING_VAT_PAY_ACCOUNT=Conta (do Plan Contable) que se utilizará como conta predeterminada para o pagamento do IVE
 ACCOUNTING_VAT_BUY_REVERSE_CHARGES_CREDIT=Conta (do plan contable) que se utilizará como conta predeterminada para o IVE nas compras por cargos inversos (crédito)
 ACCOUNTING_VAT_BUY_REVERSE_CHARGES_DEBIT=Conta (do plan contable) que se utilizará como conta predeterminada para o IVE nas compras por cargos inversos (débito)
diff --git a/htdocs/langs/gl_ES/errors.lang b/htdocs/langs/gl_ES/errors.lang
index 5fc3ae52471..6180065f8fc 100644
--- a/htdocs/langs/gl_ES/errors.lang
+++ b/htdocs/langs/gl_ES/errors.lang
@@ -320,6 +320,8 @@ ErrorSVGFilesNotAllowedAsLinksWithout=Os ficheiros SVG non están permitidos com
 ErrorTypeMenu=Imposible engadir outro menú para o mesmo módulo na barra de navegación, aínda non operativo
 ErrorTableExist=A táboa <b> %s </b> xa existe
 ErrorDictionaryNotFound=Non se atopou o dicionario <b> %s </b>
+ErrorFailedToCreateSymLinkToMedias=Produciuse un erro ao crear as ligazóns simbólicas %s para apuntar a %s
+
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=O seu parámetro PHP upload_max_filesize (%s) é superior ao parámetro PHP post_max_size (%s). Esta non é unha configuración consistente.
 WarningPasswordSetWithNoAccount=Estableceuse un contrasinal para este membro. En calquera caso, non se creou ningunha conta de usuario. Polo tanto, este contrasinal está almacenado pero non se pode usar para iniciar sesión en Dolibarr. Pode ser usado por un módulo/interface externo, pero se non precisa definir ningún login ou contrasinal para un membro, pode desactivar a opción "Xestionar un inicio de sesión para cada membro" desde a configuración do módulo Membros. Se precisa xestionar un inicio de sesión pero non precisa ningún contrasinal, pode manter este campo baleiro para evitar este aviso. Nota: o correo electrónico tamén pode ser usado como inicio de sesión se o membro está ligado a un usuario.
diff --git a/htdocs/langs/gl_ES/main.lang b/htdocs/langs/gl_ES/main.lang
index 394c3fd7617..b076bf462c2 100644
--- a/htdocs/langs/gl_ES/main.lang
+++ b/htdocs/langs/gl_ES/main.lang
@@ -1237,3 +1237,5 @@ SearchSyntaxTooltipForStringOrNum=Para procurar dentro dos campos de texto, pode
 InProgress=En progreso
 DateOfPrinting=Data de impresión
 ClickFullScreenEscapeToLeave=Fai clic aquí para cambiar ao modo de pantalla completa. Preme ESCAPE para saír do modo pantalla completa.
+UserNotYetValid=Aínda non válido
+UserExpired=Expirado
diff --git a/htdocs/langs/gl_ES/modulebuilder.lang b/htdocs/langs/gl_ES/modulebuilder.lang
index 1288c3d7073..2e7e8346f27 100644
--- a/htdocs/langs/gl_ES/modulebuilder.lang
+++ b/htdocs/langs/gl_ES/modulebuilder.lang
@@ -163,11 +163,11 @@ ListOfTabsEntries=Lista de entradas de pestanas
 TabsDefDesc=Defina aquí as pestanas que proporciona o seu módulo
 TabsDefDescTooltip=As pestanas proporcionadas polo seu módulo/aplicación defínense na matriz <strong> $this->tabs </strong> no ficheiro descritor do módulo. Pode editar este ficheiro manualmente ou usar o editor incorporado.
 BadValueForType=Valor incorrecto para o tipo %s
-DefinePropertiesFromExistingTable=Definir propiedades a partir dunha táboa existente
+DefinePropertiesFromExistingTable=Defina os campos/propiedades dunha táboa existente
 DefinePropertiesFromExistingTableDesc=Se xa existe unha táboa na base de datos (para que o obxecto se cree), pode usala para definir as propiedades do obxecto.
 DefinePropertiesFromExistingTableDesc2=Mantéñase baleiro se a táboa aínda non existe. O xerador de código usará diferentes tipos de campos para construír un exemplo de táboa que pode editar máis tarde.
-GeneratePermissions=Quero engadir dereitos para este obxecto
-GeneratePermissionsHelp=xera dereitos predeterminados para este obxecto
+GeneratePermissions=Quero xestionar os permisos deste obxecto
+GeneratePermissionsHelp=Se marca isto, engadirase algún código para xestionar os permisos para ler, escribir e eliminar o rexistro dos obxectos
 PermissionDeletedSuccesfuly=O permiso foi eliminado correctamente
 PermissionUpdatedSuccesfuly=O permiso actualizouse correctamente
 PermissionAddedSuccesfuly=O permiso engadiuse correctamente
@@ -180,3 +180,4 @@ CRUDCreateWrite=Crear ou actualizar
 FailedToAddCodeIntoDescriptor=Produciuse un erro ao engadir o código ao descritor. Comproba que o comentario de cadea "%s" aínda está presente no ficheiro.
 DictionariesCreated=Dicionario <b> %s </b> creado correctamente
 DictionaryDeleted=Dicionario <b> %s </b> eliminado correctamente
+PropertyModuleUpdated=A propiedade <b> %s </b> actualizouse correctamente
diff --git a/htdocs/langs/gl_ES/supplier_proposal.lang b/htdocs/langs/gl_ES/supplier_proposal.lang
index 1d11586a557..d49234c49f4 100644
--- a/htdocs/langs/gl_ES/supplier_proposal.lang
+++ b/htdocs/langs/gl_ES/supplier_proposal.lang
@@ -5,7 +5,7 @@ SupplierProposalNew=Novo orzamento
 CommRequest=Orzamento
 CommRequests=Orzamentos
 SearchRequest=Buscar un orzamento
-DraftRequests=Orzamentos borrador
+DraftRequests=Orzamentos a cliente borrador
 SupplierProposalsDraft=Orzamentos de provedor borrador
 LastModifiedRequests=Últimos %s orzamentos modificados
 RequestsOpened=Orzamentos abertos
@@ -42,7 +42,8 @@ SendAskRef=Enviando o orzamento %s
 SupplierProposalCard=Ficha orzamento
 ConfirmDeleteAsk=¿Está certo de querer eliminar este orzamento <b>%s</b>?
 ActionsOnSupplierProposal=Eventos do orzamento
-DocModelAuroreDescription=Modelo de orzamento completo (logo...)
+DocModelAuroreDescription=Un modelo completo para un modelo de solicitude de orzamento do provedor (antiga implementación do modelo Sponge)
+DocModelZenithDescription=Un modelo completo para un modelo de solicitude de orzamento do provedor
 CommercialAsk=Orzamento
 DefaultModelSupplierProposalCreate=Modelo por defecto
 DefaultModelSupplierProposalToBill=Modelo por defecto ao pechar un orzamento (aceptado)
@@ -53,3 +54,6 @@ SupplierProposalsToClose=Orzamentos de provedor a pechar
 SupplierProposalsToProcess=Orzamentos de provedor a procesar
 LastSupplierProposals=Últimos %s orzamentos
 AllPriceRequests=Todos os orzamentos
+TypeContact_supplier_proposal_external_SHIPPING=Contacto do provedor para a recollida
+TypeContact_supplier_proposal_external_BILLING=Contacto do provedor para a facturación
+TypeContact_supplier_proposal_external_SERVICE=Comercial seguemento orzamento
diff --git a/htdocs/langs/he_IL/admin.lang b/htdocs/langs/he_IL/admin.lang
index 34c90508486..5887dcfd4f2 100644
--- a/htdocs/langs/he_IL/admin.lang
+++ b/htdocs/langs/he_IL/admin.lang
@@ -1509,7 +1509,8 @@ WatermarkOnDraftContractCards=Watermark on draft contracts (none if empty)
 MembersSetup=חברי מודול ההתקנה
 MemberMainOptions=אפשרויות עיקריות
 MemberCodeChecker=Options for automatic generation of member codes
-AdherentLoginRequired= ניהול התחברות לכל חבר
+AdherentLoginRequired=Manage a login/password for each member
+AdherentLoginRequiredDesc=Add a value for a login and a password on the member file. If the member is linked to a user, updating the member login and password will also update the user login and password.
 AdherentMailRequired=Email required to create a new member
 MemberSendInformationByMailByDefault=תיבת סימון לשלוח אישור בדואר לחברי (אימות או מנוי חדש) מופעלת כברירת מחדל
 MemberCreateAnExternalUserForSubscriptionValidated=Create an external user login for each new member subscription validated
@@ -2076,6 +2077,10 @@ MAIN_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
 DOC_SHOW_FIRST_SALES_REP=Show first sales representative
 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_GENERATE_DOCUMENTS_SUPPLIER_PROPOSAL_WITHOUT_UNIT_PRICE=Hide the unit price column on quotation requests
+MAIN_GENERATE_DOCUMENTS_SUPPLIER_PROPOSAL_WITHOUT_TOTAL_COLUMN=Hide the total price column on quotation requests
+MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_UNIT_PRICE=Hide the unit price column on purchase orders
+MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_TOTAL_COLUMN=Hide the total price column on puchase orders
 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
@@ -2400,4 +2405,4 @@ OptionXShouldBeEnabledInModuleY=Option "<b>%s</b>" should be enabled into module
 OptionXIsCorrectlyEnabledInModuleY=Option "<b>%s</b>" is enabled into module <b>%s</b>
 AtBottomOfPage=At bottom of page
 FailedAuth=failed authentications
-MaxNumberOfFailedAuth=Max number of failed authentication in 24h to disable login.
+MaxNumberOfFailedAuth=Max number of failed authentication in 24h to deny login.
diff --git a/htdocs/langs/hr_HR/admin.lang b/htdocs/langs/hr_HR/admin.lang
index a74f9b7d7b5..4bd364f8365 100644
--- a/htdocs/langs/hr_HR/admin.lang
+++ b/htdocs/langs/hr_HR/admin.lang
@@ -1509,7 +1509,8 @@ WatermarkOnDraftContractCards=Vodeni žig na skicama ugovora (ništa ako se osta
 MembersSetup=Podešavanje modula članova
 MemberMainOptions=Glavne opcije
 MemberCodeChecker=Options for automatic generation of member codes
-AdherentLoginRequired= Upravljanje prijavom svakog korisnika
+AdherentLoginRequired=Manage a login/password for each member
+AdherentLoginRequiredDesc=Add a value for a login and a password on the member file. If the member is linked to a user, updating the member login and password will also update the user login and password.
 AdherentMailRequired=E-mail je potreban za stvaranje novog člana
 MemberSendInformationByMailByDefault=Checkbox to send mail confirmation to members (validation or new subscription) is on by default
 MemberCreateAnExternalUserForSubscriptionValidated=Izradite vanjsko korisničko ime za svaku potvrđenu pretplatu novog člana
@@ -2076,6 +2077,10 @@ MAIN_DOCUMENTS_LOGO_HEIGHT=Visina za logo u PDF-u
 DOC_SHOW_FIRST_SALES_REP=Show first sales representative
 MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Dodajte stupac za sliku u retke prijedloga
 MAIN_DOCUMENTS_WITH_PICTURE_WIDTH=Širina stupca ako se slika dodaje na redove
+MAIN_GENERATE_DOCUMENTS_SUPPLIER_PROPOSAL_WITHOUT_UNIT_PRICE=Hide the unit price column on quotation requests
+MAIN_GENERATE_DOCUMENTS_SUPPLIER_PROPOSAL_WITHOUT_TOTAL_COLUMN=Hide the total price column on quotation requests
+MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_UNIT_PRICE=Hide the unit price column on purchase orders
+MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_TOTAL_COLUMN=Hide the total price column on puchase orders
 MAIN_PDF_NO_SENDER_FRAME=Sakrij obrube na okviru adrese pošiljatelja
 MAIN_PDF_NO_RECIPENT_FRAME=Sakrij obrub na okviru adrese primatelja
 MAIN_PDF_HIDE_CUSTOMER_CODE=Sakrij šifru korisnika
@@ -2400,4 +2405,4 @@ OptionXShouldBeEnabledInModuleY=Option "<b>%s</b>" should be enabled into module
 OptionXIsCorrectlyEnabledInModuleY=Option "<b>%s</b>" is enabled into module <b>%s</b>
 AtBottomOfPage=At bottom of page
 FailedAuth=failed authentications
-MaxNumberOfFailedAuth=Max number of failed authentication in 24h to disable login.
+MaxNumberOfFailedAuth=Max number of failed authentication in 24h to deny login.
diff --git a/htdocs/langs/hr_HR/main.lang b/htdocs/langs/hr_HR/main.lang
index 5033fbb9bda..862453aa75d 100644
--- a/htdocs/langs/hr_HR/main.lang
+++ b/htdocs/langs/hr_HR/main.lang
@@ -1237,3 +1237,5 @@ SearchSyntaxTooltipForStringOrNum=For searching inside text fields, you can use
 InProgress=U postupku
 DateOfPrinting=Date of printing
 ClickFullScreenEscapeToLeave=Click here to switch in Full screen mode. Press ESCAPE to leave Full screen mode.
+UserNotYetValid=Not yet valid
+UserExpired=Isteklo
diff --git a/htdocs/langs/hr_HR/supplier_proposal.lang b/htdocs/langs/hr_HR/supplier_proposal.lang
index 9824ab8a993..5d812929dad 100644
--- a/htdocs/langs/hr_HR/supplier_proposal.lang
+++ b/htdocs/langs/hr_HR/supplier_proposal.lang
@@ -13,6 +13,7 @@ SupplierProposalArea=Vendor proposals area
 SupplierProposalShort=Upit dobavljaču
 SupplierProposals=Upiti dobavljačima
 SupplierProposalsShort=Ponude dobavljača
+AskPrice=Zahtjev za cijenom
 NewAskPrice=Novi upit
 ShowSupplierProposal=Prikaži zahtjev
 AddSupplierProposal=Izradi zahtjev za cijenom
@@ -41,7 +42,8 @@ SendAskRef=Upit %s
 SupplierProposalCard=Kartica zahtjeva
 ConfirmDeleteAsk=Are you sure you want to delete this price request <b>%s</b>?
 ActionsOnSupplierProposal=Događaji na zahtjevu
-DocModelAuroreDescription=Kompletan zahtjev (logo ... )
+DocModelAuroreDescription=A complete template for a vendor quotation request template (old implementation of Sponge template)
+DocModelZenithDescription=A complete template for a vendor quotation request template
 CommercialAsk=Zahtjev za cijenom
 DefaultModelSupplierProposalCreate=Izrada osnovnog modela
 DefaultModelSupplierProposalToBill=Osnovni predložak prilikom zatvaranja zahtjeva (prihvaćeno)
@@ -52,3 +54,6 @@ SupplierProposalsToClose=Ponude dobavljača za zatvaranje
 SupplierProposalsToProcess=Ponude dobavljača za obradu
 LastSupplierProposals=Latest %s price requests
 AllPriceRequests=Svi zahtjevi
+TypeContact_supplier_proposal_external_SHIPPING=Vendor contact for delivery
+TypeContact_supplier_proposal_external_BILLING=Vendor contact for billing
+TypeContact_supplier_proposal_external_SERVICE=Suradnik koji prati ponudu
diff --git a/htdocs/langs/hu_HU/accountancy.lang b/htdocs/langs/hu_HU/accountancy.lang
index 1c9132f4fc6..1d17546ca6d 100644
--- a/htdocs/langs/hu_HU/accountancy.lang
+++ b/htdocs/langs/hu_HU/accountancy.lang
@@ -57,11 +57,14 @@ WarningDataDisappearsWhenDataIsExported=Warning, this list contains only the acc
 VueByAccountAccounting=Megtekintés számviteli számla szerint
 VueBySubAccountAccounting=Megtekintés számviteli alszámla szerint
 
-MainAccountForCustomersNotDefined=A beállításban nem definiált ügyfelek fő számviteli számlája
-MainAccountForSuppliersNotDefined=A beállításban nem definiált szállítók fő számviteli számlája
-MainAccountForUsersNotDefined=Fő számviteli számla a beállításban nem definiált felhasználók számára
-MainAccountForVatPaymentNotDefined=Az ÁFA befizetés fő számviteli számlája nincs meghatározva a beállításban
-MainAccountForSubscriptionPaymentNotDefined=Az előfizetési fizetéshez szükséges fő számla nincs megadva a beállításban
+MainAccountForCustomersNotDefined=Main account (from the Chart of Account) for customers not defined in setup
+MainAccountForSuppliersNotDefined=Main account (from the Chart of Account) for vendors not defined in setup
+MainAccountForUsersNotDefined=Main account (from the Chart of Account) for users not defined in setup
+MainAccountForRevenueStampSaleNotDefined=Account (from the Chart of Account) for the revenue stamp (sales) not defined in setup
+MainAccountForRevenueStampPurchaseNotDefined=Account (from the Chart of Account) for the revenue stamp (purchases) not defined in setup
+MainAccountForVatPaymentNotDefined=Account (from the Chart of Account) for VAT payment not defined in setup
+MainAccountForSubscriptionPaymentNotDefined=Account (from the Chart of Account) for membership payment not defined in setup
+MainAccountForRetainedWarrantyNotDefined=Account (from the Chart of Account) for the retained warranty not defined in setup
 UserAccountNotDefined=A beállításban nincs megadva számviteli számla
 
 AccountancyArea=Számviteli terület
diff --git a/htdocs/langs/hu_HU/admin.lang b/htdocs/langs/hu_HU/admin.lang
index 8a38a3ecf62..6ad42b9820e 100644
--- a/htdocs/langs/hu_HU/admin.lang
+++ b/htdocs/langs/hu_HU/admin.lang
@@ -1509,7 +1509,8 @@ WatermarkOnDraftContractCards=Vízjel a szerződéstervezeteken (nincs, ha üres
 MembersSetup=Tagok modul beállítása
 MemberMainOptions=Fő opciók
 MemberCodeChecker=Options for automatic generation of member codes
-AdherentLoginRequired= Készítsen egy Login minden tagja számára
+AdherentLoginRequired=Manage a login/password for each member
+AdherentLoginRequiredDesc=Add a value for a login and a password on the member file. If the member is linked to a user, updating the member login and password will also update the user login and password.
 AdherentMailRequired=Új tag létrehozásához e-mail cím szükséges
 MemberSendInformationByMailByDefault=Checkbox levelet küldeni visszaigazolást a tagok (jóváhagyás vagy új előfizetés) alapértelmezés szerint be van
 MemberCreateAnExternalUserForSubscriptionValidated=Hozzon létre egy külső felhasználói bejelentkezést minden egyes érvényesített új tag-előfizetéshez
@@ -2076,6 +2077,10 @@ MAIN_DOCUMENTS_LOGO_HEIGHT=A logó magassága PDF-ben
 DOC_SHOW_FIRST_SALES_REP=Mutasd meg az első értékesítési képviselőt
 MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Oszlop hozzáadása a képhez az ajánlatsorokhoz
 MAIN_DOCUMENTS_WITH_PICTURE_WIDTH=Oszlop szélessége, ha kép van hozzáadva a sorokhoz
+MAIN_GENERATE_DOCUMENTS_SUPPLIER_PROPOSAL_WITHOUT_UNIT_PRICE=Hide the unit price column on quotation requests
+MAIN_GENERATE_DOCUMENTS_SUPPLIER_PROPOSAL_WITHOUT_TOTAL_COLUMN=Hide the total price column on quotation requests
+MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_UNIT_PRICE=Hide the unit price column on purchase orders
+MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_TOTAL_COLUMN=Hide the total price column on puchase orders
 MAIN_PDF_NO_SENDER_FRAME=Szegélyek elrejtése a küldő címkeretén
 MAIN_PDF_NO_RECIPENT_FRAME=Szegélyek elrejtése a receptcímkereten
 MAIN_PDF_HIDE_CUSTOMER_CODE=Ügyfélkód elrejtése
@@ -2400,4 +2405,4 @@ OptionXShouldBeEnabledInModuleY=Option "<b>%s</b>" should be enabled into module
 OptionXIsCorrectlyEnabledInModuleY=Option "<b>%s</b>" is enabled into module <b>%s</b>
 AtBottomOfPage=At bottom of page
 FailedAuth=failed authentications
-MaxNumberOfFailedAuth=Max number of failed authentication in 24h to disable login.
+MaxNumberOfFailedAuth=Max number of failed authentication in 24h to deny login.
diff --git a/htdocs/langs/hu_HU/main.lang b/htdocs/langs/hu_HU/main.lang
index d2c67f3ab49..586cb3c4462 100644
--- a/htdocs/langs/hu_HU/main.lang
+++ b/htdocs/langs/hu_HU/main.lang
@@ -1237,3 +1237,5 @@ SearchSyntaxTooltipForStringOrNum=For searching inside text fields, you can use
 InProgress=Folyamatban
 DateOfPrinting=Date of printing
 ClickFullScreenEscapeToLeave=Click here to switch in Full screen mode. Press ESCAPE to leave Full screen mode.
+UserNotYetValid=Not yet valid
+UserExpired=Lejárt
diff --git a/htdocs/langs/hu_HU/supplier_proposal.lang b/htdocs/langs/hu_HU/supplier_proposal.lang
index 9dd60e09171..97834616fcf 100644
--- a/htdocs/langs/hu_HU/supplier_proposal.lang
+++ b/htdocs/langs/hu_HU/supplier_proposal.lang
@@ -42,7 +42,8 @@ SendAskRef=Ár kérelem küldése %s
 SupplierProposalCard=Kártya kérése
 ConfirmDeleteAsk=Biztosan törölni szeretné ezt az ár kérelmet <b>%s</b>?
 ActionsOnSupplierProposal=Események ár kérelemre
-DocModelAuroreDescription=A teljes kérelem modell (logó...)
+DocModelAuroreDescription=A complete template for a vendor quotation request template (old implementation of Sponge template)
+DocModelZenithDescription=A complete template for a vendor quotation request template
 CommercialAsk=Ár kérelem
 DefaultModelSupplierProposalCreate=Alapértelmezett modell létrehozása
 DefaultModelSupplierProposalToBill=Alapértelmezett sablon ár kérelem lezárásakor (elfogadva)
diff --git a/htdocs/langs/id_ID/accountancy.lang b/htdocs/langs/id_ID/accountancy.lang
index c8e0653e103..6097275b00e 100644
--- a/htdocs/langs/id_ID/accountancy.lang
+++ b/htdocs/langs/id_ID/accountancy.lang
@@ -57,11 +57,14 @@ WarningDataDisappearsWhenDataIsExported=Warning, this list contains only the acc
 VueByAccountAccounting=Lihat berdasarkan akun akuntansi
 VueBySubAccountAccounting=Lihat menurut sub-akun akuntansi
 
-MainAccountForCustomersNotDefined=Akun akuntansi utama untuk pelanggan tidak ditentukan dalam pengaturan
-MainAccountForSuppliersNotDefined=Akun akuntansi utama untuk vendor tidak ditentukan dalam pengaturan
-MainAccountForUsersNotDefined=Akun akuntansi utama untuk pengguna tidak ditentukan dalam pengaturan
-MainAccountForVatPaymentNotDefined=Akun akuntansi utama untuk pembayaran PPN tidak ditentukan dalam pengaturan
-MainAccountForSubscriptionPaymentNotDefined=Akun akuntansi utama untuk pembayaran berlangganan tidak ditentukan dalam pengaturan
+MainAccountForCustomersNotDefined=Main account (from the Chart of Account) for customers not defined in setup
+MainAccountForSuppliersNotDefined=Main account (from the Chart of Account) for vendors not defined in setup
+MainAccountForUsersNotDefined=Main account (from the Chart of Account) for users not defined in setup
+MainAccountForRevenueStampSaleNotDefined=Account (from the Chart of Account) for the revenue stamp (sales) not defined in setup
+MainAccountForRevenueStampPurchaseNotDefined=Account (from the Chart of Account) for the revenue stamp (purchases) not defined in setup
+MainAccountForVatPaymentNotDefined=Account (from the Chart of Account) for VAT payment not defined in setup
+MainAccountForSubscriptionPaymentNotDefined=Account (from the Chart of Account) for membership payment not defined in setup
+MainAccountForRetainedWarrantyNotDefined=Account (from the Chart of Account) for the retained warranty not defined in setup
 UserAccountNotDefined=Accounting account for user not defined in setup
 
 AccountancyArea=Bidang akuntansi
diff --git a/htdocs/langs/id_ID/admin.lang b/htdocs/langs/id_ID/admin.lang
index d9d246b6009..a2eaf4ce8ec 100644
--- a/htdocs/langs/id_ID/admin.lang
+++ b/htdocs/langs/id_ID/admin.lang
@@ -1509,7 +1509,8 @@ WatermarkOnDraftContractCards=Tanda air pada draft kontrak (tidak ada jika koson
 MembersSetup=Pengaturan modul anggota
 MemberMainOptions=Opsi utama
 MemberCodeChecker=Options for automatic generation of member codes
-AdherentLoginRequired= Kelola Login untuk setiap anggota
+AdherentLoginRequired=Manage a login/password for each member
+AdherentLoginRequiredDesc=Add a value for a login and a password on the member file. If the member is linked to a user, updating the member login and password will also update the user login and password.
 AdherentMailRequired=Diperlukan email untuk membuat anggota baru
 MemberSendInformationByMailByDefault=Kotak centang untuk mengirim konfirmasi email kepada anggota (validasi atau berlangganan baru) diaktifkan secara default
 MemberCreateAnExternalUserForSubscriptionValidated=Buat login pengguna eksternal untuk setiap langganan anggota baru yang divalidasi
@@ -2076,6 +2077,10 @@ MAIN_DOCUMENTS_LOGO_HEIGHT=Tinggi untuk logo di PDF
 DOC_SHOW_FIRST_SALES_REP=Show first sales representative
 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_GENERATE_DOCUMENTS_SUPPLIER_PROPOSAL_WITHOUT_UNIT_PRICE=Hide the unit price column on quotation requests
+MAIN_GENERATE_DOCUMENTS_SUPPLIER_PROPOSAL_WITHOUT_TOTAL_COLUMN=Hide the total price column on quotation requests
+MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_UNIT_PRICE=Hide the unit price column on purchase orders
+MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_TOTAL_COLUMN=Hide the total price column on puchase orders
 MAIN_PDF_NO_SENDER_FRAME=Sembunyikan batas pada bingkai alamat pengirim
 MAIN_PDF_NO_RECIPENT_FRAME=Sembunyikan batas pada bingkai alamat penerima
 MAIN_PDF_HIDE_CUSTOMER_CODE=Sembunyikan kode pelanggan
@@ -2400,4 +2405,4 @@ OptionXShouldBeEnabledInModuleY=Option "<b>%s</b>" should be enabled into module
 OptionXIsCorrectlyEnabledInModuleY=Option "<b>%s</b>" is enabled into module <b>%s</b>
 AtBottomOfPage=At bottom of page
 FailedAuth=failed authentications
-MaxNumberOfFailedAuth=Max number of failed authentication in 24h to disable login.
+MaxNumberOfFailedAuth=Max number of failed authentication in 24h to deny login.
diff --git a/htdocs/langs/id_ID/supplier_proposal.lang b/htdocs/langs/id_ID/supplier_proposal.lang
index d6472cf7142..af68f5fb9d0 100644
--- a/htdocs/langs/id_ID/supplier_proposal.lang
+++ b/htdocs/langs/id_ID/supplier_proposal.lang
@@ -42,7 +42,8 @@ SendAskRef=Mengirim permintaan harga %s
 SupplierProposalCard=Kartu permintaan
 ConfirmDeleteAsk=Anda yakin ingin menghapus permintaan harga ini<b>%s </b>?
 ActionsOnSupplierProposal=Acara berdasarkan permintaan harga
-DocModelAuroreDescription=Model permintaan lengkap (logo ...)
+DocModelAuroreDescription=A complete template for a vendor quotation request template (old implementation of Sponge template)
+DocModelZenithDescription=A complete template for a vendor quotation request template
 CommercialAsk=Permintaan harga
 DefaultModelSupplierProposalCreate=Pembuatan model default
 DefaultModelSupplierProposalToBill=Template default saat menutup permintaan harga (diterima)
diff --git a/htdocs/langs/is_IS/admin.lang b/htdocs/langs/is_IS/admin.lang
index ba54367d443..25c56704773 100644
--- a/htdocs/langs/is_IS/admin.lang
+++ b/htdocs/langs/is_IS/admin.lang
@@ -1509,7 +1509,8 @@ WatermarkOnDraftContractCards=Watermark on draft contracts (none if empty)
 MembersSetup=Members mát skipulag
 MemberMainOptions=Helstu möguleikar
 MemberCodeChecker=Options for automatic generation of member codes
-AdherentLoginRequired= Stjórna Innskráning fyrir hvern meðlim
+AdherentLoginRequired=Manage a login/password for each member
+AdherentLoginRequiredDesc=Add a value for a login and a password on the member file. If the member is linked to a user, updating the member login and password will also update the user login and password.
 AdherentMailRequired=Email required to create a new member
 MemberSendInformationByMailByDefault=Checkbox að senda póst staðfestingu á meðlimum (löggilding eða nýja áskrift) er sjálfgefið
 MemberCreateAnExternalUserForSubscriptionValidated=Create an external user login for each new member subscription validated
@@ -2076,6 +2077,10 @@ MAIN_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
 DOC_SHOW_FIRST_SALES_REP=Show first sales representative
 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_GENERATE_DOCUMENTS_SUPPLIER_PROPOSAL_WITHOUT_UNIT_PRICE=Hide the unit price column on quotation requests
+MAIN_GENERATE_DOCUMENTS_SUPPLIER_PROPOSAL_WITHOUT_TOTAL_COLUMN=Hide the total price column on quotation requests
+MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_UNIT_PRICE=Hide the unit price column on purchase orders
+MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_TOTAL_COLUMN=Hide the total price column on puchase orders
 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
@@ -2400,4 +2405,4 @@ OptionXShouldBeEnabledInModuleY=Option "<b>%s</b>" should be enabled into module
 OptionXIsCorrectlyEnabledInModuleY=Option "<b>%s</b>" is enabled into module <b>%s</b>
 AtBottomOfPage=At bottom of page
 FailedAuth=failed authentications
-MaxNumberOfFailedAuth=Max number of failed authentication in 24h to disable login.
+MaxNumberOfFailedAuth=Max number of failed authentication in 24h to deny login.
diff --git a/htdocs/langs/is_IS/main.lang b/htdocs/langs/is_IS/main.lang
index 441d9f35fb6..2b3ee9c9293 100644
--- a/htdocs/langs/is_IS/main.lang
+++ b/htdocs/langs/is_IS/main.lang
@@ -235,6 +235,8 @@ PersonalValue=Starfsfólk gildi
 NewObject=New %s
 NewValue=Nýtt gildi
 OldValue=Old value %s
+FieldXModified=Field %s modified
+FieldXModifiedFromYToZ=Field %s modified from %s to %s
 CurrentValue=Núverandi gildi
 Code=Code
 Type=Tegund
@@ -346,6 +348,7 @@ MonthOfDay=Mánuður dagsins
 DaysOfWeek=Days of week
 HourShort=H
 MinuteShort=mn
+SecondShort=sec
 Rate=Verð
 CurrencyRate=Currency conversion rate
 UseLocalTax=Include tax
@@ -555,6 +558,7 @@ Unknown=Óþekkt
 General=General
 Size=Stærð
 OriginalSize=Original size
+RotateImage=Rotate 90°
 Received=Móttekin
 Paid=Greiddur
 Topic=Subject
@@ -1229,4 +1233,9 @@ PublicVirtualCard=Virtual business card
 TreeView=Tree view
 DropFileToAddItToObject=Drop a file to add it to this object
 UploadFileDragDropSuccess=The file(s) have been uploaded successfully
-SearchSyntaxTooltipForStringOrNum=For searching inside text fields, you can use the characters ^ or $ to make a 'start or end with' search or use the ! to make a 'does not contain' test. You can use the | between two strings instead of a space for a 'OR' condition instead of 'AND'. For numeric values, you can use the operator <, >, <= or >= before the value to filter using a mathematical comparison
+SearchSyntaxTooltipForStringOrNum=For searching inside text fields, you can use the characters ^ or $ to make a 'start or end with' search or use the ! to make a 'does not contain' test. You can use the | between two strings instead of a space for a 'OR' condition instead of 'AND'. For numeric values, you can use the operator <, >, <=, >= or != before the value, to filter using a mathematical comparison
+InProgress=In progress
+DateOfPrinting=Date of printing
+ClickFullScreenEscapeToLeave=Click here to switch in Full screen mode. Press ESCAPE to leave Full screen mode.
+UserNotYetValid=Not yet valid
+UserExpired=Útrunnið
diff --git a/htdocs/langs/it_IT/accountancy.lang b/htdocs/langs/it_IT/accountancy.lang
index d3a43138dc8..e313ca6075d 100644
--- a/htdocs/langs/it_IT/accountancy.lang
+++ b/htdocs/langs/it_IT/accountancy.lang
@@ -57,11 +57,14 @@ WarningDataDisappearsWhenDataIsExported=Warning, this list contains only the acc
 VueByAccountAccounting=Elenco movimenti per conto contabile
 VueBySubAccountAccounting=Visualizza per conto secondario contabile
 
-MainAccountForCustomersNotDefined=Account principale di contabilità per i clienti non definito nel setup
-MainAccountForSuppliersNotDefined=Account principale di contabilità per fornitori non definito nel setup
-MainAccountForUsersNotDefined=Account principale di contabilità per gli utenti non definito nel setup
-MainAccountForVatPaymentNotDefined=Account principale di contabilità per il pagamento dell'IVA non definito nel setup
-MainAccountForSubscriptionPaymentNotDefined=Account principale di contabilità per il pagamento degli abbonamenti non definito nel setup
+MainAccountForCustomersNotDefined=Main account (from the Chart of Account) for customers not defined in setup
+MainAccountForSuppliersNotDefined=Main account (from the Chart of Account) for vendors not defined in setup
+MainAccountForUsersNotDefined=Main account (from the Chart of Account) for users not defined in setup
+MainAccountForRevenueStampSaleNotDefined=Account (from the Chart of Account) for the revenue stamp (sales) not defined in setup
+MainAccountForRevenueStampPurchaseNotDefined=Account (from the Chart of Account) for the revenue stamp (purchases) not defined in setup
+MainAccountForVatPaymentNotDefined=Account (from the Chart of Account) for VAT payment not defined in setup
+MainAccountForSubscriptionPaymentNotDefined=Account (from the Chart of Account) for membership payment not defined in setup
+MainAccountForRetainedWarrantyNotDefined=Account (from the Chart of Account) for the retained warranty not defined in setup
 UserAccountNotDefined=Conto Contabile per l'utente non definito nella configurazione
 
 AccountancyArea=Area di contabilità
diff --git a/htdocs/langs/it_IT/admin.lang b/htdocs/langs/it_IT/admin.lang
index cab92e8f08a..9c5edfba050 100644
--- a/htdocs/langs/it_IT/admin.lang
+++ b/htdocs/langs/it_IT/admin.lang
@@ -1509,7 +1509,8 @@ WatermarkOnDraftContractCards=Bozze dei contratti filigranate (nessuna filigrana
 MembersSetup=Impostazioni modulo membri
 MemberMainOptions=Opzioni principali
 MemberCodeChecker=Opzioni per la generazione automatica dei codici membro
-AdherentLoginRequired= Gestire un account di accesso per ogni membro
+AdherentLoginRequired=Manage a login/password for each member
+AdherentLoginRequiredDesc=Add a value for a login and a password on the member file. If the member is linked to a user, updating the member login and password will also update the user login and password.
 AdherentMailRequired=Email required to create a new member
 MemberSendInformationByMailByDefault=Checkbox per inviare una mail di conferma per i membri (è attiva per impostazione predefinita)
 MemberCreateAnExternalUserForSubscriptionValidated=Crea un login utente esterno per ogni nuovo abbonamento membro convalidato
@@ -2076,6 +2077,10 @@ MAIN_DOCUMENTS_LOGO_HEIGHT=Altezza per logo in PDF
 DOC_SHOW_FIRST_SALES_REP=Visualizza prima il referente commerciale
 MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Aggiungi una colonna per l'immagine sulle righe della proposta
 MAIN_DOCUMENTS_WITH_PICTURE_WIDTH=Larghezza della colonna se viene aggiunta un'immagine su righe
+MAIN_GENERATE_DOCUMENTS_SUPPLIER_PROPOSAL_WITHOUT_UNIT_PRICE=Hide the unit price column on quotation requests
+MAIN_GENERATE_DOCUMENTS_SUPPLIER_PROPOSAL_WITHOUT_TOTAL_COLUMN=Hide the total price column on quotation requests
+MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_UNIT_PRICE=Hide the unit price column on purchase orders
+MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_TOTAL_COLUMN=Hide the total price column on puchase orders
 MAIN_PDF_NO_SENDER_FRAME=Nascondi i bordi sulla cornice dell'indirizzo del mittente
 MAIN_PDF_NO_RECIPENT_FRAME=Nascondi i bordi sulla cornice dell'indirizzo del ricevente
 MAIN_PDF_HIDE_CUSTOMER_CODE=Nascondi codice cliente
@@ -2400,4 +2405,4 @@ OptionXShouldBeEnabledInModuleY=L'opzione " <b> %s </b> " dovrebbe essere abilit
 OptionXIsCorrectlyEnabledInModuleY=L'opzione " <b> %s </b> " è abilitata nel modulo <b> %s </b>
 AtBottomOfPage=At bottom of page
 FailedAuth=failed authentications
-MaxNumberOfFailedAuth=Max number of failed authentication in 24h to disable login.
+MaxNumberOfFailedAuth=Max number of failed authentication in 24h to deny login.
diff --git a/htdocs/langs/it_IT/main.lang b/htdocs/langs/it_IT/main.lang
index 686e815b36d..de9235dfe01 100644
--- a/htdocs/langs/it_IT/main.lang
+++ b/htdocs/langs/it_IT/main.lang
@@ -1237,3 +1237,5 @@ SearchSyntaxTooltipForStringOrNum=For searching inside text fields, you can use
 InProgress=Avviato
 DateOfPrinting=Date of printing
 ClickFullScreenEscapeToLeave=Click here to switch in Full screen mode. Press ESCAPE to leave Full screen mode.
+UserNotYetValid=Not yet valid
+UserExpired=Expired
diff --git a/htdocs/langs/it_IT/supplier_proposal.lang b/htdocs/langs/it_IT/supplier_proposal.lang
index 8e14295043f..9a0a9055b7f 100644
--- a/htdocs/langs/it_IT/supplier_proposal.lang
+++ b/htdocs/langs/it_IT/supplier_proposal.lang
@@ -42,7 +42,8 @@ SendAskRef=Invia la richiesta di quotazione %s
 SupplierProposalCard=Scheda quotazione
 ConfirmDeleteAsk=Vuoi davvero eliminare la richiesta di quotazione <b>%s</b>?
 ActionsOnSupplierProposal=Eventi richiesta quotazione
-DocModelAuroreDescription=Un modello completo per le richieste di quotazione (logo, ecc...)
+DocModelAuroreDescription=A complete template for a vendor quotation request template (old implementation of Sponge template)
+DocModelZenithDescription=A complete template for a vendor quotation request template
 CommercialAsk=Richiesta quotazione
 DefaultModelSupplierProposalCreate=Creazione del modello predefinito
 DefaultModelSupplierProposalToBill=Template predefinito quando si chiude una richiesta di quotazione (accettata)
diff --git a/htdocs/langs/ja_JP/accountancy.lang b/htdocs/langs/ja_JP/accountancy.lang
index ed78eefc497..d8fc23a7fd0 100644
--- a/htdocs/langs/ja_JP/accountancy.lang
+++ b/htdocs/langs/ja_JP/accountancy.lang
@@ -57,11 +57,14 @@ WarningDataDisappearsWhenDataIsExported=警告、このリストにはまだエ
 VueByAccountAccounting=勘定科目順に表示
 VueBySubAccountAccounting=会計補助勘定科目で表示
 
-MainAccountForCustomersNotDefined=設定で定義されていない顧客のメイン勘定科目
-MainAccountForSuppliersNotDefined=設定で定義されていないベンダーのメイン勘定科目
-MainAccountForUsersNotDefined=設定で定義されていないユーザのメイン勘定科目
-MainAccountForVatPaymentNotDefined=設定で定義されていないVAT支払のメイン勘定科目
-MainAccountForSubscriptionPaymentNotDefined=設定で定義されていないサブスクリプション支払のメイン勘定科目
+MainAccountForCustomersNotDefined=設定で定義されていない顧客の主口座 (勘定科目表から)
+MainAccountForSuppliersNotDefined=設定で定義されていない仕入先の主勘定 (勘定科目表から)
+MainAccountForUsersNotDefined=セットアップで定義されていないユーザーの主勘定 (勘定科目表から)
+MainAccountForRevenueStampSaleNotDefined=設定で定義されていない収入印紙 (売上) の勘定科目 (勘定科目表から)
+MainAccountForRevenueStampPurchaseNotDefined=セットアップで定義されていない収入印紙 (購入) の勘定科目 (勘定科目表から)
+MainAccountForVatPaymentNotDefined=VAT 支払い用の勘定 (勘定科目表から) が設定で定義されていない
+MainAccountForSubscriptionPaymentNotDefined=メンバーシップ支払い用の勘定 (勘定科目表から) が設定で定義されていない
+MainAccountForRetainedWarrantyNotDefined=設定で定義されていない保持保証の勘定科目 (勘定科目表から)
 UserAccountNotDefined=設定で定義されていないユーザの会計勘定科目
 
 AccountancyArea=経理エリア
diff --git a/htdocs/langs/ja_JP/admin.lang b/htdocs/langs/ja_JP/admin.lang
index 99bb8c0b44d..d7a69dd0b3b 100644
--- a/htdocs/langs/ja_JP/admin.lang
+++ b/htdocs/langs/ja_JP/admin.lang
@@ -1509,7 +1509,8 @@ WatermarkOnDraftContractCards=下書き契約の透かし ( 空ならなし )
 MembersSetup=構成員モジュールの設定
 MemberMainOptions=主なオプション
 MemberCodeChecker=会員コード自動生成オプション
-AdherentLoginRequired= 各構成員のログインを管理する
+AdherentLoginRequired=各メンバーのログイン/パスワードを管理する
+AdherentLoginRequiredDesc=メンバー ファイルにログインとパスワードの値を追加する。メンバーがユーザーにリンクされている場合、メンバーのログイン名とパスワードを更新すると、ユーザーのログイン名とパスワードも更新される。
 AdherentMailRequired=新規構成員を作成するにはメールが必要 
 MemberSendInformationByMailByDefault=構成員 ( 検証や新規サブスクリプション ) にメールの確定を送信するチェックボックスはデフォルトでオンになっている
 MemberCreateAnExternalUserForSubscriptionValidated=検証済新規構成員サブスクリプションごとに外部ユーザログインを作成する
@@ -2076,6 +2077,10 @@ MAIN_DOCUMENTS_LOGO_HEIGHT=PDFのロゴの高さ
 DOC_SHOW_FIRST_SALES_REP=最初の営業担当者を表示
 MAIN_GENERATE_PROPOSALS_WITH_PICTURE=提案行に画像の列を追加
 MAIN_DOCUMENTS_WITH_PICTURE_WIDTH=画像が行に追加された場合の列の幅
+MAIN_GENERATE_DOCUMENTS_SUPPLIER_PROPOSAL_WITHOUT_UNIT_PRICE=見積依頼時の単価欄を非表示にする
+MAIN_GENERATE_DOCUMENTS_SUPPLIER_PROPOSAL_WITHOUT_TOTAL_COLUMN=見積依頼の合計価格列を非表示にする
+MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_UNIT_PRICE=発注書の単価列を非表示にする
+MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_TOTAL_COLUMN=購入注文の合計価格列を非表示にする
 MAIN_PDF_NO_SENDER_FRAME=送信者アドレスフレームの境界線を非表示にする
 MAIN_PDF_NO_RECIPENT_FRAME=レシピエントアドレスフレームの境界線を非表示にする
 MAIN_PDF_HIDE_CUSTOMER_CODE=顧客コードを非表示にする
@@ -2400,4 +2405,4 @@ OptionXShouldBeEnabledInModuleY=オプション「 <b> %s </b> 」をモジュ
 OptionXIsCorrectlyEnabledInModuleY=オプション「 <b> %s </b> 」がモジュール <b> %s </b> で有効になっている
 AtBottomOfPage=ページの下部にある
 FailedAuth=失敗した認証
-MaxNumberOfFailedAuth=ログインを無効にするために 24 時間以内に失敗した認証の最大数。
+MaxNumberOfFailedAuth=ログイン拒否で 24 時間以内に失敗した認証の最大数。
diff --git a/htdocs/langs/ja_JP/banks.lang b/htdocs/langs/ja_JP/banks.lang
index ec199351aa2..c2b6b7563cd 100644
--- a/htdocs/langs/ja_JP/banks.lang
+++ b/htdocs/langs/ja_JP/banks.lang
@@ -106,8 +106,8 @@ BankLineNotReconciled=照合されていない
 CustomerInvoicePayment=顧客の支払
 SupplierInvoicePayment=仕入先の支払
 SubscriptionPayment=サブスクリプション費用の支払
-WithdrawalPayment=Direct Debit payment
-BankTransferPayment=Credit Transfer payment
+WithdrawalPayment=口座振替による支払い
+BankTransferPayment=クレジット振込によるお支払い
 SocialContributionPayment=社会/財政税の支払
 BankTransfer=債権譲渡
 BankTransfers=債権譲渡s
diff --git a/htdocs/langs/ja_JP/compta.lang b/htdocs/langs/ja_JP/compta.lang
index 7b2ec3e3b55..98faa575120 100644
--- a/htdocs/langs/ja_JP/compta.lang
+++ b/htdocs/langs/ja_JP/compta.lang
@@ -253,6 +253,8 @@ CalculationMode=計算モード
 AccountancyJournal=会計コードジャーナル
 ACCOUNTING_VAT_SOLD_ACCOUNT=売上に対する VAT の既定の勘定として使用される勘定 (勘定科目表から) (VAT ディクショナリ設定で定義されていない場合に使用)
 ACCOUNTING_VAT_BUY_ACCOUNT=購入時の VAT のデフォルト アカウントとして使用されるアカウント (アカウント チャートから) (VAT ディクショナリ設定で定義されていない場合に使用)
+ACCOUNTING_REVENUESTAMP_SOLD_ACCOUNT=売上の収入印紙に使用される勘定科目 (勘定科目表から)
+ACCOUNTING_REVENUESTAMP_BUY_ACCOUNT=購入時の収入印紙に使用される勘定科目 (勘定科目表から)
 ACCOUNTING_VAT_PAY_ACCOUNT=VAT を支払うための既定のアカウントとして使用されるアカウント (アカウント チャートから)
 ACCOUNTING_VAT_BUY_REVERSE_CHARGES_CREDIT=リバースチャージ（クレジット）の購入時の VAT のデフォルトアカウントとして使用されるアカウント（勘定科目表から）
 ACCOUNTING_VAT_BUY_REVERSE_CHARGES_DEBIT=リバースチャージ（デビット）の購入時の VAT のデフォルトアカウントとして使用されるアカウント（勘定科目表から）
diff --git a/htdocs/langs/ja_JP/ecm.lang b/htdocs/langs/ja_JP/ecm.lang
index ed01de75615..723e12f8200 100644
--- a/htdocs/langs/ja_JP/ecm.lang
+++ b/htdocs/langs/ja_JP/ecm.lang
@@ -48,7 +48,7 @@ GenerateImgWebp=全画像を.webp形式の別のバージョンで複製する
 ConfirmGenerateImgWebp=確定すると、現在このフォルダーにある全画像に対して.webp形式の画像が生成される（サブフォルダーは含まれない）...
 ConfirmImgWebpCreation=全画像の重複を確定する
 GenerateChosenImgWebp=選択したイメージを .webp 形式の別のバージョンで複製する
-ConfirmGenerateChosenImgWebp=If you confirm, you will generate an image in .webp format for the image %s
+ConfirmGenerateChosenImgWebp=確定すると、画像 %s の .webp 形式の画像が生成される。
 ConfirmChosenImgWebpCreation=選択した画像の重複を確定する
 SucessConvertImgWebp=画像が正常に複製された
 SucessConvertChosenImgWebp=選択した画像が正常に複製された
diff --git a/htdocs/langs/ja_JP/errors.lang b/htdocs/langs/ja_JP/errors.lang
index ad67a1e4000..3420e1fa1e8 100644
--- a/htdocs/langs/ja_JP/errors.lang
+++ b/htdocs/langs/ja_JP/errors.lang
@@ -318,8 +318,10 @@ ErrorTheUrlOfYourDolInstanceDoesNotMatchURLIntoOAuthSetup=エラー: 現在の
 ErrorMenuExistValue=このタイトルまたは URL のメニューはすでに存在する
 ErrorSVGFilesNotAllowedAsLinksWithout=SVG ファイルは、オプション %s を指定しないと外部リンクとして許可されない。
 ErrorTypeMenu=ナビゲーションバーに同じモジュールの別のメニューを追加することはできない。まだハンドルされていない
-ErrorTableExist=Table <b>%s</b> already exist
-ErrorDictionaryNotFound=Dictionary <b>%s</b> not found
+ErrorTableExist=テーブル <b> %s </b> はすでに存在する
+ErrorDictionaryNotFound=辞書 <b> %s </b> が見つからない
+ErrorFailedToCreateSymLinkToMedias= シンボリックリンク  %s その指定先は %s を作成できず
+
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=PHPパラメータ upload_max_filesize(%s)は、PHPパラメータ post_max_size(%s)よりも大きくなっている。これは一貫した設定ではない。
 WarningPasswordSetWithNoAccount=この構成員にパスワードが設定された。ただし、ユーザアカウントは作成されなかった。したがって、このパスワードは保存されるが、Dolibarrへのログインには使用できない。外部モジュール/インターフェースで使用できるが、構成員のログインやパスワードを定義する必要がない場合は、構成員モジュールの設定から "各構成員のログインを管理する" オプションを無効にすることができる。ログインを管理する必要があるがパスワードは必要ない場合は、このフィールドを空のままにして、この警告を回避できる。注：構成員がユーザにリンクされている場合は、電子メールをログインとして使用することもできる。
@@ -360,7 +362,7 @@ WarningAutoValNotPossibleWhenStockIsDecreasedOnInvoiceVal=「請求書の検証
 WarningModuleNeedRefrech = モジュール <b> %s </b> が無効になった。有効にすることを忘れないこと
 WarningPermissionAlreadyExist=このオブジェクトの既存の権限
 WarningGoOnAccountancySetupToAddAccounts=このリストが空の場合、メニュー %s - %s - %s に移動し、勘定科目表の科目をロードまたは作成する。
-WarningCorrectedInvoiceNotFound=Corrected invoice not found
+WarningCorrectedInvoiceNotFound=修正された請求書が見つからない
 
 SwissQrOnlyVIR = SwissQR 請求書は、クレジット振替で支払うように設定された請求書にのみ追加できる。
 SwissQrCreditorAddressInvalid = 債権者の住所が無効  (郵便番号と都市は設定されているか? (%s)
diff --git a/htdocs/langs/ja_JP/main.lang b/htdocs/langs/ja_JP/main.lang
index 13e3938bdf9..12406a76760 100644
--- a/htdocs/langs/ja_JP/main.lang
+++ b/htdocs/langs/ja_JP/main.lang
@@ -235,8 +235,8 @@ PersonalValue=個人的価値
 NewObject=新規%s
 NewValue=新規値
 OldValue=古い値%s
-FieldXModified=Field %s modified
-FieldXModifiedFromYToZ=Field %s modified from %s to %s
+FieldXModified=フィールド %s が変更された
+FieldXModifiedFromYToZ=フィールド %s が %s から %s に変更された
 CurrentValue=電流値
 Code=コー​​ド
 Type=タイプ
@@ -348,7 +348,7 @@ MonthOfDay=その日の月
 DaysOfWeek=曜日
 HourShort=H
 MinuteShort=mn
-SecondShort=sec
+SecondShort=秒
 Rate=率
 CurrencyRate=為替レート
 UseLocalTax=税込み
@@ -558,7 +558,7 @@ Unknown=未知
 General=一般的
 Size=サイズ
 OriginalSize=当初のサイズ
-RotateImage=Rotate 90°
+RotateImage=90°回転
 Received=受信済
 Paid=有料
 Topic=科目
@@ -1237,3 +1237,5 @@ SearchSyntaxTooltipForStringOrNum=テキスト フィールド内を検索する
 InProgress=進行中
 DateOfPrinting=印刷日
 ClickFullScreenEscapeToLeave=ここをクリックして全画面モードに切り替える。 ESCAPE を押して全画面モードを終了する。
+UserNotYetValid=まだ有効でない
+UserExpired=期限切れ
diff --git a/htdocs/langs/ja_JP/modulebuilder.lang b/htdocs/langs/ja_JP/modulebuilder.lang
index 37bdb6e0aa9..e4aaa6c4382 100644
--- a/htdocs/langs/ja_JP/modulebuilder.lang
+++ b/htdocs/langs/ja_JP/modulebuilder.lang
@@ -28,6 +28,7 @@ ModuleBuilderDescwidgets=このタブは、ウィジェットの管理/構築専
 ModuleBuilderDescbuildpackage=ここで、モジュールの「配布準備完了」パッケージファイル(正規化された.zipファイル)と「配布準備完了」ドキュメントファイルを生成できる。ボタンをクリックするだけで、パッケージまたはドキュメントファイルを作成できる。
 EnterNameOfModuleToDeleteDesc=モジュールを削除できる。警告：モジュールの全コーディングファイル(手動で生成または作成されたもの)および構造化されたデータとドキュメントは削除される！
 EnterNameOfObjectToDeleteDesc=オブジェクトを削除できる。警告：オブジェクトに関連する全コーディングファイル(手動で生成または作成されたもの)は削除される！
+EnterNameOfObjectToDeleteDesc=オブジェクトを削除できる。警告：オブジェクトに関連する全コーディングファイル(手動で生成または作成されたもの)は削除される！
 DangerZone=危険区域
 BuildPackage=パッケージをビルドする
 BuildPackageDesc=アプリケーションのzipパッケージを生成して、Dolibarrで配布する準備を整えることができる。また、<a href="https://www.dolistore.com"> DoliStore.com</a>のようなマーケットプレイスで配布または販売することもできる。
@@ -162,11 +163,11 @@ ListOfTabsEntries=タブエントリのリスト
 TabsDefDesc=モジュールによって提供されるタブをここで定義する
 TabsDefDescTooltip=モジュール/アプリケーションによって提供されるタブは、配列<strong> $this->tabs</strong>においてモジュール記述子ファイルに定義される。このファイルを手動で編集できるし、埋め込みエディターの使用もできる。
 BadValueForType=タイプ%sの値が正しくない
-DefinePropertiesFromExistingTable=既存のテーブルからプロパティを定義する
+DefinePropertiesFromExistingTable=既存のテーブルからフィールド/プロパティを定義する
 DefinePropertiesFromExistingTableDesc=データベース内に (オブジェクトを作成するための) テーブルが既に存在する場合は、それを使用してオブジェクトのプロパティを定義できる。
 DefinePropertiesFromExistingTableDesc2=テーブルがまだ存在しない場合は、空のままにすること。コード ジェネレーターはさまざまな種類のフィールドを使用して、後で編集できるテーブルの例を作成する。
-GeneratePermissions=このオブジェクトに権限を追加したい
-GeneratePermissionsHelp=このオブジェクトのデフォルトの権利を生成する
+GeneratePermissions=このオブジェクトの権限を管理したい
+GeneratePermissionsHelp=これをチェックすると、オブジェクトのレコードの読み取り、書き込み、削除の権限を管理するためのコードが追加される。
 PermissionDeletedSuccesfuly=権限が正常に削除された
 PermissionUpdatedSuccesfuly=権限が正常に更新された
 PermissionAddedSuccesfuly=権限が正常に追加された
@@ -177,3 +178,6 @@ ApiObjectDeleted=オブジェクト %s の API が正常に削除された
 CRUDRead=読む
 CRUDCreateWrite=作成または更新
 FailedToAddCodeIntoDescriptor=記述子にコードを追加できないでした。文字列コメント「%s」がファイル内にまだ存在していることを確認すること。
+DictionariesCreated=辞書 <b> %s </b> が正常に作成された
+DictionaryDeleted=辞書 <b> %s </b> が正常に削除された
+PropertyModuleUpdated=プロパティ <b> %s </b> は正常に更新された
diff --git a/htdocs/langs/ja_JP/stripe.lang b/htdocs/langs/ja_JP/stripe.lang
index 2c1e76322b8..b59ac82e1ee 100644
--- a/htdocs/langs/ja_JP/stripe.lang
+++ b/htdocs/langs/ja_JP/stripe.lang
@@ -51,6 +51,7 @@ StripeAccount=Stripe アカウント
 StripeChargeList=Stripe 料金のリスト
 StripeTransactionList=Stripeトランザクションのリスト
 StripeCustomerId=Stripe の顧客ID
+StripePaymentId=Stripe 支払い ID
 StripePaymentModes=Stripe 支払モード
 LocalID=ローカルID
 StripeID=Stripe ID
diff --git a/htdocs/langs/ja_JP/supplier_proposal.lang b/htdocs/langs/ja_JP/supplier_proposal.lang
index 80042787301..5b3e66bced3 100644
--- a/htdocs/langs/ja_JP/supplier_proposal.lang
+++ b/htdocs/langs/ja_JP/supplier_proposal.lang
@@ -42,7 +42,8 @@ SendAskRef=価格要求の送信%s
 SupplierProposalCard=カードを要求する
 ConfirmDeleteAsk=この価格要求を削除してもよいか<b>%s </b>？
 ActionsOnSupplierProposal=価格要求のイベント
-DocModelAuroreDescription=完全な要求モデル(ロゴ...)
+DocModelAuroreDescription=仕入先見積依頼テンプレートの完全テンプレート (Sponge テンプレートの古い実装)
+DocModelZenithDescription=仕入先見積依頼テンプレートの完全テンプレート
 CommercialAsk=価格要求
 DefaultModelSupplierProposalCreate=デフォルトのモデル作成
 DefaultModelSupplierProposalToBill=価格要求を閉じるときのデフォルトテンプレート(承認済)
diff --git a/htdocs/langs/ja_JP/ticket.lang b/htdocs/langs/ja_JP/ticket.lang
index 81e5a30e253..f64bfb3efcd 100644
--- a/htdocs/langs/ja_JP/ticket.lang
+++ b/htdocs/langs/ja_JP/ticket.lang
@@ -329,8 +329,8 @@ OldUser=古いユーザ
 NewUser=新規ユーザ
 NumberOfTicketsByMonth=1か月あたりのチケット数
 NbOfTickets=チケット数
-ExternalContributors=External contributors
-AddContributor=Add external contributor
+ExternalContributors=外部寄稿者
+AddContributor=外部貢献者の追加
 
 # notifications
 TicketCloseEmailSubjectCustomer=チケットは締め切られた
diff --git a/htdocs/langs/ja_JP/website.lang b/htdocs/langs/ja_JP/website.lang
index 07d435a132b..d7ef1741095 100644
--- a/htdocs/langs/ja_JP/website.lang
+++ b/htdocs/langs/ja_JP/website.lang
@@ -158,5 +158,5 @@ Reservation=予約
 PagesViewedPreviousMonth=閲覧ページ数（先月）
 PagesViewedTotal=閲覧したページ (合計)
 Visibility=可視性
-Everyone=Everyone
+Everyone=みんな
 AssignedContacts=割当済連絡先
diff --git a/htdocs/langs/kk_KZ/accountancy.lang b/htdocs/langs/kk_KZ/accountancy.lang
index ccd154b586b..a1ee408cd7f 100644
--- a/htdocs/langs/kk_KZ/accountancy.lang
+++ b/htdocs/langs/kk_KZ/accountancy.lang
@@ -57,11 +57,14 @@ WarningDataDisappearsWhenDataIsExported=Warning, this list contains only the acc
 VueByAccountAccounting=Бухгалтерлік шот бойынша қарау
 VueBySubAccountAccounting=Бухгалтерлік қосалқы шот бойынша қарау
 
-MainAccountForCustomersNotDefined=Орнатуда анықталмаған клиенттердің негізгі бухгалтерлік шоты
-MainAccountForSuppliersNotDefined=Орнатуда анықталмаған жеткізушілердің негізгі бухгалтерлік шоты
-MainAccountForUsersNotDefined=Орнатуда анықталмаған пайдаланушылардың негізгі бухгалтерлік шоты
-MainAccountForVatPaymentNotDefined=ҚҚС төлеудің негізгі бухгалтерлік шоты баптауда анықталмаған
-MainAccountForSubscriptionPaymentNotDefined=Орнатуда анықталмаған абоненттік төлемнің негізгі бухгалтерлік шоты
+MainAccountForCustomersNotDefined=Main account (from the Chart of Account) for customers not defined in setup
+MainAccountForSuppliersNotDefined=Main account (from the Chart of Account) for vendors not defined in setup
+MainAccountForUsersNotDefined=Main account (from the Chart of Account) for users not defined in setup
+MainAccountForRevenueStampSaleNotDefined=Account (from the Chart of Account) for the revenue stamp (sales) not defined in setup
+MainAccountForRevenueStampPurchaseNotDefined=Account (from the Chart of Account) for the revenue stamp (purchases) not defined in setup
+MainAccountForVatPaymentNotDefined=Account (from the Chart of Account) for VAT payment not defined in setup
+MainAccountForSubscriptionPaymentNotDefined=Account (from the Chart of Account) for membership payment not defined in setup
+MainAccountForRetainedWarrantyNotDefined=Account (from the Chart of Account) for the retained warranty not defined in setup
 UserAccountNotDefined=Accounting account for user not defined in setup
 
 AccountancyArea=Бухгалтерлік есеп аймағы
diff --git a/htdocs/langs/kk_KZ/admin.lang b/htdocs/langs/kk_KZ/admin.lang
index eb131eb01aa..69fd25f8f8e 100644
--- a/htdocs/langs/kk_KZ/admin.lang
+++ b/htdocs/langs/kk_KZ/admin.lang
@@ -1509,7 +1509,8 @@ WatermarkOnDraftContractCards=Шарт жобаларында су белгіс
 MembersSetup=Мүшелер модулін баптау
 MemberMainOptions=Негізгі опциялар
 MemberCodeChecker=Options for automatic generation of member codes
-AdherentLoginRequired= Әр мүшеге кіруді басқарыңыз
+AdherentLoginRequired=Manage a login/password for each member
+AdherentLoginRequiredDesc=Add a value for a login and a password on the member file. If the member is linked to a user, updating the member login and password will also update the user login and password.
 AdherentMailRequired=Жаңа мүше құру үшін электрондық пошта қажет
 MemberSendInformationByMailByDefault=Мүшелерге пошталық растауды жіберу құсбелгісі (тексеру немесе жаңа жазылым) әдепкі бойынша қосулы
 MemberCreateAnExternalUserForSubscriptionValidated=Тексерілген әрбір жаңа мүше жазылымы үшін сыртқы пайдаланушы логинін жасаңыз
@@ -2076,6 +2077,10 @@ MAIN_DOCUMENTS_LOGO_HEIGHT=PDF логотипінің биіктігі
 DOC_SHOW_FIRST_SALES_REP=Show first sales representative
 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_GENERATE_DOCUMENTS_SUPPLIER_PROPOSAL_WITHOUT_UNIT_PRICE=Hide the unit price column on quotation requests
+MAIN_GENERATE_DOCUMENTS_SUPPLIER_PROPOSAL_WITHOUT_TOTAL_COLUMN=Hide the total price column on quotation requests
+MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_UNIT_PRICE=Hide the unit price column on purchase orders
+MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_TOTAL_COLUMN=Hide the total price column on puchase orders
 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
@@ -2400,4 +2405,4 @@ OptionXShouldBeEnabledInModuleY=Option "<b>%s</b>" should be enabled into module
 OptionXIsCorrectlyEnabledInModuleY=Option "<b>%s</b>" is enabled into module <b>%s</b>
 AtBottomOfPage=At bottom of page
 FailedAuth=failed authentications
-MaxNumberOfFailedAuth=Max number of failed authentication in 24h to disable login.
+MaxNumberOfFailedAuth=Max number of failed authentication in 24h to deny login.
diff --git a/htdocs/langs/kk_KZ/supplier_proposal.lang b/htdocs/langs/kk_KZ/supplier_proposal.lang
index 62a78bc41d4..f0192ad41ba 100644
--- a/htdocs/langs/kk_KZ/supplier_proposal.lang
+++ b/htdocs/langs/kk_KZ/supplier_proposal.lang
@@ -42,7 +42,8 @@ SendAskRef=%s баға сұранысын жіберу
 SupplierProposalCard=Өтініш картасы
 ConfirmDeleteAsk=<b> %s </b> баға сұрауын шынымен жойғыңыз келе ме?
 ActionsOnSupplierProposal=Баға сұранысы бойынша оқиғалар
-DocModelAuroreDescription=Толық сұраныс моделі (логотип ...)
+DocModelAuroreDescription=A complete template for a vendor quotation request template (old implementation of Sponge template)
+DocModelZenithDescription=A complete template for a vendor quotation request template
 CommercialAsk=Баға сұранысы
 DefaultModelSupplierProposalCreate=Әдепкі үлгі жасау
 DefaultModelSupplierProposalToBill=Баға сұранысын жабу кезінде әдепкі үлгі (қабылданды)
diff --git a/htdocs/langs/lo_LA/accountancy.lang b/htdocs/langs/lo_LA/accountancy.lang
index e7cbccebfcb..45207bf7389 100644
--- a/htdocs/langs/lo_LA/accountancy.lang
+++ b/htdocs/langs/lo_LA/accountancy.lang
@@ -57,11 +57,14 @@ WarningDataDisappearsWhenDataIsExported=Warning, this list contains only the acc
 VueByAccountAccounting=ເບິ່ງຕາມບັນຊີບັນຊີ
 VueBySubAccountAccounting=ເບິ່ງຕາມບັນຊີຍ່ອຍບັນຊີ
 
-MainAccountForCustomersNotDefined=ບັນຊີບັນຊີຫຼັກສໍາລັບລູກຄ້າບໍ່ໄດ້ກໍານົດໄວ້ໃນການຕັ້ງ
-MainAccountForSuppliersNotDefined=ບັນຊີບັນຊີຫຼັກສໍາລັບຜູ້ຂາຍບໍ່ໄດ້ກໍານົດໄວ້ໃນການຕັ້ງ
-MainAccountForUsersNotDefined=ບັນຊີບັນຊີຫຼັກສໍາລັບຜູ້ໃຊ້ບໍ່ໄດ້ກໍານົດໄວ້ໃນການຕັ້ງ
-MainAccountForVatPaymentNotDefined=ບັນຊີບັນຊີຫຼັກສໍາລັບການຊໍາລະອາກອນມູນຄ່າເພີ່ມທີ່ບໍ່ໄດ້ກໍານົດໄວ້ໃນການຕັ້ງ
-MainAccountForSubscriptionPaymentNotDefined=ບັນຊີບັນຊີຫຼັກສໍາລັບການຊໍາລະການສະnotັກໃຊ້ບໍ່ໄດ້ກໍານົດໄວ້ໃນການຕັ້ງ
+MainAccountForCustomersNotDefined=Main account (from the Chart of Account) for customers not defined in setup
+MainAccountForSuppliersNotDefined=Main account (from the Chart of Account) for vendors not defined in setup
+MainAccountForUsersNotDefined=Main account (from the Chart of Account) for users not defined in setup
+MainAccountForRevenueStampSaleNotDefined=Account (from the Chart of Account) for the revenue stamp (sales) not defined in setup
+MainAccountForRevenueStampPurchaseNotDefined=Account (from the Chart of Account) for the revenue stamp (purchases) not defined in setup
+MainAccountForVatPaymentNotDefined=Account (from the Chart of Account) for VAT payment not defined in setup
+MainAccountForSubscriptionPaymentNotDefined=Account (from the Chart of Account) for membership payment not defined in setup
+MainAccountForRetainedWarrantyNotDefined=Account (from the Chart of Account) for the retained warranty not defined in setup
 UserAccountNotDefined=Accounting account for user not defined in setup
 
 AccountancyArea=ພື້ນທີ່ການບັນຊີ
diff --git a/htdocs/langs/lo_LA/admin.lang b/htdocs/langs/lo_LA/admin.lang
index 20f8a9fd1c9..33ec858329b 100644
--- a/htdocs/langs/lo_LA/admin.lang
+++ b/htdocs/langs/lo_LA/admin.lang
@@ -1509,7 +1509,8 @@ WatermarkOnDraftContractCards=ລາຍນ້ ຳ ຢູ່ໃນສັນຍາ
 MembersSetup=ການຕັ້ງຄ່າໂມດູນສະມາຊິກ
 MemberMainOptions=ຕົວເລືອກຫຼັກ
 MemberCodeChecker=Options for automatic generation of member codes
-AdherentLoginRequired= ຈັດການເຂົ້າສູ່ລະບົບ ສຳ ລັບສະມາຊິກແຕ່ລະຄົນ
+AdherentLoginRequired=Manage a login/password for each member
+AdherentLoginRequiredDesc=Add a value for a login and a password on the member file. If the member is linked to a user, updating the member login and password will also update the user login and password.
 AdherentMailRequired=ຕ້ອງການອີເມວເພື່ອສ້າງສະມາຊິກໃ່
 MemberSendInformationByMailByDefault=ກ່ອງCheckາຍເພື່ອສົ່ງການຢືນຢັນທາງໄປສະນີຫາສະມາຊິກ (ການກວດສອບຫຼືການສະnewັກສະມາຊິກໃ)່) ແມ່ນເປີດຢູ່ໃນຕອນຕົ້ນ
 MemberCreateAnExternalUserForSubscriptionValidated=ສ້າງການເຂົ້າສູ່ລະບົບຂອງຜູ້ໃຊ້ພາຍນອກ ສຳ ລັບການສະmemberັກໃຊ້ສະມາຊິກໃeach່ແຕ່ລະຄົນຖືກກວດສອບ
@@ -2076,6 +2077,10 @@ MAIN_DOCUMENTS_LOGO_HEIGHT=ຄວາມສູງ ສຳ ລັບໂລໂກ້
 DOC_SHOW_FIRST_SALES_REP=Show first sales representative
 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_GENERATE_DOCUMENTS_SUPPLIER_PROPOSAL_WITHOUT_UNIT_PRICE=Hide the unit price column on quotation requests
+MAIN_GENERATE_DOCUMENTS_SUPPLIER_PROPOSAL_WITHOUT_TOTAL_COLUMN=Hide the total price column on quotation requests
+MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_UNIT_PRICE=Hide the unit price column on purchase orders
+MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_TOTAL_COLUMN=Hide the total price column on puchase orders
 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
@@ -2400,4 +2405,4 @@ OptionXShouldBeEnabledInModuleY=Option "<b>%s</b>" should be enabled into module
 OptionXIsCorrectlyEnabledInModuleY=Option "<b>%s</b>" is enabled into module <b>%s</b>
 AtBottomOfPage=At bottom of page
 FailedAuth=failed authentications
-MaxNumberOfFailedAuth=Max number of failed authentication in 24h to disable login.
+MaxNumberOfFailedAuth=Max number of failed authentication in 24h to deny login.
diff --git a/htdocs/langs/lo_LA/supplier_proposal.lang b/htdocs/langs/lo_LA/supplier_proposal.lang
index 6470c76b5de..b3ef67f5f38 100644
--- a/htdocs/langs/lo_LA/supplier_proposal.lang
+++ b/htdocs/langs/lo_LA/supplier_proposal.lang
@@ -42,7 +42,8 @@ SendAskRef=ກຳ ລັງສົ່ງ ຄຳ ຮ້ອງຂໍລາຄາ %s
 SupplierProposalCard=ຂໍບັດ
 ConfirmDeleteAsk=ເຈົ້າແນ່ໃຈບໍ່ວ່າເຈົ້າຕ້ອງການລຶບຄໍາຂໍລາຄານີ້ <b> %s </b>?
 ActionsOnSupplierProposal=ເຫດການຕາມການຮ້ອງຂໍລາຄາ
-DocModelAuroreDescription=ຮູບແບບການຮ້ອງຂໍທີ່ສົມບູນ (ໂລໂກ້ ... )
+DocModelAuroreDescription=A complete template for a vendor quotation request template (old implementation of Sponge template)
+DocModelZenithDescription=A complete template for a vendor quotation request template
 CommercialAsk=ການຮ້ອງຂໍລາຄາ
 DefaultModelSupplierProposalCreate=ການສ້າງຮູບແບບເລີ່ມຕົ້ນ
 DefaultModelSupplierProposalToBill=ແມ່ແບບເລີ່ມຕົ້ນເມື່ອປິດການຮ້ອງຂໍລາຄາ (ຍອມຮັບ)
diff --git a/htdocs/langs/lt_LT/accountancy.lang b/htdocs/langs/lt_LT/accountancy.lang
index 27d0053cefc..e3c223bd5e9 100644
--- a/htdocs/langs/lt_LT/accountancy.lang
+++ b/htdocs/langs/lt_LT/accountancy.lang
@@ -41,6 +41,7 @@ AlreadyInGeneralLedger=Already transferred to accounting journals and ledger
 NotYetInGeneralLedger=Not yet transferred to accouting journals and ledger
 GroupIsEmptyCheckSetup=Grupė yra tuščia, patikrinkite individualizuotos apskaitos grupės nustatymus
 DetailByAccount=Rodyti išsamią informaciją pagal apskaitos sąskaitą
+DetailBy=Detail by
 AccountWithNonZeroValues=Accounts with non-zero values
 ListOfAccounts=Apskaitos sąskaitų sąrašas
 CountriesInEEC=Countries in EEC
@@ -51,14 +52,19 @@ AccountantFiles=Export source documents
 ExportAccountingSourceDocHelp=With this tool, you can search and export the source events that are used to generate your accountancy. <br>The exported ZIP file will contain the lists of requested items in CSV, as well as their attached files in their original format (PDF, ODT, DOCX...).
 ExportAccountingSourceDocHelp2=To export your journals, use the menu entry %s - %s.
 ExportAccountingProjectHelp=Specify a project if you need an accounting report only for a specific project. Expense reports and loan payments are not included in project reports.
+ExportAccountancy=Export accountancy
+WarningDataDisappearsWhenDataIsExported=Warning, this list contains only the accounting entries that have not been already exported (Export date is empty). If you want to include the accounting entries already exported to re-export them, click on the button above.
 VueByAccountAccounting=View by accounting account
 VueBySubAccountAccounting=View by accounting subaccount
 
-MainAccountForCustomersNotDefined=Pagrindinė apskaitos sąskaita klientams, kurie nenustatyti sąrankos metu
-MainAccountForSuppliersNotDefined=Pagrindinė apskaitos sąskaita tiekėjams, kurie nenustatyti sąrankos metu
-MainAccountForUsersNotDefined=Pagrindinė apskaitos sąskaita naudotojams, kurie nenustatyti sąrankos metu
-MainAccountForVatPaymentNotDefined=Pagrindinė apskaitos sąskaita PVM mokėjimui, kuri nėra nustatyta sąrankos metu
-MainAccountForSubscriptionPaymentNotDefined=Main accounting account for subscription payment not defined in setup
+MainAccountForCustomersNotDefined=Main account (from the Chart of Account) for customers not defined in setup
+MainAccountForSuppliersNotDefined=Main account (from the Chart of Account) for vendors not defined in setup
+MainAccountForUsersNotDefined=Main account (from the Chart of Account) for users not defined in setup
+MainAccountForRevenueStampSaleNotDefined=Account (from the Chart of Account) for the revenue stamp (sales) not defined in setup
+MainAccountForRevenueStampPurchaseNotDefined=Account (from the Chart of Account) for the revenue stamp (purchases) not defined in setup
+MainAccountForVatPaymentNotDefined=Account (from the Chart of Account) for VAT payment not defined in setup
+MainAccountForSubscriptionPaymentNotDefined=Account (from the Chart of Account) for membership payment not defined in setup
+MainAccountForRetainedWarrantyNotDefined=Account (from the Chart of Account) for the retained warranty not defined in setup
 UserAccountNotDefined=Accounting account for user not defined in setup
 
 AccountancyArea=Apskaitos sritis
@@ -112,6 +118,7 @@ MenuLoanAccounts=Paskolų sąskaitos
 MenuProductsAccounts=Prekės sąskaitos
 MenuClosureAccounts=Closure accounts
 MenuAccountancyClosure=Closure
+MenuExportAccountancy=Export accountancy
 MenuAccountancyValidationMovements=Validate movements
 ProductsBinding=Prekių sąskaitos
 TransferInAccounting=Transfer in accounting
@@ -167,9 +174,9 @@ ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow
 ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
 ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, what is the period selected by default
 
-ACCOUNTING_SELL_JOURNAL=Sales journal (sales and returns)
-ACCOUNTING_PURCHASE_JOURNAL=Purchase journal (purchase and returns)
-ACCOUNTING_BANK_JOURNAL=Cash journal (receipts and disbursements)
+ACCOUNTING_SELL_JOURNAL=Sales journal - sales and returns
+ACCOUNTING_PURCHASE_JOURNAL=Purchase journal - purchase and returns
+ACCOUNTING_BANK_JOURNAL=Cash journal - receipts and disbursements
 ACCOUNTING_EXPENSEREPORT_JOURNAL=Expense report journal
 ACCOUNTING_MISCELLANEOUS_JOURNAL=General journal
 ACCOUNTING_HAS_NEW_JOURNAL=Turi naują žurnalą
@@ -238,6 +245,7 @@ ConfirmDeleteMvt=This will delete all lines in accountancy for the year/month an
 ConfirmDeleteMvtPartial=This will delete the transaction from the accounting (all lines related to the same transaction will be deleted)
 FinanceJournal=Finance journal
 ExpenseReportsJournal=Išlaidų ataskaitų žurnalas
+InventoryJournal=Inventory journal
 DescFinanceJournal=Finance journal including all the types of payments by bank account
 DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Journals and Ledger.
 VATAccountNotDefined=Account for VAT not defined
@@ -294,7 +302,7 @@ DescClosure=Consult here the number of movements by month not yet validated & lo
 OverviewOfMovementsNotValidated=Overview of movements not validated and locked
 AllMovementsWereRecordedAsValidated=All movements were recorded as validated and locked
 NotAllMovementsCouldBeRecordedAsValidated=Not all movements could be recorded as validated and locked
-ValidateMovements=Validate and lock movements...
+ValidateMovements=Validate and lock movements
 DescValidateMovements=Any modification or deletion of writing, lettering and deletes will be prohibited. All entries for an exercise must be validated otherwise closing will not be possible
 
 ValidateHistory=Bind Automatically
@@ -343,12 +351,18 @@ ACCOUNTING_DISABLE_BINDING_ON_SALES=Disable binding & transfer in accountancy on
 ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountancy on purchases (vendor invoices will not be taken into account in accounting)
 ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting)
 ACCOUNTING_ENABLE_LETTERING=Enable the lettering function in the accounting
+ACCOUNTING_ENABLE_LETTERING_DESC=When this options is enabled, you can define, on each accounting entry, a code so you can group different accounting movements together. In the past, when different journals was managed independently, this feature was necessary to group movement lines of different journals together. However, with Dolibarr accountancy, such a tracking code, called "<b>%s</b>" is already saved automatically, so an automatic lettering is already done, with no risk of error so this feature has become useless for a common usage. Manual lettering feature is provided for end users that really don't trust the computer engine making the transfer of data in accountancy.
+EnablingThisFeatureIsNotNecessary=Enabling this feature is no more necessary for a rigourous accounting management.
 ACCOUNTING_ENABLE_AUTOLETTERING=Enable the automatic lettering when transferring to accounting
+ACCOUNTING_ENABLE_AUTOLETTERING_DESC=The code for the lettering is automatically generated and incremented and not choosed by the end user
+OptionsAdvanced=Advanced options
+ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE=Activate the management of VAT reverse charge on supplier purchases
+ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE_DESC=When this option is enabled, you can define that a supplier or a given vendor invoice must be transfered into accountancy differently: A additionnal debit and a credit line will generated into the accounting on 2 given accounts from the chart of account defined into the "%s" setup page.
 
 ## Export
 NotExportLettering=Do not export the lettering when generating the file
-NotifiedExportDate=Flag exported lines as Exported <span class="warning">(to modify a line, you will need to delete the whole transaction and re-transfert it into accounting)</span>
-NotifiedValidationDate=Validate and Lock the exported entries <span class="warning">(same effect than the "%s" feature, modification and deletion of the lines will DEFINITELY not be possible)</span>
+NotifiedExportDate=Flag not yet exported lines as Exported <span class="warning">(to modify a line flagged as exported, you will need to delete the whole transaction and re-transfert it into accounting)</span>
+NotifiedValidationDate=Validate and Lock the exported entries not yet already locked <span class="warning">(same effect than the "%s" feature, modification and deletion of the lines will DEFINITELY not be possible)</span>
 NotifiedExportFull=Export documents ?
 DateValidationAndLock=Date validation and lock
 ConfirmExportFile=Confirmation of the generation of the accounting export file ?
@@ -380,7 +394,7 @@ ChartofaccountsId=Chart of accounts Id
 ## Tools - Init accounting account on product / service
 InitAccountancy=Init accountancy
 InitAccountancyDesc=Šis puslapis gali būti naudojamas inicijuoti apskaitos sąskaitą prekėms ir paslaugoms, kurių pardavimo ir pirkimo apibrėžtoje apskaitos sąskaitoje nėra.
-DefaultBindingDesc=This page can be used to set a default account to use to link transactions record about payment salaries, donation, taxes and vat when no specific accounting account were already set.
+DefaultBindingDesc=This page can be used to set the default accounts (from the chart of account) to use to link business objects with an account, like payment salaries, donation, taxes and VAT, when no specific account were already set.
 DefaultClosureDesc=This page can be used to set parameters used for accounting closures.
 Options=Options
 OptionModeProductSell=Rėžimas pardavimas
@@ -432,7 +446,7 @@ ConfirmMassUnletteringAuto=Bulk auto unreconcile confirmation
 ConfirmMassUnletteringManual=Bulk manual unreconcile confirmation
 ConfirmMassUnletteringQuestion=Are you sure you want to unreconcile the %s selected record(s)?
 ConfirmMassDeleteBookkeepingWriting=Bulk Delete confirmation
-ConfirmMassDeleteBookkeepingWritingQuestion=This will delete the transaction from the accounting (all lines related to the same transaction will be deleted) Are you sure you want to delete the %s selected record(s)?
+ConfirmMassDeleteBookkeepingWritingQuestion=This will delete the transaction from the accounting (all line entries related to the same transaction will be deleted). Are you sure you want to delete the %s selected entries?
 
 ## Error
 SomeMandatoryStepsOfSetupWereNotDone=Kai kurie privalomi nustatymo žingsniai nebuvo atlikti, prašome juos užpildyti
@@ -445,7 +459,7 @@ NoJournalDefined=Joks žurnalas nenustatytas
 Binded=Lines bound
 ToBind=Lines to bind
 UseMenuToSetBindindManualy=Lines not yet bound, use menu <a href="%s">%s</a> to make the binding manually
-SorryThisModuleIsNotCompatibleWithTheExperimentalFeatureOfSituationInvoices=Sorry this module is not compatible with the experimental feature of situation invoices
+SorryThisModuleIsNotCompatibleWithTheExperimentalFeatureOfSituationInvoices=Note: this module or page is not completely compatible with the experimental feature of situation invoices. Some data may be wrong.
 AccountancyErrorMismatchLetterCode=Mismatch in reconcile code
 AccountancyErrorMismatchBalanceAmount=The balance (%s) is not equal to 0
 AccountancyErrorLetteringBookkeeping=Errors have occurred concerning the transactions: %s
@@ -475,9 +489,9 @@ FECFormatMulticurrencyAmount=Multicurrency amount (Montantdevise)
 FECFormatMulticurrencyCode=Multicurrency code (Idevise)
 
 DateExport=Date export
-WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manually in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate.
+WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contain transactions modified manually in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate.
 ExpenseReportJournal=Išlaidų ataskaitos žurnalas
-DocsAlreadyExportedAreExcluded=Docs already exported are excluded
-ClickToHideAlreadyExportedLines=Click to hide already exported lines
+DocsAlreadyExportedAreIncluded=Docs already exported are included
+ClickToShowAlreadyExportedLines=Click to show already exported lines
 
 NAccounts=%s accounts
diff --git a/htdocs/langs/lt_LT/admin.lang b/htdocs/langs/lt_LT/admin.lang
index 7134bbfb99d..2176ab30ac7 100644
--- a/htdocs/langs/lt_LT/admin.lang
+++ b/htdocs/langs/lt_LT/admin.lang
@@ -1509,7 +1509,8 @@ WatermarkOnDraftContractCards=Vandens ženklas ant sutarčių projektų (nieko j
 MembersSetup=Narių modulio nuostatos
 MemberMainOptions=Pagrindinės opcijos
 MemberCodeChecker=Options for automatic generation of member codes
-AdherentLoginRequired= Valdyti kiekvieno nario Prisijungimą
+AdherentLoginRequired=Manage a login/password for each member
+AdherentLoginRequiredDesc=Add a value for a login and a password on the member file. If the member is linked to a user, updating the member login and password will also update the user login and password.
 AdherentMailRequired=Email required to create a new member
 MemberSendInformationByMailByDefault=Patvirtinimas paukščiuku žymimame langelyje pašto siuntimui nariams (patvirtinimas arba nauja įmoka) yra pagal nutylėjimą
 MemberCreateAnExternalUserForSubscriptionValidated=Create an external user login for each new member subscription validated
@@ -2076,6 +2077,10 @@ MAIN_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
 DOC_SHOW_FIRST_SALES_REP=Show first sales representative
 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_GENERATE_DOCUMENTS_SUPPLIER_PROPOSAL_WITHOUT_UNIT_PRICE=Hide the unit price column on quotation requests
+MAIN_GENERATE_DOCUMENTS_SUPPLIER_PROPOSAL_WITHOUT_TOTAL_COLUMN=Hide the total price column on quotation requests
+MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_UNIT_PRICE=Hide the unit price column on purchase orders
+MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_TOTAL_COLUMN=Hide the total price column on puchase orders
 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
@@ -2400,4 +2405,4 @@ OptionXShouldBeEnabledInModuleY=Option "<b>%s</b>" should be enabled into module
 OptionXIsCorrectlyEnabledInModuleY=Option "<b>%s</b>" is enabled into module <b>%s</b>
 AtBottomOfPage=At bottom of page
 FailedAuth=failed authentications
-MaxNumberOfFailedAuth=Max number of failed authentication in 24h to disable login.
+MaxNumberOfFailedAuth=Max number of failed authentication in 24h to deny login.
diff --git a/htdocs/langs/lt_LT/main.lang b/htdocs/langs/lt_LT/main.lang
index b9cd47ab165..e7ae80a961b 100644
--- a/htdocs/langs/lt_LT/main.lang
+++ b/htdocs/langs/lt_LT/main.lang
@@ -235,6 +235,8 @@ PersonalValue=Asmeninė reikšmė
 NewObject=New %s
 NewValue=Nauja reikšmė
 OldValue=Old value %s
+FieldXModified=Field %s modified
+FieldXModifiedFromYToZ=Field %s modified from %s to %s
 CurrentValue=Dabartinė reikšmė
 Code=Kodas
 Type=Tipas
@@ -346,6 +348,7 @@ MonthOfDay=Dienos mėnuo
 DaysOfWeek=Days of week
 HourShort=H
 MinuteShort=MN
+SecondShort=sec
 Rate=Norma
 CurrencyRate=Currency conversion rate
 UseLocalTax=Įtraukti mokestį
@@ -555,6 +558,7 @@ Unknown=Nežinomas
 General=Vyriausias
 Size=Dydis
 OriginalSize=Original size
+RotateImage=Rotate 90°
 Received=Gautas
 Paid=Apmokėtas
 Topic=Subject
@@ -1229,4 +1233,9 @@ PublicVirtualCard=Virtual business card
 TreeView=Tree view
 DropFileToAddItToObject=Drop a file to add it to this object
 UploadFileDragDropSuccess=The file(s) have been uploaded successfully
-SearchSyntaxTooltipForStringOrNum=For searching inside text fields, you can use the characters ^ or $ to make a 'start or end with' search or use the ! to make a 'does not contain' test. You can use the | between two strings instead of a space for a 'OR' condition instead of 'AND'. For numeric values, you can use the operator <, >, <= or >= before the value to filter using a mathematical comparison
+SearchSyntaxTooltipForStringOrNum=For searching inside text fields, you can use the characters ^ or $ to make a 'start or end with' search or use the ! to make a 'does not contain' test. You can use the | between two strings instead of a space for a 'OR' condition instead of 'AND'. For numeric values, you can use the operator <, >, <=, >= or != before the value, to filter using a mathematical comparison
+InProgress=In progress
+DateOfPrinting=Date of printing
+ClickFullScreenEscapeToLeave=Click here to switch in Full screen mode. Press ESCAPE to leave Full screen mode.
+UserNotYetValid=Not yet valid
+UserExpired=Pasibaigęs
diff --git a/htdocs/langs/lv_LV/accountancy.lang b/htdocs/langs/lv_LV/accountancy.lang
index 5d3d06dea8a..af78f3ca129 100644
--- a/htdocs/langs/lv_LV/accountancy.lang
+++ b/htdocs/langs/lv_LV/accountancy.lang
@@ -57,11 +57,14 @@ WarningDataDisappearsWhenDataIsExported=Brīdinājums, šajā sarakstā ir tikai
 VueByAccountAccounting=Skatīt pēc grāmatvedības konta
 VueBySubAccountAccounting=Skatīt pēc grāmatvedības apakškonta
 
-MainAccountForCustomersNotDefined=Galvenais grāmatvedības konts klientiem, kas nav definēti iestatījumos
-MainAccountForSuppliersNotDefined=Galvenais grāmatvedības konts piegādātājiem, kas nav definēti iestatījumos
-MainAccountForUsersNotDefined=Galvenais grāmatvedības konts lietotājiem, kas nav definēti iestatījumos
-MainAccountForVatPaymentNotDefined=Galvenais grāmatvedības konts par PVN maksājumu, kas nav definēts iestatījumos
-MainAccountForSubscriptionPaymentNotDefined=Galvenais grāmatvedības konts abonēšanas maksā, kas nav definēts iestatījumā
+MainAccountForCustomersNotDefined=Main account (from the Chart of Account) for customers not defined in setup
+MainAccountForSuppliersNotDefined=Main account (from the Chart of Account) for vendors not defined in setup
+MainAccountForUsersNotDefined=Main account (from the Chart of Account) for users not defined in setup
+MainAccountForRevenueStampSaleNotDefined=Account (from the Chart of Account) for the revenue stamp (sales) not defined in setup
+MainAccountForRevenueStampPurchaseNotDefined=Account (from the Chart of Account) for the revenue stamp (purchases) not defined in setup
+MainAccountForVatPaymentNotDefined=Account (from the Chart of Account) for VAT payment not defined in setup
+MainAccountForSubscriptionPaymentNotDefined=Account (from the Chart of Account) for membership payment not defined in setup
+MainAccountForRetainedWarrantyNotDefined=Account (from the Chart of Account) for the retained warranty not defined in setup
 UserAccountNotDefined=Uzskaites konts lietotājam, kas nav definēts iestatījumos
 
 AccountancyArea=Grāmatvedības zona
diff --git a/htdocs/langs/lv_LV/admin.lang b/htdocs/langs/lv_LV/admin.lang
index cc5cc700d4f..50ffa968f64 100644
--- a/htdocs/langs/lv_LV/admin.lang
+++ b/htdocs/langs/lv_LV/admin.lang
@@ -1509,7 +1509,8 @@ WatermarkOnDraftContractCards=Ūdenszīme uz līgumu projektiem (nav, ja  tukšs
 MembersSetup=Dalībnieku moduļa uzstādīšana
 MemberMainOptions=Galvenās iespējas
 MemberCodeChecker=Iespējas automātiskai dalībnieku kodu ģenerēšanai
-AdherentLoginRequired= Pārvaldīt Pieteikšanos katram dalībniekam
+AdherentLoginRequired=Manage a login/password for each member
+AdherentLoginRequiredDesc=Add a value for a login and a password on the member file. If the member is linked to a user, updating the member login and password will also update the user login and password.
 AdherentMailRequired=Lai izveidotu jaunu dalībnieku, nepieciešams e-pasts
 MemberSendInformationByMailByDefault=Rūtiņu, lai nosūtītu pasta apstiprinājums locekļiem (validāciju vai jauns abonements) ir ieslēgts pēc noklusējuma
 MemberCreateAnExternalUserForSubscriptionValidated=Katram apstiprinātam jaunam dalībnieka abonementam izveidojiet ārēju lietotāja pieteikuminformāciju
@@ -2076,6 +2077,10 @@ MAIN_DOCUMENTS_LOGO_HEIGHT=Logotipa augstums PDF formātā
 DOC_SHOW_FIRST_SALES_REP=Parādiet pirmo tirdzniecības pārstāvi
 MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Pievienojiet attēla kolonnu priekšlikuma rindām
 MAIN_DOCUMENTS_WITH_PICTURE_WIDTH=Kolonnas platums, ja līnijām ir pievienots attēls
+MAIN_GENERATE_DOCUMENTS_SUPPLIER_PROPOSAL_WITHOUT_UNIT_PRICE=Hide the unit price column on quotation requests
+MAIN_GENERATE_DOCUMENTS_SUPPLIER_PROPOSAL_WITHOUT_TOTAL_COLUMN=Hide the total price column on quotation requests
+MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_UNIT_PRICE=Hide the unit price column on purchase orders
+MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_TOTAL_COLUMN=Hide the total price column on puchase orders
 MAIN_PDF_NO_SENDER_FRAME=Slēpt adresāta rāmja robežas
 MAIN_PDF_NO_RECIPENT_FRAME=Paslēpt adresāta rāmja robežas
 MAIN_PDF_HIDE_CUSTOMER_CODE=Paslēpt klienta kodu
@@ -2400,4 +2405,4 @@ OptionXShouldBeEnabledInModuleY=Opcija "<b> %s </b>" ir jāiespējo modulī <b>
 OptionXIsCorrectlyEnabledInModuleY=Opcija " <b> %s </b> " ir iespējota modulī <b> %s a09a4b739f17f8
 AtBottomOfPage=At bottom of page
 FailedAuth=failed authentications
-MaxNumberOfFailedAuth=Max number of failed authentication in 24h to disable login.
+MaxNumberOfFailedAuth=Max number of failed authentication in 24h to deny login.
diff --git a/htdocs/langs/lv_LV/main.lang b/htdocs/langs/lv_LV/main.lang
index a8977ca3cb7..42bc0265899 100644
--- a/htdocs/langs/lv_LV/main.lang
+++ b/htdocs/langs/lv_LV/main.lang
@@ -1237,3 +1237,5 @@ SearchSyntaxTooltipForStringOrNum=For searching inside text fields, you can use
 InProgress=Procesā
 DateOfPrinting=Date of printing
 ClickFullScreenEscapeToLeave=Click here to switch in Full screen mode. Press ESCAPE to leave Full screen mode.
+UserNotYetValid=Not yet valid
+UserExpired=Beidzies
diff --git a/htdocs/langs/lv_LV/modulebuilder.lang b/htdocs/langs/lv_LV/modulebuilder.lang
index 552b2f28e2e..b1bc3bafc4f 100644
--- a/htdocs/langs/lv_LV/modulebuilder.lang
+++ b/htdocs/langs/lv_LV/modulebuilder.lang
@@ -28,6 +28,7 @@ ModuleBuilderDescwidgets=Šī cilne ir paredzēta, lai pārvaldītu/veidotu logr
 ModuleBuilderDescbuildpackage=Jūs varat ģenerēt šeit moduļa "gatavs izplatīšanai" pakotnes failu (standartizētu .zip failu) un dokumentācijas failu "gatavs izplatīšanai". Vienkārši noklikšķiniet uz pogas, lai izveidotu paketi vai dokumentācijas failu.
 EnterNameOfModuleToDeleteDesc=Jūs varat izdzēst savu moduli. BRĪDINĀJUMS! Visi moduļa kodēšanas faili (ģenerēti vai izveidoti manuāli) UN strukturētie dati un dokumentācija tiks izdzēsti!
 EnterNameOfObjectToDeleteDesc=Objektu var izdzēst. BRĪDINĀJUMS: Visi ar objektu saistītie kodēšanas faili (ģenerēti vai izveidoti manuāli) tiks izdzēsti!
+EnterNameOfObjectToDeleteDesc=Objektu var izdzēst. BRĪDINĀJUMS: Visi ar objektu saistītie kodēšanas faili (ģenerēti vai izveidoti manuāli) tiks izdzēsti!
 DangerZone=Bīstamā zona
 BuildPackage=Izveidot paketi
 BuildPackageDesc=Jūs varat izveidot zip pakotni no jūsu pieteikuma, lai jūs būtu gatavi to izplatīt jebkurā Dolibarr. Jūs varat arī to izplatīt vai pārdot tirgū kā <a href="https://www.dolistore.com">DoliStore.com</a> .
@@ -162,11 +163,11 @@ ListOfTabsEntries=Cilņu ierakstu saraksts
 TabsDefDesc=Šeit definējiet moduļa nodrošinātās cilnes
 TabsDefDescTooltip=Jūsu moduļa/lietojumprogrammas nodrošinātās cilnes ir definētas masīvā <strong> $this->tabs </strong> moduļa deskriptora failā. Varat manuāli rediģēt šo failu vai izmantot iegulto redaktoru.
 BadValueForType=Nepareiza vērtība tipam %s
-DefinePropertiesFromExistingTable=Definējiet rekvizītus no esošāss tabulas
+DefinePropertiesFromExistingTable=Define the fields/properties from an existing table
 DefinePropertiesFromExistingTableDesc=Ja datu bāzē tabula (izveidojamajam objektam) jau pastāv, varat to izmantot, lai definētu objekta rekvizītus.
 DefinePropertiesFromExistingTableDesc2=Ja tabula vēl nepastāv, atstājiet tukšu. Kodu ģenerators izmantos dažāda veida laukus, lai izveidotu tabulas piemēru, kuru varēsit rediģēt vēlāk.
-GeneratePermissions=Es vēlos pievienot tiesības šim objektam
-GeneratePermissionsHelp=ģenerēt noklusējuma tiesības šim objektam
+GeneratePermissions=I want to manage permissions on this object
+GeneratePermissionsHelp=If you check this, some code will be added to manage permissions to read, write and delete record of the objects
 PermissionDeletedSuccesfuly=Atļauja ir veiksmīgi noņemta
 PermissionUpdatedSuccesfuly=Atļauja ir veiksmīgi atjaunināta
 PermissionAddedSuccesfuly=Atļauja ir veiksmīgi pievienota
@@ -177,3 +178,6 @@ ApiObjectDeleted=API objektam %s ir veiksmīgi izdzēsts
 CRUDRead=Lasīt
 CRUDCreateWrite=Izveidot vai atjaunināt
 FailedToAddCodeIntoDescriptor=Neizdevās pievienot kodu deskriptoram. Pārbaudiet, vai failā joprojām ir virknes komentārs "%s".
+DictionariesCreated=Dictionary <b>%s</b> created successfully
+DictionaryDeleted=Dictionary <b>%s</b> removed successfully
+PropertyModuleUpdated=Property <b>%s</b> has been update successfully
diff --git a/htdocs/langs/lv_LV/supplier_proposal.lang b/htdocs/langs/lv_LV/supplier_proposal.lang
index 3c0f48cf394..77ffe44386c 100644
--- a/htdocs/langs/lv_LV/supplier_proposal.lang
+++ b/htdocs/langs/lv_LV/supplier_proposal.lang
@@ -42,7 +42,8 @@ SendAskRef=Sūta cenas pieprasījumu %s
 SupplierProposalCard=Pieprasīt karti
 ConfirmDeleteAsk=Vai tiešām vēlaties dzēst šo cenu pieprasījumu <b> %s</b>?
 ActionsOnSupplierProposal=Pasākumi pēc cenas pieprasījuma
-DocModelAuroreDescription=Pilns pieprasījuma modelis (logotips ...)
+DocModelAuroreDescription=A complete template for a vendor quotation request template (old implementation of Sponge template)
+DocModelZenithDescription=A complete template for a vendor quotation request template
 CommercialAsk=Cenas pieprasījums
 DefaultModelSupplierProposalCreate=Noklusējuma modeļa izveidošana
 DefaultModelSupplierProposalToBill=Noklusējuma veidne, aizverot cenu pieprasījumu (pieņemts)
diff --git a/htdocs/langs/mk_MK/accountancy.lang b/htdocs/langs/mk_MK/accountancy.lang
index 99c230dcd11..7af106dafed 100644
--- a/htdocs/langs/mk_MK/accountancy.lang
+++ b/htdocs/langs/mk_MK/accountancy.lang
@@ -41,6 +41,7 @@ AlreadyInGeneralLedger=Already transferred to accounting journals and ledger
 NotYetInGeneralLedger=Not yet transferred to accouting journals and ledger
 GroupIsEmptyCheckSetup=Групата е празна, проверете го поставувањето на персоналната сметководствена група
 DetailByAccount=Покажете детали по сметка
+DetailBy=Detail by
 AccountWithNonZeroValues=Сметки со вредности кои не се нула
 ListOfAccounts=Листа на сметки
 CountriesInEEC=Земји во Европска економска заедница
@@ -51,14 +52,19 @@ AccountantFiles=Export source documents
 ExportAccountingSourceDocHelp=With this tool, you can search and export the source events that are used to generate your accountancy. <br>The exported ZIP file will contain the lists of requested items in CSV, as well as their attached files in their original format (PDF, ODT, DOCX...).
 ExportAccountingSourceDocHelp2=To export your journals, use the menu entry %s - %s.
 ExportAccountingProjectHelp=Specify a project if you need an accounting report only for a specific project. Expense reports and loan payments are not included in project reports.
+ExportAccountancy=Export accountancy
+WarningDataDisappearsWhenDataIsExported=Warning, this list contains only the accounting entries that have not been already exported (Export date is empty). If you want to include the accounting entries already exported to re-export them, click on the button above.
 VueByAccountAccounting=View by accounting account
 VueBySubAccountAccounting=View by accounting subaccount
 
-MainAccountForCustomersNotDefined=Главна сметководствена сметка за клиенти што не се дефинирани во сетапот
-MainAccountForSuppliersNotDefined=Главна сметководствена сметка за трговците кои не се дефинирани во сетапот
-MainAccountForUsersNotDefined=Главна сметководствена сметка за корисници кои не се дефинирани во сетапот
-MainAccountForVatPaymentNotDefined=Main accounting account for VAT payment not defined in setup
-MainAccountForSubscriptionPaymentNotDefined=Main accounting account for subscription payment not defined in setup
+MainAccountForCustomersNotDefined=Main account (from the Chart of Account) for customers not defined in setup
+MainAccountForSuppliersNotDefined=Main account (from the Chart of Account) for vendors not defined in setup
+MainAccountForUsersNotDefined=Main account (from the Chart of Account) for users not defined in setup
+MainAccountForRevenueStampSaleNotDefined=Account (from the Chart of Account) for the revenue stamp (sales) not defined in setup
+MainAccountForRevenueStampPurchaseNotDefined=Account (from the Chart of Account) for the revenue stamp (purchases) not defined in setup
+MainAccountForVatPaymentNotDefined=Account (from the Chart of Account) for VAT payment not defined in setup
+MainAccountForSubscriptionPaymentNotDefined=Account (from the Chart of Account) for membership payment not defined in setup
+MainAccountForRetainedWarrantyNotDefined=Account (from the Chart of Account) for the retained warranty not defined in setup
 UserAccountNotDefined=Accounting account for user not defined in setup
 
 AccountancyArea=Accounting area
@@ -112,6 +118,7 @@ MenuLoanAccounts=Loan accounts
 MenuProductsAccounts=Product accounts
 MenuClosureAccounts=Closure accounts
 MenuAccountancyClosure=Closure
+MenuExportAccountancy=Export accountancy
 MenuAccountancyValidationMovements=Validate movements
 ProductsBinding=Products accounts
 TransferInAccounting=Transfer in accounting
@@ -167,9 +174,9 @@ ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow
 ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
 ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, what is the period selected by default
 
-ACCOUNTING_SELL_JOURNAL=Sales journal (sales and returns)
-ACCOUNTING_PURCHASE_JOURNAL=Purchase journal (purchase and returns)
-ACCOUNTING_BANK_JOURNAL=Cash journal (receipts and disbursements)
+ACCOUNTING_SELL_JOURNAL=Sales journal - sales and returns
+ACCOUNTING_PURCHASE_JOURNAL=Purchase journal - purchase and returns
+ACCOUNTING_BANK_JOURNAL=Cash journal - receipts and disbursements
 ACCOUNTING_EXPENSEREPORT_JOURNAL=Expense report journal
 ACCOUNTING_MISCELLANEOUS_JOURNAL=General journal
 ACCOUNTING_HAS_NEW_JOURNAL=Has new Journal
@@ -238,6 +245,7 @@ ConfirmDeleteMvt=This will delete all lines in accountancy for the year/month an
 ConfirmDeleteMvtPartial=This will delete the transaction from the accounting (all lines related to the same transaction will be deleted)
 FinanceJournal=Finance journal
 ExpenseReportsJournal=Expense reports journal
+InventoryJournal=Inventory journal
 DescFinanceJournal=Finance journal including all the types of payments by bank account
 DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Journals and Ledger.
 VATAccountNotDefined=Account for VAT not defined
@@ -294,7 +302,7 @@ DescClosure=Consult here the number of movements by month not yet validated & lo
 OverviewOfMovementsNotValidated=Overview of movements not validated and locked
 AllMovementsWereRecordedAsValidated=All movements were recorded as validated and locked
 NotAllMovementsCouldBeRecordedAsValidated=Not all movements could be recorded as validated and locked
-ValidateMovements=Validate and lock movements...
+ValidateMovements=Validate and lock movements
 DescValidateMovements=Any modification or deletion of writing, lettering and deletes will be prohibited. All entries for an exercise must be validated otherwise closing will not be possible
 
 ValidateHistory=Bind Automatically
@@ -343,12 +351,18 @@ ACCOUNTING_DISABLE_BINDING_ON_SALES=Disable binding & transfer in accountancy on
 ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountancy on purchases (vendor invoices will not be taken into account in accounting)
 ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting)
 ACCOUNTING_ENABLE_LETTERING=Enable the lettering function in the accounting
+ACCOUNTING_ENABLE_LETTERING_DESC=When this options is enabled, you can define, on each accounting entry, a code so you can group different accounting movements together. In the past, when different journals was managed independently, this feature was necessary to group movement lines of different journals together. However, with Dolibarr accountancy, such a tracking code, called "<b>%s</b>" is already saved automatically, so an automatic lettering is already done, with no risk of error so this feature has become useless for a common usage. Manual lettering feature is provided for end users that really don't trust the computer engine making the transfer of data in accountancy.
+EnablingThisFeatureIsNotNecessary=Enabling this feature is no more necessary for a rigourous accounting management.
 ACCOUNTING_ENABLE_AUTOLETTERING=Enable the automatic lettering when transferring to accounting
+ACCOUNTING_ENABLE_AUTOLETTERING_DESC=The code for the lettering is automatically generated and incremented and not choosed by the end user
+OptionsAdvanced=Advanced options
+ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE=Activate the management of VAT reverse charge on supplier purchases
+ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE_DESC=When this option is enabled, you can define that a supplier or a given vendor invoice must be transfered into accountancy differently: A additionnal debit and a credit line will generated into the accounting on 2 given accounts from the chart of account defined into the "%s" setup page.
 
 ## Export
 NotExportLettering=Do not export the lettering when generating the file
-NotifiedExportDate=Flag exported lines as Exported <span class="warning">(to modify a line, you will need to delete the whole transaction and re-transfert it into accounting)</span>
-NotifiedValidationDate=Validate and Lock the exported entries <span class="warning">(same effect than the "%s" feature, modification and deletion of the lines will DEFINITELY not be possible)</span>
+NotifiedExportDate=Flag not yet exported lines as Exported <span class="warning">(to modify a line flagged as exported, you will need to delete the whole transaction and re-transfert it into accounting)</span>
+NotifiedValidationDate=Validate and Lock the exported entries not yet already locked <span class="warning">(same effect than the "%s" feature, modification and deletion of the lines will DEFINITELY not be possible)</span>
 NotifiedExportFull=Export documents ?
 DateValidationAndLock=Date validation and lock
 ConfirmExportFile=Confirmation of the generation of the accounting export file ?
@@ -380,7 +394,7 @@ ChartofaccountsId=Chart of accounts Id
 ## Tools - Init accounting account on product / service
 InitAccountancy=Init accountancy
 InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accounting account defined for sales and purchases.
-DefaultBindingDesc=This page can be used to set a default account to use to link transactions record about payment salaries, donation, taxes and vat when no specific accounting account were already set.
+DefaultBindingDesc=This page can be used to set the default accounts (from the chart of account) to use to link business objects with an account, like payment salaries, donation, taxes and VAT, when no specific account were already set.
 DefaultClosureDesc=This page can be used to set parameters used for accounting closures.
 Options=Options
 OptionModeProductSell=Mode sales
@@ -432,7 +446,7 @@ ConfirmMassUnletteringAuto=Bulk auto unreconcile confirmation
 ConfirmMassUnletteringManual=Bulk manual unreconcile confirmation
 ConfirmMassUnletteringQuestion=Are you sure you want to unreconcile the %s selected record(s)?
 ConfirmMassDeleteBookkeepingWriting=Bulk Delete confirmation
-ConfirmMassDeleteBookkeepingWritingQuestion=This will delete the transaction from the accounting (all lines related to the same transaction will be deleted) Are you sure you want to delete the %s selected record(s)?
+ConfirmMassDeleteBookkeepingWritingQuestion=This will delete the transaction from the accounting (all line entries related to the same transaction will be deleted). Are you sure you want to delete the %s selected entries?
 
 ## Error
 SomeMandatoryStepsOfSetupWereNotDone=Some mandatory steps of setup was not done, please complete them
@@ -445,7 +459,7 @@ NoJournalDefined=No journal defined
 Binded=Lines bound
 ToBind=Lines to bind
 UseMenuToSetBindindManualy=Lines not yet bound, use menu <a href="%s">%s</a> to make the binding manually
-SorryThisModuleIsNotCompatibleWithTheExperimentalFeatureOfSituationInvoices=Sorry this module is not compatible with the experimental feature of situation invoices
+SorryThisModuleIsNotCompatibleWithTheExperimentalFeatureOfSituationInvoices=Note: this module or page is not completely compatible with the experimental feature of situation invoices. Some data may be wrong.
 AccountancyErrorMismatchLetterCode=Mismatch in reconcile code
 AccountancyErrorMismatchBalanceAmount=The balance (%s) is not equal to 0
 AccountancyErrorLetteringBookkeeping=Errors have occurred concerning the transactions: %s
@@ -475,9 +489,9 @@ FECFormatMulticurrencyAmount=Multicurrency amount (Montantdevise)
 FECFormatMulticurrencyCode=Multicurrency code (Idevise)
 
 DateExport=Date export
-WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manually in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate.
+WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contain transactions modified manually in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate.
 ExpenseReportJournal=Expense Report Journal
-DocsAlreadyExportedAreExcluded=Docs already exported are excluded
-ClickToHideAlreadyExportedLines=Click to hide already exported lines
+DocsAlreadyExportedAreIncluded=Docs already exported are included
+ClickToShowAlreadyExportedLines=Click to show already exported lines
 
 NAccounts=%s accounts
diff --git a/htdocs/langs/mk_MK/main.lang b/htdocs/langs/mk_MK/main.lang
index 8fac298a203..9cbfb6be3cf 100644
--- a/htdocs/langs/mk_MK/main.lang
+++ b/htdocs/langs/mk_MK/main.lang
@@ -1,9 +1,15 @@
 # Dolibarr language file - Source file is en_US - main
 DIRECTION=ltr
+# Default for FONTFORPDF=helvetica
 # Note for Chinese:
-# msungstdlight or cid0ct are for traditional Chinese (traditional does not render with Ubuntu pdf reader)
-# stsongstdlight or cid0cs are for simplified Chinese
+# msungstdlight or cid0ct are for traditional Chinese zh_TW (traditional does not render with Ubuntu pdf reader)
+# stsongstdlight or cid0cs are for simplified Chinese zh_CN
 # To read Chinese pdf with Linux: sudo apt-get install poppler-data
+# cid0jp is for Japanish
+# cid0kr is for Korean
+# DejaVuSans is for some Eastern languages, some Asian languages and some Arabic languages
+# freemono is for ru_RU or uk_UA, uz_UZ
+# freeserif is for Tamil
 FONTFORPDF=DejaVuSans
 FONTSIZEFORPDF=10
 SeparatorDecimal=,
@@ -28,6 +34,7 @@ NoTemplateDefined=No template available for this email type
 AvailableVariables=Available substitution variables
 NoTranslation=No translation
 Translation=Translation
+Translations=Translations
 CurrentTimeZone=TimeZone PHP (server)
 EmptySearchString=Enter non empty search criterias
 EnterADateCriteria=Enter a date criteria
@@ -192,13 +199,12 @@ Hide=Hide
 ShowCardHere=Show card
 Search=Search
 SearchOf=Search
-SearchMenuShortCut=Ctrl + shift + f
 QuickAdd=Quick add
-QuickAddMenuShortCut=Ctrl + shift + l
 Valid=Valid
 Approve=Approve
 Disapprove=Disapprove
 ReOpen=Re-Open
+OpenVerb=Open
 Upload=Upload
 ToLink=Link
 Select=Select
@@ -216,8 +222,9 @@ UserGroup=User group
 UserGroups=User groups
 NoUserGroupDefined=No user group defined
 Password=Password
-PasswordRetype=Retype your password
+PasswordRetype=Repeat your password
 NoteSomeFeaturesAreDisabled=Note that a lot of features/modules are disabled in this demonstration.
+YourUserFile=Your user file
 Name=Name
 NameSlashCompany=Name / Company
 Person=Person
@@ -228,6 +235,8 @@ PersonalValue=Personal value
 NewObject=New %s
 NewValue=New value
 OldValue=Old value %s
+FieldXModified=Field %s modified
+FieldXModifiedFromYToZ=Field %s modified from %s to %s
 CurrentValue=Current value
 Code=Code
 Type=Type
@@ -244,6 +253,7 @@ Designation=Description
 DescriptionOfLine=Description of line
 DateOfLine=Date of line
 DurationOfLine=Duration of line
+ParentLine=Parent line ID
 Model=Doc template
 DefaultModel=Default doc template
 Action=Настан
@@ -302,6 +312,8 @@ UserValidation=Validation user
 UserCreationShort=Creat. user
 UserModificationShort=Modif. user
 UserValidationShort=Valid. user
+UserClosing=Closing user
+UserClosingShort=Closing user
 DurationYear=year
 DurationMonth=month
 DurationWeek=week
@@ -336,6 +348,7 @@ MonthOfDay=Month of the day
 DaysOfWeek=Days of week
 HourShort=H
 MinuteShort=mn
+SecondShort=sec
 Rate=Rate
 CurrencyRate=Currency conversion rate
 UseLocalTax=Include tax
@@ -344,7 +357,7 @@ KiloBytes=Kilobytes
 MegaBytes=Megabytes
 GigaBytes=Gigabytes
 TeraBytes=Terabytes
-UserAuthor=Ceated by
+UserAuthor=Created by
 UserModif=Updated by
 b=b.
 Kb=Kb
@@ -480,6 +493,7 @@ ActionsOnContact=Events for this contact/address
 ActionsOnContract=Events for this contract
 ActionsOnMember=Events about this member
 ActionsOnProduct=Events about this product
+ActionsOnAsset=Events for this fixed asset
 NActionsLate=%s late
 ToDo=To do
 Completed=Completed
@@ -503,6 +517,7 @@ NotYetAvailable=Not yet available
 NotAvailable=Not available
 Categories=Tags/categories
 Category=Tag/category
+SelectTheTagsToAssign=Select the tags/categories to assign
 By=By
 From=From
 FromDate=From
@@ -517,6 +532,7 @@ or=or
 Other=Other
 Others=Others
 OtherInformations=Други информации
+Workflow=Workflow
 Quantity=Quantity
 Qty=Qty
 ChangedBy=Changed by
@@ -542,6 +558,7 @@ Unknown=Непознато
 General=General
 Size=Size
 OriginalSize=Original size
+RotateImage=Rotate 90°
 Received=Received
 Paid=Paid
 Topic=Subject
@@ -619,6 +636,7 @@ MonthVeryShort11=N
 MonthVeryShort12=D
 AttachedFiles=Attached files and documents
 JoinMainDoc=Join main document
+JoinMainDocOrLastGenerated=Send the main document or the last generated one if not found
 DateFormatYYYYMM=YYYY-MM
 DateFormatYYYYMMDD=YYYY-MM-DD
 DateFormatYYYYMMDDHHMM=YYYY-MM-DD HH:SS
@@ -709,6 +727,7 @@ FeatureDisabled=Feature disabled
 MoveBox=Move widget
 Offered=Offered
 NotEnoughPermissions=You don't have permission for this action
+UserNotInHierachy=This action is reserved to the supervisors of this user
 SessionName=Session name
 Method=Method
 Receive=Receive
@@ -798,6 +817,7 @@ URLPhoto=URL of photo/logo
 SetLinkToAnotherThirdParty=Link to another third party
 LinkTo=Link to
 LinkToProposal=Link to proposal
+LinkToExpedition= Link to expedition
 LinkToOrder=Link to order
 LinkToInvoice=Link to invoice
 LinkToTemplateInvoice=Link to template invoice
@@ -883,9 +903,12 @@ MassFilesArea=Area for files built by mass actions
 ShowTempMassFilesArea=Show area of files built by mass actions
 ConfirmMassDeletion=Bulk Delete confirmation
 ConfirmMassDeletionQuestion=Are you sure you want to delete the %s selected record(s)?
+ConfirmMassClone=Bulk clone confirmation
+ConfirmMassCloneQuestion=Select project to clone to
+ConfirmMassCloneToOneProject=Clone to project %s
 RelatedObjects=Related Objects
-ClassifyBilled=Classify billed
-ClassifyUnbilled=Classify unbilled
+ClassifyBilled=Classify Billed
+ClassifyUnbilled=Classify Unbilled
 Progress=Progress
 ProgressShort=Progr.
 FrontOffice=Front office
@@ -898,13 +921,14 @@ ExportFilteredList=Export filtered list
 ExportList=Export list
 ExportOptions=Export Options
 IncludeDocsAlreadyExported=Include docs already exported
-ExportOfPiecesAlreadyExportedIsEnable=Export of pieces already exported is enable
-ExportOfPiecesAlreadyExportedIsDisable=Export of pieces already exported is disable
+ExportOfPiecesAlreadyExportedIsEnable=Documents already exported are visible and will be exported
+ExportOfPiecesAlreadyExportedIsDisable=Documents already exported are hidden and won't be exported
 AllExportedMovementsWereRecordedAsExported=All exported movements were recorded as exported
 NotAllExportedMovementsCouldBeRecordedAsExported=Not all exported movements could be recorded as exported
 Miscellaneous=Miscellaneous
 Calendar=Calendar
 GroupBy=Group by...
+GroupByX=Group by %s
 ViewFlatList=View flat list
 ViewAccountList=View ledger
 ViewSubAccountList=View subaccount ledger
@@ -916,6 +940,7 @@ DirectDownloadInternalLink=Private download link
 PrivateDownloadLinkDesc=You need to be logged and you need permissions to view or download the file
 Download=Download
 DownloadDocument=Download document
+DownloadSignedDocument=Download signed document
 ActualizeCurrency=Update currency rate
 Fiscalyear=Fiscal year
 ModuleBuilder=Module and Application Builder
@@ -1041,6 +1066,7 @@ SearchIntoContracts=Договори
 SearchIntoCustomerShipments=Customer shipments
 SearchIntoExpenseReports=Expense reports
 SearchIntoLeaves=Leave
+SearchIntoKM=Knowledge base
 SearchIntoTickets=Tickets
 SearchIntoCustomerPayments=Customer payments
 SearchIntoVendorPayments=Vendor payments
@@ -1112,6 +1138,7 @@ DeleteFileText=Do you really want delete this file?
 ShowOtherLanguages=Show other languages
 SwitchInEditModeToAddTranslation=Switch in edit mode to add translations for this language
 NotUsedForThisCustomer=Not used for this customer
+NotUsedForThisVendor=Not used for this vendor
 AmountMustBePositive=Amount must be positive
 ByStatus=By status
 InformationMessage=Information
@@ -1132,15 +1159,29 @@ EventReminder=Event Reminder
 UpdateForAllLines=Update for all lines
 OnHold=On hold
 Civility=Civility
-AffectTag=Affect Tag
+AffectTag=Assign a Tag
+AffectUser=Assign a User
+SetSupervisor=Set the supervisor
 CreateExternalUser=Create external user
-ConfirmAffectTag=Bulk Tag Affect
-ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
+ConfirmAffectTag=Bulk Tag Assignement
+ConfirmAffectUser=Bulk User Assignement
+ProjectRole=Role assigned on each project/opportunity
+TasksRole=Role assigned on each task (if used)
+ConfirmSetSupervisor=Bulk Supervisor Set
+ConfirmUpdatePrice=Choose a increase/decrease price rate
+ConfirmAffectTagQuestion=Are you sure you want to assign tags to the %s selected record(s)?
+ConfirmAffectUserQuestion=Are you sure you want to assign users to the %s selected record(s)?
+ConfirmSetSupervisorQuestion=Are you sure you want to set supervisor to the %s selected record(s)?
+ConfirmUpdatePriceQuestion=Are you sure you want to update the price of the %s selected record(s)?
 CategTypeNotFound=No tag type found for type of records
+Rate=Rate
+SupervisorNotFound=Supervisor not found
 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
+EmailDate=Email date
+SetToStatus=Set to status %s
 SetToEnabled=Set to enabled
 SetToDisabled=Set to disabled
 ConfirmMassEnabling=mass enabling confirmation
@@ -1164,3 +1205,37 @@ NotClosedYet=Not yet closed
 ClearSignature=Reset signature
 CanceledHidden=Canceled hidden
 CanceledShown=Canceled shown
+Terminate=Terminate
+Terminated=Исклучен
+AddLineOnPosition=Add line on position (at the end if empty)
+ConfirmAllocateCommercial=Assign sales representative confirmation
+ConfirmAllocateCommercialQuestion=Are you sure you want to assign the %s selected record(s)?
+CommercialsAffected=Sales representatives assigned
+CommercialAffected=Sales representative assigned
+YourMessage=Your message
+YourMessageHasBeenReceived=Your message has been received. We will answer or contact you as soon as possible.
+UrlToCheck=Url to check
+Automation=Automation
+CreatedByEmailCollector=Created by Email collector
+CreatedByPublicPortal=Created from Public portal
+UserAgent=User Agent
+InternalUser=Internal user
+ExternalUser=External user
+NoSpecificContactAddress=No specific contact or address
+NoSpecificContactAddressBis=This tab is dedicated to force specific contacts or addresses for the current object. Use it only if you want to define one or several specific contacts or addresses for the object when the information on the thirdparty is not enough or not accurate.
+HideOnVCard=Hide %s
+AddToContacts=Add address to my contacts
+LastAccess=Last access
+UploadAnImageToSeeAPhotoHere=Upload an image from the tab %s to see a photo here
+LastPasswordChangeDate=Last password change date
+PublicVirtualCardUrl=Virtual business card page URL
+PublicVirtualCard=Virtual business card
+TreeView=Tree view
+DropFileToAddItToObject=Drop a file to add it to this object
+UploadFileDragDropSuccess=The file(s) have been uploaded successfully
+SearchSyntaxTooltipForStringOrNum=For searching inside text fields, you can use the characters ^ or $ to make a 'start or end with' search or use the ! to make a 'does not contain' test. You can use the | between two strings instead of a space for a 'OR' condition instead of 'AND'. For numeric values, you can use the operator <, >, <=, >= or != before the value, to filter using a mathematical comparison
+InProgress=In progress
+DateOfPrinting=Date of printing
+ClickFullScreenEscapeToLeave=Click here to switch in Full screen mode. Press ESCAPE to leave Full screen mode.
+UserNotYetValid=Not yet valid
+UserExpired=Истечен
diff --git a/htdocs/langs/nb_NO/accountancy.lang b/htdocs/langs/nb_NO/accountancy.lang
index 7f5f585b56e..d95271f5766 100644
--- a/htdocs/langs/nb_NO/accountancy.lang
+++ b/htdocs/langs/nb_NO/accountancy.lang
@@ -57,11 +57,14 @@ WarningDataDisappearsWhenDataIsExported=Advarsel, denne listen inneholder kun re
 VueByAccountAccounting=Vis etter regnskapskonto
 VueBySubAccountAccounting=Vis etter regnskaps-subkonto
 
-MainAccountForCustomersNotDefined=Hoved regnskapskonto for kunder som ikke er definert i oppsettet
-MainAccountForSuppliersNotDefined=Hovedregnskapskonto for leverandører som ikke er definert i oppsettet
-MainAccountForUsersNotDefined=Hoved regnskapskonto for brukere som ikke er definert i oppsettet
-MainAccountForVatPaymentNotDefined=Hoved regnskapskonto for MVA-betaling ikke definert i oppsettet
-MainAccountForSubscriptionPaymentNotDefined=Hovedregnskapskonto for abonnementsbetaling ikke definert i oppsettet
+MainAccountForCustomersNotDefined=Hovedkonto (fra Kontoplan) for kunder som ikke er definert i oppsett
+MainAccountForSuppliersNotDefined=Hovedkonto (fra kontoplanen) for leverandører som ikke er definert i oppsett
+MainAccountForUsersNotDefined=Hovedkonto (fra kontoplanen) for brukere som ikke er definert i oppsett
+MainAccountForRevenueStampSaleNotDefined=Account (from the Chart of Account) for the revenue stamp (sales) not defined in setup
+MainAccountForRevenueStampPurchaseNotDefined=Account (from the Chart of Account) for the revenue stamp (purchases) not defined in setup
+MainAccountForVatPaymentNotDefined=Account (from the Chart of Account) for VAT payment not defined in setup
+MainAccountForSubscriptionPaymentNotDefined=Account (from the Chart of Account) for membership payment not defined in setup
+MainAccountForRetainedWarrantyNotDefined=Account (from the Chart of Account) for the retained warranty not defined in setup
 UserAccountNotDefined=Regnskapskonto for bruker ikke definert i oppsett
 
 AccountancyArea=Regnskapsområde
diff --git a/htdocs/langs/nb_NO/admin.lang b/htdocs/langs/nb_NO/admin.lang
index 8b4c17db655..f5fce3ede8d 100644
--- a/htdocs/langs/nb_NO/admin.lang
+++ b/htdocs/langs/nb_NO/admin.lang
@@ -1509,7 +1509,8 @@ WatermarkOnDraftContractCards=Vannmerke på kontraktkladder (ingen hvis tom)
 MembersSetup=Oppsett av medlemsmodul
 MemberMainOptions=Hovedinnstillinger
 MemberCodeChecker=Alternativer for automatisk generering av medlemskoder
-AdherentLoginRequired= Opprett innlogging for hvert medlem
+AdherentLoginRequired=Administrer en pålogging/passord for hvert medlem
+AdherentLoginRequiredDesc=Legg til en verdi for en pålogging og et passord i medlemsfilen. Hvis medlemmet er knyttet til en bruker, vil oppdatering av medlemsinnlogging og passord også oppdatere brukerinnlogging og passord.
 AdherentMailRequired=E-post kreves for å lage et nytt medlem
 MemberSendInformationByMailByDefault=Valg for å sende e-postbekreftelse til medlemmer (validering eller nytt abonnement) er krysset av som standard
 MemberCreateAnExternalUserForSubscriptionValidated=Opprett en ekstern brukerpålogging for hvert nytt medlemsabonnement som valideres
@@ -2076,6 +2077,10 @@ MAIN_DOCUMENTS_LOGO_HEIGHT=Høyde for logo på PDF
 DOC_SHOW_FIRST_SALES_REP=Vis første salgsrepresentant
 MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Legg til kolonne for bilde på tilbudslinjer
 MAIN_DOCUMENTS_WITH_PICTURE_WIDTH=Kolonnenbredde hvis et bilde legges til på linjer
+MAIN_GENERATE_DOCUMENTS_SUPPLIER_PROPOSAL_WITHOUT_UNIT_PRICE=Skjul enhetspriskolonnen på tilbudsforespørsler
+MAIN_GENERATE_DOCUMENTS_SUPPLIER_PROPOSAL_WITHOUT_TOTAL_COLUMN=Skjul totalpriskolonnen på tilbudsforespørsler
+MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_UNIT_PRICE=Skjul enhetspriskolonnen på innkjøpsordrer
+MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_TOTAL_COLUMN=Skjul totalpriskolonnen på kjøpsordrer
 MAIN_PDF_NO_SENDER_FRAME=Skjul kanter på rammen rundt avsenderadresse
 MAIN_PDF_NO_RECIPENT_FRAME=Skjul kanter på rammen til mottakeradresse
 MAIN_PDF_HIDE_CUSTOMER_CODE=Skjul kundekode
@@ -2400,4 +2405,4 @@ OptionXShouldBeEnabledInModuleY=Alternativet " <b>%s</b> " bør være aktivert i
 OptionXIsCorrectlyEnabledInModuleY=Alternativet " <b>%s</b> " er aktivert i modulen <b>%s</b>
 AtBottomOfPage=Nederst på siden
 FailedAuth=mislykkede autentiseringer
-MaxNumberOfFailedAuth=Maks antall mislykkede autentiseringer i løpet av 24 timer for å deaktivere pålogging.
+MaxNumberOfFailedAuth=Maks antall mislykkede autentiseringer i løpet av 24 timer for å nekte pålogging.
diff --git a/htdocs/langs/nb_NO/errors.lang b/htdocs/langs/nb_NO/errors.lang
index b2acbb2d30a..8655061441d 100644
--- a/htdocs/langs/nb_NO/errors.lang
+++ b/htdocs/langs/nb_NO/errors.lang
@@ -320,6 +320,8 @@ ErrorSVGFilesNotAllowedAsLinksWithout=SVG-filer er ikke tillatt som eksterne len
 ErrorTypeMenu=Umulig å legge til en annen meny for samme modul på navigasjonslinjen, ikke håndtert ennå
 ErrorTableExist=Tabell <b> %s </b> finnes allerede
 ErrorDictionaryNotFound=Ordbok <b> %s </b> ikke funnet
+ErrorFailedToCreateSymLinkToMedias=Kunne ikke opprette symbolkoblingene %s for å peke til %s
+
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=PHP-parameteren upload_max_filesize (%s) er høyere enn PHP-parameteren post_max_size (%s). Dette er ikke et konsistent oppsett.
 WarningPasswordSetWithNoAccount=Et passord ble satt for dette medlemmet, men ingen brukerkonto ble opprettet. Det fører til at passordet ikke kan benyttes for å logge inn på Dolibarr. Det kan brukes av en ekstern modul/grensesnitt, men hvis du ikke trenger å definere noen innlogging eller passord for et medlem, kan du deaktivere alternativet "opprett en pålogging for hvert medlem" fra medlemsmodul-oppsettet. Hvis du trenger å administrere en pålogging, men ikke trenger noe passord, kan du holde dette feltet tomt for å unngå denne advarselen. Merk: E-post kan også brukes som en pålogging dersom medlemmet er knyttet til en bruker.
diff --git a/htdocs/langs/nb_NO/main.lang b/htdocs/langs/nb_NO/main.lang
index c8cc469d590..46f97fb6894 100644
--- a/htdocs/langs/nb_NO/main.lang
+++ b/htdocs/langs/nb_NO/main.lang
@@ -1237,3 +1237,5 @@ SearchSyntaxTooltipForStringOrNum=For å søke i tekstfelt kan du bruke tegnene
 InProgress=Pågår
 DateOfPrinting=Dato for utskrift
 ClickFullScreenEscapeToLeave=Klikk her for å bytte til fullskjermmodus. Trykk ESCAPE for å gå ut av fullskjermmodus.
+UserNotYetValid=Ikke gyldig ennå
+UserExpired=Utløpt
diff --git a/htdocs/langs/nb_NO/modulebuilder.lang b/htdocs/langs/nb_NO/modulebuilder.lang
index 263d775abfb..352383801b7 100644
--- a/htdocs/langs/nb_NO/modulebuilder.lang
+++ b/htdocs/langs/nb_NO/modulebuilder.lang
@@ -163,11 +163,11 @@ ListOfTabsEntries=Liste over faneoppføringer
 TabsDefDesc=Definer fanene som leveres av modulen din her 
 TabsDefDescTooltip=Fanene som tilbys av din modul/applikasjon er definert i arrayet <strong> $this->tabs </strong> i modulbeskrivelsesfilen. Du kan redigere denne filen manuelt eller bruke den innebygde editoren.
 BadValueForType=Feil verdi for type %s
-DefinePropertiesFromExistingTable=Definer egenskaper fra en eksisterende tabell
+DefinePropertiesFromExistingTable=Define the fields/properties from an existing table
 DefinePropertiesFromExistingTableDesc=Hvis en tabell i databasen (for objektet som skal opprettes) allerede eksisterer, kan du bruke den til å definere egenskapene til objektet.
 DefinePropertiesFromExistingTableDesc2=Hold tom hvis tabellen ikke eksisterer ennå. Kodegeneratoren vil bruke forskjellige typer felt for å bygge et eksempel på en tabell som du kan redigere senere.
-GeneratePermissions=Jeg vil legge til rettighetene for dette objektet
-GeneratePermissionsHelp=generer standardrettigheter for dette objektet
+GeneratePermissions=I want to manage permissions on this object
+GeneratePermissionsHelp=If you check this, some code will be added to manage permissions to read, write and delete record of the objects
 PermissionDeletedSuccesfuly=Tillatelsen er fjernet
 PermissionUpdatedSuccesfuly=Tillatelsen er oppdatert
 PermissionAddedSuccesfuly=Tillatelsen er lagt til
@@ -180,3 +180,4 @@ CRUDCreateWrite=Opprett eller oppdater
 FailedToAddCodeIntoDescriptor=Kunne ikke legge til kode i beskrivelsen. Sjekk at strengkommentaren "%s" fortsatt er til stede i filen.
 DictionariesCreated=Ordbok <b> %s </b> opprettet 
 DictionaryDeleted=Ordbok <b> %s </b> ble fjernet
+PropertyModuleUpdated=Property <b>%s</b> has been update successfully
diff --git a/htdocs/langs/nb_NO/supplier_proposal.lang b/htdocs/langs/nb_NO/supplier_proposal.lang
index 8c488ce1e52..d5af0602aa0 100644
--- a/htdocs/langs/nb_NO/supplier_proposal.lang
+++ b/htdocs/langs/nb_NO/supplier_proposal.lang
@@ -13,6 +13,7 @@ SupplierProposalArea=Leverandørtilbud-område
 SupplierProposalShort=Leverandørtilbud
 SupplierProposals=Leverandørtilbud
 SupplierProposalsShort=Leverandørtilbud
+AskPrice=Prisforespørsel
 NewAskPrice=Ny prisforspørsel
 ShowSupplierProposal=Vis prisforespørsel
 AddSupplierProposal=Opprett en prisforespørsel
@@ -32,7 +33,7 @@ SupplierProposalStatusValidatedShort=Validert
 SupplierProposalStatusClosedShort=Lukket
 SupplierProposalStatusSignedShort=Akseptert
 SupplierProposalStatusNotSignedShort=Avvist
-CopyAskFrom=Opprett ny prisforespørsel ved å kopiere en eksisterende
+CopyAskFrom=Opprett en prisforespørsel ved å kopiere en eksisterende forespørsel
 CreateEmptyAsk=Opprett blank forespørsel
 ConfirmCloneAsk=Er du sikker på at du vil klone prisforespørsel <b>%s</b>?
 ConfirmReOpenAsk=Er du sikker på at du vil gjenåpne prisforespørsel <b>%s</b>?
@@ -41,7 +42,8 @@ SendAskRef=Sender prisforespørsel %s
 SupplierProposalCard=Forespørsel-kort
 ConfirmDeleteAsk=Er du sikker på at du vil slette prisforespørsel <b>%s</b>?
 ActionsOnSupplierProposal=Hendelser om prisforespørsel
-DocModelAuroreDescription=En komplett modell for prisforespørsel (logo mm)
+DocModelAuroreDescription=A complete template for a vendor quotation request template (old implementation of Sponge template)
+DocModelZenithDescription=A complete template for a vendor quotation request template
 CommercialAsk=Prisforespørsel
 DefaultModelSupplierProposalCreate=Standardmodell for opprettelse
 DefaultModelSupplierProposalToBill=Standardmal når prisforespørsel lukkes (akkseptert)
@@ -52,3 +54,6 @@ SupplierProposalsToClose=Leverandørtilbud å lukke
 SupplierProposalsToProcess=Leverandørtilbud til behandling
 LastSupplierProposals=Siste %s prisforespørsler
 AllPriceRequests=Alle forespørsler
+TypeContact_supplier_proposal_external_SHIPPING=Leverandørkontakt for levering
+TypeContact_supplier_proposal_external_BILLING=Leverandørkontakt for fakturering
+TypeContact_supplier_proposal_external_SERVICE=Representant for oppfølging av tilbud
diff --git a/htdocs/langs/nl_BE/admin.lang b/htdocs/langs/nl_BE/admin.lang
index 59e7e526720..8bc8ad3b9cd 100644
--- a/htdocs/langs/nl_BE/admin.lang
+++ b/htdocs/langs/nl_BE/admin.lang
@@ -152,10 +152,6 @@ InfDirAlt=Sinds versie 3 is het mogelijk om een alternatieve rootmap te definië
 InfDirExample=<br> <strong>Verklaar</strong> het dan in het bestand <strong>conf.php</strong> <br> $ Dolibarr_main_url_root_alt='/custom' <br> $ Dolibarr_main_document_root_alt='/pad/of/Dolibarr/htdocs/custom' <br> Als deze regels worden becommentarieerd met "#", schakelt u ze gewoon uit door het teken "#" te verwijderen.
 LastStableVersion=Nieuwste stabiele versie
 LastActivationIP=Laatste activerings-IP
-GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany, with date 2023-01-31:</u><br>
-GenericMaskCodes4b=<u>Example on third party created on 2023-01-31:</u><br>
-GenericMaskCodes4c=<u>Example on product created on 2023-01-31:</u><br>
-GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> will give <b>ABC2301-000099</b><br><b>{0000+100@1}-ZZZ/{dd}/XXX</b> will give <b>0199-ZZZ/31/XXX</b><br><b>IN{yy}{mm}-{0000}-{t}</b> will give <b>IN2301-0099-A</b> if the type of company is 'Responsable Inscripto' with code for type that is 'A_RI'
 UMask=Umask parameter voor nieuwe bestanden op een Unix- / Linux- / BSD-bestandssysteem.
 SeeWikiForAllTeam=Kijk op de Wiki-pagina voor een lijst met bijdragers en hun organisatie
 UseACacheDelay=Ingestelde vertraging voor de cacheexport in secondes (0 of leeg voor geen cache)
@@ -242,9 +238,6 @@ YouMustEnableOneModule=Je moet minstens 1 module aktiveren
 BillsPDFModules=Factuur documentsjablonen
 LDAPGlobalParameters=Globale instellingen
 LDAPPassword=Beheerderswachtwoord
-LDAPFieldGroupidExample=Example : gidnumber
-LDAPFieldUseridExample=Example : uidnumber
-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).
 SalariesSetup=Setup van module salarissen
 MailToSendProposal=Klant voorstellen
 MailToSendInvoice=Klantfacturen
@@ -252,13 +245,5 @@ MailToSendReception=Ontvangen
 MailToExpenseReport=Uitgaven rapporten
 MailToThirdparty=Klant
 AddBoxes=Widgets toevoegen
-oauthToken=OAuth2 token
 GeneralOptions=Algemene opties
 ExportSetup=Installatie van module Exporteren
-INVOICE_ADD_SWISS_QR_CODEMore=Switzerland's standard for invoices; make sure ZIP & City are filled and that the accounts have valid Swiss/Liechtenstein IBANs.
-CssOnEdit=CSS on edit pages
-CssOnView=CSS on view pages
-CssOnList=CSS on lists
-HelpCssOnEditDesc=The CSS used when editing the field.<br>Example: "minwiwdth100 maxwidth500 widthcentpercentminusx"
-HelpCssOnViewDesc=The CSS used when viewing the field.
-HelpCssOnListDesc=The CSS used when field is inside a list table.<br>Example: "tdoverflowmax200"
diff --git a/htdocs/langs/nl_NL/accountancy.lang b/htdocs/langs/nl_NL/accountancy.lang
index f9cbd80ce7b..94b834781ec 100644
--- a/htdocs/langs/nl_NL/accountancy.lang
+++ b/htdocs/langs/nl_NL/accountancy.lang
@@ -57,11 +57,14 @@ WarningDataDisappearsWhenDataIsExported=Let op, deze lijst bevat alleen de boeki
 VueByAccountAccounting=Overzicht per grootboekrekening
 VueBySubAccountAccounting=Overzicht op volgorde subrekening
 
-MainAccountForCustomersNotDefined=De standaard grootboekrekening voor klanten is niet vastgelegd bij de instellingen
-MainAccountForSuppliersNotDefined=Hoofdrekening voor leveranciers die niet zijn gedefinieerd in de configuratie
-MainAccountForUsersNotDefined=De standaard grootboekrekening voor gebruikers is niet vastgelegd bij de instellingen
-MainAccountForVatPaymentNotDefined=Standaard grootboekrekening voor betaalde BTW is niet vastgelegd bij instellingen
-MainAccountForSubscriptionPaymentNotDefined=Hoofdrekening voor abonnementsbetaling is niet gedefinieerd in de configuratie
+MainAccountForCustomersNotDefined=Main account (from the Chart of Account) for customers not defined in setup
+MainAccountForSuppliersNotDefined=Main account (from the Chart of Account) for vendors not defined in setup
+MainAccountForUsersNotDefined=Main account (from the Chart of Account) for users not defined in setup
+MainAccountForRevenueStampSaleNotDefined=Account (from the Chart of Account) for the revenue stamp (sales) not defined in setup
+MainAccountForRevenueStampPurchaseNotDefined=Account (from the Chart of Account) for the revenue stamp (purchases) not defined in setup
+MainAccountForVatPaymentNotDefined=Account (from the Chart of Account) for VAT payment not defined in setup
+MainAccountForSubscriptionPaymentNotDefined=Account (from the Chart of Account) for membership payment not defined in setup
+MainAccountForRetainedWarrantyNotDefined=Account (from the Chart of Account) for the retained warranty not defined in setup
 UserAccountNotDefined=Grootboekrekening voor gebruiker niet gedefinieerd in setup
 
 AccountancyArea=Boekhouding
diff --git a/htdocs/langs/nl_NL/admin.lang b/htdocs/langs/nl_NL/admin.lang
index eb848387169..1c1be87ea40 100644
--- a/htdocs/langs/nl_NL/admin.lang
+++ b/htdocs/langs/nl_NL/admin.lang
@@ -1509,7 +1509,8 @@ WatermarkOnDraftContractCards=Watermerk op voorlopige contracten (leeg=geen)
 MembersSetup=Ledenmoduleinstellingen
 MemberMainOptions=Hoofdopties
 MemberCodeChecker=Opties voor het automatisch genereren van lidcodes
-AdherentLoginRequired= Beheren van een login voor elk lid
+AdherentLoginRequired=Manage a login/password for each member
+AdherentLoginRequiredDesc=Add a value for a login and a password on the member file. If the member is linked to a user, updating the member login and password will also update the user login and password.
 AdherentMailRequired=E-mail vereist om een nieuw lid te maken
 MemberSendInformationByMailByDefault=Vinkvakje om een bevestigingse-mail te sturen naar leden (validatie van nieuwe abonnementen). Staat standaard aan.
 MemberCreateAnExternalUserForSubscriptionValidated=Maak een externe gebruikerslogin aan voor elk gevalideerd nieuw lidmaatschap
@@ -2076,6 +2077,10 @@ MAIN_DOCUMENTS_LOGO_HEIGHT=Hoogte voor logo op PDF
 DOC_SHOW_FIRST_SALES_REP=Toon eerste vertegenwoordiger
 MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Kolom toevoegen voor afbeelding op voorstelregels
 MAIN_DOCUMENTS_WITH_PICTURE_WIDTH=Breedte van de kolom als een afbeelding op lijnen is toegevoegd
+MAIN_GENERATE_DOCUMENTS_SUPPLIER_PROPOSAL_WITHOUT_UNIT_PRICE=Hide the unit price column on quotation requests
+MAIN_GENERATE_DOCUMENTS_SUPPLIER_PROPOSAL_WITHOUT_TOTAL_COLUMN=Hide the total price column on quotation requests
+MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_UNIT_PRICE=Hide the unit price column on purchase orders
+MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_TOTAL_COLUMN=Hide the total price column on puchase orders
 MAIN_PDF_NO_SENDER_FRAME=Verberg randen op frame van afzenderadres
 MAIN_PDF_NO_RECIPENT_FRAME=Verberg randen op receptnt adresframe
 MAIN_PDF_HIDE_CUSTOMER_CODE=Klantcode verbergen
@@ -2399,5 +2404,5 @@ DefaultForTypeDesc=Sjabloon dat standaard wordt gebruikt bij het maken van een n
 OptionXShouldBeEnabledInModuleY=Optie " <b> %s </b> " moet worden ingeschakeld in module <b> %s </b>
 OptionXIsCorrectlyEnabledInModuleY=Optie " <b> %s </b> " is ingeschakeld in module <b> %s </b>
 AtBottomOfPage=Onderaan de pagina
-FailedAuth=failed authentications
-MaxNumberOfFailedAuth=Max number of failed authentication in 24h to disable login.
+FailedAuth=mislukte authenticaties
+MaxNumberOfFailedAuth=Max number of failed authentication in 24h to deny login.
diff --git a/htdocs/langs/nl_NL/banks.lang b/htdocs/langs/nl_NL/banks.lang
index bb29dc09f58..aacdf8ccf8f 100644
--- a/htdocs/langs/nl_NL/banks.lang
+++ b/htdocs/langs/nl_NL/banks.lang
@@ -60,7 +60,7 @@ EditFinancialAccount=Wijzig rekening
 LabelBankCashAccount=Label van bank of kas
 AccountType=Rekeningtype
 BankType0=Spaarrekening
-BankType1=Current, cheque or credit card account
+BankType1=Huidige rekening, cheque of creditcardrekening
 BankType2=Kasrekening
 AccountsArea=Rekeningenoverzicht
 AccountCard=Rekeningdetailkaart
@@ -106,8 +106,8 @@ BankLineNotReconciled=Niet afgestemd
 CustomerInvoicePayment=Afnemersbetaling
 SupplierInvoicePayment=Leveranciersbetaling
 SubscriptionPayment=Betaling van abonnement
-WithdrawalPayment=Direct Debit payment
-BankTransferPayment=Credit Transfer payment
+WithdrawalPayment=Betaling via automatische incasso
+BankTransferPayment=Betaling via overschrijving
 SocialContributionPayment=Sociale/fiscale belastingbetaling
 BankTransfer=Overschrijving
 BankTransfers=Overschrijvingen
diff --git a/htdocs/langs/nl_NL/bills.lang b/htdocs/langs/nl_NL/bills.lang
index 38c8a4f4e78..681ac17e885 100644
--- a/htdocs/langs/nl_NL/bills.lang
+++ b/htdocs/langs/nl_NL/bills.lang
@@ -164,7 +164,7 @@ BillFrom=Van
 BillTo=Voor
 ShippingTo=verschepen naar
 ActionsOnBill=Acties op factuur
-ActionsOnBillRec=Actions on recurring invoice
+ActionsOnBillRec=Acties op terugkerende factuur
 RecurringInvoiceTemplate=Template / Herhaal factuur
 NoQualifiedRecurringInvoiceTemplateFound=Geen geschikte sjablonen gevonden voor terugkerende facturen
 FoundXQualifiedRecurringInvoiceTemplate=Gevonden: %s geschikte templates voor herhaal facturen
@@ -197,7 +197,7 @@ ConfirmClassifyPaidPartiallyReasonDiscount=Resterende onbetaalde <b>bedragen (%s
 ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Aan restant te betalen <b>(%s %s)</b> wordt een korting toegekend, omdat de betaling werd verricht vóór de termijn. Ik accepteer de BTW te verliezen op deze korting.
 ConfirmClassifyPaidPartiallyReasonDiscountVat=Aan restant te betalen <b>(%s %s)</b> wordt een korting toegekend, omdat de betaling werd verricht vóór de termijn. Ik vorder de BTW terug van deze korting, zonder een credit nota.
 ConfirmClassifyPaidPartiallyReasonBadCustomer=Slechte afnemer
-ConfirmClassifyPaidPartiallyReasonBadSupplier=Bad vendor
+ConfirmClassifyPaidPartiallyReasonBadSupplier=Slechte verkoper
 ConfirmClassifyPaidPartiallyReasonBankCharge=Inhouding per bank (intermediaire bankkosten)
 ConfirmClassifyPaidPartiallyReasonWithholdingTax=Loonheffing
 ConfirmClassifyPaidPartiallyReasonProductReturned=Producten gedeeltelijk teruggegeven
@@ -210,7 +210,7 @@ ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=Deze keuze wordt gebruikt
 ConfirmClassifyPaidPartiallyReasonBankChargeDesc=Het onbetaalde bedrag is <b>intermediaire bankkosten</b>, direct in mindering gebracht op het <b>correcte bedrag</b> betaald door de Klant.
 ConfirmClassifyPaidPartiallyReasonWithholdingTaxDesc=Het onbetaalde bedrag zal nooit worden betaald aangezien het een loonheffing is
 ConfirmClassifyPaidPartiallyReasonOtherDesc=Gebruik deze keuze als alle andere niet geschikt zijn, bijvoorbeeld in de volgende situatie: <br> - betaling niet voltooid omdat sommige producten zijn teruggestuurd <br> - geclaimd bedrag te belangrijk omdat een korting is vergeten <br> In alle gevallen moet het te veel gevorderde bedrag in het boekhoudsysteem worden gecorrigeerd door een creditnota te maken.
-ConfirmClassifyPaidPartiallyReasonBadSupplierDesc=A <b>bad supplier</b> is a supplier we refuse to pay.
+ConfirmClassifyPaidPartiallyReasonBadSupplierDesc=Een <b> slechte leverancier </b> is een leverancier die we weigeren te betalen.
 ConfirmClassifyAbandonReasonOther=Andere
 ConfirmClassifyAbandonReasonOtherDesc=Deze keuze zal in alle andere gevallen worden gebruikt. Bijvoorbeeld omdat u van plan bent om de factuur te vervangen.
 ConfirmCustomerPayment=Bevestigt u deze betaling voor <b> %s </b> %s ?
diff --git a/htdocs/langs/nl_NL/dict.lang b/htdocs/langs/nl_NL/dict.lang
index 40ab210faa9..748b0e0eef7 100644
--- a/htdocs/langs/nl_NL/dict.lang
+++ b/htdocs/langs/nl_NL/dict.lang
@@ -137,7 +137,7 @@ CountryLV=Letland
 CountryLB=Libanon
 CountryLS=Lesotho
 CountryLR=Liberia
-CountryLY=Libya
+CountryLY=Libië
 CountryLI=Liechtenstein
 CountryLT=Litouwen
 CountryLU=Luxemburg
diff --git a/htdocs/langs/nl_NL/ecm.lang b/htdocs/langs/nl_NL/ecm.lang
index 9d1f91ffc92..b3121c8ba35 100644
--- a/htdocs/langs/nl_NL/ecm.lang
+++ b/htdocs/langs/nl_NL/ecm.lang
@@ -48,7 +48,7 @@ GenerateImgWebp=Dupliceer alle afbeeldingen met een andere versie met .webp-inde
 ConfirmGenerateImgWebp=Als u bevestigt, genereert u een afbeelding in .webp-indeling voor alle afbeeldingen die zich momenteel in deze map bevinden (submappen zijn niet inbegrepen)...
 ConfirmImgWebpCreation=Bevestig alle afbeeldingen duplicatie
 GenerateChosenImgWebp=Dupliceer de gekozen afbeelding met een andere versie met .webp-indeling
-ConfirmGenerateChosenImgWebp=If you confirm, you will generate an image in .webp format for the image %s
+ConfirmGenerateChosenImgWebp=Als u bevestigt, genereert u een afbeelding in .webp-indeling voor de afbeelding %s
 ConfirmChosenImgWebpCreation=Bevestig de duplicatie van gekozen afbeeldingen
 SucessConvertImgWebp=Afbeeldingen succesvol gedupliceerd
 SucessConvertChosenImgWebp=Gekozen afbeelding succesvol gedupliceerd
diff --git a/htdocs/langs/nl_NL/errors.lang b/htdocs/langs/nl_NL/errors.lang
index a85ddf77d1b..79b2f77dbaa 100644
--- a/htdocs/langs/nl_NL/errors.lang
+++ b/htdocs/langs/nl_NL/errors.lang
@@ -191,7 +191,7 @@ ErrorGlobalVariableUpdater4=SOAP-client is mislukt met fout '%s'
 ErrorGlobalVariableUpdater5=Geen globale variabele geselecteerd
 ErrorFieldMustBeANumeric=Veld <b>%s</b> moet een numerieke waarde zijn
 ErrorMandatoryParametersNotProvided=Verplichte parameter (s) niet opgegeven
-ErrorOppStatusRequiredIfUsage=You set you want to use this project to follow an opportunity, so you must also fill the initial Status of opportunity.
+ErrorOppStatusRequiredIfUsage=U geeft aan dat u dit project wilt gebruiken om een verkoopkans te volgen, dus u moet ook de initiële Status van verkoopkans invullen.
 ErrorOppStatusRequiredIfAmount=U hebt een geschat bedrag voor deze lead ingesteld. Je moet dus ook de status invoeren.
 ErrorFailedToLoadModuleDescriptorForXXX=Kan modulebeschrijvingsklasse voor %s niet laden
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Onjuiste definitie van menureeks in modulebeschrijving (slechte waarde voor sleutel fk_menu)
@@ -318,8 +318,10 @@ ErrorTheUrlOfYourDolInstanceDoesNotMatchURLIntoOAuthSetup=Fout: de URL van uw hu
 ErrorMenuExistValue=Er bestaat al een menu met deze titel of URL
 ErrorSVGFilesNotAllowedAsLinksWithout=SVG-bestanden zijn niet toegestaan als externe links zonder de optie %s
 ErrorTypeMenu=Het is niet mogelijk om nog een menu toe te voegen voor dezelfde module op de navigatiebalk, nog niet verwerkt
-ErrorTableExist=Table <b>%s</b> already exist
-ErrorDictionaryNotFound=Dictionary <b>%s</b> not found
+ErrorTableExist=Tabel <b> %s </b> bestaat al
+ErrorDictionaryNotFound=Woordenboek <b> %s </b> niet gevonden
+ErrorFailedToCreateSymLinkToMedias=Failed to create the symlinks %s to point to %s
+
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Uw PHP-parameter upload_max_filesize (%s) is hoger dan PHP-parameter post_max_size (%s). Dit is geen consistente opstelling.
 WarningPasswordSetWithNoAccount=Er is een wachtwoord ingesteld voor dit lid. Er is echter geen gebruikersaccount gemaakt. Dus dit wachtwoord is opgeslagen maar kan niet worden gebruikt om in te loggen bij Dolibarr. Het kan worden gebruikt door een externe module / interface, maar als u geen gebruikersnaam of wachtwoord voor een lid hoeft aan te maken, kunt u de optie "Beheer een login voor elk lid" in de module-setup van Member uitschakelen. Als u een login moet beheren maar geen wachtwoord nodig heeft, kunt u dit veld leeg houden om deze waarschuwing te voorkomen. Opmerking: e-mail kan ook worden gebruikt als login als het lid aan een gebruiker is gekoppeld.
@@ -360,7 +362,7 @@ WarningAutoValNotPossibleWhenStockIsDecreasedOnInvoiceVal=Automatische validatie
 WarningModuleNeedRefrech = Module <b> %s </b> is uitgeschakeld. Vergeet het niet in te schakelen
 WarningPermissionAlreadyExist=Bestaande machtigingen voor dit object
 WarningGoOnAccountancySetupToAddAccounts=Als deze lijst leeg is, ga dan naar menu %s - %s - %s om rekeningen voor uw rekeningschema te laden of te maken.
-WarningCorrectedInvoiceNotFound=Corrected invoice not found
+WarningCorrectedInvoiceNotFound=Gecorrigeerde factuur niet gevonden
 
 SwissQrOnlyVIR = SwissQR-factuur kan alleen worden toegevoegd aan facturen die zijn ingesteld om te worden betaald met overboekingen.
 SwissQrCreditorAddressInvalid = Crediteur adres is ongeldig (zijn postcode en plaats ingesteld? (%s)
@@ -389,4 +391,4 @@ BadSetupOfField = Fout slechte instelling van veld
 BadSetupOfFieldClassNotFoundForValidation = Fout slechte instelling van veld : Klasse niet gevonden voor validatie
 BadSetupOfFieldFileNotFound = Fout slechte instelling van veld : Bestand niet gevonden voor opname
 BadSetupOfFieldFetchNotCallable = Fout slechte instelling van veld: Ophalen niet aanroepbaar op klasse
-ErrorTooManyAttempts= Too many attempts, please try again later
+ErrorTooManyAttempts= Te veel pogingen. Probeer het later opnieuw
diff --git a/htdocs/langs/nl_NL/languages.lang b/htdocs/langs/nl_NL/languages.lang
index 4e36d0532c9..e552d5a91a3 100644
--- a/htdocs/langs/nl_NL/languages.lang
+++ b/htdocs/langs/nl_NL/languages.lang
@@ -123,6 +123,6 @@ Language_ur_PK=Urdu
 Language_uz_UZ=Oezbeeks
 Language_vi_VN=Vietnamees
 Language_zh_CN=Chinees
-Language_zh_TW=Chinese (Taiwan)
+Language_zh_TW=Chinees (Taiwan)
 Language_zh_HK=Chinees (Hong Kong)
 Language_bh_MY=Maleis-
diff --git a/htdocs/langs/nl_NL/ldap.lang b/htdocs/langs/nl_NL/ldap.lang
index 6f5e99c3a6b..c07a92c7426 100644
--- a/htdocs/langs/nl_NL/ldap.lang
+++ b/htdocs/langs/nl_NL/ldap.lang
@@ -25,3 +25,9 @@ ContactSynchronized=Contact gesynchroniseerd
 ForceSynchronize=Forceer synchronisatie Dolibarr -> LDAP
 ErrorFailedToReadLDAP=Kon niet lezen uit de LDAP-database. Controleer de instellingen van de LDAP module en database toegankelijkheid.
 PasswordOfUserInLDAP=Wachtwoord van gebruiker in LDAP
+LDAPPasswordHashType=Hash-type wachtwoord
+LDAPPasswordHashTypeExample=Type wachtwoord-hash gebruikt op de server
+SupportedForLDAPExportScriptOnly=Alleen ondersteund door een ldap-exportscript
+SupportedForLDAPImportScriptOnly=Alleen ondersteund door een ldap-importscript
+LDAPUserAccountControl = userAccountControl bij creatie (active directory)
+LDAPUserAccountControlExample = 512 normaal account / 546 normaal account + geen wachtwoord + uitgeschakeld (zie: https://fr.wikipedia.org/wiki/Active_Directory)
diff --git a/htdocs/langs/nl_NL/main.lang b/htdocs/langs/nl_NL/main.lang
index b895af88b12..cd362326eaf 100644
--- a/htdocs/langs/nl_NL/main.lang
+++ b/htdocs/langs/nl_NL/main.lang
@@ -235,8 +235,8 @@ PersonalValue=Persoonlijke waarde
 NewObject=Nieuw %s
 NewValue=Nieuwe waarde
 OldValue=Oude waarde %s
-FieldXModified=Field %s modified
-FieldXModifiedFromYToZ=Field %s modified from %s to %s
+FieldXModified=Veld %s aangepast
+FieldXModifiedFromYToZ=Veld %s gewijzigd van %s in %s
 CurrentValue=Huidige waarde
 Code=Code
 Type=Type
@@ -558,7 +558,7 @@ Unknown=Onbekend
 General=Algemeen
 Size=Grootte
 OriginalSize=Originele grootte
-RotateImage=Rotate 90°
+RotateImage=Draai 90°
 Received=Ontvangen
 Paid=Betaald
 Topic=Onderwerp
@@ -1236,4 +1236,6 @@ UploadFileDragDropSuccess=De bestanden zijn succesvol geüpload
 SearchSyntaxTooltipForStringOrNum=Voor het zoeken in tekstvelden kunt u de tekens ^ of $ gebruiken om een zoekopdracht 'beginnen of eindigen met' te maken of de ! om een 'bevat niet'-test te maken. U kunt de | tussen twee strings in plaats van een spatie voor een 'OR'-voorwaarde in plaats van 'AND'. Voor numerieke waarden kunt u de operator <, > gebruiken , <=, > = of != voor de waarde, om te filteren met behulp van een wiskundige vergelijking
 InProgress=In behandeling
 DateOfPrinting=Datum van afdrukken
-ClickFullScreenEscapeToLeave=Click here to switch in Full screen mode. Press ESCAPE to leave Full screen mode.
+ClickFullScreenEscapeToLeave=Klik hier om over te schakelen naar de modus Volledig scherm. Druk op ESCAPE om de modus Volledig scherm te verlaten.
+UserNotYetValid=Not yet valid
+UserExpired=Verlopen
diff --git a/htdocs/langs/nl_NL/modulebuilder.lang b/htdocs/langs/nl_NL/modulebuilder.lang
index ac7c4b8679a..b0aa7f7be0d 100644
--- a/htdocs/langs/nl_NL/modulebuilder.lang
+++ b/htdocs/langs/nl_NL/modulebuilder.lang
@@ -28,6 +28,7 @@ ModuleBuilderDescwidgets=Dit tabblad is bedoeld voor het beheren/bouwen van widg
 ModuleBuilderDescbuildpackage=U kunt hier een &quot;klaar om te distribueren&quot; pakketbestand (een genormaliseerd .zip-bestand) van uw module en een &quot;klaar om te distribueren&quot; documentatiebestand genereren. Klik op de knop om het pakket of documentatiebestand te maken.
 EnterNameOfModuleToDeleteDesc=U kunt uw module verwijderen. WAARSCHUWING: Alle coderingsbestanden van de module (handmatig gegenereerd of gemaakt) EN gestructureerde gegevens en documentatie worden verwijderd!
 EnterNameOfObjectToDeleteDesc=U kunt een object verwijderen. WAARSCHUWING: Alle coderingsbestanden (handmatig gegenereerd of gemaakt) met betrekking tot het object worden verwijderd!
+EnterNameOfObjectToDeleteDesc=U kunt een object verwijderen. WAARSCHUWING: Alle coderingsbestanden (handmatig gegenereerd of gemaakt) met betrekking tot het object worden verwijderd!
 DangerZone=Gevarenzone
 BuildPackage=Bouw pakket
 BuildPackageDesc=U kunt een zip-pakket van uw applicatie genereren, zodat u klaar bent om het op elke Dolibarr te distribueren. U kunt het ook distribueren of verkopen op een marktplaats zoals <a href="https://www.dolistore.com">DoliStore.com</a> .
@@ -162,11 +163,11 @@ ListOfTabsEntries=Lijst met tabbladitems
 TabsDefDesc=Definieer hier de tabbladen van uw module
 TabsDefDescTooltip=De tabbladen die door uw module/toepassing worden geleverd, zijn gedefinieerd in de array <strong> $this->tabs </strong> in het moduledescriptorbestand. U kunt dit bestand handmatig bewerken of de ingesloten editor gebruiken.
 BadValueForType=Onjuiste waarde voor type %s
-DefinePropertiesFromExistingTable=Definieer eigenschappen van een bestaande tabel
+DefinePropertiesFromExistingTable=Define the fields/properties from an existing table
 DefinePropertiesFromExistingTableDesc=Als er al een tabel in de database (voor het aan te maken object) bestaat, kunt u deze gebruiken om de eigenschappen van het object te definiëren.
 DefinePropertiesFromExistingTableDesc2=Laat leeg als de tabel nog niet bestaat. De codegenerator gebruikt verschillende soorten velden om een voorbeeld van een tabel samen te stellen die u later kunt bewerken.
-GeneratePermissions=Ik wil de rechten voor dit object toevoegen
-GeneratePermissionsHelp=standaardrechten voor dit object genereren
+GeneratePermissions=I want to manage permissions on this object
+GeneratePermissionsHelp=If you check this, some code will be added to manage permissions to read, write and delete record of the objects
 PermissionDeletedSuccesfuly=Toestemming is succesvol verwijderd
 PermissionUpdatedSuccesfuly=Toestemming is succesvol geüpdatet
 PermissionAddedSuccesfuly=Toestemming is succesvol toegevoegd
@@ -177,3 +178,6 @@ ApiObjectDeleted=API voor object %s is succesvol verwijderd
 CRUDRead=Gelezen
 CRUDCreateWrite=Maken of bijwerken
 FailedToAddCodeIntoDescriptor=Kan code niet toevoegen aan descriptor. Controleer of de tekenreekscommentaar "%s" nog aanwezig is in het bestand.
+DictionariesCreated=Woordenboek <b> %s </b> succesvol aangemaakt
+DictionaryDeleted=Woordenboek <b> %s </b> succesvol verwijderd
+PropertyModuleUpdated=Property <b>%s</b> has been update successfully
diff --git a/htdocs/langs/nl_NL/stocks.lang b/htdocs/langs/nl_NL/stocks.lang
index 0360e8b2178..1307cd1213c 100644
--- a/htdocs/langs/nl_NL/stocks.lang
+++ b/htdocs/langs/nl_NL/stocks.lang
@@ -239,7 +239,7 @@ InventoryForASpecificWarehouse=Voorraad voor een specifiek magazijn
 InventoryForASpecificProduct=Voorraad voor een specifiek product
 StockIsRequiredToChooseWhichLotToUse=Een bestaande voorraad is vereist om te kunnen kiezen welke partij u wilt gebruiken
 ForceTo=Toevoegen aan
-AlwaysShowFullArbo=Display the full path of a warehouse (parent warehouses) on the popup of warehouse links (Warning: This may decrease dramatically performances)
+AlwaysShowFullArbo=Geef het volledige pad van een magazijn (bovenliggende magazijnen) weer in de pop-up van magazijnkoppelingen (Waarschuwing: dit kan de prestaties drastisch verminderen)
 StockAtDatePastDesc=U kunt hier de echte voorraad op een bepaalde datum in het verleden bekijken
 StockAtDateFutureDesc=U kunt hier de voorraad (virtuele voorraad) op een bepaalde datum in de toekomst bekijken
 CurrentStock=Huidige voorraad
@@ -321,5 +321,5 @@ BatchNotFound=Lot / serienummer niet gevonden voor dit product
 StockMovementWillBeRecorded=Voorraadbewegingen worden geregistreerd
 StockMovementNotYetRecorded=Voorraadbewegingen worden niet beïnvloed door deze stap
 WarningThisWIllAlsoDeleteStock=Let op, dit zal ook alle hoeveelheden in voorraad in het magazijn vernietigen
-DeleteBatch=Delete lot/serial
-ConfirmDeleteBatch=Are you sure you want to delete lot/serial ?
+DeleteBatch=Verwijder partij/serie
+ConfirmDeleteBatch=Weet u zeker dat u lot/serie wilt verwijderen?
diff --git a/htdocs/langs/nl_NL/stripe.lang b/htdocs/langs/nl_NL/stripe.lang
index 146015e0316..b5e34dd8571 100644
--- a/htdocs/langs/nl_NL/stripe.lang
+++ b/htdocs/langs/nl_NL/stripe.lang
@@ -51,6 +51,7 @@ StripeAccount=Stripe-account
 StripeChargeList=Lijst met Stripe kosten
 StripeTransactionList=Lijst met Stripe-transacties
 StripeCustomerId=Stripe klant-ID
+StripePaymentId=Stripe-betalings-ID
 StripePaymentModes=Stripe betaalwijzen
 LocalID=Lokaal ID
 StripeID=Stripe ID
diff --git a/htdocs/langs/nl_NL/supplier_proposal.lang b/htdocs/langs/nl_NL/supplier_proposal.lang
index 6d255fdb3cf..c36865689d0 100644
--- a/htdocs/langs/nl_NL/supplier_proposal.lang
+++ b/htdocs/langs/nl_NL/supplier_proposal.lang
@@ -42,7 +42,8 @@ SendAskRef=Prijsaanvraag verzenden %s
 SupplierProposalCard=Verzoek kaart
 ConfirmDeleteAsk=Weet u zeker dat u deze prijsaanvraag <b>%s</b> wilt verwijderen?
 ActionsOnSupplierProposal=Evenementen op prijsaanvraag
-DocModelAuroreDescription=Een compleet aanvraagmodel (logo ...)
+DocModelAuroreDescription=A complete template for a vendor quotation request template (old implementation of Sponge template)
+DocModelZenithDescription=A complete template for a vendor quotation request template
 CommercialAsk=Prijs aanvraag
 DefaultModelSupplierProposalCreate=Standaard model aanmaken
 DefaultModelSupplierProposalToBill=Standaardsjabloon bij het afsluiten van een prijsaanvraag (geaccepteerd)
diff --git a/htdocs/langs/nl_NL/ticket.lang b/htdocs/langs/nl_NL/ticket.lang
index 3c179a8c636..c9514719bc8 100644
--- a/htdocs/langs/nl_NL/ticket.lang
+++ b/htdocs/langs/nl_NL/ticket.lang
@@ -126,9 +126,9 @@ TicketParams=Parameters
 TicketsShowModuleLogo=Toon het logo van de module in de openbare interface
 TicketsShowModuleLogoHelp=Schakel deze optie in om het logo op de pagina's van de openbare interface te verbergen
 TicketsShowCompanyLogo=Toon het logo van het bedrijf in de openbare interface
-TicketsShowCompanyLogoHelp=Enable this option to show the logo of the main company in the pages of the public interface
-TicketsShowCompanyFooter=Display the footer of the company in the public interface
-TicketsShowCompanyFooterHelp=Enable this option to show the footer of the main company in the pages of the public interface
+TicketsShowCompanyLogoHelp=Schakel deze optie in om het logo van het hoofdbedrijf weer te geven op de pagina's van de openbare interface
+TicketsShowCompanyFooter=Geef de voettekst van het bedrijf weer in de openbare interface
+TicketsShowCompanyFooterHelp=Schakel deze optie in om de voettekst van het hoofdbedrijf weer te geven op de pagina's van de openbare interface
 TicketsEmailAlsoSendToMainAddress=Stuur ook een melding naar het hoofd e-mailadres
 TicketsEmailAlsoSendToMainAddressHelp=Schakel deze optie in om ook een e-mail te sturen naar het adres gedefinieerd in set-up "%s" (zie tabblad "%s")
 TicketsLimitViewAssignedOnly=Beperk de weergave tot tickets die zijn toegewezen aan de huidige gebruiker (niet effectief voor externe gebruikers, altijd beperkt tot de derde partij waarvan ze afhankelijk zijn)
@@ -329,8 +329,8 @@ OldUser=Oude gebruiker
 NewUser=Nieuwe gebruiker
 NumberOfTicketsByMonth=Aantal tickets per maand
 NbOfTickets=Aantal tickets
-ExternalContributors=External contributors
-AddContributor=Add external contributor
+ExternalContributors=Externe bijdragers
+AddContributor=Externe bijdrager toevoegen
 
 # notifications
 TicketCloseEmailSubjectCustomer=Ticket gesloten
diff --git a/htdocs/langs/nl_NL/users.lang b/htdocs/langs/nl_NL/users.lang
index bf374f948d6..01f8297ffe6 100644
--- a/htdocs/langs/nl_NL/users.lang
+++ b/htdocs/langs/nl_NL/users.lang
@@ -99,7 +99,7 @@ YourRole=Uw rollen
 YourQuotaOfUsersIsReached=Uw quotum van actieve gebruikers is bereikt!
 NbOfUsers=aantal gebruikers
 NbOfPermissions=Aantal machtigingen
-DontDowngradeSuperAdmin=Only another admin can downgrade an admin
+DontDowngradeSuperAdmin=Alleen een andere beheerder kan een beheerder downgraden
 HierarchicalResponsible=Opzichter
 HierarchicView=Hiërarchisch schema
 UseTypeFieldToChange=Gebruik het veld Type om te veranderen
diff --git a/htdocs/langs/nl_NL/website.lang b/htdocs/langs/nl_NL/website.lang
index 8e8757eb8d2..caebb340053 100644
--- a/htdocs/langs/nl_NL/website.lang
+++ b/htdocs/langs/nl_NL/website.lang
@@ -158,5 +158,5 @@ Reservation=Reservering
 PagesViewedPreviousMonth=Bekeken pagina's (vorige maand)
 PagesViewedTotal=Pagina's bekeken (totaal)
 Visibility=Zichtbaarheid
-Everyone=Everyone
-AssignedContacts=Assigned contacts
+Everyone=Iedereen
+AssignedContacts=Toegewezen contacten
diff --git a/htdocs/langs/pl_PL/accountancy.lang b/htdocs/langs/pl_PL/accountancy.lang
index 8c96a01b88b..0219d7b51e2 100644
--- a/htdocs/langs/pl_PL/accountancy.lang
+++ b/htdocs/langs/pl_PL/accountancy.lang
@@ -57,11 +57,14 @@ WarningDataDisappearsWhenDataIsExported=Warning, this list contains only the acc
 VueByAccountAccounting=Wyświetl według konta księgowego
 VueBySubAccountAccounting=Wyświetl według subkonta księgowego
 
-MainAccountForCustomersNotDefined=Główne konto księgowe dla klientów nie zdefiniowane w ustawieniach
-MainAccountForSuppliersNotDefined=Główne konto rozliczeniowe dla dostawców niezdefiniowane w konfiguracji
-MainAccountForUsersNotDefined=Główne konto księgowe dla użytkowników nie zdefiniowane w ustawieniach
-MainAccountForVatPaymentNotDefined=Główne konto księgowe dla płatności VAT nie zdefiniowane w ustawieniach
-MainAccountForSubscriptionPaymentNotDefined=Główne konto księgowe dla płatności za subskrypcję nie zostało zdefiniowane w konfiguracji
+MainAccountForCustomersNotDefined=Main account (from the Chart of Account) for customers not defined in setup
+MainAccountForSuppliersNotDefined=Main account (from the Chart of Account) for vendors not defined in setup
+MainAccountForUsersNotDefined=Main account (from the Chart of Account) for users not defined in setup
+MainAccountForRevenueStampSaleNotDefined=Account (from the Chart of Account) for the revenue stamp (sales) not defined in setup
+MainAccountForRevenueStampPurchaseNotDefined=Account (from the Chart of Account) for the revenue stamp (purchases) not defined in setup
+MainAccountForVatPaymentNotDefined=Account (from the Chart of Account) for VAT payment not defined in setup
+MainAccountForSubscriptionPaymentNotDefined=Account (from the Chart of Account) for membership payment not defined in setup
+MainAccountForRetainedWarrantyNotDefined=Account (from the Chart of Account) for the retained warranty not defined in setup
 UserAccountNotDefined=Kontro księgowe dla użytkownika nie zdefiniowane w ustawieniach
 
 AccountancyArea=Strefa księgowości
diff --git a/htdocs/langs/pl_PL/admin.lang b/htdocs/langs/pl_PL/admin.lang
index fd8e1ffc5f7..824cc6dcd60 100644
--- a/htdocs/langs/pl_PL/admin.lang
+++ b/htdocs/langs/pl_PL/admin.lang
@@ -1509,7 +1509,8 @@ WatermarkOnDraftContractCards=Znak wodny w szkicach projektów (brak jeśli pust
 MembersSetup=Członkowie konfiguracji modułu
 MemberMainOptions=Główne opcje
 MemberCodeChecker=Options for automatic generation of member codes
-AdherentLoginRequired= Zarządzanie logowania dla każdego członka
+AdherentLoginRequired=Manage a login/password for each member
+AdherentLoginRequiredDesc=Add a value for a login and a password on the member file. If the member is linked to a user, updating the member login and password will also update the user login and password.
 AdherentMailRequired=Adres e-mail wymagany do utworzenia nowego członka
 MemberSendInformationByMailByDefault=Checkbox wysłać mail z potwierdzeniem do członków jest domyślnie
 MemberCreateAnExternalUserForSubscriptionValidated=Utwórz zewnętrzny login użytkownika dla każdej zweryfikowanej subskrypcji nowego członka
@@ -2076,6 +2077,10 @@ MAIN_DOCUMENTS_LOGO_HEIGHT=Wysokość logo na dokumencie PDF
 DOC_SHOW_FIRST_SALES_REP=Show first sales representative
 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_GENERATE_DOCUMENTS_SUPPLIER_PROPOSAL_WITHOUT_UNIT_PRICE=Hide the unit price column on quotation requests
+MAIN_GENERATE_DOCUMENTS_SUPPLIER_PROPOSAL_WITHOUT_TOTAL_COLUMN=Hide the total price column on quotation requests
+MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_UNIT_PRICE=Hide the unit price column on purchase orders
+MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_TOTAL_COLUMN=Hide the total price column on puchase orders
 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
@@ -2400,4 +2405,4 @@ OptionXShouldBeEnabledInModuleY=Option "<b>%s</b>" should be enabled into module
 OptionXIsCorrectlyEnabledInModuleY=Option "<b>%s</b>" is enabled into module <b>%s</b>
 AtBottomOfPage=At bottom of page
 FailedAuth=failed authentications
-MaxNumberOfFailedAuth=Max number of failed authentication in 24h to disable login.
+MaxNumberOfFailedAuth=Max number of failed authentication in 24h to deny login.
diff --git a/htdocs/langs/pl_PL/main.lang b/htdocs/langs/pl_PL/main.lang
index c735340a731..cb542114773 100644
--- a/htdocs/langs/pl_PL/main.lang
+++ b/htdocs/langs/pl_PL/main.lang
@@ -1237,3 +1237,5 @@ SearchSyntaxTooltipForStringOrNum=For searching inside text fields, you can use
 InProgress=W trakcie
 DateOfPrinting=Date of printing
 ClickFullScreenEscapeToLeave=Click here to switch in Full screen mode. Press ESCAPE to leave Full screen mode.
+UserNotYetValid=Not yet valid
+UserExpired=Wygasł
diff --git a/htdocs/langs/pl_PL/supplier_proposal.lang b/htdocs/langs/pl_PL/supplier_proposal.lang
index 394cbc7c9d7..af9b0be5ee0 100644
--- a/htdocs/langs/pl_PL/supplier_proposal.lang
+++ b/htdocs/langs/pl_PL/supplier_proposal.lang
@@ -1,22 +1,23 @@
 # Dolibarr language file - Source file is en_US - supplier_proposal
-SupplierProposal=Vendor commercial proposals
+SupplierProposal=Oferty handlowe dostawcy
 supplier_proposalDESC=Zarządzaj zapytaniami o cenę do dostawców
 SupplierProposalNew=Nowe zapytanie o cenę
 CommRequest=Zapytanie o cenę
 CommRequests=Zapytania o cenę
 SearchRequest=Znajdź zapytanie
 DraftRequests=Projekt zapytania
-SupplierProposalsDraft=Draft vendor proposals
+SupplierProposalsDraft=Szkice propozycji dostawców
 LastModifiedRequests=Ostatnie %s zapytań o cenę
 RequestsOpened=Otwórz zapytanie o cenę
-SupplierProposalArea=Vendor proposals area
-SupplierProposalShort=Vendor proposal
+SupplierProposalArea=Obszar propozycji dostawców
+SupplierProposalShort=Propozycja dostawcy
 SupplierProposals=Propozycje dostawcy
 SupplierProposalsShort=Propozycje dostawcy
+AskPrice=Zapytanie o cenę
 NewAskPrice=Nowe zapytanie o cenę
 ShowSupplierProposal=Pokaż zapytanie o cenę
 AddSupplierProposal=Stwórz zapytanie o cenę
-SupplierProposalRefFourn=Vendor ref
+SupplierProposalRefFourn=Numer sprzedawcy
 SupplierProposalDate=Data dostawy
 SupplierProposalRefFournNotice=Przed zamknięciem do "Zaakceptowano", myślę uchwycić dostawców odniesienia.
 ConfirmValidateAsk=Czy na pewno chcesz zatwierdzić tę prośbę o cenę pod nazwą <b>%s</b>?
@@ -32,7 +33,7 @@ SupplierProposalStatusValidatedShort=Zatwierdzone
 SupplierProposalStatusClosedShort=Zamknięte
 SupplierProposalStatusSignedShort=Zaakceptowane
 SupplierProposalStatusNotSignedShort=Odrzucony
-CopyAskFrom=Stwórz zapytanie o cenę poprzez skopiowanie istniejącego zapytania
+CopyAskFrom=Utwórz zapytanie o cenę, kopiując istniejące zapytanie
 CreateEmptyAsk=Stwórz puste zapytanie
 ConfirmCloneAsk=Czy powielić zapytanie o cenę <b>%s</b>?
 ConfirmReOpenAsk=Czy otworzyć na nowo zapytanie o cenę <b>%s</b>?
@@ -41,14 +42,18 @@ SendAskRef=Wysłanie zapytania o cenę% s
 SupplierProposalCard=Karta zapytania
 ConfirmDeleteAsk=Czy usunąć to zapytanie o cenę <b>%s</b>?
 ActionsOnSupplierProposal=Zdarzenia na zapytaniu o cenę
-DocModelAuroreDescription=Kompletny model wniosku (logo itp.)
+DocModelAuroreDescription=A complete template for a vendor quotation request template (old implementation of Sponge template)
+DocModelZenithDescription=A complete template for a vendor quotation request template
 CommercialAsk=Zapytanie o cenę
 DefaultModelSupplierProposalCreate=Tworzenie modelu domyślnego
 DefaultModelSupplierProposalToBill=Domyślny szablon podczas zamykania zapytania o cenę (przyjęte)
 DefaultModelSupplierProposalClosed=Domyślny szablon podczas zamykania zapytania o cenę (odmówienie)
-ListOfSupplierProposals=List of vendor proposal requests
-ListSupplierProposalsAssociatedProject=List of vendor proposals associated with project
-SupplierProposalsToClose=Vendor proposals to close
-SupplierProposalsToProcess=Vendor proposals to process
+ListOfSupplierProposals=Lista zapytań ofertowych dostawców
+ListSupplierProposalsAssociatedProject=Lista propozycji dostawców powiązanych z projektem
+SupplierProposalsToClose=Propozycje dostawców do zamknięcia
+SupplierProposalsToProcess=Propozycje dostawców do przetworzenia
 LastSupplierProposals=Ostatnie %s zapytań o cenę
 AllPriceRequests=Wszystkie zapytania
+TypeContact_supplier_proposal_external_SHIPPING=Kontakt z dostawcą w sprawie dostawy
+TypeContact_supplier_proposal_external_BILLING=Kontakt z dostawcą w celu rozliczenia
+TypeContact_supplier_proposal_external_SERVICE=Przedstawiciela w ślad za wniosek
diff --git a/htdocs/langs/pt_BR/accountancy.lang b/htdocs/langs/pt_BR/accountancy.lang
index 8c9246726a6..86a07bc2a81 100644
--- a/htdocs/langs/pt_BR/accountancy.lang
+++ b/htdocs/langs/pt_BR/accountancy.lang
@@ -27,10 +27,6 @@ JournalizationInLedgerStatus=Situação do registro do diário
 GroupIsEmptyCheckSetup=O grupo está vazio, verifique a configuração do grupo de contabilidade personalizado
 AccountantFiles=Exportar documentos de origem
 VueByAccountAccounting=Ver por conta contábil
-MainAccountForCustomersNotDefined=Conta contábil principal para clientes não definidos na configuração
-MainAccountForUsersNotDefined=Conta contábil principal para usuários não definidos na configuração
-MainAccountForVatPaymentNotDefined=Conta contábil principal para o pagamento do IVA não definido na configuração
-MainAccountForSubscriptionPaymentNotDefined=Conta contábil principal  para pagamento de assinatura não definida na configuração
 AccountancyAreaDescIntro=O uso do módulo Contabilidade é feito em diversas etapas:
 AccountancyAreaDescActionOnce=As ações a seguir são normalmente realizadas apenas uma vez, ou uma vez por ano...
 AccountancyAreaDescActionFreq=As ações a seguir são normalmente executadas a cada mês, semana ou dia para grandes empresas...
diff --git a/htdocs/langs/pt_BR/admin.lang b/htdocs/langs/pt_BR/admin.lang
index b656dd4c5db..88ef3bcf829 100644
--- a/htdocs/langs/pt_BR/admin.lang
+++ b/htdocs/langs/pt_BR/admin.lang
@@ -1150,7 +1150,6 @@ ContractsNumberingModules=módulos de numeração de contratos
 TemplatePDFContracts=Modelos de documentos Contratos
 WatermarkOnDraftContractCards=Marca d'água em projetos de contratos (nenhum se estiver vazio)
 MembersSetup=Configurações de módulo de membros
-AdherentLoginRequired=Gestor de login para cada membro
 AdherentMailRequired=O e-mail necessário para criar um novo membro
 MemberSendInformationByMailByDefault=Marque o checkbox para enviar confirmação de correspondência para membros (validação ou nova contribuição) é ativo por default
 MemberCreateAnExternalUserForSubscriptionValidated=Criar um login de usuário externo para cada inscrição de membro validada.
@@ -1369,6 +1368,14 @@ YourCompanyDoesNotUseVAT=Sua empresa foi definida para não usar o IVA (Home - C
 AccountancyCodeSell=Código de contas de vendas
 AccountancyCodeBuy=Código de contas de compras
 CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=Mantenha a caixa de seleção “Criar automaticamente o pagamento” vazia por padrão ao criar um novo imposto
+AgendaSetup =Configurações do módulo de eventos e agenda
+AGENDA_DEFAULT_VIEW =Qual visualização você deseja abrir por padrão ao selecionar o menu Agenda
+AGENDA_REMINDER_BROWSER =Habilitar o lembrete de evento no <b>navegador do usuário</b> (quando a data do lembrete é atingida, um pop-up é mostrado pelo navegador. Cada usuário pode desabilitar tais notificações na configuração de notificação do navegador).
+AGENDA_REMINDER_BROWSER_SOUND =Habilitar a notificação sonora
+AGENDA_REMINDER_EMAIL =Habilitar lembrete de evento <b>por e-mail </b> (opção de lembrete / atraso pode ser definido em cada evento)
+AGENDA_REMINDER_EMAIL_NOTE =Obs: A frequência do agendamento %s deve ser suficiente para garantir que o lembrete seja enviado no momento correto.
+AGENDA_SHOW_LINKED_OBJECT =Exibir objeto conectado na visualização da agenda
+PasswordTogetVCalExport =Chave para autorizar exportação do link
 PastDelayVCalExport=Não exportar eventos antigos de
 SecurityKey =Chave de segurança
 ClickToDialSetup=Configurações do módulo clique para discar
diff --git a/htdocs/langs/pt_BR/main.lang b/htdocs/langs/pt_BR/main.lang
index 14f7cb1c465..8d9f5492851 100644
--- a/htdocs/langs/pt_BR/main.lang
+++ b/htdocs/langs/pt_BR/main.lang
@@ -576,3 +576,4 @@ Terminate=Concluir
 Terminated=Encerrado
 InternalUser=Usuário Interno
 ExternalUser=Usuário Externo
+UserExpired=Vencido
diff --git a/htdocs/langs/pt_BR/supplier_proposal.lang b/htdocs/langs/pt_BR/supplier_proposal.lang
index 32b020535af..655531d9857 100644
--- a/htdocs/langs/pt_BR/supplier_proposal.lang
+++ b/htdocs/langs/pt_BR/supplier_proposal.lang
@@ -13,6 +13,7 @@ SupplierProposalArea=Área de propostas de fornecedores
 SupplierProposalShort=Proposta do fornecedor
 SupplierProposals=Propostas de fornecedores
 SupplierProposalsShort=Propostas de fornecedores
+AskPrice=Solicitação de preço
 NewAskPrice=Nova solicitação de preço
 ShowSupplierProposal=Mostrar solicitação de preço
 AddSupplierProposal=Criar uma solicitação de preço
@@ -40,7 +41,6 @@ SendAskRef=Enviando a solicitação de preço %s
 SupplierProposalCard=Ficha da solicitação
 ConfirmDeleteAsk=Você tem certeza que deseja excluir a solicitação de preço <b>%s</b>?
 ActionsOnSupplierProposal=Eventos na solicitação de preço
-DocModelAuroreDescription=Um modelo de solicitação completo (logo...)
 CommercialAsk=Solicitação de preço
 DefaultModelSupplierProposalCreate=Criação de modelo padrão
 DefaultModelSupplierProposalToBill=Tema padrão quando fechando uma solicitação de preço (aceita)
@@ -51,3 +51,6 @@ SupplierProposalsToClose=Propostas de fornecedores para fechar
 SupplierProposalsToProcess=Propostas de fornecedores para processar
 LastSupplierProposals=Últimos %s preços solicitados
 AllPriceRequests=Todas as solicitações
+TypeContact_supplier_proposal_external_SHIPPING=Contato do fornecedor para entrega
+TypeContact_supplier_proposal_external_BILLING=Contato do fornecedor para faturamento
+TypeContact_supplier_proposal_external_SERVICE=Representante seguindo a proposta
diff --git a/htdocs/langs/pt_MZ/accountancy.lang b/htdocs/langs/pt_MZ/accountancy.lang
index 56da1820edc..be21040e6fb 100644
--- a/htdocs/langs/pt_MZ/accountancy.lang
+++ b/htdocs/langs/pt_MZ/accountancy.lang
@@ -27,10 +27,6 @@ JournalizationInLedgerStatus=Situação do registro do diário
 GroupIsEmptyCheckSetup=O grupo está vazio, verifique a configuração do grupo de contabilidade personalizado
 AccountantFiles=Exportar documentos de origem
 VueByAccountAccounting=Ver por conta contábil
-MainAccountForCustomersNotDefined=Conta contábil principal para clientes não definidos na configuração
-MainAccountForUsersNotDefined=Conta contábil principal para usuários não definidos na configuração
-MainAccountForVatPaymentNotDefined=Conta contábil principal para o pagamento do IVA não definido na configuração
-MainAccountForSubscriptionPaymentNotDefined=Conta contábil principal  para pagamento de assinatura não definida na configuração
 AccountancyAreaDescIntro=O uso do módulo Contabilidade é feito em diversas etapas:
 AccountancyAreaDescActionOnce=As ações a seguir são normalmente realizadas apenas uma vez, ou uma vez por ano...
 AccountancyAreaDescActionFreq=As ações a seguir são normalmente executadas a cada mês, semana ou dia para grandes empresas...
diff --git a/htdocs/langs/pt_MZ/admin.lang b/htdocs/langs/pt_MZ/admin.lang
index c7445cf8654..fc6c7d3b692 100644
--- a/htdocs/langs/pt_MZ/admin.lang
+++ b/htdocs/langs/pt_MZ/admin.lang
@@ -1127,7 +1127,6 @@ ContractsNumberingModules=módulos de numeração de contratos
 TemplatePDFContracts=Modelos de documentos Contratos
 WatermarkOnDraftContractCards=Marca d'água em projetos de contratos (nenhum se estiver vazio)
 MembersSetup=Configurações de módulo de membros
-AdherentLoginRequired=Gestor de login para cada membro
 AdherentMailRequired=O e-mail necessário para criar um novo membro
 MemberSendInformationByMailByDefault=Marque o checkbox para enviar confirmação de correspondência para membros (validação ou nova contribuição) é ativo por default
 MemberCreateAnExternalUserForSubscriptionValidated=Criar um login de usuário externo para cada inscrição de membro validada.
@@ -1346,6 +1345,14 @@ YourCompanyDoesNotUseVAT=Sua empresa foi definida para não usar o IVA (Home - C
 AccountancyCodeSell=Código de contas de vendas
 AccountancyCodeBuy=Código de contas de compras
 CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=Mantenha a caixa de seleção “Criar automaticamente o pagamento” vazia por padrão ao criar um novo imposto
+AgendaSetup =Configurações do módulo de eventos e agenda
+AGENDA_DEFAULT_VIEW =Qual visualização você deseja abrir por padrão ao selecionar o menu Agenda
+AGENDA_REMINDER_BROWSER =Habilitar o lembrete de evento no <b>navegador do usuário</b> (quando a data do lembrete é atingida, um pop-up é mostrado pelo navegador. Cada usuário pode desabilitar tais notificações na configuração de notificação do navegador).
+AGENDA_REMINDER_BROWSER_SOUND =Habilitar a notificação sonora
+AGENDA_REMINDER_EMAIL =Habilitar lembrete de evento <b>por e-mail </b> (opção de lembrete / atraso pode ser definido em cada evento)
+AGENDA_REMINDER_EMAIL_NOTE =Obs: A frequência do agendamento %s deve ser suficiente para garantir que o lembrete seja enviado no momento correto.
+AGENDA_SHOW_LINKED_OBJECT =Exibir objeto conectado na visualização da agenda
+PasswordTogetVCalExport =Chave para autorizar exportação do link
 PastDelayVCalExport=Não exportar eventos antigos de
 SecurityKey =Chave de segurança
 ClickToDialSetup=Configurações do módulo clique para discar
diff --git a/htdocs/langs/pt_PT/accountancy.lang b/htdocs/langs/pt_PT/accountancy.lang
index e954fc6efbc..53a07569b67 100644
--- a/htdocs/langs/pt_PT/accountancy.lang
+++ b/htdocs/langs/pt_PT/accountancy.lang
@@ -57,11 +57,14 @@ WarningDataDisappearsWhenDataIsExported=Warning, this list contains only the acc
 VueByAccountAccounting=View by accounting account
 VueBySubAccountAccounting=View by accounting subaccount
 
-MainAccountForCustomersNotDefined=Principal conta contábil para clientes não definidos na configuração
-MainAccountForSuppliersNotDefined=Conta contábil principal para fornecedores não definidos na configuração
-MainAccountForUsersNotDefined=Principal conta contábil para usuários não definidos na configuração
-MainAccountForVatPaymentNotDefined=Principal conta contábil para pagamento de IVA não definida na configuração
-MainAccountForSubscriptionPaymentNotDefined=Main accounting account for subscription payment not defined in setup
+MainAccountForCustomersNotDefined=Main account (from the Chart of Account) for customers not defined in setup
+MainAccountForSuppliersNotDefined=Main account (from the Chart of Account) for vendors not defined in setup
+MainAccountForUsersNotDefined=Main account (from the Chart of Account) for users not defined in setup
+MainAccountForRevenueStampSaleNotDefined=Account (from the Chart of Account) for the revenue stamp (sales) not defined in setup
+MainAccountForRevenueStampPurchaseNotDefined=Account (from the Chart of Account) for the revenue stamp (purchases) not defined in setup
+MainAccountForVatPaymentNotDefined=Account (from the Chart of Account) for VAT payment not defined in setup
+MainAccountForSubscriptionPaymentNotDefined=Account (from the Chart of Account) for membership payment not defined in setup
+MainAccountForRetainedWarrantyNotDefined=Account (from the Chart of Account) for the retained warranty not defined in setup
 UserAccountNotDefined=Accounting account for user not defined in setup
 
 AccountancyArea=Área de contabilidade
diff --git a/htdocs/langs/pt_PT/admin.lang b/htdocs/langs/pt_PT/admin.lang
index 1491c331374..b12937e9a0a 100644
--- a/htdocs/langs/pt_PT/admin.lang
+++ b/htdocs/langs/pt_PT/admin.lang
@@ -1509,7 +1509,8 @@ WatermarkOnDraftContractCards=Marca d'água nos contratos rascunho (nenhuma se e
 MembersSetup=Configuração do módulo "Membros"
 MemberMainOptions=Opções principais
 MemberCodeChecker=Options for automatic generation of member codes
-AdherentLoginRequired= Gerir um login para cada membro
+AdherentLoginRequired=Manage a login/password for each member
+AdherentLoginRequiredDesc=Add a value for a login and a password on the member file. If the member is linked to a user, updating the member login and password will also update the user login and password.
 AdherentMailRequired=Email necessário para criar um novo membro
 MemberSendInformationByMailByDefault=Selecione para enviar email de confirmação aos membros (validação ou nova subscrição), está ativada por defeito
 MemberCreateAnExternalUserForSubscriptionValidated=Create an external user login for each new member subscription validated
@@ -2076,6 +2077,10 @@ MAIN_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
 DOC_SHOW_FIRST_SALES_REP=Show first sales representative
 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_GENERATE_DOCUMENTS_SUPPLIER_PROPOSAL_WITHOUT_UNIT_PRICE=Hide the unit price column on quotation requests
+MAIN_GENERATE_DOCUMENTS_SUPPLIER_PROPOSAL_WITHOUT_TOTAL_COLUMN=Hide the total price column on quotation requests
+MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_UNIT_PRICE=Hide the unit price column on purchase orders
+MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_TOTAL_COLUMN=Hide the total price column on puchase orders
 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
@@ -2400,4 +2405,4 @@ OptionXShouldBeEnabledInModuleY=Option "<b>%s</b>" should be enabled into module
 OptionXIsCorrectlyEnabledInModuleY=Option "<b>%s</b>" is enabled into module <b>%s</b>
 AtBottomOfPage=At bottom of page
 FailedAuth=failed authentications
-MaxNumberOfFailedAuth=Max number of failed authentication in 24h to disable login.
+MaxNumberOfFailedAuth=Max number of failed authentication in 24h to deny login.
diff --git a/htdocs/langs/pt_PT/main.lang b/htdocs/langs/pt_PT/main.lang
index 9dae651bb4a..beb6cfafd4a 100644
--- a/htdocs/langs/pt_PT/main.lang
+++ b/htdocs/langs/pt_PT/main.lang
@@ -1237,3 +1237,5 @@ SearchSyntaxTooltipForStringOrNum=For searching inside text fields, you can use
 InProgress=Em progresso
 DateOfPrinting=Date of printing
 ClickFullScreenEscapeToLeave=Click here to switch in Full screen mode. Press ESCAPE to leave Full screen mode.
+UserNotYetValid=Not yet valid
+UserExpired=Expirada
diff --git a/htdocs/langs/pt_PT/supplier_proposal.lang b/htdocs/langs/pt_PT/supplier_proposal.lang
index 9cf0353bc70..741398d6c1d 100644
--- a/htdocs/langs/pt_PT/supplier_proposal.lang
+++ b/htdocs/langs/pt_PT/supplier_proposal.lang
@@ -13,12 +13,13 @@ SupplierProposalArea=Área de orçamentos de fornecedor
 SupplierProposalShort=Orçamento de fornecedor
 SupplierProposals=Orçamentos de fornecedor
 SupplierProposalsShort=Orçamentos de fornecedor
+AskPrice=Pedido de preço
 NewAskPrice=Novo pedido de preço
 ShowSupplierProposal=Mostrar pedido de preço
 AddSupplierProposal=Criar um pedido de preço
 SupplierProposalRefFourn=Ref. do fornecedor
 SupplierProposalDate=Data de Envio
-SupplierProposalRefFournNotice=Before closing to "Accepted", think to grasp suppliers references.
+SupplierProposalRefFournNotice=Antes de fechar para "Aceite", pense em entender as referências dos fornecedores.
 ConfirmValidateAsk=Tem a certeza que pretende validar este pedido de preço com o nome <b> %s </b>?
 DeleteAsk=Eliminar pedido
 ValidateAsk=Validar pedido
@@ -32,7 +33,7 @@ SupplierProposalStatusValidatedShort=Validado
 SupplierProposalStatusClosedShort=Fechado
 SupplierProposalStatusSignedShort=Aceite
 SupplierProposalStatusNotSignedShort=Recusado
-CopyAskFrom=Criar orçamento de fornecedor copiando um orçamento existente
+CopyAskFrom=Crie uma solicitação de preço copiando uma solicitação existente
 CreateEmptyAsk=Criar pedido em branco
 ConfirmCloneAsk=Tem certeza que deseja clonar o orçamento do fornecedor, <b>%s</b>?
 ConfirmReOpenAsk=Tem certeza que deseja reabrir o orçamento do fornecedor, <b>%s</b>?
@@ -41,7 +42,8 @@ SendAskRef=A enviar o orçamento do fornecedor, %s
 SupplierProposalCard=Ficha do orçamento do fornecedor
 ConfirmDeleteAsk=Tem certeza de que deseja eliminar o pedido de preço <b>%s</b>?
 ActionsOnSupplierProposal=Eventos sobre o orçamento do fornecedor
-DocModelAuroreDescription=Um modelo completo de orçamento de fornecedor (logo...)
+DocModelAuroreDescription=A complete template for a vendor quotation request template (old implementation of Sponge template)
+DocModelZenithDescription=A complete template for a vendor quotation request template
 CommercialAsk=Pedido de preço
 DefaultModelSupplierProposalCreate=Criação do modelo padrão
 DefaultModelSupplierProposalToBill=Modelo predefinido ao fechar um orçamento de fornecedor (aceite)
@@ -52,3 +54,6 @@ SupplierProposalsToClose=Orçamentos de fornecedor a fechar
 SupplierProposalsToProcess=Orçamentos de fornecedor a processar
 LastSupplierProposals=Últimos %s orçamentos de fornecedores
 AllPriceRequests=Todos os orçamentos de fornecedores
+TypeContact_supplier_proposal_external_SHIPPING=Contato do Vendedor para entrega
+TypeContact_supplier_proposal_external_BILLING=Contato do Vendedor para cobrança
+TypeContact_supplier_proposal_external_SERVICE=Representante que dá seguimento ao orçamento
diff --git a/htdocs/langs/ro_RO/accountancy.lang b/htdocs/langs/ro_RO/accountancy.lang
index e49c75182f8..5f3ee471d3d 100644
--- a/htdocs/langs/ro_RO/accountancy.lang
+++ b/htdocs/langs/ro_RO/accountancy.lang
@@ -57,11 +57,14 @@ WarningDataDisappearsWhenDataIsExported=Atenție, această listă conține doar
 VueByAccountAccounting=Vizualizare după contul contabil
 VueBySubAccountAccounting=Vizualizați după subcont contabil
 
-MainAccountForCustomersNotDefined=Contul contabil principal pentru clienții care nu sunt definiți în configurare
-MainAccountForSuppliersNotDefined=Contul contabil principal pentru furnizorii care nu sunt definiți în configurare
-MainAccountForUsersNotDefined=Contul contabil principal pentru utilizatorii care nu sunt definiți în configurare
-MainAccountForVatPaymentNotDefined=Contul contabil principal pentru plăţile de TVA care nu sunt definite în configurare
-MainAccountForSubscriptionPaymentNotDefined=Contul contabil principal pentru plăţile de abonamente care nu sunt definite în configurare
+MainAccountForCustomersNotDefined=Contul contabil principal (din Planul de Conturi) pentru clienți nu a fost definit în configurare
+MainAccountForSuppliersNotDefined=Contul contabil principal (din Planul de Conturi) pentru furnizori nu a fost definit în configurare
+MainAccountForUsersNotDefined=Contul contabil principal (din Planul de Conturi) pentru utilizatori nu a fost definit în configurare
+MainAccountForRevenueStampSaleNotDefined=Contul contabil (din Planul de Conturi) pentru taxa de venit (vânzări) nu a fost definit în configurare
+MainAccountForRevenueStampPurchaseNotDefined=Contul contabil (din Planul de Conturi) pentru taxa de venit (achiziții) nu a fost definit în configurare
+MainAccountForVatPaymentNotDefined=Contul contabil (din Planul de Conturi) pentru plata TVA nu a fost definit în configurare
+MainAccountForSubscriptionPaymentNotDefined=Contul contabil (din Planul de Conturi) pentru plată adeziune membri nu a fost definit în configurare
+MainAccountForRetainedWarrantyNotDefined=Contul contabil (din Planul de conturi) pentru garanția reținută nu a fost definit la configurare
 UserAccountNotDefined=Contul contabil pentru utilizator nu a fost definit în configurare
 
 AccountancyArea=Zona contabilă
diff --git a/htdocs/langs/ro_RO/admin.lang b/htdocs/langs/ro_RO/admin.lang
index 405b8431740..35b02c75350 100644
--- a/htdocs/langs/ro_RO/admin.lang
+++ b/htdocs/langs/ro_RO/admin.lang
@@ -1509,7 +1509,8 @@ WatermarkOnDraftContractCards=Filigranul de pe contractele schiţă (niciunul da
 MembersSetup=Configurare modul Membri
 MemberMainOptions=Opţiuni principale
 MemberCodeChecker=Opțiuni pentru generarea automată a codurilor de membru
-AdherentLoginRequired= Gestionează autentificarea pentru fiecare membru
+AdherentLoginRequired=Administrare autentificare/parolă pentru fiecare membru
+AdherentLoginRequiredDesc=Adăugare o valoare pentru un login și o parolă în fișa de  membru. Dacă membrul este conectat la un utilizator, actualizarea numelui de utilizator și a parolei va actualiza, de asemenea, numele de utilizator și parola.
 AdherentMailRequired=Emailul este necesar pentru a crea un nou membru
 MemberSendInformationByMailByDefault=Opţiunea de a trimite email de confirmare a membrilor(validare sau confirmare adeziune) este activă în mod implicit
 MemberCreateAnExternalUserForSubscriptionValidated=Creare cont de utilizator extern pentru fiecare adeziune de membru nou validat
@@ -2076,6 +2077,10 @@ MAIN_DOCUMENTS_LOGO_HEIGHT=Înălţime logo în PDF
 DOC_SHOW_FIRST_SALES_REP=Afișează primul reprezentant de vânzări
 MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Adaugă coloană pentru imagine pe liniile de ofertă
 MAIN_DOCUMENTS_WITH_PICTURE_WIDTH=Lăţimea coloanei dacă o poză este adăugată pe linie
+MAIN_GENERATE_DOCUMENTS_SUPPLIER_PROPOSAL_WITHOUT_UNIT_PRICE=Ascunde coloana de preț unitar pe cererile de ofertă
+MAIN_GENERATE_DOCUMENTS_SUPPLIER_PROPOSAL_WITHOUT_TOTAL_COLUMN=Ascunde coloana de total preț pe cererile de ofertă
+MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_UNIT_PRICE=Ascunde coloana de preț unitar pe comenzile de achiziție
+MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_TOTAL_COLUMN=Ascunde coloana de preț total pe comenzile de achiziție
 MAIN_PDF_NO_SENDER_FRAME=Ascunde marginile chenarului de adresă expeditor/furnizor
 MAIN_PDF_NO_RECIPENT_FRAME=Ascunde marginile chenarului de adresă destinatar/beneficiar
 MAIN_PDF_HIDE_CUSTOMER_CODE=Ascunde cod client
@@ -2400,4 +2405,4 @@ OptionXShouldBeEnabledInModuleY=Opțiunea "<b>%s</b>" trebuie activată în modu
 OptionXIsCorrectlyEnabledInModuleY=Opțiunea "<b>%s</b>" este activată în modulul  <b>%s</b>
 AtBottomOfPage=În subsolul paginii
 FailedAuth=autentificări eșuate
-MaxNumberOfFailedAuth=Număr maxim de autentificări eșuate în 24 de ore după care se dezactivează autentificarea.
+MaxNumberOfFailedAuth=Număr maxim de autentificări eșuate în 24 de ore pentru a refuza autentificarea.
diff --git a/htdocs/langs/ro_RO/banks.lang b/htdocs/langs/ro_RO/banks.lang
index d13b134299a..253b441ac88 100644
--- a/htdocs/langs/ro_RO/banks.lang
+++ b/htdocs/langs/ro_RO/banks.lang
@@ -106,8 +106,8 @@ BankLineNotReconciled=Ne-reconciliat
 CustomerInvoicePayment=Plată client
 SupplierInvoicePayment=Plată furnizor
 SubscriptionPayment=Plată cotizaţie
-WithdrawalPayment=Direct Debit payment
-BankTransferPayment=Credit Transfer payment
+WithdrawalPayment=Plată Direct Debit
+BankTransferPayment=Plată Transfer Credit
 SocialContributionPayment=Plată taxe sociale/fiscale și TVA
 BankTransfer=Transfer credit
 BankTransfers=Transferuri credit
diff --git a/htdocs/langs/ro_RO/compta.lang b/htdocs/langs/ro_RO/compta.lang
index 14e24e9748c..e360b5014bf 100644
--- a/htdocs/langs/ro_RO/compta.lang
+++ b/htdocs/langs/ro_RO/compta.lang
@@ -253,6 +253,8 @@ CalculationMode=Mod calcul
 AccountancyJournal=Jurnal contabil
 ACCOUNTING_VAT_SOLD_ACCOUNT=Cont contabil (din Planul de Conturi) care urmează să fie utilizat ca și cont implicit pentru TVA la vânzări (utilizat dacă nu este definit în configurarea dicționarului TVA)
 ACCOUNTING_VAT_BUY_ACCOUNT=Cont contabil (din Planul de Conturi) care urmează să fie utilizat ca și cont implicit pentru TVA la achiziții (utilizat dacă nu este definit în configurarea dicționarului TVA)
+ACCOUNTING_REVENUESTAMP_SOLD_ACCOUNT=Cont contabil (din Planul de Conturi) care va fi utilizat pentru taxa de venit la vânzări
+ACCOUNTING_REVENUESTAMP_BUY_ACCOUNT=Cont contabil (din Planul de Conturi) care va fi utilizat pentru taxa de venit la cumpărări
 ACCOUNTING_VAT_PAY_ACCOUNT=Cont contabil (din Planul de Conturi) care va fi utilizat ca și cont implicit pentru plata TVA
 ACCOUNTING_VAT_BUY_REVERSE_CHARGES_CREDIT=Cont contabil(din planul de conturi) care urmează să fie utilizat ca și cont implicit pentru TVA la achizițiile pentru taxarea inversă (credit)
 ACCOUNTING_VAT_BUY_REVERSE_CHARGES_DEBIT=Cont contabil(din planul de conturi) care va fi utilizat ca și cont implicit pentru TVA la achizițiile pentru taxarea inversă (Debit)
diff --git a/htdocs/langs/ro_RO/ecm.lang b/htdocs/langs/ro_RO/ecm.lang
index 1ea6feb1f81..a998556d8e2 100644
--- a/htdocs/langs/ro_RO/ecm.lang
+++ b/htdocs/langs/ro_RO/ecm.lang
@@ -48,7 +48,7 @@ GenerateImgWebp=Duplică toate imaginile cu o altă versiune în format .webp
 ConfirmGenerateImgWebp=Dacă confirmi, vei genera o imagine în format .webp pentru toate imaginile aflate în prezent în acest folder (subfolderele nu sunt incluse)... 
 ConfirmImgWebpCreation=Confirmă duplicarea tuturor imaginilor
 GenerateChosenImgWebp=Duplică imaginea aleasă cu o altă versiune în format .webp
-ConfirmGenerateChosenImgWebp=If you confirm, you will generate an image in .webp format for the image %s
+ConfirmGenerateChosenImgWebp=Dacă confirmi, vei genera o imagine în format .webp pentru imaginea %s
 ConfirmChosenImgWebpCreation=Confirmare duplicare imagini alese
 SucessConvertImgWebp=Imaginile au fost duplicate cu succes
 SucessConvertChosenImgWebp=Imaginea aleasă a fost duplicată cu succes
diff --git a/htdocs/langs/ro_RO/errors.lang b/htdocs/langs/ro_RO/errors.lang
index c6ded2dd0ca..a99d81678a2 100644
--- a/htdocs/langs/ro_RO/errors.lang
+++ b/htdocs/langs/ro_RO/errors.lang
@@ -318,8 +318,10 @@ ErrorTheUrlOfYourDolInstanceDoesNotMatchURLIntoOAuthSetup=Eroare: Adresa URL a i
 ErrorMenuExistValue=Există deja un Meniu cu acest titlu sau această adresă URL
 ErrorSVGFilesNotAllowedAsLinksWithout=Fișierele SVG nu sunt permise ca legături externe fără opțiunea %s
 ErrorTypeMenu=Imposibil de adăugat un alt meniu pentru același modul în bara de navigare, nu poate fi gestionat încă 
-ErrorTableExist=Table <b>%s</b> already exist
-ErrorDictionaryNotFound=Dictionary <b>%s</b> not found
+ErrorTableExist=Tabelul <b>%s</b> există deja
+ErrorDictionaryNotFound=Dicționarul <b>%s</b> nu a fost găsit
+ErrorFailedToCreateSymLinkToMedias=Eșec la crearea symlink-urilor %s care să direcționeze către %s
+
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Parametrul tău PHP upload_max_filesize (%s) este mai mare decât paramentrul PHP post_max_size (%s). Aceasta nu este o configuraţie consistentă.
 WarningPasswordSetWithNoAccount= O parolă a fost trimisă către acest membru. Cu toate acestea, nu a fost creat nici un cont de utilizator. Astfel, această parolă este stocată, dar nu poate fi utilizată pentru autentificare. Poate fi utilizată de către un modul / interfată externă, dar dacă nu aveți nevoie să definiți un utilizator sau o parolă pentru un membru, puteți dezactiva opțiunea "Gestionați o conectare pentru fiecare membru" din modul de configurare membri. În cazul în care aveți nevoie să gestionați un utilizator, dar nu este nevoie de parolă, aveți posibilitatea să păstrați acest câmp gol pentru a evita acest avertisment. Notă: Adresa de e-mail poate fi utilizată ca utilizator la autentificare, în cazul în care membrul este legat de un utilizator. 
@@ -360,7 +362,7 @@ WarningAutoValNotPossibleWhenStockIsDecreasedOnInvoiceVal=Validarea automată es
 WarningModuleNeedRefrech = Modulul <b>%s</b> a fost dezavtivat. Nu uita să-l activezi
 WarningPermissionAlreadyExist=Permisiuni existente pentru acest obiect
 WarningGoOnAccountancySetupToAddAccounts=Dacă această listă este goală, accesează meniul %s - %s - %s pentru a încărca sau crea conturi pentru planul de conturi.
-WarningCorrectedInvoiceNotFound=Corrected invoice not found
+WarningCorrectedInvoiceNotFound=Factura de corecție nu a fost găsită
 
 SwissQrOnlyVIR = Factura SwissQR poate fi adăugată numai pe facturile setate să fie plătite cu plăți prin transfer de credit. 
 SwissQrCreditorAddressInvalid = Adresa creditorului este invalidă (este setat codul poștal și județul? (%s)
diff --git a/htdocs/langs/ro_RO/main.lang b/htdocs/langs/ro_RO/main.lang
index 5c6fe7392dd..349e81bca10 100644
--- a/htdocs/langs/ro_RO/main.lang
+++ b/htdocs/langs/ro_RO/main.lang
@@ -235,8 +235,8 @@ PersonalValue=Valoare personalizată
 NewObject=Nou %s
 NewValue=Valoare nouă
 OldValue=Valoare anterioară %s
-FieldXModified=Field %s modified
-FieldXModifiedFromYToZ=Field %s modified from %s to %s
+FieldXModified=Câmpul %s a fost modificat
+FieldXModifiedFromYToZ=Câmpul %s a fost modificat de la %s la %s
 CurrentValue=Valoarea curentă
 Code=Cod
 Type=Tip
@@ -558,7 +558,7 @@ Unknown=Necunoscut
 General=General
 Size=Dimensiune
 OriginalSize=Dimensiunea originală
-RotateImage=Rotate 90°
+RotateImage=Rotație 90°
 Received=Primit
 Paid=Plătit
 Topic=Subiect
@@ -1237,3 +1237,5 @@ SearchSyntaxTooltipForStringOrNum=Pentru a căuta în interiorul câmpurilor de
 InProgress=În curs
 DateOfPrinting=Dată tipărire
 ClickFullScreenEscapeToLeave=Fă clic aici pentru a comuta în modul Ecran complet. Apasă ESCAPE pentru a părăsi modul Ecran complet. 
+UserNotYetValid=Încă nu este validat
+UserExpired=Expirat
diff --git a/htdocs/langs/ro_RO/modulebuilder.lang b/htdocs/langs/ro_RO/modulebuilder.lang
index 7694e139294..2c24d739972 100644
--- a/htdocs/langs/ro_RO/modulebuilder.lang
+++ b/htdocs/langs/ro_RO/modulebuilder.lang
@@ -28,6 +28,7 @@ ModuleBuilderDescwidgets=Această filă este dedicată administrării/construiri
 ModuleBuilderDescbuildpackage=Puteți genera aici un fișier pachet "pregătit pentru distribuire" (un fișier .zip) al modulului tău și un fișier de documentație "gata de distribuire". Doar fă clic pe buton pentru a construi pachetul sau documentația.
 EnterNameOfModuleToDeleteDesc= Puteți șterge modulul pe care l-aţi creat. ATENŢIE: Toate fișierele de cod ale modulului (generate sau create manual) ȘI datele și documentația de structură vor fi șterse!
 EnterNameOfObjectToDeleteDesc=Puteți șterge un obiect. ATENŢIE: Toate fișierele de cod (generate sau create manual) legate de obiect vor fi șterse!
+EnterNameOfObjectToDeleteDesc=Puteți șterge un obiect. ATENŢIE: Toate fișierele de cod (generate sau create manual) legate de obiect vor fi șterse!
 DangerZone=Zona periculoasă
 BuildPackage=Construiți pachetul
 BuildPackageDesc=Puteți genera un pachet zip al aplicației dvs., pentru a-l putea distribui in orice implementare de Dolibarr. Puteți, de asemenea, să-l distribuiți sau să-l vindeţi în marketplace, de exemplu pe <a href="https://www.dolistore.com">DoliStore.com</a>.
@@ -162,11 +163,11 @@ ListOfTabsEntries=Listă tab-uri
 TabsDefDesc=Defineşte aici tab-urile furnizate de modulul tău
 TabsDefDescTooltip=Tab-urile furnizate de modulul/aplicația ta sunt definite în matricea <strong>$this->tabs</strong> în fișierul descriptor al modulului. Poți edita manual acest fișier sau poți utiliza editorul încorporat. 
 BadValueForType=Valoare incorectă pentru tipul %s
-DefinePropertiesFromExistingTable=Definește proprietăți dintr-un tabel existent
+DefinePropertiesFromExistingTable=Definește câmpurile/proprietățile dintr-un tabel existent
 DefinePropertiesFromExistingTableDesc=Dacă un tabel din baza de date (pentru ca obiectul să fie creat) există deja, îl poți folosi pentru a defini proprietățile obiectului.
 DefinePropertiesFromExistingTableDesc2=Lasă necompletat dacă tabelul nu există încă. Generatorul de cod va folosi diferite tipuri de câmpuri pentru a construi un exemplu de tabel pe care îl poți edita ulterior.
-GeneratePermissions=vreau să adaug drepturile pentru acest obiect
-GeneratePermissionsHelp=generează drepturi implicite pentru acest obiect
+GeneratePermissions=Veau să administrez permisiunile pentru acest obiect
+GeneratePermissionsHelp=Dacă bifezi asta, se va adăuga un cod pentru a gestiona permisiunile de citire, scriere și ștergere a înregistrărilor obiectelor
 PermissionDeletedSuccesfuly=Permisiunea a fost eliminată cu succes
 PermissionUpdatedSuccesfuly=Permisiunea a fost actualizată cu succes
 PermissionAddedSuccesfuly=Permisiunea a fost adăugată cu succes
@@ -177,3 +178,6 @@ ApiObjectDeleted=API pentru obiectul %s a fost șters cu succes
 CRUDRead=Citire
 CRUDCreateWrite=Creare sau actualizare
 FailedToAddCodeIntoDescriptor=Nu s-a putut adăuga codul în descriptor. Verificați dacă comentariul "%s" este încă prezent în fișier.
+DictionariesCreated=Dicționarul <b>%s</b> a fost creat cu succes
+DictionaryDeleted=Dicționarul <b>%s</b> a șters cu succes
+PropertyModuleUpdated=Proprietatea <b>%s</b> a fost actualizată cu succes
diff --git a/htdocs/langs/ro_RO/stripe.lang b/htdocs/langs/ro_RO/stripe.lang
index 07e7d61c214..e458fd25837 100644
--- a/htdocs/langs/ro_RO/stripe.lang
+++ b/htdocs/langs/ro_RO/stripe.lang
@@ -51,6 +51,7 @@ StripeAccount=Contul Stripe
 StripeChargeList=Listă de comisioane Stripe
 StripeTransactionList=Listă de tranzacții Stripe
 StripeCustomerId=ID client Stripe
+StripePaymentId=Id plată Stripe
 StripePaymentModes=Moduri de plată Stripe
 LocalID=ID local
 StripeID=ID Stripe
diff --git a/htdocs/langs/ro_RO/supplier_proposal.lang b/htdocs/langs/ro_RO/supplier_proposal.lang
index 756cd3f1ab6..a48aeb98e06 100644
--- a/htdocs/langs/ro_RO/supplier_proposal.lang
+++ b/htdocs/langs/ro_RO/supplier_proposal.lang
@@ -1,54 +1,59 @@
 # Dolibarr language file - Source file is en_US - supplier_proposal
-SupplierProposal=Propuneri comerciale furnizor
-supplier_proposalDESC=Gestiioneaza cereri pret la furnizori
-SupplierProposalNew=Cerere Preţ  Noua
-CommRequest=Cerere Preţ 
-CommRequests=Cereri Preţ 
-SearchRequest=Cauta o cerere
+SupplierProposal=Oferte furnizor
+supplier_proposalDESC=Gestionează cererile de preţ transmise către furnizori
+SupplierProposalNew=Cerere de preţ nouă
+CommRequest=Cerere preţ 
+CommRequests=Cereri preţ 
+SearchRequest=Caută o cerere
 DraftRequests=Cereri schiţă
-SupplierProposalsDraft=Propuneri furnizor schiţă
-LastModifiedRequests=Ultimele %scereri de prețuri modificate 
-RequestsOpened=Deschide Cereri Preţ 
-SupplierProposalArea=Domeniul propunerilor furnizorilor
-SupplierProposalShort=Propunerea furnizorului
-SupplierProposals=Propunerile furnizorilor
-SupplierProposalsShort=Propunerile furnizorilor
-NewAskPrice=Cerere Preţ  Noua
-ShowSupplierProposal=Arata Cerere Preţ 
-AddSupplierProposal=Crează o cerere de pret
-SupplierProposalRefFourn=Ref. Furnizor
-SupplierProposalDate=Data de livrare
-SupplierProposalRefFournNotice=Înainte de a vă închide la "Acceptat", gândiți-vă să înțelegeți referințele furnizorilor.
-ConfirmValidateAsk=Sigur doriți să validați această cerere de preț sub numele <b> %s </b>?
-DeleteAsk=Şterge cerere
-ValidateAsk=Validează cererre
-SupplierProposalStatusDraft=Schiţă (cererea tebuie validata)
-SupplierProposalStatusValidated=Validata(cererea este deschisa)
-SupplierProposalStatusClosed=Închis
-SupplierProposalStatusSigned=Acceptat
-SupplierProposalStatusNotSigned=Refuzat
+SupplierProposalsDraft=Oferte furnizor schiţă
+LastModifiedRequests=Ultimele %s cereri de preț modificate 
+RequestsOpened=Cereri de preţ deschise
+SupplierProposalArea=Oferte furnizori
+SupplierProposalShort=Propunere furnizor
+SupplierProposals=Oferte furnizor
+SupplierProposalsShort=Oferte furnizori
+AskPrice=Cerere de preţ 
+NewAskPrice=Cerere de preţ nouă
+ShowSupplierProposal=Afişează cererea de preţ 
+AddSupplierProposal=Crează o cerere de preţ
+SupplierProposalRefFourn=Ref. furnizor
+SupplierProposalDate=Dată de livrare
+SupplierProposalRefFournNotice=Înainte de a închide ca "Acceptată", colectaţi referințele furnizor.
+ConfirmValidateAsk=Sigur doriți să validați această cerere de preț sub numele <b>%s</b>?
+DeleteAsk=Şterge cerere de preţ
+ValidateAsk=Validează cerere
+SupplierProposalStatusDraft=Schiţă (cererea trebuie validată)
+SupplierProposalStatusValidated=Validată(cererea este deschisă)
+SupplierProposalStatusClosed=Închisă
+SupplierProposalStatusSigned=Acceptată
+SupplierProposalStatusNotSigned=Refuzată
 SupplierProposalStatusDraftShort=Schiţă
 SupplierProposalStatusValidatedShort=Validată
-SupplierProposalStatusClosedShort=Închis
-SupplierProposalStatusSignedShort=Acceptat
-SupplierProposalStatusNotSignedShort=Refuzat
+SupplierProposalStatusClosedShort=Închisă
+SupplierProposalStatusSignedShort=Acceptată
+SupplierProposalStatusNotSignedShort=Refuzată
 CopyAskFrom=Creați o cerere de preț copiind o cerere existentă
-CreateEmptyAsk=Crează o cerere goala
-ConfirmCloneAsk=Sigur doriți să clonați solicitarea de preț <b> %s </b>?
-ConfirmReOpenAsk=Sigur doriți să redeschideți cererea de preț <b> %s </b>?
-SendAskByMail=Trimitere  cerere pret  pe mail
-SendAskRef=Trimiterea cererii de preț %s
-SupplierProposalCard=Fişă Cerere
-ConfirmDeleteAsk=Sigur doriți să ștergeți această cerere de preț <b> %s </b>?
-ActionsOnSupplierProposal=Evenimente pe cererea de pret
-DocModelAuroreDescription=Un model complet de solicitare (logo ...)
-CommercialAsk=Cerere Preţ 
-DefaultModelSupplierProposalCreate=Crează model implicit
-DefaultModelSupplierProposalToBill=Șablonul standard la închiderea unei cereri de preț (acceptat)
-DefaultModelSupplierProposalClosed=Șablonul standard la închiderea unei cereri de preț (refuzat)
-ListOfSupplierProposals=Lista cererilor furnizorului de oferte
-ListSupplierProposalsAssociatedProject=Lista propunerilor furnizorilor asociate cu proiectul
-SupplierProposalsToClose=Propunerile vânzătorului să închidă
-SupplierProposalsToProcess=Propunerile furnizorilor de procesat
-LastSupplierProposals=Ultimele %scereri de preț 
+CreateEmptyAsk=Crează o cerere de preţ goală
+ConfirmCloneAsk=Sigur doriți să clonați cererea de preț <b>%s</b>?
+ConfirmReOpenAsk=Sigur doriți să redeschideți cererea de preț <b>%s</b>?
+SendAskByMail=Trimitere cerere de preţ pe mail
+SendAskRef=Trimitere cerere de preț %s
+SupplierProposalCard=Fişă cerere de preţ
+ConfirmDeleteAsk=Sigur doriți să ștergeți această cerere de preț <b>%s</b>?
+ActionsOnSupplierProposal=Evenimente pe cererea de preţ
+DocModelAuroreDescription=Un șablon complet pentru o cerere de ofertă de la furnizor (vechea implementare a șablonului Sponge)
+DocModelZenithDescription=Un șablon complet pentru o cerere de ofertă de la furnizor
+CommercialAsk=Cerere de preţ 
+DefaultModelSupplierProposalCreate=Şablon implicit de creare
+DefaultModelSupplierProposalToBill=Șablonul standard la închiderea unei cereri de preț (acceptate)
+DefaultModelSupplierProposalClosed=Șablonul standard la închiderea unei cereri de preț (refuzate)
+ListOfSupplierProposals=Lista cererilor de preţ de la furnizor
+ListSupplierProposalsAssociatedProject=Lista ofertelor de la furnizor asociate cu proiectul
+SupplierProposalsToClose=Oferte furnizor de închis
+SupplierProposalsToProcess=Oferte furnizor de procesat
+LastSupplierProposals=Ultimele %s cereri de preț 
 AllPriceRequests=Toate cererile
+TypeContact_supplier_proposal_external_SHIPPING=Contact furnizor pentru livrare
+TypeContact_supplier_proposal_external_BILLING=Contact furnizor pentru facturare
+TypeContact_supplier_proposal_external_SERVICE=Reprezentant urmărire ofertă
diff --git a/htdocs/langs/ro_RO/ticket.lang b/htdocs/langs/ro_RO/ticket.lang
index 6619bf79d69..8c18aaa8aa3 100644
--- a/htdocs/langs/ro_RO/ticket.lang
+++ b/htdocs/langs/ro_RO/ticket.lang
@@ -329,8 +329,8 @@ OldUser=Utilizator anterior
 NewUser=Utilizator nou
 NumberOfTicketsByMonth=Număr de tichete pe lună
 NbOfTickets=Număr de tichete
-ExternalContributors=External contributors
-AddContributor=Add external contributor
+ExternalContributors=Contributori externi
+AddContributor=Adăugare contributor extern
 
 # notifications
 TicketCloseEmailSubjectCustomer=Tichet închis
diff --git a/htdocs/langs/ro_RO/website.lang b/htdocs/langs/ro_RO/website.lang
index a5038f589a8..95a82e32b6a 100644
--- a/htdocs/langs/ro_RO/website.lang
+++ b/htdocs/langs/ro_RO/website.lang
@@ -158,5 +158,5 @@ Reservation=Rezervare
 PagesViewedPreviousMonth=Pagini vizualizate (luna anterioară)
 PagesViewedTotal=Pagini vizualizate (total)
 Visibility=Vizibilitate
-Everyone=Everyone
+Everyone=Oricine
 AssignedContacts=Contacte asignate
diff --git a/htdocs/langs/ru_RU/accountancy.lang b/htdocs/langs/ru_RU/accountancy.lang
index 05aab3bfdc5..343b48ec411 100644
--- a/htdocs/langs/ru_RU/accountancy.lang
+++ b/htdocs/langs/ru_RU/accountancy.lang
@@ -57,11 +57,14 @@ WarningDataDisappearsWhenDataIsExported=Warning, this list contains only the acc
 VueByAccountAccounting=Просмотр по учетной записи
 VueBySubAccountAccounting=Просмотр по субсчету бухгалтерского учета
 
-MainAccountForCustomersNotDefined=Главный бухгалтерский счет для клиентов, не определенных в настройке
-MainAccountForSuppliersNotDefined=Главный бухгалтерский счет для поставщиков, не определенных в настройке
-MainAccountForUsersNotDefined=Основная учетная запись для пользователей, не определенных в настройке
-MainAccountForVatPaymentNotDefined=Главный бухгалтерский счет для уплаты НДС не определен в настройке
-MainAccountForSubscriptionPaymentNotDefined=Основной бухгалтерский счет для оплаты подписки не определен в настройке
+MainAccountForCustomersNotDefined=Main account (from the Chart of Account) for customers not defined in setup
+MainAccountForSuppliersNotDefined=Main account (from the Chart of Account) for vendors not defined in setup
+MainAccountForUsersNotDefined=Main account (from the Chart of Account) for users not defined in setup
+MainAccountForRevenueStampSaleNotDefined=Account (from the Chart of Account) for the revenue stamp (sales) not defined in setup
+MainAccountForRevenueStampPurchaseNotDefined=Account (from the Chart of Account) for the revenue stamp (purchases) not defined in setup
+MainAccountForVatPaymentNotDefined=Account (from the Chart of Account) for VAT payment not defined in setup
+MainAccountForSubscriptionPaymentNotDefined=Account (from the Chart of Account) for membership payment not defined in setup
+MainAccountForRetainedWarrantyNotDefined=Account (from the Chart of Account) for the retained warranty not defined in setup
 UserAccountNotDefined=Accounting account for user not defined in setup
 
 AccountancyArea=Область бухгалтерского учета
diff --git a/htdocs/langs/ru_RU/admin.lang b/htdocs/langs/ru_RU/admin.lang
index 53e4750b816..711aa1e2471 100644
--- a/htdocs/langs/ru_RU/admin.lang
+++ b/htdocs/langs/ru_RU/admin.lang
@@ -1509,7 +1509,8 @@ WatermarkOnDraftContractCards=Водяной знак на черновиках
 MembersSetup=Настройка модуля участников
 MemberMainOptions=Основные настройки
 MemberCodeChecker=Options for automatic generation of member codes
-AdherentLoginRequired= Управление логином для каждого пользователя
+AdherentLoginRequired=Manage a login/password for each member
+AdherentLoginRequiredDesc=Add a value for a login and a password on the member file. If the member is linked to a user, updating the member login and password will also update the user login and password.
 AdherentMailRequired=Требуется электронная почта для создания нового участника
 MemberSendInformationByMailByDefault=Чекбокс отправить по почте подтверждение участников по умолчанию
 MemberCreateAnExternalUserForSubscriptionValidated=Создайте внешний пользовательский логин для каждой подтвержденной подписки нового участника
@@ -2076,6 +2077,10 @@ MAIN_DOCUMENTS_LOGO_HEIGHT=Высота для логотипа в PDF
 DOC_SHOW_FIRST_SALES_REP=Показать первого торгового представителя
 MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Добавить изображение в строку предложения
 MAIN_DOCUMENTS_WITH_PICTURE_WIDTH=Ширина столбца, если рисунок добавляется по линиям
+MAIN_GENERATE_DOCUMENTS_SUPPLIER_PROPOSAL_WITHOUT_UNIT_PRICE=Hide the unit price column on quotation requests
+MAIN_GENERATE_DOCUMENTS_SUPPLIER_PROPOSAL_WITHOUT_TOTAL_COLUMN=Hide the total price column on quotation requests
+MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_UNIT_PRICE=Hide the unit price column on purchase orders
+MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_TOTAL_COLUMN=Hide the total price column on puchase orders
 MAIN_PDF_NO_SENDER_FRAME=Скрыть границы в рамке адреса отправителя
 MAIN_PDF_NO_RECIPENT_FRAME=Скрыть границы в адресной рамке получателя
 MAIN_PDF_HIDE_CUSTOMER_CODE=Скрыть код клиента
@@ -2400,4 +2405,4 @@ OptionXShouldBeEnabledInModuleY=Option "<b>%s</b>" should be enabled into module
 OptionXIsCorrectlyEnabledInModuleY=Option "<b>%s</b>" is enabled into module <b>%s</b>
 AtBottomOfPage=At bottom of page
 FailedAuth=failed authentications
-MaxNumberOfFailedAuth=Max number of failed authentication in 24h to disable login.
+MaxNumberOfFailedAuth=Max number of failed authentication in 24h to deny login.
diff --git a/htdocs/langs/ru_RU/main.lang b/htdocs/langs/ru_RU/main.lang
index 50e31a6670b..d7c732ea616 100644
--- a/htdocs/langs/ru_RU/main.lang
+++ b/htdocs/langs/ru_RU/main.lang
@@ -1237,3 +1237,5 @@ SearchSyntaxTooltipForStringOrNum=For searching inside text fields, you can use
 InProgress=В процессе
 DateOfPrinting=Date of printing
 ClickFullScreenEscapeToLeave=Click here to switch in Full screen mode. Press ESCAPE to leave Full screen mode.
+UserNotYetValid=Not yet valid
+UserExpired=Истек
diff --git a/htdocs/langs/ru_RU/supplier_proposal.lang b/htdocs/langs/ru_RU/supplier_proposal.lang
index a1df1532e8a..a4670c7f9eb 100644
--- a/htdocs/langs/ru_RU/supplier_proposal.lang
+++ b/htdocs/langs/ru_RU/supplier_proposal.lang
@@ -42,7 +42,8 @@ SendAskRef=Отправка ценового запроса %s
 SupplierProposalCard=Запросить карту
 ConfirmDeleteAsk=Вы действительно хотите удалить этот ценовой запрос <b>%s</b>?
 ActionsOnSupplierProposal=События по запросу цены
-DocModelAuroreDescription=Полная модель запроса (логотип ...)
+DocModelAuroreDescription=A complete template for a vendor quotation request template (old implementation of Sponge template)
+DocModelZenithDescription=A complete template for a vendor quotation request template
 CommercialAsk=Запрос цены
 DefaultModelSupplierProposalCreate=Создание модели по умолчанию
 DefaultModelSupplierProposalToBill=Шаблон по умолчанию при закрытии запроса цены (принято)
diff --git a/htdocs/langs/sk_SK/admin.lang b/htdocs/langs/sk_SK/admin.lang
index 8ff53777252..d4688287910 100644
--- a/htdocs/langs/sk_SK/admin.lang
+++ b/htdocs/langs/sk_SK/admin.lang
@@ -1509,7 +1509,8 @@ WatermarkOnDraftContractCards=Vodoznak na návrhy zmluvy ( nie ak prázdne )
 MembersSetup=Členovia modul nastavenia
 MemberMainOptions=Hlavné voľby
 MemberCodeChecker=Options for automatic generation of member codes
-AdherentLoginRequired= Spravovanie Prihlásenie pre každého člena
+AdherentLoginRequired=Manage a login/password for each member
+AdherentLoginRequiredDesc=Add a value for a login and a password on the member file. If the member is linked to a user, updating the member login and password will also update the user login and password.
 AdherentMailRequired=Email required to create a new member
 MemberSendInformationByMailByDefault=Zaškrtávacie políčko poslať mailom potvrdenie členom (validácia alebo nové predplatné) je v predvolenom nastavení
 MemberCreateAnExternalUserForSubscriptionValidated=Create an external user login for each new member subscription validated
@@ -2076,6 +2077,10 @@ MAIN_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
 DOC_SHOW_FIRST_SALES_REP=Show first sales representative
 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_GENERATE_DOCUMENTS_SUPPLIER_PROPOSAL_WITHOUT_UNIT_PRICE=Hide the unit price column on quotation requests
+MAIN_GENERATE_DOCUMENTS_SUPPLIER_PROPOSAL_WITHOUT_TOTAL_COLUMN=Hide the total price column on quotation requests
+MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_UNIT_PRICE=Hide the unit price column on purchase orders
+MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_TOTAL_COLUMN=Hide the total price column on puchase orders
 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
@@ -2400,4 +2405,4 @@ OptionXShouldBeEnabledInModuleY=Option "<b>%s</b>" should be enabled into module
 OptionXIsCorrectlyEnabledInModuleY=Option "<b>%s</b>" is enabled into module <b>%s</b>
 AtBottomOfPage=At bottom of page
 FailedAuth=failed authentications
-MaxNumberOfFailedAuth=Max number of failed authentication in 24h to disable login.
+MaxNumberOfFailedAuth=Max number of failed authentication in 24h to deny login.
diff --git a/htdocs/langs/sk_SK/main.lang b/htdocs/langs/sk_SK/main.lang
index c6fd6920ea0..00202103ef3 100644
--- a/htdocs/langs/sk_SK/main.lang
+++ b/htdocs/langs/sk_SK/main.lang
@@ -235,6 +235,8 @@ PersonalValue=Osobné hodnota
 NewObject=New %s
 NewValue=Nová hodnota
 OldValue=Old value %s
+FieldXModified=Field %s modified
+FieldXModifiedFromYToZ=Field %s modified from %s to %s
 CurrentValue=Súčasná hodnota
 Code=Kód
 Type=Typ
@@ -346,6 +348,7 @@ MonthOfDay=Mesiaca odo dňa
 DaysOfWeek=Days of week
 HourShort=H
 MinuteShort=mn
+SecondShort=sec
 Rate=Sadzba
 CurrencyRate=Currency conversion rate
 UseLocalTax=Vrátane DPH
@@ -555,6 +558,7 @@ Unknown=Neznámy
 General=Všeobecný
 Size=Veľkosť
 OriginalSize=Original size
+RotateImage=Rotate 90°
 Received=Prijaté
 Paid=Platený
 Topic=Subject
@@ -1229,4 +1233,9 @@ PublicVirtualCard=Virtual business card
 TreeView=Tree view
 DropFileToAddItToObject=Drop a file to add it to this object
 UploadFileDragDropSuccess=The file(s) have been uploaded successfully
-SearchSyntaxTooltipForStringOrNum=For searching inside text fields, you can use the characters ^ or $ to make a 'start or end with' search or use the ! to make a 'does not contain' test. You can use the | between two strings instead of a space for a 'OR' condition instead of 'AND'. For numeric values, you can use the operator <, >, <= or >= before the value to filter using a mathematical comparison
+SearchSyntaxTooltipForStringOrNum=For searching inside text fields, you can use the characters ^ or $ to make a 'start or end with' search or use the ! to make a 'does not contain' test. You can use the | between two strings instead of a space for a 'OR' condition instead of 'AND'. For numeric values, you can use the operator <, >, <=, >= or != before the value, to filter using a mathematical comparison
+InProgress=In progress
+DateOfPrinting=Date of printing
+ClickFullScreenEscapeToLeave=Click here to switch in Full screen mode. Press ESCAPE to leave Full screen mode.
+UserNotYetValid=Not yet valid
+UserExpired=Vypršala
diff --git a/htdocs/langs/sk_SK/supplier_proposal.lang b/htdocs/langs/sk_SK/supplier_proposal.lang
index 8b205419665..ef997e7352a 100644
--- a/htdocs/langs/sk_SK/supplier_proposal.lang
+++ b/htdocs/langs/sk_SK/supplier_proposal.lang
@@ -13,6 +13,7 @@ SupplierProposalArea=Vendor proposals area
 SupplierProposalShort=Vendor proposal
 SupplierProposals=Vendor proposals
 SupplierProposalsShort=Vendor proposals
+AskPrice=Cenová požiadávka
 NewAskPrice=Nová cenová požiadávka
 ShowSupplierProposal=Zobraziť cenovú požiadávku
 AddSupplierProposal=Vytvoriť cenovú požiadávku
@@ -32,7 +33,7 @@ SupplierProposalStatusValidatedShort=Overené
 SupplierProposalStatusClosedShort=Zatvorené
 SupplierProposalStatusSignedShort=Akceptované
 SupplierProposalStatusNotSignedShort=Odmietol
-CopyAskFrom=Vytvoriť cenovú požiadávku skopírovaním existujúcej požiadávky
+CopyAskFrom=Create a price request by copying an existing request
 CreateEmptyAsk=Vytvoriť prázdnu požiadávku
 ConfirmCloneAsk=Určite chcete duplikovať túto cenovú požiadávku <b>%s</b>?
 ConfirmReOpenAsk=Určite chcete znova otvoriť  cenovú požiadávku  <b>%s</b>?
@@ -41,7 +42,8 @@ SendAskRef=Odosielanie cenovej požiadávky %s
 SupplierProposalCard=Karta žiadosti
 ConfirmDeleteAsk=Určite chcete zmazať cenovú požiadávku <b>%s</b>?
 ActionsOnSupplierProposal=Udalosti na cenovej požiadávke
-DocModelAuroreDescription=Úplný model požiadávky ( logo... ) 
+DocModelAuroreDescription=A complete template for a vendor quotation request template (old implementation of Sponge template)
+DocModelZenithDescription=A complete template for a vendor quotation request template
 CommercialAsk=Cenová požiadavka
 DefaultModelSupplierProposalCreate=Predvolené model, tvorba
 DefaultModelSupplierProposalToBill=Základná šablóna pri uzatváraní cenovej požiadávky ( akceptovaná )
@@ -52,3 +54,6 @@ SupplierProposalsToClose=Vendor proposals to close
 SupplierProposalsToProcess=Vendor proposals to process
 LastSupplierProposals=Latest %s price requests
 AllPriceRequests=Všetky požiadávky
+TypeContact_supplier_proposal_external_SHIPPING=Vendor contact for delivery
+TypeContact_supplier_proposal_external_BILLING=Vendor contact for billing
+TypeContact_supplier_proposal_external_SERVICE=Zástupca nasledujúce vypracovaného návrhu
diff --git a/htdocs/langs/sl_SI/accountancy.lang b/htdocs/langs/sl_SI/accountancy.lang
index fea9e2932eb..ecfb7166193 100644
--- a/htdocs/langs/sl_SI/accountancy.lang
+++ b/htdocs/langs/sl_SI/accountancy.lang
@@ -57,11 +57,14 @@ WarningDataDisappearsWhenDataIsExported=Warning, this list contains only the acc
 VueByAccountAccounting=Ogled po računovodskem računu
 VueBySubAccountAccounting=Pogled po računovodskih podkontih
 
-MainAccountForCustomersNotDefined=Glavni računovodski račun za stranke, ki niso definirane v nastavitvah
-MainAccountForSuppliersNotDefined=Glavni računovodski račun za prodajalce, ki niso definirani v nastavitvah
-MainAccountForUsersNotDefined=Glavni računovodski račun za uporabnike, ki niso definirani v nastavitvah
-MainAccountForVatPaymentNotDefined=Glavni računovodski račun za plačilo DDV ni definiran v nastavitvah
-MainAccountForSubscriptionPaymentNotDefined=V nastavitvah ni definiran glavni računovodski račun za plačilo naročnine
+MainAccountForCustomersNotDefined=Main account (from the Chart of Account) for customers not defined in setup
+MainAccountForSuppliersNotDefined=Main account (from the Chart of Account) for vendors not defined in setup
+MainAccountForUsersNotDefined=Main account (from the Chart of Account) for users not defined in setup
+MainAccountForRevenueStampSaleNotDefined=Account (from the Chart of Account) for the revenue stamp (sales) not defined in setup
+MainAccountForRevenueStampPurchaseNotDefined=Account (from the Chart of Account) for the revenue stamp (purchases) not defined in setup
+MainAccountForVatPaymentNotDefined=Account (from the Chart of Account) for VAT payment not defined in setup
+MainAccountForSubscriptionPaymentNotDefined=Account (from the Chart of Account) for membership payment not defined in setup
+MainAccountForRetainedWarrantyNotDefined=Account (from the Chart of Account) for the retained warranty not defined in setup
 UserAccountNotDefined=Računovodski račun za uporabnika ni definiran v nastavitvah
 
 AccountancyArea=Računovodsko področje
diff --git a/htdocs/langs/sl_SI/admin.lang b/htdocs/langs/sl_SI/admin.lang
index 9e2e18b9629..a940f988d7b 100644
--- a/htdocs/langs/sl_SI/admin.lang
+++ b/htdocs/langs/sl_SI/admin.lang
@@ -1509,7 +1509,8 @@ WatermarkOnDraftContractCards=Vodni tisk na osnutkih pogodb (brez, če je prazno
 MembersSetup=Nastavitve modula članov
 MemberMainOptions=Glavne opcije
 MemberCodeChecker=Options for automatic generation of member codes
-AdherentLoginRequired= Urejanje uporabniških imen za vse člane
+AdherentLoginRequired=Manage a login/password for each member
+AdherentLoginRequiredDesc=Add a value for a login and a password on the member file. If the member is linked to a user, updating the member login and password will also update the user login and password.
 AdherentMailRequired=Za ustvarjanje novega člana je potreben e-poštni naslov
 MemberSendInformationByMailByDefault=Kontrolno polje za pošiljanje potrdil članom po pošti (potrditev ali nova naročnina) je privzeto označeno
 MemberCreateAnExternalUserForSubscriptionValidated=Ustvarite prijavo zunanjega uporabnika za vsako potrjeno naročnino novega člana
@@ -2076,6 +2077,10 @@ MAIN_DOCUMENTS_LOGO_HEIGHT=Višina za logotip v PDF
 DOC_SHOW_FIRST_SALES_REP=Prikaži prvega prodajnega predstavnika
 MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Dodajte stolpec za sliko v vrstice predlogov
 MAIN_DOCUMENTS_WITH_PICTURE_WIDTH=Širina stolpca, če je slika dodana v vrstice
+MAIN_GENERATE_DOCUMENTS_SUPPLIER_PROPOSAL_WITHOUT_UNIT_PRICE=Hide the unit price column on quotation requests
+MAIN_GENERATE_DOCUMENTS_SUPPLIER_PROPOSAL_WITHOUT_TOTAL_COLUMN=Hide the total price column on quotation requests
+MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_UNIT_PRICE=Hide the unit price column on purchase orders
+MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_TOTAL_COLUMN=Hide the total price column on puchase orders
 MAIN_PDF_NO_SENDER_FRAME=Skrij obrobe okvirja naslova pošiljatelja
 MAIN_PDF_NO_RECIPENT_FRAME=Skrij obrobe okvirja naslova prejemnika
 MAIN_PDF_HIDE_CUSTOMER_CODE=Skrij kodo stranke
@@ -2400,4 +2405,4 @@ OptionXShouldBeEnabledInModuleY=Option "<b>%s</b>" should be enabled into module
 OptionXIsCorrectlyEnabledInModuleY=Option "<b>%s</b>" is enabled into module <b>%s</b>
 AtBottomOfPage=At bottom of page
 FailedAuth=failed authentications
-MaxNumberOfFailedAuth=Max number of failed authentication in 24h to disable login.
+MaxNumberOfFailedAuth=Max number of failed authentication in 24h to deny login.
diff --git a/htdocs/langs/sl_SI/main.lang b/htdocs/langs/sl_SI/main.lang
index d15916b660a..eab4f6f9b40 100644
--- a/htdocs/langs/sl_SI/main.lang
+++ b/htdocs/langs/sl_SI/main.lang
@@ -1237,3 +1237,5 @@ SearchSyntaxTooltipForStringOrNum=For searching inside text fields, you can use
 InProgress=V postopku
 DateOfPrinting=Date of printing
 ClickFullScreenEscapeToLeave=Click here to switch in Full screen mode. Press ESCAPE to leave Full screen mode.
+UserNotYetValid=Not yet valid
+UserExpired=Pretečen
diff --git a/htdocs/langs/sl_SI/modulebuilder.lang b/htdocs/langs/sl_SI/modulebuilder.lang
index 8f8581bb1e8..6c2560f602d 100644
--- a/htdocs/langs/sl_SI/modulebuilder.lang
+++ b/htdocs/langs/sl_SI/modulebuilder.lang
@@ -28,6 +28,7 @@ ModuleBuilderDescwidgets=Ta zavihek je namenjen upravljanju/izdelavi pripomočko
 ModuleBuilderDescbuildpackage=Tukaj lahko ustvarite datoteko paketa, pripravljeno za distribucijo (normalizirano datoteko .zip) vašega modula in dokumentacijsko datoteko, pripravljeno za distribucijo. Preprosto kliknite gumb za izdelavo paketa ali dokumentacijske datoteke.
 EnterNameOfModuleToDeleteDesc=Svoj modul lahko izbrišete. OPOZORILO: Vse datoteke kodiranja modula (generirane ali ustvarjene ročno) TER strukturirani podatki in dokumentacija bodo izbrisani!
 EnterNameOfObjectToDeleteDesc=Predmet lahko izbrišete. OPOZORILO: Vse datoteke kodiranja (generirane ali ustvarjene ročno), povezane z objektom, bodo izbrisane!
+EnterNameOfObjectToDeleteDesc=Predmet lahko izbrišete. OPOZORILO: Vse datoteke kodiranja (generirane ali ustvarjene ročno), povezane z objektom, bodo izbrisane!
 DangerZone=Nevarno območje
 BuildPackage=Zgradite paket
 BuildPackageDesc=Lahko ustvarite zip paket svoje aplikacije, tako da ste pripravljeni za distribucijo na kateri koli Dolibarr. Lahko ga tudi distribuirate ali prodajate na trgu, kot je <a href="https://www.dolistore.com"> DoliStore.com </a>.
@@ -162,11 +163,11 @@ ListOfTabsEntries=Seznam vnosov zavihkov
 TabsDefDesc=Tukaj določite zavihke, ki jih ponuja vaš modul
 TabsDefDescTooltip=Zavihki, ki jih nudi vaš modul/aplikacija, so definirani v matriki <strong> $this->tabs </strong> v datoteki deskriptorja modula. To datoteko lahko urejate ročno ali uporabite vdelani urejevalnik.
 BadValueForType=Neveljaven tip %s
-DefinePropertiesFromExistingTable=Definirajte lastnosti iz obstoječe tabele
+DefinePropertiesFromExistingTable=Define the fields/properties from an existing table
 DefinePropertiesFromExistingTableDesc=Če tabela v bazi podatkov (za objekt, ki ga želite ustvariti) že obstaja, jo lahko uporabite za definiranje lastnosti predmeta.
 DefinePropertiesFromExistingTableDesc2=Pustite prazno, če tabela še ne obstaja. Generator kode bo uporabil različne vrste polj za izdelavo primera tabele, ki jo lahko pozneje urejate.
-GeneratePermissions=I want to add the rights for this object
-GeneratePermissionsHelp=generate default rights for this object
+GeneratePermissions=I want to manage permissions on this object
+GeneratePermissionsHelp=If you check this, some code will be added to manage permissions to read, write and delete record of the objects
 PermissionDeletedSuccesfuly=Permission has been successfully removed
 PermissionUpdatedSuccesfuly=Permission has been successfully updated
 PermissionAddedSuccesfuly=Permission has been successfully added
@@ -177,3 +178,6 @@ ApiObjectDeleted=API for object %s has been successfully deleted
 CRUDRead=Preberite
 CRUDCreateWrite=Create or Update
 FailedToAddCodeIntoDescriptor=Failed to add code into descriptor. Check that the string comment "%s" is still present into the file.
+DictionariesCreated=Dictionary <b>%s</b> created successfully
+DictionaryDeleted=Dictionary <b>%s</b> removed successfully
+PropertyModuleUpdated=Property <b>%s</b> has been update successfully
diff --git a/htdocs/langs/sl_SI/supplier_proposal.lang b/htdocs/langs/sl_SI/supplier_proposal.lang
index eb24c199f41..8cf038e6129 100644
--- a/htdocs/langs/sl_SI/supplier_proposal.lang
+++ b/htdocs/langs/sl_SI/supplier_proposal.lang
@@ -42,7 +42,8 @@ SendAskRef=Pošiljanje povpraševanja po ceni %s
 SupplierProposalCard=Zahtevaj kartico
 ConfirmDeleteAsk=Ali ste prepričani, da želite izbrisati to zahtevo za ceno <b> %s </b>?
 ActionsOnSupplierProposal=Dogodki po ceni na povpraševanje
-DocModelAuroreDescription=Popoln model zahteve (logotip ...)
+DocModelAuroreDescription=A complete template for a vendor quotation request template (old implementation of Sponge template)
+DocModelZenithDescription=A complete template for a vendor quotation request template
 CommercialAsk=Zahteva po ceni
 DefaultModelSupplierProposalCreate=Ustvarjanje privzetega modela
 DefaultModelSupplierProposalToBill=Privzeta predloga pri zapiranju zahteve za ceno (sprejeto)
diff --git a/htdocs/langs/sr_RS/admin.lang b/htdocs/langs/sr_RS/admin.lang
index 1ee4a00a586..b06fb8df4e9 100644
--- a/htdocs/langs/sr_RS/admin.lang
+++ b/htdocs/langs/sr_RS/admin.lang
@@ -1509,7 +1509,8 @@ WatermarkOnDraftContractCards=Watermark on draft contracts (none if empty)
 MembersSetup=Members module setup
 MemberMainOptions=Main options
 MemberCodeChecker=Options for automatic generation of member codes
-AdherentLoginRequired= Manage a Login for each member
+AdherentLoginRequired=Manage a login/password for each member
+AdherentLoginRequiredDesc=Add a value for a login and a password on the member file. If the member is linked to a user, updating the member login and password will also update the user login and password.
 AdherentMailRequired=Email required to create a new member
 MemberSendInformationByMailByDefault=Checkbox to send mail confirmation to members (validation or new subscription) is on by default
 MemberCreateAnExternalUserForSubscriptionValidated=Create an external user login for each new member subscription validated
@@ -2076,6 +2077,10 @@ MAIN_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
 DOC_SHOW_FIRST_SALES_REP=Show first sales representative
 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_GENERATE_DOCUMENTS_SUPPLIER_PROPOSAL_WITHOUT_UNIT_PRICE=Hide the unit price column on quotation requests
+MAIN_GENERATE_DOCUMENTS_SUPPLIER_PROPOSAL_WITHOUT_TOTAL_COLUMN=Hide the total price column on quotation requests
+MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_UNIT_PRICE=Hide the unit price column on purchase orders
+MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_TOTAL_COLUMN=Hide the total price column on puchase orders
 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
@@ -2400,4 +2405,4 @@ OptionXShouldBeEnabledInModuleY=Option "<b>%s</b>" should be enabled into module
 OptionXIsCorrectlyEnabledInModuleY=Option "<b>%s</b>" is enabled into module <b>%s</b>
 AtBottomOfPage=At bottom of page
 FailedAuth=failed authentications
-MaxNumberOfFailedAuth=Max number of failed authentication in 24h to disable login.
+MaxNumberOfFailedAuth=Max number of failed authentication in 24h to deny login.
diff --git a/htdocs/langs/sr_RS/main.lang b/htdocs/langs/sr_RS/main.lang
index 93c3969559d..9d1a481f598 100644
--- a/htdocs/langs/sr_RS/main.lang
+++ b/htdocs/langs/sr_RS/main.lang
@@ -1237,3 +1237,5 @@ SearchSyntaxTooltipForStringOrNum=For searching inside text fields, you can use
 InProgress=U toku
 DateOfPrinting=Date of printing
 ClickFullScreenEscapeToLeave=Click here to switch in Full screen mode. Press ESCAPE to leave Full screen mode.
+UserNotYetValid=Not yet valid
+UserExpired=Istekla
diff --git a/htdocs/langs/sr_RS/supplier_proposal.lang b/htdocs/langs/sr_RS/supplier_proposal.lang
index d3857cc2787..fa946586484 100644
--- a/htdocs/langs/sr_RS/supplier_proposal.lang
+++ b/htdocs/langs/sr_RS/supplier_proposal.lang
@@ -13,6 +13,7 @@ SupplierProposalArea=Vendor proposals area
 SupplierProposalShort=Vendor proposal
 SupplierProposals=Vendor proposals
 SupplierProposalsShort=Vendor proposals
+AskPrice=Zahtev za cenu
 NewAskPrice=Novi zahtev za cenu
 ShowSupplierProposal=Prikaži zahtev za cenu
 AddSupplierProposal=Kreiraj zahtev za cenu
@@ -41,7 +42,8 @@ SendAskRef=Slanje zahteva za cenu %s
 SupplierProposalCard=Kartica zahteva
 ConfirmDeleteAsk=Da li ste sigurni da želite da obrišete ovaj upit za cenu <b>%s</b>?
 ActionsOnSupplierProposal=Događaji na zahtevu za cenu
-DocModelAuroreDescription=Kompletan model zahteva (logo...)
+DocModelAuroreDescription=A complete template for a vendor quotation request template (old implementation of Sponge template)
+DocModelZenithDescription=A complete template for a vendor quotation request template
 CommercialAsk=Zahtev za cenu
 DefaultModelSupplierProposalCreate=Default model za kreiranje
 DefaultModelSupplierProposalToBill=Default template prilikom zatvaranja zahteva za cenu (prihvaćen)
@@ -52,3 +54,6 @@ SupplierProposalsToClose=Vendor proposals to close
 SupplierProposalsToProcess=Vendor proposals to process
 LastSupplierProposals=Najnoviji %s upiti za cenu
 AllPriceRequests=Svi zahtevi
+TypeContact_supplier_proposal_external_SHIPPING=Vendor contact for delivery
+TypeContact_supplier_proposal_external_BILLING=Vendor contact for billing
+TypeContact_supplier_proposal_external_SERVICE=Agent koji prati ponudu
diff --git a/htdocs/langs/sv_SE/accountancy.lang b/htdocs/langs/sv_SE/accountancy.lang
index d0e82994fd0..ae529dee7d1 100644
--- a/htdocs/langs/sv_SE/accountancy.lang
+++ b/htdocs/langs/sv_SE/accountancy.lang
@@ -57,11 +57,14 @@ WarningDataDisappearsWhenDataIsExported=Warning, this list contains only the acc
 VueByAccountAccounting=Visa baserat på redovisningskonto
 VueBySubAccountAccounting=Visa efter redovisning av underkonto
 
-MainAccountForCustomersNotDefined=Huvudsakliga bokföringskonto för kunder som inte definierats i installationen
-MainAccountForSuppliersNotDefined=Huvudkonton för leverantörer som inte definierats i installationen
-MainAccountForUsersNotDefined=Huvudkontonskonto för användare som inte definierats i installationen
-MainAccountForVatPaymentNotDefined=Huvudkonton för momsbetalning som inte definieras i inställningen
-MainAccountForSubscriptionPaymentNotDefined=Huvudkonton för abonnemangsbetalning som inte definieras i inställningen
+MainAccountForCustomersNotDefined=Main account (from the Chart of Account) for customers not defined in setup
+MainAccountForSuppliersNotDefined=Main account (from the Chart of Account) for vendors not defined in setup
+MainAccountForUsersNotDefined=Main account (from the Chart of Account) for users not defined in setup
+MainAccountForRevenueStampSaleNotDefined=Account (from the Chart of Account) for the revenue stamp (sales) not defined in setup
+MainAccountForRevenueStampPurchaseNotDefined=Account (from the Chart of Account) for the revenue stamp (purchases) not defined in setup
+MainAccountForVatPaymentNotDefined=Account (from the Chart of Account) for VAT payment not defined in setup
+MainAccountForSubscriptionPaymentNotDefined=Account (from the Chart of Account) for membership payment not defined in setup
+MainAccountForRetainedWarrantyNotDefined=Account (from the Chart of Account) for the retained warranty not defined in setup
 UserAccountNotDefined=Redovisningskonto för användare är inte definierat i konfigurationen
 
 AccountancyArea=Redovisningsområde
diff --git a/htdocs/langs/sv_SE/admin.lang b/htdocs/langs/sv_SE/admin.lang
index abbc0d51a66..dbca8fdecf8 100644
--- a/htdocs/langs/sv_SE/admin.lang
+++ b/htdocs/langs/sv_SE/admin.lang
@@ -1509,7 +1509,8 @@ WatermarkOnDraftContractCards=Vattenstämpel på kontraktsförslag (inget om fä
 MembersSetup=Medlemmar modul inställning
 MemberMainOptions=Huvudalternativ
 MemberCodeChecker=Alternativ för automatisk generation av medlemskoder
-AdherentLoginRequired= Hantera en inloggning för varje medlem
+AdherentLoginRequired=Manage a login/password for each member
+AdherentLoginRequiredDesc=Add a value for a login and a password on the member file. If the member is linked to a user, updating the member login and password will also update the user login and password.
 AdherentMailRequired=E-post krävs för att skapa en ny medlem
 MemberSendInformationByMailByDefault=Kryssruta för att skicka e-post bekräftelse till medlemmar (bekräftande eller nya abonnemang) är aktiverat som standard
 MemberCreateAnExternalUserForSubscriptionValidated=Skapa en extern användarinloggning för varje validerad ny medlemsabonnemang
@@ -2076,6 +2077,10 @@ MAIN_DOCUMENTS_LOGO_HEIGHT=Höjd på logotyp i PDF
 DOC_SHOW_FIRST_SALES_REP=Visa första säljare
 MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Lägg till kolumn för bild på offertrader
 MAIN_DOCUMENTS_WITH_PICTURE_WIDTH=Bredd på kolumnen om en bild läggs till på rader
+MAIN_GENERATE_DOCUMENTS_SUPPLIER_PROPOSAL_WITHOUT_UNIT_PRICE=Hide the unit price column on quotation requests
+MAIN_GENERATE_DOCUMENTS_SUPPLIER_PROPOSAL_WITHOUT_TOTAL_COLUMN=Hide the total price column on quotation requests
+MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_UNIT_PRICE=Hide the unit price column on purchase orders
+MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_TOTAL_COLUMN=Hide the total price column on puchase orders
 MAIN_PDF_NO_SENDER_FRAME=Dölj kanter på avsändarens adressram
 MAIN_PDF_NO_RECIPENT_FRAME=Dölj kanter på mottagarens adressram
 MAIN_PDF_HIDE_CUSTOMER_CODE=Dölj kundnummer
@@ -2400,4 +2405,4 @@ OptionXShouldBeEnabledInModuleY=Option "<b>%s</b>" should be enabled into module
 OptionXIsCorrectlyEnabledInModuleY=Option "<b>%s</b>" is enabled into module <b>%s</b>
 AtBottomOfPage=At bottom of page
 FailedAuth=failed authentications
-MaxNumberOfFailedAuth=Max number of failed authentication in 24h to disable login.
+MaxNumberOfFailedAuth=Max number of failed authentication in 24h to deny login.
diff --git a/htdocs/langs/sv_SE/main.lang b/htdocs/langs/sv_SE/main.lang
index ec09ba92a80..f0c54aa6f4a 100644
--- a/htdocs/langs/sv_SE/main.lang
+++ b/htdocs/langs/sv_SE/main.lang
@@ -1237,3 +1237,5 @@ SearchSyntaxTooltipForStringOrNum=For searching inside text fields, you can use
 InProgress=Pågående
 DateOfPrinting=Date of printing
 ClickFullScreenEscapeToLeave=Click here to switch in Full screen mode. Press ESCAPE to leave Full screen mode.
+UserNotYetValid=Not yet valid
+UserExpired=Utgånget
diff --git a/htdocs/langs/sv_SE/modulebuilder.lang b/htdocs/langs/sv_SE/modulebuilder.lang
index 6e491b5aaff..8731c8a185e 100644
--- a/htdocs/langs/sv_SE/modulebuilder.lang
+++ b/htdocs/langs/sv_SE/modulebuilder.lang
@@ -28,6 +28,7 @@ ModuleBuilderDescwidgets=Den här fliken är avsedd att hantera / bygga widgets.
 ModuleBuilderDescbuildpackage=Du kan generera här en "färdig att distribuera" paketfil (en normaliserad .zip-fil) av din modul och en "färdig att distribuera" dokumentationsfil. Klicka bara på knappen för att bygga paketet eller dokumentationsfilen.
 EnterNameOfModuleToDeleteDesc=Du kan radera din modul. VARNING: Alla kodningsfiler för modulen (genereras eller skapas manuellt) OCH strukturerad data och dokumentation raderas!
 EnterNameOfObjectToDeleteDesc=Du kan radera ett objekt. VARNING: Alla kodningsfiler (genererade eller skapade manuellt) relaterade till objekt raderas!
+EnterNameOfObjectToDeleteDesc=Du kan radera ett objekt. VARNING: Alla kodningsfiler (genererade eller skapade manuellt) relaterade till objekt raderas!
 DangerZone=Farozon
 BuildPackage=Bygg paketet
 BuildPackageDesc=Du kan skapa ett zip-paket av din applikation så att du är redo att distribuera den på valfri Dolibarr. Du kan också distribuera den eller sälja den på marknadsplatsen som <a href="https://www.dolistore.com"> DoliStore.com </a>.
@@ -162,11 +163,11 @@ ListOfTabsEntries=Lista över flikposter
 TabsDefDesc=Definiera flikarna som tillhandahålls av din modul
 TabsDefDescTooltip=Flikarna som tillhandahålls av din modul/applikation är definierade i arrayen <strong> $this->tabs </strong> i modulbeskrivningsfilen. Du kan redigera den här filen manuellt eller använda den inbäddade redigeraren.
 BadValueForType=Fel värde för typ %s
-DefinePropertiesFromExistingTable=Definiera egenskaper från en befintlig tabell
+DefinePropertiesFromExistingTable=Define the fields/properties from an existing table
 DefinePropertiesFromExistingTableDesc=Om det redan finns en tabell i databasen (för objektet att skapa) kan du använda den för att definiera objektets egenskaper.
 DefinePropertiesFromExistingTableDesc2=Håll tabellen tom om den inte finns ännu. Kodgeneratorn kommer att använda olika typer av fält för att bygga ett exempel på tabell som du kan redigera senare.
-GeneratePermissions=Jag vill lägga till rättigheterna för detta objekt
-GeneratePermissionsHelp=generera standardrättigheter för detta objekt
+GeneratePermissions=I want to manage permissions on this object
+GeneratePermissionsHelp=If you check this, some code will be added to manage permissions to read, write and delete record of the objects
 PermissionDeletedSuccesfuly=Behörigheten har tagits bort
 PermissionUpdatedSuccesfuly=Behörigheten har uppdaterats
 PermissionAddedSuccesfuly=Behörighet har lagts till
@@ -177,3 +178,6 @@ ApiObjectDeleted=API for object %s has been successfully deleted
 CRUDRead=Läsa
 CRUDCreateWrite=Create or Update
 FailedToAddCodeIntoDescriptor=Failed to add code into descriptor. Check that the string comment "%s" is still present into the file.
+DictionariesCreated=Dictionary <b>%s</b> created successfully
+DictionaryDeleted=Dictionary <b>%s</b> removed successfully
+PropertyModuleUpdated=Property <b>%s</b> has been update successfully
diff --git a/htdocs/langs/sv_SE/supplier_proposal.lang b/htdocs/langs/sv_SE/supplier_proposal.lang
index 772a3146902..156ac7965b7 100644
--- a/htdocs/langs/sv_SE/supplier_proposal.lang
+++ b/htdocs/langs/sv_SE/supplier_proposal.lang
@@ -42,7 +42,8 @@ SendAskRef=Skickar prisförfrågan %s
 SupplierProposalCard=Förfråganskort
 ConfirmDeleteAsk=Är du säker på att du vill radera denna prisförfrågan <b>%s</b>?
 ActionsOnSupplierProposal=Händelser för prisförfrågan
-DocModelAuroreDescription=En komplett modell (logotyp ...)
+DocModelAuroreDescription=A complete template for a vendor quotation request template (old implementation of Sponge template)
+DocModelZenithDescription=A complete template for a vendor quotation request template
 CommercialAsk=Prisförfrågan
 DefaultModelSupplierProposalCreate=Skapa standardmodell
 DefaultModelSupplierProposalToBill=Standardmall när du avslutar en prisförfrågan (accepterad)
diff --git a/htdocs/langs/sw_SW/accountancy.lang b/htdocs/langs/sw_SW/accountancy.lang
index dbee22ef000..d473d79055c 100644
--- a/htdocs/langs/sw_SW/accountancy.lang
+++ b/htdocs/langs/sw_SW/accountancy.lang
@@ -57,11 +57,14 @@ WarningDataDisappearsWhenDataIsExported=Onyo, orodha hii ina maingizo ya uhasibu
 VueByAccountAccounting=Tazama kwa akaunti ya uhasibu
 VueBySubAccountAccounting=Tazama kwa akaunti ndogo ya uhasibu
 
-MainAccountForCustomersNotDefined=Akaunti kuu ya uhasibu kwa wateja ambayo haijafafanuliwa katika usanidi
-MainAccountForSuppliersNotDefined=Akaunti kuu ya uhasibu kwa wachuuzi haijafafanuliwa katika usanidi
-MainAccountForUsersNotDefined=Akaunti kuu ya uhasibu kwa watumiaji ambayo haijafafanuliwa katika usanidi
-MainAccountForVatPaymentNotDefined=Akaunti kuu ya uhasibu kwa malipo ya VAT haijafafanuliwa katika usanidi
-MainAccountForSubscriptionPaymentNotDefined=Akaunti kuu ya uhasibu kwa malipo ya usajili haijafafanuliwa katika usanidi
+MainAccountForCustomersNotDefined=Main account (from the Chart of Account) for customers not defined in setup
+MainAccountForSuppliersNotDefined=Main account (from the Chart of Account) for vendors not defined in setup
+MainAccountForUsersNotDefined=Main account (from the Chart of Account) for users not defined in setup
+MainAccountForRevenueStampSaleNotDefined=Account (from the Chart of Account) for the revenue stamp (sales) not defined in setup
+MainAccountForRevenueStampPurchaseNotDefined=Account (from the Chart of Account) for the revenue stamp (purchases) not defined in setup
+MainAccountForVatPaymentNotDefined=Account (from the Chart of Account) for VAT payment not defined in setup
+MainAccountForSubscriptionPaymentNotDefined=Account (from the Chart of Account) for membership payment not defined in setup
+MainAccountForRetainedWarrantyNotDefined=Account (from the Chart of Account) for the retained warranty not defined in setup
 UserAccountNotDefined=Akaunti ya uhasibu kwa mtumiaji haijafafanuliwa katika usanidi
 
 AccountancyArea=Eneo la uhasibu
diff --git a/htdocs/langs/sw_SW/admin.lang b/htdocs/langs/sw_SW/admin.lang
index ed2928a0c5c..1ce5936732c 100644
--- a/htdocs/langs/sw_SW/admin.lang
+++ b/htdocs/langs/sw_SW/admin.lang
@@ -1509,7 +1509,8 @@ WatermarkOnDraftContractCards=Watermark kwenye rasimu ya mikataba (hakuna ikiwa
 MembersSetup=Usanidi wa moduli za wanachama
 MemberMainOptions=Chaguzi kuu
 MemberCodeChecker=Chaguzi za kuunda kiotomatiki misimbo ya wanachama
-AdherentLoginRequired= Dhibiti Kuingia kwa kila mwanachama
+AdherentLoginRequired=Manage a login/password for each member
+AdherentLoginRequiredDesc=Add a value for a login and a password on the member file. If the member is linked to a user, updating the member login and password will also update the user login and password.
 AdherentMailRequired=Barua pepe inahitajika ili kuunda mwanachama mpya
 MemberSendInformationByMailByDefault=Kisanduku cha kuteua cha kutuma uthibitisho wa barua kwa wanachama (uthibitishaji au usajili mpya) umewashwa kwa chaguomsingi
 MemberCreateAnExternalUserForSubscriptionValidated=Unda kuingia kwa mtumiaji wa nje kwa kila usajili mpya wa mwanachama uliothibitishwa
@@ -2076,6 +2077,10 @@ MAIN_DOCUMENTS_LOGO_HEIGHT=Urefu wa nembo kwenye PDF
 DOC_SHOW_FIRST_SALES_REP=Onyesha mwakilishi wa kwanza wa mauzo
 MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Ongeza safu wima kwa picha kwenye mistari ya pendekezo
 MAIN_DOCUMENTS_WITH_PICTURE_WIDTH=Upana wa safu ikiwa picha imeongezwa kwenye mistari
+MAIN_GENERATE_DOCUMENTS_SUPPLIER_PROPOSAL_WITHOUT_UNIT_PRICE=Hide the unit price column on quotation requests
+MAIN_GENERATE_DOCUMENTS_SUPPLIER_PROPOSAL_WITHOUT_TOTAL_COLUMN=Hide the total price column on quotation requests
+MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_UNIT_PRICE=Hide the unit price column on purchase orders
+MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_TOTAL_COLUMN=Hide the total price column on puchase orders
 MAIN_PDF_NO_SENDER_FRAME=Ficha mipaka kwenye fremu ya anwani ya mtumaji
 MAIN_PDF_NO_RECIPENT_FRAME=Ficha mipaka kwenye fremu ya anwani ya mapishi
 MAIN_PDF_HIDE_CUSTOMER_CODE=Ficha nambari ya mteja
@@ -2400,4 +2405,4 @@ OptionXShouldBeEnabledInModuleY=Chaguo " <b> %s </b> " inapaswa kuwashwa katika
 OptionXIsCorrectlyEnabledInModuleY=Chaguo " <b> %s </b> " imewashwa kuwa moduli <b> %s </b> 
 AtBottomOfPage=Chini ya ukurasa
 FailedAuth=failed authentications
-MaxNumberOfFailedAuth=Max number of failed authentication in 24h to disable login.
+MaxNumberOfFailedAuth=Max number of failed authentication in 24h to deny login.
diff --git a/htdocs/langs/sw_SW/modulebuilder.lang b/htdocs/langs/sw_SW/modulebuilder.lang
index 2dd5e0be3d5..1289e90fe0b 100644
--- a/htdocs/langs/sw_SW/modulebuilder.lang
+++ b/htdocs/langs/sw_SW/modulebuilder.lang
@@ -163,11 +163,11 @@ ListOfTabsEntries=Orodha ya maingizo ya kichupo
 TabsDefDesc=Bainisha hapa vichupo vilivyotolewa na moduli yako
 TabsDefDescTooltip=Vichupo vilivyotolewa na sehemu/programu yako vimefafanuliwa katika safu <strong> $this->tabo </strong>  kwenye faili ya maelezo ya moduli. Unaweza kuhariri faili hii mwenyewe au kutumia kihariri kilichopachikwa.
 BadValueForType=Thamani mbaya ya aina %s
-DefinePropertiesFromExistingTable=Bainisha sifa kutoka kwa jedwali lililopo
+DefinePropertiesFromExistingTable=Define the fields/properties from an existing table
 DefinePropertiesFromExistingTableDesc=Ikiwa jedwali katika hifadhidata (kwa kitu cha kuunda) tayari iko, unaweza kuitumia kufafanua sifa za kitu.
 DefinePropertiesFromExistingTableDesc2=Weka tupu ikiwa jedwali bado haipo. Jenereta ya msimbo itatumia aina tofauti za sehemu ili kuunda mfano wa jedwali ambalo unaweza kuhariri baadaye.
-GeneratePermissions=Ninataka kuongeza haki za kitu hiki
-GeneratePermissionsHelp=toa haki chaguomsingi za kitu hiki
+GeneratePermissions=I want to manage permissions on this object
+GeneratePermissionsHelp=If you check this, some code will be added to manage permissions to read, write and delete record of the objects
 PermissionDeletedSuccesfuly=Ruhusa imeondolewa
 PermissionUpdatedSuccesfuly=Ruhusa imesasishwa
 PermissionAddedSuccesfuly=Ruhusa imeongezwa
@@ -180,3 +180,4 @@ CRUDCreateWrite=Unda au Sasisha
 FailedToAddCodeIntoDescriptor=Imeshindwa kuongeza msimbo kwenye kifafanuzi. Hakikisha kwamba maoni ya mfuatano "%s" bado iko kwenye faili.
 DictionariesCreated=Dictionary <b>%s</b> created successfully
 DictionaryDeleted=Dictionary <b>%s</b> removed successfully
+PropertyModuleUpdated=Property <b>%s</b> has been update successfully
diff --git a/htdocs/langs/sw_SW/supplier_proposal.lang b/htdocs/langs/sw_SW/supplier_proposal.lang
index e8f3321b49d..4febf09ed84 100644
--- a/htdocs/langs/sw_SW/supplier_proposal.lang
+++ b/htdocs/langs/sw_SW/supplier_proposal.lang
@@ -42,7 +42,8 @@ SendAskRef=Inatuma ombi la bei %s
 SupplierProposalCard=Omba kadi
 ConfirmDeleteAsk=Je, una uhakika unataka kufuta ombi hili la bei <b> %s </b> ?
 ActionsOnSupplierProposal=Matukio kwa ombi la bei
-DocModelAuroreDescription=Muundo kamili wa ombi (nembo...)
+DocModelAuroreDescription=A complete template for a vendor quotation request template (old implementation of Sponge template)
+DocModelZenithDescription=A complete template for a vendor quotation request template
 CommercialAsk=Ombi la bei
 DefaultModelSupplierProposalCreate=Uundaji wa muundo chaguomsingi
 DefaultModelSupplierProposalToBill=Kiolezo chaguomsingi wakati wa kufunga ombi la bei (limekubaliwa)
diff --git a/htdocs/langs/ta_IN/accountancy.lang b/htdocs/langs/ta_IN/accountancy.lang
index eb4de959c10..80a4a0efeab 100644
--- a/htdocs/langs/ta_IN/accountancy.lang
+++ b/htdocs/langs/ta_IN/accountancy.lang
@@ -57,11 +57,14 @@ WarningDataDisappearsWhenDataIsExported=Warning, this list contains only the acc
 VueByAccountAccounting=கணக்கு கணக்கு மூலம் பார்க்கவும்
 VueBySubAccountAccounting=கணக்கியல் துணைக் கணக்கு மூலம் பார்க்கவும்
 
-MainAccountForCustomersNotDefined=வாடிக்கையாளர்களுக்கான முதன்மை கணக்கு கணக்கு அமைப்பில் வரையறுக்கப்படவில்லை
-MainAccountForSuppliersNotDefined=விற்பனையாளர்களுக்கான பிரதான கணக்கியல் கணக்கு அமைப்பில் வரையறுக்கப்படவில்லை
-MainAccountForUsersNotDefined=பயனர்களுக்கான பிரதான கணக்கியல் கணக்கு அமைப்பில் வரையறுக்கப்படவில்லை
-MainAccountForVatPaymentNotDefined=VAT செலுத்துதலுக்கான முதன்மை கணக்கு கணக்கு அமைப்பில் வரையறுக்கப்படவில்லை
-MainAccountForSubscriptionPaymentNotDefined=சந்தா செலுத்துதலுக்கான முதன்மை கணக்கு கணக்கு அமைப்பில் வரையறுக்கப்படவில்லை
+MainAccountForCustomersNotDefined=Main account (from the Chart of Account) for customers not defined in setup
+MainAccountForSuppliersNotDefined=Main account (from the Chart of Account) for vendors not defined in setup
+MainAccountForUsersNotDefined=Main account (from the Chart of Account) for users not defined in setup
+MainAccountForRevenueStampSaleNotDefined=Account (from the Chart of Account) for the revenue stamp (sales) not defined in setup
+MainAccountForRevenueStampPurchaseNotDefined=Account (from the Chart of Account) for the revenue stamp (purchases) not defined in setup
+MainAccountForVatPaymentNotDefined=Account (from the Chart of Account) for VAT payment not defined in setup
+MainAccountForSubscriptionPaymentNotDefined=Account (from the Chart of Account) for membership payment not defined in setup
+MainAccountForRetainedWarrantyNotDefined=Account (from the Chart of Account) for the retained warranty not defined in setup
 UserAccountNotDefined=Accounting account for user not defined in setup
 
 AccountancyArea=கணக்கியல் பகுதி
diff --git a/htdocs/langs/ta_IN/admin.lang b/htdocs/langs/ta_IN/admin.lang
index e0fe87b9b3f..65afae5d7b8 100644
--- a/htdocs/langs/ta_IN/admin.lang
+++ b/htdocs/langs/ta_IN/admin.lang
@@ -1509,7 +1509,8 @@ WatermarkOnDraftContractCards=வரைவு ஒப்பந்தங்கள
 MembersSetup=உறுப்பினர்கள் தொகுதி அமைப்பு
 MemberMainOptions=முக்கிய விருப்பங்கள்
 MemberCodeChecker=Options for automatic generation of member codes
-AdherentLoginRequired= ஒவ்வொரு உறுப்பினருக்கும் ஒரு உள்நுழைவை நிர்வகிக்கவும்
+AdherentLoginRequired=Manage a login/password for each member
+AdherentLoginRequiredDesc=Add a value for a login and a password on the member file. If the member is linked to a user, updating the member login and password will also update the user login and password.
 AdherentMailRequired=புதிய உறுப்பினரை உருவாக்க மின்னஞ்சல் தேவை
 MemberSendInformationByMailByDefault=உறுப்பினர்களுக்கு மின்னஞ்சல் உறுதிப்படுத்தலை அனுப்புவதற்கான தேர்வுப்பெட்டி (சரிபார்ப்பு அல்லது புதிய சந்தா) இயல்பாகவே இயக்கத்தில் உள்ளது
 MemberCreateAnExternalUserForSubscriptionValidated=சரிபார்க்கப்பட்ட ஒவ்வொரு புதிய உறுப்பினர் சந்தாவிற்கும் வெளிப்புற பயனர் உள்நுழைவை உருவாக்கவும்
@@ -2076,6 +2077,10 @@ MAIN_DOCUMENTS_LOGO_HEIGHT=PDF இல் லோகோவுக்கான உ
 DOC_SHOW_FIRST_SALES_REP=Show first sales representative
 MAIN_GENERATE_PROPOSALS_WITH_PICTURE=முன்மொழிவு வரிகளில் படத்திற்கான நெடுவரிசையைச் சேர்க்கவும்
 MAIN_DOCUMENTS_WITH_PICTURE_WIDTH=வரிகளில் படம் சேர்க்கப்பட்டால் நெடுவரிசையின் அகலம்
+MAIN_GENERATE_DOCUMENTS_SUPPLIER_PROPOSAL_WITHOUT_UNIT_PRICE=Hide the unit price column on quotation requests
+MAIN_GENERATE_DOCUMENTS_SUPPLIER_PROPOSAL_WITHOUT_TOTAL_COLUMN=Hide the total price column on quotation requests
+MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_UNIT_PRICE=Hide the unit price column on purchase orders
+MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_TOTAL_COLUMN=Hide the total price column on puchase orders
 MAIN_PDF_NO_SENDER_FRAME=அனுப்புநர் முகவரி சட்டத்தில் எல்லைகளை மறை
 MAIN_PDF_NO_RECIPENT_FRAME=செய்முறை முகவரி சட்டகத்தில் எல்லைகளை மறை
 MAIN_PDF_HIDE_CUSTOMER_CODE=வாடிக்கையாளர் குறியீட்டை மறை
@@ -2400,4 +2405,4 @@ OptionXShouldBeEnabledInModuleY=Option "<b>%s</b>" should be enabled into module
 OptionXIsCorrectlyEnabledInModuleY=Option "<b>%s</b>" is enabled into module <b>%s</b>
 AtBottomOfPage=At bottom of page
 FailedAuth=failed authentications
-MaxNumberOfFailedAuth=Max number of failed authentication in 24h to disable login.
+MaxNumberOfFailedAuth=Max number of failed authentication in 24h to deny login.
diff --git a/htdocs/langs/ta_IN/supplier_proposal.lang b/htdocs/langs/ta_IN/supplier_proposal.lang
index af133d4c2f3..094f65ae23f 100644
--- a/htdocs/langs/ta_IN/supplier_proposal.lang
+++ b/htdocs/langs/ta_IN/supplier_proposal.lang
@@ -42,7 +42,8 @@ SendAskRef=%s விலை கோரிக்கையை அனுப்பு
 SupplierProposalCard=கோரிக்கை அட்டை
 ConfirmDeleteAsk=<b> %s </b> இந்த விலைக் கோரிக்கையை நிச்சயமாக நீக்க விரும்புகிறீர்களா?
 ActionsOnSupplierProposal=விலை கோரிக்கையின் பேரில் நிகழ்வுகள்
-DocModelAuroreDescription=ஒரு முழுமையான கோரிக்கை மாதிரி (லோகோ...)
+DocModelAuroreDescription=A complete template for a vendor quotation request template (old implementation of Sponge template)
+DocModelZenithDescription=A complete template for a vendor quotation request template
 CommercialAsk=விலை கோரிக்கை
 DefaultModelSupplierProposalCreate=இயல்புநிலை மாதிரி உருவாக்கம்
 DefaultModelSupplierProposalToBill=விலை கோரிக்கையை மூடும் போது இயல்புநிலை டெம்ப்ளேட் (ஏற்றுக்கொள்ளப்பட்டது)
diff --git a/htdocs/langs/tg_TJ/accountancy.lang b/htdocs/langs/tg_TJ/accountancy.lang
index cc4207cdb86..d37f6982663 100644
--- a/htdocs/langs/tg_TJ/accountancy.lang
+++ b/htdocs/langs/tg_TJ/accountancy.lang
@@ -57,11 +57,14 @@ WarningDataDisappearsWhenDataIsExported=Warning, this list contains only the acc
 VueByAccountAccounting=Аз ҳисоби ҳисоби баҳисобгирӣ дидан кунед
 VueBySubAccountAccounting=Бо зерсохтори баҳисобгирӣ дидан кунед
 
-MainAccountForCustomersNotDefined=Ҳисоби асосии баҳисобгирии муштариён, ки дар танзим муайян нашудаанд
-MainAccountForSuppliersNotDefined=Ҳисоби асосии баҳисобгирии фурӯшандагон, ки дар танзим муайян нашудаанд
-MainAccountForUsersNotDefined=Ҳисоби асосии баҳисобгирӣ барои корбароне, ки дар танзим муайян нашудаанд
-MainAccountForVatPaymentNotDefined=Ҳисоби асосии баҳисобгирии пардохти ААИ дар танзим муқаррар нашудааст
-MainAccountForSubscriptionPaymentNotDefined=Ҳисоби асосии баҳисобгирии пардохти обуна дар танзимот муайян нашудааст
+MainAccountForCustomersNotDefined=Main account (from the Chart of Account) for customers not defined in setup
+MainAccountForSuppliersNotDefined=Main account (from the Chart of Account) for vendors not defined in setup
+MainAccountForUsersNotDefined=Main account (from the Chart of Account) for users not defined in setup
+MainAccountForRevenueStampSaleNotDefined=Account (from the Chart of Account) for the revenue stamp (sales) not defined in setup
+MainAccountForRevenueStampPurchaseNotDefined=Account (from the Chart of Account) for the revenue stamp (purchases) not defined in setup
+MainAccountForVatPaymentNotDefined=Account (from the Chart of Account) for VAT payment not defined in setup
+MainAccountForSubscriptionPaymentNotDefined=Account (from the Chart of Account) for membership payment not defined in setup
+MainAccountForRetainedWarrantyNotDefined=Account (from the Chart of Account) for the retained warranty not defined in setup
 UserAccountNotDefined=Accounting account for user not defined in setup
 
 AccountancyArea=Минтақаи баҳисобгирӣ
diff --git a/htdocs/langs/tg_TJ/admin.lang b/htdocs/langs/tg_TJ/admin.lang
index 312cad37e66..05d7f606644 100644
--- a/htdocs/langs/tg_TJ/admin.lang
+++ b/htdocs/langs/tg_TJ/admin.lang
@@ -1509,7 +1509,8 @@ WatermarkOnDraftContractCards=Нишонаи обӣ дар лоиҳаи шарт
 MembersSetup=Танзими модули аъзоён
 MemberMainOptions=Вариантҳои асосӣ
 MemberCodeChecker=Options for automatic generation of member codes
-AdherentLoginRequired= Логинро барои ҳар як аъзо идора кунед
+AdherentLoginRequired=Manage a login/password for each member
+AdherentLoginRequiredDesc=Add a value for a login and a password on the member file. If the member is linked to a user, updating the member login and password will also update the user login and password.
 AdherentMailRequired=Паёми электронӣ барои сохтани узви нав лозим аст
 MemberSendInformationByMailByDefault=Қуттии қайд барои фиристодани тасдиқи почта ба аъзоён (тасдиқ ё обунаи нав) бо нобаёнӣ фаъол аст
 MemberCreateAnExternalUserForSubscriptionValidated=Барои ҳар як обунаи узви нави тасдиқшуда воридшавии корбари беруна созед
@@ -2076,6 +2077,10 @@ MAIN_DOCUMENTS_LOGO_HEIGHT=Баландӣ барои логотип дар PDF
 DOC_SHOW_FIRST_SALES_REP=Show first sales representative
 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_GENERATE_DOCUMENTS_SUPPLIER_PROPOSAL_WITHOUT_UNIT_PRICE=Hide the unit price column on quotation requests
+MAIN_GENERATE_DOCUMENTS_SUPPLIER_PROPOSAL_WITHOUT_TOTAL_COLUMN=Hide the total price column on quotation requests
+MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_UNIT_PRICE=Hide the unit price column on purchase orders
+MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_TOTAL_COLUMN=Hide the total price column on puchase orders
 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
@@ -2400,4 +2405,4 @@ OptionXShouldBeEnabledInModuleY=Option "<b>%s</b>" should be enabled into module
 OptionXIsCorrectlyEnabledInModuleY=Option "<b>%s</b>" is enabled into module <b>%s</b>
 AtBottomOfPage=At bottom of page
 FailedAuth=failed authentications
-MaxNumberOfFailedAuth=Max number of failed authentication in 24h to disable login.
+MaxNumberOfFailedAuth=Max number of failed authentication in 24h to deny login.
diff --git a/htdocs/langs/tg_TJ/supplier_proposal.lang b/htdocs/langs/tg_TJ/supplier_proposal.lang
index cd11b12fdad..e0ba3b6448d 100644
--- a/htdocs/langs/tg_TJ/supplier_proposal.lang
+++ b/htdocs/langs/tg_TJ/supplier_proposal.lang
@@ -42,7 +42,8 @@ SendAskRef=Ирсоли дархости нарх %s
 SupplierProposalCard=Корти дархост
 ConfirmDeleteAsk=Шумо мутмаин ҳастед, ки ин дархости нархро <b> %s </b> нест кардан мехоҳед?
 ActionsOnSupplierProposal=Чорабиниҳо бо дархости нарх
-DocModelAuroreDescription=Модели пурраи дархост (логотип ...)
+DocModelAuroreDescription=A complete template for a vendor quotation request template (old implementation of Sponge template)
+DocModelZenithDescription=A complete template for a vendor quotation request template
 CommercialAsk=Дархости нарх
 DefaultModelSupplierProposalCreate=Эҷоди модели пешфарз
 DefaultModelSupplierProposalToBill=Шаблонҳои пешфарз ҳангоми бастани дархости нарх (қабул карда мешаванд)
diff --git a/htdocs/langs/th_TH/admin.lang b/htdocs/langs/th_TH/admin.lang
index c847f79bac4..5eb78b28019 100644
--- a/htdocs/langs/th_TH/admin.lang
+++ b/htdocs/langs/th_TH/admin.lang
@@ -1509,7 +1509,8 @@ WatermarkOnDraftContractCards=ลายน้ำในสัญญาร่า
 MembersSetup=สมาชิกติดตั้งโมดูล
 MemberMainOptions=ตัวเลือกหลัก
 MemberCodeChecker=Options for automatic generation of member codes
-AdherentLoginRequired= เข้าสู่ระบบการจัดการสำหรับสมาชิกแต่ละคน
+AdherentLoginRequired=Manage a login/password for each member
+AdherentLoginRequiredDesc=Add a value for a login and a password on the member file. If the member is linked to a user, updating the member login and password will also update the user login and password.
 AdherentMailRequired=Email required to create a new member
 MemberSendInformationByMailByDefault=ช่องทำเครื่องหมายยืนยันที่จะส่งอีเมลไปยังสมาชิก (การตรวจสอบหรือการสมัครสมาชิกใหม่) เป็นตามค่าเริ่มต้น
 MemberCreateAnExternalUserForSubscriptionValidated=Create an external user login for each new member subscription validated
@@ -2076,6 +2077,10 @@ MAIN_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
 DOC_SHOW_FIRST_SALES_REP=Show first sales representative
 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_GENERATE_DOCUMENTS_SUPPLIER_PROPOSAL_WITHOUT_UNIT_PRICE=Hide the unit price column on quotation requests
+MAIN_GENERATE_DOCUMENTS_SUPPLIER_PROPOSAL_WITHOUT_TOTAL_COLUMN=Hide the total price column on quotation requests
+MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_UNIT_PRICE=Hide the unit price column on purchase orders
+MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_TOTAL_COLUMN=Hide the total price column on puchase orders
 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
@@ -2400,4 +2405,4 @@ OptionXShouldBeEnabledInModuleY=Option "<b>%s</b>" should be enabled into module
 OptionXIsCorrectlyEnabledInModuleY=Option "<b>%s</b>" is enabled into module <b>%s</b>
 AtBottomOfPage=At bottom of page
 FailedAuth=failed authentications
-MaxNumberOfFailedAuth=Max number of failed authentication in 24h to disable login.
+MaxNumberOfFailedAuth=Max number of failed authentication in 24h to deny login.
diff --git a/htdocs/langs/th_TH/main.lang b/htdocs/langs/th_TH/main.lang
index d761f50c4ae..7e3077338b9 100644
--- a/htdocs/langs/th_TH/main.lang
+++ b/htdocs/langs/th_TH/main.lang
@@ -235,6 +235,8 @@ PersonalValue=ค่าส่วนบุคคล
 NewObject=New %s
 NewValue=ค่าใหม่
 OldValue=Old value %s
+FieldXModified=Field %s modified
+FieldXModifiedFromYToZ=Field %s modified from %s to %s
 CurrentValue=มูลค่าปัจจุบัน
 Code=รหัส
 Type=ชนิด
@@ -346,6 +348,7 @@ MonthOfDay=เดือนของวัน
 DaysOfWeek=Days of week
 HourShort=H
 MinuteShort=ล้าน
+SecondShort=sec
 Rate=ประเมิน
 CurrencyRate=Currency conversion rate
 UseLocalTax=รวมภาษี
@@ -555,6 +558,7 @@ Unknown=ไม่ทราบ
 General=ทั่วไป
 Size=ขนาด
 OriginalSize=Original size
+RotateImage=Rotate 90°
 Received=ที่ได้รับ
 Paid=ต้องจ่าย
 Topic=Subject
@@ -1229,4 +1233,9 @@ PublicVirtualCard=Virtual business card
 TreeView=Tree view
 DropFileToAddItToObject=Drop a file to add it to this object
 UploadFileDragDropSuccess=The file(s) have been uploaded successfully
-SearchSyntaxTooltipForStringOrNum=For searching inside text fields, you can use the characters ^ or $ to make a 'start or end with' search or use the ! to make a 'does not contain' test. You can use the | between two strings instead of a space for a 'OR' condition instead of 'AND'. For numeric values, you can use the operator <, >, <= or >= before the value to filter using a mathematical comparison
+SearchSyntaxTooltipForStringOrNum=For searching inside text fields, you can use the characters ^ or $ to make a 'start or end with' search or use the ! to make a 'does not contain' test. You can use the | between two strings instead of a space for a 'OR' condition instead of 'AND'. For numeric values, you can use the operator <, >, <=, >= or != before the value, to filter using a mathematical comparison
+InProgress=In progress
+DateOfPrinting=Date of printing
+ClickFullScreenEscapeToLeave=Click here to switch in Full screen mode. Press ESCAPE to leave Full screen mode.
+UserNotYetValid=Not yet valid
+UserExpired=หมดอายุ
diff --git a/htdocs/langs/tr_TR/accountancy.lang b/htdocs/langs/tr_TR/accountancy.lang
index 0584f7999b5..915c3e28f89 100644
--- a/htdocs/langs/tr_TR/accountancy.lang
+++ b/htdocs/langs/tr_TR/accountancy.lang
@@ -41,6 +41,7 @@ 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=Hesaba göre detayları göster
+DetailBy=Detail by
 AccountWithNonZeroValues=Sıfır olmayan değerlere sahip hesaplar
 ListOfAccounts=Hesap listesi
 CountriesInEEC=Avrupa Ekonomi Topluluğu'ndaki Ülkeler
@@ -51,14 +52,19 @@ AccountantFiles=Kaynak belgeleri dışa aktar
 ExportAccountingSourceDocHelp=With this tool, you can search and export the source events that are used to generate your accountancy. <br>The exported ZIP file will contain the lists of requested items in CSV, as well as their attached files in their original format (PDF, ODT, DOCX...).
 ExportAccountingSourceDocHelp2=To export your journals, use the menu entry %s - %s.
 ExportAccountingProjectHelp=Specify a project if you need an accounting report only for a specific project. Expense reports and loan payments are not included in project reports.
+ExportAccountancy=Export accountancy
+WarningDataDisappearsWhenDataIsExported=Warning, this list contains only the accounting entries that have not been already exported (Export date is empty). If you want to include the accounting entries already exported to re-export them, click on the button above.
 VueByAccountAccounting=View by accounting account
 VueBySubAccountAccounting=View by accounting subaccount
 
-MainAccountForCustomersNotDefined=Müşteriler için ana muhasebe hesabı kurulumda tanımlı değil
-MainAccountForSuppliersNotDefined=Tedarikçiler için ana muhasebe hesabı kurulumda tanımlı değil
-MainAccountForUsersNotDefined=Kullanıcılar için ana muhasebe hesabı kurulumda tanımlı değil
-MainAccountForVatPaymentNotDefined=KDV ödemesi için ana muhasebe hesabı kurulumda tanımlı değil
-MainAccountForSubscriptionPaymentNotDefined=Kurulumda tanımlanmayan abonelik ödemesi için ana muhasebe hesabı
+MainAccountForCustomersNotDefined=Main account (from the Chart of Account) for customers not defined in setup
+MainAccountForSuppliersNotDefined=Main account (from the Chart of Account) for vendors not defined in setup
+MainAccountForUsersNotDefined=Main account (from the Chart of Account) for users not defined in setup
+MainAccountForRevenueStampSaleNotDefined=Account (from the Chart of Account) for the revenue stamp (sales) not defined in setup
+MainAccountForRevenueStampPurchaseNotDefined=Account (from the Chart of Account) for the revenue stamp (purchases) not defined in setup
+MainAccountForVatPaymentNotDefined=Account (from the Chart of Account) for VAT payment not defined in setup
+MainAccountForSubscriptionPaymentNotDefined=Account (from the Chart of Account) for membership payment not defined in setup
+MainAccountForRetainedWarrantyNotDefined=Account (from the Chart of Account) for the retained warranty not defined in setup
 UserAccountNotDefined=Accounting account for user not defined in setup
 
 AccountancyArea=Muhasebe alanı
@@ -112,6 +118,7 @@ MenuLoanAccounts=Kredi hesapları
 MenuProductsAccounts=Ürün hesapları
 MenuClosureAccounts=Hesapları kapama
 MenuAccountancyClosure=Kapanış
+MenuExportAccountancy=Export accountancy
 MenuAccountancyValidationMovements=Hareketleri doğrula
 ProductsBinding=Ürün hesapları
 TransferInAccounting=Muhasebede aktarım
@@ -167,9 +174,9 @@ ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow
 ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
 ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, what is the period selected by default
 
-ACCOUNTING_SELL_JOURNAL=Sales journal (sales and returns)
-ACCOUNTING_PURCHASE_JOURNAL=Purchase journal (purchase and returns)
-ACCOUNTING_BANK_JOURNAL=Cash journal (receipts and disbursements)
+ACCOUNTING_SELL_JOURNAL=Sales journal - sales and returns
+ACCOUNTING_PURCHASE_JOURNAL=Purchase journal - purchase and returns
+ACCOUNTING_BANK_JOURNAL=Cash journal - receipts and disbursements
 ACCOUNTING_EXPENSEREPORT_JOURNAL=Gider raporu günlüğü
 ACCOUNTING_MISCELLANEOUS_JOURNAL=General journal
 ACCOUNTING_HAS_NEW_JOURNAL=Has new Journal
@@ -238,6 +245,7 @@ ConfirmDeleteMvt=This will delete all lines in accountancy for the year/month an
 ConfirmDeleteMvtPartial=This will delete the transaction from the accounting (all lines related to the same transaction will be deleted)
 FinanceJournal=Finance journal
 ExpenseReportsJournal=Gider raporları günlüğü
+InventoryJournal=Inventory journal
 DescFinanceJournal=Banka hesabından yapılan tüm ödeme türlerini içeren finans günlüğü
 DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Journals and Ledger.
 VATAccountNotDefined=KDV için hesap tanımlı değil
@@ -294,7 +302,7 @@ DescClosure=Consult here the number of movements by month not yet validated & lo
 OverviewOfMovementsNotValidated=Overview of movements not validated and locked
 AllMovementsWereRecordedAsValidated=All movements were recorded as validated and locked
 NotAllMovementsCouldBeRecordedAsValidated=Not all movements could be recorded as validated and locked
-ValidateMovements=Validate and lock movements...
+ValidateMovements=Validate and lock movements
 DescValidateMovements=Any modification or deletion of writing, lettering and deletes will be prohibited. All entries for an exercise must be validated otherwise closing will not be possible
 
 ValidateHistory=Otomatik Olarak Bağla
@@ -343,12 +351,18 @@ ACCOUNTING_DISABLE_BINDING_ON_SALES=Disable binding & transfer in accountancy on
 ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountancy on purchases (vendor invoices will not be taken into account in accounting)
 ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting)
 ACCOUNTING_ENABLE_LETTERING=Enable the lettering function in the accounting
+ACCOUNTING_ENABLE_LETTERING_DESC=When this options is enabled, you can define, on each accounting entry, a code so you can group different accounting movements together. In the past, when different journals was managed independently, this feature was necessary to group movement lines of different journals together. However, with Dolibarr accountancy, such a tracking code, called "<b>%s</b>" is already saved automatically, so an automatic lettering is already done, with no risk of error so this feature has become useless for a common usage. Manual lettering feature is provided for end users that really don't trust the computer engine making the transfer of data in accountancy.
+EnablingThisFeatureIsNotNecessary=Enabling this feature is no more necessary for a rigourous accounting management.
 ACCOUNTING_ENABLE_AUTOLETTERING=Enable the automatic lettering when transferring to accounting
+ACCOUNTING_ENABLE_AUTOLETTERING_DESC=The code for the lettering is automatically generated and incremented and not choosed by the end user
+OptionsAdvanced=Advanced options
+ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE=Activate the management of VAT reverse charge on supplier purchases
+ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE_DESC=When this option is enabled, you can define that a supplier or a given vendor invoice must be transfered into accountancy differently: A additionnal debit and a credit line will generated into the accounting on 2 given accounts from the chart of account defined into the "%s" setup page.
 
 ## Export
 NotExportLettering=Do not export the lettering when generating the file
-NotifiedExportDate=Flag exported lines as Exported <span class="warning">(to modify a line, you will need to delete the whole transaction and re-transfert it into accounting)</span>
-NotifiedValidationDate=Validate and Lock the exported entries <span class="warning">(same effect than the "%s" feature, modification and deletion of the lines will DEFINITELY not be possible)</span>
+NotifiedExportDate=Flag not yet exported lines as Exported <span class="warning">(to modify a line flagged as exported, you will need to delete the whole transaction and re-transfert it into accounting)</span>
+NotifiedValidationDate=Validate and Lock the exported entries not yet already locked <span class="warning">(same effect than the "%s" feature, modification and deletion of the lines will DEFINITELY not be possible)</span>
 NotifiedExportFull=Export documents ?
 DateValidationAndLock=Date validation and lock
 ConfirmExportFile=Confirmation of the generation of the accounting export file ?
@@ -380,7 +394,7 @@ ChartofaccountsId=Hesap planı Id
 ## Tools - Init accounting account on product / service
 InitAccountancy=Muhasebe başlangıcı
 InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accounting account defined for sales and purchases.
-DefaultBindingDesc=This page can be used to set a default account to use to link transactions record about payment salaries, donation, taxes and vat when no specific accounting account were already set.
+DefaultBindingDesc=This page can be used to set the default accounts (from the chart of account) to use to link business objects with an account, like payment salaries, donation, taxes and VAT, when no specific account were already set.
 DefaultClosureDesc=Bu sayfa, muhasebe kapanışları için kullanılan parametreleri ayarlamak için kullanılabilir.
 Options=Seçenekler
 OptionModeProductSell=Satış modu
@@ -432,7 +446,7 @@ ConfirmMassUnletteringAuto=Bulk auto unreconcile confirmation
 ConfirmMassUnletteringManual=Bulk manual unreconcile confirmation
 ConfirmMassUnletteringQuestion=Are you sure you want to unreconcile the %s selected record(s)?
 ConfirmMassDeleteBookkeepingWriting=Toplu Silme onayı
-ConfirmMassDeleteBookkeepingWritingQuestion=This will delete the transaction from the accounting (all lines related to the same transaction will be deleted) Are you sure you want to delete the %s selected record(s)?
+ConfirmMassDeleteBookkeepingWritingQuestion=This will delete the transaction from the accounting (all line entries related to the same transaction will be deleted). Are you sure you want to delete the %s selected entries?
 
 ## Error
 SomeMandatoryStepsOfSetupWereNotDone=Kurulumun bazı zorunlu adımları tamamlanmadı, lütfen onları tamamlayın.
@@ -445,7 +459,7 @@ NoJournalDefined=No journal defined
 Binded=Bağlanmış satırlar
 ToBind=Bağlanacak satırlar
 UseMenuToSetBindindManualy=Lines not yet bound, use menu <a href="%s">%s</a> to make the binding manually
-SorryThisModuleIsNotCompatibleWithTheExperimentalFeatureOfSituationInvoices=Sorry this module is not compatible with the experimental feature of situation invoices
+SorryThisModuleIsNotCompatibleWithTheExperimentalFeatureOfSituationInvoices=Note: this module or page is not completely compatible with the experimental feature of situation invoices. Some data may be wrong.
 AccountancyErrorMismatchLetterCode=Mismatch in reconcile code
 AccountancyErrorMismatchBalanceAmount=The balance (%s) is not equal to 0
 AccountancyErrorLetteringBookkeeping=Errors have occurred concerning the transactions: %s
@@ -475,9 +489,9 @@ FECFormatMulticurrencyAmount=Multicurrency amount (Montantdevise)
 FECFormatMulticurrencyCode=Multicurrency code (Idevise)
 
 DateExport=Date export
-WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manually in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate.
+WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contain transactions modified manually in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate.
 ExpenseReportJournal=Expense Report Journal
-DocsAlreadyExportedAreExcluded=Docs already exported are excluded
-ClickToHideAlreadyExportedLines=Click to hide already exported lines
+DocsAlreadyExportedAreIncluded=Docs already exported are included
+ClickToShowAlreadyExportedLines=Click to show already exported lines
 
 NAccounts=%s accounts
diff --git a/htdocs/langs/tr_TR/admin.lang b/htdocs/langs/tr_TR/admin.lang
index 92425be5589..2447223406f 100644
--- a/htdocs/langs/tr_TR/admin.lang
+++ b/htdocs/langs/tr_TR/admin.lang
@@ -1509,7 +1509,8 @@ WatermarkOnDraftContractCards=Taslak sözleşmeler üzerinde filigran (boşsa yo
 MembersSetup=Üye modülü kurulumu
 MemberMainOptions=Ana seçenekler
 MemberCodeChecker=Options for automatic generation of member codes
-AdherentLoginRequired= Her üye için bir Kullanıcı adı yürütün
+AdherentLoginRequired=Manage a login/password for each member
+AdherentLoginRequiredDesc=Add a value for a login and a password on the member file. If the member is linked to a user, updating the member login and password will also update the user login and password.
 AdherentMailRequired=Yeni bir üye oluşturmak için e-posta gereklidir
 MemberSendInformationByMailByDefault=Üyelere onay epostası (doğrulama ya da yeni abonelik) göndermek için onay kutusu varsayılan olarak açıktır
 MemberCreateAnExternalUserForSubscriptionValidated=Create an external user login for each new member subscription validated
@@ -2076,6 +2077,10 @@ MAIN_DOCUMENTS_LOGO_HEIGHT=PDF'deki logo için yükseklik
 DOC_SHOW_FIRST_SALES_REP=Show first sales representative
 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_GENERATE_DOCUMENTS_SUPPLIER_PROPOSAL_WITHOUT_UNIT_PRICE=Hide the unit price column on quotation requests
+MAIN_GENERATE_DOCUMENTS_SUPPLIER_PROPOSAL_WITHOUT_TOTAL_COLUMN=Hide the total price column on quotation requests
+MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_UNIT_PRICE=Hide the unit price column on purchase orders
+MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_TOTAL_COLUMN=Hide the total price column on puchase orders
 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
@@ -2400,4 +2405,4 @@ OptionXShouldBeEnabledInModuleY=Option "<b>%s</b>" should be enabled into module
 OptionXIsCorrectlyEnabledInModuleY=Option "<b>%s</b>" is enabled into module <b>%s</b>
 AtBottomOfPage=At bottom of page
 FailedAuth=failed authentications
-MaxNumberOfFailedAuth=Max number of failed authentication in 24h to disable login.
+MaxNumberOfFailedAuth=Max number of failed authentication in 24h to deny login.
diff --git a/htdocs/langs/tr_TR/main.lang b/htdocs/langs/tr_TR/main.lang
index 73e469b9088..e7286f883de 100644
--- a/htdocs/langs/tr_TR/main.lang
+++ b/htdocs/langs/tr_TR/main.lang
@@ -1237,3 +1237,5 @@ SearchSyntaxTooltipForStringOrNum=For searching inside text fields, you can use
 InProgress=Devam etmekte
 DateOfPrinting=Date of printing
 ClickFullScreenEscapeToLeave=Click here to switch in Full screen mode. Press ESCAPE to leave Full screen mode.
+UserNotYetValid=Not yet valid
+UserExpired=Süresi doldu
diff --git a/htdocs/langs/tr_TR/supplier_proposal.lang b/htdocs/langs/tr_TR/supplier_proposal.lang
index 273736c971a..10eea5e000e 100644
--- a/htdocs/langs/tr_TR/supplier_proposal.lang
+++ b/htdocs/langs/tr_TR/supplier_proposal.lang
@@ -42,7 +42,8 @@ SendAskRef=Fiyat isteği %s gönderiliyor
 SupplierProposalCard=İstek kartı
 ConfirmDeleteAsk=<b>%s</b> fiyat talebini silmek istediğinizden emin misiniz ?
 ActionsOnSupplierProposal=Fiyat isteğindeki etkinlikler
-DocModelAuroreDescription=Eksiksiz bir istek modeli (logo...)
+DocModelAuroreDescription=A complete template for a vendor quotation request template (old implementation of Sponge template)
+DocModelZenithDescription=A complete template for a vendor quotation request template
 CommercialAsk=Fiyat isteği
 DefaultModelSupplierProposalCreate=Varsayılan model oluşturma
 DefaultModelSupplierProposalToBill=Bir fiyat isteğini kapatma sırasında (kabul edilmiş) varsayılan şablon
diff --git a/htdocs/langs/uk_UA/accountancy.lang b/htdocs/langs/uk_UA/accountancy.lang
index 244fbe7a915..8dced5ad2fb 100644
--- a/htdocs/langs/uk_UA/accountancy.lang
+++ b/htdocs/langs/uk_UA/accountancy.lang
@@ -57,11 +57,14 @@ WarningDataDisappearsWhenDataIsExported=Warning, this list contains only the acc
 VueByAccountAccounting=Переглянути за обліковим записом
 VueBySubAccountAccounting=Перегляд за бухгалтерським субрахунком
 
-MainAccountForCustomersNotDefined=Основний обліковий запис для клієнтів, не визначений у налаштуваннях
-MainAccountForSuppliersNotDefined=Основний обліковий запис для постачальників, не визначених у налаштуваннях
-MainAccountForUsersNotDefined=Основний обліковий запис для користувачів, не визначених під час налаштування
-MainAccountForVatPaymentNotDefined=Основний рахунок для сплати ПДВ не визначено в налаштуваннях
-MainAccountForSubscriptionPaymentNotDefined=Основний обліковий запис для оплати передплати не визначено в налаштуваннях
+MainAccountForCustomersNotDefined=Main account (from the Chart of Account) for customers not defined in setup
+MainAccountForSuppliersNotDefined=Main account (from the Chart of Account) for vendors not defined in setup
+MainAccountForUsersNotDefined=Main account (from the Chart of Account) for users not defined in setup
+MainAccountForRevenueStampSaleNotDefined=Account (from the Chart of Account) for the revenue stamp (sales) not defined in setup
+MainAccountForRevenueStampPurchaseNotDefined=Account (from the Chart of Account) for the revenue stamp (purchases) not defined in setup
+MainAccountForVatPaymentNotDefined=Account (from the Chart of Account) for VAT payment not defined in setup
+MainAccountForSubscriptionPaymentNotDefined=Account (from the Chart of Account) for membership payment not defined in setup
+MainAccountForRetainedWarrantyNotDefined=Account (from the Chart of Account) for the retained warranty not defined in setup
 UserAccountNotDefined=Accounting account for user not defined in setup
 
 AccountancyArea=Зона обліку
diff --git a/htdocs/langs/uk_UA/admin.lang b/htdocs/langs/uk_UA/admin.lang
index 31043d5f054..7d3578e5ef2 100644
--- a/htdocs/langs/uk_UA/admin.lang
+++ b/htdocs/langs/uk_UA/admin.lang
@@ -1509,7 +1509,8 @@ WatermarkOnDraftContractCards=Водяний знак на проектах ко
 MembersSetup=Налаштування модуля Members
 MemberMainOptions=Основні варіанти
 MemberCodeChecker=Options for automatic generation of member codes
-AdherentLoginRequired= Керуйте логіном для кожного члена
+AdherentLoginRequired=Manage a login/password for each member
+AdherentLoginRequiredDesc=Add a value for a login and a password on the member file. If the member is linked to a user, updating the member login and password will also update the user login and password.
 AdherentMailRequired=Для створення нового учасника потрібна електронна адреса
 MemberSendInformationByMailByDefault=Прапорець для надсилання підтвердження поштою учасникам (перевірка або нова підписка) увімкнено за замовчуванням
 MemberCreateAnExternalUserForSubscriptionValidated=Створіть зовнішній логін користувача для кожної підтвердженої підписки нового члена
@@ -2076,6 +2077,10 @@ MAIN_DOCUMENTS_LOGO_HEIGHT=Висота логотипу в PDF
 DOC_SHOW_FIRST_SALES_REP=Show first sales representative
 MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Додайте стовпець для зображення в рядках пропозиції
 MAIN_DOCUMENTS_WITH_PICTURE_WIDTH=Ширина стовпця, якщо зображення додано по рядках
+MAIN_GENERATE_DOCUMENTS_SUPPLIER_PROPOSAL_WITHOUT_UNIT_PRICE=Hide the unit price column on quotation requests
+MAIN_GENERATE_DOCUMENTS_SUPPLIER_PROPOSAL_WITHOUT_TOTAL_COLUMN=Hide the total price column on quotation requests
+MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_UNIT_PRICE=Hide the unit price column on purchase orders
+MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_TOTAL_COLUMN=Hide the total price column on puchase orders
 MAIN_PDF_NO_SENDER_FRAME=Приховати межі в рамці адреси відправника
 MAIN_PDF_NO_RECIPENT_FRAME=Приховати межі на фреймі адреси одержувача
 MAIN_PDF_HIDE_CUSTOMER_CODE=Приховати код клієнта
@@ -2400,4 +2405,4 @@ OptionXShouldBeEnabledInModuleY=Option "<b>%s</b>" should be enabled into module
 OptionXIsCorrectlyEnabledInModuleY=Option "<b>%s</b>" is enabled into module <b>%s</b>
 AtBottomOfPage=At bottom of page
 FailedAuth=failed authentications
-MaxNumberOfFailedAuth=Max number of failed authentication in 24h to disable login.
+MaxNumberOfFailedAuth=Max number of failed authentication in 24h to deny login.
diff --git a/htdocs/langs/uk_UA/supplier_proposal.lang b/htdocs/langs/uk_UA/supplier_proposal.lang
index 3c3544213e3..8b5e47c8bb5 100644
--- a/htdocs/langs/uk_UA/supplier_proposal.lang
+++ b/htdocs/langs/uk_UA/supplier_proposal.lang
@@ -42,7 +42,8 @@ SendAskRef=Надсилання запиту ціни %s
 SupplierProposalCard=Картка запиту
 ConfirmDeleteAsk=Ви впевнені, що хочете видалити цей запит ціни <b> %s </b>?
 ActionsOnSupplierProposal=Події за запитом ціни
-DocModelAuroreDescription=Повна модель запиту (логотип...)
+DocModelAuroreDescription=A complete template for a vendor quotation request template (old implementation of Sponge template)
+DocModelZenithDescription=A complete template for a vendor quotation request template
 CommercialAsk=Запит ціни
 DefaultModelSupplierProposalCreate=Створення моделі за замовчуванням
 DefaultModelSupplierProposalToBill=Шаблон за замовчуванням під час закриття запиту ціни (прийнято)
diff --git a/htdocs/langs/ur_PK/accountancy.lang b/htdocs/langs/ur_PK/accountancy.lang
index 247ceb3f34b..4a7ffc8e48c 100644
--- a/htdocs/langs/ur_PK/accountancy.lang
+++ b/htdocs/langs/ur_PK/accountancy.lang
@@ -57,11 +57,14 @@ WarningDataDisappearsWhenDataIsExported=Warning, this list contains only the acc
 VueByAccountAccounting=حساب کتاب کے حساب سے دیکھیں
 VueBySubAccountAccounting=اکاؤنٹنگ ذیلی اکاؤنٹ کے ذریعہ دیکھیں
 
-MainAccountForCustomersNotDefined=صارفین کے لیے مین اکاؤنٹنگ اکاؤنٹ سیٹ اپ میں بیان نہیں کیا گیا ہے۔
-MainAccountForSuppliersNotDefined=وینڈرز کے لیے مین اکاؤنٹنگ اکاؤنٹ سیٹ اپ میں بیان نہیں کیا گیا ہے۔
-MainAccountForUsersNotDefined=صارفین کے لیے مرکزی اکاؤنٹنگ اکاؤنٹ سیٹ اپ میں بیان نہیں کیا گیا ہے۔
-MainAccountForVatPaymentNotDefined=VAT ادائیگی کے لیے مرکزی اکاؤنٹنگ اکاؤنٹ سیٹ اپ میں بیان نہیں کیا گیا ہے۔
-MainAccountForSubscriptionPaymentNotDefined=رکنیت کی ادائیگی کے لیے مرکزی اکاؤنٹنگ اکاؤنٹ سیٹ اپ میں بیان نہیں کیا گیا ہے۔
+MainAccountForCustomersNotDefined=Main account (from the Chart of Account) for customers not defined in setup
+MainAccountForSuppliersNotDefined=Main account (from the Chart of Account) for vendors not defined in setup
+MainAccountForUsersNotDefined=Main account (from the Chart of Account) for users not defined in setup
+MainAccountForRevenueStampSaleNotDefined=Account (from the Chart of Account) for the revenue stamp (sales) not defined in setup
+MainAccountForRevenueStampPurchaseNotDefined=Account (from the Chart of Account) for the revenue stamp (purchases) not defined in setup
+MainAccountForVatPaymentNotDefined=Account (from the Chart of Account) for VAT payment not defined in setup
+MainAccountForSubscriptionPaymentNotDefined=Account (from the Chart of Account) for membership payment not defined in setup
+MainAccountForRetainedWarrantyNotDefined=Account (from the Chart of Account) for the retained warranty not defined in setup
 UserAccountNotDefined=Accounting account for user not defined in setup
 
 AccountancyArea=اکاؤنٹنگ ایریا
diff --git a/htdocs/langs/ur_PK/admin.lang b/htdocs/langs/ur_PK/admin.lang
index 46d9f914aac..25d10018b8e 100644
--- a/htdocs/langs/ur_PK/admin.lang
+++ b/htdocs/langs/ur_PK/admin.lang
@@ -1509,7 +1509,8 @@ WatermarkOnDraftContractCards=مسودہ معاہدوں پر واٹر مارک (
 MembersSetup=ممبران ماڈیول سیٹ اپ
 MemberMainOptions=اہم اختیارات
 MemberCodeChecker=Options for automatic generation of member codes
-AdherentLoginRequired= ہر ممبر کے لیے لاگ ان کا انتظام کریں۔
+AdherentLoginRequired=Manage a login/password for each member
+AdherentLoginRequiredDesc=Add a value for a login and a password on the member file. If the member is linked to a user, updating the member login and password will also update the user login and password.
 AdherentMailRequired=نیا رکن بنانے کے لیے ای میل درکار ہے۔
 MemberSendInformationByMailByDefault=اراکین کو میل کی تصدیق بھیجنے کے لیے چیک باکس (توثیق یا نئی رکنیت) بطور ڈیفالٹ آن ہے۔
 MemberCreateAnExternalUserForSubscriptionValidated=ہر نئے رکن کی توثیق شدہ رکنیت کے لیے ایک بیرونی صارف لاگ ان بنائیں
@@ -2076,6 +2077,10 @@ MAIN_DOCUMENTS_LOGO_HEIGHT=پی ڈی ایف پر لوگو کی اونچائی
 DOC_SHOW_FIRST_SALES_REP=Show first sales representative
 MAIN_GENERATE_PROPOSALS_WITH_PICTURE=پروپوزل لائنز پر تصویر کے لیے کالم شامل کریں۔
 MAIN_DOCUMENTS_WITH_PICTURE_WIDTH=کالم کی چوڑائی اگر لائنوں پر تصویر شامل کی جائے۔
+MAIN_GENERATE_DOCUMENTS_SUPPLIER_PROPOSAL_WITHOUT_UNIT_PRICE=Hide the unit price column on quotation requests
+MAIN_GENERATE_DOCUMENTS_SUPPLIER_PROPOSAL_WITHOUT_TOTAL_COLUMN=Hide the total price column on quotation requests
+MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_UNIT_PRICE=Hide the unit price column on purchase orders
+MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_TOTAL_COLUMN=Hide the total price column on puchase orders
 MAIN_PDF_NO_SENDER_FRAME=مرسل ایڈریس فریم پر بارڈرز چھپائیں۔
 MAIN_PDF_NO_RECIPENT_FRAME=وصول کنندہ کے ایڈریس فریم پر بارڈرز چھپائیں۔
 MAIN_PDF_HIDE_CUSTOMER_CODE=کسٹمر کوڈ چھپائیں۔
@@ -2400,4 +2405,4 @@ OptionXShouldBeEnabledInModuleY=Option "<b>%s</b>" should be enabled into module
 OptionXIsCorrectlyEnabledInModuleY=Option "<b>%s</b>" is enabled into module <b>%s</b>
 AtBottomOfPage=At bottom of page
 FailedAuth=failed authentications
-MaxNumberOfFailedAuth=Max number of failed authentication in 24h to disable login.
+MaxNumberOfFailedAuth=Max number of failed authentication in 24h to deny login.
diff --git a/htdocs/langs/ur_PK/supplier_proposal.lang b/htdocs/langs/ur_PK/supplier_proposal.lang
index 2d2601cc187..efc9dad9926 100644
--- a/htdocs/langs/ur_PK/supplier_proposal.lang
+++ b/htdocs/langs/ur_PK/supplier_proposal.lang
@@ -42,7 +42,8 @@ SendAskRef=قیمت کی درخواست %s بھیج رہا ہے۔
 SupplierProposalCard=کارڈ کی درخواست کریں۔
 ConfirmDeleteAsk=کیا آپ واقعی اس قیمت کی درخواست <b> %s </b> کو حذف کرنا چاہتے ہیں؟
 ActionsOnSupplierProposal=قیمت کی درخواست پر واقعات
-DocModelAuroreDescription=ایک مکمل درخواست ماڈل (لوگو...)
+DocModelAuroreDescription=A complete template for a vendor quotation request template (old implementation of Sponge template)
+DocModelZenithDescription=A complete template for a vendor quotation request template
 CommercialAsk=قیمت کی درخواست
 DefaultModelSupplierProposalCreate=پہلے سے طے شدہ ماڈل کی تخلیق
 DefaultModelSupplierProposalToBill=قیمت کی درخواست کو بند کرتے وقت ڈیفالٹ ٹیمپلیٹ (قبول شدہ)
diff --git a/htdocs/langs/uz_UZ/accountancy.lang b/htdocs/langs/uz_UZ/accountancy.lang
index fe7f8ed80cb..8f5c174039a 100644
--- a/htdocs/langs/uz_UZ/accountancy.lang
+++ b/htdocs/langs/uz_UZ/accountancy.lang
@@ -57,11 +57,14 @@ WarningDataDisappearsWhenDataIsExported=Warning, this list contains only the acc
 VueByAccountAccounting=Buxgalteriya hisobi bo'yicha ko'rish
 VueBySubAccountAccounting=Buxgalteriya subkontaji bo'yicha ko'rish
 
-MainAccountForCustomersNotDefined=O'rnatishda aniqlanmagan mijozlar uchun asosiy buxgalteriya hisobi
-MainAccountForSuppliersNotDefined=O'rnatishda aniqlanmagan sotuvchilar uchun asosiy buxgalteriya hisobi
-MainAccountForUsersNotDefined=O'rnatishda aniqlanmagan foydalanuvchilar uchun asosiy buxgalteriya hisobi
-MainAccountForVatPaymentNotDefined=O'rnatishda aniqlanmagan QQSni to'lash uchun asosiy buxgalteriya hisobi
-MainAccountForSubscriptionPaymentNotDefined=O'rnatishda aniqlanmagan obuna to'lovining asosiy buxgalteriya hisobi
+MainAccountForCustomersNotDefined=Main account (from the Chart of Account) for customers not defined in setup
+MainAccountForSuppliersNotDefined=Main account (from the Chart of Account) for vendors not defined in setup
+MainAccountForUsersNotDefined=Main account (from the Chart of Account) for users not defined in setup
+MainAccountForRevenueStampSaleNotDefined=Account (from the Chart of Account) for the revenue stamp (sales) not defined in setup
+MainAccountForRevenueStampPurchaseNotDefined=Account (from the Chart of Account) for the revenue stamp (purchases) not defined in setup
+MainAccountForVatPaymentNotDefined=Account (from the Chart of Account) for VAT payment not defined in setup
+MainAccountForSubscriptionPaymentNotDefined=Account (from the Chart of Account) for membership payment not defined in setup
+MainAccountForRetainedWarrantyNotDefined=Account (from the Chart of Account) for the retained warranty not defined in setup
 UserAccountNotDefined=Accounting account for user not defined in setup
 
 AccountancyArea=Buxgalteriya hisobi maydoni
diff --git a/htdocs/langs/uz_UZ/admin.lang b/htdocs/langs/uz_UZ/admin.lang
index 5c36139693b..2cb01d4d851 100644
--- a/htdocs/langs/uz_UZ/admin.lang
+++ b/htdocs/langs/uz_UZ/admin.lang
@@ -1509,7 +1509,8 @@ WatermarkOnDraftContractCards=Shartnoma loyihalari bo'yicha suv belgisi (agar bo
 MembersSetup=A'zolar modulini sozlash
 MemberMainOptions=Asosiy variantlar
 MemberCodeChecker=Options for automatic generation of member codes
-AdherentLoginRequired= Har bir a'zo uchun tizimga kirishni boshqaring
+AdherentLoginRequired=Manage a login/password for each member
+AdherentLoginRequiredDesc=Add a value for a login and a password on the member file. If the member is linked to a user, updating the member login and password will also update the user login and password.
 AdherentMailRequired=Yangi a'zo yaratish uchun elektron pochta kerak
 MemberSendInformationByMailByDefault=Odatiy ravishda a'zolarga pochta orqali tasdiqlash (tasdiqlash yoki yangi obuna) yuborish uchun tasdiqlash qutisi yoqilgan
 MemberCreateAnExternalUserForSubscriptionValidated=Tasdiqlangan har bir yangi a'zo obuna uchun tashqi foydalanuvchi loginini yarating
@@ -2076,6 +2077,10 @@ MAIN_DOCUMENTS_LOGO_HEIGHT=PDF-dagi logotip uchun balandlik
 DOC_SHOW_FIRST_SALES_REP=Show first sales representative
 MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Taklif satrlarida rasm uchun ustun qo'shing
 MAIN_DOCUMENTS_WITH_PICTURE_WIDTH=Chiziqlarga rasm qo'shilsa, ustunning kengligi
+MAIN_GENERATE_DOCUMENTS_SUPPLIER_PROPOSAL_WITHOUT_UNIT_PRICE=Hide the unit price column on quotation requests
+MAIN_GENERATE_DOCUMENTS_SUPPLIER_PROPOSAL_WITHOUT_TOTAL_COLUMN=Hide the total price column on quotation requests
+MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_UNIT_PRICE=Hide the unit price column on purchase orders
+MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_TOTAL_COLUMN=Hide the total price column on puchase orders
 MAIN_PDF_NO_SENDER_FRAME=Yuboruvchining manzil ramkasidagi chegaralarni yashirish
 MAIN_PDF_NO_RECIPENT_FRAME=Qabul qiluvchilar manzillar doirasidagi chegaralarni yashirish
 MAIN_PDF_HIDE_CUSTOMER_CODE=Mijoz kodini yashirish
@@ -2400,4 +2405,4 @@ OptionXShouldBeEnabledInModuleY=Option "<b>%s</b>" should be enabled into module
 OptionXIsCorrectlyEnabledInModuleY=Option "<b>%s</b>" is enabled into module <b>%s</b>
 AtBottomOfPage=At bottom of page
 FailedAuth=failed authentications
-MaxNumberOfFailedAuth=Max number of failed authentication in 24h to disable login.
+MaxNumberOfFailedAuth=Max number of failed authentication in 24h to deny login.
diff --git a/htdocs/langs/uz_UZ/supplier_proposal.lang b/htdocs/langs/uz_UZ/supplier_proposal.lang
index a3798afd3b0..f73618659a5 100644
--- a/htdocs/langs/uz_UZ/supplier_proposal.lang
+++ b/htdocs/langs/uz_UZ/supplier_proposal.lang
@@ -42,7 +42,8 @@ SendAskRef=%s narx so'rovini yuborish
 SupplierProposalCard=Kartani so'rash
 ConfirmDeleteAsk=Ushbu narx talabini o'chirishni xohlaysizmi <b> %s </b>?
 ActionsOnSupplierProposal=Narxlar bo'yicha so'rov bo'yicha tadbirlar
-DocModelAuroreDescription=To'liq so'rov modeli (logotip ...)
+DocModelAuroreDescription=A complete template for a vendor quotation request template (old implementation of Sponge template)
+DocModelZenithDescription=A complete template for a vendor quotation request template
 CommercialAsk=Narx so'rovi
 DefaultModelSupplierProposalCreate=Standart model yaratish
 DefaultModelSupplierProposalToBill=Narx so'rovini yopishda standart shablon (qabul qilinadi)
diff --git a/htdocs/langs/vi_VN/accountancy.lang b/htdocs/langs/vi_VN/accountancy.lang
index 3c007b76f43..32c20843140 100644
--- a/htdocs/langs/vi_VN/accountancy.lang
+++ b/htdocs/langs/vi_VN/accountancy.lang
@@ -57,11 +57,14 @@ WarningDataDisappearsWhenDataIsExported=Warning, this list contains only the acc
 VueByAccountAccounting=View by accounting account
 VueBySubAccountAccounting=View by accounting subaccount
 
-MainAccountForCustomersNotDefined=Tài khoản kế toán chính cho khách hàng không được định nghĩa trong thiết lập
-MainAccountForSuppliersNotDefined=Tài khoản kế toán chính cho các nhà cung cấp không được định nghĩa trong thiết lập
-MainAccountForUsersNotDefined=Tài khoản kế toán chính cho người dùng không được định nghĩa trong thiết lập
-MainAccountForVatPaymentNotDefined=Tài khoản kế toán chính cho thanh toán VAT không được định nghĩa trong thiết lập
-MainAccountForSubscriptionPaymentNotDefined=Tài khoản kế toán chính cho thanh toán thuê bao không được định nghĩa trong thiết lập
+MainAccountForCustomersNotDefined=Main account (from the Chart of Account) for customers not defined in setup
+MainAccountForSuppliersNotDefined=Main account (from the Chart of Account) for vendors not defined in setup
+MainAccountForUsersNotDefined=Main account (from the Chart of Account) for users not defined in setup
+MainAccountForRevenueStampSaleNotDefined=Account (from the Chart of Account) for the revenue stamp (sales) not defined in setup
+MainAccountForRevenueStampPurchaseNotDefined=Account (from the Chart of Account) for the revenue stamp (purchases) not defined in setup
+MainAccountForVatPaymentNotDefined=Account (from the Chart of Account) for VAT payment not defined in setup
+MainAccountForSubscriptionPaymentNotDefined=Account (from the Chart of Account) for membership payment not defined in setup
+MainAccountForRetainedWarrantyNotDefined=Account (from the Chart of Account) for the retained warranty not defined in setup
 UserAccountNotDefined=Accounting account for user not defined in setup
 
 AccountancyArea=Khu vực kế toán
diff --git a/htdocs/langs/vi_VN/admin.lang b/htdocs/langs/vi_VN/admin.lang
index 87ab9ae05f5..bcb5be57907 100644
--- a/htdocs/langs/vi_VN/admin.lang
+++ b/htdocs/langs/vi_VN/admin.lang
@@ -1509,7 +1509,8 @@ WatermarkOnDraftContractCards=Watermark on dự thảo hợp đồng (none if em
 MembersSetup=Cài đặt module thành viên
 MemberMainOptions=Lựa chọn chính
 MemberCodeChecker=Options for automatic generation of member codes
-AdherentLoginRequired= Quản lý một Đăng nhập cho mỗi thành viên
+AdherentLoginRequired=Manage a login/password for each member
+AdherentLoginRequiredDesc=Add a value for a login and a password on the member file. If the member is linked to a user, updating the member login and password will also update the user login and password.
 AdherentMailRequired=Yêu cầu email để tạo thành viên mới
 MemberSendInformationByMailByDefault=Hộp kiểm để gửi thư xác nhận cho các thành viên (xác nhận hoặc đăng ký mới) là theo mặc định
 MemberCreateAnExternalUserForSubscriptionValidated=Create an external user login for each new member subscription validated
@@ -2076,6 +2077,10 @@ MAIN_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
 DOC_SHOW_FIRST_SALES_REP=Show first sales representative
 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_GENERATE_DOCUMENTS_SUPPLIER_PROPOSAL_WITHOUT_UNIT_PRICE=Hide the unit price column on quotation requests
+MAIN_GENERATE_DOCUMENTS_SUPPLIER_PROPOSAL_WITHOUT_TOTAL_COLUMN=Hide the total price column on quotation requests
+MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_UNIT_PRICE=Hide the unit price column on purchase orders
+MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_TOTAL_COLUMN=Hide the total price column on puchase orders
 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
@@ -2400,4 +2405,4 @@ OptionXShouldBeEnabledInModuleY=Option "<b>%s</b>" should be enabled into module
 OptionXIsCorrectlyEnabledInModuleY=Option "<b>%s</b>" is enabled into module <b>%s</b>
 AtBottomOfPage=At bottom of page
 FailedAuth=failed authentications
-MaxNumberOfFailedAuth=Max number of failed authentication in 24h to disable login.
+MaxNumberOfFailedAuth=Max number of failed authentication in 24h to deny login.
diff --git a/htdocs/langs/vi_VN/main.lang b/htdocs/langs/vi_VN/main.lang
index ec04b0c24a5..d7e489d4c02 100644
--- a/htdocs/langs/vi_VN/main.lang
+++ b/htdocs/langs/vi_VN/main.lang
@@ -1237,3 +1237,5 @@ SearchSyntaxTooltipForStringOrNum=For searching inside text fields, you can use
 InProgress=Trong tiến trình xử lý
 DateOfPrinting=Date of printing
 ClickFullScreenEscapeToLeave=Click here to switch in Full screen mode. Press ESCAPE to leave Full screen mode.
+UserNotYetValid=Not yet valid
+UserExpired=Đã hết hạn
diff --git a/htdocs/langs/vi_VN/supplier_proposal.lang b/htdocs/langs/vi_VN/supplier_proposal.lang
index fdc5d3910da..ed0ac35e936 100644
--- a/htdocs/langs/vi_VN/supplier_proposal.lang
+++ b/htdocs/langs/vi_VN/supplier_proposal.lang
@@ -13,6 +13,7 @@ SupplierProposalArea=Khu vực đề xuất nhà cung cấp
 SupplierProposalShort=Đề xuất nhà cung cấp
 SupplierProposals=Đề xuất nhà cung cấp
 SupplierProposalsShort=Đề xuất nhà cung cấp
+AskPrice=Yêu cầu giá
 NewAskPrice=Yêu cầu giá mới
 ShowSupplierProposal=Hiển thị yêu cầu giá
 AddSupplierProposal=Tạo một yêu cầu giá
@@ -32,7 +33,7 @@ SupplierProposalStatusValidatedShort=Đã xác nhận
 SupplierProposalStatusClosedShort=Đã đóng
 SupplierProposalStatusSignedShort=Đã được chấp nhận
 SupplierProposalStatusNotSignedShort=Đã từ chối
-CopyAskFrom=Tạo yêu cầu giá bằng cách sao chép yêu cầu hiện có
+CopyAskFrom=Create a price request by copying an existing request
 CreateEmptyAsk=Tạo yêu cầu trống
 ConfirmCloneAsk=Bạn có chắc chắn muốn sao chép yêu cầu giá <b>%s</b> ?
 ConfirmReOpenAsk=Bạn có chắc chắn muốn mở lại yêu cầu giá <b>%s</b> ?
@@ -41,7 +42,8 @@ SendAskRef=Gửi yêu cầu giá %s
 SupplierProposalCard=Thẻ yêu cầu
 ConfirmDeleteAsk=Bạn có chắc chắn muốn xóa yêu cầu giá này <b>%s</b> ?
 ActionsOnSupplierProposal=Sự kiện của yêu cầu giá
-DocModelAuroreDescription=Một mô hình yêu cầu hoàn chỉnh (logo ...)
+DocModelAuroreDescription=A complete template for a vendor quotation request template (old implementation of Sponge template)
+DocModelZenithDescription=A complete template for a vendor quotation request template
 CommercialAsk=Yêu cầu giá
 DefaultModelSupplierProposalCreate=Tạo mô hình mặc định
 DefaultModelSupplierProposalToBill=Mẫu mặc định khi đóng yêu cầu giá (được chấp nhận)
@@ -52,3 +54,6 @@ SupplierProposalsToClose=Đề nghị nhà cung cấp để đóng
 SupplierProposalsToProcess=Đề xuất nhà cung cấp để xử lý
 LastSupplierProposals=Yêu cầu giá mới nhất %s
 AllPriceRequests=Tất cả các yêu cầu
+TypeContact_supplier_proposal_external_SHIPPING=Vendor contact for delivery
+TypeContact_supplier_proposal_external_BILLING=Vendor contact for billing
+TypeContact_supplier_proposal_external_SERVICE=Đại diện kinh doanh theo dõi đơn hàng đề xuất
diff --git a/htdocs/langs/zh_CN/accountancy.lang b/htdocs/langs/zh_CN/accountancy.lang
index c9566fde00c..190d2359eb3 100644
--- a/htdocs/langs/zh_CN/accountancy.lang
+++ b/htdocs/langs/zh_CN/accountancy.lang
@@ -57,18 +57,21 @@ WarningDataDisappearsWhenDataIsExported=Warning, this list contains only the acc
 VueByAccountAccounting=View by accounting account
 VueBySubAccountAccounting=View by accounting subaccount
 
-MainAccountForCustomersNotDefined=未在设置中定义的顾客的主要会计科目
-MainAccountForSuppliersNotDefined=未在设置中定义的供应商的主要会计科目
-MainAccountForUsersNotDefined=未在设置中定义的用户的主要会计科目
-MainAccountForVatPaymentNotDefined=未在设置中定义的税款支付的主要会计科目
-MainAccountForSubscriptionPaymentNotDefined=Main accounting account for subscription payment not defined in setup
+MainAccountForCustomersNotDefined=Main account (from the Chart of Account) for customers not defined in setup
+MainAccountForSuppliersNotDefined=Main account (from the Chart of Account) for vendors not defined in setup
+MainAccountForUsersNotDefined=Main account (from the Chart of Account) for users not defined in setup
+MainAccountForRevenueStampSaleNotDefined=Account (from the Chart of Account) for the revenue stamp (sales) not defined in setup
+MainAccountForRevenueStampPurchaseNotDefined=Account (from the Chart of Account) for the revenue stamp (purchases) not defined in setup
+MainAccountForVatPaymentNotDefined=Account (from the Chart of Account) for VAT payment not defined in setup
+MainAccountForSubscriptionPaymentNotDefined=Account (from the Chart of Account) for membership payment not defined in setup
+MainAccountForRetainedWarrantyNotDefined=Account (from the Chart of Account) for the retained warranty not defined in setup
 UserAccountNotDefined=Accounting account for user not defined in setup
 
 AccountancyArea=会计区
 AccountancyAreaDescIntro=会计模块的使用分几步完成：
-AccountancyAreaDescActionOnce=以下动作通常只执行一次，或每年执行一次......
+AccountancyAreaDescActionOnce=下列操作通常仅执行一次，或每年一次......
 AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you automaticaly the correct default accounting account when transferring data in accounting
-AccountancyAreaDescActionFreq=对于非常大的公司，通常每月，每周或每天执行以下操作......
+AccountancyAreaDescActionFreq=对于非常大的公司来说，通常每月、每周或每天执行下列操作......
 
 AccountancyAreaDescJournalSetup=STEP %s: Check content of your journal list from menu %s
 AccountancyAreaDescChartModel=STEP %s: Check that a model of chart of account exists or create one from menu %s
@@ -81,7 +84,7 @@ AccountancyAreaDescSal=步骤%s：定义支付工资的默认会计科目，使
 AccountancyAreaDescContrib=STEP %s: Define default accounting accounts for Taxes (special expenses). For this, use the menu entry %s.
 AccountancyAreaDescDonation=步骤%s：定义默认的捐献会计科目。为此，请使用菜单项 %s。
 AccountancyAreaDescSubscription=步骤 %s ：定义会员订阅的默认会计帐户。为此，请使用菜单项 %s。
-AccountancyAreaDescMisc=步骤%s：为杂项交易定义强制性默认帐户和默认会计科目，使用菜单%s。
+AccountancyAreaDescMisc=步骤 %s：定义杂项交易的强制默认帐户和默认会计科目。为此，请使用菜单条目 %s。
 AccountancyAreaDescLoan=步骤%s：定义贷款的默认会计科目，使用菜单%s。
 AccountancyAreaDescBank=步骤%s：为每个银行和财务帐户定义会计科目和日常报表代码，使用菜单%s。
 AccountancyAreaDescProd=STEP %s: Define accounting accounts on your Products/Services. For this, use the menu entry %s.
@@ -127,7 +130,7 @@ ExpenseReportsVentilation=费用报告绑定
 CreateMvts=创建新交易
 UpdateMvts=修改交易
 ValidTransaction=验证交易
-WriteBookKeeping=Record transactions in accounting
+WriteBookKeeping=在会计中记录交易
 Bookkeeping=分类帐
 BookkeepingSubAccount=Subledger
 AccountBalance=账目平衡
@@ -168,7 +171,7 @@ ACCOUNTING_MANAGE_ZERO=Allow to manage different number of zeros at the end of a
 BANK_DISABLE_DIRECT_INPUT=禁止在银行帐户中直接记录交易
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=在日记帐上启用草稿导出
 ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties, break ability to search on a part of value)
-ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
+ACCOUNTING_DATE_START_BINDING=定义开始绑定和转移会计的日期。在此日期之前，交易将不会转入会计。
 ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, what is the period selected by default
 
 ACCOUNTING_SELL_JOURNAL=Sales journal - sales and returns
@@ -223,7 +226,7 @@ Lettering=Lettering
 Codejournal=日记帐
 JournalLabel=Journal label
 NumPiece=件数
-TransactionNumShort=Num. transaction
+TransactionNumShort=交易编号
 AccountingCategory=Custom group of accounts
 AccountingCategories=Custom groups of accounts
 GroupByAccountAccounting=Group by general ledger account
@@ -239,7 +242,7 @@ DelMonth=Month to delete
 DelYear=删除整年
 DelJournal=日记帐删除
 ConfirmDeleteMvt=This will delete all lines in accountancy for the year/month and/or for a specific journal (At least one criterion is required). You will have to reuse the feature '%s' to have the deleted record back in the ledger.
-ConfirmDeleteMvtPartial=This will delete the transaction from the accounting (all lines related to the same transaction will be deleted)
+ConfirmDeleteMvtPartial=这将从会计中删除该交易（与同一交易相关的所有行都将被删除）
 FinanceJournal=财务账
 ExpenseReportsJournal=费用报告日常报表
 InventoryJournal=盘点日记帐
@@ -252,8 +255,8 @@ FeeAccountNotDefined=未定义费用的帐户
 BankAccountNotDefined=银行帐户未定义
 CustomerInvoicePayment=付款发票的客户
 ThirdPartyAccount=Third-party account
-NewAccountingMvt=新交易
-NumMvts=Numero的交易
+NewAccountingMvt=新建交易
+NumMvts=交易数量
 ListeMvts=调拨清单
 ErrorDebitCredit=借记卡和信用卡在同一时间不能有一个值
 AddCompteFromBK=将会计科目添加到组中
@@ -267,9 +270,9 @@ ThirdpartyAccountNotDefinedOrThirdPartyUnknownSubledgerIgnored=Third-party unkno
 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=付款未与任何产品/服务相关联
-OpeningBalance=Opening balance
-ShowOpeningBalance=Show opening balance
-HideOpeningBalance=Hide opening balance
+OpeningBalance=期初余额
+ShowOpeningBalance=显示期初余额
+HideOpeningBalance=隐藏期初余额
 ShowSubtotalByGroup=Show subtotal by level
 
 Pcgtype=帐户组
@@ -310,7 +313,7 @@ ErrorAccountancyCodeIsAlreadyUse=Error, you cannot remove or disable this accoun
 MvtNotCorrectlyBalanced=调拨未正确平衡。借方 = %s & 贷方 = %s
 Balancing=平衡
 FicheVentilation=绑定卡
-GeneralLedgerIsWritten=交易是在Ledger中写的
+GeneralLedgerIsWritten=交易已记录在账目中
 GeneralLedgerSomeRecordWasNotRecorded=某些交易无法记录。如果没有其他错误消息，这可能是因为它们已经被记录。
 NoNewRecordSaved=No more record to transfer
 ListOfProductsWithoutAccountingAccount=List of products not bound to any account of chart of account
@@ -358,7 +361,7 @@ ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE_DESC=When this option is enabled, you
 
 ## Export
 NotExportLettering=Do not export the lettering when generating the file
-NotifiedExportDate=Flag not yet exported lines as Exported <span class="warning">(to modify a line flagged as exported, you will need to delete the whole transaction and re-transfert it into accounting)</span>
+NotifiedExportDate=将尚未导出的行标记为已导出<span class="warning">（要修改被标记为已导出的行，您需要删除整个交易并将其重新传输到会计中）</span>
 NotifiedValidationDate=Validate and Lock the exported entries not yet already locked <span class="warning">(same effect than the "%s" feature, modification and deletion of the lines will DEFINITELY not be possible)</span>
 NotifiedExportFull=Export documents ?
 DateValidationAndLock=Date validation and lock
@@ -377,7 +380,7 @@ Modelcsv_cogilog=Export for Cogilog
 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)
+Modelcsv_openconcerto=导出 OpenConcerto（测试）
 Modelcsv_configurable=导出CSV可配置
 Modelcsv_FEC=Export FEC
 Modelcsv_FEC2=Export FEC (With dates generation writing / document reversed)
@@ -418,8 +421,8 @@ SaleExport=Export sale
 SaleEEC=Sale in EEC
 SaleEECWithVAT=Sale in EEC with a VAT not null, so we suppose this is NOT an intracommunautary sale and the suggested account is the standard product account.
 SaleEECWithoutVATNumber=Sale in EEC with no VAT but the VAT ID of thirdparty is not defined. We fall back on the account for standard sales. You can fix the VAT ID of the thirdparty, or change the product account suggested for binding if needed.
-ForbiddenTransactionAlreadyExported=Forbidden: The transaction has been validated and/or exported.
-ForbiddenTransactionAlreadyValidated=Forbidden: The transaction has been validated.
+ForbiddenTransactionAlreadyExported=禁止：交易已验证和/或已导出。
+ForbiddenTransactionAlreadyValidated=禁止：交易已被验证。
 ## Dictionary
 Range=会计科目范围
 Calculated=计算
@@ -443,7 +446,7 @@ ConfirmMassUnletteringAuto=Bulk auto unreconcile confirmation
 ConfirmMassUnletteringManual=Bulk manual unreconcile confirmation
 ConfirmMassUnletteringQuestion=Are you sure you want to unreconcile the %s selected record(s)?
 ConfirmMassDeleteBookkeepingWriting=批量删除确认
-ConfirmMassDeleteBookkeepingWritingQuestion=This will delete the transaction from the accounting (all line entries related to the same transaction will be deleted). Are you sure you want to delete the %s selected entries?
+ConfirmMassDeleteBookkeepingWritingQuestion=这将从会计中删除该交易（与同一交易相关的所有行条目都将被删除）。您确定要删除选定的条目 %s 吗？
 
 ## Error
 SomeMandatoryStepsOfSetupWereNotDone=一些强制性的安装步骤没有完成，请完成它们
@@ -459,7 +462,7 @@ UseMenuToSetBindindManualy=Lines not yet bound, use menu <a href="%s">%s</a> to
 SorryThisModuleIsNotCompatibleWithTheExperimentalFeatureOfSituationInvoices=Note: this module or page is not completely compatible with the experimental feature of situation invoices. Some data may be wrong.
 AccountancyErrorMismatchLetterCode=Mismatch in reconcile code
 AccountancyErrorMismatchBalanceAmount=The balance (%s) is not equal to 0
-AccountancyErrorLetteringBookkeeping=Errors have occurred concerning the transactions: %s
+AccountancyErrorLetteringBookkeeping=交易发生错误：%s
 ErrorAccountNumberAlreadyExists=The accounting number %s already exists
 ErrorArchiveAddFile=Can't put "%s" file in archive
 
@@ -486,7 +489,7 @@ FECFormatMulticurrencyAmount=Multicurrency amount (Montantdevise)
 FECFormatMulticurrencyCode=Multicurrency code (Idevise)
 
 DateExport=Date export
-WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contain transactions modified manually in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate.
+WarningReportNotReliable=警告，该报告不是基于账目的，因此不包含在账目中手动修改的交易。如果您的日记帐是最新的，则簿记视图会更准确。
 ExpenseReportJournal=费用报告日常报表
 DocsAlreadyExportedAreIncluded=Docs already exported are included
 ClickToShowAlreadyExportedLines=Click to show already exported lines
diff --git a/htdocs/langs/zh_CN/admin.lang b/htdocs/langs/zh_CN/admin.lang
index 7c3d89de514..1d4157e6ba0 100644
--- a/htdocs/langs/zh_CN/admin.lang
+++ b/htdocs/langs/zh_CN/admin.lang
@@ -195,7 +195,7 @@ ExportUseMySQLQuickParameter=使用--quick参数
 ExportUseMySQLQuickParameterHelp=“ --quick”参数有助于限制大型表的RAM消耗。
 MySqlExportParameters=MySQL 导出参数
 PostgreSqlExportParameters= PostgreSQL 导出参数
-UseTransactionnalMode=使用事务模式
+UseTransactionnalMode=使用交易模式
 FullPathToMysqldumpCommand=mysqldump 命令的完整路径
 FullPathToPostgreSQLdumpCommand=pg_dump 命令的完整路径
 AddDropDatabase=添加 DROP DATABASE 命令
@@ -232,7 +232,7 @@ Updated=已更新
 AchatTelechargement=购买/下载
 GoModuleSetupArea=要部署/安装新模块，请转到模块设置区域： <a href="%s"> %s </a> 。
 DoliStoreDesc=DoliStore，为 Dolibarr ERP/CRM 提供外部模块的官方市场
-DoliPartnersDesc=提供定制开发模块或功能的公司列表。 <br> 注意：由于 Dolibarr 是一个开源应用程序，<i> 任何有 PHP 编程经验的人 </i> 都应该能够开发模块。
+DoliPartnersDesc=提供定制开发模块或功能的公司清单。 <br> 注意：由于 Dolibarr 是一个开源应用程序，<i> 任何有 PHP 编程经验的人 </i> 都可以打开开发模块。
 WebSiteDesc=可以获取更多附加（非核心）模块的外部网站...
 DevelopYourModuleDesc=一些开发您自己的模块的解决方案......
 URL=URL
@@ -245,7 +245,7 @@ ActivatableOn=在…可启用
 SourceFile=来源文件
 AvailableOnlyIfJavascriptAndAjaxNotDisabled=仅当 JavaScript 启用时可用
 Required=必要的
-UsedOnlyWithTypeOption=仅供某些议程选项使用
+UsedOnlyWithTypeOption=仅供某些日程选项使用
 Security=安全
 Passwords=密码
 DoNotStoreClearPassword=加密存储在数据库中的密码（不保存为纯文本）。强烈建议激活此选项。
@@ -268,7 +268,7 @@ OtherResources=其他资源
 ExternalResources=外部资源
 SocialNetworks=社交网络
 SocialNetworkId=社交网络ID
-ForDocumentationSeeWiki=要查找用户或开发人员文档（文档、常见问题解答...），请查看 Dolibarr Wiki：<br> <b> <a href="%s" target="_blank" rel="noopener noreferrer"> %s </a> 
+ForDocumentationSeeWiki=要查找用户或开发人员文档（文档、常见问题解答...），<br>请查看 Dolibarr Wiki：<br><b> <a href="%s" target="_blank" rel="noopener noreferrer"> %s </a> </b>
 ForAnswersSeeForum=对于其他的任何问题/帮助，您可以使用 Dolibarr 论坛：<br> <b> <a href="%s" target="_blank" rel="noopener noreferrer"> %s </a> </b>
 HelpCenterDesc1=以下是获取 Dolibarr 帮助和支持的一些资源。
 HelpCenterDesc2=此资源的一些部分仅以<b>英文</b> 提供。
@@ -333,7 +333,7 @@ ModuleFamilyProjects=项目/协同工作
 ModuleFamilyOther=其他
 ModuleFamilyTechnic=多模块工具
 ModuleFamilyExperimental=试验性模块
-ModuleFamilyFinancial=财务模块(会计/财务)
+ModuleFamilyFinancial=财务模块（会计/资金管理）
 ModuleFamilyECM=电子文档管理(ECM)
 ModuleFamilyPortal=网站和其他前台应用
 ModuleFamilyInterface=与外部系统的接口
@@ -378,7 +378,7 @@ DoTestSendHTML=测试发送 HTML
 ErrorCantUseRazIfNoYearInMask=错误，如果序列{yy}或{yyyy}不在掩码中，则不能使用选项@来重置计数器。
 ErrorCantUseRazInStartedYearIfNoYearMonthInMask=错误，如果序列 {yy}{mm} 或 {yyyy}{mm} 不在掩码中，则无法使用选项 @。
 UMask=Unix/Linux/BSD 文件系统下新文件的 umask 参数。
-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.). Recommended value is 0600 or 0660<br>This parameter is useless on a Windows server.
+UMaskExplanation=此参数允许您定义 Dolibarr 在服务器上创建的文件的默认权限设置（例如在上传期间）。 <br> 必须是八进制值（例如，0666 表示所有人都可以读和写）。建议值为 0600 或 0660 <br> 此参数在 Windows 服务器上无用。
 SeeWikiForAllTeam=查看 Wiki 页面以获取贡献者及其组织的列表
 UseACacheDelay= 以秒为单位缓存导出响应的延迟（0 或空无缓存）
 DisableLinkToHelpCenter=在登录页面隐藏链接“<b> 需要帮助或支持 </b>”
@@ -396,7 +396,7 @@ ExampleOfDirectoriesForModelGen=语法示例： <br> c:\\myapp\\mydocumentdir\\m
 FollowingSubstitutionKeysCanBeUsed=<br>要了解如何创建ODT文档模板并将其存储到指定目录中，请参阅wiki文档：
 FullListOnOnlineDocumentation=https://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
 FirstnameNamePosition=名称/姓氏的位置顺序
-DescWeather=当延迟操作的数量达到以下值时，主看板上将显示以下图标：
+DescWeather=当逾期操作数量达到以下值时，看板上将显示以下图像：
 KeyForWebServicesAccess=使用 SOAP 服务的密钥 (webservices 中的"dolibarrkey"参数)
 TestSubmitForm=输入测试表单
 ThisForceAlsoTheme=无论用户如何设置，使用此菜单管理器将同时使用其主题。同时此菜单管理器专为智能手机而设计但并不适用于所有手机。如果您的手机上使用有问题请选择其它主题。
@@ -455,7 +455,7 @@ ExtrafieldCheckBox=复选框
 ExtrafieldCheckBoxFromList=表格中的复选框
 ExtrafieldLink=链接到对象
 ComputedFormula=计算出的字段
-ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $objectoffield</strong>.<br><strong>WARNING</strong>: If you need properties of an object not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$objectoffield->id < 10 ? round($objectoffield->id / 2, 2): ($objectoffield->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetchNoCompute($objectoffield->id) > 0 ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1')<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetchNoCompute($objectoffield->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Parent project not found'
+ComputedFormulaDesc=您可以在此处输入使用对象的其他属性或任何 PHP 编码的公式，以获得动态计算值。您可以使用任何 PHP 兼容公式，包括“?”条件运算符，以及以下全局对象：<strong> $db、$conf、$langs、$mysoc、$user、$objectoffield </strong> . <br> <strong> 警告 </strong> ：如果您需要未加载对象的属性，只需将对象放入公式中即可，如第二个示例所示。 <br> 使用计算字段意味着您无法从界面输入任何值。此外，如果存在语法错误，公式可能不会返回任何内容。 <br> <br> 公式示例：<br> $objectoffield->id < 10 ? round($objectoffield-> id / 2, 2): ($objectoffield->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2) <br> <br> 重新加载对象的示例 <br> (($reloadedobj = new Societe( $db)) && ($reloadedobj->fetchNoCompute($objectoffield->id) > 0 ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1') <br> <br> 强制加载对象及其父对象的公式的其他示例： <br> (( $reloadedobj = 新任务($db)) && ($reloadedobj->fetchNoCompute($objectoffield->id) > 0) && ($secondloadedobj = 新项目($db)) && ($secondloadedobj->fetchNoCompute($reloadedobj- >fk_project) > 0)) ？ $secondloadedobj->ref: '未找到父项目'
 Computedpersistent=存储计算出的域
 ComputedpersistentDesc=计算出的额外字段将存储在数据库中，但是，只有在更改该字段的对象时才会重新计算该值。如果计算域依赖于其他对象或全局数据，这个值可能是错误的！！
 ExtrafieldParamHelpPassword=将此字段留空意味着该值将在不加密的情况下存储（字段必须仅在屏幕上用星号隐藏）。 <br> 设置“auto”以使用默认加密规则将密码保存到数据库中（之后读取的值将只是哈希值，无法检索原始值）
@@ -515,7 +515,7 @@ ClickToShowDescription=点击以显示描述
 DependsOn=该模块需要模块(集)
 RequiredBy=本模块被以下模块(集)需要
 TheKeyIsTheNameOfHtmlField=这是 HTML 字段的名称。需要技术知识才能读取 HTML 页面的内容以获取字段的键名。
-PageUrlForDefaultValues=You must enter the relative path of the page URL. If you include parameters in URL, it will be effective if all parameters in browsed URL have the value defined here.
+PageUrlForDefaultValues=您必须输入页面 URL 的相对路径。如果在 URL 中包含参数，则浏览的 URL 中的所有参数都具有此处定义的值才有效。
 PageUrlForDefaultValuesCreate= <br> 示例：<br> 用于创建新的合作方的表单，它是 <strong> %s </strong> 。 <br> 对于安装到自定义目录的外部模块的 URL，不要包含“custom/”，因此使用 <strong> mymodule/mypage.php </strong> 之类的路径，而不是 custom/mymodule/mypage.php。 <br> 如果只有在 url 有一些参数时才需要默认值，你可以使用 <strong> %s </strong>
 PageUrlForDefaultValuesList= <br> 示例：<br> 对于列出合作方的页面，它是 <strong> %s </strong> 。 <br> 对于安装到自定义目录的外部模块的 URL，不要包含“custom/”，因此请使用 <strong> mymodule/mypagelist.php </strong> 之类的路径，而不是 custom/mymodule/mypagelist.php。 <br> 如果只有在 url 有一些参数时才需要默认值，你可以使用 <strong> %s </strong>
 AlsoDefaultValuesAreEffectiveForActionCreate=另请注意，覆盖表单创建的默认值仅适用于正确设计的页面（因此请使用参数 action=create 或 presend...）
@@ -525,15 +525,15 @@ GoIntoTranslationMenuToChangeThis=已使用此代码找到此键的翻译。要
 WarningSettingSortOrder=警告，如果字段是未知字段，则在列表页面上设置默认排序顺序可能会导致技术错误。如果遇到此类错误，请返回此页面以删除默认排序顺序并恢复默认行为。
 Field=字段
 ProductDocumentTemplates=生成产品文档的文档模板
-ProductBatchDocumentTemplates=Document templates to generate product lots document
-FreeLegalTextOnExpenseReports=关于费用报销单的免费法律文本
+ProductBatchDocumentTemplates=用于生成产品批次文档的文档模板
+FreeLegalTextOnExpenseReports=费用报销单上的附加法律文本
 WatermarkOnDraftExpenseReports=费用报销单草稿上的水印
 ProjectIsRequiredOnExpenseReports=该项目必须提交费用报销单
 PrefillExpenseReportDatesWithCurrentMonth=用当月的开始和结束日期预先填写新建费用报销单的开始和结束日期
 ForceExpenseReportsLineAmountsIncludingTaxesOnly=强制以含税金额输入费用报销单金额
-AttachMainDocByDefault=Set this to <b>Yes</b> if you want to attach by default the main document to the email (if applicable)
+AttachMainDocByDefault=如果您想默认将主文档附加到电子邮件（如果适用），请将其设置为 <b> 是 </b>
 FilesAttachedToEmail=附加文件
-SendEmailsReminders=通过电子邮件发送议程提醒
+SendEmailsReminders=通过电子邮件发送日程提醒
 davDescription=设置WebDAV服务器
 DAVSetup=模块DAV的设置
 DAV_ALLOW_PRIVATE_DIR=启用通用私有目录（名为“private”的 WebDAV 专用目录 - 需要登录）
@@ -581,20 +581,20 @@ Module54Name=合约/订阅
 Module54Desc=合约管理（服务或定期订阅）
 Module55Name=条码
 Module55Desc=条码或二维码管理
-Module56Name=通过贷记转账付款
-Module56Desc=管理使用贷记转账对供应商的付款。它包括为欧洲国家生成 SEPA 文件。
+Module56Name=通过银行转账付款
+Module56Desc=管理使用银行转账的供应商的付款单。它包括为欧洲国家生成 SEPA 文件。
 Module57Name=直接借记付款
 Module57Desc=管理使用直接借记对供应商的付款。它包括为欧洲国家生成 SEPA 文件。
 Module58Name=ClickToDial
 Module58Desc=ClickToDial系统集成(Asterisk ...)
 Module60Name=便签
 Module60Desc=便签管理
-Module70Name=干预
-Module70Desc=干预管理模块
+Module70Name=现场服务
+Module70Desc=现场服务管理
 Module75Name=费用和差旅记录
 Module75Desc=费用和差旅记录的管理
-Module80Name=货件
-Module80Desc=发运单和交货回单管理
+Module80Name=发货单
+Module80Desc=发货单和交货回执管理
 Module85Name=银行和现金
 Module85Desc=银行或现金帐户管理
 Module100Name=外部站点
@@ -616,7 +616,7 @@ Module320Desc=向 Dolibarr 页面添加 RSS 源
 Module330Name=书签和快捷方式
 Module330Desc=为您经常访问的内部或外部页面创建始终可见的快捷方式
 Module400Name=项目或商机
-Module400Desc=管理项目、销售线索/商机和/或任务。您还可以将任何元素（发票、订单、报价单、介入......）分配给项目并从项目视图中获取横向视图。
+Module400Desc=管理项目、销售线索/商机和/或任务。您还可以将任何元素（发票、订单、报价单、现场服务......）分配给项目并从项目视图中获取横向视图。
 Module410Name=Webcalendar
 Module410Desc=Webcalendar集成
 Module500Name=税收和特殊费用
@@ -625,9 +625,9 @@ Module510Name=工资
 Module510Desc=记录和跟踪员工付款
 Module520Name=贷款
 Module520Desc=贷款管理模块
-Module600Name=商业活动通知
+Module600Name=商务事件通知
 Module600Desc=发送由商业活动触发的电子邮件通知：按用户（在每个用户上定义的设置）、按合作方联系人（在每个合作方上定义的设置）或通过特定电子邮件
-Module600Long=请注意，此模块会在特定商业活动发生时实时发送电子邮件。如果您正在寻找通过电子邮件发送议程事件提醒的功能，请进入议程模块设置。
+Module600Long=请注意，此模块会在特定商业活动发生时实时发送电子邮件。如果您正在寻找通过电子邮件发送日程事件提醒的功能，请进入日程模块设置。
 Module610Name=产品变体
 Module610Desc=创建产品变体（颜色、尺寸等）
 Module700Name=捐献
@@ -635,7 +635,7 @@ Module700Desc=捐献管理
 Module770Name=费用报销
 Module770Desc=管理费用报销（交通、餐饮……）
 Module1120Name=供应商报价单
-Module1120Desc=要求供应商商业提案和价格
+Module1120Desc=请求供应商报价单和定价
 Module1200Name=Mantis
 Module1200Desc=Mantis 集成
 Module1520Name=文档生成
@@ -650,8 +650,8 @@ Module2300Name=计划任务
 Module2300Desc=计划任务管理（cron 或 chrono table）
 Module2400Name=事件/日程
 Module2400Desc=跟踪项目。记录自动事件以进行跟踪或记录手动事件或会议。这是良好的客户或供应商关系管理的主要模块。
-Module2430Name=Online Booking Calendar
-Module2430Desc=Provide an online calendar to allow anyone to book rendez-vous, according to predefined ranges or availabilities.
+Module2430Name=在线预订日历
+Module2430Desc=提供在线日历，允许任何人根据预定义的范围或可用性预订约会。
 Module2500Name=DMS / ECM
 Module2500Desc=文件管理系统/电子内容管理。自动组织生成或存储的文档。在需要时分享。
 Module2600Name=API / 网络服务 (SOAP 服务器)
@@ -667,8 +667,8 @@ Module2900Name=Maxmind的GeoIP全球IP地址数据库
 Module2900Desc=Maxmind的GeoIP数据库的转换能力
 Module3200Name=不可更改的档案
 Module3200Desc=启用不可更改的商业活动日志。事件被实时存档。日志是只读的可以导出的链式事件表。对于某些国家/地区，此模块可能是强制性的。
-Module3300Name=Module Builder
-Module3300Desc=A RAD (Rapid Application Development - low-code and no-code) tool to help developers or advanced users to build their own module/application.
+Module3300Name=模块生成器
+Module3300Desc=RAD（快速应用程序开发 - 低代码和无代码）工具可帮助开发人员或高级用户构建自己的模块/应用程序。
 Module3400Name=社交网络
 Module3400Desc=启用合作方和地址的社交网络字段（skype、twitter、facebook、...）。
 Module4000Name=人力资源管理
@@ -708,12 +708,12 @@ Module60000Desc=佣金管理模块
 Module62000Name=国际贸易术语
 Module62000Desc=添加功能来管理国际贸易术语
 Module63000Name=资源
-Module63000Desc=管理用于分配给活动的资源（打印机、汽车、房间等）
-Module66000Name=OAuth2 token management
-Module66000Desc=Provide a tool to generate and manage OAuth2 tokens. The token can then be used by some other modules.
+Module63000Desc=管理用于分配给事件的资源（打印机、汽车、房间……）
+Module66000Name=OAuth2 令牌管理
+Module66000Desc=提供生成和管理 OAuth2 令牌的工具。然后该令牌可以被其他一些模块使用。
 Module94160Name=收货单
 ##### Permissions #####
-Permission11=Read customer invoices (and payments)
+Permission11=读取客户发票（和付款）
 Permission12=创建/变更发票
 Permission13=作废客户发票
 Permission14=确认客户发票
@@ -738,13 +738,13 @@ Permission41=查看项目和任务（我是其联系人的共享项目和项目
 Permission42=创建/修改项目（共享项目和我是其联系人的项目）。还可以将用户分配给项目和任务
 Permission44=删除项目（共享项目和我作为联系人的项目）
 Permission45=导出项目
-Permission61=查看干预
-Permission62=创建/变更干预
-Permission64=删除干预
-Permission67=导出干预措施
-Permission68=通过电子邮件发送干预
-Permission69=验证干预
-Permission70=作废干预
+Permission61=读取现场服务
+Permission62=创建/变更现场服务
+Permission64=删除现场服务
+Permission67=导出现场服务
+Permission68=通过电子邮件发送现场服务
+Permission69=验证现场服务
+Permission70=无效的现场服务
 Permission71=读取会员
 Permission72=创建/变更会员
 Permission74=删除会员
@@ -775,7 +775,7 @@ Permission111=查看财务账户
 Permission112=创建/变更/删除和比较交易
 Permission113=设置财务账户（创建、管理银行交易类别）
 Permission114=交易对账
-Permission115=导出交易和帐户报表
+Permission115=导出交易和账户报表
 Permission116=账户间转账
 Permission117=管理支票调度
 Permission121=查看链接到用户的合作方
@@ -845,8 +845,8 @@ PermissionAdvanced253=创建/修改内部/外部用户和权限
 Permission254=只能创建/修改外部用户资料
 Permission255=修改其他用户密码
 Permission256=删除或禁用其他用户
-Permission262=将访问权限扩展到所有合作方及其对象（不仅是用户作为销售代表的合作方）。 <br> 对外部用户无效（对于提案、订单、发票、合同等，始终仅限于他们自己）。 <br> 对项目无效（仅关于项目权限、可见性和分配事项的规则）。
-Permission263=将访问权限扩展到所有没有对象的合作方（不仅是用户作为销售代表的合作方）。 <br> 对外部用户无效（对于提案、订单、发票、合同等，始终仅限于他们自己）。 <br> 对项目无效（仅关于项目权限、可见性和分配事项的规则）。
+Permission262=将访问权限扩展到所有合作方及其对象（不仅是用户作为销售代表的合作方）。 <br> 对外部用户无效（对于报价单、订单、发票、合同等，始终仅限于他们自己）。 <br> 对项目无效（仅关于项目权限、可见性和分配事项的规则）。
+Permission263=将访问权限扩展到所有没有对象的合作方（不仅是用户作为销售代表的合作方）。 <br> 对外部用户无效（对于报价单、订单、发票、合同等，始终仅限于他们自己）。 <br> 对项目无效（仅关于项目权限、可见性和分配事项的规则）。
 Permission271=查看 CA
 Permission272=查看发票
 Permission273=开具发票
@@ -895,10 +895,10 @@ Permission533=读取服务价格
 Permission534=删除服务
 Permission536=查看管理隐藏的服务
 Permission538=导出服务
-Permission561=读取贷记转账的付款单
-Permission562=创建/修改贷记转账付款单
-Permission563=发送/传输贷记转账付款单
-Permission564=记录贷记转账的贷项/拒绝
+Permission561=读取银行转账的付款单
+Permission562=创建/修改银行转账付款单
+Permission563=发送/传输银行转账付款单
+Permission564=记录借记/拒绝银行转账
 Permission601=查看便签
 Permission602=创建/修改便签
 Permission609=删除便签
@@ -932,15 +932,15 @@ Permission1012=创建新盘点
 Permission1014=验证盘点
 Permission1015=允许更改产品的 PMP 值
 Permission1016=删除盘点
-Permission1101=读取交货回单
-Permission1102=创建/变更交货回单
-Permission1104=验证交货回单
-Permission1109=删除交货回单
-Permission1121=查看供应商提案
-Permission1122=创建/修改供应商提案
-Permission1123=验证供应商提案
-Permission1124=发送供应商提案
-Permission1125=删除供应商提案
+Permission1101=读取交货回执
+Permission1102=创建/变更交货回执
+Permission1104=验证交货回执
+Permission1109=删除交货回执
+Permission1121=读取供应商报价单
+Permission1122=创建/变更供应商报价单
+Permission1123=验证供应商报价单
+Permission1124=发送供应商报价单
+Permission1125=删除供应商报价单
 Permission1126=关闭供应商价格请求
 Permission1181=查看供应商资料
 Permission1182=查看采购订单
@@ -955,7 +955,7 @@ Permission1190=审批（二次审批）采购订单
 Permission1191=导出供应商订单及其属性
 Permission1201=获得导出结果
 Permission1202=创建/修改导出信息
-Permission1231=Read vendor invoices (and payments)
+Permission1231=读取供应商发票（和付款）
 Permission1232=创建/修改供应商发票
 Permission1233=验证供应商发票
 Permission1234=删除供应商发票
@@ -964,22 +964,22 @@ Permission1236=导出供应商发票、属性和付款资料
 Permission1237=导出采购订单及其详细信息
 Permission1251=将大量外部数据导入数据库（数据加载）
 Permission1321=导出客户发票、属性及其付款资料
-Permission1322=重新打开已付账单
+Permission1322=重新打开已支付帐单
 Permission1421=导出销售订单和属性
 Permission1521=查看文件
 Permission1522=删除文件
-Permission2401=查看关联到此的用户帐户的操作（事件或任务）（如果是事件的所有者或分配到该用户）
-Permission2402=创建/修改关联到此的用户帐户的操作（事件或任务）（如果是事件的所有者或分配到该用户）
-Permission2403=删除关联到此的用户帐户的操作（事件或任务）（如果是事件的所有者或分配到该用户）
-Permission2411=查看他人的操作(事件或任务)
-Permission2412=创建/修改他人的操作(事件或任务)
-Permission2413=删除他人的操作(事件或任务)
+Permission2401=读取链接到其用户帐户（是事件所有者或事件已分配给该用户）的操作（事件或任务）
+Permission2402=创建/变更链接到其用户帐户（是事件所有者）的操作（事件或任务）
+Permission2403=删除链接到其用户帐户（是事件所有者）的操作（事件或任务）
+Permission2411=读取他人的操作（事件或任务）
+Permission2412=创建/变更他人的操作（事件或任务）
+Permission2413=删除他人的操作（事件或任务）
 Permission2414=导出他人的操作/任务
 Permission2501=查看/下载文档
 Permission2502=下载文档
 Permission2503=提交或删除文档
 Permission2515=设置文档目录
-Permission2610=Generate/modify users API key
+Permission2610=生成/变更用户API密钥
 Permission2801=在只读模式下使用 FTP 客户端（仅浏览和下载）
 Permission2802=在写入模式下使用 FTP 客户端（删除或上传文件）
 Permission3200=读取已存档的事件和指纹
@@ -987,14 +987,14 @@ Permission3301=生成新模块
 Permission4001=查看技能/工作/职位
 Permission4002=创建/修改 技能/工作/职位
 Permission4003=删除技能/工作/职位
-Permission4021=Read evaluations (yours and your subordinates)
-Permission4022=Create/modify evaluations
+Permission4021=读取评价（您和您的下属的）
+Permission4022=创建/变更评价
 Permission4023=验证评价
 Permission4025=删除评价
 Permission4028=查看比较菜单
 Permission4031=查看个人信息
 Permission4032=写入个人信息
-Permission4033=Read all evaluations (even those of user not subordinates)
+Permission4033=读取所有评价（甚至是非下属用户的评价）
 Permission10001=查看网站内容
 Permission10002=创建/修改网站内容（HTML和 JavaScript 内容）
 Permission10003=创建/修改网站内容（动态 PHP代码）。危险，只能提供给受限制的开发人员。
@@ -1006,18 +1006,18 @@ Permission20004=查看所有休假请求（即使是用户不是下属）
 Permission20005=为所有人创建/修改休假请求（即使是非下属的用户）
 Permission20006=管理休假请求（设置和更新余额）
 Permission20007=审批休假请求
-Permission23001=查看计划任务
+Permission23001=读取计划任务
 Permission23002=创建/修改计划任务
 Permission23003=删除计划任务
 Permission23004=执行计划任务
-Permission40001=Read currencies and their rates
-Permission40002=Create/Update currencies and their rates
-Permission40003=Delete currencies and their rates
+Permission40001=读取货币及其汇率
+Permission40002=创建/更新货币及其汇率
+Permission40003=删除货币及其汇率
 Permission50101=使用销售点模块 (SimplePOS)
 Permission50151=使用销售点模块 (TakePOS)
 Permission50152=编辑销售订单行
 Permission50153=编辑已订购的销售订单行
-Permission50201=查看交易
+Permission50201=读取交易
 Permission50202=导入交易
 Permission50330=查看 Zapier 的对象
 Permission50331=创建/修改 Zapier 的对象
@@ -1029,9 +1029,9 @@ Permission50414=删除账目
 Permission50415=在账目中按年份和分类帐删除所有项目
 Permission50418=导出账目
 Permission50420=报表和导出报表（营业额、余额、日记帐、分类帐）
-Permission50430=定义会计期间。验证交易并结账。
+Permission50430=定义会计年度。验证交易并关闭会计年度。
 Permission50440=管理会计科目表，会计设置
-Permission51001=查看资产
+Permission51001=读取资产
 Permission51002=创建/修改资产
 Permission51003=删除资产
 Permission51005=设置资产类型
@@ -1044,12 +1044,12 @@ Permission59003=查看每位用户利润
 Permission63001=查看资源
 Permission63002=创建/修改资源
 Permission63003=删除资源
-Permission63004=将资源链接到议程事件
+Permission63004=将资源链接到日程事件
 Permission64001=允许直接打印
 Permission67000=允许打印收据
-Permission68001=查看内部通讯报告
-Permission68002=创建/修改内部通信报告
-Permission68004=删除内部通讯报告
+Permission68001=读取内部报表
+Permission68002=创建/变更内部报表
+Permission68004=删除内部报表
 Permission941601=查看收据    
 Permission941602=创建和编辑收据
 Permission941603=验证收据
@@ -1065,7 +1065,7 @@ DictionaryRegion=地区
 DictionaryCountry=国家
 DictionaryCurrency=货币
 DictionaryCivility=尊称
-DictionaryActions=活动议程类型
+DictionaryActions=日程事件的类型
 DictionarySocialContributions=社会税或财政税的类型
 DictionaryVAT=VAT或销售税率
 DictionaryRevenueStamp=印花税金额
@@ -1077,11 +1077,11 @@ DictionaryEcotaxe=生态税 (WEEE)
 DictionaryPaperFormat=纸张格式
 DictionaryFormatCards=卡片格式
 DictionaryFees=费用报销单 - 费用报销单费用类型
-DictionarySendingMethods=运输方式
+DictionarySendingMethods=货物运输方式
 DictionaryStaff=雇员人数
-DictionaryAvailability=交货用时
+DictionaryAvailability=交货延迟
 DictionaryOrderMethods=订购方式
-DictionarySource=提案/订单的来源
+DictionarySource=报价单/订单的来源
 DictionaryAccountancyCategory=个性化的报告组
 DictionaryAccountancysystem=会计科目表
 DictionaryAccountancyJournal=会计日记账
@@ -1095,7 +1095,7 @@ DictionaryHolidayTypes=休假 - 休假类型
 DictionaryOpportunityStatus=项目/商机的状态
 DictionaryExpenseTaxCat=费用报告 - 运输类别
 DictionaryExpenseTaxRange=费用报告 - 按运输类别划分的范围
-DictionaryTransportMode=内部通信报告 - 运输方式
+DictionaryTransportMode=内部报表 - 传送模式
 DictionaryBatchStatus=产品批号/序列号的质量控制状态
 DictionaryAssetDisposalType=资产处置类型
 TypeOfUnit=单位类型
@@ -1109,7 +1109,7 @@ BackToModuleList=返回模块列表
 BackToDictionaryList=返回字典列表
 TypeOfRevenueStamp=印花税票种类
 VATManagement=销售税管理
-VATIsUsedDesc=默认情况下，在创建潜在客户、发票、订单等时，销售税率遵循现行标准规则：<br> 如果卖方不缴纳销售税，则销售税默认为 0。规则结束。 <br> 如果（卖方国家=买方国家），则销售税默认等于卖方国家/地区的产品销售税。规则结束。 <br> 如果卖方和买方都在欧共体且货物是与运输相关的产品（拖运、海运、航空），则默认增值税为 0。此规则取决于卖家所在的国家/地区 - 请咨询您的会计师。增值税应由买方向其所在国家的海关支付，而不是向卖方支付。规则结束。 <br> 如果卖方和买方都在欧共体，并且买方不是公司（具有注册的欧盟内部增值税号），则增值税默认为卖方所在国家/地区的增值税税率。规则结束。 <br> 如果卖方和买方都在欧共体，并且买方是公司（注册了欧盟内增值税号），则默认增值税为 0。规则结束。 <br> 在任何其他情况下，建议的默认值为销售税 = 0。规则结束。
+VATIsUsedDesc=默认情况下，在创建准客户、发票、订单等时，销售税率遵循现行标准规则：<br> 如果卖方不缴纳销售税，则销售税默认为 0。规则结束。 <br> 如果（卖方国家=买方国家），则销售税默认等于卖方国家/地区的产品销售税。规则结束。 <br> 如果卖方和买方都在欧共体且货物是与运输相关的产品（拖运、海运、航空），则默认增值税为 0。此规则取决于卖家所在的国家/地区 - 请咨询您的会计师。增值税应由买方向其所在国家的海关支付，而不是向卖方支付。规则结束。 <br> 如果卖方和买方都在欧共体，并且买方不是公司（具有注册的欧盟内部增值税号），则增值税默认为卖方所在国家/地区的增值税税率。规则结束。 <br> 如果卖方和买方都在欧共体，并且买方是公司（注册了欧盟内增值税号），则默认增值税为 0。规则结束。 <br> 在任何其他情况下，建议的默认值为销售税 = 0。规则结束。
 VATIsNotUsedDesc=默认情况下，建议的销售税为 0，可用于协会、个人或小公司等情况。
 VATIsUsedExampleFR=在法国，这意味着这个公司或机构有一个真正的财政系统（简化实际或正常实际），这个体制会申报增值税。
 VATIsNotUsedExampleFR=在法国，它指的是非增值税申报的协会或选择微型企业财政系统（特许经营增值税）并在没有任何增值税申报的情况下支付特许经营增值税的公司，组织或自由职业。该选项将在发票上显示“Non applicable VAT - art-293B of CGI”的参考。
@@ -1222,8 +1222,8 @@ ShowBugTrackLink=显示链接“<strong> %s </strong>”
 ShowBugTrackLinkDesc=留空不显示此链接，使用值 'github' 为 Dolibarr 项目的链接，或直接定义一个 URL 'https://...'
 Alerts=警告
 DelaysOfToleranceBeforeWarning=为…显示警告
-DelaysOfToleranceDesc=这里您可以设置主看板区出现逾期提醒 (带有%s图标) 前的逾期时间。
-Delays_MAIN_DELAY_ACTIONS_TODO=计划的活动（议程活动）未完成
+DelaysOfToleranceDesc=设置逾期时间，用以在屏幕上显示逾期元素的警报图标 %s 。
+Delays_MAIN_DELAY_ACTIONS_TODO=未完成的已计划事件（日程事件）
 Delays_MAIN_DELAY_PROJECT_TO_CLOSE=项目未及时关闭
 Delays_MAIN_DELAY_TASKS_TODO=计划的任务（项目任务）未完成
 Delays_MAIN_DELAY_ORDERS_TO_PROCESS=订单未处理
@@ -1268,7 +1268,7 @@ AreaForAdminOnly=设置参数只能由 <b> 管理员用户 </b> 设置。
 SystemInfoDesc=系统信息指只对系统管理员可见的以只读方式显示的杂项技术信息。
 SystemAreaForAdminOnly=此区域仅供管理员用户使用。 Dolibarr 用户权限无法更改此限制。
 CompanyFundationDesc=编辑您的公司/组织的信息。完成后单击页面底部的“%s”按钮。
-MoreNetworksAvailableWithModule=More social networks may be available by enabling the module "Social networks".
+MoreNetworksAvailableWithModule=通过启用“社交网络”模块可以使用更多社交网络。
 AccountantDesc=如果您有外部会计师/簿记员，您可以在此处编辑其信息。
 AccountantFileNumber=会计师代码
 DisplayDesc=在此处可以修改影响应用程序外观和呈现的参数。
@@ -1278,7 +1278,7 @@ SessionTimeOut=会话超时
 SessionExplanation=如果会话清理器由内部 PHP 会话清理器完成（仅此而已），则此数字保证会话在此延迟之前永远不会过期。内部 PHP 会话清理器不保证会话会在此延迟后会过期。它将在此延迟之后且当会话清理器运行时过期，因此每次 <b> %s/%s </b> 访问，但仅在其他会话进行访问期间（如果值为 0，则意味着清除会话仅由外部过程完成）。 <br> 注意：在某些具有外部会话清理机制的服务器上（debian、ubuntu 下的 cron...），无论此处输入的值是什么，会话都可以在外部设置定义的时间后销毁。
 SessionsPurgedByExternalSystem=此服务器上的会话似乎是由外部机制（debian、ubuntu 下的 cron ......）清理的，可能每 <b> %s </b> 秒（= 参数值 <b> session.gc_maxlifetime </b> ），所以在这里改变值没有效果。您必须要求服务器管理员更改会话延迟。
 TriggersAvailable=可用的触发器
-TriggersDesc=触发器是一旦复制到目录<b> htdocs / core / triggers</b>中就会修改Dolibarr工作流程行为的文件。他们可以感知新的Dolibarr事件（新公司创建，发票验证......）。
+TriggersDesc=触发器是一旦复制到目录 <b> htdocs/core/triggers </b> 中就会变更 Dolibarr 工作流程行为的文件。其实现了使用 Dolibarr 事件（新建公司、验证发票等等）来激活的新操作。
 TriggerDisabledByName=此文件中的触发器被其名称中的 <b> -NORUN </b> 后缀禁用。
 TriggerDisabledAsModuleDisabled=此文件中的触发器将在<b>%s</b>模块禁用时禁用。
 TriggerAlwaysActive=无论 Dolibarr 的各模块是否启用，此文件中的触发器一直处于启用状态。
@@ -1286,7 +1286,7 @@ TriggerActiveAsModuleActive=此文件中的触发器将于 <b>%s</b> 模块启
 GeneratedPasswordDesc=选择用于自动生成密码的方法。
 DictionaryDesc=输入全部参考数据。您能添加你的参数值为默认值。
 ConstDesc=此页面允许您编辑（覆盖）其他页面中不可用的参数。这些主要是为开发人员/高级故障排除保留的参数。
-MiscellaneousOptions=Miscellaneous options
+MiscellaneousOptions=其他选项
 MiscellaneousDesc=所有其他安全相关的参数在这里定义。
 LimitsSetup=限制及精度设置
 LimitsDesc=您可以在此处定义 Dolibarr 的使用限制、精度和优化
@@ -1320,7 +1320,7 @@ YouMustRunCommandFromCommandLineAfterLoginToUser=您必须以 <b>%s</b> 用户
 YourPHPDoesNotHaveSSLSupport=SSL 函数在您的 PHP 中不可用
 DownloadMoreSkins=下载更多外观主题
 SimpleNumRefModelDesc=返回格式为 %syymm-nnnn 的参考编号，其中 yy 是年份，mm 是月份，nnnn 是顺序自动递增不会重置的数字
-SimpleRefNumRefModelDesc=Returns the reference number in the format n where n is a sequential auto-incrementing number with no reset
+SimpleRefNumRefModelDesc=返回格式为 n 的编号数字，其中 n 是连续的自动递增数字，无需重置
 AdvancedNumRefModelDesc=返回格式为 %syymm-nnnn 的参考编号，其中 yy 是年份，mm 是月份，nnnn 是顺序自动递增不会重置的数字
 SimpleNumRefNoDateModelDesc=返回格式为 %s-nnnn 的参考号，其中 nnnn 是顺序自动递增不会重置的数字
 ShowProfIdInAddress=显示带有地址的资格ID
@@ -1401,14 +1401,14 @@ AddRefInList=在组合列表中显示客户/供应商参考。 <br> 合作方将
 AddVatInList=在组合列表中显示客户/供应商增值税号。
 AddAdressInList=在组合列表中显示客户/供应商地址。 <br> 合作方将以“The Big Company corp. - 21 jump street 123456 Big town - USA”的名称格式出现，而不是“The Big Company corp”。
 AddEmailPhoneTownInContactList=显示联系人电子邮件（或电话，如果未定义电子邮件）和城镇信息清单（选择清单或组合框） <br> 联系人将显示为“Dupond Durand - dupond.durand@email.com - 巴黎”或“Dupond Durand - 06 07 59 65 66 - 巴黎”而不是“Dupond Durand”。
-AskForPreferredShippingMethod=询问合作方的首选运输方式。
+AskForPreferredShippingMethod=询问合作方的首选货物运输方式。
 FieldEdition=%s 字段的编辑
 FillThisOnlyIfRequired=例如：+2 (请只在时区错误问题出现时填写)
 GetBarCode=获取条码
 NumberingModules=编号模式
 DocumentModules=文件模式
 ##### Module password generation
-PasswordGenerationStandard=Return a password generated according to internal Dolibarr algorithm: %s characters containing shared numbers and characters.
+PasswordGenerationStandard=返回根据 Dolibarr 内部算法生成的密码：包含共享数字和字符的 %s 个字符。
 PasswordGenerationNone=不要建议生成密码。密码必须手动输入。
 PasswordGenerationPerso=返回一个字符串用于设置你的个人密码。
 SetupPerso=根据你的配置
@@ -1427,7 +1427,7 @@ HRMSetup=人力资源管理模块设置
 CompanySetup=客户/供应商模块及其相关参数设置
 CompanyCodeChecker=自动生成客户/供应商代码的选项
 AccountCodeManager=自动生成客户/供应商会计科目代码的选项
-NotificationsDesc=可以为某些 Dolibarr 事件自动发送电子邮件通知。 <br> 可以定义通知的接收者：
+NotificationsDesc=对于某些 Dolibarr 事件，可以自动发送电子邮件通知。 <br> 可以定义通知的收件人：
 NotificationsDescUser=* 每个用户，一次一个用户。
 NotificationsDescContact=* 每个合作方联系人（客户或供应商），一次一个联系人。
 NotificationsDescGlobal=* 或通过在模块的设置页面中设置全局电子邮件地址。
@@ -1455,30 +1455,30 @@ ForceInvoiceDate=强制发票中的日期为确认日期
 SuggestedPaymentModesIfNotDefinedInInvoice=如果未在发票上定义，则发票上的默认建议付款方式
 SuggestPaymentByRIBOnAccount=根据账户的提款方式来建议付款方式
 SuggestPaymentByChequeToAddress=建议以支票付款至
-FreeLegalTextOnInvoices=发票中的额外说明文本
+FreeLegalTextOnInvoices=发票上的附加文本
 WatermarkOnDraftInvoices=发票草稿加水印(无则留空)
 PaymentsNumberingModule=付款编号模式
 SuppliersPayment=供应商付款
 SupplierPaymentSetup=供应商付款设置
 InvoiceCheckPosteriorDate=在验证前检查发票日期
 InvoiceCheckPosteriorDateHelp=如果发票日期早于最后一张同类型发票的日期，将禁止验证发票。
-InvoiceOptionCategoryOfOperations=Display the mention "category of operations" on the invoice.
-InvoiceOptionCategoryOfOperationsHelp=Depending on the situation, the mention will appear in the form:<br>- Category of operations: Delivery of goods<br>- Category of operations: Provision of services<br>- Category of operations: Mixed - Delivery of goods & provision of services
-InvoiceOptionCategoryOfOperationsYes1=Yes, below the address block
-InvoiceOptionCategoryOfOperationsYes2=Yes, in the lower left-hand corner
+InvoiceOptionCategoryOfOperations=在发票上显示“操作类别”。
+InvoiceOptionCategoryOfOperationsHelp=根据具体情况，涉及内容将以以下形式出现：<br> - 业务类别：交付货物 <br> - 业务类别：提供服务 <br> - 业务类别：混合 - 交付货物并提供服务
+InvoiceOptionCategoryOfOperationsYes1=是的，在地址块下方
+InvoiceOptionCategoryOfOperationsYes2=是的，在左下角
 ##### Proposals #####
 PropalSetup=报价单模块设置
 ProposalsNumberingModules=报价单编号模式
 ProposalsPDFModules=报价单文档模板
-SuggestedPaymentModesIfNotDefinedInProposal=如果未在提案中定义，则默认为提案的建议付款方式
-FreeLegalTextOnProposal=报价单中的额外说明文本
+SuggestedPaymentModesIfNotDefinedInProposal=如果未在报价单中定义，则默认为报价单的建议付款方式
+FreeLegalTextOnProposal=报价单上的附加文本
 WatermarkOnDraftProposal=为报价单草稿添加水印（空则无）
 BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=询问银行账户
 ##### SupplierProposal #####
 SupplierProposalSetup=供应商询价申请模块设置
 SupplierProposalNumberingModules=供应商询价申请编号模型
 SupplierProposalPDFModules=供应商询价申请文档模型
-FreeLegalTextOnSupplierProposal=供应商询价申请额外说明文字
+FreeLegalTextOnSupplierProposal=供应商询价申请上的附加文本
 WatermarkOnDraftSupplierProposal=给供应商询价申请加盖水印 (无则留空)
 BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=询问目标询价申请的银行账号
 WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=询问订单的仓库货源
@@ -1489,31 +1489,32 @@ SuggestedPaymentModesIfNotDefinedInOrder=如果订单上未定义，则默认销
 OrdersSetup=销售订单管理设置
 OrdersNumberingModules=订单编号模式
 OrdersModelModule=订单文档模板
-FreeLegalTextOnOrders=订单中的额外说明文本
+FreeLegalTextOnOrders=订单上的附加文本
 WatermarkOnDraftOrders=为订单草稿添加水印(无则留空)
-ShippableOrderIconInList=如果订单是可以送货的则添加一个标记用于提醒
+ShippableOrderIconInList=在订单列表中添加一个图标，指示订单是否可以发货
 BANK_ASK_PAYMENT_BANK_DURING_ORDER=为账单询问银行卡账户
 ##### Interventions #####
-InterventionsSetup=干预模块设置
-FreeLegalTextOnInterventions=干预文档中的额外说明文本
-FicheinterNumberingModules=介入编号模式
-TemplatePDFInterventions=干预信息卡文档模板
-WatermarkOnDraftInterventionCards=干预卡文档加水印(如果有)
+InterventionsSetup=现场服务模块设置
+FreeLegalTextOnInterventions=现场服务文档上的附加文本
+FicheinterNumberingModules=现场服务编号模型
+TemplatePDFInterventions=现场服务卡文档模板
+WatermarkOnDraftInterventionCards=现场服务卡文档上的水印（如果为空则无水印）
 ##### Contracts #####
 ContractsSetup=联系人/订阅模块设置
 ContractsNumberingModules=合同编号模式
 TemplatePDFContracts=合同文档模块
-FreeLegalTextOnContracts=合同自由文本
+FreeLegalTextOnContracts=合同上的附加文本
 WatermarkOnDraftContractCards=为合同草案添加水印 (无则留空)
 ##### Members #####
 MembersSetup=会员模块设置
 MemberMainOptions=主要选项
 MemberCodeChecker=自动生成会员代码的选项
-AdherentLoginRequired= 管理每个会员的登录
+AdherentLoginRequired=管理每个会员的登录名/密码
+AdherentLoginRequiredDesc=在会员文件中添加登录名和密码。如果会员已链接到用户，则更新会员的登录名和密码也将同时更新用户的登录名和密码。
 AdherentMailRequired=创建新会员必需电子邮件
 MemberSendInformationByMailByDefault=默认情况下，向会员发送确认邮件（验证或新订阅）的复选框处于启用状态
 MemberCreateAnExternalUserForSubscriptionValidated=为每个经过验证的新会员订阅创建外部用户登录
-VisitorCanChooseItsPaymentMode=Visitor can choose from any available payment modes
+VisitorCanChooseItsPaymentMode=访客可以选择任何可用的付款方式
 MEMBER_REMINDER_EMAIL=通过电子邮件 </b> 启用订阅过期的自动提醒 <b>。注意：模块 <strong> %s </strong> 必须启用并正确设置才能发送提醒。
 MembersDocModules=从会员记录生成的文档的文档模板
 ##### LDAP setup #####
@@ -1642,9 +1643,9 @@ LDAPFieldEndLastSubscription=订阅结束日期
 LDAPFieldTitle=岗位
 LDAPFieldTitleExample=例如: 标题
 LDAPFieldGroupid=组ID
-LDAPFieldGroupidExample=Example : gidnumber
+LDAPFieldGroupidExample=示例：gidnumber
 LDAPFieldUserid=用户ID
-LDAPFieldUseridExample=Example : uidnumber
+LDAPFieldUseridExample=示例：uidnumber
 LDAPFieldHomedirectory=主目录
 LDAPFieldHomedirectoryExample=例如：homedirectory
 LDAPFieldHomedirectoryprefix=主目录前缀
@@ -1695,7 +1696,7 @@ OnProductSelectAddProductDesc=将产品添加为文档行时如何使用产品
 AutoFillFormFieldBeforeSubmit=使用产品描述自动填充描述字段
 DoNotAutofillButAutoConcat=不要使用产品描述自动填充输入字段。产品描述将自动连接到输入的描述。
 DoNotUseDescriptionOfProdut=产品描述永远不会包含在文档行的描述中
-MergePropalProductCard=在产品/服务附加文件选项卡中激活如果产品/服务在提案中，则将产品PDF文档合并到提案PDF azur的选项
+MergePropalProductCard=如果产品/服务在报价单中，请在产品/服务“附加文件”选项卡中激活将产品 PDF 文档合并到报价单 PDF azur 的选项
 ViewProductDescInThirdpartyLanguageAbility=以合作方的语言（否则以用户的语言）在表单中显示产品描述
 UseSearchToSelectProductTooltip=此外，如果您有大量产品 (> 100 000)，您可以通过在 设置->其他中将常量 PRODUCT_DONOTSEARCH_ANYWHERE 设置为 1 来提高速度。然后搜索将被限制在字符串的开头。
 UseSearchToSelectProduct=等到你按下一个键再加载产品组合列表的内容（如果你有很多产品，这可能会提高性能，但不太方便）
@@ -1716,7 +1717,7 @@ ErrorUnknownSyslogConstant=常量 %s 不是已知的 Syslog 常数
 OnlyWindowsLOG_USER=在 Windows 上，仅支持 LOG_USER 工具
 CompressSyslogs=压缩和备份调试日志文件（由模块Log生成以进行调试）
 SyslogFileNumberOfSaves=要保留的备份日志数量
-ConfigureCleaningCronjobToSetFrequencyOfSaves=配置清理预定作业以设置日志备份频率
+ConfigureCleaningCronjobToSetFrequencyOfSaves=配置清理计划任务以设置日志备份频率
 ##### Donations #####
 DonationsSetup=捐献模块设置
 DonationsReceiptModel=捐献收据模板
@@ -1753,22 +1754,22 @@ MailingDelay=在发送下一条信息时等待几秒
 ##### Notification #####
 NotificationSetup=电子邮件通知模块设置
 NotificationEMailFrom=通知模块使用的发件人电子邮件（发件人）
-FixedEmailTarget=接收方
+FixedEmailTarget=收件人
 NotificationDisableConfirmMessageContact=在确认消息中隐藏通知的收件人列表（订阅为联系人）
 NotificationDisableConfirmMessageUser=在确认消息中隐藏通知的收件人列表（订阅为用户）
 NotificationDisableConfirmMessageFix=在确认消息中隐藏通知的收件人列表（订阅为全局邮件）
 ##### Sendings #####
-SendingsSetup=运输模块设置
+SendingsSetup=货物运输模块设置
 SendingsReceiptModel=运输模板
 SendingsNumberingModules=运输编号模式
-SendingsAbility=支持为客户送货时采用发货单
-NoNeedForDeliveryReceipts=在大多数情况下，发运单既用作客户交货单（要发送的产品清单），并且也用作客户收货并签名的单据。因此，产品交货回单是一个重复的功能，并且很少被激活。
-FreeLegalTextOnShippings=运单中的额外说明文本
+SendingsAbility=支持货运单用于客户交货
+NoNeedForDeliveryReceipts=在大多数情况下，货运单既用作客户交货单（要发送的产品清单），并且也用作客户收货并签名的单据。因此，产品交货回执是一个重复的功能，并且很少被激活。
+FreeLegalTextOnShippings=发货单上的附加文本
 ##### Deliveries #####
-DeliveryOrderNumberingModules=产品交货回单编号模块
-DeliveryOrderModel=产品交货回单模型
-DeliveriesOrderAbility=支持产品交货回单
-FreeLegalTextOnDeliveryReceipts=交货回单上的备注文字
+DeliveryOrderNumberingModules=产品交货回执编号模块
+DeliveryOrderModel=产品交货回执模板
+DeliveriesOrderAbility=支持产品交货回执
+FreeLegalTextOnDeliveryReceipts=交货回执上的附加文本
 ##### FCKeditor #####
 AdvancedEditor=高级编辑
 ActivateFCKeditor=为以下为功能启用高级编辑器功能:
@@ -1816,8 +1817,8 @@ TaxSetup=财政税和增值税模块设置
 OptionVatMode=增值税到期
 OptionVATDefault=标准依据
 OptionVATDebitOption=权责发生制
-OptionVatDefaultDesc=应缴纳增值税： <br> - 货物交付（基于发票日期） <br> - 服务付款
-OptionVatDebitOptionDesc=应缴纳增值税： <br> - 货物交付时（基于发票日期） <br> - 服务发票（借机单）
+OptionVatDefaultDesc=应缴纳增值税：<br> - 交货时（基于发票日期） <br> - 支付服务费用时
+OptionVatDebitOptionDesc=应缴纳增值税：<br> - 交货时（基于发票日期）<br> - 开具服务发票（借方）时
 OptionPaymentForProductAndServices=产品和服务的现金基础
 OptionPaymentForProductAndServicesDesc=增值税到期：<br>  - 货物付款<br>  - 服务付款
 SummaryOfVatExigibilityUsedByDefault=根据所选选项的默认增值税资格时间：
@@ -1835,26 +1836,26 @@ AccountancyCodeSell=销售账户代码
 AccountancyCodeBuy=采购账户代码
 CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=创建新税时，默认将“自动创建付款”复选框保留为空
 ##### Agenda #####
-AgendaSetup = 事件及行程模块设置
-AGENDA_DEFAULT_FILTER_TYPE = 自动将此事件设置为议程视图的搜索过滤器
-AGENDA_DEFAULT_FILTER_STATUS = 自动将此状态设置为议程视图的搜索过滤器
-AGENDA_DEFAULT_VIEW = 选择菜单议程时默认打开哪个视图
-AGENDA_EVENT_PAST_COLOR = Past event color
-AGENDA_EVENT_CURRENT_COLOR = Current event color
-AGENDA_EVENT_FUTURE_COLOR = Future event color
+AgendaSetup = 事件和日程模块设置
+AGENDA_DEFAULT_FILTER_TYPE = 自动将此事件设置为日程视图的搜索过滤器
+AGENDA_DEFAULT_FILTER_STATUS = 自动将此状态设置为日程视图的搜索过滤器
+AGENDA_DEFAULT_VIEW = 当从菜单选择日程时默认要打开的视图
+AGENDA_EVENT_PAST_COLOR = 过去事件的颜色
+AGENDA_EVENT_CURRENT_COLOR = 当前事件的颜色
+AGENDA_EVENT_FUTURE_COLOR = 未来事件的颜色
 AGENDA_REMINDER_BROWSER = 在用户的浏览器 </b> 上启用事件提醒 <b>（到达提醒日期时，浏览器会显示一个弹出窗口。每个用户都可以从其浏览器通知设置中禁用此类通知）。
 AGENDA_REMINDER_BROWSER_SOUND = 启用声音通知
 AGENDA_REMINDER_EMAIL = 启用<b>通过电子邮件</b>发送事件提醒 （可以在每个事件上定义提醒选项/延迟）。
-AGENDA_REMINDER_EMAIL_NOTE = 注意：计划作业 %s 的频率必须足以确保在正确的时刻发送提醒。
-AGENDA_SHOW_LINKED_OBJECT = 将链接对象显示在议程视图中
-AGENDA_USE_EVENT_TYPE = 使用事件类型（在菜单设置 -> 词典 -> 议程事件类型中管理）
+AGENDA_REMINDER_EMAIL_NOTE = 注意：计划任务的频率 %s 必须足以确保在正确的时间发送提醒。
+AGENDA_SHOW_LINKED_OBJECT = 在日程视图中显示已链接的对象
+AGENDA_USE_EVENT_TYPE = 使用事件类型（在菜单 主页 -> 设置 -> 词典库 -> 日程事件类型中管理）
 AGENDA_USE_EVENT_TYPE_DEFAULT = 在事件创建表单中自动为事件类型设置此默认值
 PasswordTogetVCalExport = 导出链接的授权密钥
 PastDelayVCalExport=不导出早于这个日期的时间
 SecurityKey = 安全密钥
 ##### ClickToDial #####
 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).
+ClickToDialUrlDesc=单击手机图片后调用的 URL。在 URL 中，您可以使用标签 <br> <b> __PHONETO__ </b>替换为要拨打的人员的电话号码 <br> <b> __PHONEFROM__ </b>将替换为呼叫者的电话号码（您的）<br> <b> __LOGIN__ </b> span> 将替换为 clicktodial 登录（在用户卡上定义） <br> <b> __PASS__  </b> 将替换为 clicktodial 密码（在用户卡上定义）。
 ClickToDialDesc=在使用桌面计算机时此模块会将电话号码更改为可点击的链接，单击将呼叫该号码。例如，当在桌面上使用软电话或使用基于 SIP 协议的 CTI 系统时，这可用于启动电话呼叫。注意：使用智能手机时，电话号码始终是可点击的。
 ClickToDialUseTelLink=在电话号码上链接 "tel:"
 ClickToDialUseTelLinkDesc=如果您的用户有软件电话或软件界面，安装在与浏览器相同的计算机上，并在您单击浏览器中以“tel:”开头的链接时可以调用，请使用此方法。如果您需要以“sip:”开头的链接或完整的服务器解决方案（无需安装本地软件），您必须将其设置为“否”并填写下一个字段。
@@ -1893,7 +1894,7 @@ ApiKey=API的Key
 WarningAPIExplorerDisabled=API资源管理器已被禁用。 API资源管理器不需要提供API服务。它是开发人员查找/测试REST API的工具。如果您需要此工具，请进入模块API REST的设置以激活它。
 ##### Bank #####
 BankSetupModule=银行模块设置
-FreeLegalTextOnChequeReceipts=支票收据上的备注文字
+FreeLegalTextOnChequeReceipts=支票收据上的附加文本
 BankOrderShow=Display order of bank accounts for countries using "detailed bank number"
 BankOrderGlobal=一般
 BankOrderGlobalDesc=一般的显示顺序
@@ -1911,7 +1912,7 @@ SuppliersInvoiceNumberingModel=供应商发票编号模式
 IfSetToYesDontForgetPermission=如果设置为非空值，请不要忘记向允许进行二次审核的组或用户授予权限
 ##### GeoIPMaxmind #####
 GeoIPMaxmindSetup=Maxmind Geoip 模块设置
-PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation
+PathToGeoIPMaxmindCountryDataFile=包含 Maxmind ip 到国家/地区翻译的文件路径
 NoteOnPathLocation=注意此数据文件所处目录您的PHP必需能读取(检查您 PHP 的 open_basedir 设置和文件系统权限)。
 YouCanDownloadFreeDatFileTo=您可以下载 Maxmind网站的GeoIP全球IP地址数据库 <b>免费演示版</b> 的国家地理位置数据文件，地址是 %s。
 YouCanDownloadAdvancedDatFileTo=您也可以下载<b>更加完整更新更快的</b> Maxmind GeoIP 国家文件版本，地址是 %s。
@@ -1928,7 +1929,7 @@ UseSearchToSelectProject=等到按下某个键之后再加载项目组合列表
 AccountingPeriods=会计期间
 AccountingPeriodCard=会计期间
 NewFiscalYear=新会计期间
-OpenFiscalYear=开放会计期间
+OpenFiscalYear=开启会计年度
 CloseFiscalYear=关闭会计期间
 DeleteFiscalYear=删除会计期间
 ConfirmDeleteFiscalYear=您确定要删除此会计期间吗？
@@ -1962,7 +1963,7 @@ BackupDumpWizard=建立数据库转储文件的向导
 BackupZipWizard=建立documents目录压缩包的向导
 SomethingMakeInstallFromWebNotPossible=由于以下原因，无法从Web界面安装外部模块：
 SomethingMakeInstallFromWebNotPossible2=因此，此处描述的升级过程是只有特权用户才能执行的手动过程。
-InstallModuleFromWebHasBeenDisabledContactUs=Install or development of external modules or dynamic websites, from the application, is currently locked for security purpose. Please contact us if you need to enable this feature.
+InstallModuleFromWebHasBeenDisabledContactUs=出于安全目的，当前已锁定从应用程序安装或开发外部模块或动态网站。如果您需要启用此功能，请联系我们。
 InstallModuleFromWebHasBeenDisabledByFile=管理员已禁用从应用程序安装外部模块。您必须要求他删除文件<strong> %s </strong>以允许此功能。
 ConfFileMustContainCustom=从应用程序安装或构建外部模块需要将模块文件保存到目录<strong> %s</strong>中。要让Dolibarr处理此目录，您必须设置<strong> conf / conf.php </strong>以添加2个指令行：<br> <strong> $ dolibarr_main_url_root_alt ='/ custom'; </strong> <br>的<strong> $ dolibarr_main_document_root_alt = '%s /自定义';</strong>
 HighlightLinesOnMouseHover=当鼠标经过表格明细时高亮显示
@@ -1994,7 +1995,7 @@ PictoHelp=图标名称的格式： <br> - image.png 用于将图像文件放入
 PositionIntoComboList=行位置到组合列表中
 SellTaxRate=销售税率
 RecuperableOnly=适用于法国某些州的增值税“Not Perceived but Recoverable”是的。在所有其他情况下，将值保持为“否”。
-UrlTrackingDesc=如果供应商或运输服务提供页面或网站来检查您的货件状态，您可以在此处输入。您可以在 URL 参数中使用键 {TRACKID}，以便系统将其替换为用户在货件卡中输入的跟踪号。
+UrlTrackingDesc=如果供应商或运输服务提供页面或网站来检查您的货件状态，您可以在此处输入。您可以在 URL 参数中使用键 {TRACKID}，以便系统将其替换为用户在发货单表单中输入的跟踪号。
 OpportunityPercent=创建商机时，您将定义项目/商机的估计金额。根据商机的状态，此金额可能会乘以此比率，以评估您的所有商机可能生成的总金额。这个值是一个百分比（介于 0 和 100 之间）。
 TemplateForElement=此邮件模板与什么类型的对象相关？电子邮件模板仅在使用相关对象中的“发送电子邮件”按钮时可用。
 TypeOfTemplate=模板类型
@@ -2011,8 +2012,8 @@ ForcedConstants=必需的常量值
 MailToSendProposal=客户报价
 MailToSendOrder=销售订单
 MailToSendInvoice=客户发票
-MailToSendShipment=运输
-MailToSendIntervention=干预
+MailToSendShipment=发货单
+MailToSendIntervention=现场服务
 MailToSendSupplierRequestForQuotation=报价请求
 MailToSendSupplierOrder=订单
 MailToSendSupplierInvoice=供应商发票
@@ -2074,8 +2075,12 @@ MAIN_PDF_MARGIN_TOP=PDF的上边距
 MAIN_PDF_MARGIN_BOTTOM=PDF的底部边距
 MAIN_DOCUMENTS_LOGO_HEIGHT=PDF上LOGO的高度
 DOC_SHOW_FIRST_SALES_REP=显示第一位销售代表
-MAIN_GENERATE_PROPOSALS_WITH_PICTURE=在提案行中添加图片列
+MAIN_GENERATE_PROPOSALS_WITH_PICTURE=在报价单行上添加图片列
 MAIN_DOCUMENTS_WITH_PICTURE_WIDTH=图片列的宽度（如有）
+MAIN_GENERATE_DOCUMENTS_SUPPLIER_PROPOSAL_WITHOUT_UNIT_PRICE=隐藏报价申请中的单位价格
+MAIN_GENERATE_DOCUMENTS_SUPPLIER_PROPOSAL_WITHOUT_TOTAL_COLUMN=隐藏报价申请中的总价格
+MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_UNIT_PRICE=隐藏采购订单上的单位价格
+MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_TOTAL_COLUMN=隐藏采购订单上的总价格
 MAIN_PDF_NO_SENDER_FRAME=隐藏发件人地址框的边框
 MAIN_PDF_NO_RECIPENT_FRAME=隐藏收件人地址框的边框
 MAIN_PDF_HIDE_CUSTOMER_CODE=隐藏客户代码
@@ -2089,7 +2094,7 @@ EnterCalculationRuleIfPreviousFieldIsYes=如果上一个字段设置为是，则
 SeveralLangugeVariatFound=找到了几种语言变体
 RemoveSpecialChars=删除特殊字符
 COMPANY_AQUARIUM_CLEAN_REGEX=正则表达式过滤器清理值（COMPANY_AQUARIUM_CLEAN_REGEX）
-COMPANY_AQUARIUM_NO_PREFIX=Do not use prefix, only copy customer or supplier code
+COMPANY_AQUARIUM_NO_PREFIX=请勿使用前缀，仅复制客户或供应商代码
 COMPANY_DIGITARIA_CLEAN_REGEX=清理值的正则表达式（COMPANY_DIGITARIA_CLEAN_REGEX）
 COMPANY_DIGITARIA_UNIQUE_CODE=不允许重复
 RemoveSpecialWords=为客户或供应商生成子帐户时清除某些字词
@@ -2107,19 +2112,19 @@ SwapSenderAndRecipientOnPDF=交换 PDF 文档上的发件人和收件人地址
 FeatureSupportedOnTextFieldsOnly=警告，仅文本字段和组合列表支持的功能。此外，必须设置 URL 参数 action=create 或 action=edit 或页面名称必须以“new.php”结尾才能触发此功能。
 EmailCollector=电子邮件收集器
 EmailCollectors=电子邮件收集器
-EmailCollectorDescription=添加计划作业和设置页面以定期扫描电子邮件箱（使用 IMAP 协议），并在应用程序的正确的位置记录收到的电子邮件和/或自动创建一些记录（如潜在客户）。
+EmailCollectorDescription=添加计划任务和设置页面以定期扫描电子邮件信箱（使用 IMAP 协议）并在正确的位置记录应用程序收到的电子邮件和/或自动创建一些记录（例如商机）。
 NewEmailCollector=新建电子邮件收集器
 EMailHost=电子邮件 IMAP 服务器
 EMailHostPort=电子邮件 IMAP 服务器的端口
 loginPassword=登入/密码
-oauthToken=OAuth2 token
+oauthToken=OAuth2 令牌
 accessType=访问类型
 oauthService=认证服务
 TokenMustHaveBeenCreated=必须启用OAuth2模块，和必须使用正确的权限创建oauth2令牌（例如，Gmail的OAuth范围为"gmail_full"）
-ImapEncryption = IMAP encryption method
-ImapEncryptionHelp = Example: none, ssl, tls, notls
-NoRSH = Use the NoRSH configuration
-NoRSHHelp = Do not use RSH or SSH protocols to establish an IMAP pre-identification session
+ImapEncryption = IMAP 加密方式
+ImapEncryptionHelp = 示例：none、ssl、tls、notls
+NoRSH = 使用 NoRSH 配置
+NoRSHHelp = 请勿使用 RSH 或 SSH 协议建立 IMAP 预识别会话
 MailboxSourceDirectory=邮箱源目录
 MailboxTargetDirectory=邮箱目标目录
 EmailcollectorOperations=收集器要做的操作
@@ -2132,7 +2137,7 @@ DateLastCollectResult=最近一次尝试收集的日期
 DateLastcollectResultOk=最近一次收集成功的日期
 LastResult=最新结果
 EmailCollectorHideMailHeaders=不要将邮件头的内容保存在已收集的邮件中
-EmailCollectorHideMailHeadersHelp=启用后，电子邮件头不会添加到保存为议程事件的电子邮件内容的末尾。
+EmailCollectorHideMailHeadersHelp=启用后，电子邮件头不会添加到保存为日程事件的电子邮件内容的末尾。
 EmailCollectorConfirmCollectTitle=电子邮件收集确认
 EmailCollectorConfirmCollect=你想现在运行这个收集器吗？
 EmailCollectorExampleToCollectTicketRequestsDesc=收集符合某些规则的电子邮件，并使用电子邮件信息自动创建服务工单（必须启用服务工单模块）。如果您通过电子邮件提供一些支持，则可以使用此收集器，因此您的服务工单请求将自动生成。同时激活 Collect_Responses 以直接在服务工单视图上收集客户的回复（您必须从 Dolibarr 回复）。
@@ -2141,37 +2146,37 @@ EmailCollectorExampleToCollectAnswersFromExternalEmailSoftwareDesc=扫描您的
 EmailCollectorExampleToCollectAnswersFromExternalEmailSoftware=收集从外部电子邮件软件发送的电子邮件回复的示例
 EmailCollectorExampleToCollectDolibarrAnswersDesc=收集作为从您的应用程序发送的电子邮件的答复的所有电子邮件。带有电子邮件响应的事件（必须启用日程模块）将记录在合适的位置。例如，如果您从应用程序通过电子邮件发送报价单、订单、发票或服务工单消息，并且收件人回复了您的电子邮件，系统将自动捕获回复并将其添加到您的 ERP 中。
 EmailCollectorExampleToCollectDolibarrAnswers=收集所有传入消息的示例，这些消息是从 Dolibarr 发送的消息的答复
-EmailCollectorExampleToCollectLeadsDesc=收集符合某些规则的电子邮件并使用电子邮件信息自动创建潜在客户（必须启用模块项目）。如果您想使用模块项目（1 个潜在客户 = 1 个项目）跟踪您的潜在客户，您可以使用此收集器，因此您的潜在客户将自动生成。如果收集器 Collect_Responses 也已启用，当您从潜在客户、提案或任何其他对象发送电子邮件时，您还可以直接在应用程序上看到客户或合作伙伴的答案。 <br> 注意：在这个初始示例中，生成的线索标题包括电子邮件。如果在数据库中找不到合作方（新客户），则线索将附加到 ID 为 1 的合作方。
-EmailCollectorExampleToCollectLeads=收集商业机会的示例
+EmailCollectorExampleToCollectLeadsDesc=收集符合某些规则的电子邮件并使用电子邮件信息自动创建商机（必须启用项目模块）。如果您想使用项目模块（1 个商机 = 1 个项目）跟踪您的商机，您可以使用此收集器，因此您的商机将自动生成。如果收集器 Collect_Responses 也已启用，当您从商机、报价单或任何其他对象发送电子邮件时，您还可以直接在应用程序上看到客户或合作伙伴的回复。 <br> 注意：在这个初始示例中，生成的商机标题包括电子邮件。如果在数据库中找不到合作方（新客户），则商机将附加到 ID 为 1 的合作方。
+EmailCollectorExampleToCollectLeads=收集商机的示例
 EmailCollectorExampleToCollectJobCandidaturesDesc=收集申请工作机会的电子邮件（必须启用招聘模块）。如果您想为工作申请自动创建候选人资格，您可以完成此收集器。注意：在这个初始示例中，会生成候选人资格的标题，包括电子邮件。
 EmailCollectorExampleToCollectJobCandidatures=收集通过电子邮件收到的求职者的示例
 NoNewEmailToProcess=没有要处理的新电子邮件（匹配过滤器）
 NothingProcessed=什么都没做
-RecordEvent=在议程中记录事件（类型为发送或接收的电子邮件）
-CreateLeadAndThirdParty=创建商业机会（必要时创建合作方）
+RecordEvent=在日程中记录事件（类型为发送或接收的电子邮件）
+CreateLeadAndThirdParty=创建商机（必要时创建合作方）
 CreateTicketAndThirdParty=创建服务工单（如果合作方是通过之前的操作加载的，或者是从电子邮件标头中的跟踪器猜测的，则链接到合作方，否则没有合作方）
 CodeLastResult=最新结果代码
 NbOfEmailsInInbox=源目录中的电子邮件数量
 LoadThirdPartyFromName=在 %s 上加载合作方搜索（仅加载）
 LoadThirdPartyFromNameOrCreate=在 %s 上加载合作方搜索（如果未找到则创建）
-LoadContactFromEmailOrCreate=Load contact searching on %s (create if not found)
+LoadContactFromEmailOrCreate=在 %s 上加载联系人搜索（如果未找到则创建）
 AttachJoinedDocumentsToObject=如果在电子邮件主题中找到对象的引用，则将附件保存到对象文档中。
 WithDolTrackingID=来自 Dolibarr 发送的第一封电子邮件发起的对话的消息
 WithoutDolTrackingID=来自不是从 Dolibarr 发送的第一封电子邮件发起的对话的消息
 WithDolTrackingIDInMsgId=来自 Dolibarr 的消息
 WithoutDolTrackingIDInMsgId=不来自 Dolibarr 的信息
 CreateCandidature=创建工作申请
-FormatZip=邮编
+FormatZip=Zip
 MainMenuCode=菜单入口代码（主菜单）
 ECMAutoTree=显示自动 ECM 树
-OperationParamDesc=Define the rules to use to extract some data or set values to use for operation.<br><br>Example to extract a company name from email subject into a temporary variable:<br>tmp_var=EXTRACT:SUBJECT:Message from company ([^\n]*)<br><br>Examples to set the properties of an object to create:<br>objproperty1=SET:a hard coded value<br>objproperty2=SET:__tmp_var__<br>objproperty3=SETIFEMPTY:a value (value is set only if property is not already defined)<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a new line to extract or set several properties.
+OperationParamDesc=定义用于提取某些数据或设置用于操作的值的规则。 <br> <br> 将电子邮件主题中的公司名称提取到临时变量中的示例：<br> tmp_var=EXTRACT:SUBJECT:来自公司的消息 ([^\n]*) <br> <br> 设置要创建的对象的属性的示例：<br> objproperty1=SET：硬编码值 <br> objproperty2=SET:__tmp_var__ <br> objproperty3=SETIFEMPTY:一个值（值仅当属性尚未定义时才设置） <br> objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*) <br> options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*) <br> object.objproperty5=EXTRACT:BODY:我的公司名称是\\ s([^\\s]*) <br> <br> 使用新行提取或设置多个属性。
 OpeningHours=营业时间
 OpeningHoursDesc=在此处输入贵公司的正常营业时间。
 ResourceSetup=资源模块的配置
 UseSearchToSelectResource=使用搜索表单选择资源（而不是下拉列表）。
 DisabledResourceLinkUser=禁用将资源链接到用户的功能
 DisabledResourceLinkContact=禁用将资源链接到联系人的功能
-EnableResourceUsedInEventCheck=禁止在议程中同时使用相同的资源
+EnableResourceUsedInEventCheck=禁止在日程中同时使用同一资源
 ConfirmUnactivation=确认模块重置
 OnMobileOnly=仅在小屏幕（智能手机）上
 DisableProspectCustomerType=禁用“潜在+ 客户”合作方类型（因此合作方必须是“潜在”或“客户”，但不能同时是两者）
@@ -2210,8 +2215,8 @@ LargerThan=大于
 IfTrackingIDFoundEventWillBeLinked=请注意，如果在电子邮件中找到对象的跟踪 ID，或者如果电子邮件是收集到的并链接到对象的电子邮件区域的答复，则创建的事件将自动链接到已知的相关对象。
 WithGMailYouCanCreateADedicatedPassword=如果您启用了 GMail 帐户的两步验证，需要为Dolibarr创建一个专用的应用密码，而不是使用您自己的来自 https://myaccount.google.com/ 的帐户密码。
 EmailCollectorTargetDir=成功处理电子邮件后，将其移动到另一个标签/目录可能是一种期望中的行为。只需在此处设置目录名称即可使用此功能（请勿在名称中使用特殊字符）。请注意，您还必须使用可以读/写的登录帐户。
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database (search will be done on the defined property among 'id','name','name_alias','email'). 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 from a string 'Name: name to find' present into the body, use the 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>
-FilterSearchImapHelp=Warning: a lot of email servers (like Gmail) are doing full word searches when searching on a string and will not return a result if the string is only found partially into a word. For this reason too, use special characters into a search criteria will be ignored are they are not part of existing words.<br>To make an exclude search on a word (return email if word is not found), you can use the ! character before the word (may not work on some mail servers).
+EmailCollectorLoadThirdPartyHelp=您可以使用此操作来使用电子邮件内容来查找并加载数据库中现有的合作方（搜索将在“id”、“name”、“name_alias”、“email”之间定义的属性上完成）。找到（或创建）的合作方将用于以下需要它的操作。 <br> 例如，如果您想要创建一个合作方，其名称是从正文中的字符串“Name: name to find”中提取的，请使用发件人邮箱作为email，您可以这样设置参数字段： <br> 'email=HEADER:^From:(.*);name=EXTRACT:BODY:Name:\\s([^\\s] *);client=SET:2;' <br>
+FilterSearchImapHelp=警告：许多电子邮件服务器（例如 Gmail）在搜索字符串时会进行完整单词搜索，如果仅在单词中找到字符串的一部分，则不会返回结果。也出于这个原因，在搜索条件中使用特殊字符将被忽略，因为它们不是现有单词的一部分。 <br> 要对某个单词进行排除搜索（如果未找到该单词，则返回电子邮件），您可以使用 !单词之前的字符（可能不适用于某些邮件服务器）。
 EndPointFor=%s 的终点：%s
 DeleteEmailCollector=删除电子邮件收集器
 ConfirmDeleteEmailCollector=您确定要删除此电子邮件收集器吗？
@@ -2230,18 +2235,18 @@ ShowProjectLabel=项目标签
 PDF_INCLUDE_ALIAS_IN_THIRDPARTY_NAME=在合作方名称中包含别名
 THIRDPARTY_ALIAS=合作方名 - 合作方别名
 ALIAS_THIRDPARTY=合作方别名 - 合作方名
-PDFIn2Languages=Show labels in the PDF in 2 different languages (this feature may not work for some couple of languages)
+PDFIn2Languages=以 2 种不同语言显示 PDF 中的标签（此功能可能不适用于某些语言）
 PDF_USE_ALSO_LANGUAGE_CODE=如果您想在同一个生成的 PDF 中以 2 种不同的语言复制 PDF 中的某些文本，则必须在此处设置第二种语言，以便生成的 PDF 将在同一页面中包含 2 种不同的语言：生成 PDF 时选择的一种和这个（只有少数 PDF 模板支持这一点）。留空为每个 PDF只有1种语言。
 PDF_USE_A=使用 PDF/A 格式而不是默认格式 PDF 生成 PDF 文档
 FafaIconSocialNetworksDesc=在此处输入 FontAwesome 图标的代码。如果你不知道什么是 FontAwesome，你可以使用通用值 fa-address-book。
-RssNote=注意：每个 RSS 源定义都提供了一个小根据，您必须启用该小工具才能使其在主看板中可用
+RssNote=注意：每个 RSS 源定义都提供一个小部件，您必须启用该小部件才能在看板中使用它
 JumpToBoxes=跳转到设置 -> 小根据
 MeasuringUnitTypeDesc=在这里使用像“大小”、“表面”、“体积”、“重量”、“时间”这样的值
 MeasuringScaleDesc=比例是您必须移动小数部分以匹配默认参考单位的位数。对于“时间”单位类型，它是秒数。 80 到 99 之间的值是保留值。
 TemplateAdded=模板已添加
 TemplateUpdated=模板已更新
 TemplateDeleted=模板已删除
-MailToSendEventPush=活动提醒邮件
+MailToSendEventPush=事件提醒电邮
 SwitchThisForABetterSecurity=建议将此值切换为 %s 以提高安全性
 DictionaryProductNature= 产品性质
 CountryIfSpecificToOneCountry=国家（如果特定于给定国家）
@@ -2255,16 +2260,16 @@ AskThisIDToYourBank=请与您的银行联系以获取此 ID
 AdvancedModeOnly=权限仅在高级权限模式下可用
 ConfFileIsReadableOrWritableByAnyUsers=任何用户都可以读取或写入 conf 文件。请只向 Web 服务器用户和组授予权限。
 MailToSendEventOrganization=活动组织
-MailToPartnership=合伙
+MailToPartnership=合作伙伴
 AGENDA_EVENT_DEFAULT_STATUS=从表单创建事件时的默认事件状态
 YouShouldDisablePHPFunctions=您应该禁用 PHP 函数
 IfCLINotRequiredYouShouldDisablePHPFunctions=除非您需要在自定义代码中运行系统命令，否则您应该禁用 PHP 函数
-PHPFunctionsRequiredForCLI=For shell purpose (like scheduled job backup or running an antivirus program), you must keep PHP functions
+PHPFunctionsRequiredForCLI=出于 shell 用途（例如计划任务备份或运行防病毒程序），您必须保留 PHP 函数
 NoWritableFilesFoundIntoRootDir=在您的根目录中没有找到常用程序的可写文件或目录（好）
 RecommendedValueIs=建议：%s
 Recommended=推荐
 NotRecommended=不建议
-ARestrictedPath=Some restricted path for data files
+ARestrictedPath=数据文件的一些受限路径
 CheckForModuleUpdate=检查外部模块更新
 CheckForModuleUpdateHelp=此操作将连接到外部模块的编写者以检查是否有新版本可用。
 ModuleUpdateAvailable=有可用的更新
@@ -2278,14 +2283,14 @@ DatabasePasswordNotObfuscated=在 conf 文件中的数据库密码未被混淆
 APIsAreNotEnabled=未启用 API 模块
 YouShouldSetThisToOff=您应该将此设置为 0 或关闭
 InstallAndUpgradeLockedBy=安装和升级被文件 <b> %s </b> 锁定
-InstallLockedBy=Install/Reinstall is locked by the file <b>%s</b>
-InstallOfAddonIsNotBlocked=Installations of addons are not locked. Create a file <b>installmodules.lock</b> into directory <b>%s</b> to block installations of external addons/modules.
+InstallLockedBy=安装/重新安装被文件 <b> %s </b> 锁定
+InstallOfAddonIsNotBlocked=插件的安装未被锁定。在目录 <b>%s</b> 中创建文件 <b>installmodules.lock</b> 以阻止外部插件/模块的安装。
 OldImplementation=旧实现
 PDF_SHOW_LINK_TO_ONLINE_PAYMENT=如果启用了某些在线支付模块（Paypal、Stripe、...），请在 PDF 上添加一个链接以进行在线支付
-DashboardDisableGlobal=全局禁用所有开放对象的缩略图
+DashboardDisableGlobal=全局禁用所有未完成对象的缩略图
 BoxstatsDisableGlobal=完全禁用统计信息盒子
-DashboardDisableBlocks=在主看板上开放对象（处理或延迟）的缩略图
-DashboardDisableBlockAgenda=禁用议程的缩略图
+DashboardDisableBlocks=主看板上未完成对象（待处理或逾期）的缩略图
+DashboardDisableBlockAgenda=禁用日程的缩略图
 DashboardDisableBlockProject=禁用项目的缩略图
 DashboardDisableBlockCustomer=禁用客户的缩略图
 DashboardDisableBlockSupplier=禁用供应商的缩略图
@@ -2317,7 +2322,7 @@ ExportUseLowMemoryMode=使用低内存模式
 ExportUseLowMemoryModeHelp=使用低内存模式来生成转储文件 (压缩是通过管道而不是进入 PHP 内存)。这种方法不允许检查文件是否完整，如果失败也不能报告错误信息。如果你遇到内存不足的错误，请使用它。
 
 ModuleWebhookName = Webhook
-ModuleWebhookDesc = Interface to catch dolibarr triggers and send data of the event to an URL
+ModuleWebhookDesc = 用于捕获 dolibarr 触发器并将事件数据发送到 URL 的接口
 WebhookSetup = Webhook 设置
 Settings = 设置
 WebhookSetupPage = Webhook 设置页面
@@ -2328,19 +2333,19 @@ ReadOnlyMode=实例是否处于“只读”模式
 DEBUGBAR_USE_LOG_FILE=使用 <b> dolibarr.log </b> 文件捕获日志
 UsingLogFileShowAllRecordOfSubrequestButIsSlower=使用 dolibarr.log 文件捕获日志而不是实时内存捕获。它允许捕获所有日志，而不仅仅是当前进程的日志（因此包括 ajax 子请求页面），但会使您的实例非常非常慢。不建议。
 FixedOrPercent=固定（使用关键字“固定”）或百分比（使用关键字“百分比”）
-DefaultOpportunityStatus=默认商机状态（创建销售线索时的第一个状态）
+DefaultOpportunityStatus=默认商机状态（创建商机时的第一个状态）
 
 IconAndText=图标和文字
 TextOnly=纯文本
-IconOnlyAllTextsOnHover=Icon only - All texts appears under icon on mouse over menu bar
-IconOnlyTextOnHover=Icon only - Text of icon appears under icon on mouse over the icon
+IconOnlyAllTextsOnHover=仅图标 - 所有文本均显示在鼠标悬停在菜单栏上的图标下
+IconOnlyTextOnHover=仅图标 - 当鼠标悬停在图标上时，图标文本显示在图标下方
 IconOnly=仅图标 - 仅在工具提示上显示文本
 INVOICE_ADD_ZATCA_QR_CODE=在发票上显示 ZATCA 二维码
 INVOICE_ADD_ZATCA_QR_CODEMore=一些阿拉伯国家的发票上需要此二维码
 INVOICE_ADD_SWISS_QR_CODE=在发票上显示瑞士QR-Bill二维码
-INVOICE_ADD_SWISS_QR_CODEMore=Switzerland's standard for invoices; make sure ZIP & City are filled and that the accounts have valid Swiss/Liechtenstein IBANs.
-INVOICE_SHOW_SHIPPING_ADDRESS=Show shipping address
-INVOICE_SHOW_SHIPPING_ADDRESSMore=Compulsory indication in some countries (France, ...)
+INVOICE_ADD_SWISS_QR_CODEMore=瑞士发票标准；确保填写邮政编码和城市，并且帐户具有有效的瑞士/列支敦士登 IBAN。
+INVOICE_SHOW_SHIPPING_ADDRESS=显示货运目的地址
+INVOICE_SHOW_SHIPPING_ADDRESSMore=某些国家/地区的强制指示（法国、...）
 UrlSocialNetworksDesc=社交网络的 URL 链接。使用 {socialid} 作为包含社交网络 ID 的变量部分。
 IfThisCategoryIsChildOfAnother=如果此类别是另一个类别的子类别
 DarkThemeMode=深色主题模式
@@ -2360,7 +2365,7 @@ UsePassword=使用密码
 UseOauth=使用 OAUTH 令牌
 Images=图像
 MaxNumberOfImagesInGetPost=在表单中提交的HTML字段中允许的最大图片数量
-MaxNumberOfPostOnPublicPagesByIP=Max number of posts on public pages with the same IP address in a month
+MaxNumberOfPostOnPublicPagesByIP=同一IP地址一个月内公共页面上的最大帖子数
 CIDLookupURL=该模块带来了一个 URL，外部工具可以使用该 URL 从其电话号码中获取合作方或联系人的名称。可使用的网址是：
 ScriptIsEmpty=脚本是空的
 ShowHideTheNRequests=显示/隐藏%sSQL请求
@@ -2368,12 +2373,12 @@ DefinedAPathForAntivirusCommandIntoSetup=定义一个杀毒程序的路径到<b>
 TriggerCodes=可触发的事件
 TriggerCodeInfo=在这里输入必须生成网络请求帖子的触发代码 (只允许外部 URL)。你可以输入几个用逗号分隔的触发代码。
 EditableWhenDraftOnly=如果不勾选，只有当对象在草稿状态时才能修改该值
-CssOnEdit=CSS on edit pages
-CssOnView=CSS on view pages
-CssOnList=CSS on lists
-HelpCssOnEditDesc=The CSS used when editing the field.<br>Example: "minwiwdth100 maxwidth500 widthcentpercentminusx"
-HelpCssOnViewDesc=The CSS used when viewing the field.
-HelpCssOnListDesc=The CSS used when field is inside a list table.<br>Example: "tdoverflowmax200"
+CssOnEdit=编辑页面上的 CSS
+CssOnView=视图页面上的 CSS
+CssOnList=列表上的 CSS
+HelpCssOnEditDesc=编辑字段时使用的 CSS。 <br> 示例：“minwiwdth100 maxwidth500 widthcentpercentminusx”
+HelpCssOnViewDesc=查看字段时使用的 CSS。
+HelpCssOnListDesc=当字段位于列表内时使用的 CSS。 <br> 示例：“tdoverflowmax200”
 RECEPTION_PDF_HIDE_ORDERED=在生成的收货文档上隐藏订购数量
 MAIN_PDF_RECEPTION_DISPLAY_AMOUNT_HT=在生成的收货文档上显示价格
 WarningDisabled=警告已禁用
@@ -2383,21 +2388,21 @@ DesktopsAndSmartphones=台式机和智能手机
 AllowOnlineSign=允许在线签名
 AllowExternalDownload=允许外部下载 (无需登录，使用共享链接)
 DeadlineDayVATSubmission=下个月提交增值税的截止日期
-MaxNumberOfAttachementOnForms=Max number of joinded files in a form
-IfDefinedUseAValueBeetween=If defined, use a value between %s and %s
-Reload=Reload
-ConfirmReload=Confirm module reload
-WarningModuleHasChangedLastVersionCheckParameter=Warning: the module %s has set a parameter to check its version at each page access. This is a bad and not allowed practice that may make the page to administer modules instable. Please contact author of module to fix this.
-WarningModuleHasChangedSecurityCsrfParameter=Warning: the module %s has disabled the CSRF security of your instance. This action is suspect and your installation may no more be secured. Please contact the author of the module for explanation.
-EMailsInGoingDesc=Incoming emails are managed by the module %s. You must enable and configure it if you need to support ingoing emails.
-MAIN_IMAP_USE_PHPIMAP=Use the PHP-IMAP library for IMAP instead of native PHP IMAP. This also allows the use of an OAuth2 connection for IMAP (module OAuth must also be activated).
-MAIN_CHECKBOX_LEFT_COLUMN=Show the column for field and line selection on the left (on the right by default)
-NotAvailableByDefaultEnabledOnModuleActivation=Not created by default. Created on module activation only.
-CSSPage=CSS Style
+MaxNumberOfAttachementOnForms=表单中最大连接文件数
+IfDefinedUseAValueBeetween=如果已定义，请使用 %s 和 %s 之间的值
+Reload=重新加载
+ConfirmReload=确认模块重新加载
+WarningModuleHasChangedLastVersionCheckParameter=警告：模块 %s 已设置一个参数来在每次页面访问时检查其版本。这是一种不好的且不允许的做法，可能会使管理模块的页面不稳定。请联系模块作者来修复此问题。
+WarningModuleHasChangedSecurityCsrfParameter=警告：模块 %s 已禁用您实例的 CSRF 安全性。此操作是可疑的，您的安装可能不再受到保护。请联系该模块的作者以获取解释。
+EMailsInGoingDesc=传入电子邮件由模块 %s 管理。如果您需要支持传入电子邮件，则必须启用并配置它。
+MAIN_IMAP_USE_PHPIMAP=使用 IMAP 的 PHP-IMAP 库而不是本机 PHP IMAP。这还允许使用 IMAP 的 OAuth2 连接（还必须激活模块 OAuth）。
+MAIN_CHECKBOX_LEFT_COLUMN=在左侧显示字段和行选择的列（默认在右侧）
+NotAvailableByDefaultEnabledOnModuleActivation=默认情况下不创建。仅在模块激活时创建。
+CSSPage=CSS 样式
 Defaultfortype=默认
-DefaultForTypeDesc=Template used by default when creating a new email for the template type
-OptionXShouldBeEnabledInModuleY=Option "<b>%s</b>" should be enabled into module <b>%s</b>
-OptionXIsCorrectlyEnabledInModuleY=Option "<b>%s</b>" is enabled into module <b>%s</b>
-AtBottomOfPage=At bottom of page
-FailedAuth=failed authentications
-MaxNumberOfFailedAuth=Max number of failed authentication in 24h to disable login.
+DefaultForTypeDesc=为模板类型创建新电子邮件时默认使用的模板
+OptionXShouldBeEnabledInModuleY=选项“ <b> %s </b> ”应在模块<b>%s</b> 中被启用
+OptionXIsCorrectlyEnabledInModuleY=选项“ <b> %s </b> ”已在模块 <b> %s </b> 中被启用
+AtBottomOfPage=在页面底部
+FailedAuth=认证失败
+MaxNumberOfFailedAuth=达到最大认证失败次数后，将在 24 小时内拒绝登录。 
diff --git a/htdocs/langs/zh_CN/agenda.lang b/htdocs/langs/zh_CN/agenda.lang
index b8b0bbc1a61..e52a95f0ce4 100644
--- a/htdocs/langs/zh_CN/agenda.lang
+++ b/htdocs/langs/zh_CN/agenda.lang
@@ -1,57 +1,57 @@
 # Dolibarr language file - Source file is en_US - agenda
 IdAgenda=事件 ID
-Actions=事件集
-Agenda=待办事项
-TMenuAgenda=待办事项
-Agendas=待办事项
+Actions=事件
+Agenda=日程
+TMenuAgenda=日程
+Agendas=日程
 LocalAgenda=默认日历
-ActionsOwnedBy=按用户活动
-ActionsOwnedByShort=用户
+ActionsOwnedBy=事件所有者
+ActionsOwnedByShort=所有者
 AffectedTo=分配给
 Event=事件
-Events=事件集
+Events=事件
 EventsNb=事件数
 ListOfActions=事件清单
 EventReports=事件报表
-Location=位置
-ToUserOfGroup=Event assigned to any user in the group
+Location=地点
+ToUserOfGroup=分配给组中任何用户的事件
 EventOnFullDay=全天事件
 MenuToDoActions=所有未完成的事件
-MenuDoneActions=所有终止事件
+MenuDoneActions=所有已终止事件
 MenuToDoMyActions=我的未完成事件
-MenuDoneMyActions=我的已经终结的事件
+MenuDoneMyActions=我的已终止事件
 ListOfEvents=事件清单(默认日历)
-ActionsAskedBy=记录操作
+ActionsAskedBy=事件报告人
 ActionsToDoBy=事件分配给
-ActionsDoneBy=做的动作
-ActionAssignedTo=活动分配给
+ActionsDoneBy=事件由谁完成
+ActionAssignedTo=事件分配给
 ViewCal=月视图
 ViewDay=日视图
 ViewWeek=周视图
 ViewPerUser=用户视图
 ViewPerType=类型视图
-AutoActions= 自动化
-AgendaAutoActionDesc= Here you may define events which you want Dolibarr to create automatically  in Agenda. If nothing is checked, only manual actions will be included in logs and displayed in Agenda. Automatic tracking of business actions done on objects (validation, status change) will not be saved.
-AgendaSetupOtherDesc= This page provides options to allow the export of your Dolibarr events into an external calendar (Thunderbird, Google Calendar etc...)
-AgendaExtSitesDesc=此页面允许声明日历的外部来源，从而在Dolibarr待办事项中可以看到他们的事件。
-ActionsEvents=Dolibarr将为其自动创建一个动作的事件
-EventRemindersByEmailNotEnabled=通过电子邮件发送的事件提醒未启用到%s模块设置中。
+AutoActions= 自动填写
+AgendaAutoActionDesc= 在这里您可以定义您希望 Dolibarr 在日程中自动创建的事件。如果未选中任何内容，则仅有手动操作被包含在日志中、并显示在日程中。对对象执行的业务操作（验证、状态更改）的自动跟踪将不会被保存在日志或日程中。
+AgendaSetupOtherDesc= 此页面提供允许将 Dolibarr 事件导出到外部日历（Thunderbird、Google 日历等...）的选项
+AgendaExtSitesDesc=此页面允许声明日历的外部来源，以将其事件纳入 Dolibarr 日程中。
+ActionsEvents=Dolibarr 将自动在日程中创建一个操作的事件
+EventRemindersByEmailNotEnabled=在 %s 模块设置中未启用通过电子邮件发送事件提醒。
 ##### Agenda event labels #####
 NewCompanyToDolibarr=合作方 %s 已创建
 COMPANY_MODIFYInDolibarr=合作方 %s 已修改
 COMPANY_DELETEInDolibarr=合作方 %s 已删除
-ContractValidatedInDolibarr=联系人 %s 已验证
-CONTRACT_DELETEInDolibarr=合同%s已删除
-PropalClosedSignedInDolibarr=建议 %s 已标记
-PropalClosedRefusedInDolibarr=建议 %s 已被拒绝
+ContractValidatedInDolibarr=合同 %s 已验证
+CONTRACT_DELETEInDolibarr=合同 %s 已删除
+PropalClosedSignedInDolibarr=报价单 %s 已签署
+PropalClosedRefusedInDolibarr=报价单 %s 已被拒绝
 PropalValidatedInDolibarr=报价单 %s 已验证
-PropalBackToDraftInDolibarr=Proposal %s go back to draft status
-PropalClassifiedBilledInDolibarr=建议 %s 已归类账单
-InvoiceValidatedInDolibarr=发票%s的验证
-InvoiceValidatedInDolibarrFromPos=发票 %s 从 POS验证
-InvoiceBackToDraftInDolibarr=发票 %s 退回草稿状态
-InvoiceDeleteDolibarr=删除  %s  发票
-InvoicePaidInDolibarr=发票 %s 已变更为支付
+PropalBackToDraftInDolibarr=报价单 %s 恢复到草稿状态
+PropalClassifiedBilledInDolibarr=报价单 %s 已归类为已开票
+InvoiceValidatedInDolibarr=发票 %s 已验证
+InvoiceValidatedInDolibarrFromPos=POS 的发票 %s 已验证
+InvoiceBackToDraftInDolibarr=发票 %s 恢复到草稿状态
+InvoiceDeleteDolibarr=发票 %s 已删除
+InvoicePaidInDolibarr=发票 %s 已变更为已支付
 InvoiceCanceledInDolibarr=发票 %s 已取消
 MemberValidatedInDolibarr=会员 %s 已验证
 MemberModifiedInDolibarr=会员 %s 已修改
@@ -61,35 +61,35 @@ MemberExcludedInDolibarr=会员 %s 已排除
 MemberSubscriptionAddedInDolibarr=会员 %s 已新增 %s 的订阅
 MemberSubscriptionModifiedInDolibarr=会员 %s 已修改 %s 的订阅
 MemberSubscriptionDeletedInDolibarr=会员 %s 已删除 %s 的订阅
-ShipmentValidatedInDolibarr=运输 %s 已验证
-ShipmentClassifyClosedInDolibarr=Shipment %s classified closed
-ShipmentUnClassifyCloseddInDolibarr=Shipment %s classified re-open
-ShipmentBackToDraftInDolibarr=Shipment %s go back to draft status
-ShipmentDeletedInDolibarr=运输 %s 已删除
-ShipmentCanceledInDolibarr=Shipment %s canceled
+ShipmentValidatedInDolibarr=发货单 %s 已验证
+ShipmentClassifyClosedInDolibarr=发货单 %s 已归类为已关闭
+ShipmentUnClassifyCloseddInDolibarr=发货单 %s 已归类为重新打开
+ShipmentBackToDraftInDolibarr=发货单 %s 恢复到草稿状态
+ShipmentDeletedInDolibarr=发货单 %s 已删除
+ShipmentCanceledInDolibarr=发货单 %s 已取消
 ReceptionValidatedInDolibarr=收货单 %s 已验证
 ReceptionDeletedInDolibarr=收货单 %s 已删除
-ReceptionClassifyClosedInDolibarr=收货单%s分类为已关闭
+ReceptionClassifyClosedInDolibarr=收货单 %s 已归类为已关闭
 OrderCreatedInDolibarr=订单 %s 已创建
 OrderValidatedInDolibarr=订单 %s 已验证
-OrderDeliveredInDolibarr=订单 %s 归类已交货
+OrderDeliveredInDolibarr=订单 %s 已归类为已交货
 OrderCanceledInDolibarr=订单 %s 已取消
-OrderBilledInDolibarr=订单 %s 归类已账单
+OrderBilledInDolibarr=订单 %s 已归类为已开票
 OrderApprovedInDolibarr=订单 %s 已批准
 OrderRefusedInDolibarr=订单 %s 已被拒绝
-OrderBackToDraftInDolibarr=订单 %s 退回草稿状态
-ProposalSentByEMail=用电子邮件发送报价单%s
+OrderBackToDraftInDolibarr=订单 %s 恢复到草稿状态
+ProposalSentByEMail=用电子邮件发送的报价单%s
 ContractSentByEMail=用电子邮件发送的合同%s
 OrderSentByEMail=用电子邮件发送的销售订单%s
 InvoiceSentByEMail=用电子邮件发送的客户发票%s
 SupplierOrderSentByEMail=用电子邮件发送的采购订单%s
 ORDER_SUPPLIER_DELETEInDolibarr=采购订单 %s 已删除
 SupplierInvoiceSentByEMail=用电子邮件发送的供应商发票%s
-ShippingSentByEMail=Shipment %s sent by email
-ShippingValidated= 运输 %s 已验证
-InterventionSentByEMail=Intervention %s sent by email
-ProjectSentByEMail=用电子邮件发送的项目%s
-ProposalDeleted=报价已删除
+ShippingSentByEMail=通过电子邮件发送的发货单 %s
+ShippingValidated= 发货单 %s 已验证
+InterventionSentByEMail=通过电子邮件发送的现场服务 %s
+ProjectSentByEMail=用电子邮件发送的项目 %s
+ProposalDeleted=报价单已删除
 OrderDeleted=订单已删除
 InvoiceDeleted=发票已删除
 DraftInvoiceDeleted=发票草稿已删除
@@ -108,15 +108,15 @@ EXPENSE_REPORT_CREATEInDolibarr=费用报销单 %s 已创建
 EXPENSE_REPORT_VALIDATEInDolibarr=费用报销单 %s 已验证
 EXPENSE_REPORT_APPROVEInDolibarr=费用报销单 %s 已批准
 EXPENSE_REPORT_DELETEInDolibarr=费用报销单 %s 已删除
-EXPENSE_REPORT_REFUSEDInDolibarr=费用报销单 %s 已拒绝
+EXPENSE_REPORT_REFUSEDInDolibarr=费用报销单 %s 已被拒绝
 PROJECT_CREATEInDolibarr=项目 %s  已创建
 PROJECT_MODIFYInDolibarr=项目 %s 已修改
 PROJECT_DELETEInDolibarr=项目 %s 已删除
-TICKET_CREATEInDolibarr=工单 %s 已创建
-TICKET_MODIFYInDolibarr=工单 %s 已修改
-TICKET_ASSIGNEDInDolibarr=工单 %s 已分配
-TICKET_CLOSEInDolibarr=工单 %s 已关闭
-TICKET_DELETEInDolibarr=工单 %s 已删除
+TICKET_CREATEInDolibarr=服务工单 %s 已创建
+TICKET_MODIFYInDolibarr=服务工单 %s 已修改
+TICKET_ASSIGNEDInDolibarr=服务工单 %s 已分配
+TICKET_CLOSEInDolibarr=服务工单 %s 已关闭
+TICKET_DELETEInDolibarr=服务工单 %s 已删除
 BOM_VALIDATEInDolibarr=物料清单已验证
 BOM_UNVALIDATEInDolibarr=物料清单未验证
 BOM_CLOSEInDolibarr=物料清单已禁用
@@ -127,39 +127,39 @@ MRP_MO_UNVALIDATEInDolibarr=制造订单已设定为草稿状态
 MRP_MO_PRODUCEDInDolibarr=制造订单已生产
 MRP_MO_DELETEInDolibarr=制造订单已删除
 MRP_MO_CANCELInDolibarr=制造订单已取消
-PAIDInDolibarr=%s已经支付
+PAIDInDolibarr=%s 已经支付
 ##### End agenda events #####
 AgendaModelModule=事件的文档模板
 DateActionStart=开始日期
 DateActionEnd=结束日期
-AgendaUrlOptions1=您还可以添加以下参数来筛选输出：
-AgendaUrlOptions3=<b>logina=%s</b> 限制输出到用户所拥有的动作 <b>%s</b>.
-AgendaUrlOptionsNotAdmin=<b> logina =！%s</b>将输出限制为非用户<b> %s</b>所拥有的操作。
-AgendaUrlOptions4=<b> logint = %s</b>将输出限制为分配给用户<b> %s </b>（所有者和其他人）的操作。
-AgendaUrlOptionsProject=<b> project = __ PROJECT_ID __</b>将输出限制为链接到项目<b> __ PROJECT_ID __</b>的操作。
-AgendaUrlOptionsNotAutoEvent=<b> notactiontype = systemauto </b>排除自动事件。
-AgendaUrlOptionsIncludeHolidays=<b>includeholidays=1</b> to include events of holidays.
-AgendaShowBirthdayEvents=联系人生日
-AgendaHideBirthdayEvents=隐藏联系人生日
+AgendaUrlOptions1=您还可以添加以下参数来过滤输出：
+AgendaUrlOptions3= <b> logina=%s </b> 将输出限制为用户 <b> %s </b> 拥有的操作。
+AgendaUrlOptionsNotAdmin= <b> logina=!%s </b> 将输出限制为用户 <b> %s </b> 不拥有的操作。
+AgendaUrlOptions4= <b> logint=%s </b> 将输出限制为分配给用户 <b> %s </b> 的操作（所有者和其他人）。
+AgendaUrlOptionsProject= <b> project=__PROJECT_ID__ </b> 将输出限制为链接到项目 <b> __PROJECT_ID__ </b> 的操作。
+AgendaUrlOptionsNotAutoEvent= <b> notactiontype=systemauto </b> 将排除自动事件。
+AgendaUrlOptionsIncludeHolidays= <b> includeholidays=1 </b> 将包含休假的事件。
+AgendaShowBirthdayEvents=联系人的生日
+AgendaHideBirthdayEvents=隐藏联系人的生日
 Busy=忙碌
-ExportDataset_event1=待办事项事件列表
-DefaultWorkingDays=默认每周工作时间 (例如: 1-5天, 1-6天)
-DefaultWorkingHours=默认每天的工作时长 (例如: 9-18)
+ExportDataset_event1=日程事件清单
+DefaultWorkingDays=默认每周工作日范围（示例：1-5、1-6）
+DefaultWorkingHours=默认每日工作时间范围（例如：9-18）
 # External Sites ical
 ExportCal=导出日历
 ExtSites=导入外部日历
-ExtSitesEnableThisTool=在Agenda中显示外部日历（在全局设置中定义）。不影响用户定义的外部日历。
+ExtSitesEnableThisTool=在日程中显示外部日历（在全局设置中定义）。不影响用户定义的外部日历。
 ExtSitesNbOfAgenda=日历数
-AgendaExtNb=日历号%s
-ExtSiteUrlAgenda=URL来访问。iCal文件
+AgendaExtNb=日历编号%s
+ExtSiteUrlAgenda=访问 .ical 文件的 URL
 ExtSiteNoLabel=无说明
 VisibleTimeRange=可见时间范围
 VisibleDaysRange=可见日期范围
 AddEvent=创建事件
-MyAvailability=我的状态
+MyAvailability=我的空闲时间
 ActionType=事件类型
-DateActionBegin=活动开始日期
-ConfirmCloneEvent=您确定要克隆事件<b> %s </b>吗？
+DateActionBegin=事件开始日期
+ConfirmCloneEvent=您确定要克隆事件 <b> %s </b> 吗？
 RepeatEvent=重复事件
 OnceOnly=只有一次
 EveryDay=每日
@@ -167,17 +167,17 @@ EveryWeek=每周
 EveryMonth=每月
 DayOfMonth=几号
 DayOfWeek=周几
-DateStartPlusOne=日期开始+ 1 小时
-SetAllEventsToTodo=Set all events to todo
-SetAllEventsToInProgress=Set all events to in progress
-SetAllEventsToFinished=Set all events to finished
-ReminderTime=Reminder period before the event
-TimeType=Duration type
-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
-Reminders=Reminders
+DateStartPlusOne=开始日期 + 1 小时
+SetAllEventsToTodo=将所有事件设置为待办事项
+SetAllEventsToInProgress=将所有事件设置为进行中
+SetAllEventsToFinished=将所有事件设置为已完成
+ReminderTime=事件前的提醒时间
+TimeType=持续时间类型
+ReminderType=回调类型
+AddReminder=为此事件创建自动提醒通知
+ErrorReminderActionCommCreation=为此事件创建提醒通知时出错
+BrowserPush=浏览器弹出通知
+Reminders=提醒事项
 ActiveByDefault=默认启用
-Until=until
-DataFromWasMerged=Data from %s was merged
+Until=直到
+DataFromWasMerged=来自 %s 的数据已合并
diff --git a/htdocs/langs/zh_CN/assets.lang b/htdocs/langs/zh_CN/assets.lang
index 9b4c4cdd450..9336633583c 100644
--- a/htdocs/langs/zh_CN/assets.lang
+++ b/htdocs/langs/zh_CN/assets.lang
@@ -16,7 +16,7 @@
 #
 # Generic
 #
-NewAsset=新资产
+NewAsset=新建资产
 AccountancyCodeAsset=科目代码（资产）
 AccountancyCodeDepreciationAsset=科目代码（折旧资产帐户）
 AccountancyCodeDepreciationExpense=科目代码（折旧费用帐户）
@@ -48,16 +48,16 @@ ASSET_ACCOUNTANCY_CATEGORY=固定资产科目组
 # Menu
 #
 MenuAssets=资产
-MenuNewAsset=新资产
+MenuNewAsset=新建资产
 MenuAssetModels=模型资产
 MenuListAssets=清单
-MenuNewAssetModel=新资产模型
+MenuNewAssetModel=新建资产模型
 MenuListAssetModels=清单
 
 #
 # Module
 #
-ConfirmDeleteAsset=您真的要移除该资产吗？
+ConfirmDeleteAsset=您真的要删除该资产吗？
 
 #
 # Tab
@@ -87,7 +87,7 @@ AssetTypeInProgress=进行中
 AssetTypeFinancial=Financial
 AssetNotDepreciated=Not depreciated
 AssetDisposal=处置
-AssetConfirmDisposalAsk=您确定要处置资产<b>%s</b>吗？
+AssetConfirmDisposalAsk=您确定要处置资产 <b> %s </b> 吗？
 AssetConfirmReOpenAsk=您确定要重新打开资产<b>%s</b>吗？
 
 #
@@ -140,11 +140,11 @@ AssetAccountancyCodeDepreciationEconomic=Economic depreciation
 AssetAccountancyCodeAsset=资产
 AssetAccountancyCodeDepreciationAsset=折旧
 AssetAccountancyCodeDepreciationExpense=Depreciation expense
-AssetAccountancyCodeValueAssetSold=Value of asset disposed
+AssetAccountancyCodeValueAssetSold=已处置资产的价值
 AssetAccountancyCodeReceivableOnAssignment=待处置应收账款
 AssetAccountancyCodeProceedsFromSales=Proceeds from disposal
 AssetAccountancyCodeVatCollected=Collected VAT
-AssetAccountancyCodeVatDeductible=Recovered VAT on assets
+AssetAccountancyCodeVatDeductible=已收回资产的增值税
 AssetAccountancyCodeDepreciationAcceleratedDepreciation=Accelerated depreciation (tax)
 AssetAccountancyCodeAcceleratedDepreciation=账户
 AssetAccountancyCodeEndowmentAcceleratedDepreciation=Depreciation expense
@@ -168,7 +168,7 @@ AssetDepreciationReversal=Reversal
 #
 # Errors
 #
-AssetErrorAssetOrAssetModelIDNotProvide=Id of the asset or the model sound has not been provided
+AssetErrorAssetOrAssetModelIDNotProvide=尚未提供资产或模型的 ID
 AssetErrorFetchAccountancyCodesForMode=Error when retrieving the accounting accounts for the '%s' depreciation mode
 AssetErrorDeleteAccountancyCodesForMode=Error when deleting accounting accounts from the '%s' depreciation mode
 AssetErrorInsertAccountancyCodesForMode=Error when inserting the accounting accounts of the depreciation mode '%s'
diff --git a/htdocs/langs/zh_CN/banks.lang b/htdocs/langs/zh_CN/banks.lang
index a4935dd806f..d98886caacd 100644
--- a/htdocs/langs/zh_CN/banks.lang
+++ b/htdocs/langs/zh_CN/banks.lang
@@ -7,7 +7,7 @@ BankName=银行名称
 FinancialAccount=帐户
 BankAccount=银行帐户
 BankAccounts=银行帐户
-BankAccountsAndGateways=Bank accounts | Gateways
+BankAccountsAndGateways=银行账户 | 网关
 ShowAccount=显示帐户
 AccountRef=财务帐号
 AccountLabel=财务帐户标签
@@ -30,28 +30,28 @@ AllTime=从开始
 Reconciliation=和解
 RIB=银行帐号
 IBAN=IBAN号码
-BIC=BIC/SWIFT code
+BIC=BIC/SWIFT 码
 SwiftValid=BIC / SWIFT有效
-SwiftNotValid=BIC/SWIFT not valid
+SwiftNotValid=BIC/SWIFT 无效
 IbanValid=BAN有效
 IbanNotValid=BAN无效
 StandingOrders=提款收据
 StandingOrder=直接借记订单
-PaymentByDirectDebit=Payment by direct debit
-PaymentByBankTransfers=Payments by credit transfer
-PaymentByBankTransfer=通过银行汇款付款
+PaymentByDirectDebit=通过直接借记付款
+PaymentByBankTransfers=通过银行转账付款
+PaymentByBankTransfer=通过银行转账付款
 AccountStatement=户口结单
 AccountStatementShort=声明
 AccountStatements=户口结单
 LastAccountStatements=最近帐户报表
 IOMonthlyReporting=每月报告
-BankAccountDomiciliation=Bank address
+BankAccountDomiciliation=银行地址
 BankAccountCountry=国家
 BankAccountOwner=帐户持有人姓名
 BankAccountOwnerAddress=帐户持有人地址
-BankAccountOwnerZip=Account owner zip
-BankAccountOwnerTown=Account owner town
-BankAccountOwnerCountry=Account owner country
+BankAccountOwnerZip=帐户所有者邮编
+BankAccountOwnerTown=账户所有者所在城市
+BankAccountOwnerCountry=帐户所有者所在国家
 CreateAccount=创建帐户
 NewBankAccount=新帐户
 NewFinancialAccount=新建财务账号
@@ -60,7 +60,7 @@ EditFinancialAccount=编辑帐户
 LabelBankCashAccount=银行或现金标签
 AccountType=账户类型
 BankType0=储蓄账户
-BankType1=Current, cheque or credit card account
+BankType1=当前帐户、支票帐户或信用卡帐户
 BankType2=现金帐户
 AccountsArea=帐户区
 AccountCard=户口信息
@@ -72,13 +72,13 @@ BankTransactionForCategory=类别<b> %s</b>的银行条目
 RemoveFromRubrique=删除链接分类
 RemoveFromRubriqueConfirm=您确定要删除条目和类别之间的链接吗？
 ListBankTransactions=银行条目清单
-IdTransaction=交易ID
+IdTransaction=交易 ID
 BankTransactions=银行条目
 BankTransaction=银行条目
 ListTransactions=列表条目
 ListTransactionsByCategory=列表条目/类别
 TransactionsToConciliate=调节的条目
-TransactionsToConciliateShort=To reconcile
+TransactionsToConciliateShort=对账
 Conciliable=可以两全
 Conciliate=调节
 Conciliation=和解
@@ -104,15 +104,15 @@ BankLineConciliated=与银行收据核对的条目
 BankLineReconciled=调解
 BankLineNotReconciled=未调解
 CustomerInvoicePayment=客户付款
-SupplierInvoicePayment=Vendor payment
+SupplierInvoicePayment=供应商付款
 SubscriptionPayment=认购款项
-WithdrawalPayment=Direct Debit payment
-BankTransferPayment=Credit Transfer payment
+WithdrawalPayment=直接借记付款
+BankTransferPayment=银行转账付款
 SocialContributionPayment=支付社保/财政税
-BankTransfer=Credit transfer
-BankTransfers=Credit transfers
+BankTransfer=银行转账
+BankTransfers=银行转账
 MenuBankInternalTransfer=内部转移
-TransferDesc=Use internal transfer to transfer from one account to another, the application will write two records: a debit in the source account and a credit in the target account. The same amount, label and date will be used for this transaction.
+TransferDesc=使用内部转账从一个账户转账到另一个账户，应用程序将写入两条记录：源账户中的借方和目标账户中的贷方。本次交易将使用相同的金额、标签和日期。
 TransferFrom=从
 TransferTo=至
 TransferFromToDone=从<b>%s</b>向<b>%s</b>转帐<b>%s</b>已被记录。
@@ -121,10 +121,10 @@ ValidateCheckReceipt=验证此支票收据？
 ConfirmValidateCheckReceipt=您确定要提交此支票收据进行验证吗？一旦验证，将无法更改。
 DeleteCheckReceipt=删除此支票收据？
 ConfirmDeleteCheckReceipt=您确定要删除此支票收据吗？
-DocumentsForDeposit=Documents to deposit at the bank
+DocumentsForDeposit=存入银行的文件
 BankChecks=银行支票
-BankChecksToReceipt=等待支票存款
-BankChecksToReceiptShort=等待支票存款
+BankChecksToReceipt=待存入的支票
+BankChecksToReceiptShort=待存入的支票
 ShowCheckReceipt=显示检查存单
 NumberOfCheques=支票数
 DeleteTransaction=删除条目
@@ -132,10 +132,10 @@ ConfirmDeleteTransaction=您确定要删除此条目吗？
 ThisWillAlsoDeleteBankRecord=这也将删除生成的银行条目
 BankMovements=调拨
 PlannedTransactions=计划的条目
-Graph=Graphs
+Graph=图表
 ExportDataset_banque_1=银行条目和帐户对帐单
 ExportDataset_banque_2=存款单
-TransactionOnTheOtherAccount=交易的其他帐户
+TransactionOnTheOtherAccount=其他账户的交易
 PaymentNumberUpdateSucceeded=款项更新成功
 PaymentNumberUpdateFailed=付款数目无法更新
 PaymentDateUpdateSucceeded=付款日期更新成功
@@ -145,50 +145,50 @@ BankTransactionLine=银行条目
 AllAccounts=所有银行和现金账户
 BackToAccount=回到帐户
 ShowAllAccounts=显示所有帐户
-FutureTransaction=Future transaction. Unable to reconcile.
+FutureTransaction=未来交易。无法对账。
 SelectChequeTransactionAndGenerate=选择/过滤要包含在支票存款收据中的支票。然后，单击“创建”。
 SelectPaymentTransactionAndGenerate=选择/过滤要包含在%s存款收据中的文档。然后，单击“创建”。
-InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value
-InputReceiptNumberBis=YYYYMM or YYYYMMDD
+InputReceiptNumber=选择与对账相关的银行对账单。使用可排序的数值
+InputReceiptNumberBis=YYYYMM 或 YYYYMMDD
 EventualyAddCategory=最后，指定一个范畴对其中的记录进行分类
 ToConciliate=调节？
 ThenCheckLinesAndConciliate=然后按一下，连线检查银行对账单。
 DefaultRIB=默认BAN
 AllRIB=全部BAN
 LabelRIB=BAN标签
-NoBANRecord=空空如也——没有BAN记录
+NoBANRecord=无BAN记录
 DeleteARib=删除BAN记录
 ConfirmDeleteRib=您确定要删除此BAN记录吗？
 RejectCheck=退回的支票
 ConfirmRejectCheck=您确定要将此支票标记为已拒绝吗？
 RejectCheckDate=支票被退回的日期
 CheckRejected=退回的支票
-CheckRejectedAndInvoicesReopened=Check returned and invoices re-open
+CheckRejectedAndInvoicesReopened=支票退回并重新开具发票
 BankAccountModelModule=银行账户的文档模板
 DocumentModelSepaMandate=SEPA任务模板。仅适用于欧洲经济共同体的欧洲国家。
 DocumentModelBan=用于打印具有BAN信息的页面的模板。
-NewVariousPayment=New miscellaneous payment
-VariousPayment=Miscellaneous payment
+NewVariousPayment=新的杂项付款
+VariousPayment=杂项付款
 VariousPayments=杂项付款
-ShowVariousPayment=Show miscellaneous payment
-AddVariousPayment=Add miscellaneous payment
-VariousPaymentId=Miscellaneous payment ID
-VariousPaymentLabel=Miscellaneous payment label
-ConfirmCloneVariousPayment=Confirm the clone of a miscellaneous payment
+ShowVariousPayment=显示杂项付款
+AddVariousPayment=添加杂项付款
+VariousPaymentId=杂项付款 ID
+VariousPaymentLabel=杂项付款标签
+ConfirmCloneVariousPayment=确认杂项付款的克隆
 SEPAMandate=SEPA授权
 YourSEPAMandate=您的SEPA授权
 FindYourSEPAMandate=这是您的SEPA授权，授权我们公司向您的银行直接扣款。返回签名（扫描签名文档）或通过邮件发送给
-AutoReportLastAccountStatement=Automatically fill the field 'number of bank statement' with last statement number when making reconciliation
-CashControl=POS cash control
-NewCashFence=New cash control (opening or closing)
+AutoReportLastAccountStatement=进行对账时，自动使用最后的对账单编号填写“银行对账单编号”字段
+CashControl=POS现金控制
+NewCashFence=新的现金控制（打开或关闭）
 BankColorizeMovement=为调拨着色
 BankColorizeMovementDesc=如果启用此功能，您可以为借记或贷记调拨选择特定的背景颜色
 BankColorizeMovementName1=借方调拨的背景颜色
 BankColorizeMovementName2=贷方调拨的背景颜色
-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
-SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformation=SEPA transfer: 'Payment Type' at 'Credit Transfer' level
-SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformationHelp=When generatin a SEPA XML file for Credit transfers, the section "PaymentTypeInformation" can now be placed inside the "CreditTransferTransactionInformation" section (instead of "Payment" section). We strongly recommend to keep this unchecked to place PaymentTypeInformation at Payment level, as all banks will not necessarily accept it at CreditTransferTransactionInformation level. Contact your bank before placing PaymentTypeInformation at CreditTransferTransactionInformation level.
+IfYouDontReconcileDisableProperty=如果您不对某些银行账户进行银行对账，请禁用这些账户的属性“%s”以消除此警告。
+NoBankAccountDefined=未定义银行账户
+NoRecordFoundIBankcAccount=在银行账户中未找到记录。通常，当一条记录从银行账户的交易清单中手动删除时（例如在银行账户对账期间），就会发生这种情况。另一种原因是在禁用了“%s”模块的情况下记录了付款。
+AlreadyOneBankAccount=已定义一个银行账户
+SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformation=SEPA 转账：“银行转账”级别的“付款类型”
+SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformationHelp=当生成用于信用转账的 SEPA XML 文件时，“PaymentTypeInformation”部分现在可以放置在“CreditTransferTransactionInformation”部分（而不是“Payment”部分）内。我们强烈建议不要选中此选项，以将 PaymentTypeInformation 置于 Payment 级别，因为所有银行不一定都会在 CreditTransferTransactionInformation 级别接受它。在将 PaymentTypeInformation 置于 CreditTransferTransactionInformation 级别之前，请先与您的银行联系。
 ToCreateRelatedRecordIntoBank=To create missing related bank record
diff --git a/htdocs/langs/zh_CN/bills.lang b/htdocs/langs/zh_CN/bills.lang
index b2028ab6dd0..ec6f5a1daae 100644
--- a/htdocs/langs/zh_CN/bills.lang
+++ b/htdocs/langs/zh_CN/bills.lang
@@ -6,19 +6,19 @@ BillsCustomer=客户发票
 BillsSuppliers=供应商发票
 BillsCustomersUnpaid=未付款顾客发票
 BillsCustomersUnpaidForCompany=%s的未付款顾客发票
-BillsSuppliersUnpaid=Unpaid vendor invoices
-BillsSuppliersUnpaidForCompany=Unpaid vendors invoices for %s
+BillsSuppliersUnpaid=未付款的供应商发票
+BillsSuppliersUnpaidForCompany=%s 的未付款供应商发票
 BillsLate=逾期付款
 BillsStatistics=客户发票统计
-BillsStatisticsSuppliers=Vendors invoices statistics
+BillsStatisticsSuppliers=供应商发票统计
 DisabledBecauseDispatchedInBookkeeping=已禁用，因为发票已发送到簿记中
 DisabledBecauseNotLastInvoice=禁用，因为发票不可擦除。在此之后记录了一些发票，它将在柜台上创建漏洞。
-DisabledBecauseNotLastSituationInvoice=Disabled because invoice is not erasable. This invoice is not the last one in situation invoice cycle.
+DisabledBecauseNotLastSituationInvoice=由于发票不可擦除而被禁用。该发票不是形式发票周期中的最后一张发票。
 DisabledBecauseNotErasable=禁止删除
 InvoiceStandard=标准发票
 InvoiceStandardAsk=标准发票
 InvoiceStandardDesc=这种发票是一种常见的发票。
-InvoiceStandardShort=Standard
+InvoiceStandardShort=标准
 InvoiceDeposit=首付发票
 InvoiceDepositAsk=首付发票
 InvoiceDepositDesc=这种发票是在收到预付款时完成的。
@@ -26,15 +26,15 @@ InvoiceProForma=形式发票
 InvoiceProFormaAsk=形式发票
 InvoiceProFormaDesc=<b>形式发票</b>是发票的形式，但其没有真正的会计价值。
 InvoiceReplacement=更换发票
-InvoiceReplacementShort=Replacement
+InvoiceReplacementShort=替代品
 InvoiceReplacementAsk=为发票更换发票
 InvoiceReplacementDesc= <b> 替换发票 </b> 用于完全替换尚未收到付款的发票。 <br> <br> 注意：只能更换未付款的发票。如果您替换的发票尚未关闭，它将自动关闭为“放弃”。
-InvoiceAvoir=信用记录
-InvoiceAvoirAsk=更正发票的信用记录
-InvoiceAvoirDesc=The <b>credit note</b> is a negative invoice used to correct the fact that an invoice shows an amount that differs from the amount actually paid (eg the customer paid too much by mistake, or will not pay the complete amount since some products were returned).
-invoiceAvoirWithLines=使用原始发票中的行创建贷方通知单
-invoiceAvoirWithPaymentRestAmount=使用剩余未付原始发票创建贷方通知单
-invoiceAvoirLineWithPaymentRestAmount=剩余未付金额的信用票据
+InvoiceAvoir=贷项通知
+InvoiceAvoirAsk=更正发票的贷项通知
+InvoiceAvoirDesc=<b>贷项通知</b>是一张负数的发票，用于更正发票显示的金额与实际支付的金额不同的事实（例如，客户错误地支付了过多的金额，或者由于一些产品被退回而不会支付全部金额）。
+invoiceAvoirWithLines=使用原始发票中的行创建贷项通知
+invoiceAvoirWithPaymentRestAmount=使用剩余未付原始发票创建贷项通知
+invoiceAvoirLineWithPaymentRestAmount=剩余未付金额的贷项通知
 ReplaceInvoice=替换%s的发票
 ReplacementInvoice=更换发票
 ReplacedByInvoice=被发票 %s 替换
@@ -44,9 +44,9 @@ CorrectionInvoice=发票的更正
 UsedByInvoice=用于支付发票%s的
 ConsumedBy=消耗
 NotConsumed=不消耗
-NoReplacableInvoice=No replaceable invoices
+NoReplacableInvoice=不可更换发票
 NoInvoiceToCorrect=没有发票，以纠正
-InvoiceHasAvoir=是一个或几个信用票据的来源
+InvoiceHasAvoir=是一张或多张贷项通知的来源
 CardBill=发票信息
 PredefinedInvoices=预定义的发票
 Invoice=发票
@@ -56,62 +56,62 @@ InvoiceLine=发票线
 InvoiceCustomer=客户发票
 CustomerInvoice=客户发票
 CustomersInvoices=顾客发票
-SupplierInvoice=Vendor invoice
+SupplierInvoice=供应商发票
 SuppliersInvoices=供应商发票
-SupplierInvoiceLines=Vendor invoice lines
-SupplierBill=Vendor invoice
+SupplierInvoiceLines=供应商发票行
+SupplierBill=供应商发票
 SupplierBills=供应商发票
 Payment=付款
-PaymentBack=Refund
-CustomerInvoicePaymentBack=Refund
+PaymentBack=退款
+CustomerInvoicePaymentBack=退款
 Payments=付款
-PaymentsBack=Refunds
+PaymentsBack=退款
 paymentInInvoiceCurrency=在发票货币
 PaidBack=已退款
 DeletePayment=删除付款
 ConfirmDeletePayment=您确定要删除此付款吗？
-ConfirmConvertToReduc=Do you want to convert this %s into an available credit?
-ConfirmConvertToReduc2=The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
-ConfirmConvertToReducSupplier=Do you want to convert this %s into an available credit?
-ConfirmConvertToReducSupplier2=The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this vendor.
+ConfirmConvertToReduc=您想将此%s转换为可用积分吗？
+ConfirmConvertToReduc2=该金额将保存在所有折扣中，并可用作该客户当前或未来发票的折扣。
+ConfirmConvertToReducSupplier=您想将此%s转换为可用积分吗？
+ConfirmConvertToReducSupplier2=该金额将保存在所有折扣中，并可用作该供应商当前或未来发票的折扣。
 SupplierPayments=供应商付款
 ReceivedPayments=收到的付款
 ReceivedCustomersPayments=收到客户付款
-PayedSuppliersPayments=Payments paid to vendors
+PayedSuppliersPayments=支付给供应商的款项
 ReceivedCustomersPaymentsToValid=收到需要确认的客户付款
 PaymentsReportsForYear=客户 %s 的付款报告
 PaymentsReports=付款报表
 PaymentsAlreadyDone=付款已完成
-PaymentsBackAlreadyDone=Refunds already done
+PaymentsBackAlreadyDone=退款已完成
 PaymentRule=付款规则
-PaymentMode=Payment method
-PaymentModes=Payment methods
-DefaultPaymentMode=Default Payment method
-DefaultBankAccount=Default Bank Account
-IdPaymentMode=Payment method (id)
-CodePaymentMode=Payment method (code)
-LabelPaymentMode=Payment method (label)
-PaymentModeShort=Payment method
-PaymentTerm=Payment Term
-PaymentConditions=付款条款
-PaymentConditionsShort=付款条款
+PaymentMode=付款方式
+PaymentModes=付款方式
+DefaultPaymentMode=默认付款方式
+DefaultBankAccount=默认银行账户
+IdPaymentMode=付款方式（id）
+CodePaymentMode=付款方式（代码）
+LabelPaymentMode=付款方式（标签）
+PaymentModeShort=付款方式
+PaymentTerm=付款期限
+PaymentConditions=付款期限
+PaymentConditionsShort=付款期限
 PaymentAmount=付款金额
 PaymentHigherThanReminderToPay=付款金额比需要支付的金额高
-HelpPaymentHigherThanReminderToPay=请注意，一张或多张账单的付款金额高于未付金额。 <br> 编辑您的条目，否则请确认并考虑为每张多付发票收到的超额部分创建贷项通知单。
+HelpPaymentHigherThanReminderToPay=请注意，一张或多张账单的付款金额高于未付金额。 <br> 编辑您的条目，否则请确认并考虑为每张多付发票收到的超额部分创建贷项通知。
 HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess paid for each overpaid invoice.
-ClassifyPaid=归类为 已支付
-ClassifyUnPaid=Classify 'Unpaid'
-ClassifyPaidPartially=归类分 部分支付
-ClassifyCanceled=归类为 已丢弃
-ClassifyClosed=归类为 已关闭
-ClassifyUnBilled=归类 'Unbilled'
+ClassifyPaid=归类为“已支付”
+ClassifyUnPaid=归类为“未付款”
+ClassifyPaidPartially=归类为“部分支付”
+ClassifyCanceled=归类为“已放弃”
+ClassifyClosed=归类为“已关闭”
+ClassifyUnBilled=归类“未开票”
 CreateBill=创建发票
-CreateCreditNote=创建信用记录
-AddBill=创建发票或信用记录
+CreateCreditNote=创建贷项通知
+AddBill=创建发票或贷项通知
 AddToDraftInvoices=添加到发票草稿
 DeleteBill=删除发票
 SearchACustomerInvoice=搜索客户发票
-SearchASupplierInvoice=Search for a vendor invoice
+SearchASupplierInvoice=搜索供应商发票
 CancelBill=取消发票
 SendRemindByMail=通过电子邮件发送提醒
 DoPayment=输入付款
@@ -122,13 +122,13 @@ ConvertExcessPaidToReduc=将超额付款转换为可用折扣
 EnterPaymentReceivedFromCustomer=输入从客户收到的付款
 EnterPaymentDueToCustomer=为客户创建付款延迟
 DisabledBecauseRemainderToPayIsZero=禁用，因为未支付金额为0
-PriceBase=Base price
+PriceBase=底价
 BillStatus=发票状态
 StatusOfGeneratedInvoices=生成的发票的状态
-BillStatusDraft=草案(需要确认)
+BillStatusDraft=草案（需要确认）
 BillStatusPaid=已支付
-BillStatusPaidBackOrConverted=信用票据退款或标记为可用信用
-BillStatusConverted=付费（准备在最终发票中消费）
+BillStatusPaidBackOrConverted=可用贷项通知退款或计入贷项
+BillStatusConverted=已付款（可在最终发票中消费）
 BillStatusCanceled=已丢弃
 BillStatusValidated=已确认 (需要付款)
 BillStatusStarted=开始
@@ -162,9 +162,9 @@ ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=This part or ano
 ErrorInvoiceIsNotLastOfSameType=Error: The date of invoice %s  is %s. It must be posterior or equal to last date for same type invoices (%s). Please change the invoice date.
 BillFrom=发送方
 BillTo=接收方
-ShippingTo=Shipping to
-ActionsOnBill=发票的动作
-ActionsOnBillRec=Actions on recurring invoice
+ShippingTo=货物运输到
+ActionsOnBill=对发票采取的操作
+ActionsOnBillRec=对定期发票采取的操作
 RecurringInvoiceTemplate=模板/重复发票
 NoQualifiedRecurringInvoiceTemplateFound=没有经常生成的模板发票。
 FoundXQualifiedRecurringInvoiceTemplate=找到%s经常生效的模板发票。
@@ -181,7 +181,7 @@ AllCustomerTemplateInvoices=所有模板发票
 OtherBills=其他发票
 DraftBills=发票草稿
 CustomersDraftInvoices=顾客草稿发票
-SuppliersDraftInvoices=Vendor draft invoices
+SuppliersDraftInvoices=供应商草稿发票
 Unpaid=未付
 ErrorNoPaymentDefined=Error No payment defined
 ConfirmDeleteBill=您确定要删除此发票吗？
@@ -192,12 +192,12 @@ ConfirmCancelBill=你确定要取消发票<b>%s</b>吗 ？
 ConfirmCancelBillQuestion=为什么要将此发票分类为“废弃”？
 ConfirmClassifyPaidPartially=你确定要将发票<b>%s</b>更改为已支付状态吗？
 ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What is the reason for closing this invoice?
-ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularize the VAT with a credit note.
-ConfirmClassifyPaidPartiallyReasonDiscount=剩余未付<b>（%s %s）</b>是一项折扣，因为付款是在期前完成的。
-ConfirmClassifyPaidPartiallyReasonDiscountNoVat=其余部分支付<b>（%s的%s）</b>是一个折扣，因为获得付款之前任期。我接受失去这个折扣的增值税。
-ConfirmClassifyPaidPartiallyReasonDiscountVat=其余部分支付<b>（%s的%s）</b>是一个折扣，因为获得付款之前任期。我在此折扣不恢复信贷注意到增值税。
+ConfirmClassifyPaidPartiallyReasonAvoir=剩余未付款<b> (%s %s) </b> 是一项折扣，因为付款是在期限前完成。我通过贷项通知规范增值税。
+ConfirmClassifyPaidPartiallyReasonDiscount=剩余未付款<b>（%s %s）</b>是一项折扣，因为付款是在期限前完成。
+ConfirmClassifyPaidPartiallyReasonDiscountNoVat=剩余未付款<b>（%s %s）</b>是一项折扣，因为付款是在期限前完成。我接受失去这个折扣的增值税。
+ConfirmClassifyPaidPartiallyReasonDiscountVat=剩余未付款<b> (%s %s) </b> 是一项折扣，因为付款是在期限前完成。我在没有贷项通知的情况下收回了此折扣的增值税。
 ConfirmClassifyPaidPartiallyReasonBadCustomer=坏顾客
-ConfirmClassifyPaidPartiallyReasonBadSupplier=Bad vendor
+ConfirmClassifyPaidPartiallyReasonBadSupplier=不良供应商
 ConfirmClassifyPaidPartiallyReasonBankCharge=Deduction by bank (intermediary bank fee)
 ConfirmClassifyPaidPartiallyReasonWithholdingTax=Withholding tax
 ConfirmClassifyPaidPartiallyReasonProductReturned=产品部分退回
@@ -209,7 +209,7 @@ ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=A <b>bad customer</b> is a cus
 ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=这个选择是付款时使用的是不完整的，因为一些产品被退回
 ConfirmClassifyPaidPartiallyReasonBankChargeDesc=The unpaid amount is <b>intermediary bank fees</b>, deducted directly from the <b>correct amount</b> paid by the Customer.
 ConfirmClassifyPaidPartiallyReasonWithholdingTaxDesc=The unpaid amount will never be paid as it is a withholding tax
-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.
+ConfirmClassifyPaidPartiallyReasonOtherDesc=如果所有其他选项都不适合，请使用此选项，例如在以下情况下：<br> - 付款未完成，因为某些产品被运回<br> - 索赔金额太重要，因为忘记了折扣 <br> 在所有情况下，必须通过创建贷方票据在会计系统中更正多报的金额。
 ConfirmClassifyPaidPartiallyReasonBadSupplierDesc=A <b>bad supplier</b> is a supplier we refuse to pay.
 ConfirmClassifyAbandonReasonOther=其他
 ConfirmClassifyAbandonReasonOtherDesc=这一选择将用于所有的其他情形。例如，因为你要创建一个替代发票。
@@ -233,16 +233,16 @@ RetainedwarrantyOnlyForSituationFinal=On situation invoices the global "retained
 ToPayOn=To pay on %s
 toPayOn=to pay on %s
 RetainedWarranty=Retained Warranty
-PaymentConditionsShortRetainedWarranty=Retained warranty payment terms
-DefaultPaymentConditionsRetainedWarranty=Default retained warranty payment terms
-setPaymentConditionsShortRetainedWarranty=Set retained warranty payment terms
+PaymentConditionsShortRetainedWarranty=保留保修付款期限
+DefaultPaymentConditionsRetainedWarranty=默认保留保修付款期限
+setPaymentConditionsShortRetainedWarranty=设置保留保修付款期限
 setretainedwarranty=Set retained warranty
 setretainedwarrantyDateLimit=Set retained warranty date limit
 RetainedWarrantyDateLimit=Retained warranty date limit
 RetainedWarrantyNeed100Percent=The situation invoice need to be at 100%% progress to be displayed on PDF
 AlreadyPaid=已支付
 AlreadyPaidBack=已支付
-AlreadyPaidNoCreditNotesNoDeposits=已经支付（没有信用票据和预付款）
+AlreadyPaidNoCreditNotesNoDeposits=已经支付（没有贷项通知和预付款）
 Abandoned=已丢弃
 RemainderToPay=未付金额
 RemainderToPayMulticurrency=Remaining unpaid, original currency
@@ -258,7 +258,7 @@ ExcessReceivedMulticurrency=收到的超额部分，原币
 NegativeIfExcessReceived=如果收到超额则为负
 ExcessPaid=超额付款
 ExcessPaidMulticurrency=Excess paid, original currency
-EscompteOffered=折扣额 (付款条件前付款)
+EscompteOffered=提供折扣（期限前付款）
 EscompteOfferedShort=折扣
 SendBillRef=发票 %s  的提交
 SendReminderBillRef=发票 %s  的提交 (提醒)
@@ -267,7 +267,7 @@ NoDraftBills=没有发票草稿
 NoOtherDraftBills=没有其他发票草稿
 NoDraftInvoices=没有发票草稿
 RefBill=发票号
-ToBill=为了法案
+ToBill=待付款
 RemainderToBill=其余部分法案
 SendBillByMail=通过电子邮件发送发票
 SendReminderBillByMail=通过电子邮件发送提醒
@@ -278,13 +278,13 @@ DateMaxPayment=付款到期
 DateInvoice=发票日期
 DatePointOfTax=税点
 NoInvoice=没有发票
-NoOpenInvoice=No open invoice
-NbOfOpenInvoices=Number of open invoices
+NoOpenInvoice=没有未完成的发票
+NbOfOpenInvoices=未完成的发票数量
 ClassifyBill=分类发票
-SupplierBillsToPay=Unpaid vendor invoices
+SupplierBillsToPay=未支付的供应商发票
 CustomerBillsUnpaid=未付款顾客发票
 NonPercuRecuperable=非可收回
-SetConditions=Set Payment Terms
+SetConditions=设置付款期限
 SetMode=Set Payment Type
 SetRevenuStamp=设置印花税
 Billed=帐单
@@ -323,7 +323,7 @@ RelativeDiscount=相对折扣
 GlobalDiscount=全球折扣
 CreditNote=信用记录
 CreditNotes=信用记录
-CreditNotesOrExcessReceived=信用票据或超额收到
+CreditNotesOrExcessReceived=贷项通知或超额收到
 Deposit=首付
 Deposits=首付
 DiscountFromCreditNote=从信用记录折扣 %s
@@ -345,7 +345,7 @@ DiscountAlreadyCounted=已消费的折扣或积分
 CustomerDiscounts=客户折扣
 SupplierDiscounts=供应商折扣
 BillAddress=账单地址
-HelpEscompte=This discount is a discount granted to customer because payment was made before term.
+HelpEscompte=此折扣是由于在期限前付款而给予客户的折扣。
 HelpAbandonBadCustomer=This amount has been abandoned (customer said to be a bad customer) and is considered as an exceptional loss.
 HelpAbandonOther=This amount has been abandoned since it was an error (wrong customer or invoice replaced by another for example)
 IdSocialContribution=财政税/增值税代码
@@ -363,10 +363,10 @@ OrderBilled=Order billed
 DonationPaid=Donation paid
 PaymentNumber=付款号码
 RemoveDiscount=删除折扣
-WatermarkOnDraftBill=基于发票草稿(无则留空)
+WatermarkOnDraftBill=草稿发票上的水印（如果为空则没有水印）
 InvoiceNotChecked=没有选取发票
 ConfirmCloneInvoice=你确定要复制发票 <b>%s</b> 吗 ？
-DisabledBecauseReplacedInvoice=发票已经被取代，动作被拒绝
+DisabledBecauseReplacedInvoice=由于发票已被替换，操作已禁用
 DescTaxAndDividendsArea=This area presents a summary of all payments made for special expenses. Only records with payments during the fixed year are included here.
 NbOfPayments=No. of payments
 SplitDiscount=折扣分为两部分
@@ -388,7 +388,7 @@ ListOfPreviousSituationInvoices=以前的情况发票清单
 ListOfNextSituationInvoices=下一个情况发票清单
 ListOfSituationInvoices=情况发票清单
 CurrentSituationTotal=总现状
-DisabledBecauseNotEnouthCreditNote=要从周期中删除情况发票，此发票的贷方通知单总计必须涵盖此发票总额
+DisabledBecauseNotEnouthCreditNote=要从周期中删除形式发票，此发票的贷项通知总计必须涵盖此发票总额
 RemoveSituationFromCycle=从周期中删除此发票
 ConfirmRemoveSituationFromCycle=从周期中删除此发票%s？
 ConfirmOuting=确认外出
@@ -432,7 +432,7 @@ PaymentConditionPT_DELIVERY=交货时
 PaymentConditionShortPT_ORDER=订单
 PaymentConditionPT_ORDER=在订单
 PaymentConditionShortPT_5050=50-50
-PaymentConditionPT_5050=预付50%% ，50%%货到后付款
+PaymentConditionPT_5050=预付 50%%，交货时付 50%%
 PaymentConditionShort10D=10天
 PaymentCondition10D=10天
 PaymentConditionShort10DENDMONTH=月末10天
@@ -442,13 +442,13 @@ PaymentCondition14D=14天
 PaymentConditionShort14DENDMONTH=月末14天
 PaymentCondition14DENDMONTH=在月底之后的14天内
 PaymentConditionShortDEP30PCTDEL=__DEPOSIT_PERCENT__%% deposit
-PaymentConditionDEP30PCTDEL=__DEPOSIT_PERCENT__%% deposit, remainder on delivery
+PaymentConditionDEP30PCTDEL=__DEPOSIT_PERCENT__%% 定金，余款交货时付清
 FixAmount=Fixed amount - 1 line with label '%s'
 VarAmount=可变金额(%% tot.)
 VarAmountOneLine=可变金额（%% tot。） -  1行标签'%s'
 VarAmountAllLines=Variable amount (%% tot.) - all lines from origin
 DepositPercent=Deposit %%
-DepositGenerationPermittedByThePaymentTermsSelected=This is permitted by the payment terms selected
+DepositGenerationPermittedByThePaymentTermsSelected=这是所选付款期限允许的
 GenerateDeposit=Generate a %s%% deposit invoice
 ValidateGeneratedDeposit=Validate the generated deposit
 DepositGenerated=Deposit generated
@@ -468,8 +468,8 @@ PaymentTypeCHQ=支票
 PaymentTypeShortCHQ=支票
 PaymentTypeTIP=TIP (付款交单)
 PaymentTypeShortTIP=TIP款项
-PaymentTypeVAD=Online payment
-PaymentTypeShortVAD=Online payment
+PaymentTypeVAD=在线支付
+PaymentTypeShortVAD=在线支付
 PaymentTypeTRA=银行账单草稿
 PaymentTypeShortTRA=草稿
 PaymentTypeFAC=因素
@@ -487,7 +487,7 @@ IBAN=银行IBAN
 CustomerIBAN=IBAN of customer
 SupplierIBAN=IBAN of vendor
 BIC=BIC/SWIFT
-BICNumber=BIC/SWIFT code
+BICNumber=BIC/SWIFT 码
 ExtraInfos=自定义信息
 RegulatedOn=规范了
 ChequeNumber=Check N°
@@ -529,7 +529,7 @@ Cheques=支票
 DepositId=Id存款
 NbCheque=支票数量
 CreditNoteConvertedIntoDiscount=此%s已被转换为%s
-UsBillingContactAsIncoiveRecipientIfExist=Use contact/address with type 'billing contact' instead of third-party address as recipient for invoices
+UsBillingContactAsIncoiveRecipientIfExist=请使用“帐单联系人”类型的联系人/地址，而不是使用合作方地址作为发票收件人
 ShowUnpaidAll=显示所有未付发票
 ShowUnpaidLateOnly=只显示超时未付发票
 PaymentInvoiceRef=%s的付款发票
@@ -568,13 +568,13 @@ CactusNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invo
 EarlyClosingReason=Early closing reason
 EarlyClosingComment=Early closing note
 ##### Types de contacts #####
-TypeContact_facture_internal_SALESREPFOLL=代表跟进客户发票
+TypeContact_facture_internal_SALESREPFOLL=跟进客户发票的销售代表
 TypeContact_facture_external_BILLING=客户发票联系人
-TypeContact_facture_external_SHIPPING=客户送货联系人
+TypeContact_facture_external_SHIPPING=客户货运联系人
 TypeContact_facture_external_SERVICE=客户服务联系人
-TypeContact_invoice_supplier_internal_SALESREPFOLL=Representative following-up vendor invoice
+TypeContact_invoice_supplier_internal_SALESREPFOLL=跟进供应商发票的销售代表
 TypeContact_invoice_supplier_external_BILLING=Vendor invoice contact
-TypeContact_invoice_supplier_external_SHIPPING=Vendor shipping contact
+TypeContact_invoice_supplier_external_SHIPPING=供应商货运联系人
 TypeContact_invoice_supplier_external_SERVICE=Vendor service contact
 # Situation invoices
 InvoiceFirstSituationAsk=第一种情况发票
@@ -589,14 +589,14 @@ ModifyAllLines=全部变更
 CreateNextSituationInvoice=创建下一个情况
 ErrorFindNextSituationInvoice=错误无法找到下一个情况循环参考
 ErrorOutingSituationInvoiceOnUpdate=无法出租这种情况发票。
-ErrorOutingSituationInvoiceCreditNote=无法外出联系信用票据。
+ErrorOutingSituationInvoiceCreditNote=无法外出联系贷项通知。
 NotLastInCycle=该发票不是周期中最新的，不得修改。
 DisabledBecauseNotLastInCycle=下一种情况已经存在。
 DisabledBecauseFinal=这种情况是最终的。
 situationInvoiceShortcode_AS=如
 situationInvoiceShortcode_S=S
 CantBeLessThanMinPercent=进展不能小于以前情况下的价值。
-NoSituations=没有开放的情况
+NoSituations=没有未完成的情况
 InvoiceSituationLast=最终和一般发票
 PDFCrevetteSituationNumber=情况N°%s
 PDFCrevetteSituationInvoiceLineDecompte=情况发票 -  COUNT
@@ -605,7 +605,7 @@ PDFCrevetteSituationInvoiceLine=Situation N°%s: Inv. N°%s on %s
 TotalSituationInvoice=总情况
 invoiceLineProgressError=发票行进度不能大于或等于下一个发票行
 updatePriceNextInvoiceErrorUpdateline=Error: update price on invoice line: %s
-ToCreateARecurringInvoice=要为此合同创建定期发票，请先创建此草稿发票，然后将其转换为发票模板，并定义生成未来发票的频率。
+ToCreateARecurringInvoice=要为此合同创建定期发票，请先创建此草稿发票，然后将其转换为发票模板，并定义将来发票的生成频率。
 ToCreateARecurringInvoiceGene=要定期和手动生成未来发票，只需进入菜单<strong> %s  -  %s  -  %s </strong>。
 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=删除模板发票
@@ -638,6 +638,6 @@ MakePaymentAndClassifyPayed=Record payment
 BulkPaymentNotPossibleForInvoice=Bulk payment is not possible for invoice %s (bad type or status)
 MentionVATDebitOptionIsOn=Option to pay tax based on debits
 MentionCategoryOfOperations=Category of operations
-MentionCategoryOfOperations0=Delivery of goods
+MentionCategoryOfOperations0=交货
 MentionCategoryOfOperations1=Provision of services
-MentionCategoryOfOperations2=Mixed - Delivery of goods & provision of services
+MentionCategoryOfOperations2=混合 - 交付货物并提供服务
diff --git a/htdocs/langs/zh_CN/blockedlog.lang b/htdocs/langs/zh_CN/blockedlog.lang
index d1d06b93eee..94a2c087f4f 100644
--- a/htdocs/langs/zh_CN/blockedlog.lang
+++ b/htdocs/langs/zh_CN/blockedlog.lang
@@ -24,8 +24,8 @@ logDOC_PREVIEW=Preview of a validated document in order to print or download
 logDOC_DOWNLOAD=Download of a validated document in order to print or send
 DataOfArchivedEvent=Full datas of archived event
 ImpossibleToReloadObject=Original object (type %s, id %s) not linked (see 'Full datas' column to get unalterable saved data)
-BlockedLogAreRequiredByYourCountryLegislation=Unalterable Logs module may be required by the legislation of your country. Disabling this module may render any future transactions invalid with respect to the law and the use of legal software as they can not be validated by a tax audit.
-BlockedLogActivatedBecauseRequiredByYourCountryLegislation=Unalterable Logs module was activated because of the legislation of your country. Disabling this module may render any future transactions invalid with respect to the law and the use of legal software as they cannot be validated by a tax audit.
+BlockedLogAreRequiredByYourCountryLegislation=您所在国家/地区的法律规定可能需要不能更改的日志模块。禁用此模块可能会使未来的任何交易在法律和合法软件的使用方面无效，因为它们无法通过税务审计进行验证。
+BlockedLogActivatedBecauseRequiredByYourCountryLegislation=根据您所在国家/地区的法律规定，不能更改的日志模块已被激活。禁用此模块可能会使未来的任何交易在法律和合法软件的使用方面无效，因为它们无法通过税务审计进行验证。
 BlockedLogDisableNotAllowedForCountry=List of countries where usage of this module is mandatory (just to prevent to disable the module by error, if your country is in this list, disable of module is not possible without editing this list first. Note also that enabling/disabling this module will keep a track into the unalterable log).
 OnlyNonValid=Non-valid
 TooManyRecordToScanRestrictFilters=Too many records to scan/analyze. Please restrict list with more restrictive filters.
diff --git a/htdocs/langs/zh_CN/bookmarks.lang b/htdocs/langs/zh_CN/bookmarks.lang
index 44a64499024..eb69a0ff0f9 100644
--- a/htdocs/langs/zh_CN/bookmarks.lang
+++ b/htdocs/langs/zh_CN/bookmarks.lang
@@ -1,23 +1,24 @@
-# Dolibarr language file - Source file is en_US - marque pages
-AddThisPageToBookmarks=将当前页面添加到书签
-Bookmark=书签
-Bookmarks=书签
-ListOfBookmarks=书签列表
-EditBookmarks=列出/编辑书签
-NewBookmark=新建书签
-ShowBookmark=显示书签
-OpenANewWindow=打开新标签
-ReplaceWindow=替换当前标签
-BookmarkTargetNewWindowShort=新标签
-BookmarkTargetReplaceWindowShort=当前标签
-BookmarkTitle=书签名称
-UrlOrLink=网址
-BehaviourOnClick=选择书签URL时的行为
-CreateBookmark=创建书签
-SetHereATitleForLink=为书签设置名称
-UseAnExternalHttpLinkOrRelativeDolibarrLink=使用外部/绝对链接（https://externalurl.com）或内部/相对链接（/mypage.php）. 您也可以使用电话号码如tel:0123456.
-ChooseIfANewWindowMustBeOpenedOnClickOnBookmark=选择链接的页面在目前标签或者新标签中打开
-BookmarksManagement=书签管理
-BookmarksMenuShortCut=Ctrl + shift + m
-NoBookmarks=未设置任何书签
-NoBookmarkFound=未发现书签
+# Dolibarr language file - Source file is en_US - marque pages / bookmarks
+
+AddThisPageToBookmarks = 将当前页面添加到书签
+BehaviourOnClick = 选择书签URL时的行为
+Bookmark = 书签
+Bookmarks = 书签
+BookmarkTargetNewWindowShort = 新标签
+BookmarkTargetReplaceWindowShort = 当前标签
+BookmarkTitle = 书签名称
+BookmarksManagement = 书签管理
+BookmarksMenuShortCut = Ctrl + shift + m
+ChooseIfANewWindowMustBeOpenedOnClickOnBookmark = 选择是否应在当前标签页或新标签页中打开链接页面
+CreateBookmark = 创建书签
+EditBookmarks = 列出/编辑书签
+ListOfBookmarks = 书签列表
+NewBookmark = 新建书签
+NoBookmarkFound = 未发现书签
+NoBookmarks = 未设置任何书签
+OpenANewWindow = 打开新标签页
+ReplaceWindow = 替换当前标签
+SetHereATitleForLink = 为书签设置名称
+ShowBookmark = 显示书签
+UrlOrLink = 网址
+UseAnExternalHttpLinkOrRelativeDolibarrLink = 使用外部/绝对链接（https://externalurl.com）或内部/相对链接（/mypage.php）. 您也可以使用电话号码如tel:0123456.
diff --git a/htdocs/langs/zh_CN/boxes.lang b/htdocs/langs/zh_CN/boxes.lang
index b0481b71e03..ee710fef78d 100644
--- a/htdocs/langs/zh_CN/boxes.lang
+++ b/htdocs/langs/zh_CN/boxes.lang
@@ -7,8 +7,8 @@ BoxProductsAlertStock=产品库存预警
 BoxLastProductsInContract=最近签合同的 %s 种产品/服务
 BoxLastSupplierBills=最近新增的供应商发票
 BoxLastCustomerBills=最近新增的客户发票
-BoxOldestUnpaidCustomerBills=最早未支付客户发票
-BoxOldestUnpaidSupplierBills=最早未支付供应商发票
+BoxOldestUnpaidCustomerBills=最早的未支付客户发票
+BoxOldestUnpaidSupplierBills=最早的未支付供应商发票
 BoxLastProposals=最近新增的报价单
 BoxLastProspects=最近修改的准客户
 BoxLastCustomers=最近修改的客户
@@ -20,36 +20,36 @@ BoxLastContacts=最近新增的联系人/地址
 BoxLastMembers=最近新增的会员
 BoxLastModifiedMembers=最近修改的会员
 BoxLastMembersSubscriptions=最近新增的会员订阅
-BoxFicheInter=最近新增的介入措施
+BoxFicheInter=最近新增的现场服务
 BoxCurrentAccounts=打开财务会计账单
 BoxTitleMemberNextBirthdays=本月生日（会员）
 BoxTitleMembersByType=按类型和状态划分的会员
 BoxTitleMembersByTags=按标签和状态分类的会员
 BoxTitleMembersSubscriptionsByYear=按年份划分的会员订阅量
 BoxTitleLastRssInfos=来自 %s 的最新的 %s 条新闻
-BoxTitleLastProducts=产品/服务：最新%s编辑过的
+BoxTitleLastProducts=产品/服务：最近修改的 %s 种
 BoxTitleProductsAlertStock=产品：库存预警
 BoxTitleLastSuppliers=最近记录的 %s 位供应商
-BoxTitleLastModifiedSuppliers=供应商：最新%s编辑过的
-BoxTitleLastModifiedCustomers=客户：最新%s编辑过的
+BoxTitleLastModifiedSuppliers=供应商：最近修改的 %s 位
+BoxTitleLastModifiedCustomers=客户：最近修改的 %s 位
 BoxTitleLastCustomersOrProspects=最近新增的 %s 位客户或准客户
 BoxTitleLastCustomerBills=最近修改的 %s 张客户发票
 BoxTitleLastSupplierBills=最近修改的 %s 张供应商发票
-BoxTitleLastModifiedProspects=准客户：最新%s编辑过的
+BoxTitleLastModifiedProspects=准客户：最后修改的 %s 位
 BoxTitleLastModifiedMembers=最近新增的 %s 位会员
-BoxTitleLastFicheInter=最近修改的 %s 条干预措施
-BoxTitleOldestUnpaidCustomerBills=客户发票：最早%s未支付的
-BoxTitleOldestUnpaidSupplierBills=供应商发票：最早%s未支付的
+BoxTitleLastFicheInter=最近修改的 %s 条现场服务
+BoxTitleOldestUnpaidCustomerBills=客户发票：最早的 %s 笔未支付的
+BoxTitleOldestUnpaidSupplierBills=供应商发票：最早的 %s 笔未支付的
 BoxTitleCurrentAccounts=打开帐户：余额
 BoxTitleSupplierOrdersAwaitingReception=等待收货的采购订单
-BoxTitleLastModifiedContacts=联系人/地址：最新%s编辑过的
-BoxMyLastBookmarks=书签：最新的%s
-BoxOldestExpiredServices=执行中的逾期时间最长的服务
-BoxOldestActions=Oldest events to do
+BoxTitleLastModifiedContacts=联系人/地址：最后修改的 %s 位
+BoxMyLastBookmarks=书签：最近的 %s
+BoxOldestExpiredServices=最早开始的活动已过期服务
+BoxOldestActions=最早开始的事件
 BoxLastExpiredServices=最近已过期的活动服务的最初 %s 名联系人
 BoxTitleLastActionsToDo=最近的 %s 个操作
-BoxTitleOldestActionsToDo=最久的 %s 个未完成事件
-BoxTitleFutureActions=The next %s upcoming events
+BoxTitleOldestActionsToDo=最早开始但未完成的 %s 个事件
+BoxTitleFutureActions=接下来的 %s 项事件
 BoxTitleLastContracts=最近修改的 %s 份合同
 BoxTitleLastModifiedDonations=最近修改的 %s 笔捐献
 BoxTitleLastModifiedExpenses=最近修改的 %s 份费用报销单
@@ -59,26 +59,26 @@ BoxTitleLastOutstandingBillReached=超过最大未偿付额的客户
 BoxGlobalActivity=全局活动（发票、报价单、订单）
 BoxGoodCustomers=优质客户
 BoxTitleGoodCustomers=%s 优质客户
-BoxScheduledJobs=计划好的工作
-BoxTitleFunnelOfProspection=Lead funnel
-FailedToRefreshDataInfoNotUpToDate=更新RSS流量失败，最新成功更新日期：%s
-LastRefreshDate=最后刷新日期
+BoxScheduledJobs=计划任务
+BoxTitleFunnelOfProspection=商机漏斗
+FailedToRefreshDataInfoNotUpToDate=刷新 RSS 流量失败。最近成功刷新日期：%s
+LastRefreshDate=最近刷新日期
 NoRecordedBookmarks=未设置任何书签。
 ClickToAdd=点此添加
-NoRecordedCustomers=空空如也——没有记录
+NoRecordedCustomers=没有已记录的客户
 NoRecordedContacts=无联系人记录
-NoActionsToDo=无待办事项
+NoActionsToDo=无待办操作
 NoRecordedOrders=没有已记录的销售订单
 NoRecordedProposals=没有已记录的报价单
 NoRecordedInvoices=没有已记录的客户发票
-NoUnpaidCustomerBills=没有未付款的顾客发票
+NoUnpaidCustomerBills=没有未付款的客户发票
 NoUnpaidSupplierBills=没有未付款的供应商发票
 NoModifiedSupplierBills=没有已记录的供应商发票
-NoRecordedProducts=空空如也——没有产品/服务记录
-NoRecordedProspects=空空如也——没有潜在客户记录
+NoRecordedProducts=没有已记录的产品/服务
+NoRecordedProspects=没有已记录的准客户
 NoContractedProducts=没有签约产品/服务
 NoRecordedContracts=没有合同记录
-NoRecordedInterventions=空空如也——没有干预措施的记录
+NoRecordedInterventions=没有现场服务记录
 BoxLatestSupplierOrders=最近新增的采购订单
 BoxLatestSupplierOrdersAwaitingReception=最近新增的采购订单（等待接收）
 NoSupplierOrder=没有已记录的采购订单
@@ -89,58 +89,58 @@ BoxSuppliersOrdersPerMonth=每月采购订单
 BoxProposalsPerMonth=每月报价
 NoTooLowStockProducts=没有产品低于库存限制
 BoxProductDistribution=产品/服务分布
-ForObject=On %s
-BoxTitleLastModifiedSupplierBills=供应商发票：最新%s编辑过的
-BoxTitleLatestModifiedSupplierOrders=采购订单：最新%s编辑过的
-BoxTitleLastModifiedCustomerBills=客户发票：最新%s编辑过的
-BoxTitleLastModifiedCustomerOrders=销售订单：最新%s编辑过的
+ForObject=基于 %s
+BoxTitleLastModifiedSupplierBills=供应商发票：最后修改的 %s 张
+BoxTitleLatestModifiedSupplierOrders=采购订单：最后修改的 %s 份
+BoxTitleLastModifiedCustomerBills=客户发票：最后修改的 %s 张
+BoxTitleLastModifiedCustomerOrders=销售订单：最后修改的 %s 份
 BoxTitleLastModifiedPropals=最近修改的 %s 份报价单
 BoxTitleLatestModifiedJobPositions=最近修改的 %s 个职位
 BoxTitleLatestModifiedCandidatures=最近修改的 %s 个职位申请
 ForCustomersInvoices=客户发票
 ForCustomersOrders=客户订单
 ForProposals=报价
-LastXMonthRolling=最后 %s 月波动
-ChooseBoxToAdd=点击下拉菜单选择相应视图并添加到你的看板
-BoxAdded=插件已添加到仪表板中
+LastXMonthRolling=最近 %s 个月的波动
+ChooseBoxToAdd=将小部件添加到您的看板
+BoxAdded=小部件已添加到您的看板中
 BoxTitleUserBirthdaysOfMonth=本月生日（用户）
-BoxLastManualEntries=手工输入或没有源文档的最新会计记录
-BoxTitleLastManualEntries=手工输入或没有源文档的%s最新记录
+BoxLastManualEntries=最近手动输入或没有源文档的会计记录
+BoxTitleLastManualEntries=最近手动输入或没有源文档的 %s 笔记录
 NoRecordedManualEntries=会计没有手动输入记录
 BoxSuspenseAccount=用暂记账户清点会计业务
 BoxTitleSuspenseAccount=未分配的行数量
 NumberOfLinesInSuspenseAccount=暂记账户中的行数量
 SuspenseAccountNotDefined=暂记账户未定义
-BoxLastCustomerShipments=最近客户发货
-BoxTitleLastCustomerShipments=最近新增的 %s 份客户发运单
+BoxLastCustomerShipments=最后一份客户发货单
+BoxTitleLastCustomerShipments=最近新增的 %s 份客户发货单
 BoxTitleLastLeaveRequests=最近修改的 %s 份请假申请
-NoRecordedShipments=没有已记录的客户发货
+NoRecordedShipments=没有已记录的客户发货单
 BoxCustomersOutstandingBillReached=已达到未偿付限额的客户
 # Pages
-UsersHome=用户和群组主页
-MembersHome=会员资格主页
-ThirdpartiesHome=合作方主页
-productindex=Home products and services
-mrpindex=Home MRP
-commercialindex=Home commercial
-projectsindex=Home projects
-invoiceindex=Home invoices
-hrmindex=Home invoices
-TicketsHome=服务工单主页
-stockindex=库存主页
-sendingindex=Home shippings
-receptionindex=收货主页
-activityindex=Home activity
-proposalindex=Home proposal
-ordersindex=Home sale orders
-orderssuppliersindex=Home purchase orders
-contractindex=Home contracts
-interventionindex=Home interventions
-suppliersproposalsindex=Home suppliers proposals
-donationindex=Home donations
-specialexpensesindex=Home specials expenses
-expensereportindex=Home expensereport
-mailingindex=Home mailing
-opensurveyindex=Home opensurvey
-AccountancyHome=会计主页
+UsersHome=用户和组的主页
+MembersHome=会员资格的主页
+ThirdpartiesHome=合作方的主页
+productindex=产品和服务的主页
+mrpindex=物料需求计划的主页
+commercialindex=商务的主页
+projectsindex=项目的主页
+invoiceindex=发票的主页
+hrmindex=发票的主页
+TicketsHome=服务工单的主页
+stockindex=库存的主页
+sendingindex=发货的主页
+receptionindex=收货的主页
+activityindex=操作的主页
+proposalindex=报价单的主页
+ordersindex=销售订单的主页
+orderssuppliersindex=采购订单的主页
+contractindex=合同的主页
+interventionindex=现场服务的主页
+suppliersproposalsindex=供应商报价单的主页
+donationindex=捐献的主页
+specialexpensesindex=特殊费用的主页
+expensereportindex=费用报销单的主页
+mailingindex=邮件的主页
+opensurveyindex=开放调查的主页
+AccountancyHome=会计的主页
 ValidatedProjects=已验证的项目
diff --git a/htdocs/langs/zh_CN/cashdesk.lang b/htdocs/langs/zh_CN/cashdesk.lang
index ebb03a518a2..cd7f137e979 100644
--- a/htdocs/langs/zh_CN/cashdesk.lang
+++ b/htdocs/langs/zh_CN/cashdesk.lang
@@ -17,7 +17,7 @@ RestartSelling=回去就卖
 SellFinished=销售完成
 PrintTicket=打印服务工单
 SendTicket=发送服务工单
-NoProductFound=空空如也——没有找到项目
+NoProductFound=没有找到文章
 ProductFound=找到产品
 NoArticle=没有项目
 Identification=验证身份
@@ -102,7 +102,7 @@ CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal numb
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
 SaleStartedAt=Sale started at %s
-ControlCashOpening=Open the "Control cash box" popup when opening the POS
+ControlCashOpening=打开POS时弹出“控制钱箱”窗口
 CloseCashFence=Close cash box control
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
@@ -110,11 +110,11 @@ OrderPrinterToUse=Order printer to use
 MainTemplateToUse=Main template to use
 OrderTemplateToUse=Order template to use
 BarRestaurant=Bar Restaurant
-AutoOrder=Order by the customer himself
+AutoOrder=由客户本人下单
 RestaurantMenu=菜单
-CustomerMenu=Customer menu
-ScanToMenu=Scan QR code to see the menu
-ScanToOrder=Scan QR code to order
+CustomerMenu=客户菜单
+ScanToMenu=扫描二维码查看菜单
+ScanToOrder=扫描二维码订购
 Appearance=Appearance
 HideCategoryImages=Hide Category Images
 HideProductImages=Hide Product Images
@@ -136,12 +136,12 @@ PrintWithoutDetails=Print without details
 YearNotDefined=Year is not defined
 TakeposBarcodeRuleToInsertProduct=Barcode rule to insert product
 TakeposBarcodeRuleToInsertProductDesc=Rule to extract the product reference + a quantity from a scanned barcode.<br>If empty (default value), application will use the full barcode scanned to find the product.<br><br>If defined, syntax must be:<br><b>ref:NB+qu:NB+qd:NB+other:NB</b><br>where NB is the number of characters to use to extract data from the scanned barcode with: <ul><li><b>ref</b> : product reference</li><li><b>qu</b> : quantity to set when inserting item (units)<l/i><li><b>qd</b> : quantity to set when inserting item (decimals)</li><li><b>other</b> : others characters</li></ul>
-AlreadyPrinted=Already printed
-HideCategories=Hide categories
+AlreadyPrinted=已打印
+HideCategories=隐藏类别
 HideStockOnLine=在行上隐藏库存
 ShowOnlyProductInStock=显示库存产品
-ShowCategoryDescription=Show category description
-ShowProductReference=Show reference of products
+ShowCategoryDescription=显示类别描述
+ShowProductReference=显示产品参考
 UsePriceHT=Use price excl. taxes and not price incl. taxes
 TerminalName=Terminal %s
 TerminalNameDesc=Terminal name
diff --git a/htdocs/langs/zh_CN/commercial.lang b/htdocs/langs/zh_CN/commercial.lang
index 1ed20409376..7e6c7d71b8f 100644
--- a/htdocs/langs/zh_CN/commercial.lang
+++ b/htdocs/langs/zh_CN/commercial.lang
@@ -18,19 +18,19 @@ TaskRDVWith=与 %s 会议
 ShowTask=显示任务
 ShowAction=显示事件
 ActionsReport=事件报告
-ThirdPartiesOfSaleRepresentative=合作方与销售代表
-SaleRepresentativesOfThirdParty=合作方销售代表
+ThirdPartiesOfSaleRepresentative=具有销售代表的合作方
+SaleRepresentativesOfThirdParty=合作方的销售代表
 SalesRepresentative=销售代表
 SalesRepresentatives=销售代表
-SalesRepresentativeFollowUp=销售代表 (跟进)
-SalesRepresentativeSignature=销售代表 (签字)
+SalesRepresentativeFollowUp=销售代表（跟进）
+SalesRepresentativeSignature=销售代表（签字）
 NoSalesRepresentativeAffected=未分配特定的销售代表
 ShowCustomer=显示客户
 ShowProspect=显示准客户
 ListOfProspects=准客户列表
 ListOfCustomers=客户列表
 LastDoneTasks=最近完成的 %s 个操作
-LastActionsToDo=最早的 %s 未完成动作
+LastActionsToDo=最早的 %s 个尚未完成的操作
 DoneAndToDoActions=已完成和未完成任务
 DoneActions=已完成的动作
 ToDoActions=不完整的事件
@@ -54,13 +54,13 @@ ActionAC_PROP=通过邮件发送报价
 ActionAC_EMAIL=发送电子邮件
 ActionAC_EMAIL_IN=电子邮件的接收
 ActionAC_RDV=会议
-ActionAC_INT=干预
+ActionAC_INT=现场服务
 ActionAC_FAC=通过邮件发送客户发票
 ActionAC_REL=通过邮件发送客户发票（提醒）
 ActionAC_CLO=关闭
 ActionAC_EMAILING=发送群发电子邮件
 ActionAC_COM=Send sales order by mail
-ActionAC_SHIP=发送发货单
+ActionAC_SHIP=通过邮件发送货运单
 ActionAC_SUP_ORD=通过邮件发送采购订单
 ActionAC_SUP_INV=通过邮件发送供应商发票
 ActionAC_OTH=其他
@@ -76,14 +76,14 @@ NoLimit=没有限制
 ToOfferALinkForOnlineSignature=链接在线签名
 WelcomeOnOnlineSignaturePageProposal=欢迎来到批准来自%s的报价单的页面
 WelcomeOnOnlineSignaturePageContract=Welcome to %s Contract PDF Signing Page
-WelcomeOnOnlineSignaturePageFichinter=Welcome to %s Intervention PDF Signing Page
-ThisScreenAllowsYouToSignDocFromProposal=此屏幕允许您批准并签署或拒绝报价单/商业提案书
+WelcomeOnOnlineSignaturePageFichinter=欢迎来到 %s 现场服务PDF签名页
+ThisScreenAllowsYouToSignDocFromProposal=此界面允许您接受并签署或者拒绝报价/报价单
 ThisScreenAllowsYouToSignDocFromContract=This screen allow you to sign contract on PDF format online.
-ThisScreenAllowsYouToSignDocFromFichinter=This screen allow you to sign intervention on PDF format online.
+ThisScreenAllowsYouToSignDocFromFichinter=此界面允许您在线签署 PDF 格式的现场服务。
 ThisIsInformationOnDocumentToSignProposal=This is information on document to accept or refuse
 ThisIsInformationOnDocumentToSignContract=This is information on contract to sign
-ThisIsInformationOnDocumentToSignFichinter=This is information on intervention to sign
-SignatureProposalRef=签署报价单/商业提案书%s
+ThisIsInformationOnDocumentToSignFichinter=这是有关现场服务签名的信息
+SignatureProposalRef=签署报价/报价单 %s
 SignatureContractRef=Signature of contract %s
-SignatureFichinterRef=Signature of intervention %s
+SignatureFichinterRef=现场服务 %s 的签名
 FeatureOnlineSignDisabled=禁用联机签名的功能或在启用功能之前生成的文档
diff --git a/htdocs/langs/zh_CN/companies.lang b/htdocs/langs/zh_CN/companies.lang
index 7cac75ba2aa..25cf52f06c4 100644
--- a/htdocs/langs/zh_CN/companies.lang
+++ b/htdocs/langs/zh_CN/companies.lang
@@ -43,13 +43,13 @@ ThirdPartyType=合作方类型
 Individual=私营个体
 ToCreateContactWithSameName=会自动在合作方下创建与合作方具有相同信息的联系人/地址。在大多数情况下，即使您的合作方是自然人，单独创建合作方就足够了。
 ParentCompany=母公司
-Subsidiaries=附属公司
+Subsidiaries=子公司
 ReportByMonth=每月报告
 ReportByCustomers=每个客户的报告
 ReportByThirdparties=根据合作方的报表
 ReportByQuarter=按费率报表
 CivilityCode=文明守则
-RegisteredOffice=注册给办公室
+RegisteredOffice=已注册的办事处
 Lastname=姓氏
 Firstname=名字
 RefEmployee=员工参考
@@ -369,12 +369,12 @@ ShowContact=联系地址
 ContactsAllShort=全部 (不筛选)
 ContactType=联系人角色
 ContactForOrders=订单的联系人
-ContactForOrdersOrShipments=订单或运输联系人
+ContactForOrdersOrShipments=订单或发货单的联系人
 ContactForProposals=报价的联系人
 ContactForContracts=合同的联系人
 ContactForInvoices=发票的联系人
 NoContactForAnyOrder=不是任何订单的联系人
-NoContactForAnyOrderOrShipments=这种联系是不是任何订单或装运联系
+NoContactForAnyOrderOrShipments=此联系人不是任何订单或发货单的联系人
 NoContactForAnyProposal=不是任何报价单的联系人
 NoContactForAnyContract=不是任何合同的联系人
 NoContactForAnyInvoice=不是任何发票的联系人
@@ -389,7 +389,7 @@ VATIntraCheck=支票
 VATIntraCheckDesc=增值税 ID 必须包含国家/地区前缀。链接<b> %s </b>  使用欧洲增值税检查服务 (VIES)，该服务需要从 Dolibarr 服务器访问互联网。
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
 VATIntraCheckableOnEUSite=在欧盟委员会网站上查看共同体内增值税 ID
-VATIntraManualCheck=您还可以在欧盟委员会网站上手动查看<a href="%s" target="_blank" rel="noopener noreferrer"> %s </a> 
+VATIntraManualCheck=您还可以在欧盟委员会网站上手动查看 <a href="%s" target="_blank" rel="noopener noreferrer"> %s </a>
 ErrorVATCheckMS_UNAVAILABLE=无法检查。会员国家 (%s) 不提供检查服务。
 NorProspectNorCustomer=不是准客户，也不是客户
 JuridicalStatus=企业实体类型
@@ -442,7 +442,7 @@ ImportDataset_company_3=合作方银行账户
 ImportDataset_company_4=合作方销售代表（将销售代表/用户分配给公司）
 PriceLevel=价格水平
 PriceLevelLabels=价格水平标签
-DeliveryAddress=送货地址
+DeliveryAddress=交货地址
 AddAddress=添加地址
 SupplierCategory=供应商类别
 JuridicalStatus200=独立
diff --git a/htdocs/langs/zh_CN/compta.lang b/htdocs/langs/zh_CN/compta.lang
index 7f07235c7ef..4614c661cdc 100644
--- a/htdocs/langs/zh_CN/compta.lang
+++ b/htdocs/langs/zh_CN/compta.lang
@@ -138,7 +138,7 @@ LastPaymentForDepositShort=最近新增的 %s %s 张存款单
 NewCheckReceipt=新优惠
 NewCheckDeposit=New deposit slip
 NewCheckDepositOn=创建于账户上的存款收据：%s的
-NoWaitingChecks=空空如也——没有等待支票存款
+NoWaitingChecks=没有待存入的支票。
 NoWaitingPaymentForDeposit=No %s payment awaiting deposit.
 DateChequeReceived=检查接收日期
 DatePaymentReceived=文档接收日期
@@ -214,10 +214,10 @@ LT2ReportByQuartersES=按 IRPF 税率报告
 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=- 对于服务，报告包括根据付款日期实际收到或支付的付款的增值税。
-RulesVATInProducts=- For material assets, the report includes the VAT on the basis of the date of payment.
+RulesVATInProducts=- 对于实物资产，报告包含基于付款日期的增值税。
 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=注：对于实物资产，它应该使用的交货日期将更加公平。
+RulesVATDueProducts=- 对于实物资产，报告包括基于发票日期的到期发票的增值税。
+OptionVatInfoModuleComptabilite=注：对于实物资产，采用交货日期更加公平。
 ThisIsAnEstimatedValue=这是基于业务事件而非最终分类帐表的预览，因此最终结果可能与此预览值不同
 PercentOfInvoice=%%/发票
 NotUsedForGoods=未使用的货物
@@ -253,6 +253,8 @@ CalculationMode=计算模式
 AccountancyJournal=科目代码日记账
 ACCOUNTING_VAT_SOLD_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for VAT on sales (used if not defined on VAT dictionary setup)
 ACCOUNTING_VAT_BUY_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for VAT on purchases (used if not defined on VAT dictionary setup)
+ACCOUNTING_REVENUESTAMP_SOLD_ACCOUNT=Account (from the Chart Of Account) to be used for the revenue stamp on sales
+ACCOUNTING_REVENUESTAMP_BUY_ACCOUNT=Account (from the Chart Of Account) to be used for the revenue stamp on purchases
 ACCOUNTING_VAT_PAY_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for paying VAT
 ACCOUNTING_VAT_BUY_REVERSE_CHARGES_CREDIT=Account (from the Chart Of Account) to be used as the default account for VAT on purchases for reverse charges (Credit)
 ACCOUNTING_VAT_BUY_REVERSE_CHARGES_DEBIT=Account (from the Chart Of Account) to be used as the default account for VAT on purchases for reverse charges (Debit)
@@ -270,7 +272,7 @@ OtherCountriesCustomersReport=国外客户报道
 BasedOnTwoFirstLettersOfVATNumberBeingDifferentFromYourCompanyCountry=基于增值税号码的两个首字母与您公司的国家/地区代码不同
 SameCountryCustomersWithVAT=全国顾客报告
 BasedOnTwoFirstLettersOfVATNumberBeingTheSameAsYourCompanyCountry=根据增值税号码的两个首字母与您自己公司的国家/地区代码相同
-LinkedFichinter=链接到干预
+LinkedFichinter=链接到现场服务
 ImportDataset_tax_contrib=社会/财政税
 ImportDataset_tax_vat=增值税付款
 ErrorBankAccountNotFound=错误：银行账号未发现
diff --git a/htdocs/langs/zh_CN/contracts.lang b/htdocs/langs/zh_CN/contracts.lang
index 1ce017e493c..bbe8bb312f8 100644
--- a/htdocs/langs/zh_CN/contracts.lang
+++ b/htdocs/langs/zh_CN/contracts.lang
@@ -5,7 +5,7 @@ AllContracts=所有合同
 ContractCard=合同
 ContractStatusNotRunning=不运行
 ContractStatusDraft=草稿
-ContractStatusValidated=验证
+ContractStatusValidated=已验证
 ContractStatusClosed=禁用
 ServiceStatusInitial=不运行
 ServiceStatusRunning=运行
@@ -72,7 +72,7 @@ BoardExpiredServices=Services expired
 BoardExpiredServicesShort=Services expired
 ServiceStatus=服务现状
 DraftContracts=合同草稿
-CloseRefusedBecauseOneServiceActive=Contract can't be closed as there is at least one open service on it
+CloseRefusedBecauseOneServiceActive=合同无法被关闭，因为合同上至少还有一项未完成的服务
 ActivateAllContracts=激活所有合同行
 CloseAllContracts=关闭所有合同线
 DeleteContractLine=删除线合同
diff --git a/htdocs/langs/zh_CN/cron.lang b/htdocs/langs/zh_CN/cron.lang
index 0c44ba8e0ca..96c4269e7fe 100644
--- a/htdocs/langs/zh_CN/cron.lang
+++ b/htdocs/langs/zh_CN/cron.lang
@@ -25,10 +25,10 @@ CronLastResult=最新结果代码
 CronCommand=命令
 CronList=计划任务
 CronDelete=删除计划任务
-CronConfirmDelete=您确定要删除这些预定作业吗？
+CronConfirmDelete=您确定要删除这些计划任务吗？
 CronExecute=Launch now
-CronConfirmExecute=您确定要立即执行这些预定作业吗？
-CronInfo=计划作业模块允许计划作业以自动执行它们。也可以手动启动作业。
+CronConfirmExecute=您确定要立即执行这些计划任务吗？
+CronInfo=计划任务模块允许自动定时执行作业。也可以手动启动作业。
 CronTask=工作
 CronNone=无
 CronDtStart=之前
@@ -60,7 +60,7 @@ CronErrEndDateStartDt=结束日期不能早过开始日期啊，时光不能倒
 StatusAtInstall=模块安装时的状态
 CronStatusActiveBtn=Enable scheduling
 CronStatusInactiveBtn=禁用
-CronTaskInactive=This job is disabled (not scheduled)
+CronTaskInactive=该任务已禁用（未安排）
 CronId=Id
 CronClassFile=带有类的文件名
 CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For example to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is<br><i>product</i>
@@ -78,7 +78,7 @@ CronType_method=调用PHP类的方法
 CronType_command=命令行
 CronCannotLoadClass=无法加载类文件%s（使用类%s）
 CronCannotLoadObject=已加载类文件%s，但未找到对象%s
-UseMenuModuleToolsToAddCronJobs=Go into menu "<a href="%s">Home - Admin tools - Scheduled jobs</a>" to see and edit scheduled jobs.
+UseMenuModuleToolsToAddCronJobs=进入菜单“<a href="%s">主页 - 管理工具 - 计划任务</a>”查看和编辑计划任务。
 JobDisabled=岗位无效
 MakeLocalDatabaseDumpShort=本地数据库备份
 MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql', 'pgsql', 'auto'), 1, 'auto' or filename to build, number of backup files to keep
@@ -94,7 +94,7 @@ EmailIfError=Email for warning on error
 ErrorInBatch=Error when running the job %s
 
 # Cron Boxes
-LastExecutedScheduledJob=Last executed scheduled job
-NextScheduledJobExecute=Next scheduled job to execute
-NumberScheduledJobError=Number of scheduled jobs in error
-NumberScheduledJobNeverFinished=Number of scheduled jobs never finished
+LastExecutedScheduledJob=最后执行的计划任务
+NextScheduledJobExecute=下一步要执行的计划任务
+NumberScheduledJobError=报错的计划任务数
+NumberScheduledJobNeverFinished=从未完成的计划作业数量
diff --git a/htdocs/langs/zh_CN/datapolicy.lang b/htdocs/langs/zh_CN/datapolicy.lang
index 2b8511c942e..447376ca19c 100644
--- a/htdocs/langs/zh_CN/datapolicy.lang
+++ b/htdocs/langs/zh_CN/datapolicy.lang
@@ -23,7 +23,7 @@ Module4100Desc = 管理数据隐私的模块（符合GDPR）
 #
 datapolicySetup = 数据隐私政策模块设置
 Deletion = 删除数据
-datapolicySetupPage = Depending of laws of your countries (Example <a href="http://www.privacy-regulation.eu/en/5.htm" target="_blank" rel="noopener noreferrer external">Article 5</a> of the GDPR), personal data must be kept for a period not exceeding that necessary for the purposes for which they were collected, except for archival purposes.<br>The deletion will be done automatically after a certain duration without event (the duration which you will have indicated below).
+datapolicySetupPage = 根据您所在国家/地区的法律（例如 GDPR <a href="http://www.privacy-regulation.eu/en/5.htm" target="_blank" rel="noopener noreferrer external">第 5 条 </a>），个人数据的保存期限不得超过超出收集目的所需的数量（需要归档的除外）。 <br> 在没有事件发生的一段时间内（您将在下面指定的持续时间），删除将自动完成。
 NB_MONTHS = %s月
 ONE_YEAR = 1年
 NB_YEARS = %s年
diff --git a/htdocs/langs/zh_CN/deliveries.lang b/htdocs/langs/zh_CN/deliveries.lang
index 0802e2489ee..fed02228f4b 100644
--- a/htdocs/langs/zh_CN/deliveries.lang
+++ b/htdocs/langs/zh_CN/deliveries.lang
@@ -1,33 +1,33 @@
 # Dolibarr language file - Source file is en_US - deliveries
 Delivery=交货
-DeliveryRef=送达编号
+DeliveryRef=交货回执编号
 DeliveryCard=库存收据
-DeliveryOrder=交货回单
+DeliveryOrder=交货回执
 DeliveryDate=交货日期
-CreateDeliveryOrder=生成交货回单
-DeliveryStateSaved=交货状态保存
-SetDeliveryDate=送货日期设置
-ValidateDeliveryReceipt=验证交货回单
-ValidateDeliveryReceiptConfirm=您确定要验证此交货回单吗？
-DeleteDeliveryReceipt=删除交货回单
-DeleteDeliveryReceiptConfirm=您确定要删除交货回单 <b> %s </b> 吗？
-DeliveryMethod=运输方式
+CreateDeliveryOrder=生成交货回执
+DeliveryStateSaved=交货状态已保存
+SetDeliveryDate=设置货运日期
+ValidateDeliveryReceipt=验证交货回执
+ValidateDeliveryReceiptConfirm=您确定要验证此交货回执吗？
+DeleteDeliveryReceipt=删除交货回执
+DeleteDeliveryReceiptConfirm=您确定要删除交货回执 <b> %s </b> 吗？
+DeliveryMethod=交货方式
 TrackingNumber=运单号码
-DeliveryNotValidated=交付未验证
+DeliveryNotValidated=交货回执未验证
 StatusDeliveryCanceled=已取消
 StatusDeliveryDraft=草稿
 StatusDeliveryValidated=已接收
 # merou PDF model
 NameAndSignature=名字和签名：
 ToAndDate=To___________________________________ on ____/_____/__________
-GoodStatusDeclaration=上述货物完好并已签收，
+GoodStatusDeclaration=已收到上述货物，且货物状况良好，
 Deliverer=送货员：
-Sender=发送方
-Recipient=接收方
+Sender=发货人
+Recipient=收货人
 ErrorStockIsNotEnough=库存不足
-Shippable=可运输
-NonShippable=不可运输
-ShowShippableStatus=显示运输的状态
-ShowReceiving=显示交货回单
+Shippable=可运送
+NonShippable=无法运送
+ShowShippableStatus=显示运送状态
+ShowReceiving=显示交货回执
 NonExistentOrder=不存在的订单
 StockQuantitiesAlreadyAllocatedOnPreviousLines = 已经分配到前几行的的库存数量
diff --git a/htdocs/langs/zh_CN/dict.lang b/htdocs/langs/zh_CN/dict.lang
index 85817b3b5b1..4d07e5ecebe 100644
--- a/htdocs/langs/zh_CN/dict.lang
+++ b/htdocs/langs/zh_CN/dict.lang
@@ -21,7 +21,7 @@ CountryNL=荷兰
 CountryHU=匈牙利
 CountryRU=俄国
 CountrySE=瑞典
-CountryCI=Ivory Coast
+CountryCI=象牙海岸
 CountrySN=塞内加尔
 CountryAR=阿根廷
 CountryCM=喀麦隆
@@ -116,7 +116,7 @@ CountryHM=赫德岛和麦当劳
 CountryVA=罗马教廷（梵蒂冈城国）
 CountryHN=洪都拉斯
 CountryHK=香港
-CountryIS=Iceland
+CountryIS=冰岛
 CountryIN=印度
 CountryID=印度尼西亚
 CountryIR=伊朗
@@ -131,13 +131,13 @@ CountryKI=基里巴斯
 CountryKP=北朝鲜
 CountryKR=韩国
 CountryKW=科威特
-CountryKG=Kyrgyzstan
+CountryKG=吉尔吉斯斯坦
 CountryLA=老挝
 CountryLV=拉脱维亚
 CountryLB=黎巴嫩
 CountryLS=莱索托
 CountryLR=利比里亚
-CountryLY=Libya
+CountryLY=利比亚
 CountryLI=列支敦士登
 CountryLT=立陶宛
 CountryLU=卢森堡
@@ -160,7 +160,7 @@ CountryMD=摩尔多瓦
 CountryMN=蒙古
 CountryMS=蒙特塞拉特
 CountryMZ=莫桑比克
-CountryMM=Myanmar (Burma)
+CountryMM=缅甸
 CountryNA=纳米比亚
 CountryNR=瑙鲁
 CountryNP=尼泊尔
@@ -223,7 +223,7 @@ CountryTO=汤加
 CountryTT=特里尼达和多巴哥
 CountryTR=土耳其
 CountryTM=土库曼斯坦
-CountryTC=Turks and Caicos Islands
+CountryTC=特克斯和凯科斯群岛
 CountryTV=图瓦卢
 CountryUG=乌干达
 CountryUA=乌克兰
@@ -247,7 +247,7 @@ CountryJE=泽西
 CountryME=黑山
 CountryBL=圣巴泰勒米
 CountryMF=圣马丁
-CountryXK=Kosovo
+CountryXK=科索沃
 
 ##### Civilities #####
 CivilityMME=夫人
@@ -255,8 +255,8 @@ CivilityMMEShort=夫人
 CivilityMR=先生
 CivilityMRShort=先生
 CivilityMLE=女士
-CivilityMTRE=尊上（花千骨看多了）
-CivilityDR=医生
+CivilityMTRE=老师
+CivilityDR=博士
 ##### Currencies #####
 Currencyeuros=欧元
 CurrencyAUD=澳元
@@ -280,7 +280,7 @@ CurrencySingMGA=Ariary
 CurrencyMUR=毛里求斯卢比
 CurrencySingMUR=毛里求斯卢比
 CurrencyNOK=挪威克朗
-CurrencySingNOK=Norwegian kronas
+CurrencySingNOK=挪威克朗
 CurrencyTND=突尼斯第纳尔
 CurrencySingTND=突尼斯第纳尔
 CurrencyUSD=美元
@@ -293,7 +293,7 @@ CurrencyXOF=非洲法郎西非国家中央银行
 CurrencySingXOF=郎西非国家中央银行
 CurrencyXPF=CFP法郎
 CurrencySingXPF=太平洋法郎
-CurrencyCentEUR=cents
+CurrencyCentEUR=美分
 CurrencyCentSingEUR=美分
 CurrencyCentINR=派萨
 CurrencyCentSingINR=派萨
@@ -301,9 +301,9 @@ CurrencyThousandthSingTND=千分之一
 #### Input reasons #####
 DemandReasonTypeSRC_INTE=因特网
 DemandReasonTypeSRC_CAMP_MAIL=发邮件
-DemandReasonTypeSRC_CAMP_EMAIL=通过电子邮件发送运动
-DemandReasonTypeSRC_CAMP_PHO=电话运动
-DemandReasonTypeSRC_CAMP_FAX=传真运动
+DemandReasonTypeSRC_CAMP_EMAIL=邮寄活动
+DemandReasonTypeSRC_CAMP_PHO=电话活动
+DemandReasonTypeSRC_CAMP_FAX=传真活动
 DemandReasonTypeSRC_COMM=商务联系人
 DemandReasonTypeSRC_SHOP=商店联系人
 DemandReasonTypeSRC_WOM=口碑
@@ -333,7 +333,7 @@ PaperFormatCAP5=加拿大 P5格式
 PaperFormatCAP6=加拿大 P6格式
 #### Expense report categories ####
 ExpAutoCat=汽车
-ExpCycloCat=助力车
+ExpCycloCat=电单车
 ExpMotoCat=摩托车
 ExpAuto3CV=3 CV
 ExpAuto4CV=4 CV
@@ -345,18 +345,18 @@ ExpAuto9CV=9 CV
 ExpAuto10CV=10 CV
 ExpAuto11CV=11 CV
 ExpAuto12CV=12 CV
-ExpAuto3PCV=3 CV and more
-ExpAuto4PCV=4 CV and more
-ExpAuto5PCV=5 CV and more
-ExpAuto6PCV=6 CV and more
-ExpAuto7PCV=7 CV and more
-ExpAuto8PCV=8 CV and more
-ExpAuto9PCV=9 CV and more
-ExpAuto10PCV=10 CV and more
-ExpAuto11PCV=11 CV and more
-ExpAuto12PCV=12 CV and more
-ExpAuto13PCV=13 CV and more
+ExpAuto3PCV=3 CV 和更多
+ExpAuto4PCV=4 CV 和更多
+ExpAuto5PCV=5 CV 和更多
+ExpAuto6PCV=6 CV 和更多
+ExpAuto7PCV=7 CV 和更多
+ExpAuto8PCV=8 CV 和更多
+ExpAuto9PCV=9 CV 和更多
+ExpAuto10PCV=10 CV 和更多
+ExpAuto11PCV=11 CV 和更多
+ExpAuto12PCV=12 CV 和更多
+ExpAuto13PCV=13 CV 和更多
 ExpCyclo=容量低至50cm3
 ExpMoto12CV=摩托车1或2 CV
 ExpMoto345CV=摩托车3,4或5 CV
-ExpMoto5PCV=摩托车5 CV等等
+ExpMoto5PCV=摩托车 5 CV 和更多
diff --git a/htdocs/langs/zh_CN/donations.lang b/htdocs/langs/zh_CN/donations.lang
index 2d172ee74af..d0d8d92e0a3 100644
--- a/htdocs/langs/zh_CN/donations.lang
+++ b/htdocs/langs/zh_CN/donations.lang
@@ -25,7 +25,7 @@ LastModifiedDonations=最近修改的 %s 份捐献
 DonationRecipient=受捐献者
 IConfirmDonationReception=受捐者宣布收到捐献金额如下
 MinimumAmount=最小金额为  %s
-FreeTextOnDonations=在页脚中显示的额外说明文本
+FreeTextOnDonations=在页脚中显示的附加文本
 FrenchOptions=法国选项
 DONATION_ART200=如果您担心，请查看 CGI 的第 200 条
 DONATION_ART238=如果您担心，请查看 CGI 的第 238 条
diff --git a/htdocs/langs/zh_CN/ecm.lang b/htdocs/langs/zh_CN/ecm.lang
index 7c6670bce74..d99b9b6533b 100644
--- a/htdocs/langs/zh_CN/ecm.lang
+++ b/htdocs/langs/zh_CN/ecm.lang
@@ -5,7 +5,7 @@ ECMSectionManual=手册目录
 ECMSectionAuto=自动目录
 ECMSectionsManual=手动目录树
 ECMSectionsAuto=自动目录树
-ECMSectionsMedias=Medias tree
+ECMSectionsMedias=媒体树
 ECMSections=目录
 ECMRoot=ECM Root
 ECMNewSection=新目录
@@ -19,7 +19,7 @@ ECMArea=电子文档管理区域
 ECMAreaDesc=DMS / ECM（文档管理系统/电子内容管理）区域允许您快速保存，共享和搜索Dolibarr中的所有类型的文档。
 ECMAreaDesc2a=* Manual directories can be used to save documents not linked to a particular element.
 ECMAreaDesc2b=* Automatic directories are filled automatically when adding documents from the page of an element.
-ECMAreaDesc3=* Medias directories are files into the subdirectory <b>/medias</b> of documents directory, readable by everybody with no need to be logged and no need to have the file shared explicitely. It is used to store image files from emailing or website module.
+ECMAreaDesc3=* Medias directories are files into the subdirectory <b>/medias</b> of documents directory, readable by everybody with no need to be logged and no need to have the file shared explicitely. It is used to store image files for the emailing or website module for example.
 ECMSectionWasRemoved=目录<b>%s</b>已被删除。
 ECMSectionWasCreated=目录<b> %s</b>已创建。
 ECMSearchByKeywords=搜寻关键字
@@ -47,6 +47,10 @@ ECMSetup=ECM 设置
 GenerateImgWebp=用另一个带有 .webp 格式的版本复制所有图像
 ConfirmGenerateImgWebp=如果您确认，您将为目前进入此文件夹的所有图像都生成一份带.wepb 格式的图像 (不包含子文件夹)……
 ConfirmImgWebpCreation=确认所有图像重复
+GenerateChosenImgWebp=使用另一个版本的 .webp 格式复制所选图像
+ConfirmGenerateChosenImgWebp=如果确认，您将为图像 %s 生成 .webp 格式的图像
+ConfirmChosenImgWebpCreation=确认复制所选图像
 SucessConvertImgWebp=图像成功复制
+SucessConvertChosenImgWebp=所选图像已成功复制
 ECMDirName=目录名称
 ECMParentDirectory=父目录
diff --git a/htdocs/langs/zh_CN/errors.lang b/htdocs/langs/zh_CN/errors.lang
index 2438f419e90..b3138210c07 100644
--- a/htdocs/langs/zh_CN/errors.lang
+++ b/htdocs/langs/zh_CN/errors.lang
@@ -84,7 +84,7 @@ ErrorNoAccountancyModuleLoaded=没有激活启用任何财务会计模块
 ErrorExportDuplicateProfil=导出设定配置名称已存在
 ErrorLDAPSetupNotComplete=Dolibarr - LDAP的匹配是不完整的。
 ErrorLDAPMakeManualTest=甲。LDIF文件已经生成在目录%s的尝试加载命令行手动有更多的错误信息。
-ErrorCantSaveADoneUserWithZeroPercentage=Can't save an action with "status not started" if field "done by" is also filled.
+ErrorCantSaveADoneUserWithZeroPercentage=如果已填写了“完成者”字段，则无法保存一个“状态未开始”的操作。
 ErrorRefAlreadyExists=参考<b>%s</b>已存在
 ErrorPleaseTypeBankTransactionReportName=请输入必须报告条目的银行对账单名称（格式YYYYMM或YYYYMMDD）
 ErrorRecordHasChildren=因为有子记录所以删除记录失败
@@ -156,7 +156,7 @@ ErrorOpenIDSetupNotComplete=您设置Dolibarr配置文件以允许OpenID身份
 ErrorWarehouseMustDiffers=来源仓库和目标仓库必须不同
 ErrorBadFormat=格式错误！
 ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=错误，该会员尚未链接到任何合作方。在使用发票创建订阅之前，将会员链接到现有合作方或创建新的合作方。
-ErrorThereIsSomeDeliveries=错误，此运输已被关联到某交货，即可能已经交货了不能反悔了。拒绝删除。
+ErrorThereIsSomeDeliveries=错误，有一些交货回执链接到了此发货单。删除被拒绝。
 ErrorCantDeletePaymentReconciliated=无法删除已生成已对帐的银行条目的付款
 ErrorCantDeletePaymentSharedWithPayedInvoice=无法删除由至少一张状态为已支付的发票共享的付款
 ErrorPriceExpression1=无法分配到常数 '%s'
@@ -192,19 +192,19 @@ ErrorGlobalVariableUpdater5=没有全局变量选择
 ErrorFieldMustBeANumeric=填写 <b>%s</b> 必须为数字值
 ErrorMandatoryParametersNotProvided=未提供强制参数
 ErrorOppStatusRequiredIfUsage=You set you want to use this project to follow an opportunity, so you must also fill the initial Status of opportunity.
-ErrorOppStatusRequiredIfAmount=You set an estimated amount for this lead. So you must also enter it's status.
+ErrorOppStatusRequiredIfAmount=您为此商机设置了预估金额。所以您还必须输入它的状态。
 ErrorFailedToLoadModuleDescriptorForXXX=无法加载%s的模块描述符类
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=模块描述符中菜单数组的错误定义（关键字fk_menu的错误值）
 ErrorSavingChanges=保存变更时发生错误
-ErrorWarehouseRequiredIntoShipmentLine=行上需要仓库才能发货
+ErrorWarehouseRequiredIntoShipmentLine=发货单行上需要输入仓库才能发货
 ErrorFileMustHaveFormat=文件格式必须为%s
 ErrorFilenameCantStartWithDot=文件名称不能以“.”开始
 ErrorSupplierCountryIsNotDefined=未定义此供应商的国家/地区。先纠正这个问题。
 ErrorsThirdpartyMerge=两条记录合并失败。请求已取消。
 ErrorStockIsNotEnoughToAddProductOnOrder=产品%s的库存不足以将其添加到新订单中。
 ErrorStockIsNotEnoughToAddProductOnInvoice=产品%s的库存不足以将其添加到新发票中。
-ErrorStockIsNotEnoughToAddProductOnShipment=产品%s的库存不足以将其添加到新发货中。
-ErrorStockIsNotEnoughToAddProductOnProposal=产品%s的库存不足以将其添加到新提案/建议中。
+ErrorStockIsNotEnoughToAddProductOnShipment=库存不足，无法将产品 %s 添加到新发货单中。
+ErrorStockIsNotEnoughToAddProductOnProposal=产品 %s 的库存不足，不能将其添加到新报价单中。
 ErrorFailedToLoadLoginFileForMode=无法获取模式'%s'的登录密钥。
 ErrorModuleNotFound=找不到模块文件。
 ErrorFieldAccountNotDefinedForBankLine=未为源行标识%s（%s）定义的会计科目值
@@ -303,7 +303,7 @@ ErrorCharPlusNotSupportedByImapForSearch=IMAP搜索无法搜索到包含字符+
 ErrorTableNotFound=表格<b>%s</b>未找到
 ErrorValueForTooLow=<b>%s</b>的数值太低
 ErrorValueCantBeNull=<b>%s</b>的数值不能为空
-ErrorDateOfMovementLowerThanDateOfFileTransmission=The date of the bank transaction can't be lower than the date of the file transmission
+ErrorDateOfMovementLowerThanDateOfFileTransmission=银行交易日期不能早于文件传输日期
 ErrorTooMuchFileInForm=Too much files in form, the maximum number is %s file(s)
 ErrorSessionInvalidatedAfterPasswordChange=The session was been invalidated following a change of password, email, status or dates of validity. Please relogin.
 ErrorExistingPermission = Permission <b>%s</b> for object <b>%s</b> already exists
@@ -320,6 +320,8 @@ ErrorSVGFilesNotAllowedAsLinksWithout=SVG files are not allowed as external link
 ErrorTypeMenu=Impossible to add another menu for the same module on the navbar, not handle yet
 ErrorTableExist=Table <b>%s</b> already exist
 ErrorDictionaryNotFound=Dictionary <b>%s</b> not found
+ErrorFailedToCreateSymLinkToMedias=Failed to create the symlinks %s to point to %s
+
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=您的PHP参数 upload_max_filesize （%s）比PHP参数 post_max_size（%s）高。这不是一个一致的设置。
 WarningPasswordSetWithNoAccount=已为此会员设置了密码。但是，未创建用户帐户。因此该密码被存储，但不能用于登录 Dolibarr。它可以由外部模块/接口使用，但如果您不需要为会员定义任何登录名或密码，您可以从会员模块设置中禁用“管理每个会员的登录名”选项。如果您需要管理登录但不需要任何密码，则可以将此字段保留为空以避免出现此警告。注意：如果会员链接到用户，电子邮件也可以用作登录名。
@@ -343,7 +345,7 @@ WarningSomeLinesWithNullHourlyRate=一些用户记录了一些时间，而他们
 WarningYourLoginWasModifiedPleaseLogin=您的登录已被修改。出于安全考虑，您必须在下一步操作之前使用新登录名登录。
 WarningYourPasswordWasModifiedPleaseLogin=Your password was modified. For security purpose you will have to login now with your new password.
 WarningAnEntryAlreadyExistForTransKey=此语言的翻译密钥已存在条目
-WarningNumberOfRecipientIsRestrictedInMassAction=Warning, number of different recipient is limited to <b>%s</b> when using the mass actions on lists
+WarningNumberOfRecipientIsRestrictedInMassAction=警告，当在列表上使用批量操作时，不同收件人的数量限制为 <b> %s </b> 人。
 WarningDateOfLineMustBeInExpenseReportRange=警告，行的日期不在费用报销单的范围内
 WarningProjectDraft=项目仍处于草案模式。如果您计划使用任务，别忘了验证。
 WarningProjectClosed=项目已关闭，您必须首先重新打开它
@@ -362,7 +364,7 @@ WarningPermissionAlreadyExist=Existing permissions for this object
 WarningGoOnAccountancySetupToAddAccounts=If this list is empty, go into menu %s - %s - %s to load or create accounts for your chart of account.
 WarningCorrectedInvoiceNotFound=Corrected invoice not found
 
-SwissQrOnlyVIR = SwissQR invoice can only be added on invoices set to be paid with credit transfer payments.
+SwissQrOnlyVIR = SwissQR 发票只能添加到设置为通过银行转账付款付款的发票上。
 SwissQrCreditorAddressInvalid = Creditor address is invalid (are ZIP and city set? (%s)
 SwissQrCreditorInformationInvalid = Creditor information is invalid for IBAN (%s): %s
 SwissQrIbanNotImplementedYet = QR-IBAN not implemented yet
diff --git a/htdocs/langs/zh_CN/eventorganization.lang b/htdocs/langs/zh_CN/eventorganization.lang
index 4e72e57a2d7..5bef6c5e1bb 100644
--- a/htdocs/langs/zh_CN/eventorganization.lang
+++ b/htdocs/langs/zh_CN/eventorganization.lang
@@ -18,166 +18,166 @@
 # Generic
 #
 ModuleEventOrganizationName = 活动组织
-EventOrganizationDescription = Event Organization through Module Project
-EventOrganizationDescriptionLong= Manage the organization of an event (show, conferences, attendees or speakers, with public pages for suggestion, vote or registration)
+EventOrganizationDescription = 通过项目模块组织活动
+EventOrganizationDescriptionLong= 管理活动的组织（演出、会议、与会者或演讲者，以及用于推荐、投票或注册的公共页面）
 #
 # Menu
 #
-EventOrganizationMenuLeft = Organized events
-EventOrganizationConferenceOrBoothMenuLeft = Conference Or Booth
+EventOrganizationMenuLeft = 已组织的活动
+EventOrganizationConferenceOrBoothMenuLeft = 会议或展位
 
-PaymentEvent=Payment of event
+PaymentEvent=活动的付款
 
 #
 # Admin page
 #
-NewRegistration=Registration
-EventOrganizationSetup=Event Organization setup
-EventOrganization=Event organization
+NewRegistration=注册
+EventOrganizationSetup=活动组织设置
+EventOrganization=活动组织
 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 event to organize, some tasks can be automatically created in the project<br><br>For example: <br>Send Call for Conferences<br>Send Call for Booths<br>Validate suggestions of Conferences<br>Validate application for Booths<br>Open subscriptions to the event for attendees<br>Send a remind of the event to speakers<br>Send a remind of the event to Booth hosters<br>Send a remind of the event to attendees
-EVENTORGANIZATION_TASK_LABELTooltip2=Keep empty if you don't need to create tasks automatically.
-EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Category to add to third-parties automatically created when someone suggests a conference
-EVENTORGANIZATION_CATEG_THIRDPARTY_BOOTH = Category to add to third-parties automatically created when they suggests a booth
-EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_CONF = 收到会议建议后发送的电子邮件模板。
-EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_BOOTH = 收到展位建议后发送的电子邮件模板。
-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 to use when sending emails from the massaction "Send emails" to speakers
-EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Template of email to use when sending emails from the massaction "Send emails" on attendee list
-EVENTORGANIZATION_FILTERATTENDEES_CAT = In the form to create/add an attendee, restricts the list of thirdparties to thirdparties in the category
-EVENTORGANIZATION_FILTERATTENDEES_TYPE = In the form to create/add an attendee, restricts the list of thirdparties to thirdparties with the nature
+EventOrganizationSetupPage = 活动组织设置页面
+EVENTORGANIZATION_TASK_LABEL = 在项目通过验证时自动创建的任务标签
+EVENTORGANIZATION_TASK_LABELTooltip = 当您验证要组织的活动时，可以在项目中自动创建一些任务 <br> <br> 例如：<br> 发送会议电话 <br> 发送展位电话 <br> 验证会议推荐 <br> 验证展位申请 <br> 为与会者开放活动订阅 <br> 向演讲者发送活动提醒 <br> 向展位主办方发送活动提醒 <br> 向与会者发送活动提醒
+EVENTORGANIZATION_TASK_LABELTooltip2=如果不需要自动创建任务，请保留为空。
+EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = 在有人推荐会议时为合作方自动创建的类别
+EVENTORGANIZATION_CATEG_THIRDPARTY_BOOTH = 在合作方推荐展位时为合作方自动创建的类别
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_CONF = 收到会议推荐后发送的电子邮件的模板
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_BOOTH = 收到展位推荐后发送的电子邮件的模板
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_BOOTH = 支付展位注册费后发送的电子邮件的模板
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT = 支付活动注册费后发送的电子邮件的模板
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_SPEAKER = 从批量操作“群发电子邮件”向演讲者们群发电子邮件时使用的电子邮件模板
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = 从与会者清单上的批量操作“群发电子邮件”时使用的电子邮件模板
+EVENTORGANIZATION_FILTERATTENDEES_CAT = 在用于创建/添加与会者的表单中，限定合作方的类别
+EVENTORGANIZATION_FILTERATTENDEES_TYPE = 在用于创建/添加与会者的表单中，限定合作方的性质
 
 #
 # Object
 #
-OrganizedEvent=Organized event
-EventOrganizationConfOrBooth= Conference Or Booth
-EventOrganizationConfOrBoothes=Conferences or Boothes
-ManageOrganizeEvent = Manage the organization of an event
-ConferenceOrBooth = Conference Or Booth
-ConferenceOrBoothTab = Conference Or Booth
-AmountPaid = Amount paid
-DateOfRegistration = Date of registration
-ConferenceOrBoothAttendee = Conference Or Booth Attendee
-ApplicantOrVisitor=Applicant or visitor
-Speaker=Speaker
+OrganizedEvent=已组织的活动
+EventOrganizationConfOrBooth= 会议或展位
+EventOrganizationConfOrBoothes=会议或展位
+ManageOrganizeEvent = 管理活动的组织
+ConferenceOrBooth = 会议或展位
+ConferenceOrBoothTab = 会议或展位
+AmountPaid = 支付金额
+DateOfRegistration = 注册日期
+ConferenceOrBoothAttendee = 会议或展位与会者
+ApplicantOrVisitor=申请人或访客
+Speaker=演讲者
 
 #
 # Template Mail
 #
-YourOrganizationEventConfRequestWasReceived = 您的会议请求已收到
+YourOrganizationEventConfRequestWasReceived = 您的会议申请已收到
 YourOrganizationEventBoothRequestWasReceived = 您的展位申请已收到
-EventOrganizationEmailAskConf = Request for conference
-EventOrganizationEmailAskBooth = Request for booth
-EventOrganizationEmailBoothPayment = Payment of your booth
-EventOrganizationEmailRegistrationPayment = Registration for an event
-EventOrganizationMassEmailAttendees = Communication to attendees
-EventOrganizationMassEmailSpeakers = Communication to speakers
-ToSpeakers=To speakers
+EventOrganizationEmailAskConf = 申请会议
+EventOrganizationEmailAskBooth = 申请展位
+EventOrganizationEmailBoothPayment = 支付您的展位费用
+EventOrganizationEmailRegistrationPayment = 活动报名
+EventOrganizationMassEmailAttendees = 与与会者沟通
+EventOrganizationMassEmailSpeakers = 与演讲者沟通
+ToSpeakers=致演讲者
 
 #
 # Event
 #
-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 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 conferences
-ConferenceOrBoothInformation=Conference Or Booth informations
-Attendees=Attendees
-ListOfAttendeesOfEvent=List of attendees of the event project
-DownloadICSLink = Download ICS link
-EVENTORGANIZATION_SECUREKEY = Seed to secure the key for the public registration page to suggest a conference
-SERVICE_BOOTH_LOCATION = Service used for the invoice row about a booth location
-SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to an event
-NbVotes=Number of votes
+AllowUnknownPeopleSuggestConf=允许人们推荐会议
+AllowUnknownPeopleSuggestConfHelp=允许陌生人推荐他们想要召开的会议
+AllowUnknownPeopleSuggestBooth=允许人们申请展位
+AllowUnknownPeopleSuggestBoothHelp=允许陌生人申请展位
+PriceOfRegistration=注册价格
+PriceOfRegistrationHelp=注册或参加活动所需支付的价格
+PriceOfBooth=展位认购价
+PriceOfBoothHelp=展位认购价
+EventOrganizationICSLink=链接会议的 ICS
+ConferenceOrBoothInformation=会议或展位信息
+Attendees=与会者
+ListOfAttendeesOfEvent=活动项目的与会者清单
+DownloadICSLink = 下载 ICS 的链接
+EVENTORGANIZATION_SECUREKEY = 用于确保推荐会议的公共注册页面的密钥安全种子
+SERVICE_BOOTH_LOCATION = 用于有关展位位置的发票行的服务
+SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = 用于有关与会者订阅活动的发票行的服务
+NbVotes=票数
 #
 # Status
 #
 EvntOrgDraft = 草稿
-EvntOrgSuggested = Suggested
-EvntOrgConfirmed = Confirmed
-EvntOrgNotQualified = Not Qualified
+EvntOrgSuggested = 推荐
+EvntOrgConfirmed = 已确认
+EvntOrgNotQualified = 不合格
 EvntOrgDone = 完成
-EvntOrgCancelled = Cancelled
+EvntOrgCancelled = 已取消
 #
 # Public page
 #
-SuggestForm = Suggestion page
-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=Suggested booths
-ListOfConferencesOrBooths=Conferences or booths of event project
-SuggestConference = Suggest a new conference
-SuggestBooth = Suggest a booth
-ViewAndVote = View and vote for suggested events
-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 event
-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
+SuggestForm = 推荐页面
+SuggestOrVoteForConfOrBooth = 推荐或投票页面
+EvntOrgRegistrationHelpMessage = 在这里，您可以为会议投票或为活动推荐一个新会议。您也可以在活动期间申请展位。
+EvntOrgRegistrationConfHelpMessage = 在这里，您可以在活动期间鼓励推荐一个新的会议。
+EvntOrgRegistrationBoothHelpMessage = 在这里，您可以在活动期间申请展位。
+ListOfSuggestedConferences = 推荐会议清单
+ListOfSuggestedBooths=推荐展位
+ListOfConferencesOrBooths=活动项目的会议或展位
+SuggestConference = 推荐一个新会议
+SuggestBooth = 推荐展位
+ViewAndVote = 查看推荐活动并为其投票
+PublicAttendeeSubscriptionGlobalPage = 用于活动报名的公共链接
+PublicAttendeeSubscriptionPage = 仅用于报名此活动的公共链接
+MissingOrBadSecureKey = 安全密钥无效或丢失
+EvntOrgWelcomeMessage = 此表单允许您注册为此活动的新参与者
+EvntOrgDuration = 本次会议从 %s 开始，至 %s 结束。
+ConferenceAttendeeFee = 活动的与会者费用：“%s”，举办时间为从 %s 至 %s。
+BoothLocationFee = 活动的展位位置：“%s”，举办时间为从 %s 至 %s
 EventType = 活动类型
-LabelOfBooth=Booth label
-LabelOfconference=Conference label
-ConferenceIsNotConfirmed=Registration not available, conference is not confirmed yet
-DateMustBeBeforeThan=%s must be before %s
-DateMustBeAfterThan=%s must be after %s
-MaxNbOfAttendeesReached=The maximum number of participants has been reached
-NewSubscription=Registration
-OrganizationEventConfRequestWasReceived=您对会议的建议已收到
+LabelOfBooth=展位标签
+LabelOfconference=会议标签
+ConferenceIsNotConfirmed=无法注册，会议尚未确定
+DateMustBeBeforeThan=%s 必须位于 %s 之前
+DateMustBeAfterThan=%s 必须位于 %s 之后
+MaxNbOfAttendeesReached=已达到最大参与人数
+NewSubscription=注册
+OrganizationEventConfRequestWasReceived=您对会议的推荐已收到
 OrganizationEventBoothRequestWasReceived=您的展位申请已收到
-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)
-OrganizationEvenLabelName=Public name of the conference or booth
+OrganizationEventPaymentOfBoothWasReceived=您的展位付款已被记录
+OrganizationEventPaymentOfRegistrationWasReceived=您的活动注册付款已被记录
+OrganizationEventBulkMailToAttendees=这是关于您作为与会者参加活动的提醒
+OrganizationEventBulkMailToSpeakers=这是对您作为演讲者参加活动的提醒
+OrganizationEventLinkToThirdParty=链接到合作方（客户、供应商或合作伙伴）
+OrganizationEvenLabelName=会议或展位的公开名称
 
-NewSuggestionOfBooth=Application for a booth
-NewSuggestionOfConference=Application to hold a conference
+NewSuggestionOfBooth=展位申请
+NewSuggestionOfConference=申请召开会议
 
 #
 # Vote page
 #
-EvntOrgRegistrationWelcomeMessage = Welcome on the conference or booth suggestion page.
-EvntOrgRegistrationConfWelcomeMessage = Welcome on the conference suggestion page.
-EvntOrgRegistrationBoothWelcomeMessage = Welcome on the booth suggestion page.
-EvntOrgVoteHelpMessage = Here, you can view and vote for the suggested events for the project
-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.
+EvntOrgRegistrationWelcomeMessage = 欢迎来到会议或展位推荐页面。
+EvntOrgRegistrationConfWelcomeMessage = 欢迎来到会议推荐页面。
+EvntOrgRegistrationBoothWelcomeMessage = 欢迎来到展位推荐页面。
+EvntOrgVoteHelpMessage = 在这里，您可以查看项目的推荐活动并为其投票
+VoteOk = 您的投票已被接受。
+AlreadyVoted = 您已经为本次活动投过票了。
+VoteError = 投票时出现错误，请重试。
 
-SubscriptionOk=Your registration has been recorded
-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
-EmailCompany=Company 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
-MaxNbOfAttendees=Max number of attendees
-DateStartEvent=Event start date
-DateEndEvent=Event end date
-ModifyStatus=Modify status
-ConfirmModifyStatus=Confirm status modification
-ConfirmModifyStatusQuestion=Are you sure you want to modify the %s selected record(s)?
-RecordsUpdated = %s Records updated
-RecordUpdated = Record updated
-NoRecordUpdated = No Record updated
+SubscriptionOk=您的注册已被记录
+ConfAttendeeSubscriptionConfirmation = 确认您的活动订阅
+Attendee = 与会者
+PaymentConferenceAttendee = 会议与会者付款
+PaymentBoothLocation = 展位选址付款
+DeleteConferenceOrBoothAttendee=移除与会者
+RegistrationAndPaymentWereAlreadyRecorder=已记录邮箱 <b> %s </b> 的注册和付款
+EmailAttendee=与会者邮箱
+EmailCompany=公司邮箱
+EmailCompanyForInvoice=公司邮箱（用于发票，如果与会者邮箱不同）
+ErrorSeveralCompaniesWithEmailContactUs=已发现多家公司拥有此电子邮件地址，因此我们无法自动验证您的注册。请通过 %s 联系我们进行手动验证
+ErrorSeveralCompaniesWithNameContactUs=已找到多家使用该名称的公司，因此我们无法自动验证您的注册。请通过 %s 联系我们进行手动验证
+NoPublicActionsAllowedForThisEvent=本次活动不对外开放任何公开操作
+MaxNbOfAttendees=最大与会者人数
+DateStartEvent=活动开始日期
+DateEndEvent=活动结束日期
+ModifyStatus=修改状态
+ConfirmModifyStatus=确认状态修改
+ConfirmModifyStatusQuestion=您确定要变更这 %s 条已选记录吗？
+RecordsUpdated = %s 条记录已更新
+RecordUpdated = 记录已更新
+NoRecordUpdated = 没有记录被更新
diff --git a/htdocs/langs/zh_CN/exports.lang b/htdocs/langs/zh_CN/exports.lang
index b8ab3245d65..1f5691de662 100644
--- a/htdocs/langs/zh_CN/exports.lang
+++ b/htdocs/langs/zh_CN/exports.lang
@@ -58,7 +58,7 @@ DownloadEmptyExampleShort=Download a sample file
 DownloadEmptyExample=Download a template file with examples and information on fields you can import
 StarAreMandatory=Into the template file, all fields with a * are mandatory fields
 ChooseFormatOfFileToImport=Choose the file format to use as import file format by clicking on the %s icon to select it...
-ChooseFileToImport=Upload file then click on the %s icon to select file as source import file...
+ChooseFileToImport=上传文件，然后单击 %s 图标选择文件作为源导入文件...
 SourceFileFormat=源文件格式
 FieldsInSourceFile=在源文件中的字段
 FieldsInTargetDatabase=目标字段：Dolibarr数据库(粗体=强制)
diff --git a/htdocs/langs/zh_CN/holiday.lang b/htdocs/langs/zh_CN/holiday.lang
index 2d7db58164b..e5626f9165f 100644
--- a/htdocs/langs/zh_CN/holiday.lang
+++ b/htdocs/langs/zh_CN/holiday.lang
@@ -139,7 +139,7 @@ GoIntoDictionaryHolidayTypes=前往 <strong> 主页 - 设置 - 字典库 - 休
 HolidaySetup=休假模块设置
 HolidaysNumberingModules=休假申请单编号模式
 TemplatePDFHolidays=休假申请的 PDF 模板
-FreeLegalTextOnHolidays=PDF 上的额外说明
+FreeLegalTextOnHolidays=PDF 上的附加文本
 WatermarkOnDraftHolidayCards=休假申请草稿上的水印
 HolidaysToApprove=待批准的休假申请
 NobodyHasPermissionToValidateHolidays=没有人有权限验证休假申请
diff --git a/htdocs/langs/zh_CN/hrm.lang b/htdocs/langs/zh_CN/hrm.lang
index 2bb27cf1475..d7253edbcb6 100644
--- a/htdocs/langs/zh_CN/hrm.lang
+++ b/htdocs/langs/zh_CN/hrm.lang
@@ -24,7 +24,7 @@ SkillsManagement=技能管理
 HRM_MAXRANK=对技能进行排名的最大级别数
 HRM_DEFAULT_SKILL_DESCRIPTION=创建技能时默认的等级描述
 deplacement=转移
-DateEval=评估日期
+DateEval=评价日期
 JobCard=工作卡
 JobProfile=职位描述
 JobsProfiles=职位简介
@@ -40,12 +40,12 @@ skill=技能
 Skills=技能
 SkillCard=技能卡
 EmployeeSkillsUpdated=员工技能已更新（参见员工表单视图的“技能”标签页）
-Eval=评估
+Eval=评价
 Evals=评价
-NewEval=新评价
+NewEval=新建评价
 ValidateEvaluation=验证评价
-ConfirmValidateEvaluation=您确定要使用参考<b> %s </b> 验证此评估吗？
-EvaluationCard=评估卡
+ConfirmValidateEvaluation=您确定要验证编号为 <b> %s </b> 的评价吗？
+EvaluationCard=评价卡
 RequiredRank=职位描述所需的级别
 EmployeeRank=该技能的员工等级
 EmployeePosition=员工岗位
@@ -74,12 +74,12 @@ TypeKnowHow=知识
 TypeHowToBe=怎样成为
 TypeKnowledge=知识
 AbandonmentComment=放弃评论
-DateLastEval=上次评估日期
-NoEval=没有对该员工进行评估
+DateLastEval=最后评价日期
+NoEval=没有对该员工进行评价
 HowManyUserWithThisMaxNote=具有该等级的用户数
 HighestRank=最高等级
 SkillComparison=技能对比
-ActionsOnJob=本职位的活动
+ActionsOnJob=此职位的事件
 VacantPosition=职位空缺
 VacantCheckboxHelper=勾选此选项将显示未填补的职位（职位空缺）
 SaveAddSkill = 技能(一个或多个)已添加
@@ -87,6 +87,6 @@ SaveLevelSkill = 技能(一个或多个)等级已保存
 DeleteSkill = 技能已移除
 SkillsExtraFields=补充属性（能力）
 JobsExtraFields=属性补充（工作描述）
-EvaluationsExtraFields=补充属性（评估）
+EvaluationsExtraFields=补充属性（评价）
 NeedBusinessTravels=需要商务出差
 NoDescription=没有描述
diff --git a/htdocs/langs/zh_CN/install.lang b/htdocs/langs/zh_CN/install.lang
index e66ed09a507..41d56792d67 100644
--- a/htdocs/langs/zh_CN/install.lang
+++ b/htdocs/langs/zh_CN/install.lang
@@ -86,7 +86,7 @@ WithNoSlashAtTheEnd=注意：末尾没有斜杠 "/"
 DirectoryRecommendation=<span class="warning">IMPORTANT</span>: You must use a directory that is outside of the web pages (so do not use a subdirectory of previous parameter).
 LoginAlreadyExists=已存在
 DolibarrAdminLogin=Dolibarr后台管理账号名
-AdminLoginAlreadyExists=Dolibarr administrator account '<b>%s</b>' already exists. Go back if you want to create another one.
+AdminLoginAlreadyExists=Dolibarr 管理员帐户“<b> %s </b>”已存在。如果您想创建另一个，请返回。
 FailedToCreateAdminLogin=无法创建Dolibarr管理员帐户。
 WarningRemoveInstallDir=Warning, for security reasons, once the installation process is complete, you must add a file called <b>install.lock</b> into the Dolibarr document directory in order to prevent the accidental/malicious use of the install tools again.
 FunctionNotAvailableInThisPHP=Not available in this PHP
@@ -125,11 +125,11 @@ OpenBaseDir=PHP的openbasedir参数
 YouAskToCreateDatabaseSoRootRequired=You checked the box "Create database". For this, you need to provide the login/password of superuser (bottom of form).
 YouAskToCreateDatabaseUserSoRootRequired=You checked the box "Create database owner". For this, you need to provide the login/password of superuser (bottom of form).
 NextStepMightLastALongTime=The current step may take several minutes. Please wait until the next screen is shown completely before continuing.
-MigrationCustomerOrderShipping=Migrate shipping for sales orders storage
-MigrationShippingDelivery=送货升级存储
-MigrationShippingDelivery2=送货升级存储 2
+MigrationCustomerOrderShipping=为销售订单库存转移货运
+MigrationShippingDelivery=升级货运仓储
+MigrationShippingDelivery2=升级货运存储2
 MigrationFinished=迁移完成
-LastStepDesc=<strong>Last step</strong>: Define here the login and password you wish to use to connect to Dolibarr. <b>Do not lose this as it is the master account to administer all other/additional user accounts.</b>
+LastStepDesc= <strong> 最后一步 </strong> ：在此处定义您希望用于连接 Dolibarr 的登录名和密码。 <b> 不要丢失此帐户，因为它是管理所有其他/附加用户帐户的主帐户。 </b>
 ActivateModule=激活启用模块%s
 ShowEditTechnicalParameters=点击此处显示/编辑高级参数（专家模式）
 WarningUpgrade=Warning:\nDid you run a database backup first?\nThis is highly recommended. Loss of data (due to for example bugs in mysql version 5.5.40/41/42/43) may be possible during this process, so it is essential to take a complete dump of your database before starting any migration.\n\nClick OK to start migration process...
@@ -152,7 +152,7 @@ MigrationInvoice=数据迁移的客户发票
 MigrationContract=数据迁移合同
 MigrationSuccessfullUpdate=升级成功
 MigrationUpdateFailed=升级过程中失败
-MigrationRelationshipTables=数据迁移的关系表（%s）的
+MigrationRelationshipTables=关系表 (%s) 的数据迁移
 MigrationPaymentsUpdate=支付数据校正
 MigrationPaymentsNumberToUpdate=%的付款（县）更新
 MigrationProcessPaymentUpdate=更新费（第）%s的
@@ -174,22 +174,22 @@ MigrationContractsInvalidDatesNothingToUpdate=无不良日至正确的价值
 MigrationContractsIncoherentCreationDateUpdate=合同无效值创建日期更正
 MigrationContractsIncoherentCreationDateUpdateSuccess=差值合约创建日期更正成功完成
 MigrationContractsIncoherentCreationDateNothingToUpdate=对合同成立之日起，纠正不良的价值
-MigrationReopeningContracts=未平仓合约关闭错误
-MigrationReopenThisContract=重新打开%s的合同
+MigrationReopeningContracts=未完成的合同因错误而关闭
+MigrationReopenThisContract=重新打开合同 %s
 MigrationReopenedContractsNumber=%s 联系人变更
-MigrationReopeningContractsNothingToUpdate=没有合同，打开封闭
+MigrationReopeningContractsNothingToUpdate=没有可打开的已关闭合同
 MigrationBankTransfertsUpdate=更新银行条目和银行转帐之间的链接
 MigrationBankTransfertsNothingToUpdate=所有链接是最新的
 MigrationShipmentOrderMatching=发送收据更新
-MigrationDeliveryOrderMatching=送达回执更新
-MigrationDeliveryDetail=送货更新
+MigrationDeliveryOrderMatching=交货回执更新
+MigrationDeliveryDetail=交货回执更新
 MigrationStockDetail=更新产品的库存值
 MigrationMenusDetail=最新动态菜单表
-MigrationDeliveryAddress=更新货物的配送地址
+MigrationDeliveryAddress=更新发货单中的交货地址
 MigrationProjectTaskActors=Data migration for table llx_projet_task_actors
 MigrationProjectUserResp=数据迁移llx_projet领域fk_user_resp到llx_element_contact
 MigrationProjectTaskTime=更新时间花费在几秒钟内
-MigrationActioncommElement=更新动作数据
+MigrationActioncommElement=更新操作数据
 MigrationPaymentMode=Data migration for payment type
 MigrationCategorieAssociation=迁移类别
 MigrationEvents=Migration of events to add event owner into assignment table
@@ -214,6 +214,6 @@ ClickOnLinkOrRemoveManualy=If an upgrade is in progress, please wait. If not, cl
 ClickOnLinkOrCreateUnlockFileManualy=If an upgrade is in progress, please wait... If not, you must create a file upgrade.unlock into the Dolibarr documents directory.
 Loaded=Loaded
 FunctionTest=Function test
-NodoUpgradeAfterDB=No action requested by external modules after upgrade of database
-NodoUpgradeAfterFiles=No action requested by external modules after upgrade of files or directories
+NodoUpgradeAfterDB=数据库升级后外部模块未请求任何操作
+NodoUpgradeAfterFiles=文件或目录升级后外部模块未请求任何操作
 MigrationContractLineRank=Migrate Contract Line to use Rank (and enable Reorder)
diff --git a/htdocs/langs/zh_CN/interventions.lang b/htdocs/langs/zh_CN/interventions.lang
index 7df90790124..9bff9cd9359 100644
--- a/htdocs/langs/zh_CN/interventions.lang
+++ b/htdocs/langs/zh_CN/interventions.lang
@@ -1,72 +1,72 @@
 # Dolibarr language file - Source file is en_US - interventions
-Intervention=介入
-Interventions=干预
-InterventionCard=干预卡
-NewIntervention=新的干预
-AddIntervention=创建干预
-ChangeIntoRepeatableIntervention=Change to repeatable intervention
-ListOfInterventions=干预列表
-ActionsOnFicheInter=干预活动
-LastInterventions=最近新增的 %s 个介入措施
-AllInterventions=所有干预
-CreateDraftIntervention=创建草稿
-InterventionContact=干预接触
-DeleteIntervention=删除干预
-ValidateIntervention=验证干预
-ModifyIntervention=变更干预
-DeleteInterventionLine=删除干预行
-ConfirmDeleteIntervention=您确定要删除此干预吗？
-ConfirmValidateIntervention=您确定要在名称<b> %s </b>下批准此干预吗？
-ConfirmModifyIntervention=您确定要修改此干预吗？
-ConfirmDeleteInterventionLine=您确定要删除此干预线吗？
-ConfirmCloneIntervention=您确定要克隆此干预吗？
-NameAndSignatureOfInternalContact=Name and signature of intervening:
-NameAndSignatureOfExternalContact=Name and signature of customer:
-DocumentModelStandard=标准文档模板的干预
-InterventionCardsAndInterventionLines=干预和干预明细
-InterventionClassifyBilled=分类“帐单”
-InterventionClassifyUnBilled=归类 'Unbilled'
-InterventionClassifyDone=分类“完成”
-StatusInterInvoiced=帐单
-SendInterventionRef=提交的干预 %s
-SendInterventionByMail=Send intervention by email
-InterventionCreatedInDolibarr=干预 %s 已创建
-InterventionValidatedInDolibarr=干预 %s 已验证
-InterventionModifiedInDolibarr=干预 %s 已变更
-InterventionClassifiedBilledInDolibarr=干预 %s 设为账单
-InterventionClassifiedUnbilledInDolibarr=干预 %s 设为未账单
-InterventionSentByEMail=Intervention %s sent by email
-InterventionDeletedInDolibarr=干预 %s 已删除
-InterventionsArea=干预区
-DraftFichinter=干预草稿
-LastModifiedInterventions=最近修改的 %s 介入措施
-FichinterToProcess=要处理的干预措施
-TypeContact_fichinter_external_CUSTOMER=随访客户联系
-PrintProductsOnFichinter=在干预卡上也打印“产品”类型（不仅是服务）
-PrintProductsOnFichinterDetails=从订单生成干预
-UseServicesDurationOnFichinter=使用服务持续时间从订单生成干预
-UseDurationOnFichinter=隐藏干预记录的持续时间字段
-UseDateWithoutHourOnFichinter=隐藏干预记录的日期字段的小时和分钟
-InterventionStatistics=干预统计
-NbOfinterventions=No. of intervention cards
-NumberOfInterventionsByMonth=No. of intervention cards by month (date of validation)
-AmountOfInteventionNotIncludedByDefault=Amount of intervention is not included by default into profit (in most cases, timesheets are used to count time spent). You can use PROJECT_ELEMENTS_FOR_ADD_MARGIN and PROJECT_ELEMENTS_FOR_MINUS_MARGIN option into home-setup-other to complete list of element included into profit.
-InterId=干预身份
-InterRef=干预编号
-InterDateCreation=日期创建干预
-InterDuration=持续干预
-InterStatus=现状干预
-InterNote=注意干预
-InterLine=Line of intervention
-InterLineId=线路ID干预
-InterLineDate=行日期干预
-InterLineDuration=线路持续时间干预
-InterLineDesc=线描述干预
-RepeatableIntervention=Template of intervention
-ToCreateAPredefinedIntervention=To create a predefined or recurring intervention, create a common intervention and convert it into intervention template
-ConfirmReopenIntervention=Are you sure you want to open back the intervention <b>%s</b>?
-GenerateInter=Generate intervention
-FichinterNoContractLinked=Intervention %s has been created without a linked contract.
-ErrorFicheinterCompanyDoesNotExist=Company does not exist. Intervention has not been created.
-NextDateToIntervention=Date for next intervention generation
-NoIntervention=No intervention
+Intervention=现场服务
+Interventions=现场服务
+InterventionCard=现场服务卡
+NewIntervention=新建现场服务
+AddIntervention=创建现场服务
+ChangeIntoRepeatableIntervention=改为可重复的现场服务
+ListOfInterventions=现场服务清单
+ActionsOnFicheInter=对现场服务采取的操作
+LastInterventions=最近新增的 %s 个现场服务
+AllInterventions=所有现场服务
+CreateDraftIntervention=创建草案
+InterventionContact=现场服务联系人
+DeleteIntervention=删除现场服务
+ValidateIntervention=验证现场服务
+ModifyIntervention=变更现场服务
+DeleteInterventionLine=删除现场服务行
+ConfirmDeleteIntervention=您确定要删除此现场服务吗？
+ConfirmValidateIntervention=您确定要以名称 <b> %s </b> 来验证此现场服务吗？
+ConfirmModifyIntervention=您确定要变更此现场服务吗？
+ConfirmDeleteInterventionLine=您确定要删除此现场服务行吗？
+ConfirmCloneIntervention=您确定要克隆此现场服务吗？
+NameAndSignatureOfInternalContact=现场服务人员的姓名及签名：
+NameAndSignatureOfExternalContact=客户姓名及签名：
+DocumentModelStandard=现场服务的标准文档模型
+InterventionCardsAndInterventionLines=现场服务和现场服务行
+InterventionClassifyBilled=归类到“已计费”
+InterventionClassifyUnBilled=归类到“未计费”
+InterventionClassifyDone=归类到“已完成”
+StatusInterInvoiced=已计费
+SendInterventionRef=提交现场服务 %s
+SendInterventionByMail=通过电子邮件发送现场服务
+InterventionCreatedInDolibarr=现场服务 %s 已创建
+InterventionValidatedInDolibarr=现场服务 %s 已验证
+InterventionModifiedInDolibarr=现场服务 %s 已变更
+InterventionClassifiedBilledInDolibarr=现场服务 %s 设置为已计费
+InterventionClassifiedUnbilledInDolibarr=现场服务 %s 设置为未计费
+InterventionSentByEMail=通过电子邮件发送现场服务 %s
+InterventionDeletedInDolibarr=现场服务 %s 已删除
+InterventionsArea=现场服务区
+DraftFichinter=现场服务草案
+LastModifiedInterventions=最近修改的 %s 个现场服务
+FichinterToProcess=要处理的现场服务
+TypeContact_fichinter_external_CUSTOMER=跟进客户联系人
+PrintProductsOnFichinter=在现场服务卡上也打印“产品”类型行（不仅是服务）
+PrintProductsOnFichinterDetails=从订单生成现场服务
+UseServicesDurationOnFichinter=为订单生成的现场服务使用服务期限
+UseDurationOnFichinter=隐藏现场服务记录的持续时间字段
+UseDateWithoutHourOnFichinter=隐藏现场服务记录日期字段中的小时和分钟
+InterventionStatistics=现场服务统计
+NbOfinterventions=现场服务卡数量
+NumberOfInterventionsByMonth=按月（验证日期）划分的现场服务卡数量
+AmountOfInteventionNotIncludedByDefault=默认情况下，现场服务金额不计入利润（在大多数情况下，时间表用于计算工时）。您可以在 home-setup-other 中使用 PROJECT_ELEMENTS_FOR_ADD_MARGIN 和 PROJECT_ELEMENTS_FOR_MINUS_MARGIN 选项来完成包含在利润中的元素列表。
+InterId=现场服务 ID
+InterRef=现场服务编号
+InterDateCreation=现场服务创建日期
+InterDuration=现场服务持续时间
+InterStatus=现场服务状态
+InterNote=现场服务备注
+InterLine=现场服务的行
+InterLineId=现场服务的行 ID
+InterLineDate=现场服务的行日期
+InterLineDuration=现场服务的行持续时间
+InterLineDesc=现场服务的行描述
+RepeatableIntervention=现场服务模板
+ToCreateAPredefinedIntervention=要创建预定义或重复现场服务，请创建通用现场服务并将其转换为现场服务模板
+ConfirmReopenIntervention=您确定要重新打开现场服务 <b> %s </b> 吗？
+GenerateInter=生成现场服务
+FichinterNoContractLinked=现场服务 %s 在没有链接到合同的情况下创建。
+ErrorFicheinterCompanyDoesNotExist=公司不存在。现场服务不能被创建。
+NextDateToIntervention=下一次现场服务的产生日期
+NoIntervention=无现场服务
diff --git a/htdocs/langs/zh_CN/intracommreport.lang b/htdocs/langs/zh_CN/intracommreport.lang
index 499f34d44cf..f8f3d6cf8a4 100644
--- a/htdocs/langs/zh_CN/intracommreport.lang
+++ b/htdocs/langs/zh_CN/intracommreport.lang
@@ -1,7 +1,7 @@
-Module68000Name = Intracomm report
-Module68000Desc = Intracomm report management (Support for French DEB/DES format)
-IntracommReportSetup = Intracommreport module setup
-IntracommReportAbout = About intracommreport
+Module68000Name = 内部报表
+Module68000Desc = 内部报表管理（支持法国DEB/DES格式）
+IntracommReportSetup = 内部报表模块设置
+IntracommReportAbout = 关于内部报表
 
 # Setup
 INTRACOMMREPORT_NUM_AGREMENT=批准号（由CISD签发）
@@ -14,7 +14,7 @@ INTRACOMMREPORT_CATEG_FRAISDEPORT=Catégorie de services de type "Frais de port"
 INTRACOMMREPORT_NUM_DECLARATION=Numéro de déclarant
 
 # Menu
-MenuIntracommReport=Intracomm report
+MenuIntracommReport=内部报表
 MenuIntracommReportNew=New declaration
 MenuIntracommReportList=名单
 
diff --git a/htdocs/langs/zh_CN/languages.lang b/htdocs/langs/zh_CN/languages.lang
index 7ad5cbf0c6d..447a66d4f27 100644
--- a/htdocs/langs/zh_CN/languages.lang
+++ b/htdocs/langs/zh_CN/languages.lang
@@ -123,6 +123,6 @@ Language_ur_PK=Urdu
 Language_uz_UZ=乌兹别克
 Language_vi_VN=越南语
 Language_zh_CN=中文
-Language_zh_TW=Chinese (Taiwan)
+Language_zh_TW=中文（台湾）
 Language_zh_HK=Chinese (Hong Kong)
 Language_bh_MY=Malay
diff --git a/htdocs/langs/zh_CN/link.lang b/htdocs/langs/zh_CN/link.lang
index 5c2a5c3dcf4..00f14808c56 100644
--- a/htdocs/langs/zh_CN/link.lang
+++ b/htdocs/langs/zh_CN/link.lang
@@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - languages
 LinkANewFile=链接一份新文件/文档
 LinkedFiles=链接文件和文档
-NoLinkFound=空空如也
+NoLinkFound=无注册链接
 LinkComplete=文件链接成功
 ErrorFileNotLinked=文件无法链接
 LinkRemoved=链接 %s 已移除
diff --git a/htdocs/langs/zh_CN/mails.lang b/htdocs/langs/zh_CN/mails.lang
index 57fd37d25a5..54dcc27dd63 100644
--- a/htdocs/langs/zh_CN/mails.lang
+++ b/htdocs/langs/zh_CN/mails.lang
@@ -5,7 +5,7 @@ EMailings=电子邮件
 AllEMailings=所有电子邮件
 MailCard=通过电子邮件发送卡
 MailRecipients=收件人
-MailRecipient=接收方
+MailRecipient=收件人
 MailTitle=描述
 MailFrom=从
 MailErrorsTo=Errors to
@@ -33,13 +33,13 @@ CreateMailing=创建电子邮件
 TestMailing=测试的电子邮件
 ValidMailing=有效的电子邮件
 MailingStatusDraft=草稿
-MailingStatusValidated=验证
+MailingStatusValidated=已验证
 MailingStatusSent=发送
 MailingStatusSentPartialy=发送部分
 MailingStatusSentCompletely=发送完全
 MailingStatusError=错误
 MailingStatusNotSent=不发送
-MailSuccessfulySent=电子邮件（从%s到%s）已成功接收发货
+MailSuccessfulySent=交货回执电子邮件（从 %s 发送至 %s）已成功接收
 MailingSuccessfullyValidated=通过电子邮件发送成功验证
 MailUnsubcribe=退订
 MailingStatusNotContact=不要再联系
@@ -51,8 +51,8 @@ ConfirmResetMailing=Warning, by re-initializing emailing <b>%s</b>, you will all
 ConfirmDeleteMailing=Are you sure you want to delete this emailing?
 NbOfUniqueEMails=No. of unique emails
 NbOfEMails=No. of EMails
-TotalNbOfDistinctRecipients=受助人数目明显
-NoTargetYet=受助人还没有确定（走吧标签'收件人'）
+TotalNbOfDistinctRecipients=不同收件人的数量
+NoTargetYet=尚未定义收件人（前往“收件人”标签页）
 NoRecipientEmail=没有收件人的电子邮件地址为%s
 RemoveRecipient=删除收件人
 YouCanAddYourOwnPredefindedListHere=要创建您的电子邮件选择模块，见htdocs中/包括/模块/邮寄/自述文件。
@@ -70,7 +70,7 @@ SentTo=发送到<b>%s</b>
 MailingStatusRead=阅读
 YourMailUnsubcribeOK=The email <b>%s</b>  is correctly unsubscribe from mailing list
 ActivateCheckReadKey=用于加密用于“已读回执”和“取消订阅”功能的 URL 的密钥
-EMailSentToNRecipients=Email sent to %s recipients.
+EMailSentToNRecipients=电子邮件已发送至 %s 收件人。
 EMailSentForNElements=Email sent for %s elements.
 XTargetsAdded=<b> %s</b>收件人已添加到目标列表中
 OnlyPDFattachmentSupported=If the PDF documents were already generated for the objects to send, they will be attached to email. If not, no email will be sent (also, note that only pdf documents are supported as attachments in mass sending in this version).
@@ -122,8 +122,8 @@ YouCanUseCommaSeparatorForSeveralRecipients=您可以使用<b>逗号</b>分隔
 TagCheckMail=追踪邮件打开
 TagUnsubscribe=退订链接
 TagSignature=发送用户的签名
-EMailRecipient=Recipient Email
-TagMailtoEmail=Recipient Email (including html "mailto:" link)
+EMailRecipient=收件人电子邮件
+TagMailtoEmail=收件人电子邮件（包括 html“mailto:” 链接）
 NoEmailSentBadSenderOrRecipientEmail=没有发送电子邮件发件人或收件人电子邮件错验证用户配置文件
 # Module Notifications
 Notifications=通知
@@ -179,8 +179,8 @@ RecordCreatedByEmailCollector=Record created by the Email Collector %s from emai
 DefaultBlacklistMailingStatus=Default value for field '%s' when creating a new contact
 DefaultStatusEmptyMandatory=Empty but mandatory
 WarningLimitSendByDay=WARNING: The setup or contract of your instance limits your number of emails per day to <b>%s</b>. Trying to send more may result in having your instance slow down or suspended. Please contact your support if you need a higher quota.
-NoMoreRecipientToSendTo=No more recipient to send the email to
+NoMoreRecipientToSendTo=没有更多收件人可以向其发送电子邮件
 EmailOptedOut=Email owner has requested to not contact him with this email anymore
 EvenUnsubscribe=Include opt-out emails
 EvenUnsubscribeDesc=Include opt-out emails when you select emails as targets. Usefull for mandatory service emails for example.
-XEmailsDoneYActionsDone=%s 个电子邮件已通过预审，%s 个电子邮件已成功处理（对于 %s 记录/已完成的操作）
+XEmailsDoneYActionsDone=%s 封电子邮件已通过资格预审，%s 封电子邮件已成功处理（对于 %s 记录/动作已完成）
diff --git a/htdocs/langs/zh_CN/main.lang b/htdocs/langs/zh_CN/main.lang
index 3661a7fb2d6..cf293f9e77c 100644
--- a/htdocs/langs/zh_CN/main.lang
+++ b/htdocs/langs/zh_CN/main.lang
@@ -38,7 +38,7 @@ Translations=翻译
 CurrentTimeZone=PHP(服务器)的时区
 EmptySearchString=输入非空搜索条件
 EnterADateCriteria=输入日期条件
-NoRecordFound=空空如也——没有找到记录
+NoRecordFound=没有找到记录
 NoRecordDeleted=未删除记录
 NotEnoughDataYet=数据不足
 NoError=没有错误
@@ -47,7 +47,7 @@ Errors=错误
 ErrorFieldRequired=栏位 '%s' 必须按要求填写
 ErrorFieldFormat=栏位 '%s' 参数值有误
 ErrorFileDoesNotExists=文件%s不存在
-ErrorFailedToOpenFile=无法打开文件%s
+ErrorFailedToOpenFile=无法打开文件 %s
 ErrorCanNotCreateDir=无法创建目录 %s
 ErrorCanNotReadDir=无法读取目录 %s
 ErrorConstantNotDefined=参数%s未定义
@@ -96,7 +96,7 @@ NbOfEntries=条目数
 GoToWikiHelpPage=阅读在线帮助文档 (需要访问外网)
 GoToHelpPage=阅读帮助
 DedicatedPageAvailable=与您当前屏幕相关的专用帮助页面
-HomePage=主页
+HomePage=主页页面
 RecordSaved=记录已保存
 RecordDeleted=记录已删除
 RecordGenerated=记录已生成
@@ -168,7 +168,7 @@ AddToDraft=添加到草稿
 Update=更新
 Close=关闭
 CloseAs=设置状态
-CloseBox=将插件从你的看板中移除
+CloseBox=从您的看板中删除小部件
 Confirm=确认
 ConfirmSendCardByMail=您真的想把这张卡片的内容邮寄给<b>%s</b>吗？
 Delete=删除
@@ -235,8 +235,8 @@ PersonalValue=自定义
 NewObject=新%s
 NewValue=新值
 OldValue=旧值%s
-FieldXModified=Field %s modified
-FieldXModifiedFromYToZ=Field %s modified from %s to %s
+FieldXModified=字段 %s 已修改
+FieldXModifiedFromYToZ=字段 %s 已从 %s 修改为 %s
 CurrentValue=当前值
 Code=编码
 Type=类型
@@ -348,7 +348,7 @@ MonthOfDay=本月的一天
 DaysOfWeek=星期几
 HourShort=时
 MinuteShort=分
-SecondShort=sec
+SecondShort=秒
 Rate=税率
 CurrencyRate=汇率
 UseLocalTax=含税
@@ -474,7 +474,7 @@ RefPayment=付款编号
 CommercialProposalsShort=报价单
 Comment=说明
 Comments=说明
-ActionsToDo=待办事项
+ActionsToDo=待办事件
 ActionsToDoShort=未完成
 ActionsDoneShort=完成
 ActionNotApplicable=不适用
@@ -488,8 +488,8 @@ Accountant=会计
 ContactsForCompany=合作方联系方式
 ContactsAddressesForCompany=合作方联系人/地址
 AddressesForCompany=合作方地址
-ActionsOnCompany=该合作方的活动
-ActionsOnContact=此联系人/地址的活动
+ActionsOnCompany=该合作方的事件
+ActionsOnContact=此联系人/地址的事件
 ActionsOnContract=本合同的事件
 ActionsOnMember=该会员的事件
 ActionsOnProduct=有关此产品的事件
@@ -510,8 +510,8 @@ Duration=为期
 TotalDuration=总时间
 Summary=摘要
 DolibarrStateBoard=数据库统计
-DolibarrWorkBoard=未清项目
-NoOpenedElementToProcess=没有要处理的开放元素
+DolibarrWorkBoard=未完成项
+NoOpenedElementToProcess=没有要处理的未完成元素
 Available=可用的
 NotYetAvailable=不可用的
 NotAvailable=不可用
@@ -558,7 +558,7 @@ Unknown=未知
 General=一般
 Size=尺寸
 OriginalSize=原始尺寸
-RotateImage=Rotate 90°
+RotateImage=旋转90°
 Received=已收
 Paid=已支付
 Topic=主题
@@ -726,8 +726,8 @@ AutomaticCode=自动代码
 FeatureDisabled=功能禁用
 MoveBox=拖动插件
 Offered=提供
-NotEnoughPermissions=您没有这个动作的权限
-UserNotInHierachy=此操作保留给该用户的主管
+NotEnoughPermissions=您没有执行此操作的权限
+UserNotInHierachy=此操作仅供该用户的主管使用
 SessionName=会话名称
 Method=方法
 Receive=收到
@@ -749,7 +749,7 @@ MenuAccountancy=会计
 MenuECM=文件
 MenuAWStats=AWStats
 MenuMembers=会员
-MenuAgendaGoogle=谷歌议程
+MenuAgendaGoogle=谷歌日程
 MenuTaxesAndSpecialExpenses=税收 |特殊费用
 ThisLimitIsDefinedInSetup=来自Dolibarr本身的大小限制(菜单：home-setup-security)为：%s Kb，而PHP的限制为: %s Kb
 ThisLimitIsDefinedInSetupAt=Dolibarr 限制（菜单 %s): %s Kb，PHP 限制（参数 %s): %s 钾
@@ -774,8 +774,8 @@ Page=页面
 Notes=备注
 AddNewLine=添加新行
 AddFile=添加文件
-FreeZone=自由文本产品
-FreeLineOfType=自由文本项，类型：
+FreeZone=产品附加文本
+FreeLineOfType=附加文本项，类型：
 CloneMainAttributes=复制项目含主属性
 ReGeneratePDF=重新生成 PDF
 PDFMerge=PDF合并
@@ -822,10 +822,10 @@ LinkToOrder=链接到订单
 LinkToInvoice=链接到发票
 LinkToTemplateInvoice=发票模板链接
 LinkToSupplierOrder=采购订单链接
-LinkToSupplierProposal=供应商提案链接
+LinkToSupplierProposal=供应商报价单链接
 LinkToSupplierInvoice=供应商发票链接
 LinkToContract=链接到联系人
-LinkToIntervention=链接到干预
+LinkToIntervention=链接到现场服务
 LinkToTicket=链接到服务工单
 LinkToMo=链接到莫
 CreateDraft=创建草稿
@@ -858,7 +858,7 @@ Deductible=可抵扣
 from=从
 toward=往
 Access=访问
-SelectAction=选择行动
+SelectAction=选择操作
 SelectTargetUser=选择目标用户/员工
 HelpCopyToClipboard=按快捷键 Ctrl+C 复制
 SaveUploadedFileWithMask=将文件保存在服务器上，名称为“<strong> %s </strong>”（否则为“%s”）
@@ -874,7 +874,7 @@ AddBox=添加信息框
 SelectElementAndClick=选择一个元素并点击 %s
 PrintFile=打印文件 %s
 ShowTransaction=在银行帐户条目
-ShowIntervention=显示干预
+ShowIntervention=显示现场服务
 ShowContract=查看合同
 GoIntoSetupToChangeLogo=进入主页 - 设置 - 公司更改徽标或进入主页 - 设置 - 显示隐藏。
 Deny=否认
@@ -887,7 +887,7 @@ Genderwoman=女性
 Genderother=其他
 ViewList=列表视图
 ViewGantt=甘特图
-ViewKanban=看板图
+ViewKanban=看板视图
 Mandatory=强制性
 Hello=你好
 GoodBye=再见
@@ -897,10 +897,10 @@ DeleteLine=删除行
 ConfirmDeleteLine=您确定要删除此行吗？
 ErrorPDFTkOutputFileNotFound=错误：未生成文件。请检查“pdftk”命令是否安装在 $PATH 环境变量（仅限 Linux/unix）中包含的目录中，或者联系您的系统管理员。
 NoPDFAvailableForDocGenAmongChecked=在已检查记录中没有PDF可用于生成文档
-TooManyRecordForMassAction=选择进行大规模行动的记录过多。该操作仅限于 <span class='notranslate'>%s</span> 列表\n 记录。
+TooManyRecordForMassAction=选择进行批量操作的记录过多。该操作仅限于 %s 条记录的清单。
 NoRecordSelected=未选定记录
-MassFilesArea=批量动作生成文件区
-ShowTempMassFilesArea=显示批量动作生成文件区
+MassFilesArea=批量操作创建的文件区域
+ShowTempMassFilesArea=显示通过批量操作创建的文件区域
 ConfirmMassDeletion=批量删除确认
 ConfirmMassDeletionQuestion=您确定要删除%s已选记录吗？
 ConfirmMassClone=批量克隆确认
@@ -933,7 +933,7 @@ ViewFlatList=查看全部列表
 ViewAccountList=查看账本
 ViewSubAccountList=查看子账户账本
 RemoveString=删除字符串'%s'
-SomeTranslationAreUncomplete=提供的某些语言可能仅部分翻译或可能包含错误。请通过注册 <span class='notranslate'><a href="https://transifex.com/projects/p/dolibarr/" target="_blank" rel="noopener noreferrer external"></span> 帮助纠正您的语言\n https://transifex.com/projects/p/dolibarr/ </a>  添加您的改进。
+SomeTranslationAreUncomplete=提供的某些语言可能仅部分翻译或可能包含错误。请通过注册到 <a href="https://transifex.com/projects/p/dolibarr/" target="_blank" rel="noopener noreferrer external"> https://transifex.com/projects/p/dolibarr/ </a> 来帮助您纠正语言翻译错误并且添加您的新翻译。
 DirectDownloadLink=公开下载链接
 PublicDownloadLinkDesc=只需要链接即可下载文件
 DirectDownloadInternalLink=私人下载链接
@@ -945,7 +945,7 @@ ActualizeCurrency=更新货币汇率
 Fiscalyear=财务年度
 ModuleBuilder=模块和应用程序生成器
 SetMultiCurrencyCode=设置货币
-BulkActions=批量行动
+BulkActions=批量操作
 ClickToShowHelp=单击以显示工具提示帮助
 WebSite=网站
 WebSites=网站
@@ -955,18 +955,18 @@ ExpenseReports=费用报销单
 HR=HR
 HRAndBank=人力资源和银行
 AutomaticallyCalculated=自动计算
-TitleSetToDraft=回到草案
-ConfirmSetToDraft=您确定要返回草稿状态吗？
+TitleSetToDraft=恢复到草稿
+ConfirmSetToDraft=您确定要恢复到草稿状态吗？
 ImportId=导入ID
 Events=事件
 EMailTemplates=电子邮件模板
 FileNotShared=未向外部公众分享的文件
 Project=项目
 Projects=项目
-LeadOrProject=铅 |项目
+LeadOrProject=商机 | 项目
 LeadsOrProjects=商机 | 项目
-Lead=带领
-Leads=潜在客户
+Lead=商机
+Leads=商机
 ListOpenLeads=打开的商机清单
 ListOpenProjects=打开的项目清单
 NewLeadOrProject=新建商机或项目
@@ -1039,7 +1039,7 @@ quadrillion=千万亿
 SelectMailModel=选择电子邮件模板
 SetRef=套编号
 Select2ResultFoundUseArrows=发现结果。使用箭头选择。
-Select2NotFound=空空如也——没有结果
+Select2NotFound=没有找到结果
 Select2Enter=输入
 Select2MoreCharacter=个以上的字符
 Select2MoreCharacters=个以上的字符
@@ -1060,10 +1060,10 @@ SearchIntoSupplierInvoices=供应商发票
 SearchIntoCustomerOrders=销售订单
 SearchIntoSupplierOrders=订单
 SearchIntoCustomerProposals=报价单
-SearchIntoSupplierProposals=供应商提案
-SearchIntoInterventions=干预
+SearchIntoSupplierProposals=供应商报价单
+SearchIntoInterventions=现场服务
 SearchIntoContracts=合同
-SearchIntoCustomerShipments=客户运输
+SearchIntoCustomerShipments=客户发货单
 SearchIntoExpenseReports=费用报销单
 SearchIntoLeaves=休假
 SearchIntoKM=知识库
@@ -1107,7 +1107,7 @@ ToClose=关闭
 ToRefuse=拒绝
 ToProcess=待处理
 ToApprove=审批
-GlobalOpenedElemView=全球视野
+GlobalOpenedElemView=全局视图
 NoArticlesFoundForTheKeyword=未找到与关键字“<span class='notranslate'><strong></span>”相关的文章\n %s </strong> '
 NoArticlesFoundForTheCategory=没有找到该类别的文章
 ToAcceptRefuse=接受 |拒绝
@@ -1115,7 +1115,7 @@ ContactDefault_agenda=事件
 ContactDefault_commande=订单
 ContactDefault_contrat=合同
 ContactDefault_facture=发票
-ContactDefault_fichinter=介入
+ContactDefault_fichinter=现场服务
 ContactDefault_invoice_supplier=供应商发票
 ContactDefault_order_supplier=采购订单
 ContactDefault_project=项目
@@ -1155,7 +1155,7 @@ DateOfBirth=生日
 SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=安全令牌已过期，因此操作已被取消。请再试一次。
 UpToDate=会员资格已生效
 OutOfDate=会员资格已过期
-EventReminder=活动提醒
+EventReminder=事件提醒
 UpdateForAllLines=更新所有线路
 OnHold=等候接听
 Civility=礼貌
@@ -1237,3 +1237,5 @@ SearchSyntaxTooltipForStringOrNum=要在文本字段内搜索，您可以使用
 InProgress=进行中
 DateOfPrinting=印刷日期
 ClickFullScreenEscapeToLeave=单击此处切换全屏模式。按 ESCAPE 键退出全屏模式。
+UserNotYetValid=尚未生效
+UserExpired=已到期
diff --git a/htdocs/langs/zh_CN/margins.lang b/htdocs/langs/zh_CN/margins.lang
index 7c550e822bf..fb439ef39e9 100644
--- a/htdocs/langs/zh_CN/margins.lang
+++ b/htdocs/langs/zh_CN/margins.lang
@@ -6,6 +6,7 @@ TotalMargin=总利润
 MarginOnProducts=利润 / 产品
 MarginOnServices=利润 / 服务
 MarginRate=利润率
+ModifyMarginRates=Modify margin rates
 MarkRate=标记税率
 DisplayMarginRates=显示利润率
 DisplayMarkRates=显示mark rates
@@ -42,4 +43,4 @@ rateMustBeNumeric=税率必须为数字值
 markRateShouldBeLesserThan100=Mark rate 将低于 100
 ShowMarginInfos=显示利润信息
 CheckMargins=利润明细
-MarginPerSaleRepresentativeWarning=The report of margin per user use the link between third parties and sale representatives to calculate the margin of each sale representative. Because some thirdparties may not have any dedicated sale representative and some third parties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
+MarginPerSaleRepresentativeWarning=每个用户的利润报告使用合作方和销售代表之间的链接来计算每个销售代表的利润。由于某些合作方可能没有专门的销售代表，并且某些合作方可能与多个合作方有关联，因此某些金额可能不会包含在本报告中（如果没有销售代表），而某些金额可能会出现在不同的行中（针对每个销售代表） 。
diff --git a/htdocs/langs/zh_CN/members.lang b/htdocs/langs/zh_CN/members.lang
index f79f43d3b82..01fa98ecfe5 100644
--- a/htdocs/langs/zh_CN/members.lang
+++ b/htdocs/langs/zh_CN/members.lang
@@ -174,7 +174,7 @@ ShowTypeCard=显示类型“%s”
 HTPasswordExport=生成htpassword文件
 NoThirdPartyAssociatedToMember=没有与该会员关联的合作方
 MembersAndSubscriptions=会员和贡献
-MoreActions=补充行动记录
+MoreActions=记录的补充操作
 MoreActionsOnSubscription=记录捐献时默认建议的自定义操作，其在线支付捐献时也会自动完成
 MoreActionBankDirect=在银行帐户上创建直接输入
 MoreActionBankViaInvoice=创建发票并通过银行帐户付款
diff --git a/htdocs/langs/zh_CN/modulebuilder.lang b/htdocs/langs/zh_CN/modulebuilder.lang
index 7cb91fb0502..e0b4ff2e70f 100644
--- a/htdocs/langs/zh_CN/modulebuilder.lang
+++ b/htdocs/langs/zh_CN/modulebuilder.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - loan
 IdModule= Module id
-ModuleBuilderDesc=This tool must be used only by experienced users or developers. It provides utilities to build or edit your own module. Documentation for alternative <a href="%s" target="_blank" rel="noopener noreferrer">manual development is here</a>.
+ModuleBuilderDesc=该工具只能由有经验的用户或开发人员使用。它提供了构建或编辑您自己的模块的实用程序。替代<a href="%s" target="_blank" rel="noopener noreferrer">手动开发的文档位于此处</a>。
 EnterNameOfModuleDesc=Enter the name of the module/application to create with no spaces. Use uppercase to separate words (For example: MyModule, EcommerceForShop, SyncWithMySystem...)
 EnterNameOfObjectDesc=Enter the name of the object to create with no spaces. Use uppercase to separate words (For example: MyObject, Student, Teacher...). The CRUD class file, the pages to list/add/edit/delete the object and the SQL files will be generated.
 EnterNameOfDictionaryDesc=Enter the name of the dictionary to create with no spaces. Use uppercase to separate words (For example: MyDico...). The class file, but also the SQL file will be generated.
@@ -163,11 +163,11 @@ ListOfTabsEntries=List of tab entries
 TabsDefDesc=Define here the tabs provided by your module
 TabsDefDescTooltip=The tabs provided by your module/application are defined into the array <strong>$this->tabs</strong> into the module descriptor file. You can edit manually this file or use the embedded editor.
 BadValueForType=Bad value for type %s
-DefinePropertiesFromExistingTable=Define properties from an existing table
+DefinePropertiesFromExistingTable=Define the fields/properties from an existing table
 DefinePropertiesFromExistingTableDesc=If a table in the database (for the object to create) already exists, you can use it to define the properties of the object.
 DefinePropertiesFromExistingTableDesc2=Keep empty if the table does not exist yet. The code generator will use different kinds of fields to build an example of table that you can edit later.
-GeneratePermissions=I want to add the rights for this object
-GeneratePermissionsHelp=generate default rights for this object
+GeneratePermissions=I want to manage permissions on this object
+GeneratePermissionsHelp=If you check this, some code will be added to manage permissions to read, write and delete record of the objects
 PermissionDeletedSuccesfuly=Permission has been successfully removed
 PermissionUpdatedSuccesfuly=Permission has been successfully updated
 PermissionAddedSuccesfuly=Permission has been successfully added
@@ -180,3 +180,4 @@ CRUDCreateWrite=Create or Update
 FailedToAddCodeIntoDescriptor=Failed to add code into descriptor. Check that the string comment "%s" is still present into the file.
 DictionariesCreated=Dictionary <b>%s</b> created successfully
 DictionaryDeleted=Dictionary <b>%s</b> removed successfully
+PropertyModuleUpdated=Property <b>%s</b> has been update successfully
diff --git a/htdocs/langs/zh_CN/mrp.lang b/htdocs/langs/zh_CN/mrp.lang
index 827e20fd340..b27d089e27e 100644
--- a/htdocs/langs/zh_CN/mrp.lang
+++ b/htdocs/langs/zh_CN/mrp.lang
@@ -19,9 +19,9 @@ BOMsNumberingModules=物料清单编号模板
 BOMsModelModule=物料清单文档模块
 MOsNumberingModules=制造订单编号模板
 MOsModelModule=制造订单文档模板
-FreeLegalTextOnBOMs=物料清单文档上的自由文本
+FreeLegalTextOnBOMs=物料清单文档上的附加文本
 WatermarkOnDraftBOMs=物料清单草稿上的水印
-FreeLegalTextOnMOs=制造订单文档上的自由文本
+FreeLegalTextOnMOs=制造订单文档上的附加文本
 WatermarkOnDraftMOs=制造订单草稿上的水印
 ConfirmCloneBillOfMaterials=您确定要复制物料清单%s吗？
 ConfirmCloneMo=您确认要复制制造订单%s吗？
@@ -74,8 +74,8 @@ CancelProductionForRef=取消产品 %s 的产品库存减量
 TooltipDeleteAndRevertStockMovement=删除行并恢复库存调拨
 AutoCloseMO=如果达到消耗和生产的数量，自动关闭制造订单
 NoStockChangeOnServices=服务无库存变化
-ProductQtyToConsumeByMO=Product quantity still to consume by open MO
-ProductQtyToProduceByMO=Product quantity still to produce by open MO
+ProductQtyToConsumeByMO=开放 MO 仍需消耗的产品数量
+ProductQtyToProduceByMO=产品数量仍按开放 MO 生产
 AddNewConsumeLines=Add new line to consume
 AddNewProduceLines=Add new line to produce
 ProductsToConsume=消耗的产品
@@ -115,11 +115,11 @@ MOAndLines=Manufacturing Orders and lines
 MoChildGenerate=Generate Child Mo
 ParentMo=MO Parent
 MOChild=MO Child
-BomCantAddChildBom=The nomenclature %s is already present in the tree leading to the nomenclature %s
+BomCantAddChildBom=命名法 %s 已经存在于命名法 %s 的树中
 BOMNetNeeds = BOM 净需求
 BOMProductsList=BOM的产品
 BOMServicesList=BOM的服务
 Manufacturing=Manufacturing
 Disassemble=Disassemble
 ProducedBy=Produced by
-QtyTot=Qty Total
+QtyTot=数量总计
diff --git a/htdocs/langs/zh_CN/oauth.lang b/htdocs/langs/zh_CN/oauth.lang
index 8f0fc5aec25..f862a8b918e 100644
--- a/htdocs/langs/zh_CN/oauth.lang
+++ b/htdocs/langs/zh_CN/oauth.lang
@@ -28,7 +28,7 @@ OAUTH_GOOGLE_SECRET=OAuth Google Secret
 OAUTH_GITHUB_NAME=OAuth GitHub service
 OAUTH_GITHUB_ID=OAuth GitHub Id
 OAUTH_GITHUB_SECRET=OAuth GitHub Secret
-OAUTH_URL_FOR_CREDENTIAL=Go to <a class="notasortlink" href="%s" target="_blank" rel="noopener noreferrer external">this page<span class="fas fa-external-link-alt paddingleft"></span></a> to create or get your OAuth ID and Secret
+OAUTH_URL_FOR_CREDENTIAL=前往<a class="notasortlink" href="%s" target="_blank" rel="noopener noreferrer external">此页面 <span class="fas fa-external-link-alt paddingleft"> </span> </a> 创建或获取您的 OAuth ID 和 Secret
 OAUTH_STRIPE_TEST_NAME=OAuth Stripe Test
 OAUTH_STRIPE_LIVE_NAME=OAuth Stripe Live
 OAUTH_ID=OAuth Client ID
diff --git a/htdocs/langs/zh_CN/orders.lang b/htdocs/langs/zh_CN/orders.lang
index 039fed5618e..e40c001896d 100644
--- a/htdocs/langs/zh_CN/orders.lang
+++ b/htdocs/langs/zh_CN/orders.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - orders
-OrderExists=An order was already open linked to this proposal, so no other order was created automatically
+OrderExists=链接到此报价单的订单已打开，因此不会自动创建其他订单
 OrdersArea=客户订单区
 SuppliersOrdersArea=采购订单区
 OrderCard=订单信息
@@ -25,23 +25,23 @@ CustomerOrder=销售订单
 CustomersOrders=销售订单
 CustomersOrdersRunning=当前销售订单
 CustomersOrdersAndOrdersLines=销售订单和订单详情
-OrdersDeliveredToBill=Sales orders delivered to bill
-OrdersToBill=Sales orders delivered
-OrdersInProcess=Sales orders in process
-OrdersToProcess=Sales orders to process
+OrdersDeliveredToBill=销售订单已交货至账单
+OrdersToBill=销售订单已交货
+OrdersInProcess=正在处理销售订单
+OrdersToProcess=正在处理销售订单
 SuppliersOrdersToProcess=待处理采购订单
 SuppliersOrdersAwaitingReception=等待收货的采购订单
-AwaitingReception=等待接受
+AwaitingReception=等待收货
 StatusOrderCanceledShort=已取消
 StatusOrderDraftShort=草稿
 StatusOrderValidatedShort=已验证
 StatusOrderSentShort=处理中
-StatusOrderSent=运输处理中
+StatusOrderSent=发货中
 StatusOrderOnProcessShort=已下订单
 StatusOrderProcessedShort=处理中
-StatusOrderDelivered=已递送
-StatusOrderDeliveredShort=已递送
-StatusOrderToBillShort=已递送
+StatusOrderDelivered=已交货
+StatusOrderDeliveredShort=已交货
+StatusOrderToBillShort=已交货
 StatusOrderApprovedShort=已批准
 StatusOrderRefusedShort=已拒绝
 StatusOrderToProcessShort=待处理
@@ -53,29 +53,29 @@ StatusOrderValidated=已验证
 StatusOrderOnProcess=已订购 - 待收货
 StatusOrderOnProcessWithValidation=已订购 - 待收货或验证
 StatusOrderProcessed=已处理
-StatusOrderToBill=已递送
+StatusOrderToBill=已交货
 StatusOrderApproved=已批准
 StatusOrderRefused=已拒绝
 StatusOrderReceivedPartially=部分收到
 StatusOrderReceivedAll=收到所有产品
-ShippingExist=运输存在
+ShippingExist=已有发货单存在
 QtyOrdered=订购数量
 ProductQtyInDraft=订单草稿中的产品数量
 ProductQtyInDraftOrWaitingApproved=草稿或已确认的订单中的产品数量，不只是已下订单
-MenuOrdersToBill=已发货订单
+MenuOrdersToBill=订单已交货
 MenuOrdersToBill2=订单账单
-ShipProduct=航运产品
+ShipProduct=发货产品
 CreateOrder=创建订单
 RefuseOrder=拒绝订单
 ApproveOrder=批准订单
 Approve2Order=批准订单（第二级）
-UserApproval=User for approval
-UserApproval2=User for approval (second level)
+UserApproval=批准用户
+UserApproval2=批准用户（二级）
 ValidateOrder=验证订单
 UnvalidateOrder=未验证订单
 DeleteOrder=删除订单
 CancelOrder=取消订单
-OrderReopened= Order %s re-open
+OrderReopened= 订单 %s 重新打开
 AddOrder=创建订单
 AddSupplierOrderShort=创建订单
 AddPurchaseOrder=创建采购订单
@@ -83,7 +83,7 @@ AddToDraftOrders=添加订单草稿
 ShowOrder=显示订单
 OrdersOpened=处理订单
 NoDraftOrders=没有订单草稿
-NoOrder=空空如也——没有订单
+NoOrder=无订单
 NoSupplierOrder=没有采购订单
 LastOrders=最近新增的 %s 份销售订单
 LastCustomerOrders=最近新增的 %s 份销售订单
@@ -94,23 +94,23 @@ NbOfOrders=订单号码
 OrdersStatistics=订单统计
 OrdersStatisticsSuppliers=采购订单统计信息
 NumberOfOrdersByMonth=按月份订单数
-AmountOfOrdersByMonthHT=Amount of orders by month (excl. tax)
+AmountOfOrdersByMonthHT=每月订单金额（不含税）
 ListOfOrders=订单列表
-ListOrderLigne=Lines of orders
-productobuy=Products to buy only
-productonly=Products only
-disablelinefree=No free lines
+ListOrderLigne=订单行
+productobuy=只能购买的产品
+productonly=仅限产品
+disablelinefree=没有空闲行
 CloseOrder=关闭订单
-ConfirmCloseOrder=Are you sure you want to set this order to delivered? Once an order is delivered, it can be set to billed.
+ConfirmCloseOrder=您确定要将此订单设置为已交货吗？如果订单已交货，可以将其设置为已开票。
 ConfirmDeleteOrder=您确定要删除此订单吗？
 ConfirmValidateOrder=您确定要在名称<b> %s </b>下验证此订单吗？
 ConfirmUnvalidateOrder=您确定要将订单<b> %s</b>恢复为草稿状态吗？
 ConfirmCancelOrder=您确定要取消此订单吗？
 ConfirmMakeOrder=您确定要确认是否在<b> %s </b>上确认了此订单？
 GenerateBill=生成发票
-ClassifyShipped=归类"已交付"
-PassedInShippedStatus=classified delivered
-YouCantShipThis=I can't classify this. Please check user permissions
+ClassifyShipped=归类为已交货
+PassedInShippedStatus=已归类为已交货
+YouCantShipThis=我无法对这个进行分类。请检查用户权限
 DraftOrders=订单草稿
 DraftSuppliersOrders=采购订单草稿
 OnProcessOrders=处理中订单
@@ -120,7 +120,7 @@ RefOrderSupplier=参考。订购供应商
 RefOrderSupplierShort=参考。订购供应商
 SendOrderByMail=通过邮件发送订单
 ActionsOnOrder=订单上的事件
-NoArticleOfTypeProduct=任何类型的产品文章'，以便对这一秩序shippable文章
+NoArticleOfTypeProduct=没有“产品”类型的商品，因此该订单没有可发货的商品
 OrderMode=订购方法
 AuthorRequest=要求提交
 UserWithApproveOrderGrant=被授予“核准订单”的权限的用户。
@@ -130,23 +130,23 @@ DispatchSupplierOrder=接收采购订单%s
 FirstApprovalAlreadyDone=审批已完成
 SecondApprovalAlreadyDone=第二次批准已经完成
 SupplierOrderReceivedInDolibarr=采购订单%s收到%s
-SupplierOrderSubmitedInDolibarr=Purchase Order %s submitted
+SupplierOrderSubmitedInDolibarr=采购订单 %s 已提交
 SupplierOrderClassifiedBilled=采购订单%s设置开票
 OtherOrders=其他订单
-SupplierOrderValidatedAndApproved=Supplier order is validated and approved : %s
-SupplierOrderValidated=Supplier order is validated : %s
-OrderShowDetail=Show order detail
+SupplierOrderValidatedAndApproved=采购订单已验证并获得批准：%s
+SupplierOrderValidated=采购订单已验证：%s
+OrderShowDetail=显示订单明细
 ##### Types de contacts #####
-TypeContact_commande_internal_SALESREPFOLL=Representative following-up sales order
-TypeContact_commande_internal_SHIPPING=送货跟进
+TypeContact_commande_internal_SALESREPFOLL=跟进销售订单的销售代表
+TypeContact_commande_internal_SHIPPING=跟进发货单的销售代表
 TypeContact_commande_external_BILLING=客户发票联系人
-TypeContact_commande_external_SHIPPING=客户送货联系人
-TypeContact_commande_external_CUSTOMER=客户跟进订单联系人
-TypeContact_order_supplier_internal_SALESREPFOLL=代表性的后续采购订单
-TypeContact_order_supplier_internal_SHIPPING=送货跟进
+TypeContact_commande_external_SHIPPING=客户货运联系人
+TypeContact_commande_external_CUSTOMER=跟进订单的客户联系人
+TypeContact_order_supplier_internal_SALESREPFOLL=跟进采购订单的销售代表
+TypeContact_order_supplier_internal_SHIPPING=跟进发货单的销售代表
 TypeContact_order_supplier_external_BILLING=供应商发票联系
-TypeContact_order_supplier_external_SHIPPING=供应商发货联系
-TypeContact_order_supplier_external_CUSTOMER=供应商联系跟进订单
+TypeContact_order_supplier_external_SHIPPING=供应商货运联系人
+TypeContact_order_supplier_external_CUSTOMER=跟进订单的供应商联系人
 Error_COMMANDE_SUPPLIER_ADDON_NotDefined=常量COMMANDE_SUPPLIER_ADDON没有定义
 Error_COMMANDE_ADDON_NotDefined=常量COMMANDE_ADDON没有定义
 Error_OrderNotChecked=选定发票中没有订单
@@ -157,7 +157,7 @@ OrderByEMail=电子邮件
 OrderByWWW=在线
 OrderByPhone=电话
 # Documents models
-PDFEinsteinDescription=A complete order model (old implementation of Eratosthene template)
+PDFEinsteinDescription=完整的订单模型（Eratosthene 模板的旧实现）
 PDFEratostheneDescription=完整的订单模型
 PDFEdisonDescription=一份简单的订购模式
 PDFProformaDescription=完整的形式发票模板
@@ -172,22 +172,22 @@ OrderCreated=您的订单已创建
 OrderFail=您的订单创建期间发生了错误
 CreateOrders=创建订单
 ToBillSeveralOrderSelectCustomer=要为多个订单创建一张发票, 首先点击客户，然后选择  "%s".
-OptionToSetOrderBilledNotEnabled=Option from module Workflow, to set order to 'Billed' automatically when invoice is validated, is not enabled, so you will have to set the status of orders to 'Billed' manually after the invoice has been generated.
+OptionToSetOrderBilledNotEnabled=未启用工作流模块中用于在验证发票时自动将订单设置为“已开票”的选项，因此您必须在生成发票后手动将订单状态设置为“已开票”。
 IfValidateInvoiceIsNoOrderStayUnbilled=如果发票确认为“否”，则在验证发票之前，订单将保持为“未开票”状态。
 CloseReceivedSupplierOrdersAutomatically=如果收到所有产品，则会自动将订单关闭为状态“%s”。
-SetShippingMode=设置送货方式
+SetShippingMode=设置货运方式
 WithReceptionFinished=收货已结束
 #### supplier orders status
 StatusSupplierOrderCanceledShort=已取消
 StatusSupplierOrderDraftShort=草稿
 StatusSupplierOrderValidatedShort=批准
 StatusSupplierOrderSentShort=过程中
-StatusSupplierOrderSent=运输处理中
+StatusSupplierOrderSent=发货中
 StatusSupplierOrderOnProcessShort=已下订单
 StatusSupplierOrderProcessedShort=处理完毕
-StatusSupplierOrderDelivered=已递送
-StatusSupplierOrderDeliveredShort=已递送
-StatusSupplierOrderToBillShort=已递送
+StatusSupplierOrderDelivered=已交货
+StatusSupplierOrderDeliveredShort=已交货
+StatusSupplierOrderToBillShort=已交货
 StatusSupplierOrderApprovedShort=已获批准
 StatusSupplierOrderRefusedShort=已被拒绝
 StatusSupplierOrderToProcessShort=待处理
@@ -199,10 +199,10 @@ StatusSupplierOrderValidated=批准
 StatusSupplierOrderOnProcess=已下订单 - 等待接收
 StatusSupplierOrderOnProcessWithValidation=已下订单 - 等待接收或确认
 StatusSupplierOrderProcessed=处理完毕
-StatusSupplierOrderToBill=已递送
+StatusSupplierOrderToBill=已交货
 StatusSupplierOrderApproved=已获批准
 StatusSupplierOrderRefused=已被拒绝
 StatusSupplierOrderReceivedPartially=部分收到
 StatusSupplierOrderReceivedAll=所有收到的产品
-NeedAtLeastOneInvoice = There has to be at least one Invoice
+NeedAtLeastOneInvoice = 必须至少有一张发票
 LineAlreadyDispatched = 已收到订单行。
diff --git a/htdocs/langs/zh_CN/other.lang b/htdocs/langs/zh_CN/other.lang
index a21d3a39e0c..cf686f58933 100644
--- a/htdocs/langs/zh_CN/other.lang
+++ b/htdocs/langs/zh_CN/other.lang
@@ -41,7 +41,7 @@ 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_CLOSE=Sales order delivered
+Notify_ORDER_CLOSE=销售订单已交货
 Notify_ORDER_SUPPLIER_SENTBYMAIL=Purchase order sent by email
 Notify_ORDER_SUPPLIER_VALIDATE=Purchase order recorded
 Notify_ORDER_SUPPLIER_APPROVE=Purchase order approved
@@ -65,11 +65,11 @@ Notify_BILL_SUPPLIER_PAYED=Vendor invoice paid
 Notify_BILL_SUPPLIER_SENTBYMAIL=Vendor invoice sent by mail
 Notify_BILL_SUPPLIER_CANCELED=Vendor invoice cancelled
 Notify_CONTRACT_VALIDATE=合同验证
-Notify_FICHINTER_VALIDATE=干预验证
-Notify_FICHINTER_ADD_CONTACT=添加联系人到干预
-Notify_FICHINTER_SENTBYMAIL=通过邮件发送的干预
-Notify_SHIPPING_VALIDATE=送货验证
-Notify_SHIPPING_SENTBYMAIL=通过电子邮件发送送货信息资料
+Notify_FICHINTER_VALIDATE=现场服务已验证
+Notify_FICHINTER_ADD_CONTACT=为现场服务添加联系人
+Notify_FICHINTER_SENTBYMAIL=通过邮件发送的现场服务
+Notify_SHIPPING_VALIDATE=货运单已验证
+Notify_SHIPPING_SENTBYMAIL=通过邮件发送的货运单
 Notify_MEMBER_VALIDATE=会员已验证
 Notify_MEMBER_MODIFY=会员已修改
 Notify_MEMBER_SUBSCRIPTION=会员已订阅
@@ -83,14 +83,14 @@ Notify_EXPENSE_REPORT_VALIDATE=Expense report validated (approval required)
 Notify_EXPENSE_REPORT_APPROVE=Expense report approved
 Notify_HOLIDAY_VALIDATE=Leave request validated (approval required)
 Notify_HOLIDAY_APPROVE=Leave request approved
-Notify_ACTION_CREATE=Added action to Agenda
+Notify_ACTION_CREATE=操作已添加到日程中
 SeeModuleSetup=参见模块设置 %s
 NbOfAttachedFiles=所附文件数/文件
 TotalSizeOfAttachedFiles=所附文件/文档的总大小
 MaxSize=最大尺寸
 AttachANewFile=添加一个新附件
 LinkedObject=链接对象
-NbOfActiveNotifications=Number of notifications (no. of recipient emails)
+NbOfActiveNotifications=通知数量（收件人电子邮件数量）
 PredefinedMailTest=__(Hello)__\n这是一封发送给 __EMAIL__ 的测试邮件。\n行间使用回车符分隔。\n\n__USER_SIGNATURE__
 PredefinedMailTestHtml=__(Hello)__<br>这是一封发送给 __EMAIL__ 的<b>测试</b>邮件（测试两个字必须用粗体）<br>行间使用回车符分隔。<br><br>__USER_SIGNATURE__
 PredefinedMailContentContract=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
@@ -101,8 +101,8 @@ PredefinedMailContentSendSupplierProposal=__(Hello)__\n\nPlease find price reque
 PredefinedMailContentSendOrder=__(Hello)__\n\n请查收附件中的订单 __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierOrder=__(Hello)__\n\n请查收附件中的我们的订单 __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierInvoice=__(Hello)__\n\n请查收附件中的发票 __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendShipping=__(Hello)__\n\nPlease find shipping __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendFichInter=__(Hello)__\n\nPlease find intervention __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendShipping=__（你好）__\n\n请查收附件中的货运单 __REF__\n\n\n__（真挚地）__\n\n__用户_签名__
+PredefinedMailContentSendFichInter=__（你好）__\n\n请查阅附件 __REF__ 的现场服务\n\n\n__（真挚地）__\n\n__用户_签名__
 PredefinedMailContentLink=如果尚未完成，您可以点击下面的链接进行付款。\n\n%s\n\n
 PredefinedMailContentGeneric=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendActionComm=Event reminder "__EVENT_LABEL__" on __EVENT_DATE__ at __EVENT_TIME__<br><br>This is an automatic message, please do not reply.
@@ -196,8 +196,8 @@ NumberOf=Number of %s
 NumberOfUnits=Number of units on %s
 AmountIn=Amount in %s
 NumberOfUnitsMos=Number of units to produce in manufacturing orders
-EMailTextInterventionAddedContact=A new intervention %s has been assigned to you.
-EMailTextInterventionValidated=干预%s已被验证。
+EMailTextInterventionAddedContact=已为您分配了新的现场服务 %s。
+EMailTextInterventionValidated=现场服务 %s 已验证。
 EMailTextInvoiceValidated=Invoice %s has been validated.
 EMailTextInvoicePayed=Invoice %s has been paid.
 EMailTextProposalValidated=Proposal %s has been validated.
@@ -206,18 +206,18 @@ EMailTextProposalClosedSignedWeb=Proposal %s has been closed signed on portal pa
 EMailTextProposalClosedRefused=Proposal %s has been closed refused.
 EMailTextProposalClosedRefusedWeb=Proposal %s has been closed refuse on portal page.
 EMailTextOrderValidated=Order %s has been validated.
-EMailTextOrderClose=Order %s has been delivered.
+EMailTextOrderClose=订单 %s 已交货。
 EMailTextOrderApproved=Order %s has been approved.
 EMailTextOrderValidatedBy=Order %s has been recorded by %s.
 EMailTextOrderApprovedBy=Order %s has been approved by %s.
 EMailTextOrderRefused=Order %s has been refused.
 EMailTextOrderRefusedBy=Order %s has been refused by %s.
-EMailTextExpeditionValidated=Shipping %s has been validated.
+EMailTextExpeditionValidated=货运单 %s 已验证。
 EMailTextExpenseReportValidated=Expense report %s has been validated.
 EMailTextExpenseReportApproved=Expense report %s has been approved.
 EMailTextHolidayValidated=Leave request %s has been validated.
 EMailTextHolidayApproved=Leave request %s has been approved.
-EMailTextActionAdded=The action %s has been added to the Agenda.
+EMailTextActionAdded=操作 %s 已添加到日程中。
 ImportedWithSet=输入数据集
 DolibarrNotification=自动通知
 ResizeDesc=输入新的高度新的宽度<b>或</b> 。比率将维持在调整大小...
@@ -266,7 +266,7 @@ ThirdPartyCreatedByEmailCollector=Third party created by email collector from em
 ContactCreatedByEmailCollector=Contact/address created by email collector from email MSGID %s
 ProjectCreatedByEmailCollector=Project created by email collector from email MSGID %s
 TicketCreatedByEmailCollector=电子邮件收集器根据电子邮件 MSGID %s 创建的服务工单 
-OpeningHoursFormatDesc=Use a - to separate opening and closing hours.<br>Use a space to enter different ranges.<br>Example: 8-12 14-18
+OpeningHoursFormatDesc=使用 - 分隔营业开始时间和营业结束时间。 <br> 使用空格分割输入的不同的范围。 <br> 示例：8-12 14-18
 SuffixSessionName=Suffix for session name
 LoginWith=Login with %s
 
@@ -297,10 +297,10 @@ NbOfQtyInOrders=Qty in orders
 SelectTheTypeOfObjectToAnalyze=Select an object to view its statistics...
 
 ConfirmBtnCommonContent = Are you sure you want to "%s" ?
-ConfirmBtnCommonTitle = Confirm your action
+ConfirmBtnCommonTitle = 确认您的操作
 CloseDialog = 关闭
 Autofill = Autofill
-OrPasteAnURL=or Paste an URL
+OrPasteAnURL=或粘贴 URL
 
 # externalsite
 ExternalSiteSetup=设置链接到外部网站
diff --git a/htdocs/langs/zh_CN/partnership.lang b/htdocs/langs/zh_CN/partnership.lang
index af18f5c2ba4..7d3d8749e6d 100644
--- a/htdocs/langs/zh_CN/partnership.lang
+++ b/htdocs/langs/zh_CN/partnership.lang
@@ -16,82 +16,82 @@
 #
 # Generic
 #
-ModulePartnershipName=Partnership management
-PartnershipDescription=Module Partnership management
-PartnershipDescriptionLong= Module Partnership management
-Partnership=合伙
-Partnerships=Partnerships
-AddPartnership=Add partnership
+ModulePartnershipName=合作伙伴管理
+PartnershipDescription=合作伙伴模块管理
+PartnershipDescriptionLong= 合作伙伴模块管理
+Partnership=合作伙伴
+Partnerships=合作伙伴
+AddPartnership=添加合作伙伴
 CancelPartnershipForExpiredMembers=合作伙伴：取消订阅已过期会员的合作伙伴关系
-PartnershipCheckBacklink=Partnership: Check referring backlink
+PartnershipCheckBacklink=合作伙伴：检查引用反向链接
 
 #
 # Menu
 #
-NewPartnership=New Partnership
-NewPartnershipbyWeb=Your partnership request has been added successfully. We may contact you soon...
-ListOfPartnerships=List of partnership
+NewPartnership=新建合作伙伴
+NewPartnershipbyWeb=您的合作伙伴请求已成功添加。我们会尽快与您联系...
+ListOfPartnerships=合作伙伴清单
 
 #
 # Admin page
 #
-PartnershipSetup=Partnership setup
-PartnershipAbout=About Partnership
-PartnershipAboutPage=Partnership about page
+PartnershipSetup=合作伙伴设置
+PartnershipAbout=关于合作伙伴
+PartnershipAboutPage=合作伙伴关于页面
 partnershipforthirdpartyormember=合作伙伴状态必须设置为“合作方”或“会员”
-PARTNERSHIP_IS_MANAGED_FOR=Partnership managed for
-PARTNERSHIP_BACKLINKS_TO_CHECK=Backlinks to check
-PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL=Nb of days before cancelling status of a partnership when a subscription has expired
-ReferingWebsiteCheck=Check of website referring
-ReferingWebsiteCheckDesc=You can enable a feature to check that your partners has added a backlink to your website domains on their own website.
-PublicFormRegistrationPartnerDesc=Dolibarr can provide you a public URL/website to allow external visitors to request to be part of the partnership program.
+PARTNERSHIP_IS_MANAGED_FOR=合作伙伴管理
+PARTNERSHIP_BACKLINKS_TO_CHECK=要检查的反向链接
+PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL=订阅过期后取消合作伙伴关系状态之前的 Nb 天
+ReferingWebsiteCheck=检查网站引用情况
+ReferingWebsiteCheckDesc=您可以启用一项功能来检查您的合作伙伴是否在其自己的网站上添加了指向您网站域的反向链接。
+PublicFormRegistrationPartnerDesc=Dolibarr 可以为您提供一个公共 URL/网站，以允许外部访问者请求加入合作伙伴计划。
 
 #
 # Object
 #
-DeletePartnership=Delete a partnership
-PartnershipDedicatedToThisThirdParty=Partnership dedicated to this third party
+DeletePartnership=删除合作伙伴
+PartnershipDedicatedToThisThirdParty=致力于该合作方的合作伙伴
 PartnershipDedicatedToThisMember=致力于该会员的合作伙伴关系
 DatePartnershipStart=开始日期
 DatePartnershipEnd=结束日期
-ReasonDecline=Decline reason
-ReasonDeclineOrCancel=Decline reason
-PartnershipAlreadyExist=Partnership already exist
-ManagePartnership=Manage partnership
-BacklinkNotFoundOnPartnerWebsite=Backlink not found on partner website
-ConfirmClosePartnershipAsk=Are you sure you want to cancel this partnership?
-PartnershipType=Partnership type
-PartnershipRefApproved=Partnership %s approved
-KeywordToCheckInWebsite=If you want to check that a given keyword is present into the website of each partner, define this keyword here
+ReasonDecline=拒绝原因
+ReasonDeclineOrCancel=拒绝原因
+PartnershipAlreadyExist=合作伙伴已存在
+ManagePartnership=管理合作伙伴
+BacklinkNotFoundOnPartnerWebsite=在合作伙伴网站上找不到反向链接
+ConfirmClosePartnershipAsk=您确定要取消此合作伙伴关系吗？
+PartnershipType=合作伙伴类型
+PartnershipRefApproved=合作伙伴请求 %s 已批准
+KeywordToCheckInWebsite=如果您想检查每个合作伙伴的网站中是否存在给定的关键字，请在此处定义该关键字
 PartnershipDraft=草稿
 PartnershipAccepted=接受
 PartnershipRefused=已被拒绝
 PartnershipCanceled=已取消
-PartnershipManagedFor=Partners are
+PartnershipManagedFor=合作伙伴是
 
 #
 # Template Mail
 #
-SendingEmailOnPartnershipWillSoonBeCanceled=Partnership will soon be canceled
-SendingEmailOnPartnershipRefused=Partnership refused
-SendingEmailOnPartnershipAccepted=Partnership accepted
-SendingEmailOnPartnershipCanceled=Partnership canceled
+SendingEmailOnPartnershipWillSoonBeCanceled=合作伙伴关系将很快被取消
+SendingEmailOnPartnershipRefused=合作伙伴请求已拒绝
+SendingEmailOnPartnershipAccepted=合作伙伴请求已接受
+SendingEmailOnPartnershipCanceled=合作伙伴关系已取消
 
-YourPartnershipWillSoonBeCanceledTopic=Partnership will soon be canceled
-YourPartnershipRefusedTopic=Partnership refused
-YourPartnershipAcceptedTopic=Partnership accepted
-YourPartnershipCanceledTopic=Partnership canceled
+YourPartnershipWillSoonBeCanceledTopic=合作伙伴关系将很快被取消
+YourPartnershipRefusedTopic=合作伙伴请求已拒绝
+YourPartnershipAcceptedTopic=合作伙伴请求已接受
+YourPartnershipCanceledTopic=合作伙伴关系已取消
 
-YourPartnershipWillSoonBeCanceledContent=We inform you that your partnership will soon be canceled (Backlink not found)
-YourPartnershipRefusedContent=We inform you that your partnership request has been refused.
-YourPartnershipAcceptedContent=We inform you that your partnership request has been accepted.
-YourPartnershipCanceledContent=We inform you that your partnership has been canceled.
+YourPartnershipWillSoonBeCanceledContent=我们通知您，您的合作伙伴关系即将被取消（未找到反向链接）
+YourPartnershipRefusedContent=我们通知您，您的合作伙伴请求已被拒绝。
+YourPartnershipAcceptedContent=我们通知您，您的合作伙伴请求已被接受。
+YourPartnershipCanceledContent=我们通知您，您的合作伙伴关系已被取消。
 
-CountLastUrlCheckError=Number of errors for last URL check
-LastCheckBacklink=Date of last URL check
-ReasonDeclineOrCancel=Decline reason
+CountLastUrlCheckError=上次 URL 检查的错误数
+LastCheckBacklink=上次 URL 检查的日期
+ReasonDeclineOrCancel=拒绝原因
 
-NewPartnershipRequest=New partnership request
-NewPartnershipRequestDesc=This form allows you to request to be part of one of our partnership program. If you need help to fill this form, please contact by email <b>%s</b>.
-ThisUrlMustContainsAtLeastOneLinkToWebsite=This page must contains at least one link to one of the following domain: %s
+NewPartnershipRequest=新建合作伙伴请求
+NewPartnershipRequestDesc=通过此表单，您可以申请加入我们的合作伙伴计划。如果您需要帮助填写此表单，请通过电子邮件 <b> %s </b> 联系。
+ThisUrlMustContainsAtLeastOneLinkToWebsite=此页面必须至少包含一个指向以下域之一的链接：%s
 
diff --git a/htdocs/langs/zh_CN/productbatch.lang b/htdocs/langs/zh_CN/productbatch.lang
index 478de9a9c67..56444433f01 100644
--- a/htdocs/langs/zh_CN/productbatch.lang
+++ b/htdocs/langs/zh_CN/productbatch.lang
@@ -26,22 +26,22 @@ ShowCurrentStockOfLot=显示成对产品/批次的当前库存
 ShowLogOfMovementIfLot=显示对产品/批次的调拨日志
 StockDetailPerBatch=每批库存详情
 SerialNumberAlreadyInUse=序列号%s已经被产品%s使用
-TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
-ManageLotMask=Custom mask
-CustomMasks=Option to define a different numbering mask for each product
+TooManyQtyForSerialNumber=您只能拥有一件序列号为 %s 的产品 %s
+ManageLotMask=自定义掩码
+CustomMasks=可以为每个产品定义不同的编号掩码
 BatchLotNumberingModules=自动生成批号的编号规则
-BatchSerialNumberingModules=Numbering rule for automatic generation of serial number (for products with property 1 unique lot/serial for each product)
-QtyToAddAfterBarcodeScan=Qty to %s for each barcode/lot/serial scanned
+BatchSerialNumberingModules=自动生成序列号的编号规则（适用于每个产品具有 1 个唯一批次/序列号的产品）
+QtyToAddAfterBarcodeScan=每个扫描的条形码/批次/序列号的数量为 %s
 LifeTime=有效期（天）
 EndOfLife=已过期
 ManufacturingDate=生产日期
 DestructionDate=销毁日期
 FirstUseDate=首次使用日期
-QCFrequency=Quality control frequency (in days)
+QCFrequency=质量控制频率（以天为单位）
 ShowAllLots=显示所有批号
 HideLots=隐藏批号
 #Traceability - qc status
-OutOfOrder=Out of order
-InWorkingOrder=In working order
+OutOfOrder=乱序
+InWorkingOrder=在生产订单中
 ToReplace=替换
-CantMoveNonExistantSerial=错误。您要求移动不存在的连续记录。可能您在同一个仓库同一个发货单多次发货同一批次的货，或者它已被另一个发货单使用过。移除该发货单并准备另一个。
+CantMoveNonExistantSerial=错误。您要求移动不存在的连续记录。可能您在同一个仓库同一个发货单多次发货同一批次的货，或者它已被另一个发货单使用过。请移除该发货单并准备另一个发货单。
diff --git a/htdocs/langs/zh_CN/products.lang b/htdocs/langs/zh_CN/products.lang
index 7c63298e132..ed1631fe50e 100644
--- a/htdocs/langs/zh_CN/products.lang
+++ b/htdocs/langs/zh_CN/products.lang
@@ -395,7 +395,7 @@ CloneDestinationReference=目的地产品参考
 ErrorCopyProductCombinations=复制产品变体时出错
 ErrorDestinationProductNotFound=找不到目的地产品
 ErrorProductCombinationNotFound=未找到产品变体
-ActionAvailableOnVariantProductOnly=Action only available on the variant of product
+ActionAvailableOnVariantProductOnly=操作仅适用于产品变体
 ProductsPricePerCustomer=Product prices per customers
 ProductSupplierExtraFields=Additional Attributes (Supplier Prices)
 DeleteLinkedProduct=Delete the child product linked to the combination
diff --git a/htdocs/langs/zh_CN/projects.lang b/htdocs/langs/zh_CN/projects.lang
index d066ef7afc8..a666f541473 100644
--- a/htdocs/langs/zh_CN/projects.lang
+++ b/htdocs/langs/zh_CN/projects.lang
@@ -35,8 +35,8 @@ ConfirmDeleteATask=您确定要删除该任务吗？
 OpenedProjects=打开项目
 OpenedProjectsOpportunities=打开商机
 OpenedTasks=打开任务
-OpportunitiesStatusForOpenedProjects=按已打开项目的状态计算商机金额
-OpportunitiesStatusForProjects=按项目状态计算的商机金额
+OpportunitiesStatusForOpenedProjects=按状态计算已打开项目的商机金额
+OpportunitiesStatusForProjects=按状态计算项目的商机金额
 ShowProject=显示项目
 ShowTask=显示任务
 SetThirdParty=设置合作方
@@ -101,8 +101,8 @@ ListPredefinedInvoicesAssociatedProject=与项目相关的客户发票模板清
 ListSupplierOrdersAssociatedProject=与项目相关的采购订单清单
 ListSupplierInvoicesAssociatedProject=与项目相关的供应商发票清单
 ListContractAssociatedProject=与项目相关的合同清单
-ListShippingAssociatedProject=与项目相关的发货清单
-ListFichinterAssociatedProject=与项目相关的介入措施清单
+ListShippingAssociatedProject=与项目相关的货运清单
+ListFichinterAssociatedProject=与项目相关的现场服务清单
 ListExpenseReportsAssociatedProject=与项目相关的费用报销单清单
 ListDonationsAssociatedProject=与项目相关的捐献清单
 ListVariousPaymentsAssociatedProject=与项目相关的杂项付款清单
@@ -267,7 +267,7 @@ TimeSpentForInvoice=工时
 OneLinePerUser=每个用户一行
 ServiceToUseOnLines=默认情况下行上使用的服务
 InvoiceGeneratedFromTimeSpent=发票 %s 已根据项目的工时费用生成
-InterventionGeneratedFromTimeSpent=介入措施 %s 是根据项目的工时费用生成的
+InterventionGeneratedFromTimeSpent=现场服务 %s 是根据项目工时生成的
 ProjectBillTimeDescription=选择此项，可以输入项目任务的工时，并且能从工时表中生成发票，用以向项目客户开具发票（不选此项，不能创建基于输入工时表的发票）。注意：要生成发票，请前往项目的“工时”标签页并选择要包含的行。
 ProjectFollowOpportunity=跟踪商机
 ProjectFollowTasks=跟踪任务或工时
@@ -276,9 +276,9 @@ UsageOpportunity=用途：商机
 UsageTasks=用途：任务
 UsageBillTimeShort=用途：工时计费
 InvoiceToUse=使用的发票草稿
-InterToUse=使用的介入草稿
+InterToUse=使用的现场服务草案
 NewInvoice=新建发票
-NewInter=新建干预
+NewInter=新建现场服务
 OneLinePerTask=每个任务一行
 OneLinePerPeriod=每个周期一行
 OneLinePerTimeSpentLine=每笔工时申报一行
diff --git a/htdocs/langs/zh_CN/propal.lang b/htdocs/langs/zh_CN/propal.lang
index 1d1108d4cc6..52c3b7a97f8 100644
--- a/htdocs/langs/zh_CN/propal.lang
+++ b/htdocs/langs/zh_CN/propal.lang
@@ -19,7 +19,7 @@ LastPropals=最近新增的 %s 份报价单
 LastModifiedProposals=最近修改的 %s 份报价单
 AllPropals=全部报价单
 SearchAProposal=搜索报价单
-NoProposal=空空如也——没有报价
+NoProposal=无报价单
 ProposalsStatistics=报价单统计
 NumberOfProposalsByMonth=月数量
 AmountOfProposalsByMonthHT=Amount by month (excl. tax)
@@ -33,7 +33,7 @@ PropalStatusSigned=已签署(待付款)
 PropalStatusNotSigned=未签署(已关闭)
 PropalStatusBilled=已到账
 PropalStatusDraftShort=草稿
-PropalStatusValidatedShort=Validated (open)
+PropalStatusValidatedShort=已验证（打开）
 PropalStatusClosedShort=已禁用
 PropalStatusSignedShort=已签署
 PropalStatusNotSignedShort=未签署
@@ -56,7 +56,7 @@ CreateEmptyPropal=创建空的报价单或从产品/服务列表中创建
 DefaultProposalDurationValidity=默认报价单有效期(按天计算)
 DefaultPuttingPricesUpToDate=By default update prices with current known prices on cloning a proposal
 DefaultPuttingDescUpToDate=By default update descriptions with current known descriptions on cloning a proposal
-UseCustomerContactAsPropalRecipientIfExist=Use contact/address with type 'Contact following-up proposal' if defined instead of third party address as proposal recipient address
+UseCustomerContactAsPropalRecipientIfExist=如果已定义，请使用类型为“跟进报价联系人”的联系人/地址，而不是使用合作方地址作为报价单收件人地址
 ConfirmClonePropal=您确定要克隆报价单<b>%s</b>吗？
 ConfirmReOpenProp=您确定要重新打开报价单<b>%s</b>吗？
 ProposalsAndProposalsLines=报价单和报价项目
@@ -75,10 +75,10 @@ AvailabilityTypeAV_3W=3 周
 AvailabilityTypeAV_1M=1 个月
 
 ##### Types ofe contacts #####
-TypeContact_propal_internal_SALESREPFOLL=跟进报价的销售代表
+TypeContact_propal_internal_SALESREPFOLL=跟进报价单的销售代表
 TypeContact_propal_external_BILLING=客户账单联系人
-TypeContact_propal_external_CUSTOMER=跟进报价的客户联系人
-TypeContact_propal_external_SHIPPING=客户联系以便交付
+TypeContact_propal_external_CUSTOMER=跟进报价单的客户联系人
+TypeContact_propal_external_SHIPPING=交货的客户联系人
 
 # Document models
 CantBeNoSign=cannot be set not signed
@@ -96,10 +96,10 @@ DefaultModelPropalCreate=设置默认模板
 DefaultModelPropalToBill=关闭订单时使用的默认模板(待生成账单)
 DocModelAzurDescription=A complete proposal model (old implementation of Cyan template)
 DocModelCyanDescription=A complete proposal model
-FichinterSigned=Intervention signed
+FichinterSigned=现场服务已签署
 IdProduct=Product ID
 IdProposal=报价单 ID
-IsNotADraft=is not a draft
+IsNotADraft=不是草稿
 LineBuyPriceHT=Buy Price Amount net of tax for line
 NoSign=拒绝
 NoSigned=set not signed
@@ -113,7 +113,7 @@ ProposalsStatisticsSuppliers=Vendor proposals statistics
 RefusePropal=Refuse proposal
 Sign=Sign
 SignContract=Sign contract
-SignFichinter=Sign intervention
+SignFichinter=签署现场服务
 SignPropal=Accept proposal
 Signed=signed
 SignedOnly=Signed only
diff --git a/htdocs/langs/zh_CN/receptions.lang b/htdocs/langs/zh_CN/receptions.lang
index db073654c99..a1ca3f3e263 100644
--- a/htdocs/langs/zh_CN/receptions.lang
+++ b/htdocs/langs/zh_CN/receptions.lang
@@ -2,11 +2,11 @@
 ReceptionDescription=供应商收货单管理（创建收货单文件）
 ReceptionsSetup=供应商收货单设置
 RefReception=收货单编号
-Reception=论过程
-Receptions=收货
+Reception=收货单
+Receptions=收货单
 AllReceptions=全部收货单
-Reception=论过程
-Receptions=收货
+Reception=收货单
+Receptions=收货单
 ShowReception=显示收货单
 ReceptionsArea=收货单区
 ListOfReceptions=收货单清单
@@ -18,7 +18,7 @@ NumberOfReceptionsByMonth=每月收货单数
 ReceptionCard=收货单标签页
 NewReception=新建收货单
 CreateReception=创建收货单
-QtyInOtherReceptions=其他收货单数量
+QtyInOtherReceptions=其他收货单中的数量
 OtherReceptionsForSameOrder=此订单的其他收货单
 ReceptionsAndReceivingForSameOrder=此订单的收货和收货回单
 ReceptionsToValidate=收货验证
@@ -27,10 +27,10 @@ StatusReceptionDraft=草稿
 StatusReceptionValidated=已验证（即将收到或已收到的产品）
 StatusReceptionValidatedToReceive=已验证（要接收的产品）
 StatusReceptionValidatedReceived=已验证（产品已收到）
-StatusReceptionProcessed=处理完毕
+StatusReceptionProcessed=已处理
 StatusReceptionDraftShort=草稿
-StatusReceptionValidatedShort=批准
-StatusReceptionProcessedShort=处理完毕
+StatusReceptionValidatedShort=已验证
+StatusReceptionProcessedShort=已处理
 ReceptionSheet=收货单表单
 ValidateReception=验证收货单
 ConfirmDeleteReception=您确定要删除此收货单吗？
@@ -42,12 +42,12 @@ SendReceptionRef=提交收货单%s
 ActionsOnReception=收货单事件
 ReceptionCreationIsDoneFromOrder=目前，新收货单的创建是通过采购订单完成的。
 ReceptionLine=收货单行
-ProductQtyInReceptionAlreadySent=开放销售订单的产品数量已发送
-ProductQtyInSuppliersReceptionAlreadyRecevied=已收到未完结采购订单的产品数量
+ProductQtyInReceptionAlreadySent=已发货的未完成销售订单中的产品数量
+ProductQtyInSuppliersReceptionAlreadyRecevied=已收货的未完成采购订单中的产品数量
 ValidateOrderFirstBeforeReception=您必须先验证订单，然后才能创建收货单。
 ReceptionsNumberingModules=收货单编号模块
 ReceptionsReceiptModel=收货单文档模板
-NoMorePredefinedProductToDispatch=不再需要发送预定义产品
+NoMorePredefinedProductToDispatch=没有更多预定义的产品要配送
 ReceptionExist=存在收货单
 ReceptionBackToDraftInDolibarr=收货单 %s 回退到草稿状态
 ReceptionClassifyClosedInDolibarr=收货单 %s 分类为已关闭
diff --git a/htdocs/langs/zh_CN/resource.lang b/htdocs/langs/zh_CN/resource.lang
index 559d8a02faf..eb282a71c79 100644
--- a/htdocs/langs/zh_CN/resource.lang
+++ b/htdocs/langs/zh_CN/resource.lang
@@ -1,39 +1,39 @@
 # Dolibarr language file - Source file is en_US - resource
 MenuResourceIndex=资源
-MenuResourceAdd=新的资源
+MenuResourceAdd=新建资源
 DeleteResource=删除资源
-ConfirmDeleteResourceElement=确认从这个元素中删除资源
-NoResourceInDatabase=数据库中无资源
-NoResourceLinked=无资源链接
-ActionsOnResource=有关此资源的事件
-ResourcePageIndex=资源列表
+ConfirmDeleteResourceElement=确认删除该元素的资源
+NoResourceInDatabase=数据库中没有资源。
+NoResourceLinked=没有资源被链接
+ActionsOnResource=关于该资源的事件
+ResourcePageIndex=资源清单
 ResourceSingular=资源
 ResourceCard=资源信息卡
 AddResource=新建资源
 ResourceFormLabel_ref=资源名称
-ResourceType=资源类别
+ResourceType=资源类型
 ResourceFormLabel_description=资源描述
 
-ResourcesLinkedToElement=资源链接到元素
+ResourcesLinkedToElement=已链接到元素的资源
 
 ShowResource=显示资源
 
 ResourceElementPage=元素资源
-ResourceCreatedWithSuccess=资源成功创建
-RessourceLineSuccessfullyDeleted=资源明细成功删除
-RessourceLineSuccessfullyUpdated=资源明细成功更新
-ResourceLinkedWithSuccess=资源链接成功
+ResourceCreatedWithSuccess=资源已成功创建
+RessourceLineSuccessfullyDeleted=资源行已成功删除
+RessourceLineSuccessfullyUpdated=资源行已成功更新
+ResourceLinkedWithSuccess=已成功链接到资源
 
-ConfirmDeleteResource=确认删除这个资源
-RessourceSuccessfullyDeleted=资源成功删除
-DictionaryResourceType=资源类别
+ConfirmDeleteResource=确认删除该资源
+RessourceSuccessfullyDeleted=资源已成功删除
+DictionaryResourceType=资源类型
 
-SelectResource=请选择资源
+SelectResource=选择资源
 
-IdResource=Id资源
+IdResource=资源 ID
 AssetNumber=序列号
 ResourceTypeCode=资源类型代码
 ImportDataset_resource_1=资源
 
-ErrorResourcesAlreadyInUse=有些资源正在使用中
-ErrorResourceUseInEvent=%s被用于%s事件
+ErrorResourcesAlreadyInUse=一些资源正在使用中
+ErrorResourceUseInEvent=%s 被用于 %s 事件
diff --git a/htdocs/langs/zh_CN/sendings.lang b/htdocs/langs/zh_CN/sendings.lang
index 4e8226dabc2..afb57366e7c 100644
--- a/htdocs/langs/zh_CN/sendings.lang
+++ b/htdocs/langs/zh_CN/sendings.lang
@@ -1,81 +1,81 @@
 # Dolibarr language file - Source file is en_US - sendings
-RefSending=运输编号
-Sending=运输
-Sendings=运输
-AllSendings=全部运输
-Shipment=运输
-Shipments=运输
-ShowSending=显示运输
-Receivings=交货回单
-SendingsArea=出货区
-ListOfSendings=运输列表
-SendingMethod=运输方式
-LastSendings=最近新增的 %s 份发运单
-StatisticsOfSendings=统计出货量
-NbOfSendings=出货数量
-NumberOfShipmentsByMonth=每月的出货数量
-SendingCard=运输信息卡
-NewSending=新建运输
-CreateShipment=创建货件
-QtyShipped=出货数量
-QtyShippedShort=数量船。
-QtyPreparedOrShipped=数量（准备或发货）
-QtyToShip=出货数量
-QtyToReceive=接收数量
-QtyReceived=收到的数量
-QtyInOtherShipments=数量（其他运输）
-KeepToShip=继续发货
-KeepToShipShort=保留
-OtherSendingsForSameOrder=这个订单的其他运输
-SendingsAndReceivingForSameOrder=此订单的发运和收货
-SendingsToValidate=运输验证
-StatusSendingCanceled=取消
+RefSending=发货单编号
+Sending=发货
+Sendings=发货单
+AllSendings=全部发货单
+Shipment=发货
+Shipments=发货单
+ShowSending=显示发货单
+Receivings=交货回执
+SendingsArea=发货单区
+ListOfSendings=发货单清单
+SendingMethod=货物运输方式
+LastSendings=最近的 %s 份发货单
+StatisticsOfSendings=发货单统计
+NbOfSendings=发货单数量
+NumberOfShipmentsByMonth=每月发货单数量
+SendingCard=发货信息卡
+NewSending=新建发货单
+CreateShipment=创建发货单
+QtyShipped=已发货数量
+QtyShippedShort=发货数量
+QtyPreparedOrShipped=已准备或已发货数量
+QtyToShip=发货数量
+QtyToReceive=交货数量
+QtyReceived=已交货数量
+QtyInOtherShipments=其他发货单数量
+KeepToShip=待发货
+KeepToShipShort=等待
+OtherSendingsForSameOrder=此订单的其他发货单
+SendingsAndReceivingForSameOrder=此订单的发货单和交货回执
+SendingsToValidate=待验证的发货单
+StatusSendingCanceled=已取消
 StatusSendingCanceledShort=已取消
 StatusSendingDraft=草稿
-StatusSendingValidated=验证（产品出货或已经出货）
-StatusSendingProcessed=加工
+StatusSendingValidated=已验证（待发货或已发货的产品）
+StatusSendingProcessed=已处理
 StatusSendingDraftShort=草稿
-StatusSendingValidatedShort=验证
-StatusSendingProcessedShort=加工
-SendingSheet=运输表格
-ConfirmDeleteSending=您确定要删除此货件吗？
-ConfirmValidateSending=您确定要参考<b> %s </b>验证此货件吗？
-ConfirmCancelSending=您确定要取消此货件吗？
-DocumentModelMerou=Merou A5 model
-WarningNoQtyLeftToSend=警告，没有产品等待装运。
-StatsOnShipmentsOnlyValidated=统计数据只针对已验证的发货。使用的日期是确认发货的日期（计划交货日期并不总是知道）
-DateDeliveryPlanned=计划运输日期
-RefDeliveryReceipt=交货回单编号
-StatusReceipt=交货回单状态
-DateReceived=交货日期收到
+StatusSendingValidatedShort=已验证
+StatusSendingProcessedShort=已处理
+SendingSheet=发货单
+ConfirmDeleteSending=您确定要删除此发货单吗？
+ConfirmValidateSending=您确定要验证编号为 <b> %s </b> 的发货单吗？
+ConfirmCancelSending=您确定要取消此发货单吗？
+DocumentModelMerou=Merou A5 模板
+WarningNoQtyLeftToSend=警告，没有等待发货的产品。
+StatsOnShipmentsOnlyValidated=统计数据只针对已验证的发货单。使用的日期是确认发货的日期（计划交货日期并不总是已知的）
+DateDeliveryPlanned=计划交货日期
+RefDeliveryReceipt=交货回执编号
+StatusReceipt=交货回执状态
+DateReceived=收到交货的日期
 ClassifyReception=归类到已收货
-SendShippingByEMail=通过电子邮件发送
-SendShippingRef=提交运输 %s
-ActionsOnShipping=运输活动
-LinkToTrackYourPackage=链接到追踪您的包裹
-ShipmentCreationIsDoneFromOrder=目前，从销售订单记录中创建新的发货已完成。
-ShipmentLine=运输线路
-ProductQtyInCustomersOrdersRunning=开放销售订单的产品数量
-ProductQtyInSuppliersOrdersRunning=开放采购订单的产品数量
-ProductQtyInShipmentAlreadySent=开放销售订单的产品数量已发送
-ProductQtyInSuppliersShipmentAlreadyRecevied=开放采购订单的产品数量已收到
+SendShippingByEMail=通过电子邮件发送发货单
+SendShippingRef=提交发货单 %s
+ActionsOnShipping=发货单事件
+LinkToTrackYourPackage=跟踪您的包裹的链接
+ShipmentCreationIsDoneFromOrder=目前，新的发货单是从销售订单记录中创建的。
+ShipmentLine=发货单的行
+ProductQtyInCustomersOrdersRunning=未完成的销售订单的产品数量
+ProductQtyInSuppliersOrdersRunning=未完成的采购订单中的产品数量
+ProductQtyInShipmentAlreadySent=已发货的未完成销售订单中的产品数量
+ProductQtyInSuppliersShipmentAlreadyRecevied=已收货的未完成采购订单的产品数量
 NoProductToShipFoundIntoStock=仓库 <b> %s </b> 中找不到要发货的产品。纠正库存或返回选择另一个仓库。
 WeightVolShort=重量/体积
-ValidateOrderFirstBeforeShipment=您必须先验证订单才能发货。
+ValidateOrderFirstBeforeShipment=您必须先验证订单才能创建发货单。
 
 # Sending methods
 # ModelDocument
-DocumentModelTyphon=更完整的交货回单文档模型（logo...）
-DocumentModelStorm=更完整的交货回单和自定义属性兼容性的文档模型（logo...）
-Error_EXPEDITION_ADDON_NUMBER_NotDefined=没有定义的常数EXPEDITION_ADDON_NUMBER
-SumOfProductVolumes=产品总数
-SumOfProductWeights=产品总重
+DocumentModelTyphon=更完整的交货回执文档模板（logo...）
+DocumentModelStorm=更完整的交货回执并兼容自定义属性的文档模板（logo...）
+Error_EXPEDITION_ADDON_NUMBER_NotDefined=常量 EXPEDITION_ADDON_NUMBER 未定义
+SumOfProductVolumes=产品总体积
+SumOfProductWeights=产品总重量
 
 # warehouse details
 DetailWarehouseNumber= 仓库详情
-DetailWarehouseFormat= W：%s(数量：%d)
+DetailWarehouseFormat= 重量：%s(数量：%d)
 
-ShipmentDistribution=Shipment distribution
+ShipmentDistribution=发货单分布
 
-ErrorTooManyCombinationBatchcode=%s 行未调度，因为发现了太多组合仓库、产品、批次代码 (%s)。
-ErrorNoCombinationBatchcode=%s 行未调度，因为未找到组合仓库、产品、批次代码。
+ErrorTooManyCombinationBatchcode=行 %s 未配送，因为发现了太多的（%s）仓库、产品、批次代码的组合。
+ErrorNoCombinationBatchcode=行 %s 未配送，因为未找到仓库、产品、批次代码的组合。
diff --git a/htdocs/langs/zh_CN/sms.lang b/htdocs/langs/zh_CN/sms.lang
index 4d372db049c..dedf106e56d 100644
--- a/htdocs/langs/zh_CN/sms.lang
+++ b/htdocs/langs/zh_CN/sms.lang
@@ -28,7 +28,7 @@ TestSms=测试短信
 ValidSms=验证短信
 ApproveSms=批准短信
 SmsStatusDraft=草稿
-SmsStatusValidated=验证
+SmsStatusValidated=已验证
 SmsStatusApproved=批准
 SmsStatusSent=发送
 SmsStatusSentPartialy=发送部分
diff --git a/htdocs/langs/zh_CN/stocks.lang b/htdocs/langs/zh_CN/stocks.lang
index 8620c813c82..21a46ade5a7 100644
--- a/htdocs/langs/zh_CN/stocks.lang
+++ b/htdocs/langs/zh_CN/stocks.lang
@@ -12,19 +12,19 @@ AddWarehouse=创建仓库
 AddOne=添加
 DefaultWarehouse=默认仓库
 WarehouseTarget=目标仓库
-ValidateSending=Confirm shipment
-CancelSending=Cancel shipment
-DeleteSending=Delete shipment
+ValidateSending=确认发货单
+CancelSending=取消发货单
+DeleteSending=删除发货单
 Stock=库存
 Stocks=库存
 MissingStocks=缺少库存
 StockAtDate=当日库存
-StockAtDateInPast=Date in the past
-StockAtDateInFuture=Date in the future
+StockAtDateInPast=过去的日期
+StockAtDateInFuture=未来的日期
 StocksByLotSerial=按库存批号/序列号
 LotSerial=批号/序列号
 LotSerialList=批号/序列号列表
-SubjectToLotSerialOnly=Products subject to lot/serial only
+SubjectToLotSerialOnly=产品仅受批次/序列号限制
 Movements=调拨
 ErrorWarehouseRefRequired=仓库参考名称为必填项
 ListOfWarehouses=仓库列表
@@ -36,10 +36,10 @@ ListMouvementStockProject=与项目相关的库存调拨清单
 StocksArea=仓库区
 AllWarehouses=所有仓库
 IncludeEmptyDesiredStock=还包括未定义期望库存的负库存
-IncludeAlsoDraftOrders=Include also draft orders
+IncludeAlsoDraftOrders=还包括草稿订单
 Location=位置
-LocationSummary=Short name of location
-NumberOfDifferentProducts=Number of unique products
+LocationSummary=地点简称
+NumberOfDifferentProducts=独特产品数量
 NumberOfProducts=产品总数
 LastMovement=最近库存调拨
 LastMovements=最近库存调拨
@@ -78,8 +78,8 @@ RuleForStockManagementDecrease=选择自动库存减少规则（即使激活了
 RuleForStockManagementIncrease=选择自动库存增加规则（即使激活自动增加规则，也始终可以手动增加库存）
 DeStockOnBill=在验证客户发票/贷方票据时减少实际库存
 DeStockOnValidateOrder=在验证销售订单时减少实际库存
-DeStockOnShipment=减少实际库存送货验证
-DeStockOnShipmentOnClosing=发货结束时减少实际库存
+DeStockOnShipment=在货运单验证时减少实际库存
+DeStockOnShipmentOnClosing=在货运单设置为关闭时减少实际库存
 ReStockOnBill=在验证供应商发票/贷方票据时增加实际库存
 ReStockOnValidateOrder=在批准采购订单时增加实际库存
 ReStockOnDispatchOrder=采购订单接收货物后，手动调度到仓库时增加实际库存
@@ -99,8 +99,8 @@ RealStockWillAutomaticallyWhen=实际库存将根据此规则进行修改（如
 VirtualStock=虚拟库存
 VirtualStockAtDate=未来某个日期的虚拟库存
 VirtualStockAtDateDesc=一旦所有计划在所选日期之前处理的挂单完成，虚拟库存就会完成
-VirtualStockDesc=虚拟库存是在执行所有未结/待处理操作（影响库存）后剩余的库存（收到的采购订单、发货的销售订单、生产的制造订单等）
-AtDate=At date
+VirtualStockDesc=虚拟库存是在执行所有未完成/待处理操作（影响库存）后剩余的库存（收到的采购订单、已发货的销售订单、生产的制造订单等）
+AtDate=日期
 IdWarehouse=仓库 ID
 DescWareHouse=仓库描述
 LieuWareHouse=仓库位置
@@ -119,7 +119,7 @@ PersonalStock=个人库存 %s
 ThisWarehouseIsPersonalStock=此仓库代表 %s %s 的个人库存
 SelectWarehouseForStockDecrease=选择用于减少库存的仓库
 SelectWarehouseForStockIncrease=选择用于增加库存的仓库
-NoStockAction=暂无现货的行动
+NoStockAction=无库存操作
 DesiredStock=期望库存
 DesiredStockDesc=此库存金额将是用于通过补货功能填充库存的值。
 StockToBuy=要订购
@@ -134,7 +134,7 @@ CurentSelectionMode=当前所选模式
 CurentlyUsingVirtualStock=虚拟库存
 CurentlyUsingPhysicalStock=实物库存
 RuleForStockReplenishment=库存补充规则
-SelectProductWithNotNullQty=Select at least one product with a qty not null and a vendor
+SelectProductWithNotNullQty=选择至少一种数量不为空的产品和供应商
 AlertOnly= 仅提醒
 IncludeProductWithUndefinedAlerts = 还包括未定义库存期望数量的产品的负库存，将其恢复为 0
 WarehouseForStockDecrease=仓库 <b> %s </b> 将用于库存减少
@@ -155,7 +155,7 @@ StockMovementRecorded=库存调拨已记录
 RuleForStockAvailability=库存要求规则
 StockMustBeEnoughForInvoice=库存水平必须足以将产品/服务添加到发票中（无论自动库存更改规则如何，在将行添加到发票中时都会对当前实际库存进行检查）
 StockMustBeEnoughForOrder=库存水平必须足以向订单添加产品/服务（无论自动库存更改规则如何，在向订单添加行时都会检查当前的实际库存）
-StockMustBeEnoughForShipment= 库存水平必须足以将产品/服务添加到装运中（无论自动库存更改规则如何，在向装运中添加行时都会对当前实际库存进行检查）
+StockMustBeEnoughForShipment= 库存量必须足以将产品/服务添加到发货单中（无论自动变更库存的规则如何，在向发货单中添加行时都会对当前实际库存进行检查）
 MovementLabel=调拨标签
 TypeMovement=调拨方向
 DateMovement=调拨日期
@@ -179,7 +179,7 @@ ProductStockWarehouseUpdated=正确更新警报和所需最佳库存的库存限
 ProductStockWarehouseDeleted=正确删除警报和所需最佳库存的库存限制
 ProductStockWarehouse=按产品和仓库划分的库存告警的阈值与期望最优库存
 AddNewProductStockWarehouse=设置警报和所需最佳库存的新限制
-AddStockLocationLine=Decrease quantity then click to split the line
+AddStockLocationLine=减少数量，然后单击拆分线
 InventoryDate=盘点日期
 Inventories=盘点
 NewInventory=新建盘点
@@ -200,21 +200,21 @@ inventoryDraft=* 执行中/running
 inventorySelectWarehouse=仓库选择
 inventoryConfirmCreate=创建
 inventoryOfWarehouse=盘点仓库：%s
-inventoryErrorQtyAdd=Error: one quantity is less than zero
+inventoryErrorQtyAdd=错误：一个数量小于零
 inventoryMvtStock=通过盘点
 inventoryWarningProductAlreadyExists=此产品已列入清单
 SelectCategory=分类筛选
-SelectFournisseur=Vendor filter
+SelectFournisseur=供应商过滤器
 inventoryOnDate=盘点
 INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=库存调拨将有盘点日期（而不是盘点验证日期）
 inventoryChangePMPPermission=允许更改产品的PMP值
 ColumnNewPMP=新单位PMP
 OnlyProdsInStock=请勿添加无库存产品
-TheoricalQty=Theorical qty
-TheoricalValue=Theorical qty
+TheoricalQty=理论数量
+TheoricalValue=理论数量
 LastPA=最后 BP
 CurrentPA=当前 BP
-RecordedQty=Recorded Qty
+RecordedQty=记录数量
 RealQty=实际数量
 RealValue=实际价值
 RegulatedQty=规范数量
@@ -222,7 +222,7 @@ AddInventoryProduct=将产品添加到盘点
 AddProduct=添加
 ApplyPMP=应用 PMP
 FlushInventory=刷新盘点
-ConfirmFlushInventory=Do you confirm this action?
+ConfirmFlushInventory=您确认要做此操作吗？
 InventoryFlushed=盘点已刷新
 ExitEditMode=退出版
 inventoryDeleteLine=删除行
@@ -231,51 +231,51 @@ ListInventory=名单
 StockSupportServices=库存管理支持服务
 StockSupportServicesDesc=默认情况下，您只能库存“产品”类型的产品。如果服务模块和此选项均已启用，您还可以库存“服务”类型的产品。
 ReceiveProducts=收到物品
-StockIncreaseAfterCorrectTransfer=Increase by correction/transfer
-StockDecreaseAfterCorrectTransfer=Decrease by correction/transfer
+StockIncreaseAfterCorrectTransfer=通过修正/转移而增加
+StockDecreaseAfterCorrectTransfer=因修正/转移而减少
 StockIncrease=库存增加
 StockDecrease=库存减少
 InventoryForASpecificWarehouse=指定仓库的盘点
 InventoryForASpecificProduct=指定产品的盘点
 StockIsRequiredToChooseWhichLotToUse=需要现有库存才能选择要使用的批次
-ForceTo=Force to
+ForceTo=强制
 AlwaysShowFullArbo=在仓库链接弹出窗口中显示仓库（父仓库）的完整路径（警告：这可能会大幅降低性能）
 StockAtDatePastDesc=您可以在此处查看过去给定日期的库存（实际库存）
 StockAtDateFutureDesc=您可以在这里查看未来指定日期的库存（虚拟库存）
 CurrentStock=当前库存
-InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
-UpdateByScaning=Complete real qty by scaning
-UpdateByScaningProductBarcode=Update by scan (product barcode)
-UpdateByScaningLot=Update by scan (lot|serial barcode)
+InventoryRealQtyHelp=将值设置为 0 以重置数量 <br> 将字段保留为空，或删除行以保持不变
+UpdateByScaning=扫码填写真实数量
+UpdateByScaningProductBarcode=扫码更新（产品条形码）
+UpdateByScaningLot=扫码更新（批次|序列条形码）
 DisableStockChangeOfSubProduct=在此调拨期间停止该套件所有子产品的库存变化。
 ImportFromCSV=导入调拨的 CSV 清单
-ChooseFileToImport=Upload file then click on the %s icon to select file as source import file...
+ChooseFileToImport=上传文件，然后单击 %s 图标选择文件作为源导入文件...
 SelectAStockMovementFileToImport=选择要导入的库存调拨文件
 InfoTemplateImport=上传的文件需要具有以下格式（* 为必填字段）：<br> 来源仓库* |目标仓库* |产品* |数量* |批次/序列号 <br> CSV 字符分隔符必须为 " <b> %s </b> "
 LabelOfInventoryMovemement=盘点%s
 ReOpen=重新打开
 ConfirmFinish=您确认关闭此盘点吗？这将生成所有库存调拨，以将您的库存更新为您输入盘点的实际数量。
-ObjectNotFound=%s not found
+ObjectNotFound=未找到 %s
 MakeMovementsAndClose=生成调拨并关闭
-AutofillWithExpected=Fill real quantity with expected quantity
+AutofillWithExpected=将实际数量填入预期数量
 ShowAllBatchByDefault=默认情况下，在产品的“库存”标签页上显示批次详细信息
 CollapseBatchDetailHelp=您可以在库存模块配置中设置批次详情默认显示
-ErrorWrongBarcodemode=Unknown Barcode mode
-ProductDoesNotExist=Product does not exist
+ErrorWrongBarcodemode=未知条形码模式
+ProductDoesNotExist=产品不存在
 ErrorSameBatchNumber=在盘点表中发现了多条批次号记录。无法知道要增加哪一个。
-ProductBatchDoesNotExist=Product with batch/serial does not exist
-ProductBarcodeDoesNotExist=Product with barcode does not exist
+ProductBatchDoesNotExist=此批次/序列号的产品不存在
+ProductBarcodeDoesNotExist=带有此条形码的产品不存在
 WarehouseId=仓库 ID
 WarehouseRef=仓库编号
 SaveQtyFirst=在询问创建库存调拨之前，首先保存实际盘点数量。
 ToStart=开始
 InventoryStartedShort=开始
-ErrorOnElementsInventory=Operation canceled for the following reason:
+ErrorOnElementsInventory=操作由于以下原因被取消：
 ErrorCantFindCodeInInventory=在盘点中找不到以下代码
-QtyWasAddedToTheScannedBarcode=Success !! The quantity was added to all the requested barcode. You can close the Scanner tool.
+QtyWasAddedToTheScannedBarcode=成功 ！！该数量已添加到所有请求的条形码中。您可以关闭扫描仪工具。
 StockChangeDisabled=库存变更已禁用
 NoWarehouseDefinedForTerminal=没有为终端定义仓库
-ClearQtys=Clear all quantities
+ClearQtys=清除所有数量
 ModuleStockTransferName=高级库存转移
 ModuleStockTransferDesc=库存转移的高级管理，生成转移表
 StockTransferNew=新建库存转移
@@ -289,13 +289,13 @@ ConfirmAddStock=通过转移%s增加库存
 ConfirmAddStockCancel=取消通过转移%s增加库存
 AddStockAllProduct=库存增加
 AddStockAllProductCancel=取消库存增加
-DatePrevueDepart=Intended date of departure
-DateReelleDepart=Real date of departure
-DatePrevueArrivee=Intended date of arrival
-DateReelleArrivee=Real date of arrival
+DatePrevueDepart=预计出发日期
+DateReelleDepart=实际出发日期
+DatePrevueArrivee=预计到达日期
+DateReelleArrivee=实际抵达日期
 HelpWarehouseStockTransferSource=如果设置了此仓库，则只有其本身及其子仓库可用作来源仓库
 HelpWarehouseStockTransferDestination=如果设置了此仓库，则只有其本身及其子仓库可用作目标仓库
-LeadTimeForWarning=Lead time before alert (in days)
+LeadTimeForWarning=告警的提前期（以天为单位）
 TypeContact_stocktransfer_internal_STFROM=库存转移的发送者
 TypeContact_stocktransfer_internal_STDEST=库存转移的接收者
 TypeContact_stocktransfer_internal_STRESP=库存转移的负责人
@@ -310,16 +310,16 @@ StockStransferDecrementedCancel=来源仓库的减少已取消
 StockStransferIncremented=已关闭 - 库存已转移
 StockStransferIncrementedShort=库存已转移
 StockStransferIncrementedShortCancel=目的仓库的增加已取消
-StockTransferNoBatchForProduct=Product %s doesn't use batch, clear batch on line and retry
+StockTransferNoBatchForProduct=产品%s未使用批次，请在线清除批次并重试
 StockTransferSetup = 库存转移模块配置
 Settings=设置
 StockTransferSetupPage = 库存转移模块配置页
 StockTransferRightRead=读取库存转移
 StockTransferRightCreateUpdate=创建/变更库存转移
 StockTransferRightDelete=删除库存转移
-BatchNotFound=Lot / serial not found for this product
+BatchNotFound=未找到该产品的批次/序列号
 StockMovementWillBeRecorded=库存调拨将被记录
 StockMovementNotYetRecorded=库存调拨不会受到此步骤的影响
 WarningThisWIllAlsoDeleteStock=警告，这也会销毁仓库中的所有库存数量
-DeleteBatch=Delete lot/serial
-ConfirmDeleteBatch=Are you sure you want to delete lot/serial ?
+DeleteBatch=删除批次/序列号
+ConfirmDeleteBatch=您确定要删除此批次/序列号吗？
diff --git a/htdocs/langs/zh_CN/stripe.lang b/htdocs/langs/zh_CN/stripe.lang
index 4a2d76d5549..67eeed4e97b 100644
--- a/htdocs/langs/zh_CN/stripe.lang
+++ b/htdocs/langs/zh_CN/stripe.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - stripe
 StripeSetup=Stripe模块设置
-StripeDesc=Offer your customers an online payment page for payments with credit/debit cards via <a href="https://www.stripe.com" target="_blank" rel="noopener noreferrer external">Stripe</a>. This can be used to allow your customers to make ad-hoc payments or for payments related to a particular Dolibarr object (invoice, order, ...)
+StripeDesc=通过 <a href="https://www.stripe.com" target="_blank" rel="noopener noreferrer external"> Stripe </a> 为您的客户提供信用卡/借记卡付款的在线支付页面。这可用于允许您的客户进行临时付款或与特定 Dolibarr 对象（发票、订单等）相关的付款
 StripeOrCBDoPayment=使用信用卡或Stripe付款
 FollowingUrlAreAvailableToMakePayments=以下网址可提供给客户的网页上，能够作出Dolibarr支付对象
 PaymentForm=付款方式
@@ -49,9 +49,9 @@ OAUTH_STRIPE_LIVE_ID=Stripe连接客户端ID（ca _...）
 BankAccountForBankTransfer=基金支付的银行账户
 StripeAccount=Stripe帐户
 StripeChargeList=Stripe费用清单
-StripeTransactionList=Stripe事务列表
+StripeTransactionList=Stripe 交易清单
 StripeCustomerId=Stripe客户ID
-StripePaymentId=Stripe payment id
+StripePaymentId=Stripe 付款 ID
 StripePaymentModes=Stripe支付模式
 LocalID=本地ID
 StripeID=Stripe ID
diff --git a/htdocs/langs/zh_CN/supplier_proposal.lang b/htdocs/langs/zh_CN/supplier_proposal.lang
index 9512c455ac9..8f0262107c8 100644
--- a/htdocs/langs/zh_CN/supplier_proposal.lang
+++ b/htdocs/langs/zh_CN/supplier_proposal.lang
@@ -6,13 +6,13 @@ CommRequest=询价申请
 CommRequests=询价申请
 SearchRequest=搜索申请
 DraftRequests=草稿
-SupplierProposalsDraft=供应商提案草案
+SupplierProposalsDraft=供应商报价单草案
 LastModifiedRequests=最近修改的 %s 份询价申请
 RequestsOpened=打开询价申请
-SupplierProposalArea=供应商提案区域
-SupplierProposalShort=供应商提案
-SupplierProposals=供应商提案
-SupplierProposalsShort=供应商提案
+SupplierProposalArea=供应商报价单区
+SupplierProposalShort=供应商报价单
+SupplierProposals=供应商报价单
+SupplierProposalsShort=供应商报价单
 AskPrice=询价申请
 NewAskPrice=新建询价申请
 ShowSupplierProposal=显示询价申请
@@ -24,7 +24,7 @@ ConfirmValidateAsk=您确定要在名称<b> %s </b>下验证此价格请求吗
 DeleteAsk=删除申请
 ValidateAsk=验证申请
 SupplierProposalStatusDraft=草稿(需要确认)
-SupplierProposalStatusValidated=验证（请求已打开）
+SupplierProposalStatusValidated=已验证（请求已开放）
 SupplierProposalStatusClosed=关闭
 SupplierProposalStatusSigned=接受
 SupplierProposalStatusNotSigned=拒绝
@@ -36,23 +36,24 @@ SupplierProposalStatusNotSignedShort=拒绝
 CopyAskFrom=通过复制现有请求创建一个价格请求
 CreateEmptyAsk=创建空白申请
 ConfirmCloneAsk=您确定要克隆价格请求<b> %s </b>吗？
-ConfirmReOpenAsk=您确定要打开价格请求<b> %s </b>吗？
+ConfirmReOpenAsk=您确定要重新打开价格请求吗 <b> %s </b> ？
 SendAskByMail=用邮件发送询价申请
 SendAskRef=发送询价申请 %s
 SupplierProposalCard=请求卡
 ConfirmDeleteAsk=您确定要删除此价格请求<b> %s </b>吗？
-ActionsOnSupplierProposal=询价申请的活动
-DocModelAuroreDescription=一个完成申请模型(logo...)
+ActionsOnSupplierProposal=供应商报价事件
+DocModelAuroreDescription=A complete template for a vendor quotation request template (old implementation of Sponge template)
+DocModelZenithDescription=A complete template for a vendor quotation request template
 CommercialAsk=询价申请
 DefaultModelSupplierProposalCreate=设置默认模板
 DefaultModelSupplierProposalToBill=当关闭询价申请时的默认模板 (接受)
 DefaultModelSupplierProposalClosed=当关闭询价申请时的默认模板 (拒绝)
-ListOfSupplierProposals=供应商提案请求列表
-ListSupplierProposalsAssociatedProject=与项目关联的供应商提案列表
-SupplierProposalsToClose=供应商提案结束
+ListOfSupplierProposals=供应商报价单清单
+ListSupplierProposalsAssociatedProject=与项目相关的供应商报价单清单
+SupplierProposalsToClose=供应商报价单关闭
 SupplierProposalsToProcess=供应商提议处理
 LastSupplierProposals=最近新增的 %s 份询价申请
 AllPriceRequests=全部申请
-TypeContact_supplier_proposal_external_SHIPPING=供应商交货联系人
+TypeContact_supplier_proposal_external_SHIPPING=交货的供应商联系人
 TypeContact_supplier_proposal_external_BILLING=供应商开具账单联系人
-TypeContact_supplier_proposal_external_SERVICE=跟进报价的销售代表
+TypeContact_supplier_proposal_external_SERVICE=跟进报价单的销售代表
diff --git a/htdocs/langs/zh_CN/suppliers.lang b/htdocs/langs/zh_CN/suppliers.lang
index 724d69f6596..0bad2a19533 100644
--- a/htdocs/langs/zh_CN/suppliers.lang
+++ b/htdocs/langs/zh_CN/suppliers.lang
@@ -38,7 +38,7 @@ SentToSuppliers=发送给供应商
 ListOfSupplierOrders=采购订单清单
 MenuOrdersSupplierToBill=采购订单发票
 NbDaysToDelivery=交货延迟时间 (天)
-DescNbDaysToDelivery=这订单中产品的最长交货延迟时间
+DescNbDaysToDelivery=该订单产品的最长交货延迟时间
 SupplierReputation=供应商声誉
 ReferenceReputation=Reference reputation
 DoNotOrderThisProductToThisSupplier=不订购
diff --git a/htdocs/langs/zh_CN/ticket.lang b/htdocs/langs/zh_CN/ticket.lang
index a3fe4b3752f..e39200fb496 100644
--- a/htdocs/langs/zh_CN/ticket.lang
+++ b/htdocs/langs/zh_CN/ticket.lang
@@ -212,7 +212,7 @@ LatestNewTickets=最近新增的 %s 份服务工单（未读）
 TicketSeverity=严重程度
 ShowTicket=查看服务工单
 RelatedTickets=相关服务工单
-TicketAddIntervention=创建介入措施
+TicketAddIntervention=创建现场服务
 CloseTicket=关闭|解决
 AbandonTicket=放弃
 CloseATicket=关闭|解决服务工单
@@ -222,7 +222,7 @@ ConfirmDeleteTicket=请确认删除服务工单
 TicketDeletedSuccess=服务工单删除成功
 TicketMarkedAsClosed=服务工单标记为已关闭
 TicketDurationAuto=计算的持续时间
-TicketDurationAutoInfos=持续时间根据相关的介入措施自动计算
+TicketDurationAutoInfos=持续时间根据相关的现场服务自动计算
 TicketUpdated=服务工单已更新
 SendMessageByEmail=通过电子邮件发送消息
 TicketNewMessage=新消息
@@ -260,7 +260,7 @@ TicketEmailOriginIssuer=源服务工单的公布人
 InitialMessage=初始消息
 LinkToAContract=链接到合同
 TicketPleaseSelectAContract=选择合同
-UnableToCreateInterIfNoSocid=未定义合作方时无法创建介入措施
+UnableToCreateInterIfNoSocid=未定义合作方时无法创建现场服务
 TicketMailExchanges=邮件交流
 TicketInitialMessageModified=初始消息已修改
 TicketMessageSuccesfullyUpdated=消息已成功更新
@@ -326,11 +326,11 @@ SeeThisTicketIntomanagementInterface=在管理界面查看服务工单
 TicketPublicInterfaceForbidden=服务工单的公共界面未启用
 ErrorEmailOrTrackingInvalid=跟踪 ID 或电子邮件的值不正确
 OldUser=老用户
-NewUser=新用户
+NewUser=新建用户
 NumberOfTicketsByMonth=每月服务工单数量
 NbOfTickets=服务工单数量
-ExternalContributors=External contributors
-AddContributor=Add external contributor
+ExternalContributors=外部贡献者
+AddContributor=添加外部贡献者
 
 # notifications
 TicketCloseEmailSubjectCustomer=服务工单已关闭
diff --git a/htdocs/langs/zh_CN/users.lang b/htdocs/langs/zh_CN/users.lang
index 45cd393c1f9..37a07240f84 100644
--- a/htdocs/langs/zh_CN/users.lang
+++ b/htdocs/langs/zh_CN/users.lang
@@ -99,7 +99,7 @@ YourRole=您的角色
 YourQuotaOfUsersIsReached=你的活跃用户达到配额！
 NbOfUsers=用户数量
 NbOfPermissions=权限数量
-DontDowngradeSuperAdmin=Only another admin can downgrade an admin
+DontDowngradeSuperAdmin=只有另一个管理员可以降级管理员
 HierarchicalResponsible=超级管理员
 HierarchicView=分层视图
 UseTypeFieldToChange=改变用户字段类型
diff --git a/htdocs/langs/zh_CN/website.lang b/htdocs/langs/zh_CN/website.lang
index bff3c3b239f..87fe2cf9b0f 100644
--- a/htdocs/langs/zh_CN/website.lang
+++ b/htdocs/langs/zh_CN/website.lang
@@ -48,7 +48,7 @@ VirtualhostDesc=The name of the Virtual host or domain (For example: www.mywebsi
 SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>Create on your web server (Apache, Nginx, ...) a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong>
 ExampleToUseInApacheVirtualHostConfig=Example to use in Apache virtual host setup:
 YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
-YouCanAlsoDeployToAnotherWHP=<u>Run your web site with another Dolibarr Hosting provider</u><br>If you don't have a web server like Apache or NGinx available on internet, you can export and import your web site onto another Dolibarr instance provided by another Dolibarr hosting provider that provide full integration with the Website module. You can find a list of some Dolibarr hosting providers on <a href="https://saas.dolibarr.org" target="_blank" rel="noopener noreferrer external">https://saas.dolibarr.org</a>
+YouCanAlsoDeployToAnotherWHP= <u> 使用其他 Dolibarr 托管提供商运行您的网站 </u> <br> 如果您在互联网上没有像 Apache 或 NGinx 这样的 Web 服务器，您可以将您的网站导出和导入到另一个 Dolibarr 托管提供商提供的另一个 Dolibarr 实例上，该实例提供与网站模块的完全集成。您可以在 <a href="https://saas.dolibarr.org" target="_blank" rel="noopener noreferrer external"> https://saas.dolibarr.org </a> 上找到一些 Dolibarr 托管提供商的列表
 CheckVirtualHostPerms=Check also that the virtual host user (for example www-data) has <strong>%s</strong> permissions on files into<br><strong>%s</strong>
 ReadPerm=阅读
 WritePerm=写
@@ -60,10 +60,10 @@ NoPageYet=还没有页面
 YouCanCreatePageOrImportTemplate=You can create a new page or import a full website template
 SyntaxHelp=有关特定语法提示的帮助
 YouCanEditHtmlSourceckeditor=您可以使用编辑器中的“源”按钮编辑HTML源代码。
-YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
+YouCanEditHtmlSource= <br> <span class="fa fa-bug"> </span> 您可以使用标签将 PHP 代码包含到此源中 <strong> &lt;?php ?&gt; </strong> 。可以使用以下全局变量：$conf、$db、$mysoc、$user、$website、$websitepage、$weblangs、$pagelangs。 <br> <br> <span class="fa fa-bug"> </span> 您还可以使用以下语法包含另一个页面/容器的内容： <br> <strong> &lt;?php includeContainer('alias_of_container_to_include'); ?&gt; </strong> <br> <br> <span class="fa fa-bug"> </span> 您可以使用以下语法重定向到另一个页面/容器（注意：不要输出任何内容）重定向前的内容）： <br> <strong> &lt;?php redirectToContainer(' alias_of_container_to_redirect_to'); ?&gt; </strong> <br> <br> <span class="fa fa-link"> </span> 要添加到其他页面的链接，请使用以下语法：<br>  <strong> &lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt; </strong>  <br> <br> <span class="fa fa-download"> </span> 包含 <strong>用于下载</strong>文件的链接，该文件存储在<strong>documents</strong> 目录，使用 <strong> document.php </strong> 包装器：<br> 示例，对于将文件放入documents/ecm（需要记录），语法为： <br> <strong> &lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt; </strong> <br> 对于文档/媒体中的文件（开放目录以供公共访问），语法为： <br> <strong> &lt;a href="/document.php?modulepart=medias&file=[relative_dir/]文件名。 ext"&gt; </strong> <br> 对于通过共享链接共享的文件 (使用文件的共享哈希键打开访问），语法为： <br> <strong> &lt;a href="/document.php?hashp=publicsharekeyoffile"&gt; </strong>  <br> <br> <span class="fa fa-picture-o"> </span> 包含 <span 类='notranslate'><strong></span> 图像</strong> 存储到<strong> 文档</strong>  目录，使用 <strong> viewimage.php </strong> 包装器：<br>例如，要将图像放入文档/媒体（开放目录以供公共访问），语法为： <br> <strong> &lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt; </strong> <br>
 #YouCanEditHtmlSource2=<br><span class="fa fa-picture-o"></span> To include a <strong>image</strong> shared publicaly, use the <strong>viewimage.php</strong> wrapper:<br>Example with a shared key 123456789, syntax is:<br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;</strong><br>
-YouCanEditHtmlSource2=For an image shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;</strong><br>
-YouCanEditHtmlSourceMore=<br>More examples of HTML or dynamic code available on <a href="%s" target="_blank" rel="noopener noreferrer external">the wiki documentation</a><br>.
+YouCanEditHtmlSource2=对于通过共享链接共享的图像（使用文件的共享哈希键进行开放访问），语法为： <br> <strong> &lt;img src="/viewimage.php?hashp=12345679012..."&gt; </strong>  <br>
+YouCanEditHtmlSourceMore= <br> 有关 HTML 或动态代码的更多示例，请参阅 <a href="%s" target="_blank" rel="noopener noreferrer external"> wiki 文档</a> <br> .
 ClonePage=克隆页面/容器
 CloneSite=克隆网站
 SiteAdded=Website added
@@ -158,5 +158,5 @@ Reservation=Reservation
 PagesViewedPreviousMonth=Pages viewed (previous month)
 PagesViewedTotal=Pages viewed (total)
 Visibility=谁可访问
-Everyone=Everyone
+Everyone=所有人
 AssignedContacts=项目联系人
diff --git a/htdocs/langs/zh_CN/withdrawals.lang b/htdocs/langs/zh_CN/withdrawals.lang
index 41f7f016c45..1b5b2ef8a75 100644
--- a/htdocs/langs/zh_CN/withdrawals.lang
+++ b/htdocs/langs/zh_CN/withdrawals.lang
@@ -1,21 +1,21 @@
 # Dolibarr language file - Source file is en_US - withdrawals
 CustomersStandingOrdersArea=Payments by Direct debit orders
-SuppliersStandingOrdersArea=Payments by Credit transfer
+SuppliersStandingOrdersArea=通过银行转账付款
 StandingOrdersPayment=长期订单
 StandingOrderPayment=长期订单
 NewStandingOrder=新建长期订单
-NewPaymentByBankTransfer=New payment by credit transfer
+NewPaymentByBankTransfer=通过银行转账进行新付款
 StandingOrderToProcess=要处理
-PaymentByBankTransferReceipts=Credit transfer orders
-PaymentByBankTransferLines=Credit transfer order lines
+PaymentByBankTransferReceipts=银行转账的订单
+PaymentByBankTransferLines=银行转账订单行
 WithdrawalsReceipts=提款收据
 WithdrawalReceipt=提款收据
-BankTransferReceipts=Credit transfer orders
-BankTransferReceipt=Credit transfer order
-LatestBankTransferReceipts=最近新增的 %s 份信用转帐订单
+BankTransferReceipts=银行转账的订单
+BankTransferReceipt=银行转账的订单
+LatestBankTransferReceipts=最近新增的 %s 份银行转账订单
 LastWithdrawalReceipts=最近新增的 %s 份直接借记文件
 WithdrawalsLine=Direct debit order line
-CreditTransfer=Credit transfer
+CreditTransfer=银行转账
 CreditTransferLine=Credit transfer line
 WithdrawalsLines=直接借记订单行
 CreditTransferLines=Credit transfer lines
@@ -32,8 +32,8 @@ InvoiceWaitingWithdraw=发票等待直接付款
 InvoiceWaitingPaymentByBankTransfer=Invoice waiting for credit transfer
 AmountToWithdraw=收回的款额
 AmountToTransfer=Amount to transfer
-NoInvoiceToWithdraw=No invoice open for '%s' is waiting. Go on tab '%s' on invoice card to make a request.
-NoSupplierInvoiceToWithdraw=No supplier invoice with open '%s' is waiting. Go on tab '%s' on invoice card to make a request.
+NoInvoiceToWithdraw=没有为“%s”打开的发票正在等待中。进入发票页上的标签页“%s”提出请求。
+NoSupplierInvoiceToWithdraw=没有未完成的供应商发票“%s”正在等待中。请前往发票页上的标签页“%s”提出请求。
 ResponsibleUser=User Responsible
 WithdrawalsSetup=提款设置
 CreditTransferSetup=Credit transfer setup
@@ -76,7 +76,7 @@ StatusRefused=拒绝
 StatusMotif0=未指定
 StatusMotif1=提供insuffisante
 StatusMotif2=Tirage conteste
-StatusMotif3=没有直接付款订单
+StatusMotif3=没有直接付款的订单
 StatusMotif4=销售订单
 StatusMotif5=肋inexploitable
 StatusMotif6=帐户无余额
@@ -142,7 +142,7 @@ ExecutionDate=执行日期
 CreateForSepa=创建直接付款文件
 ICS=Creditor Identifier - ICS
 IDS=Debitor Identifier
-END_TO_END="EndToEndId" SEPA XML tag - Unique id assigned per transaction
+END_TO_END=“EndToEndId”SEPA XML 标签 - 每笔交易分配的唯一 ID
 USTRD="Unstructured" SEPA XML tag
 ADDDAYS=Add days to Execution Date
 NoDefaultIBANFound=No default IBAN found for this third party
diff --git a/htdocs/langs/zh_CN/workflow.lang b/htdocs/langs/zh_CN/workflow.lang
index bc4671b978e..1252f53e216 100644
--- a/htdocs/langs/zh_CN/workflow.lang
+++ b/htdocs/langs/zh_CN/workflow.lang
@@ -1,20 +1,20 @@
 # Dolibarr language file - Source file is en_US - workflow
 WorkflowSetup=工作流模块设置
-WorkflowDesc=This module provides some automatic actions. By default, the workflow is open (you can do things in the order you want) but here you can activate some automatic actions.
+WorkflowDesc=该模块提供了一些自动操作。默认情况下，工作流是打开的（您可以按想要的顺序执行操作），但在这里您可以激活一些自动操作。
 ThereIsNoWorkflowToModify=没有工作流程，您可以修改你已激活的模块。
 # Autocreate
 descWORKFLOW_PROPAL_AUTOCREATE_ORDER=签署报价单后自动创建销售订单（新订单的金额与报价金额相同）
 descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=签署报价单后自动创建客户发票（新发票的金额与报价金额相同）
 descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=在合同确认后自动创建客户发票
 descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Automatically create a customer invoice after a sales order is closed (the new invoice will have same amount as the order)
-descWORKFLOW_TICKET_CREATE_INTERVENTION=创建服务工单时，自动创建介入措施。
+descWORKFLOW_TICKET_CREATE_INTERVENTION=创建服务工单时，自动创建现场服务。
 # Autoclassify customer proposal or order
 descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal as billed when sales order is set to billed (and if the amount of the order is the same as the total amount of the signed linked proposal)
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposal as billed when customer invoice is validated (and if the amount of the invoice is the same as the total amount of the signed linked proposal)
 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)
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=当发货单被验证时，将链接的源销售订单归类为已发货（并且如果所有发货单的发货数量之和与要更新的订单中的数量相同）
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING_CLOSED=当发货单被关闭时，将链接的源销售订单归类为已发货（并且如果所有发货单的发货数量之和与要更新的订单中的数量相同）
 # Autoclassify purchase proposal
 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)
 # Autoclassify purchase order
@@ -27,10 +27,10 @@ descWORKFLOW_EXPEDITION_CLASSIFY_CLOSED_INVOICE=当链接的采购发票经过
 descWORKFLOW_TICKET_LINK_CONTRACT=创建服务工单时，链接其匹配的合作方的可用合同
 descWORKFLOW_TICKET_USE_PARENT_COMPANY_CONTRACTS=When linking contracts, search among those of parents companies
 # Autoclose intervention
-descWORKFLOW_TICKET_CLOSE_INTERVENTION=关闭服务工单后，关闭与服务工单关联的所有介入措施
+descWORKFLOW_TICKET_CLOSE_INTERVENTION=关闭服务工单后，关闭与服务工单关联的所有现场服务
 AutomaticCreation=自动创建
 AutomaticClassification=自动分类
 # Autoclassify shipment
-descWORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE=Classify linked source shipment as closed when customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked shipments)
+descWORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE=当客户发票被验证时，将链接的源发货单归类为已关闭（并且发票金额与链接的发货单的总金额相同）
 AutomaticClosing=Automatic closing
 AutomaticLinking=Automatic linking
diff --git a/htdocs/langs/zh_HK/admin.lang b/htdocs/langs/zh_HK/admin.lang
index e2b7c030128..ba57eb7feae 100644
--- a/htdocs/langs/zh_HK/admin.lang
+++ b/htdocs/langs/zh_HK/admin.lang
@@ -1509,7 +1509,8 @@ WatermarkOnDraftContractCards=合同草稿上的水印（如果為空則無水
 MembersSetup=會員模塊設置
 MemberMainOptions=主要選項
 MemberCodeChecker=Options for automatic generation of member codes
-AdherentLoginRequired= 管理每個會員的登錄
+AdherentLoginRequired=Manage a login/password for each member
+AdherentLoginRequiredDesc=Add a value for a login and a password on the member file. If the member is linked to a user, updating the member login and password will also update the user login and password.
 AdherentMailRequired=創建新會員所需的電子郵件
 MemberSendInformationByMailByDefault=默認情況下，向會員發送確認郵件（驗證或新訂閱）的複選框處於啟用狀態
 MemberCreateAnExternalUserForSubscriptionValidated=Create an external user login for each new member subscription validated
@@ -2076,6 +2077,10 @@ MAIN_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
 DOC_SHOW_FIRST_SALES_REP=Show first sales representative
 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_GENERATE_DOCUMENTS_SUPPLIER_PROPOSAL_WITHOUT_UNIT_PRICE=Hide the unit price column on quotation requests
+MAIN_GENERATE_DOCUMENTS_SUPPLIER_PROPOSAL_WITHOUT_TOTAL_COLUMN=Hide the total price column on quotation requests
+MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_UNIT_PRICE=Hide the unit price column on purchase orders
+MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_TOTAL_COLUMN=Hide the total price column on puchase orders
 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
@@ -2400,4 +2405,4 @@ OptionXShouldBeEnabledInModuleY=Option "<b>%s</b>" should be enabled into module
 OptionXIsCorrectlyEnabledInModuleY=Option "<b>%s</b>" is enabled into module <b>%s</b>
 AtBottomOfPage=At bottom of page
 FailedAuth=failed authentications
-MaxNumberOfFailedAuth=Max number of failed authentication in 24h to disable login.
+MaxNumberOfFailedAuth=Max number of failed authentication in 24h to deny login.
diff --git a/htdocs/langs/zh_TW/accountancy.lang b/htdocs/langs/zh_TW/accountancy.lang
index 4594ceaa233..4a89957cbaf 100644
--- a/htdocs/langs/zh_TW/accountancy.lang
+++ b/htdocs/langs/zh_TW/accountancy.lang
@@ -57,11 +57,14 @@ WarningDataDisappearsWhenDataIsExported=Warning, this list contains only the acc
 VueByAccountAccounting=依會計科目檢視
 VueBySubAccountAccounting=依會計子分類帳檢視
 
-MainAccountForCustomersNotDefined=在設定中客戶的主要會計帳戶尚未定義
-MainAccountForSuppliersNotDefined=在設定中供應商的主要會計帳戶尚未定義
-MainAccountForUsersNotDefined=在設定中使用者的主要會計帳戶尚未定義
-MainAccountForVatPaymentNotDefined=在設定中營業稅付款的主要會計帳戶尚未定義
-MainAccountForSubscriptionPaymentNotDefined=未在"設定"中定義訂閱付款的主會計帳戶
+MainAccountForCustomersNotDefined=Main account (from the Chart of Account) for customers not defined in setup
+MainAccountForSuppliersNotDefined=Main account (from the Chart of Account) for vendors not defined in setup
+MainAccountForUsersNotDefined=Main account (from the Chart of Account) for users not defined in setup
+MainAccountForRevenueStampSaleNotDefined=Account (from the Chart of Account) for the revenue stamp (sales) not defined in setup
+MainAccountForRevenueStampPurchaseNotDefined=Account (from the Chart of Account) for the revenue stamp (purchases) not defined in setup
+MainAccountForVatPaymentNotDefined=Account (from the Chart of Account) for VAT payment not defined in setup
+MainAccountForSubscriptionPaymentNotDefined=Account (from the Chart of Account) for membership payment not defined in setup
+MainAccountForRetainedWarrantyNotDefined=Account (from the Chart of Account) for the retained warranty not defined in setup
 UserAccountNotDefined=Accounting account for user not defined in setup
 
 AccountancyArea=會計區域
diff --git a/htdocs/langs/zh_TW/admin.lang b/htdocs/langs/zh_TW/admin.lang
index f339cbd07ba..a2d0eeeb7ee 100644
--- a/htdocs/langs/zh_TW/admin.lang
+++ b/htdocs/langs/zh_TW/admin.lang
@@ -1509,7 +1509,8 @@ WatermarkOnDraftContractCards=草稿合約浮水印(若空白則無)
 MembersSetup=會員模組設定
 MemberMainOptions=主要選項
 MemberCodeChecker=自動產生會員代碼的選項
-AdherentLoginRequired= 管理每位會員登入
+AdherentLoginRequired=Manage a login/password for each member
+AdherentLoginRequiredDesc=Add a value for a login and a password on the member file. If the member is linked to a user, updating the member login and password will also update the user login and password.
 AdherentMailRequired=建立新會員需要電子郵件
 MemberSendInformationByMailByDefault=已勾選預設傳送電子郵件驗證成員（驗證或新訂閲）
 MemberCreateAnExternalUserForSubscriptionValidated=為每個經過驗證的新會員訂閱建立一個外部用戶帳號
@@ -2076,6 +2077,10 @@ MAIN_DOCUMENTS_LOGO_HEIGHT=PDF上Logo的高度
 DOC_SHOW_FIRST_SALES_REP=顯示第一位業務代表
 MAIN_GENERATE_PROPOSALS_WITH_PICTURE=在提案/建議書行加入圖片欄位
 MAIN_DOCUMENTS_WITH_PICTURE_WIDTH=欄位寬度-如果在行上加入圖片
+MAIN_GENERATE_DOCUMENTS_SUPPLIER_PROPOSAL_WITHOUT_UNIT_PRICE=Hide the unit price column on quotation requests
+MAIN_GENERATE_DOCUMENTS_SUPPLIER_PROPOSAL_WITHOUT_TOTAL_COLUMN=Hide the total price column on quotation requests
+MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_UNIT_PRICE=Hide the unit price column on purchase orders
+MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_TOTAL_COLUMN=Hide the total price column on puchase orders
 MAIN_PDF_NO_SENDER_FRAME=隱藏寄件人地址框的邊框
 MAIN_PDF_NO_RECIPENT_FRAME=隱藏收件人地址框的邊框
 MAIN_PDF_HIDE_CUSTOMER_CODE=隱藏客戶代碼
@@ -2400,4 +2405,4 @@ OptionXShouldBeEnabledInModuleY=Option "<b>%s</b>" should be enabled into module
 OptionXIsCorrectlyEnabledInModuleY=Option "<b>%s</b>" is enabled into module <b>%s</b>
 AtBottomOfPage=At bottom of page
 FailedAuth=failed authentications
-MaxNumberOfFailedAuth=Max number of failed authentication in 24h to disable login.
+MaxNumberOfFailedAuth=Max number of failed authentication in 24h to deny login.
diff --git a/htdocs/langs/zh_TW/main.lang b/htdocs/langs/zh_TW/main.lang
index c0fd46ba85b..62381350cb1 100644
--- a/htdocs/langs/zh_TW/main.lang
+++ b/htdocs/langs/zh_TW/main.lang
@@ -1237,3 +1237,5 @@ SearchSyntaxTooltipForStringOrNum=For searching inside text fields, you can use
 InProgress=進行中
 DateOfPrinting=Date of printing
 ClickFullScreenEscapeToLeave=Click here to switch in Full screen mode. Press ESCAPE to leave Full screen mode.
+UserNotYetValid=Not yet valid
+UserExpired=已過期
diff --git a/htdocs/langs/zh_TW/supplier_proposal.lang b/htdocs/langs/zh_TW/supplier_proposal.lang
index 7af171473c1..416398bdd36 100644
--- a/htdocs/langs/zh_TW/supplier_proposal.lang
+++ b/htdocs/langs/zh_TW/supplier_proposal.lang
@@ -42,7 +42,8 @@ SendAskRef=傳送供應商報價%s
 SupplierProposalCard=供應商報價需求卡
 ConfirmDeleteAsk=您確定要刪除供應商報價<b>%s</b>嗎？
 ActionsOnSupplierProposal=供應商報價事件
-DocModelAuroreDescription=完整的需求模組（logo...）
+DocModelAuroreDescription=A complete template for a vendor quotation request template (old implementation of Sponge template)
+DocModelZenithDescription=A complete template for a vendor quotation request template
 CommercialAsk=供應商報價
 DefaultModelSupplierProposalCreate=預設模型建立
 DefaultModelSupplierProposalToBill=關閉供應商報價時的預設範本（已接受）